andrey Fri, 28 Jan 2011 17:33:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307827
Log:
clear error before doing anything, because we can get
trapped by previous error :
php -r '$link = mysqli_init();
var_dump($link->real_connect("127.0.0.1", "unknown", "unknown"));
var_dump($link->real_connect("127.0.0.1", "known", "password"));'
shows the problem. The second connect did not work, as it should be.
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-28 17:11:32 UTC (rev
307826)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-28 17:33:14 UTC (rev
307827)
@@ -641,6 +641,9 @@
DBG_ENTER("mysqlnd_conn::connect");
+ SET_EMPTY_ERROR(conn->error_info);
+ SET_ERROR_AFF_ROWS(conn);
+
DBG_INF_FMT("host=%s user=%s db=%s port=%u flags=%u persistent=%u
state=%u",
host?host:"", user?user:"", db?db:"", port,
mysql_flags,
conn? conn->persistent:0, conn?
CONN_GET_STATE(conn):-1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
