diff options
| author | Andrey Hristov <andrey@php.net> | 2009-12-28 11:17:10 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2009-12-28 11:17:10 +0000 |
| commit | d76fa2b46cb189cdc0be0a5c43f33ab4d035e199 (patch) | |
| tree | 4ae68d2847be7115a302187d571d1de103369de9 | |
| parent | 0d5a31809023662755f244aa7e7e8677bbb6c9ea (diff) | |
| download | php-git-d76fa2b46cb189cdc0be0a5c43f33ab4d035e199.tar.gz | |
move network creation to the init hook
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 25 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_structs.h | 1 |
2 files changed, 21 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index e76d9ab05e..fea5f6988b 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2019,8 +2019,11 @@ MYSQLND_METHOD(mysqlnd_conn, get_connection_stats)(const MYSQLND * const conn, MYSQLND_STMT * _mysqlnd_stmt_init(MYSQLND * const conn TSRMLS_DC); +static void MYSQLND_METHOD(mysqlnd_conn, init)(MYSQLND * conn TSRMLS_DC); + MYSQLND_CLASS_METHODS_START(mysqlnd_conn) + MYSQLND_METHOD(mysqlnd_conn, init), MYSQLND_METHOD(mysqlnd_conn, connect), MYSQLND_METHOD(mysqlnd_conn, escape_string), @@ -2086,6 +2089,20 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_conn) MYSQLND_CLASS_METHODS_END; +/* {{{ mysqlnd_conn::init */ +static void +MYSQLND_METHOD(mysqlnd_conn, init)(MYSQLND * conn TSRMLS_DC) +{ + DBG_ENTER("mysqlnd_conn::init"); + conn->net = mysqlnd_net_init(conn->persistent TSRMLS_CC); + + SET_ERROR_AFF_ROWS(conn); + + DBG_VOID_RETURN; +} +/* }}} */ + + /* {{{ mysqlnd_init */ PHPAPI MYSQLND *_mysqlnd_init(zend_bool persistent TSRMLS_DC) { @@ -2095,20 +2112,18 @@ PHPAPI MYSQLND *_mysqlnd_init(zend_bool persistent TSRMLS_DC) DBG_ENTER("mysqlnd_init"); DBG_INF_FMT("persistent=%d", persistent); - SET_ERROR_AFF_ROWS(ret); ret->persistent = persistent; - ret->m = mysqlnd_conn_methods; + CONN_SET_STATE(ret, CONN_ALLOCED); ret->m->get_reference(ret TSRMLS_CC); - ret->net = mysqlnd_net_init(persistent TSRMLS_CC); - - CONN_SET_STATE(ret, CONN_ALLOCED); + ret->m->init(ret TSRMLS_CC); DBG_RETURN(ret); } /* }}} */ + /* {{{ mysqlnd_library_init */ void mysqlnd_library_init(TSRMLS_D) { diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 7a85eecc07..ddfc77de64 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -245,6 +245,7 @@ struct st_mysqlnd_net_methods struct st_mysqlnd_conn_methods { + void (*init)(MYSQLND * conn TSRMLS_DC); enum_func_status (*connect)(MYSQLND *conn, const char *host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket, unsigned int mysql_flags TSRMLS_DC); ulong (*escape_string)(const MYSQLND * const conn, char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC); enum_func_status (*set_charset)(MYSQLND * const conn, const char * const charset TSRMLS_DC); |