From: Kalle Sommer Nielsen 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.4.0alpha1~191^2~520 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b016c7ded7b379a1b0239ac45e921ee82f6c0db7;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/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index e27758cedd..03416670f0 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)