From: Kalle Sommer Nielsen <kalle@php.net>
Date: Sun, 12 Dec 2010 18:00:25 +0000 (+0000)
Subject: Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to call libmysql)
X-Git-Tag: php-5.3.6RC1~243
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=071513562d40dc8a08e52cda845b3f4ab435c19e;p=php

Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to call libmysql)

# Based on patch by tre-php-net at crushedhat dot com
---

diff --git a/NEWS b/NEWS
index 9cb8e674bf..feba2c88bf 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@
 - MySQL Improved extension:
   . Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA 
     query). (Kalle)
+  . Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to 
+    call libmysql). (Kalle, tre-php-net at crushedhat dot com)
 
 - PDO Oracle driver:
   . Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 8a570842e1..dd5282229c 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -231,7 +231,10 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 #endif
 
 #if !defined(MYSQLI_USE_MYSQLND)
-	if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname, port, socket, CLIENT_MULTI_RESULTS) == NULL)
+	/* BC for prior to bug fix #53425 */
+	flags |= CLIENT_MULTI_RESULTS;
+
+	if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname, port, socket, flags) == NULL)
 #else
 	if (mysqlnd_connect(mysql->mysql, hostname, username, passwd, passwd_len, dbname, dbname_len,
 						port, socket, flags TSRMLS_CC) == NULL)