From 2a44cee4d5ca375011d13cc1a93b1282b9081c3e Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 13 Oct 2015 12:54:02 +0200 Subject: [PATCH] MNDR: - Remove unused variable --- ext/mysqlnd/mysqlnd.c | 2 -- ext/mysqlnd/mysqlnd_structs.h | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 27b258cf5d..2d6548bf1f 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -844,7 +844,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect_handshake)(MYSQLND_CONN_DATA * conn, goto err; } - conn->client_flag = mysql_flags; conn->server_capabilities = greet_packet->server_capabilities; if (FAIL == mysqlnd_connect_run_authentication(conn, user, passwd, db, db_len, (size_t) passwd_len, @@ -860,7 +859,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect_handshake)(MYSQLND_CONN_DATA * conn, PACKET_FREE(greet_packet); DBG_RETURN(PASS); err: - conn->client_flag = 0; conn->server_capabilities = 0; PACKET_FREE(greet_packet); DBG_RETURN(FAIL); diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index c7920aeca8..36342706ca 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -930,10 +930,9 @@ struct st_mysqlnd_connection_data unsigned int connect_or_select_db_len; MYSQLND_INFILE infile; unsigned int protocol_version; - zend_ulong max_packet_size; + zend_ulong max_packet_size; unsigned int port; - zend_ulong client_flag; - zend_ulong server_capabilities; + zend_ulong server_capabilities; /* For UPSERT queries */ MYSQLND_UPSERT_STATUS * upsert_status; -- 2.50.1