diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-10-26 14:22:31 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-10-26 14:22:31 +0200 |
| commit | 4f4d77805c6afdddce0c8184ee6b1dddab7da6a7 (patch) | |
| tree | 0b38185e79ef8d8bb2e80e88d5ff4656611928a1 | |
| parent | 056ecf3201a10ca9b819c01562fb683b75513db0 (diff) | |
| parent | 848780606dbaa3553b300390393d646b7bd20051 (diff) | |
| download | php-git-4f4d77805c6afdddce0c8184ee6b1dddab7da6a7.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/pdo_mysql/mysql_statement.c
| -rw-r--r-- | ext/pdo_mysql/tests/bug_41997.phpt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ext/pdo_mysql/tests/bug_41997.phpt b/ext/pdo_mysql/tests/bug_41997.phpt index ee0cfe9ac2..38d55a0190 100644 --- a/ext/pdo_mysql/tests/bug_41997.phpt +++ b/ext/pdo_mysql/tests/bug_41997.phpt @@ -2,12 +2,11 @@ PDO MySQL Bug #41997 (stored procedure call returning single rowset blocks future queries) --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(); -$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); +$db = MySQLPDOTest::factory(); $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC); $matches = array(); if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches)) @@ -20,9 +19,8 @@ if ($version < 50000) ?> --FILE-- <?php -require dirname(__FILE__) . '/config.inc'; -require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; -$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); +require dirname(__FILE__) . '/mysql_pdo_test.inc'; +$db = MySQLPDOTest::factory(); $db->exec('DROP PROCEDURE IF EXISTS p'); $db->exec('CREATE PROCEDURE p() BEGIN SELECT 1 AS "one"; END'); |