bzr commit into mysql-5.5-bugteam branch (Georgi.Kodinov:3114) Bug#57744

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B57744-5.5-bugteam/ based on revid:dmitry.shulga@stripped

 3114 Georgi Kodinov	2010-11-10
      Bug #57744: sql-common/client.c: Missing DBUG_RETURN macro
      
      - added missing DBUG_RETURN
      - fixed whitespace according to coding style.

    modified:
      sql-common/client.c
=== modified file 'sql-common/client.c'
--- a/sql-common/client.c	2010-10-12 10:07:13 +0000
+++ b/sql-common/client.c	2010-11-10 15:21:51 +0000
@@ -4197,7 +4197,7 @@ static int native_password_auth_client(M
   int pkt_len;
   uchar *pkt;
 
-  DBUG_ENTER ("native_password_auth_client");
+  DBUG_ENTER("native_password_auth_client");
 
 
   if (((MCPVIO_EXT *)vio)->mysql_change_user)
@@ -4213,10 +4213,10 @@ static int native_password_auth_client(M
   {
     /* read the scramble */
     if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
-      return CR_ERROR;
+      DBUG_RETURN(CR_ERROR);
 
     if (pkt_len != SCRAMBLE_LENGTH + 1)
-      DBUG_RETURN (CR_SERVER_HANDSHAKE_ERR);
+      DBUG_RETURN(CR_SERVER_HANDSHAKE_ERR);
 
     /* save it in MYSQL */
     memcpy(mysql->scramble, pkt, SCRAMBLE_LENGTH);
@@ -4226,19 +4226,19 @@ static int native_password_auth_client(M
   if (mysql->passwd[0])
   {
     char scrambled[SCRAMBLE_LENGTH + 1];
-    DBUG_PRINT ("info", ("sending scramble"));
+    DBUG_PRINT("info", ("sending scramble"));
     scramble(scrambled, (char*)pkt, mysql->passwd);
     if (vio->write_packet(vio, (uchar*)scrambled, SCRAMBLE_LENGTH))
-      DBUG_RETURN (CR_ERROR);
+      DBUG_RETURN(CR_ERROR);
   }
   else
   {
-    DBUG_PRINT ("info", ("no password"));
+    DBUG_PRINT("info", ("no password"));
     if (vio->write_packet(vio, 0, 0)) /* no password */
-      DBUG_RETURN (CR_ERROR);
+      DBUG_RETURN(CR_ERROR);
   }
 
-  DBUG_RETURN (CR_OK);
+  DBUG_RETURN(CR_OK);
 }
 
 /**
@@ -4250,7 +4250,7 @@ static int old_password_auth_client(MYSQ
   uchar *pkt;
   int pkt_len;
 
-  DBUG_ENTER ("old_password_auth_client");
+  DBUG_ENTER("old_password_auth_client");
 
   if (((MCPVIO_EXT *)vio)->mysql_change_user)
   {
@@ -4265,11 +4265,11 @@ static int old_password_auth_client(MYSQ
   {
     /* read the scramble */
     if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
-      return CR_ERROR;
+      DBUG_RETURN(CR_ERROR);
 
     if (pkt_len != SCRAMBLE_LENGTH_323 + 1 &&
         pkt_len != SCRAMBLE_LENGTH + 1)
-        DBUG_RETURN (CR_SERVER_HANDSHAKE_ERR);
+        DBUG_RETURN(CR_SERVER_HANDSHAKE_ERR);
 
     /* save it in MYSQL */
     memcpy(mysql->scramble, pkt, pkt_len);
@@ -4281,11 +4281,11 @@ static int old_password_auth_client(MYSQ
     char scrambled[SCRAMBLE_LENGTH_323 + 1];
     scramble_323(scrambled, (char*)pkt, mysql->passwd);
     if (vio->write_packet(vio, (uchar*)scrambled, SCRAMBLE_LENGTH_323 + 1))
-      DBUG_RETURN (CR_ERROR);
+      DBUG_RETURN(CR_ERROR);
   }
   else
     if (vio->write_packet(vio, 0, 0)) /* no password */
-      DBUG_RETURN (CR_ERROR);
+      DBUG_RETURN(CR_ERROR);
 
-  DBUG_RETURN (CR_OK);
+  DBUG_RETURN(CR_OK);
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]