svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c trunk/ext/mysqli/mysqli_nonapi.c

kalle Sun, 12 Dec 2010 18:00:25 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=306278 Log: 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 Bug: http://bugs.php.net/53425 (Assigned) mysqli_real_connect() ignores client flags when built to call libmysql Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c U php/php-src/trunk/ext/mysqli/mysqli_nonapi.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-12-12 18:00:19 UTC (rev 306277) +++ php/php-src/branches/PHP_5_3/NEWS 2010-12-12 18:00:25 UTC (rev 306278) @@ -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 Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c 2010-12-12 18:00:19 UTC (rev 306277) +++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c 2010-12-12 18:00:25 UTC (rev 306278) @@ -231,7 +231,10 @@ #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) Modified: php/php-src/trunk/ext/mysqli/mysqli_nonapi.c =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2010-12-12 18:00:19 UTC (rev 306277) +++ php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2010-12-12 18:00:25 UTC (rev 306278) @@ -231,7 +231,10 @@ #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)