List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:November 10 2010 4:11pm
Subject:bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3346 to 3347)
View as plain text  
 3347 Georgi Kodinov	2010-11-10 [merge]
      merge

    modified:
      include/mysql/client_plugin.h
      sql-common/client.c
 3346 Oystein Grovlen	2010-11-10 [merge]
      Merge fix for Bug#57704 into mysql-trunk-bugfixing

    modified:
      mysql-test/r/subselect.result
      mysql-test/t/subselect.test
      sql/sql_union.cc
=== modified file 'include/mysql/client_plugin.h'
--- a/include/mysql/client_plugin.h	2010-10-13 15:11:29 +0000
+++ b/include/mysql/client_plugin.h	2010-11-10 15:55:57 +0000
@@ -79,8 +79,7 @@ struct st_mysql_client_plugin_AUTHENTICA
 /**
   loads a plugin and initializes it
 
-  @param mysql  MYSQL structure. only MYSQL_PLUGIN_DIR option value is used,
-                and last_errno/last_error, for error reporting
+  @param mysql  MYSQL structure.
   @param name   a name of the plugin to load
   @param type   type of plugin that should be loaded, -1 to disable type check
   @param argc   number of arguments to pass to the plugin initialization
@@ -100,8 +99,7 @@ mysql_load_plugin(struct st_mysql *mysql
   This is the same as mysql_load_plugin, but take va_list instead of
   a list of arguments.
 
-  @param mysql  MYSQL structure. only MYSQL_PLUGIN_DIR option value is used,
-                and last_errno/last_error, for error reporting
+  @param mysql  MYSQL structure.
   @param name   a name of the plugin to load
   @param type   type of plugin that should be loaded, -1 to disable type check
   @param argc   number of arguments to pass to the plugin initialization
@@ -118,8 +116,7 @@ mysql_load_plugin_v(struct st_mysql *mys
 /**
   finds an already loaded plugin by name, or loads it, if necessary
 
-  @param mysql  MYSQL structure. only MYSQL_PLUGIN_DIR option value is used,
-                and last_errno/last_error, for error reporting
+  @param mysql  MYSQL structure.
   @param name   a name of the plugin to load
   @param type   type of plugin that should be loaded
 

=== modified file 'sql-common/client.c'
--- a/sql-common/client.c	2010-10-12 10:15:42 +0000
+++ b/sql-common/client.c	2010-11-10 16:10:41 +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);
 }

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3346 to 3347) Georgi Kodinov10 Nov