]> granicus.if.org Git - php/commitdiff
move state setting to the right place, in mysqlnd_init, no more
authorAndrey Hristov <andrey@php.net>
Tue, 22 Dec 2009 17:31:31 +0000 (17:31 +0000)
committerAndrey Hristov <andrey@php.net>
Tue, 22 Dec 2009 17:31:31 +0000 (17:31 +0000)
in mysqlnd::connect

ext/mysqlnd/mysqlnd.c

index dffff286c1d43ffd990cb95f04c63cdff76d94d3..ab24f0293b94f2cd0ed5c744aef754c4fea7466c 100644 (file)
@@ -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);
 }
 /* }}} */