------------------------------------------------------------
revno: 2750
committer: Sergei Golubchik <sergii@pisem.net>
branch nick: maria-5.2-pa
timestamp: Tue 2010-03-02 21:32:24 +0100
message:
  fixes for embedded
modified:
  .bzrignore
  libmysqld/lib_sql.cc
  mysql-test/r/change_user.result
  mysql-test/t/change_user.test
  sql-common/client.c
  sql/sql_acl.cc
diff:
=== modified file '.bzrignore'
--- .bzrignore	2010-02-19 08:18:09 +0000
+++ .bzrignore	2010-03-02 20:32:24 +0000
@@ -1933,3 +1933,4 @@
 client/sql_list.h
 libmysqld/client_plugin.c
 sql/client_plugin.c
+*.dgcov

=== modified file 'libmysqld/lib_sql.cc'
--- libmysqld/lib_sql.cc	2010-02-19 08:18:09 +0000
+++ libmysqld/lib_sql.cc	2010-03-02 20:32:24 +0000
@@ -582,6 +582,7 @@
   THD *thd = (THD *)mysql->thd;
   thd->mysql= mysql;
   mysql->server_version= server_version;
+  mysql->client_flag= client_flag;
   init_alloc_root(&mysql->field_alloc, 8192, 0);
 }
 

=== modified file 'mysql-test/r/change_user.result'
--- mysql-test/r/change_user.result	2010-02-19 08:18:09 +0000
+++ mysql-test/r/change_user.result	2010-03-02 20:32:24 +0000
@@ -1,33 +1,33 @@
 grant select on test.* to test_nopw;
 grant select on test.* to test_oldpw identified by password "09301740536db389";
 grant select on test.* to test_newpw identified by "newpw";
-select user(), current_user(), database();
-user()	current_user()	database()
-root@localhost	root@localhost	test
-select user(), current_user(), database();
-user()	current_user()	database()
-test_nopw@localhost	test_nopw@%	NULL
-select user(), current_user(), database();
-user()	current_user()	database()
-test_oldpw@localhost	test_oldpw@%	NULL
-select user(), current_user(), database();
-user()	current_user()	database()
-test_newpw@localhost	test_newpw@%	NULL
-select user(), current_user(), database();
-user()	current_user()	database()
-root@localhost	root@localhost	NULL
-select user(), current_user(), database();
-user()	current_user()	database()
-test_nopw@localhost	test_nopw@%	test
-select user(), current_user(), database();
-user()	current_user()	database()
-test_oldpw@localhost	test_oldpw@%	test
-select user(), current_user(), database();
-user()	current_user()	database()
-test_newpw@localhost	test_newpw@%	test
-select user(), current_user(), database();
-user()	current_user()	database()
-root@localhost	root@localhost	test
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
+concat('<', user(), '>')	concat('<', current_user(), '>')	database()
+<root@localhost>	<root@localhost>	test
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
+concat('<', user(), '>')	concat('<', current_user(), '>')	database()
+<test_nopw@localhost>	<test_nopw@%>	NULL
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
+concat('<', user(), '>')	concat('<', current_user(), '>')	database()
+<test_oldpw@localhost>	<test_oldpw@%>	NULL
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
+concat('<', user(), '>')	concat('<', current_user(), '>')	database()
+<test_newpw@localhost>	<test_newpw@%>	NULL
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
+concat('<', user(), '>')	concat('<', current_user(), '>')	database()
+<root@localhost>	<root@localhost>	NULL
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
+concat('<', user(), '>')	concat('<', current_user(), '>')	database()
+<test_nopw@localhost>	<test_nopw@%>	test
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
+concat('<', user(), '>')	concat('<', current_user(), '>')	database()
+<test_oldpw@localhost>	<test_oldpw@%>	test
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
+concat('<', user(), '>')	concat('<', current_user(), '>')	database()
+<test_newpw@localhost>	<test_newpw@%>	test
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
+concat('<', user(), '>')	concat('<', current_user(), '>')	database()
+<root@localhost>	<root@localhost>	test
 drop user test_nopw;
 drop user test_oldpw;
 drop user test_newpw;

=== modified file 'mysql-test/t/change_user.test'
--- mysql-test/t/change_user.test	2010-02-19 08:18:09 +0000
+++ mysql-test/t/change_user.test	2010-03-02 20:32:24 +0000
@@ -6,25 +6,39 @@
 grant select on test.* to test_oldpw identified by password "09301740536db389";
 grant select on test.* to test_newpw identified by "newpw";
 
-select user(), current_user(), database();
+#
+# massaging the data for tests to pass in the embedded server,
+# that has authentication completely disabled.
+#
+
+--replace_result <@> <test_nopw@%> @> @localhost>
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 
 change_user test_nopw;
-select user(), current_user(), database();
+--replace_result <@> <test_nopw@%> @> @localhost>
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 change_user test_oldpw, oldpw;
-select user(), current_user(), database();
+--replace_result <@> <test_oldpw@%> @> @localhost>
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 change_user test_newpw, newpw;
-select user(), current_user(), database();
+--replace_result <@> <test_newpw@%> @> @localhost>
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 change_user root;
-select user(), current_user(), database();
+--replace_result <@> <root@localhost> @> @localhost>
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 
 change_user test_nopw,,test;
-select user(), current_user(), database();
+--replace_result <@> <test_nopw@%> @> @localhost>
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 change_user test_oldpw,oldpw,test;
-select user(), current_user(), database();
+--replace_result <@> <test_oldpw@%> @> @localhost>
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 change_user test_newpw,newpw,test;
-select user(), current_user(), database();
+--replace_result <@> <test_newpw@%> @> @localhost>
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 change_user root,,test;
-select user(), current_user(), database();
+--replace_result <@> <root@localhost> @> @localhost>
+select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 
 drop user test_nopw;
 drop user test_oldpw;

=== modified file 'sql-common/client.c'
--- sql-common/client.c	2010-02-23 18:49:25 +0000
+++ sql-common/client.c	2010-03-02 20:32:24 +0000
@@ -1961,7 +1961,7 @@
     else
     {
       DBUG_ASSERT(data_len == SCRAMBLE_LENGTH_323 + 1);
-      DBUG_ASSERT(data[data_len] == 0);
+      DBUG_ASSERT(data[SCRAMBLE_LENGTH_323] == 0);
     }
     memcpy(end, data, data_len);
     end+= data_len;

=== modified file 'sql/sql_acl.cc'
--- sql/sql_acl.cc	2010-02-23 18:49:25 +0000
+++ sql/sql_acl.cc	2010-03-02 20:32:24 +0000
@@ -7110,10 +7110,10 @@
     the packet must contain at least the trailing '\0'.
   */
   if (db >= end)
-    {
-      my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
-      return 1;
-    }
+  {
+    my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
+    return 1;
+  }
 
   uint db_len= strlen(db);
 
@@ -7450,7 +7450,7 @@
   {
     /*
       we cannot allow plugin data packet to start from 255 or 254 -
-      as the client will treat it as an error or "change plugi" packet.
+      as the client will treat it as an error or "change plugin" packet.
       We'll escape these bytes with \1. Consequently, we
       have to escape \1 byte too.
     */
@@ -7690,6 +7690,7 @@
 */
 int acl_authenticate(THD *thd, uint connect_errors, uint com_change_user_pkt_len)
 {
+  DBUG_ENTER("acl_authenticate");
   int res, old_status;
   plugin_ref plugin;
   MPVIO_EXT mpvio;
@@ -7717,7 +7718,7 @@
     mpvio.packets_read++;    // take COM_CHANGE_USER packet into account
 
     if (parse_com_change_user_packet(&mpvio, com_change_user_pkt_len))
-      return 1;
+      DBUG_RETURN(1);
 
     DBUG_ASSERT(mpvio.status == MPVIO_EXT::RESTART ||
                 mpvio.status == MPVIO_EXT::SUCCESS);
@@ -7748,7 +7749,7 @@
   {
     /* Server cannot load required plugin. */
     my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), auth_plugin_name->str);
-    return 1;
+    DBUG_RETURN(1);
   }
 
   mpvio.plugin= plugin;
@@ -7816,7 +7817,7 @@
 
     if (!thd->is_error())
       login_failed_error(thd, thd->password);
-    return 1;
+    DBUG_RETURN(1);
   }
 
   if (initialized) // if not --skip-grant-tables
@@ -7836,7 +7837,7 @@
     if (acl_check_ssl(thd, acl_user))
     {
       login_failed_error(thd, thd->password);
-      return 1;
+      DBUG_RETURN(1);
     }
 
     /* Don't allow the user to connect if he has done too many queries */
@@ -7847,7 +7848,7 @@
           (opt_old_style_user_limits ? sctx->user : sctx->priv_user),
           (opt_old_style_user_limits ? sctx->host_or_ip : sctx->priv_host),
           &acl_user->user_resource))
-      return 1; // The error is set by get_or_create_user_conn()
+      DBUG_RETURN(1); // The error is set by get_or_create_user_conn()
   }
   else
     sctx->skip_grants();
@@ -7859,7 +7860,7 @@
       check_for_max_user_connections(thd, thd->user_connect))
   {
     status_var_increment(denied_connections);
-    return 1; // The error is set in check_for_max_user_connections()
+    DBUG_RETURN(1); // The error is set in check_for_max_user_connections()
   }
 
   DBUG_PRINT("info",
@@ -7881,7 +7882,7 @@
     if (!count_ok)
     {                                         // too many connections
       my_error(ER_CON_COUNT_ERROR, MYF(0));
-      return 1;
+      DBUG_RETURN(1);
     }
   }
 
@@ -7904,7 +7905,7 @@
         status_var_increment(thd->status_var.access_denied_errors);
         thd->user_connect= 0;
       }
-      return 1;
+      DBUG_RETURN(1);
     }
   }
 
@@ -7914,7 +7915,7 @@
     my_ok(thd);
 
   /* Ready to handle queries */
-  return 0;
+  DBUG_RETURN(0);
 }
 
 /**
------------------------------------------------------------
revno: 2751
committer: Sergei Golubchik <sergii@pisem.net>
branch nick: maria-5.2-pa
timestamp: Thu 2010-03-11 13:33:22 +0100
message:
  comments
modified:
  client/mysql.cc
  plugin/auth/auth_socket.c
  plugin/auth/dialog.c
  sql-common/client.c
  sql-common/client_plugin.c
  sql/sql_acl.cc
diff:
=== modified file 'client/mysql.cc'
--- client/mysql.cc	2010-02-19 08:18:09 +0000
+++ client/mysql.cc	2010-03-11 12:33:22 +0000
@@ -4235,6 +4235,7 @@
   return valid_arg ? start : NullS;
 }
 
+
 /**
   An example of mysql_authentication_dialog_ask callback.
 
@@ -4257,6 +4258,7 @@
                         In all other cases it is assumed to be an allocated
                         string, and the "dialog" plugin will free() it.
 */
+
 extern "C" char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
                                                  const char *prompt,
                                                  char *buf, int buf_len)

=== modified file 'plugin/auth/auth_socket.c'
--- plugin/auth/auth_socket.c	2010-02-19 08:18:09 +0000
+++ plugin/auth/auth_socket.c	2010-03-11 12:33:22 +0000
@@ -29,6 +29,15 @@
 #include <pwd.h>
 #include <string.h>
 
+/**
+  perform the unix socket based authentication
+
+  This authentication callback performs a unix socket based authentication -
+  it gets the uid of the client process and considers the user authenticated
+  if it uses username of this uid. That is - if the user is already
+  authenticated to the OS (if she is logged in) - she can use MySQL as herself
+*/
+
 static int socket_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
 {
   unsigned char *pkt;

=== modified file 'plugin/auth/dialog.c'
--- plugin/auth/dialog.c	2010-02-23 12:02:00 +0000
+++ plugin/auth/dialog.c	2010-03-11 12:33:22 +0000
@@ -54,8 +54,9 @@
 /********************* SERVER SIDE ****************************************/
 
 /**
-  dialog demo with two questions, one password and one, the last, ordinary.
+  dialog demo with two questions, one password and one ordinary.
 */
+
 static int two_questions(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
 {
   unsigned char *pkt;
@@ -94,7 +95,11 @@
   two_questions
 };
 
-/* dialog demo where the number of questions is not known in advance */
+
+/**
+  dialog demo where the number of questions is not known in advance
+*/
+
 static int three_attempts(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
 {
   unsigned char *pkt;
@@ -191,6 +196,7 @@
   return buf;
 }
 
+
 /**
   The main function of the dialog plugin.
 
@@ -207,6 +213,7 @@
       and whether the input is a password (not echoed).
    3. the prompt is expected to be sent zero-terminated
 */
+
 static int perform_dialog(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
 {
   unsigned char *pkt, cmd= 0;
@@ -268,12 +275,14 @@
   return CR_OK;
 }
 
+
 /**
   initialization function of the dialog plugin
 
   Pick up the client's authentication_dialog_ask() function, if exists,
   or fall back to the default implementation.
 */
+
 static int init_dialog()
 {
   void *sym= dlsym(RTLD_DEFAULT, "mysql_authentication_dialog_ask");

=== modified file 'sql-common/client.c'
--- sql-common/client.c	2010-03-02 20:32:24 +0000
+++ sql-common/client.c	2010-03-11 12:33:22 +0000
@@ -1933,6 +1933,7 @@
   @retval 0 ok
   @retval 1 error
 */
+
 static int send_change_user_packet(MCPVIO_EXT *mpvio,
                                    const uchar *data, int data_len)
 {
@@ -1985,6 +1986,7 @@
   return res;
 }
 
+
 /**
   sends a client authentication packet (second packet in the 3-way handshake)
 
@@ -2015,6 +2017,7 @@
   @retval 0 ok
   @retval 1 error
 */
+
 static int send_client_reply_packet(MCPVIO_EXT *mpvio,
                                     const uchar *data, int data_len)
 {
@@ -2183,13 +2186,16 @@
   return 1;
 }
 
+
 static int client_mpvio_write_packet(struct st_plugin_vio*, const uchar*, int);
+
 /**
   vio->read_packet() callback method for client authentication plugins
 
   This function is called by a client authentication plugin, when it wants
   to read data from the server.
 */
+
 static int client_mpvio_read_packet(struct st_plugin_vio *mpv, uchar **buf)
 {
   MCPVIO_EXT *mpvio= (MCPVIO_EXT*)mpv;
@@ -2240,6 +2246,7 @@
   return pkt_len;
 }
 
+
 /**
   vio->write_packet() callback method for client authentication plugins
 
@@ -2249,6 +2256,7 @@
   It transparently wraps the data into a change user or authentication
   handshake packet, if neccessary.
 */
+
 static int client_mpvio_write_packet(struct st_plugin_vio *mpv,
                                      const uchar *pkt, int pkt_len)
 {
@@ -2279,10 +2287,12 @@
   return res;
 }
 
+
 /**
   fills MYSQL_PLUGIN_VIO_INFO structure with the information about the
   connection
 */
+
 void mpvio_info(Vio *vio, MYSQL_PLUGIN_VIO_INFO *info)
 {
   bzero(info, sizeof(*info));
@@ -2320,6 +2330,7 @@
   }
 }
 
+
 static void client_mpvio_info(MYSQL_PLUGIN_VIO *vio,
                               MYSQL_PLUGIN_VIO_INFO *info)
 {
@@ -2327,6 +2338,7 @@
   mpvio_info(mpvio->mysql->net.vio, info);
 }
 
+
 /**
   Client side of the plugin driver authentication.
 
@@ -2343,6 +2355,7 @@
   @retval 0 ok
   @retval 1 error
 */
+
 int run_plugin_auth(MYSQL *mysql, char *data, uint data_len,
                     char *data_plugin, const char *db)
 {
@@ -2475,6 +2488,7 @@
   return mysql->net.read_pos[0] != 0;
 }
 
+
 MYSQL * STDCALL 
 CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
 		       const char *passwd, const char *db,
@@ -3765,10 +3779,12 @@
   return mysql->net.last_errno;
 }
 
+
 /**
   client authentication plugin that does native MySQL authentication
   using a 20-byte (4.1+) scramble
 */
+
 static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
 {
   int pkt_len;
@@ -3811,10 +3827,12 @@
   return CR_OK;
 }
 
+
 /**
   client authentication plugin that does old MySQL authentication
   using an 8-byte (4.0-) scramble
 */
+
 static int old_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
 {
   uchar *pkt;

=== modified file 'sql-common/client_plugin.c'
--- sql-common/client_plugin.c	2010-02-19 08:18:09 +0000
+++ sql-common/client_plugin.c	2010-03-11 12:33:22 +0000
@@ -82,6 +82,7 @@
   return 1;
 }
 
+
 /**
   finds a plugin in the list
 
@@ -92,8 +93,8 @@
   
   @retval a pointer to a found plugin or 0
 */
-static struct st_mysql_client_plugin *
-find_plugin(const char *name, int type)
+
+static struct st_mysql_client_plugin *find_plugin(const char *name, int type)
 {
   struct st_client_plugin_int *p;
 
@@ -110,6 +111,7 @@
   return NULL;
 }
 
+
 /**
   verifies the plugin and adds it to the list
 
@@ -122,6 +124,7 @@
 
   @retval a pointer to an installed plugin or 0
 */
+
 static struct st_mysql_client_plugin *
 add_plugin(MYSQL *mysql, struct st_mysql_client_plugin *plugin, void *dlhandle,
            int argc, va_list args)
@@ -184,6 +187,7 @@
   return NULL;
 }
 
+
 /**
   Loads plugins which are specified in the environment variable
   LIBMYSQL_PLUGINS.
@@ -199,6 +203,7 @@
   or
   LIBMYSQL_PLUGINS="plugin1=int:param1,str:param2;plugin2;..."
 */
+
 static void load_env_plugins(MYSQL *mysql)
 {
   char *plugs, *free_env, *s= getenv("LIBMYSQL_PLUGINS");
@@ -231,6 +236,7 @@
   @retval 0    successful
   @retval != 0 error occured
 */
+
 int mysql_client_plugin_init()
 {
   MYSQL mysql;
@@ -260,11 +266,13 @@
   return 0;
 }
 
+
 /**
   Deinitializes the client plugin layer.
 
   Unloades all client plugins and frees any associated resources.
 */
+
 void mysql_client_plugin_deinit()
 {
   int i;
@@ -315,6 +323,7 @@
   return plugin;
 }
 
+
 /* see <mysql/client_plugin.h> for a full description */
 struct st_mysql_client_plugin *
 mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
@@ -390,6 +399,7 @@
   return NULL;
 }
 
+
 /* see <mysql/client_plugin.h> for a full description */
 struct st_mysql_client_plugin *
 mysql_load_plugin(MYSQL *mysql, const char *name, int type, int argc, ...)
@@ -402,6 +412,7 @@
   return p;
 }
 
+
 /* see <mysql/client_plugin.h> for a full description */
 struct st_mysql_client_plugin *
 mysql_client_find_plugin(MYSQL *mysql, const char *name, int type)

=== modified file 'sql/sql_acl.cc'
--- sql/sql_acl.cc	2010-03-02 20:32:24 +0000
+++ sql/sql_acl.cc	2010-03-11 12:33:22 +0000
@@ -6793,9 +6793,11 @@
   enum { SUCCESS, FAILURE, RESTART } status;
 };
 
+
 /**
   a helper function to report an access denied error in all the proper places
 */
+
 static void login_failed_error(THD *thd, bool passwd_used)
 {
   my_error(ER_ACCESS_DENIED_ERROR, MYF(0),
@@ -6821,6 +6823,7 @@
   }
 }
 
+
 /**
   sends a server handshake initialization packet, the very first packet
   after the connection was established
@@ -6846,6 +6849,7 @@
   @retval 0 ok
   @retval 1 error
 */
+
 static bool send_server_handshake_packet(MPVIO_EXT *mpvio,
                                          const char *data, uint data_len)
 {
@@ -6939,6 +6943,7 @@
   return res;
 }
 
+
 static uchar switch_plugin_request_buf[]= { 254 };
 
 /**
@@ -6962,6 +6967,7 @@
   @retval 0 ok
   @retval 1 error
 */
+
 static bool send_plugin_request_packet(MPVIO_EXT *mpvio,
                                        const uchar *data, uint data_len)
 {
@@ -7013,6 +7019,7 @@
                            (uchar*)data, data_len);
 }
 
+
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
 /**
    Finds acl entry in user database for authentication purposes.
@@ -7026,6 +7033,7 @@
    @retval 0    found
    @retval 1    not found
 */
+
 static bool find_mpvio_user(MPVIO_EXT *mpvio, Security_context *sctx)
 {
   pthread_mutex_lock(&acl_cache->lock);
@@ -7068,6 +7076,7 @@
 }
 #endif
 
+
 /* the packet format is described in send_change_user_packet() */
 static bool parse_com_change_user_packet(MPVIO_EXT *mpvio, uint packet_length)
 {
@@ -7201,6 +7210,7 @@
   return 0;
 }
 
+
 /* the packet format is described in send_client_reply_packet() */
 static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio,
                                            uchar **buff, ulong pkt_len)
@@ -7424,6 +7434,7 @@
 #endif
 }
 
+
 /**
   vio->write_packet() callback method for server authentication plugins
 
@@ -7434,6 +7445,7 @@
   and handles plugin negotiation with the client. If necessary,
   it escapes the plugin data, if it starts with a mysql protocol packet byte.
 */
+
 static int server_mpvio_write_packet(MYSQL_PLUGIN_VIO *param,
                                    const uchar *packet, int packet_len)
 {
@@ -7466,6 +7478,7 @@
   return res;
 }
 
+
 /**
   vio->read_packet() callback method for server authentication plugins
 
@@ -7476,6 +7489,7 @@
   a client authentication handshake packet, and handles plugin negotiation
   with the client, if necessary.
 */
+
 static int server_mpvio_read_packet(MYSQL_PLUGIN_VIO *param, uchar **buf)
 {
   MPVIO_EXT *mpvio= (MPVIO_EXT*)param;
@@ -7558,10 +7572,12 @@
   return -1;
 }
 
+
 /**
   fills MYSQL_PLUGIN_VIO_INFO structure with the information about the
   connection
 */
+
 static void server_mpvio_info(MYSQL_PLUGIN_VIO *vio,
                               MYSQL_PLUGIN_VIO_INFO *info)
 {
@@ -7569,6 +7585,7 @@
   mpvio_info(mpvio->thd->net.vio, info);
 }
 
+
 static int acl_check_ssl(THD *thd, ACL_USER *acl_user)
 {
 #if defined(HAVE_OPENSSL)
@@ -7674,6 +7691,7 @@
   return 1;
 }
 
+
 /**
   Perform the handshake, authorize the client and update thd sctx variables.
 
@@ -7688,6 +7706,7 @@
   @retval 0  success, thd is updated.
   @retval 1  error
 */
+
 int acl_authenticate(THD *thd, uint connect_errors, uint com_change_user_pkt_len)
 {
   DBUG_ENTER("acl_authenticate");
@@ -7918,6 +7937,7 @@
   DBUG_RETURN(0);
 }
 
+
 /**
   MySQL Server Password Authentication Plugin
 
@@ -7926,6 +7946,7 @@
   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)
 {
@@ -8009,6 +8030,7 @@
   return CR_ERROR;
 }
 
+
 static int old_password_authenticate(MYSQL_PLUGIN_VIO *vio, 
                                            MYSQL_SERVER_AUTH_INFO *info)
 {
------------------------------------------------------------
revno: 2753
committer: Sergei Golubchik <sergii@pisem.net>
branch nick: maria-5.2-pa
timestamp: Mon 2010-03-15 11:57:42 +0100
message:
  add new API files to the abi_check rule
added:
  include/mysql/client_plugin.h.pp
  include/mysql/plugin_auth.h.pp
modified:
  Makefile.am
diff:
=== modified file 'Makefile.am'
--- Makefile.am	2010-02-19 08:06:33 +0000
+++ Makefile.am	2010-03-15 10:57:42 +0000
@@ -272,11 +272,13 @@
 #
 
 API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
-                           $(top_srcdir)/include/mysql.h
+                          $(top_srcdir)/include/mysql.h \
+			  $(top_srcdir)/include/mysql/client_plugin.h \
+			  $(top_srcdir)/include/mysql/plugin_auth.h
 
-TEST_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
-                            $(top_srcdir)/sql/mysql_priv.h \
-                            $(top_srcdir)/include/mysql.h
+TEST_PREPROCESSOR_HEADER = $(API_PREPROCESSOR_HEADER) \
+                           $(top_srcdir)/sql/mysql_priv.h
+                            
 
 #
 # Rules for checking that the abi/api has not changed.

=== added file 'include/mysql/client_plugin.h.pp'
--- include/mysql/client_plugin.h.pp	1970-01-01 00:00:00 +0000
+++ include/mysql/client_plugin.h.pp	2010-03-15 10:57:42 +0000
@@ -0,0 +1,41 @@
+#include <stdarg.h>
+#include <stdlib.h>
+struct st_mysql_client_plugin
+{
+  int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; int (*init)(char *, size_t, int, va_list); int (*deinit)();
+};
+struct st_mysql;
+#include <mysql/plugin_auth_common.h>
+typedef struct st_plugin_vio_info
+{
+  enum { MYSQL_VIO_INVALID, MYSQL_VIO_TCP, MYSQL_VIO_SOCKET,
+         MYSQL_VIO_PIPE, MYSQL_VIO_MEMORY } protocol;
+  int socket;
+} MYSQL_PLUGIN_VIO_INFO;
+typedef struct st_plugin_vio
+{
+  int (*read_packet)(struct st_plugin_vio *vio,
+                     unsigned char **buf);
+  int (*write_packet)(struct st_plugin_vio *vio,
+                      const unsigned char *packet,
+                      int packet_len);
+  void (*info)(struct st_plugin_vio *vio, struct st_plugin_vio_info *info);
+} MYSQL_PLUGIN_VIO;
+struct st_mysql_client_plugin_AUTHENTICATION
+{
+  int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; int (*init)(char *, size_t, int, va_list); int (*deinit)();
+  int (*authenticate_user)(MYSQL_PLUGIN_VIO *vio, struct st_mysql *mysql);
+};
+typedef char *(*mysql_authentication_dialog_ask_t)(struct st_mysql *mysql,
+                      int type, const char *prompt, char *buf, int buf_len);
+struct st_mysql_client_plugin *
+mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
+                  int argc, ...);
+struct st_mysql_client_plugin *
+mysql_load_plugin_v(struct st_mysql *mysql, const char *name, int type,
+                    int argc, va_list args);
+struct st_mysql_client_plugin *
+mysql_client_find_plugin(struct st_mysql *mysql, const char *name, int type);
+struct st_mysql_client_plugin *
+mysql_client_register_plugin(struct st_mysql *mysql,
+                             struct st_mysql_client_plugin *plugin);

=== added file 'include/mysql/plugin_auth.h.pp'
--- include/mysql/plugin_auth.h.pp	1970-01-01 00:00:00 +0000
+++ include/mysql/plugin_auth.h.pp	2010-03-15 10:57:42 +0000
@@ -0,0 +1,193 @@
+#include <mysql/plugin.h>
+#include <mysql/services.h>
+#include <mysql/service_my_snprintf.h>
+#include <stdarg.h>
+#include <stdlib.h>
+extern struct my_snprintf_service_st {
+  size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
+  size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
+} *my_snprintf_service;
+size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
+size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
+#include <mysql/service_thd_alloc.h>
+#include <stdlib.h>
+struct st_mysql_lex_string
+{
+  char *str;
+  size_t length;
+};
+typedef struct st_mysql_lex_string MYSQL_LEX_STRING;
+extern struct thd_alloc_service_st {
+  void *(*thd_alloc_func)(void*, unsigned int);
+  void *(*thd_calloc_func)(void*, unsigned int);
+  char *(*thd_strdup_func)(void*, const char *);
+  char *(*thd_strmake_func)(void*, const char *, unsigned int);
+  void *(*thd_memdup_func)(void*, const void*, unsigned int);
+  MYSQL_LEX_STRING *(*thd_make_lex_string_func)(void*, MYSQL_LEX_STRING *,
+                                        const char *, unsigned int, int);
+} *thd_alloc_service;
+void *thd_alloc(void* thd, unsigned int size);
+void *thd_calloc(void* thd, unsigned int size);
+char *thd_strdup(void* thd, const char *str);
+char *thd_strmake(void* thd, const char *str, unsigned int size);
+void *thd_memdup(void* thd, const void* str, unsigned int size);
+MYSQL_LEX_STRING *thd_make_lex_string(void* thd, MYSQL_LEX_STRING *lex_str,
+                                      const char *str, unsigned int size,
+                                      int allocate_lex_string);
+struct st_mysql_xid {
+  long formatID;
+  long gtrid_length;
+  long bqual_length;
+  char data[128];
+};
+typedef struct st_mysql_xid MYSQL_XID;
+enum enum_mysql_show_type
+{
+  SHOW_UNDEF, SHOW_BOOL, SHOW_INT, SHOW_LONG,
+  SHOW_LONGLONG, SHOW_CHAR, SHOW_CHAR_PTR,
+  SHOW_ARRAY, SHOW_FUNC, SHOW_DOUBLE,
+  SHOW_always_last
+};
+struct st_mysql_show_var {
+  const char *name;
+  char *value;
+  enum enum_mysql_show_type type;
+};
+typedef int (*mysql_show_var_func)(void*, struct st_mysql_show_var*, char *);
+struct st_mysql_sys_var;
+struct st_mysql_value;
+typedef int (*mysql_var_check_func)(void* thd,
+                                    struct st_mysql_sys_var *var,
+                                    void *save, struct st_mysql_value *value);
+typedef void (*mysql_var_update_func)(void* thd,
+                                      struct st_mysql_sys_var *var,
+                                      void *var_ptr, const void *save);
+struct st_mysql_plugin
+{
+  int type;
+  void *info;
+  const char *name;
+  const char *author;
+  const char *descr;
+  int license;
+  int (*init)(void *);
+  int (*deinit)(void *);
+  unsigned int version;
+  struct st_mysql_show_var *status_vars;
+  struct st_mysql_sys_var **system_vars;
+  void * __reserved1;
+};
+enum enum_ftparser_mode
+{
+  MYSQL_FTPARSER_SIMPLE_MODE= 0,
+  MYSQL_FTPARSER_WITH_STOPWORDS= 1,
+  MYSQL_FTPARSER_FULL_BOOLEAN_INFO= 2
+};
+enum enum_ft_token_type
+{
+  FT_TOKEN_EOF= 0,
+  FT_TOKEN_WORD= 1,
+  FT_TOKEN_LEFT_PAREN= 2,
+  FT_TOKEN_RIGHT_PAREN= 3,
+  FT_TOKEN_STOPWORD= 4
+};
+typedef struct st_mysql_ftparser_boolean_info
+{
+  enum enum_ft_token_type type;
+  int yesno;
+  int weight_adjust;
+  char wasign;
+  char trunc;
+  char prev;
+  char *quot;
+} MYSQL_FTPARSER_BOOLEAN_INFO;
+typedef int mysql_ft_size_t;
+typedef struct st_mysql_ftparser_param
+{
+  int (*mysql_parse)(struct st_mysql_ftparser_param *,
+                     const unsigned char *doc, mysql_ft_size_t doc_len);
+  int (*mysql_add_word)(struct st_mysql_ftparser_param *,
+                        const unsigned char *word, mysql_ft_size_t word_len,
+                        MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info);
+  void *ftparser_state;
+  void *mysql_ftparam;
+  const struct charset_info_st *cs;
+  const unsigned char *doc;
+  mysql_ft_size_t length;
+  unsigned int flags;
+  enum enum_ftparser_mode mode;
+} MYSQL_FTPARSER_PARAM;
+struct st_mysql_ftparser
+{
+  int interface_version;
+  int (*parse)(MYSQL_FTPARSER_PARAM *param);
+  int (*init)(MYSQL_FTPARSER_PARAM *param);
+  int (*deinit)(MYSQL_FTPARSER_PARAM *param);
+};
+struct st_mysql_storage_engine
+{
+  int interface_version;
+};
+struct handlerton;
+struct st_mysql_daemon
+{
+  int interface_version;
+};
+struct st_mysql_information_schema
+{
+  int interface_version;
+};
+struct st_mysql_value
+{
+  int (*value_type)(struct st_mysql_value *);
+  const char *(*val_str)(struct st_mysql_value *, char *buffer, int *length);
+  int (*val_real)(struct st_mysql_value *, double *realbuf);
+  int (*val_int)(struct st_mysql_value *, long long *intbuf);
+};
+int thd_in_lock_tables(const void* thd);
+int thd_tablespace_op(const void* thd);
+long long thd_test_options(const void* thd, long long test_options);
+int thd_sql_command(const void* thd);
+void **thd_ha_data(const void* thd, const struct handlerton *hton);
+int thd_tx_isolation(const void* thd);
+char *thd_security_context(void* thd, char *buffer, unsigned int length,
+                           unsigned int max_query_len);
+void thd_inc_row_count(void* thd);
+const char *set_thd_proc_info(void*, const char * info, const char *func,
+                              const char *file, const unsigned int line);
+int mysql_tmpfile(const char *prefix);
+int thd_killed(const void* thd);
+unsigned long thd_get_thread_id(const void* thd);
+void thd_get_xid(const void* thd, MYSQL_XID *xid);
+void mysql_query_cache_invalidate4(void* thd,
+                                   const char *key, unsigned int key_length,
+                                   int using_trx);
+#include <mysql/plugin_auth_common.h>
+typedef struct st_plugin_vio_info
+{
+  enum { MYSQL_VIO_INVALID, MYSQL_VIO_TCP, MYSQL_VIO_SOCKET,
+         MYSQL_VIO_PIPE, MYSQL_VIO_MEMORY } protocol;
+  int socket;
+} MYSQL_PLUGIN_VIO_INFO;
+typedef struct st_plugin_vio
+{
+  int (*read_packet)(struct st_plugin_vio *vio,
+                     unsigned char **buf);
+  int (*write_packet)(struct st_plugin_vio *vio,
+                      const unsigned char *packet,
+                      int packet_len);
+  void (*info)(struct st_plugin_vio *vio, struct st_plugin_vio_info *info);
+} MYSQL_PLUGIN_VIO;
+typedef struct st_mysql_server_auth_info
+{
+  const char *user_name;
+  const char *auth_string;
+  char authenticated_as[48 +1];
+  int password_used;
+} MYSQL_SERVER_AUTH_INFO;
+struct st_mysql_auth
+{
+  int interface_version;
+  const char *client_auth_plugin;
+  int (*authenticate_user)(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info);
+};
------------------------------------------------------------
revno: 2755
committer: Sergei Golubchik <sergii@pisem.net>
branch nick: maria-5.2-pa
timestamp: Mon 2010-03-15 19:16:54 +0100
message:
  indentation fixes
modified:
  sql/sql_acl.cc
diff:
=== modified file 'sql/sql_acl.cc'
--- sql/sql_acl.cc	2010-03-15 17:35:32 +0000
+++ sql/sql_acl.cc	2010-03-15 18:16:54 +0000
@@ -7835,7 +7835,7 @@
     plugin= old_password_plugin;
   else
   if ((plugin= my_plugin_lock_by_name(thd, auth_plugin_name,
-                                       MYSQL_AUTHENTICATION_PLUGIN)))
+                                      MYSQL_AUTHENTICATION_PLUGIN)))
     unlock_plugin= true;
   else
 #endif
@@ -8028,7 +8028,7 @@
 */
 
 static int native_password_authenticate(MYSQL_PLUGIN_VIO *vio, 
-                                              MYSQL_SERVER_AUTH_INFO *info)
+                                        MYSQL_SERVER_AUTH_INFO *info)
 {
   uchar *pkt;
   int pkt_len;
@@ -8112,7 +8112,7 @@
 
 
 static int old_password_authenticate(MYSQL_PLUGIN_VIO *vio, 
-                                           MYSQL_SERVER_AUTH_INFO *info)
+                                     MYSQL_SERVER_AUTH_INFO *info)
 {
   uchar *pkt;
   int pkt_len;
------------------------------------------------------------
revno: 2757
committer: Sergei Golubchik <sergii@pisem.net>
branch nick: maria-5.2-pa
timestamp: Mon 2010-03-15 21:35:53 +0100
message:
  fixes for make distcheck
removed:
  include/mysql/plugin.h.pp
modified:
  Makefile.am
  include/Makefile.am
  sql-common/Makefile.am
  sql/sql_acl.cc
diff:
=== modified file 'Makefile.am'
--- Makefile.am	2010-03-15 10:57:42 +0000
+++ Makefile.am	2010-03-15 20:35:53 +0000
@@ -271,8 +271,7 @@
 # after which TEST_PREPROCESSOR_HEADER will be used.
 #
 
-API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
-                          $(top_srcdir)/include/mysql.h \
+API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql.h \
 			  $(top_srcdir)/include/mysql/client_plugin.h \
 			  $(top_srcdir)/include/mysql/plugin_auth.h
 

=== modified file 'include/Makefile.am'
--- include/Makefile.am	2010-02-19 08:18:09 +0000
+++ include/Makefile.am	2010-03-15 20:35:53 +0000
@@ -44,7 +44,7 @@
 			atomic/rwlock.h atomic/x86-gcc.h atomic/generic-msvc.h \
                         atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
                         wqueue.h waiting_threads.h
-EXTRA_DIST =        mysql.h.pp mysql/plugin.h.pp
+EXTRA_DIST =        mysql.h.pp mysql/plugin_auth.h.pp mysql/client_plugin.h.pp
 
 # Remove built files and the symlinked directories
 CLEANFILES =            $(BUILT_SOURCES) readline openssl

=== removed file 'include/mysql/plugin.h.pp'
--- include/mysql/plugin.h.pp	2010-03-03 14:44:14 +0000
+++ include/mysql/plugin.h.pp	1970-01-01 00:00:00 +0000
@@ -1,163 +0,0 @@
-#include <mysql/services.h>
-#include <mysql/service_my_snprintf.h>
-#include <stdarg.h>
-#include <stdlib.h>
-extern struct my_snprintf_service_st {
-  size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
-  size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
-} *my_snprintf_service;
-size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
-size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
-#include <mysql/service_thd_alloc.h>
-#include <stdlib.h>
-struct st_mysql_lex_string
-{
-  char *str;
-  size_t length;
-};
-typedef struct st_mysql_lex_string MYSQL_LEX_STRING;
-extern struct thd_alloc_service_st {
-  void *(*thd_alloc_func)(void*, unsigned int);
-  void *(*thd_calloc_func)(void*, unsigned int);
-  char *(*thd_strdup_func)(void*, const char *);
-  char *(*thd_strmake_func)(void*, const char *, unsigned int);
-  void *(*thd_memdup_func)(void*, const void*, unsigned int);
-  MYSQL_LEX_STRING *(*thd_make_lex_string_func)(void*, MYSQL_LEX_STRING *,
-                                        const char *, unsigned int, int);
-} *thd_alloc_service;
-void *thd_alloc(void* thd, unsigned int size);
-void *thd_calloc(void* thd, unsigned int size);
-char *thd_strdup(void* thd, const char *str);
-char *thd_strmake(void* thd, const char *str, unsigned int size);
-void *thd_memdup(void* thd, const void* str, unsigned int size);
-MYSQL_LEX_STRING *thd_make_lex_string(void* thd, MYSQL_LEX_STRING *lex_str,
-                                      const char *str, unsigned int size,
-                                      int allocate_lex_string);
-struct st_mysql_xid {
-  long formatID;
-  long gtrid_length;
-  long bqual_length;
-  char data[128];
-};
-typedef struct st_mysql_xid MYSQL_XID;
-enum enum_mysql_show_type
-{
-  SHOW_UNDEF, SHOW_BOOL, SHOW_INT, SHOW_LONG,
-  SHOW_LONGLONG, SHOW_CHAR, SHOW_CHAR_PTR,
-  SHOW_ARRAY, SHOW_FUNC, SHOW_DOUBLE,
-  SHOW_always_last
-};
-struct st_mysql_show_var {
-  const char *name;
-  char *value;
-  enum enum_mysql_show_type type;
-};
-typedef int (*mysql_show_var_func)(void*, struct st_mysql_show_var*, char *);
-struct st_mysql_sys_var;
-struct st_mysql_value;
-typedef int (*mysql_var_check_func)(void* thd,
-                                    struct st_mysql_sys_var *var,
-                                    void *save, struct st_mysql_value *value);
-typedef void (*mysql_var_update_func)(void* thd,
-                                      struct st_mysql_sys_var *var,
-                                      void *var_ptr, const void *save);
-struct st_mysql_plugin
-{
-  int type;
-  void *info;
-  const char *name;
-  const char *author;
-  const char *descr;
-  int license;
-  int (*init)(void *);
-  int (*deinit)(void *);
-  unsigned int version;
-  struct st_mysql_show_var *status_vars;
-  struct st_mysql_sys_var **system_vars;
-  void * __reserved1;
-};
-enum enum_ftparser_mode
-{
-  MYSQL_FTPARSER_SIMPLE_MODE= 0,
-  MYSQL_FTPARSER_WITH_STOPWORDS= 1,
-  MYSQL_FTPARSER_FULL_BOOLEAN_INFO= 2
-};
-enum enum_ft_token_type
-{
-  FT_TOKEN_EOF= 0,
-  FT_TOKEN_WORD= 1,
-  FT_TOKEN_LEFT_PAREN= 2,
-  FT_TOKEN_RIGHT_PAREN= 3,
-  FT_TOKEN_STOPWORD= 4
-};
-typedef struct st_mysql_ftparser_boolean_info
-{
-  enum enum_ft_token_type type;
-  int yesno;
-  int weight_adjust;
-  char wasign;
-  char trunc;
-  char prev;
-  char *quot;
-} MYSQL_FTPARSER_BOOLEAN_INFO;
-typedef int mysql_ft_size_t;
-typedef struct st_mysql_ftparser_param
-{
-  int (*mysql_parse)(struct st_mysql_ftparser_param *,
-                     const unsigned char *doc, mysql_ft_size_t doc_len);
-  int (*mysql_add_word)(struct st_mysql_ftparser_param *,
-                        const unsigned char *word, mysql_ft_size_t word_len,
-                        MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info);
-  void *ftparser_state;
-  void *mysql_ftparam;
-  const struct charset_info_st *cs;
-  const unsigned char *doc;
-  mysql_ft_size_t length;
-  unsigned int flags;
-  enum enum_ftparser_mode mode;
-} MYSQL_FTPARSER_PARAM;
-struct st_mysql_ftparser
-{
-  int interface_version;
-  int (*parse)(MYSQL_FTPARSER_PARAM *param);
-  int (*init)(MYSQL_FTPARSER_PARAM *param);
-  int (*deinit)(MYSQL_FTPARSER_PARAM *param);
-};
-struct st_mysql_storage_engine
-{
-  int interface_version;
-};
-struct handlerton;
-struct st_mysql_daemon
-{
-  int interface_version;
-};
-struct st_mysql_information_schema
-{
-  int interface_version;
-};
-struct st_mysql_value
-{
-  int (*value_type)(struct st_mysql_value *);
-  const char *(*val_str)(struct st_mysql_value *, char *buffer, int *length);
-  int (*val_real)(struct st_mysql_value *, double *realbuf);
-  int (*val_int)(struct st_mysql_value *, long long *intbuf);
-};
-int thd_in_lock_tables(const void* thd);
-int thd_tablespace_op(const void* thd);
-long long thd_test_options(const void* thd, long long test_options);
-int thd_sql_command(const void* thd);
-void **thd_ha_data(const void* thd, const struct handlerton *hton);
-int thd_tx_isolation(const void* thd);
-char *thd_security_context(void* thd, char *buffer, unsigned int length,
-                           unsigned int max_query_len);
-void thd_inc_row_count(void* thd);
-const char *set_thd_proc_info(void*, const char * info, const char *func,
-                              const char *file, const unsigned int line);
-int mysql_tmpfile(const char *prefix);
-int thd_killed(const void* thd);
-unsigned long thd_get_thread_id(const void* thd);
-void thd_get_xid(const void* thd, MYSQL_XID *xid);
-void mysql_query_cache_invalidate4(void* thd,
-                                   const char *key, unsigned int key_length,
-                                   int using_trx);

=== modified file 'sql-common/Makefile.am'
--- sql-common/Makefile.am	2006-12-31 00:02:27 +0000
+++ sql-common/Makefile.am	2010-03-15 20:35:53 +0000
@@ -14,7 +14,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ## Process this file with automake to create Makefile.in
-EXTRA_DIST = client.c pack.c my_time.c my_user.c
+EXTRA_DIST = client.c pack.c my_time.c my_user.c client_plugin.c
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

=== modified file 'sql/sql_acl.cc'
--- sql/sql_acl.cc	2010-03-15 18:16:54 +0000
+++ sql/sql_acl.cc	2010-03-15 20:35:53 +0000
@@ -6838,6 +6838,7 @@
 #ifndef HAVE_OPENSSL
 #define ssl_acceptor_fd 0
 #define sslaccept(A,B,C,D) 1
+#define NORMAL_HANDSHAKE_SIZE   6
 #endif
 
 /**
------------------------------------------------------------
revno: 2760
committer: Sergei Golubchik <sergii@pisem.net>
branch nick: maria-5.2-pa
timestamp: Sat 2010-03-20 14:58:55 +0100
message:
  We cannot use AM_CONDITIONAL conditionally.
  For every conditional AM_CONDITIONAL should be
  invoked unconditionally at least once. Otherwise, under
  certain conditions configure will complain that conditional
  was never defined because the macro was only
  invoked conditionally.
  
  conditional, conditional, conditional.
modified:
  plugin/auth/plug.in
diff:
=== modified file 'plugin/auth/plug.in'
--- plugin/auth/plug.in	2010-02-19 08:18:09 +0000
+++ plugin/auth/plug.in	2010-03-20 13:58:55 +0000
@@ -12,3 +12,4 @@
 ]])],have_peercred=yes)
 AM_CONDITIONAL(HAVE_PEERCRED, test x$have_peercred = xyes)
 ])
+AM_CONDITIONAL(HAVE_PEERCRED, false)
------------------------------------------------------------
revno: 2762
committer: Sergei Golubchik <sergii@pisem.net>
branch nick: maria-5.2-pa
timestamp: Mon 2010-03-22 19:09:47 +0100
message:
  fixes for: compilation failure in static builds.
  test failure in optimized builds
modified:
  include/my_global.h
  mysql-test/t/mysql_delimiter_19799.sql*
  mysql-test/t/windows.test*
  sql/sql_acl.cc
diff:
=== modified file 'include/my_global.h'
--- include/my_global.h	2010-03-15 17:35:32 +0000
+++ include/my_global.h	2010-03-22 18:09:47 +0000
@@ -1530,10 +1530,12 @@
 #endif
 
 #ifndef HAVE_DLERROR
-#define dlerror() ""
+#define dlerror() "No support for dynamic loading (static build?)"
+#define dlopen(A,B) 0
+#define dlsym(A,B) 0
+#define dlclose(A) 0
 #endif
 
-
 #ifndef __NETWARE__
 /*
  *  Include standard definitions of operator new and delete.

=== modified file 'mysql-test/t/mysql_delimiter_19799.sql' (properties changed: +x to -x)
=== modified file 'mysql-test/t/windows.test' (properties changed: +x to -x)
=== modified file 'sql/sql_acl.cc'
--- sql/sql_acl.cc	2010-03-15 20:35:53 +0000
+++ sql/sql_acl.cc	2010-03-22 18:09:47 +0000
@@ -7785,7 +7785,7 @@
 int acl_authenticate(THD *thd, uint connect_errors, uint com_change_user_pkt_len)
 {
   DBUG_ENTER("acl_authenticate");
-  int res, old_status;
+  int res= CR_OK, old_status= MPVIO_EXT::FAILURE;
   plugin_ref plugin;
   MPVIO_EXT mpvio;
   st_mysql_auth *auth;
------------------------------------------------------------
revno: 2763
committer: Sergei Golubchik <sergii@pisem.net>
branch nick: maria-5.2-pa
timestamp: Mon 2010-03-22 23:14:48 +0100
message:
  fix for funcs_1 suite, fix for opensolaris gcc
modified:
  mysql-test/suite/funcs_1/r/is_columns_mysql.result
  mysql-test/suite/funcs_1/r/is_user_privileges.result
  plugin/auth/Makefile.am
diff:
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- mysql-test/suite/funcs_1/r/is_columns_mysql.result	2009-10-28 09:23:02 +0000
+++ mysql-test/suite/funcs_1/r/is_columns_mysql.result	2010-03-22 22:14:48 +0000
@@ -178,6 +178,7 @@
 NULL	mysql	time_zone_transition_type	Transition_type_id	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references	
 NULL	mysql	user	Alter_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	auth_string	41	NULL	NO	text	65535	65535	NULL	NULL	utf8	utf8_bin	text			select,insert,update,references	
 NULL	mysql	user	Create_priv	8	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_tmp_table_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -198,6 +199,7 @@
 NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	mysql	user	Password	3		NO	char	41	41	NULL	NULL	latin1	latin1_bin	char(41)			select,insert,update,references	
+NULL	mysql	user	plugin	40		NO	char	60	60	NULL	NULL	latin1	latin1_swedish_ci	char(60)			select,insert,update,references	
 NULL	mysql	user	Process_priv	12	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	References_priv	15	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Reload_priv	10	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -233,6 +235,7 @@
 1.0000	char	latin1	latin1_bin
 1.0000	char	latin1	latin1_swedish_ci
 1.0000	varchar	latin1	latin1_swedish_ci
+1.0000	text	utf8	utf8_bin
 1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
 SELECT DISTINCT
@@ -497,3 +500,5 @@
 NULL	mysql	user	max_updates	int	NULL	NULL	NULL	NULL	int(11) unsigned
 NULL	mysql	user	max_connections	int	NULL	NULL	NULL	NULL	int(11) unsigned
 NULL	mysql	user	max_user_connections	int	NULL	NULL	NULL	NULL	int(11) unsigned
+1.0000	mysql	user	plugin	char	60	60	latin1	latin1_swedish_ci	char(60)
+1.0000	mysql	user	auth_string	text	65535	65535	utf8	utf8_bin	text

=== modified file 'mysql-test/suite/funcs_1/r/is_user_privileges.result'
--- mysql-test/suite/funcs_1/r/is_user_privileges.result	2008-03-07 19:18:14 +0000
+++ mysql-test/suite/funcs_1/r/is_user_privileges.result	2010-03-22 22:14:48 +0000
@@ -76,10 +76,10 @@
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 #
 # Add GRANT OPTION db_datadict.* to testuser1;
 GRANT UPDATE ON db_datadict.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
@@ -93,10 +93,10 @@
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 # Establish connection testuser1 (user=testuser1)
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
@@ -105,10 +105,10 @@
 'testuser1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@@ -130,10 +130,10 @@
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
 #
 # Here <SELECT YES> is shown correctly for testuser1;
@@ -147,10 +147,10 @@
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 # Switch to connection testuser1
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
@@ -159,10 +159,10 @@
 'testuser1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION
@@ -207,10 +207,10 @@
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 # Switch to connection testuser1
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
@@ -253,10 +253,10 @@
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 # Switch to connection testuser1
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
@@ -265,10 +265,10 @@
 'testuser1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@@ -284,10 +284,10 @@
 'testuser1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@@ -309,10 +309,10 @@
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	auth_string
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0		
 # Switch to connection testuser1
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''

=== modified file 'plugin/auth/Makefile.am'
--- plugin/auth/Makefile.am	2010-02-19 08:18:09 +0000
+++ plugin/auth/Makefile.am	2010-03-22 22:14:48 +0000
@@ -1,7 +1,7 @@
 pkgplugindir=$(pkglibdir)/plugin
 
 AM_LDFLAGS=-module -rpath $(pkgplugindir)
-AM_CPPFLAGS=-DMYSQL_DYNAMIC_PLUGIN -Wno-pointer-sign -I$(top_srcdir)/include
+AM_CPPFLAGS=-DMYSQL_DYNAMIC_PLUGIN -I$(top_srcdir)/include
 
 pkgplugin_LTLIBRARIES=  dialog.la
 dialog_la_SOURCES= dialog.c
------------------------------------------------------------
revno: 2765
committer: Sergei Golubchik <sergii@pisem.net>
branch nick: maria-5.2-pa
timestamp: Fri 2010-03-26 12:32:46 +0100
message:
  post-review changes
  code cleanups and bugfixes:
  * user name and db name we converted from thd->charset() ut utf8 before thd->charset() was set
  * opt_secure_auth was checked after the user sends short scramble, not before
  * hostname mask was ignored for empty user names (anonymous users)
modified:
  client/mysql.cc
  include/mysql/client_plugin.h
  include/mysql/plugin_auth.h
  include/mysql/plugin_auth_common.h
  libmysqld/lib_sql.cc
  plugin/auth/auth_socket.c
  plugin/auth/dialog.c
  sql-common/client.c
  sql-common/client_plugin.c
  sql/mysqld.cc
  sql/sql_acl.cc
  sql/sql_acl.h
  sql/sql_parse.cc
diff:
=== modified file 'client/mysql.cc'
--- client/mysql.cc	2010-03-15 17:35:32 +0000
+++ client/mysql.cc	2010-03-26 11:32:46 +0000
@@ -4273,24 +4273,24 @@
                                                  const char *prompt,
                                                  char *buf, int buf_len)
 {
-  int ch;
-  char *s=buf, *end=buf+buf_len-1;
+  char *s=buf;
 
   fputs("[mysql] ", stdout);
   fputs(prompt, stdout);
   fputs(" ", stdout);
 
   if (type == 2) /* password */
   {
     s= get_tty_password("");
-    strncpy(buf, s, buf_len);
+    strnmov(buf, s, buf_len);
+    buf[buf_len-1]= 0;
     my_free(s, MYF(0));
   }
   else
   {
-    for (ch= fgetc(stdin); s < end && ch != '\n' && ch != EOF; ch= fgetc(stdin))
-      *s++= ch;
-    *s=0;
+    fgets(buf, buf_len-1, stdin);
+    if (buf[0] && (s= strend(buf))[-1] == '\n')
+      s[-1]= 0;
   }
 
   return buf;

=== modified file 'libmysqld/lib_sql.cc'
--- libmysqld/lib_sql.cc	2010-03-15 17:35:32 +0000
+++ libmysqld/lib_sql.cc	2010-03-26 11:32:46 +0000
@@ -415,7 +415,7 @@
 int emb_read_change_user_result(MYSQL *mysql)
 {
   mysql->net.read_pos= (uchar*)""; // fake an OK packet
-  return mysql_errno(mysql) ? packet_error : 1;
+  return mysql_errno(mysql) ? packet_error : 1 /* length of the OK packet */;
 }
 
 MYSQL_METHODS embedded_methods= 

=== modified file 'plugin/auth/dialog.c'
--- plugin/auth/dialog.c	2010-03-11 12:33:22 +0000
+++ plugin/auth/dialog.c	2010-03-26 11:32:46 +0000
@@ -236,7 +236,7 @@
         We send the "password", assuming the client knows what its doing.
         (in other words, the dialog plugin should be only set as a default
         authentication plugin on the client if the first question
-        asks for a password - which will be sent in cleat text, by the way)
+        asks for a password - which will be sent in clear text, by the way)
       */
       reply= mysql->passwd;
     }

=== modified file 'sql-common/client.c'
--- sql-common/client.c	2010-03-11 12:33:22 +0000
+++ sql-common/client.c	2010-03-26 11:32:46 +0000
@@ -109,6 +109,9 @@
 #include <sql_common.h>
 #include <mysql/client_plugin.h>
 
+#define native_password_plugin_name "mysql_native_password"
+#define old_password_plugin_name    "mysql_old_password"
+
 uint		mysql_port=0;
 char		*mysql_unix_port= 0;
 const char	*unknown_sqlstate= "HY000";
@@ -1047,13 +1050,14 @@
   return 0;
 }
 
-#define extension_free(OPTS, X)                                  \
+#define extension_set_string(OPTS, X, STR)                       \
     if ((OPTS)->extension)                                       \
       my_free((OPTS)->extension->X, MYF(MY_ALLOW_ZERO_PTR));     \
     else                                                         \
       (OPTS)->extension= (struct st_mysql_options_extention *)   \
         my_malloc(sizeof(struct st_mysql_options_extention),     \
-                  MYF(MY_WME | MY_ZEROFILL));
+                  MYF(MY_WME | MY_ZEROFILL));                    \
+    (OPTS)->extension->X= my_strdup((STR), MYF(MY_WME));
 
 void mysql_read_default_options(struct st_mysql_options *options,
 				const char *filename,const char *group)
@@ -1243,12 +1247,10 @@
           options->report_data_truncation= opt_arg ? test(atoi(opt_arg)) : 1;
           break;
         case OPT_plugin_dir:
-          extension_free(options, plugin_dir);
-          options->extension->plugin_dir= my_strdup(opt_arg, MYF(MY_WME));
+          extension_set_string(options, plugin_dir, opt_arg);
           break;
         case OPT_default_auth:
-          extension_free(options, default_auth);
-          options->extension->default_auth= my_strdup(opt_arg, MYF(MY_WME));
+          extension_set_string(options, default_auth, opt_arg);
           break;
 	default:
 	  DBUG_PRINT("warning",("unknown option: %s",option[0]));
@@ -1892,6 +1894,44 @@
 /*********** client side authentication support **************************/
 
 typedef struct st_mysql_client_plugin_AUTHENTICATION auth_plugin_t;
+static int client_mpvio_write_packet(struct st_plugin_vio*, const uchar*, int);
+static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
+static int old_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
+
+static auth_plugin_t native_password_client_plugin=
+{
+  MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
+  MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
+  native_password_plugin_name,
+  "R.J.Silk, Sergei Golubchik",
+  "Native MySQL authentication",
+  {1, 0, 0},
+  NULL,
+  NULL,
+  native_password_auth_client
+};
+
+static auth_plugin_t old_password_client_plugin=
+{
+  MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
+  MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
+  old_password_plugin_name,
+  "R.J.Silk, Sergei Golubchik",
+  "Old MySQL-3.23 authentication",
+  {1, 0, 0},
+  NULL,
+  NULL,
+  old_password_auth_client
+};
+
+struct st_mysql_client_plugin *mysql_client_builtins[]=
+{
+  (struct st_mysql_client_plugin *)&native_password_client_plugin,
+  (struct st_mysql_client_plugin *)&old_password_client_plugin,
+  0
+};
+
+
 
 /* this is a "superset" of MYSQL_PLUGIN_VIO, in C++ I use inheritance */
 typedef struct {
@@ -1900,20 +1940,17 @@
   void (*info)(struct st_plugin_vio *vio, struct st_plugin_vio_info *info);
   /* -= end of MYSQL_PLUGIN_VIO =- */
   MYSQL *mysql;
-  auth_plugin_t *plugin;            /**< what plugin we're under */
+  auth_plugin_t *plugin;             /**< what plugin we're under */
   const char *db;
   struct {
-    uchar *pkt;                     /**< pointer into NET::buff */
+    uchar *pkt;                      /**< pointer into NET::buff */
     uint pkt_len;
   } cached_server_reply;
-  int packets_read, packets_written; /**< counters for send/received packets */
-  int mysql_change_user;            /**< if it's mysql_change_user() */
-  int last_read_packet_len;         /**< the length of the last *read* packet */
+  uint packets_read, packets_written; /**< counters for send/received packets */
+  my_bool mysql_change_user;          /**< if it's mysql_change_user() */
+  int last_read_packet_len;           /**< the length of the last *read* packet */
 } MCPVIO_EXT;
 
-#define native_password_plugin_name "mysql_native_password"
-#define old_password_plugin_name    "mysql_old_password"
-
 /**
   sends a COM_CHANGE_USER command with a caller provided payload
 
@@ -2124,7 +2161,7 @@
       goto error;
     }
   }
-#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
+#endif /* HAVE_OPENSSL */
 
   DBUG_PRINT("info",("Server version = '%s'  capabilites: %lu  status: %u  client_flag: %lu",
 		     mysql->server_version, mysql->server_capabilities,
@@ -2187,8 +2224,6 @@
 }
 
 
-static int client_mpvio_write_packet(struct st_plugin_vio*, const uchar*, int);
-
 /**
   vio->read_packet() callback method for client authentication plugins
 
@@ -2202,7 +2237,16 @@
   MYSQL *mysql= mpvio->mysql;
   ulong  pkt_len;
 
-  if (mpvio->packets_read == 0 && !mpvio->cached_server_reply.pkt)
+  /* there are cached data left, feed it to a plugin */
+  if (mpvio->cached_server_reply.pkt)
+  {
+    *buf= mpvio->cached_server_reply.pkt;
+    mpvio->cached_server_reply.pkt= 0;
+    mpvio->packets_read++;
+    return mpvio->cached_server_reply.pkt_len;
+  }
+
+  if (mpvio->packets_read == 0)
   {
     /*
       the server handshake packet came from the wrong plugin,
@@ -2214,15 +2258,6 @@
       return (int)packet_error;
   }
 
-  /* there are cached data left, feed it to a plugin */
-  if (mpvio->cached_server_reply.pkt)
-  {
-    *buf= mpvio->cached_server_reply.pkt;
-    mpvio->cached_server_reply.pkt= 0;
-    mpvio->packets_read++;
-    return mpvio->cached_server_reply.pkt_len;
-  }
-
   /* otherwise read the data */
   pkt_len= (*mysql->methods->read_change_user_result)(mysql);
   mpvio->last_read_packet_len= pkt_len;
@@ -2236,6 +2271,8 @@
     the server sends \1\255 or \1\254 instead of just \255 or \254 -
     for us to not confuse it with an error or "change plugin" packets.
     We remove this escaping \1 here.
+
+    See also server_mpvio_write_packet() where the escaping is done.
   */
   if (pkt_len && **buf == 1)
   {
@@ -2368,14 +2405,18 @@
   /* determine the default/initial plugin to use */
   if (mysql->options.extension && mysql->options.extension->default_auth &&
       mysql->server_capabilities & CLIENT_PLUGIN_AUTH)
+  {
     auth_plugin_name= mysql->options.extension->default_auth;
+    if (!(auth_plugin= (auth_plugin_t*) mysql_client_find_plugin(mysql,
+                       auth_plugin_name, MYSQL_CLIENT_AUTHENTICATION_PLUGIN)))
+      return 1; /* oops, not found */
+  }
   else
-    auth_plugin_name= mysql->server_capabilities & CLIENT_PROTOCOL_41 ?
-      native_password_plugin_name : old_password_plugin_name;
-
-  if (!(auth_plugin= (auth_plugin_t*) mysql_client_find_plugin(mysql,
-                         auth_plugin_name, MYSQL_CLIENT_AUTHENTICATION_PLUGIN)))
-    return 1; /* oops, not found */
+  {
+    auth_plugin= mysql->server_capabilities & CLIENT_PROTOCOL_41 ?
+      &native_password_client_plugin : &old_password_client_plugin;
+    auth_plugin_name= auth_plugin->name;
+  }
 
   mysql->net.last_errno= 0; /* just in case */
 
@@ -2436,16 +2477,18 @@
   {
     /* The server asked to use a different authentication plugin */
     if (pkt_length == 1)
-    { /* old "use short scramble" packet */
+    {
+      /* old "use short scramble" packet */
       auth_plugin_name= old_password_plugin_name;
       mpvio.cached_server_reply.pkt= (uchar*)mysql->scramble;
       mpvio.cached_server_reply.pkt_len= SCRAMBLE_LENGTH + 1;
     }
     else
-    { /* new "use different plugin" packet */
+    {
+      /* new "use different plugin" packet */
       uint len;
       auth_plugin_name= (char*)mysql->net.read_pos + 1;
-      len= strlen(auth_plugin_name);
+      len= strlen(auth_plugin_name); /* safe as my_net_read always appends \0 */
       mpvio.cached_server_reply.pkt_len= pkt_length - len - 2;
       mpvio.cached_server_reply.pkt= mysql->net.read_pos + len + 2;
     }
@@ -2496,8 +2539,8 @@
 {
   char		buff[NAME_LEN+USERNAME_LENGTH+100];
   int           scramble_data_len, pkt_scramble_len;
-  char          *end,*host_info, *server_version_end, *pkt_end, *scramble_data;
-  char          *scramble_plugin;
+  char          *end, *host_info=0, *server_version_end, *pkt_end;
+  char          *scramble_data, *scramble_plugin;
   my_socket	sock;
   in_addr_t	ip_addr;
   struct	sockaddr_in sock_addr;
@@ -2898,6 +2941,8 @@
     {
       scramble_data_len= pkt_scramble_len;
       scramble_plugin= scramble_data + scramble_data_len;
+      if (scramble_data + scramble_data_len > pkt_end)
+        scramble_data_len= pkt_end - scramble_data;
     }
     else
     {
@@ -3665,12 +3710,10 @@
       mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;
     break;
   case MYSQL_PLUGIN_DIR:
-    extension_free(&mysql->options, plugin_dir);
-    mysql->options.extension->plugin_dir= my_strdup(arg, MYF(MY_WME));
+    extension_set_string(&mysql->options, plugin_dir, arg);
     break;
   case MYSQL_DEFAULT_AUTH:
-    extension_free(&mysql->options, default_auth);
-    mysql->options.extension->default_auth= my_strdup(arg, MYF(MY_WME));
+    extension_set_string(&mysql->options, default_auth, arg);
     break;
   default:
     DBUG_RETURN(1);
@@ -3876,36 +3919,3 @@
   return CR_OK;
 }
 
-static auth_plugin_t native_password_client_plugin=
-{
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
-  native_password_plugin_name,
-  "R.J.Silk, Sergei Golubchik",
-  "Native MySQL authentication",
-  {1, 0, 0},
-  NULL,
-  NULL,
-  native_password_auth_client
-};
-
-static auth_plugin_t old_password_client_plugin=
-{
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
-  old_password_plugin_name,
-  "R.J.Silk, Sergei Golubchik",
-  "Old MySQL-3.23 authentication",
-  {1, 0, 0},
-  NULL,
-  NULL,
-  old_password_auth_client
-};
-
-struct st_mysql_client_plugin *mysql_client_builtins[]=
-{
-  (struct st_mysql_client_plugin *)&native_password_client_plugin,
-  (struct st_mysql_client_plugin *)&old_password_client_plugin,
-  0
-};
-

=== modified file 'sql-common/client_plugin.c'
--- sql-common/client_plugin.c	2010-03-11 12:33:22 +0000
+++ sql-common/client_plugin.c	2010-03-26 11:32:46 +0000
@@ -209,18 +209,16 @@
   char *plugs, *free_env, *s= getenv("LIBMYSQL_PLUGINS");
 
   /* no plugins to load */
-  if(!s)
+  if (!s)
     return;
 
   free_env= plugs= my_strdup(s, MYF(MY_WME));
-  s= NULL;
 
   do {
     if ((s= strchr(plugs, ';')))
       *s= '\0';
     mysql_load_plugin(mysql, plugs, -1, 0);
-    if(s)
-      plugs= ++s;
+    plugs= s + 1;
   } while (s);
 
   my_free(free_env, MYF(0));

=== modified file 'sql/mysqld.cc'
--- sql/mysqld.cc	2010-03-15 17:35:32 +0000
+++ sql/mysqld.cc	2010-03-26 11:32:46 +0000
@@ -3491,7 +3491,7 @@
   if (init_errmessage())	/* Read error messages from file */
     return 1;
   init_client_errs();
-  mysql_library_init(un,us,ed); /* for replication */
+  mysql_library_init(never,never,never); /* for replication */
   lex_init();
   if (item_create_init())
     return 1;

=== modified file 'sql/sql_acl.cc'
--- sql/sql_acl.cc	2010-03-22 18:09:47 +0000
+++ sql/sql_acl.cc	2010-03-26 11:32:46 +0000
@@ -664,8 +664,18 @@
                                 user.user ? user.user : "",
                                 user.host.hostname ? user.host.hostname : "");
             }
-            user.plugin.str= tmpstr;
-            user.plugin.length= strlen(tmpstr);
+            if (my_strcasecmp(system_charset_info, tmpstr,
+                              native_password_plugin_name.str) == 0)
+              user.plugin= native_password_plugin_name;
+            else
+            if (my_strcasecmp(system_charset_info, tmpstr,
+                              old_password_plugin_name.str) == 0)
+              user.plugin= old_password_plugin_name;
+            else
+            {
+              user.plugin.str= tmpstr;
+              user.plugin.length= strlen(tmpstr);
+            }
             user.auth_string.str= get_field(&mem, table->field[next_field++]);
             if (!user.auth_string.str)
               user.auth_string.str= const_cast<char*>("");
@@ -6828,12 +6838,12 @@
 
 /* few defines to have less ifdef's in the code below */
 #ifdef EMBEDDED_LIBRARY
+#undef HAVE_OPENSSL
 #ifdef NO_EMBEDDED_ACCESS_CHECKS
 #define initialized 0
 #define decrease_user_connections(X)        /* nothing */
 #define check_for_max_user_connections(X,Y)   0
 #endif
-#undef HAVE_OPENSSL
 #endif
 #ifndef HAVE_OPENSSL
 #define ssl_acceptor_fd 0
@@ -6929,6 +6939,7 @@
                                          const char *data, uint data_len)
 {
   DBUG_ASSERT(mpvio->status == MPVIO_EXT::FAILURE);
+  DBUG_ASSERT(data_len <= 255);
 
   THD *thd= mpvio->thd;
   char *buff= (char *)my_alloca(1 + SERVER_VERSION_LENGTH + data_len + 64);
@@ -7018,8 +7029,31 @@
   return res;
 }
 
+static bool secure_auth(THD *thd)
+{
+  if (!opt_secure_auth)
+    return 0;
 
-static uchar switch_plugin_request_buf[]= { 254 };
+  /*
+    If the server is running in secure auth mode, short scrambles are 
+    forbidden. Extra juggling to report the same error as the old code.
+  */
+  if (thd->client_capabilities & CLIENT_PROTOCOL_41)
+  {
+    my_error(ER_SERVER_IS_IN_SECURE_AUTH_MODE, MYF(0),
+             thd->security_ctx->user,
+             thd->security_ctx->host_or_ip);
+    general_log_print(thd, COM_CONNECT, ER(ER_SERVER_IS_IN_SECURE_AUTH_MODE),
+                      thd->security_ctx->user,
+                      thd->security_ctx->host_or_ip);
+  }
+  else
+  {
+    my_error(ER_NOT_SUPPORTED_AUTH_MODE, MYF(0));
+    general_log_print(thd, COM_CONNECT, ER(ER_NOT_SUPPORTED_AUTH_MODE));
+  }
+  return 1;
+}
 
 /**
   sends a "change plugin" packet, requesting a client to restart authentication
@@ -7049,6 +7083,8 @@
   DBUG_ASSERT(mpvio->packets_written == 1);
   DBUG_ASSERT(mpvio->packets_read == 1);
   NET *net= &mpvio->thd->net;
+  static uchar switch_plugin_request_buf[]= { 254 };
+
 
   mpvio->status= MPVIO_EXT::FAILURE; // the status is no longer RESTART
 
@@ -7061,14 +7097,18 @@
     we send an old "short 4.0 scramble request", if we need to request a
     client to use 4.0 auth plugin (short scramble) and the scramble was
     already sent to the client
+
+    below, cached_client_reply.plugin is the plugin name that client has used,
+    client_auth_plugin is derived from mysql.user table, for the given
+    user account, it's the plugin that the client need to use to login.
   */
   bool switch_from_long_to_short_scramble=
-    my_strcasecmp(system_charset_info, native_password_plugin_name.str,
-                  mpvio->cached_client_reply.plugin) == 0 &&
+    native_password_plugin_name.str == mpvio->cached_client_reply.plugin &&
     client_auth_plugin == old_password_plugin_name.str;
 
   if (switch_from_long_to_short_scramble)
-    return my_net_write(net, switch_plugin_request_buf, 1) ||
+    return secure_auth(mpvio->thd) ||
+           my_net_write(net, switch_plugin_request_buf, 1) ||
            net_flush(net);
 
   /*
@@ -7077,8 +7117,7 @@
     ask an old 4.0 client to use the new 4.1 authentication protocol.
   */
   bool switch_from_short_to_long_scramble=
-    my_strcasecmp(system_charset_info, old_password_plugin_name.str,
-                  mpvio->cached_client_reply.plugin) == 0 &&
+    old_password_plugin_name.str == mpvio->cached_client_reply.plugin &&
     client_auth_plugin == native_password_plugin_name.str;
 
   if (switch_from_short_to_long_scramble)
@@ -7111,12 +7150,14 @@
 
 static bool find_mpvio_user(MPVIO_EXT *mpvio, Security_context *sctx)
 {
+  DBUG_ASSERT(mpvio->acl_user == 0);
+
   pthread_mutex_lock(&acl_cache->lock);
   for (uint i=0 ; i < acl_users.elements ; i++)
   {
     ACL_USER *acl_user_tmp= dynamic_element(&acl_users,i,ACL_USER*);
-    if (!acl_user_tmp->user || (!strcmp(sctx->user, acl_user_tmp->user) &&
-        compare_hostname(&acl_user_tmp->host, sctx->host, sctx->ip)))
+    if ((!acl_user_tmp->user || !strcmp(sctx->user, acl_user_tmp->user)) &&
+        compare_hostname(&acl_user_tmp->host, sctx->host, sctx->ip))
     {
       mpvio->acl_user= acl_user_tmp->copy(mpvio->thd->mem_root);
       break;
@@ -7131,12 +7172,14 @@
   }
 
   /* user account requires non-default plugin and the client is too old */
-  if (my_strcasecmp(system_charset_info, mpvio->acl_user->plugin.str,
-                                         native_password_plugin_name.str) &&
-      my_strcasecmp(system_charset_info, mpvio->acl_user->plugin.str,
-                                         old_password_plugin_name.str) &&
+  if (mpvio->acl_user->plugin.str != native_password_plugin_name.str &&
+      mpvio->acl_user->plugin.str != old_password_plugin_name.str &&
       !(mpvio->thd->client_capabilities & CLIENT_PLUGIN_AUTH))
   {
+    DBUG_ASSERT(my_strcasecmp(system_charset_info, mpvio->acl_user->plugin.str,
+                              native_password_plugin_name.str));
+    DBUG_ASSERT(my_strcasecmp(system_charset_info, mpvio->acl_user->plugin.str,
+                              old_password_plugin_name.str));
     my_error(ER_NOT_SUPPORTED_AUTH_MODE, MYF(0));
     general_log_print(mpvio->thd, COM_CONNECT, ER(ER_NOT_SUPPORTED_AUTH_MODE));
     return 1;
@@ -7203,17 +7246,6 @@
 
   char *ptr= db + db_len + 1;
 
-  /* Convert database and user names to utf8 */
-  db_buff[db_len= copy_and_convert(db_buff, sizeof(db_buff)-1,
-                                   system_charset_info, db, db_len,
-                                   thd->charset(), &dummy_errors)]= 0;
-  db= db_buff;
-
-  user_buff[user_len= copy_and_convert(user_buff, sizeof(user_buff)-1,
-                                       system_charset_info, user, user_len,
-                                       thd->charset(), &dummy_errors)]= '\0';
-  user= user_buff;
-
   if (ptr+1 < end)
   {
     uint cs_number= uint2korr(ptr);
@@ -7221,14 +7253,22 @@
     thd->update_charset();
   }
 
-  if (!(sctx->user= my_strdup(user, MYF(MY_WME))))
+  /* Convert database and user names to utf8 */
+  db_len= copy_and_convert(db_buff, sizeof(db_buff)-1, system_charset_info,
+                           db, db_len, thd->charset(), &dummy_errors);
+
+  user_len= copy_and_convert(user_buff, sizeof(user_buff)-1,
+                             system_charset_info, user, user_len,
+                             thd->charset(), &dummy_errors);
+
+  if (!(sctx->user= my_strndup(user_buff, user_len, MYF(MY_WME))))
     return 1;
 
   /* Clear variables that are allocated */
   thd->user_connect= 0;
   strmake(sctx->priv_user, sctx->user, USERNAME_LENGTH);
 
-  if (thd->make_lex_string(&mpvio->db, db, db_len, 0) == 0)
+  if (thd->make_lex_string(&mpvio->db, db_buff, db_len, 0) == 0)
     return 1; /* The error is set by make_lex_string(). */
 
   /*
@@ -7260,6 +7300,7 @@
     }
   }
   else
+  {
     if (thd->client_capabilities & CLIENT_SECURE_CONNECTION)
       client_plugin= native_password_plugin_name.str;
     else
@@ -7274,6 +7315,7 @@
       if (mpvio->acl_user->auth_string.length == 0)
         mpvio->acl_user->plugin= old_password_plugin_name;
     }
+  }
   
   /* remember the data part of the packet, to present it to plugin in read_packet() */
   mpvio->cached_client_reply.pkt= passwd;
@@ -7362,7 +7404,7 @@
 
   char *user= end;
   char *passwd= strend(user)+1;
-  uint user_len= passwd - user - 1;
+  uint user_len= passwd - user - 1, db_len;
   char *db= passwd;
   char db_buff[NAME_LEN + 1];           // buffer to store db in utf8
   char user_buff[USERNAME_LENGTH + 1];	// buffer to store user in utf8
@@ -7380,10 +7422,18 @@
   */
   uint passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ?
                    (uchar)(*passwd++) : strlen(passwd);
-  db= thd->client_capabilities & CLIENT_CONNECT_WITH_DB ?
-        db + passwd_len + 1 : 0;
-  /* strlen() can't be easily deleted without changing protocol */
-  uint db_len= db ? strlen(db) : 0;
+
+  if (thd->client_capabilities & CLIENT_CONNECT_WITH_DB)
+  {
+    db= db + passwd_len + 1;
+    /* strlen() can't be easily deleted without changing protocol */
+    db_len= strlen(db);
+  }
+  else
+  {
+    db= 0;
+    db_len= 0;
+  }
 
   if (passwd + passwd_len + db_len > (char *)net->read_pos + pkt_len)
     return packet_error;
@@ -7393,22 +7443,19 @@
   /* Since 4.1 all database names are stored in utf8 */
   if (db)
   {
-    db_buff[db_len= copy_and_convert(db_buff, sizeof(db_buff)-1,
-                                     system_charset_info,
-                                     db, db_len,
-                                     thd->charset(), &dummy_errors)]= 0;
+    db_len= copy_and_convert(db_buff, sizeof(db_buff)-1, system_charset_info,
+                             db, db_len, thd->charset(), &dummy_errors);
     db= db_buff;
   }
 
-  user_buff[user_len= copy_and_convert(user_buff, sizeof(user_buff)-1,
-                                       system_charset_info, user, user_len,
-                                       thd->charset(), &dummy_errors)]= '\0';
+  user_len= copy_and_convert(user_buff, sizeof(user_buff)-1,
+                             system_charset_info, user, user_len,
+                             thd->charset(), &dummy_errors);
   user= user_buff;
 
   /* If username starts and ends in "'", chop them off */
   if (user_len > 1 && user[0] == '\'' && user[user_len - 1] == '\'')
   {
-    user[user_len-1]= 0;
     user++;
     user_len-= 2;
   }
@@ -7419,7 +7466,7 @@
     return packet_error; /* The error is set by make_lex_string(). */
   if (sctx->user)
     x_free(sctx->user);
-  if (!(sctx->user= my_strdup(user, MYF(MY_WME))))
+  if (!(sctx->user= my_strndup(user, user_len, MYF(MY_WME))))
     return packet_error; /* The error is set by my_strdup(). */
 
   /*
@@ -7446,6 +7493,7 @@
       return packet_error;
   }
   else
+  {
     if (thd->client_capabilities & CLIENT_SECURE_CONNECTION)
       client_plugin= native_password_plugin_name.str;
     else
@@ -7460,6 +7508,7 @@
       if (mpvio->acl_user->auth_string.length == 0)
         mpvio->acl_user->plugin= old_password_plugin_name;
     }
+  }
   
   /*
     if the acl_user needs a different plugin to authenticate
@@ -7526,6 +7575,7 @@
 {
   MPVIO_EXT *mpvio= (MPVIO_EXT*)param;
   int res;
+
   /* reset cached_client_reply */
   mpvio->cached_client_reply.pkt= 0;
   /* for the 1st packet we wrap plugin data into the handshake packet */
@@ -7574,7 +7624,7 @@
   {
     /*
       plugin wants to read the data without sending anything first.
-      send an empty packet, to start a handshake
+      send an empty packet to force a server handshake packet to be sent
     */
     if (server_mpvio_write_packet(mpvio, 0, 0))
       pkt_len= packet_error;
@@ -7661,7 +7711,7 @@
 }
 
 
-static int acl_check_ssl(THD *thd, ACL_USER *acl_user)
+static bool acl_check_ssl(THD *thd, ACL_USER *acl_user)
 {
 #if defined(HAVE_OPENSSL)
   Vio *vio=thd->net.vio;
@@ -7766,6 +7816,56 @@
   return 1;
 }
 
+static int do_auth_once(THD *thd, LEX_STRING *auth_plugin_name,
+                        MPVIO_EXT *mpvio)
+{
+  int res= CR_OK, old_status= MPVIO_EXT::FAILURE;
+  bool unlock_plugin= false;
+  plugin_ref plugin;
+
+  if (auth_plugin_name->str == native_password_plugin_name.str)
+    plugin= native_password_plugin;
+  else
+#ifndef EMBEDDED_LIBRARY
+  if (auth_plugin_name->str == old_password_plugin_name.str)
+    plugin= old_password_plugin;
+  else
+  if ((plugin= my_plugin_lock_by_name(thd, auth_plugin_name,
+                                      MYSQL_AUTHENTICATION_PLUGIN)))
+    unlock_plugin= true;
+#endif
+
+  mpvio->plugin= plugin;
+  old_status= mpvio->status;
+
+  if (plugin)
+  {
+    st_mysql_auth *auth= (st_mysql_auth*)plugin_decl(plugin)->info;
+    res= auth->authenticate_user(mpvio, &mpvio->auth_info);
+
+    if (unlock_plugin)
+      plugin_unlock(thd, plugin);
+  }
+  else
+  {
+    /* Server cannot load the required plugin. */
+    my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), auth_plugin_name->str);
+    res= CR_ERROR;
+  }
+
+  /*
+    If the status was MPVIO_EXT::RESTART before the authenticate_user() call
+    it can never be MPVIO_EXT::RESTART after the call, because any call
+    to write_packet() or read_packet() will reset the status.
+
+    But (!) if a plugin never called a read_packet() or write_packet(), the
+    status will stay unchanged. We'll fix it, by resetting the status here.
+  */
+  if (old_status == MPVIO_EXT::RESTART && mpvio->status == MPVIO_EXT::RESTART)
+    mpvio->status= MPVIO_EXT::FAILURE; // reset to the default
+
+  return res;
+}
 
 /**
   Perform the handshake, authorize the client and update thd sctx variables.
@@ -7782,17 +7882,14 @@
   @retval 1  error
 */
 
-int acl_authenticate(THD *thd, uint connect_errors, uint com_change_user_pkt_len)
+bool acl_authenticate(THD *thd, uint connect_errors, uint com_change_user_pkt_len)
 {
-  DBUG_ENTER("acl_authenticate");
-  int res= CR_OK, old_status= MPVIO_EXT::FAILURE;
-  plugin_ref plugin;
+  int res= CR_OK;
   MPVIO_EXT mpvio;
-  st_mysql_auth *auth;
   LEX_STRING *auth_plugin_name= default_auth_plugin_name;
-  bool unlock_plugin;
   enum  enum_server_command command= com_change_user_pkt_len ? COM_CHANGE_USER
                                                              : COM_CONNECT;
+  DBUG_ENTER("acl_authenticate");
 
   compile_time_assert(MYSQL_USERNAME_LENGTH == USERNAME_LENGTH);
 
@@ -7804,9 +7901,7 @@
   mpvio.connect_errors= connect_errors;
   mpvio.status= MPVIO_EXT::FAILURE;
 
-  if (com_change_user_pkt_len == 0)
-    thd->scramble[SCRAMBLE_LENGTH]= 1; // it means - there is no scramble yet
-  else
+  if (command == COM_CHANGE_USER)
   {
     mpvio.packets_written++; // pretend that a server handshake packet was sent
     mpvio.packets_read++;    // take COM_CHANGE_USER packet into account
@@ -7816,67 +7911,33 @@
 
     DBUG_ASSERT(mpvio.status == MPVIO_EXT::RESTART ||
                 mpvio.status == MPVIO_EXT::SUCCESS);
+  }
+  else
+  {
+    /* mark the thd as having no scramble yet */
+    thd->scramble[SCRAMBLE_LENGTH]= 1;
+
     /*
-      we skip the first step of the authentication -
-      the one that starts a default plugin, sends the handshake packet with the
-      scramble and reads the packet with the user name.
-      in COM_CHANGE_USER the client already has the scramble and we already
-      know the user name
+      perform the first authentication attempt, with the default plugin.
+      This sends the server handshake packet, reads the client reply
+      with a user name, and performs the authentication if everyone has used
+      the correct plugin.
     */
-    goto skip_first;
-  }
-
-retry:
-  unlock_plugin= false;
-  if (auth_plugin_name->str == native_password_plugin_name.str)
-    plugin= native_password_plugin;
-  else
-#ifndef EMBEDDED_LIBRARY
-  if (auth_plugin_name->str == old_password_plugin_name.str)
-    plugin= old_password_plugin;
-  else
-  if ((plugin= my_plugin_lock_by_name(thd, auth_plugin_name,
-                                      MYSQL_AUTHENTICATION_PLUGIN)))
-    unlock_plugin= true;
-  else
-#endif
-  {
-    /* Server cannot load required plugin. */
-    my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), auth_plugin_name->str);
-    DBUG_RETURN(1);
-  }
-
-  mpvio.plugin= plugin;
-  auth= (st_mysql_auth*)plugin_decl(plugin)->info;
-
-  old_status= mpvio.status;
-  res= auth->authenticate_user(&mpvio, &mpvio.auth_info);
-
-  if (unlock_plugin)
-    plugin_unlock(thd, plugin);
-
-skip_first:
+    res= do_auth_once(thd, auth_plugin_name, &mpvio);
+  }
+
   /*
-    restart the authentication, if needed.
-
-    Note, that we only trust RESTART status if it wasn't set before
-    the authentication. If it was - it can never be set after the call, as
-    any read_packet() or write_packet() would've reset it. So, if it's
-    was set before authenticate_user() and we see it here, it simply means
-    that there was a restart, but a plugin never called read_packet() or
-    write_packet() and what we see is the old status from before the
-    authenticate_user() call.
+    retry the authentication, if - after receiving the user name -
+    we found that we need to switch to a non-default plugin
   */
   if (mpvio.status == MPVIO_EXT::RESTART)
   {
-    if (old_status == MPVIO_EXT::RESTART)
-      mpvio.status= MPVIO_EXT::FAILURE; // reset to the default
-    else
-    {
-      DBUG_ASSERT(mpvio.acl_user);
-      auth_plugin_name= &mpvio.acl_user->plugin;
-      goto retry;
-    }
+    DBUG_ASSERT(mpvio.acl_user);
+    DBUG_ASSERT(command == COM_CHANGE_USER ||
+                my_strcasecmp(system_charset_info, auth_plugin_name->str,
+                              mpvio.acl_user->plugin.str));
+    auth_plugin_name= &mpvio.acl_user->plugin;
+    res= do_auth_once(thd, auth_plugin_name, &mpvio);
   }
 
   Security_context *sctx= thd->security_ctx;
@@ -7971,7 +8032,7 @@
   {
     pthread_mutex_lock(&LOCK_connection_count);
     bool count_ok= (*thd->scheduler->connection_count <=
-               *thd->scheduler->max_connections);
+                    *thd->scheduler->max_connections);
     VOID(pthread_mutex_unlock(&LOCK_connection_count));
     if (!count_ok)
     {                                         // too many connections
@@ -7995,8 +8056,8 @@
       /* mysql_change_db() has pushed the error message. */
       if (thd->user_connect)
       {
+        status_var_increment(thd->status_var.access_denied_errors);
         decrease_user_connections(thd->user_connect);
-        status_var_increment(thd->status_var.access_denied_errors);
         thd->user_connect= 0;
       }
       DBUG_RETURN(1);
@@ -8036,24 +8097,15 @@
   MPVIO_EXT *mpvio=(MPVIO_EXT*)vio;
   THD *thd=mpvio->thd;
 
-  /*
-    let's check if the client has got the scramble already.
-    That could've happened if another plugin has started the authentication,
-    has sent the scramble, but after reading the user name the server has found
-    that this particular user should be handled by this particular plugin.
-  */
-
+  /* generate the scramble, or reuse the old one */
   if (thd->scramble[SCRAMBLE_LENGTH])
-  {
-    /* no scramble was sent to the client yet, do it now */
-    create_random_string(thd->scramble,
-                         pkt_len= SCRAMBLE_LENGTH, &thd->rand);
-    pkt= (uchar*)thd->scramble;
-    if (mpvio->write_packet(mpvio, pkt, pkt_len + 1))
-      return CR_ERROR;
-  }
-
-  /* ok, the client has got the scramble. read the reply and authenticate */
+    create_random_string(thd->scramble, SCRAMBLE_LENGTH, &thd->rand);
+
+  /* send it to the client */
+  if (mpvio->write_packet(mpvio, (uchar*)thd->scramble, SCRAMBLE_LENGTH + 1))
+    return CR_ERROR;
+
+  /* reply and authenticate */
 
   /*
     <digression>
@@ -8085,7 +8137,7 @@
       plugins are involved.
 
       Anyway, it still looks simple from a plugin point of view:
-      "the client has got the scramble, read the reply and authenticate".
+      "sen the scramble, read the reply and authenticate".
       All the magic is transparently handled by the server.
     </digression>
   */
@@ -8120,17 +8172,15 @@
   MPVIO_EXT *mpvio=(MPVIO_EXT*)vio;
   THD *thd=mpvio->thd;
 
+  /* generate the scramble, or reuse the old one */
   if (thd->scramble[SCRAMBLE_LENGTH])
-  {
-    /* no scramble was sent to the client yet, do it now */
-    create_random_string(thd->scramble,
-                         pkt_len= SCRAMBLE_LENGTH, &thd->rand);
-    pkt= (uchar*)thd->scramble;
-    if (mpvio->write_packet(mpvio, pkt, pkt_len))
-      return CR_ERROR;
-  }
-
-  /* ok, the client has got the scramble. read the reply and authenticate */
+    create_random_string(thd->scramble, SCRAMBLE_LENGTH, &thd->rand);
+
+  /* send it to the client */
+  if (mpvio->write_packet(mpvio, (uchar*)thd->scramble, SCRAMBLE_LENGTH + 1))
+    return CR_ERROR;
+
+  /* read the reply and authenticate */
   if ((pkt_len= mpvio->read_packet(mpvio, &pkt)) < 0)
     return CR_ERROR;
 
@@ -8149,28 +8199,8 @@
   if (pkt_len == 0) /* no password */
     return info->auth_string[0] ? CR_ERROR : CR_OK;
 
-  /*
-    If the server is running in secure auth mode, short scrambles are 
-    forbidden. Extra juggling to report the same error as the old code.
-  */
-  if (opt_secure_auth)
-  {
-    if (thd->client_capabilities & CLIENT_PROTOCOL_41)
-    {
-      my_error(ER_SERVER_IS_IN_SECURE_AUTH_MODE, MYF(0),
-               thd->security_ctx->user,
-               thd->security_ctx->host_or_ip);
-      general_log_print(thd, COM_CONNECT, ER(ER_SERVER_IS_IN_SECURE_AUTH_MODE),
-                        thd->security_ctx->user,
-                        thd->security_ctx->host_or_ip);
-    }
-    else
-    {
-      my_error(ER_NOT_SUPPORTED_AUTH_MODE, MYF(0));
-      general_log_print(thd, COM_CONNECT, ER(ER_NOT_SUPPORTED_AUTH_MODE));
-    }
+  if (secure_auth(thd))
     return CR_ERROR;
-  }
 
   info->password_used = 1;
 

=== modified file 'sql/sql_acl.h'
--- sql/sql_acl.h	2010-02-19 08:18:09 +0000
+++ sql/sql_acl.h	2010-03-26 11:32:46 +0000
@@ -169,7 +169,7 @@
 void acl_free(bool end=0);
 ulong acl_get(const char *host, const char *ip,
 	      const char *user, const char *db, my_bool db_is_pattern);
-int acl_authenticate(THD *thd, uint connect_errors, uint com_change_user_pkt_len);
+bool acl_authenticate(THD *thd, uint connect_errors, uint com_change_user_pkt_len);
 bool acl_getroot(Security_context *sctx, char *user, char *host,
                  char *ip, char *db);
 bool acl_check_host(const char *host, const char *ip);

=== modified file 'sql/sql_parse.cc'
--- sql/sql_parse.cc	2010-03-19 20:29:42 +0000
+++ sql/sql_parse.cc	2010-03-26 11:32:46 +0000
@@ -1115,8 +1115,7 @@
       x_free(thd->security_ctx->user);
       *thd->security_ctx= save_security_ctx;
       thd->user_connect= save_user_connect;
-      thd->db= save_db;
-      thd->db_length= save_db_length;
+      thd->reset_db(save_db, save_db_length);
       thd->variables.character_set_client= save_character_set_client;
       thd->variables.collation_connection= save_collation_connection;
       thd->variables.character_set_results= save_character_set_results;