MariaDB 5.2 -> MariaDB 5.3 merge

5 files changed, 21 insertions, 20 deletions

diff --git a/server-tools/CMakeLists.txt b/server-tools/CMakeLists.txt
index 3f02ba88f1d..9cfeb4e80f9 100644
--- a/server-tools/CMakeLists.txt
+++ b/server-tools/CMakeLists.txt
@@ -27,7 +27,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instanc
                             user_management_commands.cc
                             ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c
                             ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c
-                            ../../libmysql/errmsg.c)
+                            ../../libmysql/errmsg.c ../../sql-common/client_plugin.c)
 
 ADD_DEPENDENCIES(mysqlmanager GenError)
 TARGET_LINK_LIBRARIES(mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32)
diff --git a/server-tools/instance-manager/CMakeLists.txt b/server-tools/instance-manager/CMakeLists.txt
index 4b9c386afe1..a1f24b2682d 100755
--- a/server-tools/instance-manager/CMakeLists.txt
+++ b/server-tools/instance-manager/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instanc
                             user_management_commands.cc ../../mysys/my_rnd.c
                             ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c
                             ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c
-                            ../../libmysql/errmsg.c)
+                            ../../libmysql/errmsg.c ../../sql-common/client_plugin.c)
 
 ADD_DEPENDENCIES(mysqlmanager GenError)
 TARGET_LINK_LIBRARIES(mysqlmanager debug dbug mysys strings taocrypt vio yassl zlib wsock32)
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index 19c4ac8de19..5c5af3377eb 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -46,7 +46,8 @@ libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \
 	$(top_builddir)/sql/pack.$(OBJEXT) \
 	$(top_builddir)/sql/sql_state.$(OBJEXT) \
 	$(top_builddir)/sql/mini_client_errors.$(OBJEXT)\
-	$(top_builddir)/sql/client.$(OBJEXT)
+	$(top_builddir)/sql/client.$(OBJEXT) \
+	$(top_builddir)/sql/client_plugin.$(OBJEXT)
 
 CLEANFILES= net_serv.cc client_settings.h
 
@@ -91,7 +92,7 @@ mysqlmanager_LDADD=	@CLIENT_EXTRA_LDFLAGS@ \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/strings/libmystrings.a \
 			$(top_builddir)/dbug/libdbug.a \
-			@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
+			@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ @LIBDL@
 
 EXTRA_DIST =		WindowsService.cpp WindowsService.h IMService.cpp \
 			IMService.h CMakeLists.txt
diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc
index 6e401bf3ffe..75a18c5b43a 100644
--- a/server-tools/instance-manager/options.cc
+++ b/server-tools/instance-manager/options.cc
@@ -148,7 +148,7 @@ static struct my_option my_long_options[] =
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
   { "add-user", OPT_ADD_USER,
-    "Add a user to the password file",
+    "Add a user to the password file.",
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
 #ifndef __WIN__
@@ -164,11 +164,11 @@ static struct my_option my_long_options[] =
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 
   { "check-password-file", OPT_CHECK_PASSWORD_FILE,
-    "Check the password file for consistency",
+    "Check the password file for consistency.",
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
   { "clean-password-file", OPT_CLEAN_PASSWORD_FILE,
-    "Clean the password file",
+    "Clean the password file.",
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
 #ifndef DBUG_OFF
@@ -185,11 +185,11 @@ static struct my_option my_long_options[] =
     0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 },
 
   { "drop-user", OPT_DROP_USER,
-    "Drop existing user from the password file",
+    "Drop existing user from the password file.",
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
   { "edit-user", OPT_EDIT_USER,
-    "Edit existing user in the password file",
+    "Edit existing user in the password file.",
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
 #ifdef __WIN__
@@ -200,7 +200,7 @@ static struct my_option my_long_options[] =
 #endif
 
   { "list-users", OPT_LIST_USERS,
-    "Print out a list of registered users",
+    "Print out a list of registered users.",
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
 #ifndef __WIN__
@@ -218,7 +218,7 @@ static struct my_option my_long_options[] =
     0, 0, 0, 0, 0 },
 
   { "mysqld-safe-compatible", OPT_MYSQLD_SAFE_COMPATIBLE,
-    "Start Instance Manager in mysqld_safe compatible manner",
+    "Start Instance Manager in mysqld_safe-compatible manner.",
     (uchar* *) &Options::Main::mysqld_safe_compatible,
     (uchar* *) &Options::Main::mysqld_safe_compatible,
     0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
@@ -227,7 +227,7 @@ static struct my_option my_long_options[] =
     "Print out a user entry as a line for the password file and exit.",
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
-  { "password", OPT_PASSWORD, "Password to update the password file",
+  { "password", OPT_PASSWORD, "Password to update the password file.",
     (uchar* *) &Options::User_management::password,
     (uchar* *) &Options::User_management::password,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
@@ -243,7 +243,7 @@ static struct my_option my_long_options[] =
     (uchar* *) &Options::Main::pid_file_name,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 
-  { "port", OPT_PORT, "Port number to use for connections",
+  { "port", OPT_PORT, "Port number to use for connections.",
     (uchar* *) &Options::Main::port_number,
     (uchar* *) &Options::Main::port_number,
     0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
@@ -273,14 +273,14 @@ static struct my_option my_long_options[] =
     (uchar* *) &Options::Service::stand_alone,
     0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
 #else
-  { "user", OPT_USER, "Username to start mysqlmanager",
+  { "user", OPT_USER, "Username to start mysqlmanager.",
     (uchar* *) &Options::Daemon::user,
     (uchar* *) &Options::Daemon::user,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 #endif
 
   { "username", OPT_USERNAME,
-    "Username to update the password file",
+    "Username to update the password file.",
     (uchar* *) &Options::User_management::user_name,
     (uchar* *) &Options::User_management::user_name,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
@@ -312,16 +312,16 @@ static void usage()
 {
   version();
 
-  printf("Copyright (C) 2003, 2004 MySQL AB\n"
+  printf("Copyright (C) 2003, 2004 MySQL AB.\n"
   "This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
-  "and you are welcome to modify and redistribute it under the GPL license\n");
+  "and you are welcome to modify and redistribute it under the GPL license.\n");
   printf("Usage: %s [OPTIONS] \n", my_progname);
 
   my_print_help(my_long_options);
   printf("\nThe following options may be given as the first argument:\n"
-  "--print-defaults        Print the program argument list and exit\n"
+  "--print-defaults        Print the program argument list and exit.\n"
   "--defaults-file=#       Only read manager configuration and instance\n"
-  "                        setings from the given file #. The same file\n"
+  "                        settings from the given file #. The same file\n"
   "                        will be used to modify configuration of instances\n"
   "                        with SET commands.\n");
   my_print_variables(my_long_options);
diff --git a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc
index 85e3f4a2cac..b7a32f1d047 100644
--- a/server-tools/instance-manager/user_map.cc
+++ b/server-tools/instance-manager/user_map.cc
@@ -368,7 +368,7 @@ int User_map::authenticate(const LEX_STRING *user_name,
                            const char *scramble) const
 {
   const User *user= find_user(user_name);
-  return user ? check_scramble(scrambled_password, scramble, user->salt) : 2;
+  return user ? check_scramble((uchar*)scrambled_password, scramble, user->salt) : 2;
 }