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

Fix a debug assertion caused by a missing DBUG_RETURN macro.

Browse Source 
sql/sql_acl.cc:
  Must use DBUG_RETURN in a function instrumented with DBUG_ENTER.
This commit is contained in:
Davi Arnaut 2010-11-17 19:02:48 -02:00
parent 36ab257491
commit c45458524c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_acl.cc
View File

@ -9234,8 +9234,8 @@ acl_authenticate(THD *thd, uint connect_errors, uint com_change_user_pkt_len)
2. client sends the encrypted password back to the server 2. client sends the encrypted password back to the server
3. the server checks the password. 3. the server checks the password.
*/ */
static int native_password_authenticate(MYSQL_PLUGIN_VIO *vio, static int native_password_authenticate(MYSQL_PLUGIN_VIO *vio,
MYSQL_SERVER_AUTH_INFO *info) MYSQL_SERVER_AUTH_INFO *info)
{ {
uchar *pkt; uchar *pkt;
int pkt_len; int pkt_len;
@ -9249,7 +9249,7 @@ static int native_password_authenticate(MYSQL_PLUGIN_VIO *vio,
/* send it to the client */ /* send it to the client */
if (mpvio->write_packet(mpvio, (uchar*) mpvio->scramble, SCRAMBLE_LENGTH + 1)) if (mpvio->write_packet(mpvio, (uchar*) mpvio->scramble, SCRAMBLE_LENGTH + 1))
return CR_ERROR; DBUG_RETURN(CR_ERROR);
/* reply and authenticate */ /* reply and authenticate */