1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #57744: sql-common/client.c: Missing DBUG_RETURN macro

Browse Source 
- added missing DBUG_RETURN
- fixed whitespace according to coding style.
This commit is contained in:
Georgi Kodinov 2010-11-10 17:21:51 +02:00
parent bb356127a3
commit 236affe7f9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql-common/client.c
View File

@ -4213,7 +4213,7 @@ static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
{ {
/* read the scramble */ /* read the scramble */
if ((pkt_len= vio->read_packet(vio, &pkt)) < 0) if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
return CR_ERROR; DBUG_RETURN(CR_ERROR);
if (pkt_len != SCRAMBLE_LENGTH + 1) if (pkt_len != SCRAMBLE_LENGTH + 1)
DBUG_RETURN(CR_SERVER_HANDSHAKE_ERR); DBUG_RETURN(CR_SERVER_HANDSHAKE_ERR);
@ -4265,7 +4265,7 @@ static int old_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
{ {
/* read the scramble */ /* read the scramble */
if ((pkt_len= vio->read_packet(vio, &pkt)) < 0) if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
return CR_ERROR; DBUG_RETURN(CR_ERROR);
if (pkt_len != SCRAMBLE_LENGTH_323 + 1 && if (pkt_len != SCRAMBLE_LENGTH_323 + 1 &&
pkt_len != SCRAMBLE_LENGTH + 1) pkt_len != SCRAMBLE_LENGTH + 1)