Fix a debug assertion caused by a missing DBUG_RETURN macro.

sql/sql_acl.cc: Must use DBUG_RETURN in a function instrumented with DBUG_ENTER.

Fix a debug assertion caused by a missing DBUG_RETURN macro.
sql/sql_acl.cc: Must use DBUG_RETURN in a function instrumented with DBUG_ENTER.
c4545852 · Davi Arnaut · 36ab2574 · c4545852
Commit c4545852 authored Nov 17, 2010 by Davi Arnaut
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

sql/sql_acl.cc sql/sql_acl.cc +3 -3

No files found.
--- 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 */