From dc82ad3749871f2fe0f7431f172ceb0f44396432 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Wed, 10 Jun 2009 12:28:50 -0400
Subject: [PATCH] resolve conflict, comment out my custom database code that I
 use for profiling these tests.

---
 framework/Image/tests/im.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/framework/Image/tests/im.php b/framework/Image/tests/im.php
index 17440b386..d3a3130d6 100644
--- a/framework/Image/tests/im.php
+++ b/framework/Image/tests/im.php
@@ -10,6 +10,8 @@
 define('HORDE_BASE', '/var/www/html/horde');
 define('AUTH_HANDLER', true);
 require_once HORDE_BASE . '/lib/base.php';
+$GLOBALS['conf']['sql']['adapter'] = $GLOBALS['conf']['sql']['phptype'] == 'mysqli' ? 'mysqli' : 'pdo_' . $GLOBALS['conf']['sql']['phptype'];
+$db = Horde_Db_Adapter::factory($GLOBALS['conf']['sql']);
 
 // Putting these here so they don't interfere with timing/memory data when
 // profiling.
@@ -422,4 +424,11 @@ function logThis($effect, $time, $memory)
     global $driver, $logger;
 
     $logger->debug("$driver, $effect, $time, $memory");
+
+//    global $driver, $logger, $db;
+//    $sql = "INSERT INTO image_tests (test, driver, peak_memory, execution_time) VALUES (?, ?, ?, ?);";
+//    $db->insert($sql, array('test' => $effect,
+//                                     'driver' => $driver,
+//                                     'peak_memory' => $memory,
+//                                     'execution_time' => $time));
 }
-- 
2.11.0