Added default multi resultset support for mysqli_connect (#30645)

diff --git a/NEWS b/NEWS
index 13934e17e8909b39c021838f0c2186a606208b69..ad30da789ce375fe078aa26031dd136697f6d5b7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2004, PHP 5.0.3
+- Fixed bug #30645 (def. multi result set support for mysql_connect). (Georg)
 - Fixed error handling in mysqli_multi_query. (Georg)
 - Fixed a problem with SPL iterators aggregating the innner iterator. (Marcus)
 - Extended the functionality of is_subclass_of() to accept either a class name

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 260c0c75d6153432173285b1e4e9d7553c471733..78527b45b32c001feefb4ca226f6bbbfe939edd2 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -74,7 +74,7 @@ PHP_FUNCTION(mysqli_connect)
                RETURN_FALSE;
        }
 
-       if (mysql_real_connect(mysql->mysql,hostname,username,passwd,dbname,port,socket,0) == NULL) {
+       if (mysql_real_connect(mysql->mysql,hostname,username,passwd,dbname,port,socket,CLIENT_MULTI_RESULTS) == NULL) {
                /* Save error messages */
 
                MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);