MFB (fixing bug 31668)

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 16e4585e5ecb1bff819f40eb4940adb1d3c0831a..a133b5c118d8bde9534154574d83df2e8309a3c6 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -67,7 +67,7 @@ PHP_FUNCTION(mysqli_connect)
                }
        }
 
-       mysql = (MY_MYSQL *)calloc(1, sizeof(MY_MYSQL));
+       mysql = (MY_MYSQL *) ecalloc(1, sizeof(MY_MYSQL));
 
        if (!(mysql->mysql = mysql_init(NULL))) {
                efree(mysql);

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index 7656a9fb25acef5b9f35992cf2132e1c6546a5ab..b4589cca7d4b28841a095fe1bfa5adaf20fdb537 100644 (file)
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -57,6 +57,7 @@ typedef struct {
        MYSQL           *mysql;
        zval            *li_read;
        php_stream      *li_stream;
+       unsigned int multi_query;       
 } MY_MYSQL;
 
 typedef struct {
@@ -149,14 +150,14 @@ extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
 
 PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRMLS_DC);
 
-#define MYSQLI_DISABLE_MQ if (MyG(multi_query)) { \
+#define MYSQLI_DISABLE_MQ if (mysql->multi_query) { \
        mysql_set_server_option(mysql->mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF); \
-       MyG(multi_query) = 0; \
+       mysql->multi_query = 0; \
 } 
 
-#define MYSQLI_ENABLE_MQ if (!MyG(multi_query)) { \
+#define MYSQLI_ENABLE_MQ if (!mysql->multi_query) { \
        mysql_set_server_option(mysql->mysql, MYSQL_OPTION_MULTI_STATEMENTS_ON); \
-       MyG(multi_query) = 1; \
+       mysql->multi_query = 1; \
 } 
 
 #define REGISTER_MYSQLI_CLASS_ENTRY(name, mysqli_entry, class_functions) { \

diff --git a/ext/mysqli/tests/bug31668.phpt b/ext/mysqli/tests/bug31668.phpt
new file mode 100644 (file)
index 0000000..b813096
--- /dev/null
+++ b/ext/mysqli/tests/bug31668.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Bug #31668 multi_query works exactly every other time (multi_query was global, now per connection)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+       include "connect.inc";
+
+       $mysql = new mysqli($host, $user, $passwd, "test");
+       $mysql->multi_query('SELECT 1;SELECT 2');
+       do {
+               $res = $mysql->store_result();  
+               if ($mysql->errno == 0) {
+                       while ($arr = $res->fetch_assoc()) {
+                               var_dump($arr);
+                       }
+                       $res->free();
+               }
+       } while ($mysql->next_result());
+       var_dump($mysql->error, __LINE__);
+       $mysql->close();
+
+       $mysql = new mysqli($host, $user, $passwd, "test");
+       $mysql->multi_query('SELECT 1;SELECT 2');
+       do {
+               $res = $mysql->store_result();  
+               if ($mysql->errno == 0) {
+                       while ($arr = $res->fetch_assoc()) {
+                               var_dump($arr);
+                       }
+                       $res->free();
+               }
+       } while ($mysql->next_result());
+       var_dump($mysql->error, __LINE__);
+?>
+--EXPECTF--
+array(1) {
+  [1]=>
+  string(1) "1"
+}
+array(1) {
+  [2]=>
+  string(1) "2"
+}
+string(0) ""
+int(%d)
+array(1) {
+  [1]=>
+  string(1) "1"
+}
+array(1) {
+  [2]=>
+  string(1) "2"
+}
+string(0) ""
+int(%d)