From d8dc47d58f5a83b45d08cc2a91286a54bcb719e7 Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Thu, 15 Oct 2009 20:46:08 +0000 Subject: Making mysqlnd emit no warnings when fetching pooled persistent connections that have timed out or are unusable for any other reason - bug #49761 --- ext/mysqlnd/mysqlnd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ext/mysqlnd/mysqlnd.c') diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 815247d96f..ce2a37bb47 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1825,7 +1825,8 @@ static enum_func_status MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn, const char *user, const char *passwd, - const char *db TSRMLS_DC) + const char *db, + zend_bool silent TSRMLS_DC) { /* User could be max 16 * 3 (utf8), pass is 20 usually, db is up to 64*3 @@ -1839,8 +1840,8 @@ MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn, char *p = buffer; DBG_ENTER("mysqlnd_conn::change_user"); - DBG_INF_FMT("conn=%llu user=%s passwd=%s db=%s", - conn->thread_id, user?user:"", passwd?"***":"null", db?db:""); + DBG_INF_FMT("conn=%llu user=%s passwd=%s db=%s silent=%d", + conn->thread_id, user?user:"", passwd?"***":"null", db?db:"", (silent == TRUE)?1:0 ); if (!user) { user = ""; @@ -1877,7 +1878,7 @@ MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn, if (PASS != mysqlnd_simple_command(conn, COM_CHANGE_USER, buffer, p - buffer, PROT_LAST /* we will handle the OK packet*/, - FALSE, TRUE TSRMLS_CC)) { + silent, TRUE TSRMLS_CC)) { DBG_RETURN(FAIL); } -- cgit v1.2.1