From 94c79b37a0b9609841577c3620e4261141be342b Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Wed, 17 Nov 2010 19:02:48 -0200 Subject: [PATCH] Fix a debug assertion caused by a missing DBUG_RETURN macro. --- sql/sql_acl.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 8ef17cec6a8..abd8f50cb9f 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -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 3. the server checks the password. */ -static int native_password_authenticate(MYSQL_PLUGIN_VIO *vio, - MYSQL_SERVER_AUTH_INFO *info) +static int native_password_authenticate(MYSQL_PLUGIN_VIO *vio, + MYSQL_SERVER_AUTH_INFO *info) { uchar *pkt; int pkt_len; @@ -9249,7 +9249,7 @@ static int native_password_authenticate(MYSQL_PLUGIN_VIO *vio, /* send it to the client */ if (mpvio->write_packet(mpvio, (uchar*) mpvio->scramble, SCRAMBLE_LENGTH + 1)) - return CR_ERROR; + DBUG_RETURN(CR_ERROR); /* reply and authenticate */