From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 11 Dec 2020 12:03:22 +0000 (+0100)
Subject: PDO MySQL: Unskip bug_41125.phpt
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4e88bd7e30214bec26c5c49d82d78439b0f00dc;p=php

PDO MySQL: Unskip bug_41125.phpt

This test was always skipped (leftover debug statement?)

Contrary to the comments in the test and the test expectation,
this actually works fine.
---

diff --git a/ext/pdo_mysql/tests/bug_41125.phpt b/ext/pdo_mysql/tests/bug_41125.phpt
index e7db01c8e3..d96778d754 100644
--- a/ext/pdo_mysql/tests/bug_41125.phpt
+++ b/ext/pdo_mysql/tests/bug_41125.phpt
@@ -13,7 +13,6 @@ if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
     die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
-die("skip $version");
 if ($version < 40100)
     die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
         $matches[1], $matches[2], $matches[3], $version));
@@ -27,10 +26,6 @@ $db->exec("DROP TABLE IF EXISTS test");
 // And now allow the evil to do his work
 $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, 1);
 $sql = "CREATE TABLE IF NOT EXISTS test(id INT); INSERT INTO test(id) VALUES (1); SELECT * FROM test; INSERT INTO test(id) VALUES (2); SELECT * FROM test;";
-// NOTE: This will fail, it is OK to fail - you must not mix DML/DDL and SELECT
-// The PDO API does not support multiple queries properly!
-// Read http://blog.ulf-wendel.de/?p=192
-// Compare MySQL C-API documentation
 $stmt = $db->query($sql);
 do {
     var_dump($stmt->fetchAll());
@@ -44,8 +39,36 @@ require __DIR__ . '/mysql_pdo_test.inc';
 $db = MySQLPDOTest::factory();
 $db->exec("DROP TABLE IF EXISTS test");
 ?>
---EXPECTF--
-Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error in %s on line %d
+--EXPECT--
 array(0) {
 }
+array(0) {
+}
+array(1) {
+  [0]=>
+  array(2) {
+    ["id"]=>
+    string(1) "1"
+    [0]=>
+    string(1) "1"
+  }
+}
+array(0) {
+}
+array(2) {
+  [0]=>
+  array(2) {
+    ["id"]=>
+    string(1) "1"
+    [0]=>
+    string(1) "1"
+  }
+  [1]=>
+  array(2) {
+    ["id"]=>
+    string(1) "2"
+    [0]=>
+    string(1) "2"
+  }
+}
 done!