From e1251edc163443adde753857dea6c814ab3421f2 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 22 Dec 2009 17:31:31 +0000 Subject: [PATCH] move state setting to the right place, in mysqlnd_init, no more in mysqlnd::connect --- ext/mysqlnd/mysqlnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index dffff286c1d43..ab24f0293b94f 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -531,8 +531,6 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND *conn, PACKET_INIT(auth_packet, PROT_AUTH_PACKET, php_mysql_packet_auth *, FALSE); PACKET_INIT_ALLOCA(ok_packet, PROT_OK_PACKET); - CONN_SET_STATE(conn, CONN_ALLOCED); - if (conn->persistent) { conn->scheme = pestrndup(transport, transport_len, 1); mnd_efree(transport); @@ -2104,6 +2102,8 @@ PHPAPI MYSQLND *_mysqlnd_init(zend_bool persistent TSRMLS_DC) ret->net = mysqlnd_net_init(persistent TSRMLS_CC); + CONN_SET_STATE(ret, CONN_ALLOCED); + DBG_RETURN(ret); } /* }}} */