com php-src: MNDR: - Remove unused variable: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_structs.h

From: Date: Thu, 12 Nov 2015 15:19:16 +0000
Subject: com php-src: MNDR: - Remove unused variable: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_structs.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89819@lists.php.net to get a copy of this message
Commit: 2a44cee4d5ca375011d13cc1a93b1282b9081c3e Author: Andrey Hristov <andrey@php.net> Tue, 13 Oct 2015 12:54:02 +0200 Parents: c33d3b6e5b3a6f91c740b4677528d1848fd8e574 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a44cee4d5ca375011d13cc1a93b1282b9081c3e Log: MNDR: - Remove unused variable Changed paths: M ext/mysqlnd/mysqlnd.c M ext/mysqlnd/mysqlnd_structs.h Diff: diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 27b258c..2d6548b 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 c7920ae..3634270 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;

« previous php.cvs (#89819) next »