diff options
| author | Ulf Wendel <uw@php.net> | 2009-10-15 20:46:08 +0000 |
|---|---|---|
| committer | Ulf Wendel <uw@php.net> | 2009-10-15 20:46:08 +0000 |
| commit | d8dc47d58f5a83b45d08cc2a91286a54bcb719e7 (patch) | |
| tree | a9ff489a4e96c798a89b50f4cc51f50a3d7f63bb /ext/mysqli | |
| parent | ab4670ee53b8ef48e0a7f012f3bc26b2297df6c2 (diff) | |
| download | php-git-d8dc47d58f5a83b45d08cc2a91286a54bcb719e7.tar.gz | |
Making mysqlnd emit no warnings when fetching pooled persistent connections that have timed out or are unusable for any other reason - bug #49761
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli_libmysql.h | 2 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_mysqlnd.h | 1 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_libmysql.h b/ext/mysqli/mysqli_libmysql.h index be82c4b982..592435a353 100644 --- a/ext/mysqli/mysqli_libmysql.h +++ b/ext/mysqli/mysqli_libmysql.h @@ -34,3 +34,5 @@ #define mysqli_close(c, is_forced) mysql_close((c)) #define mysqli_stmt_close(c, implicit) mysql_stmt_close((c)) #define mysqli_free_result(r, is_forced) mysql_free_result((r)) +#define mysqli_change_user_silent(c, u, p, d) mysql_change_user((c), (u), (p), (d)) + diff --git a/ext/mysqli/mysqli_mysqlnd.h b/ext/mysqli/mysqli_mysqlnd.h index 574d956737..b815dec632 100644 --- a/ext/mysqli/mysqli_mysqlnd.h +++ b/ext/mysqli/mysqli_mysqlnd.h @@ -39,6 +39,7 @@ #define mysqli_free_result(r, implicit) mysqlnd_free_result((r), (implicit)) #define mysqli_bg_store_result(r) mysqlnd_bg_store_result((r)) #define mysqli_async_query(c, q, l) mysqlnd_async_query((c), (q), (l)) +#define mysqli_change_user_silent(c, u, p, d) mysqlnd_change_user((c), (u), (p), (d), TRUE) #define HAVE_STMT_NEXT_RESULT diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 3e0a43e446..0edbb1a4ec 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -166,7 +166,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne /* reset variables */ #ifndef MYSQLI_NO_CHANGE_USER_ON_PCONNECT - if (!mysql_change_user(mysql->mysql, username, passwd, dbname)) { + if (!mysqli_change_user_silent(mysql->mysql, username, passwd, dbname)) { #else if (!mysql_ping(mysql->mysql)) { #endif |