List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:November 17 2010 9:02pm
Subject:bzr commit into mysql-5.5-bugteam branch (davi:3129)
View as plain text  
# At a local mysql-5.5-bugteam repository of davi

 3129 Davi Arnaut	2010-11-17
      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.

    modified:
      sql/sql_acl.cc
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2010-11-02 15:45:26 +0000
+++ b/sql/sql_acl.cc	2010-11-17 21:02:48 +0000
@@ -9234,8 +9234,8 @@ acl_authenticate(THD *thd, uint connect_
   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(
 
   /* 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 */
 


Attachment: [text/bzr-bundle] bzr/davi.arnaut@oracle.com-20101117210248-13rzegciz92x9ir5.bundle
Thread
bzr commit into mysql-5.5-bugteam branch (davi:3129) Davi Arnaut17 Nov