1 files changed, 31 insertions, 26 deletions

diff --git a/ext/pdo_mysql/tests/bug_61207.phpt b/ext/pdo_mysql/tests/bug_61207.phpt
index 917b322180..411b39a70b 100644
--- a/ext/pdo_mysql/tests/bug_61207.phpt
+++ b/ext/pdo_mysql/tests/bug_61207.phpt
@@ -2,27 +2,27 @@
 PDO MySQL Bug #61207 (PDO::nextRowset() after a multi-statement query doesn't always work)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
-require dirname(__FILE__) . '/config.inc';
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-PDOTest::skip();
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
+
 ?>
 --FILE--
 <?php
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+$db = MySQLPDOTest::factory();
 
-$link = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+$db->query('DROP TABLE IF EXISTS test');
+$db->query('create table `test`( `id` int )');
 
-$link->query('create table `bug61207`( `id` int )');
+$handle1 = $db->prepare('insert into test(id) values(1);
+                          select * from test where id = ?;
+                          update test set id = 2 where id = ?;');
 
-$handle1 = $link->prepare('insert into bug61207(id) values(1);
-                          select * from bug61207 where id = ?;
-                          update bug61207 set id = 2 where id = ?;');
-						     
 $handle1->bindValue('1', '1');
 $handle1->bindValue('2', '1');
-				      
-$handle1->execute();   
+
+$handle1->execute();
 $i = 1;
 print("Handle 1:\n");
 do {
@@ -31,9 +31,9 @@ do {
 		print("Results detected\n");
 } while($handle1->nextRowset());
 
-$handle2 = $link->prepare('select * from bug61207 where id = ?;
-                           update bug61207 set id = 1 where id = ?;');
-					        
+$handle2 = $db->prepare('select * from test where id = ?;
+                           update test set id = 1 where id = ?;');
+
 $handle2->bindValue('1', '2');
 $handle2->bindValue('2', '2');
 
@@ -47,9 +47,9 @@ do {
 		print("Results detected\n");
 } while($handle2->nextRowset());
 
-$handle3 = $link->prepare('update bug61207 set id = 2 where id = ?;
-                           select * from bug61207 where id = ?;');
- 
+$handle3 = $db->prepare('update test set id = 2 where id = ?;
+                           select * from test where id = ?;');
+
 $handle3->bindValue('1', '1');
 $handle3->bindValue('2', '2');
 
@@ -63,15 +63,15 @@ do {
 		print("Results detected\n");
 } while($handle3->nextRowset());
 
-$handle4 = $link->prepare('insert into bug61207(id) values(3);
-                           update bug61207 set id = 2 where id = ?;
-                           select * from bug61207 where id = ?;');
-															      
+$handle4 = $db->prepare('insert into test(id) values(3);
+                           update test set id = 2 where id = ?;
+                           select * from test where id = ?;');
+
 $handle4->bindValue('1', '3');
 $handle4->bindValue('2', '2');
-									       
+
 $handle4->execute();
-      
+
 $i = 1;
 print("Handle 4:\n");
 do {
@@ -80,7 +80,12 @@ do {
 		print("Results detected\n");
 } while($handle1->nextRowset());
 
-$link->query("DROP TABLE bug61207");
+$db->query("DROP TABLE test");
+?>
+--CLEAN--
+<?php
+require dirname(__FILE__) . '/mysql_pdo_test.inc';
+MySQLPDOTest::dropTestTable();
 ?>
 --EXPECT--
 Handle 1: