diff options
| author | Marc Alff <marc.alff@oracle.com> | 2010-10-26 11:02:32 +0200 |
|---|---|---|
| committer | Marc Alff <marc.alff@oracle.com> | 2010-10-26 11:02:32 +0200 |
| commit | b431da62147ed8d1ed5433c810a92ed6eadcbf27 (patch) | |
| tree | 2341256cd31b1bec369c51f8c21a867ddc7ac911 /sql-common | |
| parent | d51cd894dac501d808da0c3bc08636f387014eb3 (diff) | |
| parent | dca17350be4815cc20fbfa2dde9dfc586806e081 (diff) | |
| download | mariadb-git-b431da62147ed8d1ed5433c810a92ed6eadcbf27.tar.gz | |
local merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 0a30ef150e1..e8ca74eba37 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2923,7 +2923,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, uint port, const char *unix_socket,ulong client_flag) { char buff[NAME_LEN+USERNAME_LENGTH+100]; - int scramble_data_len, pkt_scramble_len; + int scramble_data_len, pkt_scramble_len= 0; char *end,*host_info= 0, *server_version_end, *pkt_end; char *scramble_data; const char *scramble_plugin; |