From: Andrey Hristov <andrey@php.net>
Date: Tue, 22 Dec 2009 17:31:31 +0000 (+0000)
Subject: move state setting to the right place, in mysqlnd_init, no more
X-Git-Tag: php-5.3.2RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1251edc163443adde753857dea6c814ab3421f2;p=php

move state setting to the right place, in mysqlnd_init, no more
in mysqlnd::connect
---

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index dffff286c1..ab24f0293b 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);
 }
 /* }}} */