1st set of fixes to make tests work with MySQL

# Additional changes pending

7 files changed, 32 insertions, 1 deletions

diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt
index f085e903ef..77a625c3c4 100644
--- a/ext/pdo/tests/pdo_012.phpt
+++ b/ext/pdo/tests/pdo_012.phpt
@@ -30,9 +30,13 @@ class Test
 	}
 }
 
+unset($stmt);
+
 $stmt = $db->query($SELECT, PDO_FETCH_CLASS, 'Test');
 var_dump($stmt->fetchAll());
 
+unset($stmt);
+
 $stmt = $db->query($SELECT, PDO_FETCH_NUM);
 $stmt->setFetchMode(PDO_FETCH_CLASS, 'Test', array('Changed'));
 var_dump($stmt->fetchAll());
diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt
index e4cd8d3944..0929606336 100644
--- a/ext/pdo/tests/pdo_013.phpt
+++ b/ext/pdo/tests/pdo_013.phpt
@@ -36,11 +36,15 @@ class Test
 	}
 }
 
+unset($stmt);
+
 foreach ($db->query($SELECT, PDO_FETCH_CLASS, 'Test') as $data)
 {
 	var_dump($data);
 }
 
+unset($stmt);
+
 $stmt = $db->query($SELECT, PDO_FETCH_CLASS, 'Test', array('WOW'));
 
 foreach($stmt as $data)
diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
index 4581b88f71..f6f7cea177 100644
--- a/ext/pdo/tests/pdo_016.phpt
+++ b/ext/pdo/tests/pdo_016.phpt
@@ -17,6 +17,11 @@ $db->exec('CREATE TABLE test(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');
 $db->exec('INSERT INTO test VALUES(0, \'String0\')');
 $db->exec('INSERT INTO test VALUES(1, \'String1\')');
 $db->exec('INSERT INTO test VALUES(2, \'String2\')');
+
+if ($db->getAttribute(PDO_ATTR_DRIVER_NAME) == 'mysql') {
+	$db->setAttribute(PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1);
+}
+
 $stmt1 = $db->prepare('SELECT COUNT(idx) FROM test');
 $stmt2 = $db->prepare('SELECT idx, txt FROM test ORDER by idx');
 
diff --git a/ext/pdo/tests/pdo_017.phpt b/ext/pdo/tests/pdo_017.phpt
index ba8d57eeeb..36bdb029c8 100644
--- a/ext/pdo/tests/pdo_017.phpt
+++ b/ext/pdo/tests/pdo_017.phpt
@@ -22,7 +22,13 @@ try {
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
-$db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))');
+if ($db->getAttribute(PDO_ATTR_DRIVER_NAME) == 'mysql') {
+	$suf = ' Type=InnoDB';
+} else {
+	$suf = '';
+}
+
+$db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))'.$suf);
 $db->exec("INSERT INTO test VALUES(1, 'A')"); 
 $db->exec("INSERT INTO test VALUES(2, 'B')"); 
 $db->exec("INSERT INTO test VALUES(3, 'C')");
diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt
index dce59b25ef..1e2290c400 100644
--- a/ext/pdo/tests/pdo_018.phpt
+++ b/ext/pdo/tests/pdo_018.phpt
@@ -77,6 +77,10 @@ $db->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_EXCEPTION);
 var_dump($db->query('SELECT COUNT(*) FROM classtypes')->fetchColumn());
 var_dump($db->query('SELECT id, name FROM classtypes ORDER by id')->fetchAll(PDO_FETCH_COLUMN|PDO_FETCH_UNIQUE));
 
+if ($db->getAttribute(PDO_ATTR_DRIVER_NAME) == 'mysql') {
+	$db->setAttribute(PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1);
+}
+
 $objs = array();
 $objs[0] = new stdClass;
 $objs[1] = new TestBase;
@@ -101,6 +105,8 @@ foreach($objs as $obj)
 echo "===TYPES===\n";
 var_dump($ctypes);
 
+unset($stmt);
+
 echo "===INSERT===\n";
 $stmt = $db->prepare('INSERT INTO test VALUES(:id, :classtype, :val)');
 $stmt->bindParam(':id', $idx);
@@ -121,6 +127,8 @@ foreach($objs as $idx => $obj)
 	$stmt->execute();	
 }
 
+unset($stmt);
+
 echo "===DATA===\n";
 var_dump($db->query('SELECT test.val FROM test')->fetchAll(PDO_FETCH_COLUMN));
 
diff --git a/ext/pdo/tests/pdo_021.phpt b/ext/pdo/tests/pdo_021.phpt
index e7d7c9d619..c2ac95dbe7 100644
--- a/ext/pdo/tests/pdo_021.phpt
+++ b/ext/pdo/tests/pdo_021.phpt
@@ -36,6 +36,8 @@ $select->execute();
 $num = $select->fetchColumn();
 echo 'There are ' . $num . " rows in the table.\n";
 
+unset($stmt);
+
 // Insert using named parameters
 $stmt2 = $db->prepare("INSERT INTO test VALUES(:first, :second, :third)");
 foreach ($data as $row) {
diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt
index 87d6b09532..5207f8d3f5 100644
--- a/ext/pdo/tests/pdo_026.phpt
+++ b/ext/pdo/tests/pdo_026.phpt
@@ -62,6 +62,8 @@ foreach ($data as $row) {
     $stmt->execute($row);
 }
 
+unset($stmt);
+
 $stmt = $db->query('SELECT * FROM test');
 var_dump(get_class($stmt));
 var_dump(get_class($stmt->dbh));