diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-12-12 18:00:25 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-12-12 18:00:25 +0000 |
| commit | 071513562d40dc8a08e52cda845b3f4ab435c19e (patch) | |
| tree | 2397c7b5d678219a78cc485cda6f9e786307624f /ext/mysqli/mysqli_nonapi.c | |
| parent | b529d43c0d24e512b23d3c780dbc96668a8fe380 (diff) | |
| download | php-git-071513562d40dc8a08e52cda845b3f4ab435c19e.tar.gz | |
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
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) |