diff options
| author | Andrey Hristov <andrey@php.net> | 2015-11-10 11:02:33 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | 654d1a7caf068c67560fd49c86cf6f6354322d6f (patch) | |
| tree | 731e7dddb2d0fa79a66ddf194c1e1fdca924460e /ext/mysqlnd/mysqlnd.c | |
| parent | 80d59a3a362052cfa5767f99dcd3954182947c55 (diff) | |
| download | php-git-654d1a7caf068c67560fd49c86cf6f6354322d6f.tar.gz | |
MNDR:
- rename MYSQLND_NET to MYSQLND_PPEC (protocol packet envelope codec).
PPEC does only the encoding and decoding to the protocol frame.
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 8d5140a2ae..9b78c27033 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -342,7 +342,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, dtor)(MYSQLND_CONN_DATA * conn) conn->m->free_options(conn); if (conn->net) { - mysqlnd_net_free(conn->net, conn->stats, conn->error_info); + mysqlnd_ppec_free(conn->net, conn->stats, conn->error_info); conn->net = NULL; } @@ -664,7 +664,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, execute_init_commands)(MYSQLND_CONN_DATA * con static unsigned int MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, unsigned int mysql_flags) { - MYSQLND_NET * net = conn->net; + MYSQLND_PPEC * net = conn->net; MYSQLND_VIO * vio = conn->vio; DBG_ENTER("mysqlnd_conn_data::get_updated_connect_flags"); @@ -784,10 +784,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, zend_bool reconnect = FALSE; zend_bool saved_compression = FALSE; zend_bool local_tx_started = FALSE; - MYSQLND_NET * net = conn->net; + MYSQLND_PPEC * net = conn->net; MYSQLND_STRING transport = { NULL, 0 }; -// char * transport = NULL; -// int transport_len; DBG_ENTER("mysqlnd_conn_data::connect"); DBG_INF_FMT("conn=%p", conn); |