Merge lp:~stewart/percona-server/5.6.10 into lp:percona-server/5.6

[Stewart Smith]

Merge MySQL 5.6.10

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/38/

Mostly an automerge with two post merge fixups.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/.bzrignore'
--- Percona-Server/.bzrignore	2012-06-06 10:10:17 +0000
+++ Percona-Server/.bzrignore	2013-02-13 06:17:00 +0000
@@ -1316,6 +1316,7 @@
 mysql-test/*.vcproj
 mysql-test/.DS_Store
 mysql-test/collections/default.release
+mysql-test/collections/default.release.done
 mysql-test/funcs_1.log
 mysql-test/funcs_1.tar
 mysql-test/gmon.out
@@ -2979,6 +2980,8 @@
 unittest/examples/.deps/skip-t.Po
 unittest/examples/.deps/skip_all-t.Po
 unittest/examples/.deps/todo-t.Po
+unittest/gunit/merge_large_tests.cc
+unittest/gunit/merge_small_tests.cc
 unittest/mysys/*.t
 unittest/mysys/.deps/base64-t.Po
 unittest/mysys/.deps/my_atomic-t.Po
@@ -3130,6 +3133,7 @@
 Docs/INFO_BIN
 Docs/INFO_SRC
 Testing
+FilesCopied
 source_downloads
 client/mysql_plugin
 support-files/plugins.files
 
=== modified file 'Percona-Server/BUILD/compile-dist'
--- Percona-Server/BUILD/compile-dist	2012-08-22 01:40:20 +0000
+++ Percona-Server/BUILD/compile-dist	2013-02-13 06:17:00 +0000
@@ -27,8 +27,5 @@
 
 # By default we get the "community" feature set from
 #    cmake/build_configurations/feature_set.cmake
-# We include ndbcluster in the configuration, so that it is picked up
-#    by 'make dist' in case someone wants a pushbuild tree for cluster.
 #
-./configure \
-  --with-ndbcluster
+./configure
 
=== modified file 'Percona-Server/CMakeLists.txt'
--- Percona-Server/CMakeLists.txt	2012-12-04 08:24:59 +0000
+++ Percona-Server/CMakeLists.txt	2013-02-13 06:17:00 +0000
@@ -374,7 +374,6 @@
   ADD_SUBDIRECTORY(unittest/examples)
   ADD_SUBDIRECTORY(unittest/mytap)
   ADD_SUBDIRECTORY(unittest/mytap/t)
-  ADD_SUBDIRECTORY(unittest/mysys)
   ADD_SUBDIRECTORY(unittest/gunit)
 ENDIF()
 
@@ -402,7 +401,7 @@
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
-  ADD_SUBDIRECTORY(SPECIFIC-ULN)
+  ADD_SUBDIRECTORY(packaging/rpm-uln)
 ENDIF()
 
 INCLUDE(cmake/abi_check.cmake)
@@ -440,6 +439,7 @@
   SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
 ADD_SUBDIRECTORY(packaging/WiX)
+ADD_SUBDIRECTORY(packaging/solaris)
 
 # Create a single package with "make package"
 # (see http://public.kitware.com/Bug/view.php?id=11452)
 
=== modified file 'Percona-Server/VERSION'
--- Percona-Server/VERSION	2012-12-04 08:24:59 +0000
+++ Percona-Server/VERSION	2013-02-13 06:17:00 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=8
-MYSQL_VERSION_EXTRA=-rc
+MYSQL_VERSION_PATCH=10
+MYSQL_VERSION_EXTRA=
 
=== modified file 'Percona-Server/client/client_priv.h'
--- Percona-Server/client/client_priv.h	2013-02-05 03:24:51 +0000
+++ Percona-Server/client/client_priv.h	2013-02-13 06:17:00 +0000
@@ -49,7 +49,7 @@
   OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL,
   OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION,
   OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH,
-  OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_SERVER_ARG,
+  OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_SET_GTID_PURGED, OPT_SERVER_ARG,
   OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,
   OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT,
   OPT_TRIGGERS,
 
=== modified file 'Percona-Server/client/mysql.cc'
--- Percona-Server/client/mysql.cc	2012-12-04 08:24:59 +0000
+++ Percona-Server/client/mysql.cc	2013-02-13 06:17:00 +0000
@@ -62,6 +62,9 @@
 /* Array of options to pass to libemysqld */
 #define MAX_SERVER_ARGS               64
 
+/* Maximum memory limit that can be claimed by alloca(). */
+#define MAX_ALLOCA_SIZE              512
+
 #include "sql_string.h"
 
 extern "C" {
@@ -2554,14 +2557,17 @@
   {
     uint length=(uint) (out-line);
 
-    if (!truncated && !is_delimiter_command(line, length))
+    if (!truncated && (!is_delimiter_command(line, length) ||
+                       (*in_string || *ml_comment)))
     {
       /* 
         Don't add a new line in case there's a DELIMITER command to be 
         added to the glob buffer (e.g. on processing a line like 
         "<command>;DELIMITER <non-eof>") : similar to how a new line is 
         not added in the case when the DELIMITER is the first command 
-        entered with an empty glob buffer. 
+        entered with an empty glob buffer. However, if the delimiter is
+        part of a string or a comment, the new line should be added. (e.g.
+        SELECT '\ndelimiter\n';\n)
       */
       *out++='\n';
       length++;
@@ -3655,8 +3661,10 @@
   MYSQL_ROW	cur;
   MYSQL_FIELD	*field;
   bool		*num_flag;
+  size_t        sz;
 
-  num_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result));
+  sz= sizeof(bool) * mysql_num_fields(result);
+  num_flag= (bool *) my_safe_alloca(sz, MAX_ALLOCA_SIZE);
   if (column_types_flag)
   {
     print_field_types(result);
@@ -3757,7 +3765,7 @@
     (void) tee_fputs("\n", PAGER);
   }
   tee_puts((char*) separator.ptr(), PAGER);
-  my_afree((uchar*) num_flag);
+  my_safe_afree((bool *) num_flag, sz, MAX_ALLOCA_SIZE);
 }
 
 /**
@@ -4677,6 +4685,8 @@
 sql_real_connect(char *host,char *database,char *user,char *password,
 		 uint silent)
 {
+  my_bool interactive= status.batch ? FALSE : TRUE;
+
   if (connected)
   {
     connected= 0;
@@ -4767,6 +4777,7 @@
   mysql_options(&mysql, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(&mysql, MYSQL_OPT_CONNECT_ATTR_ADD, 
                  "program_name", "mysql");
+  mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, &interactive);
 
   if (!mysql_real_connect(&mysql, host, user, password,
                           database, opt_mysql_port, opt_mysql_unix_port,
 
=== modified file 'Percona-Server/client/mysql_config_editor.cc'
--- Percona-Server/client/mysql_config_editor.cc	2012-08-30 18:29:28 +0000
+++ Percona-Server/client/mysql_config_editor.cc	2013-02-13 06:17:00 +0000
@@ -35,6 +35,7 @@
 
 #define MYSQL_CONFIG_EDITOR_VERSION "1.0"
 #define MY_LINE_MAX 4096
+#define MAX_COMMAND_LIMIT 100
 /*
   Header length for the login file.
   4-byte (unused) + LOGIN_KEY_LEN
@@ -55,37 +56,41 @@
 static char my_key[LOGIN_KEY_LEN];
 
 static my_bool opt_verbose, opt_all, tty_password= 0, opt_warn,
-               login_path_specified= TRUE;
+               opt_remove_host, opt_remove_pass, opt_remove_user,
+               login_path_specified= FALSE;
 
-int execute_commands(int argc, char **argv);
+static int execute_commands(int command);
+static int set_command(void);
+static int remove_command(void);
+static int print_command(void);
 static void print_login_path(DYNAMIC_STRING *file_buf, const char *path_name);
 static void remove_login_path(DYNAMIC_STRING *file_buf, const char *path_name);
 static char* locate_login_path(DYNAMIC_STRING *file_buf, const char *path_name);
 static my_bool check_and_create_login_file(void);
 static void mask_password_and_print(char *buf);
-static void reset_login_file(bool gen_key);
+static int reset_login_file(bool gen_key);
 
 static int encrypt_buffer(const char *plain, int plain_len, char cipher[]);
 static int decrypt_buffer(const char *cipher, int cipher_len, char plain[]);
 static int encrypt_and_write_file(DYNAMIC_STRING *file_buf);
 static int read_and_decrypt_file(DYNAMIC_STRING *file_buf);
+static int do_handle_options(int argc, char *argv[]);
+static void remove_options(DYNAMIC_STRING *file_buf, const char *path_name);
+static void remove_option(DYNAMIC_STRING *file_buf, const char *path_name,
+                          const char* option_name);
 void generate_login_key(void);
-int read_login_key(void);
-int add_header(void);
+static int read_login_key(void);
+static int add_header(void);
+static void my_perror(const char *msg);
 
 static void verbose_msg(const char *fmt, ...);
 static void print_version(void);
-static void usage(void);
+static void usage_program(void);
+static void usage_command(int command);
 extern "C" my_bool get_one_option(int optid, const struct my_option *opt,
                                   char *argument);
 
-
-/*
-  The order of commands must be the same as command_names,
-  except MY_CONFIG_ERROR.
-*/
 enum commands {
-  MY_CONFIG_ERROR,
   MY_CONFIG_SET,
   MY_CONFIG_REMOVE,
   MY_CONFIG_PRINT,
@@ -93,249 +98,563 @@
   MY_CONFIG_HELP
 };
 
-static const char *command_names[]= {
-  "set",
-  "remove",
-  "print",
-  "reset",
-  "help",
-  NullS
+struct my_command_data {
+  const int id;
+  const char *name;
+  const char *description;
+  my_option *options;
+  my_bool (*get_one_option_func)(int optid,
+                                 const struct my_option *opt,
+                                 char *argument);
 };
 
-static TYPELIB command_typelib=
-{ array_elements(command_names)-1, "commands", command_names, NULL};
 
-static struct my_option my_long_options[] =
+/* mysql_config_editor utility options. */
+static struct my_option my_program_long_options[]=
 {
-  {"all", OPT_CONFIG_ALL, "Used with print command to print all login paths.",
-    &opt_all, &opt_all, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifndef DBUG_OFF
   {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",
    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #endif
   {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"verbose", 'v', "Write more information.", &opt_verbose,
+   &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+
+/* Command-specific options. */
+
+/* SET command options. */
+static struct my_option my_set_command_options[]=
+{
+  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
   {"host", 'h', "Host name to be entered into the login file.", &opt_host,
-    &opt_host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"login-path", 'G', "Name of the login path to use in the login file.",
-    &opt_login_path, &opt_login_path, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
-    0, 0, 0},
+   &opt_host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"login-path", 'G', "Name of the login path to use in the login file. "
+   "(Default : client)", &opt_login_path, &opt_login_path, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"password", 'p', "Prompt for password to be entered into the login file.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"user", 'u', "User name to be entered into the login file.", &opt_user,
-    &opt_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"verbose", 'v', "Write more information.", &opt_verbose,
-   &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,
-   NO_ARG, 0, 0, 0, 0, 0, 0},
+   &opt_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"warn", 'w', "Warn and ask for confirmation if set command attempts to "
    "overwrite an existing login path (enabled by default).",
    &opt_warn, &opt_warn, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
-  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
-};
-
+  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+
+/* REMOVE command options. */
+static struct my_option my_remove_command_options[]=
+{
+  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"host", 'h', "Remove host name from the login path.",
+   &opt_remove_host, &opt_remove_host, 0, GET_BOOL, NO_ARG, 0, 0, 0,
+   0, 0, 0},
+  {"login-path", 'G', "Name of the login path from which options to "
+   "be removed (entire path would be removed if none of user, password, "
+   "or host options are specified). (Default : client)", &opt_login_path,
+   &opt_login_path, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"password", 'p', "Remove password from the login path.",
+   &opt_remove_pass, &opt_remove_pass, 0, GET_BOOL, NO_ARG, 0, 0, 0,
+   0, 0, 0},
+  {"user", 'u', "Remove user name from the login path.", &opt_remove_user,
+   &opt_remove_user, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"warn", 'w', "Warn and ask for confirmation if remove command attempts "
+   "to remove the default login path (client) if no login path is specified "
+   "(enabled by default).", &opt_warn, &opt_warn, 0, GET_BOOL, NO_ARG, 1,
+   0, 0, 0, 0, 0},
+  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+
+/* PRINT command options. */
+static struct my_option my_print_command_options[]=
+{
+  {"all", OPT_CONFIG_ALL, "Used with print command to print all login paths.",
+   &opt_all, &opt_all, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"login-path", 'G', "Name of the login path to use in the login file. "
+   "(Default : client)", &opt_login_path, &opt_login_path, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+
+/* RESET command options. */
+static struct my_option my_reset_command_options[]=
+{
+  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+
+/* HELP command options. */
+static struct my_option my_help_command_options[]=
+{
+  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
 
 my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
+my_program_get_one_option(int optid,
+                          const struct my_option *opt __attribute__((unused)),
+                          char *argument)
 {
   switch(optid) {
   case '#':
     DBUG_PUSH(argument ? argument : "d:t:o,/tmp/mysql_config_editor.trace");
     break;
+  case 'V':
+    print_version();
+    exit(0);
+    break;
+  case '?':
+    usage_program();
+    exit(0);
+    break;
+  }
+  return 0;
+}
+
+my_bool
+my_set_command_get_one_option(int optid,
+                              const struct my_option *opt __attribute__((unused)),
+                              char *argument)
+{
+  switch(optid) {
   case 'p':
     tty_password= 1;
     break;
-  case 'V':
-    print_version();
-    exit(0);
-    break;
-  case '?':
-    usage();
-    exit(0);
-    break;
-  }
-  return 0;
-}
+  case 'G':
+    login_path_specified= TRUE;
+    break;
+  case '?':
+    usage_command(MY_CONFIG_SET);
+    exit(0);
+    break;
+  }
+  return 0;
+}
+
+my_bool
+my_remove_command_get_one_option(int optid,
+                                 const struct my_option *opt __attribute__((unused)),
+                                 char *argument)
+{
+  switch(optid) {
+  case 'G':
+    login_path_specified= TRUE;
+    break;
+  case '?':
+    usage_command(MY_CONFIG_REMOVE);
+    exit(0);
+    break;
+  }
+  return 0;
+}
+
+my_bool
+my_print_command_get_one_option(int optid,
+                                const struct my_option *opt __attribute__((unused)),
+                                char *argument)
+{
+  switch(optid) {
+  case 'G':
+    login_path_specified= TRUE;
+    break;
+  case '?':
+    usage_command(MY_CONFIG_PRINT);
+    exit(0);
+    break;
+  }
+  return 0;
+}
+
+my_bool
+my_reset_command_get_one_option(int optid,
+                                const struct my_option *opt __attribute__((unused)),
+                                char *argument)
+{
+  switch(optid) {
+  case '?':
+    usage_command(MY_CONFIG_RESET);
+    exit(0);
+    break;
+  }
+  return 0;
+}
+
+static struct my_command_data command_data[]=
+{
+  {
+    MY_CONFIG_SET,
+    "set",
+    "Write a login path to the login file.",
+    my_set_command_options,
+    my_set_command_get_one_option
+  },
+  {
+    MY_CONFIG_REMOVE,
+    "remove",
+    "Remove a login path from the login file.",
+    my_remove_command_options,
+    my_remove_command_get_one_option
+  },
+  {
+    MY_CONFIG_PRINT,
+    "print",
+    "Print the contents of login file in unencrypted form.",
+    my_print_command_options,
+    my_print_command_get_one_option
+  },
+  {
+    MY_CONFIG_RESET,
+    "reset",
+    "Empty the contents of the login file. The file is created\n"
+    "if it does not exist.",
+    my_reset_command_options,
+    my_reset_command_get_one_option
+  },
+  {
+    MY_CONFIG_HELP,
+    "help",
+    "Display a help message and exit.",
+    my_help_command_options,
+    NULL
+  },
+  {
+    0, NULL, NULL, NULL, NULL
+  }
+};
 
 
 int main(int argc, char *argv[])
 {
+  MY_INIT(argv[0]);
   DBUG_ENTER("main");
-  int error;
-
-  MY_INIT(argv[0]);
-
-  if ((error= handle_options(&argc, &argv, my_long_options, get_one_option)))
+  int command, rc= 0;
+
+  command= do_handle_options(argc, argv);
+
+  if (command > -1)
+    rc= execute_commands(command);
+
+  if (rc == -1)
   {
-    exit(error);
+    my_perror("operation failed.");
+    DBUG_RETURN(1);
   }
-
-  if (argc == 0)
+  DBUG_RETURN(0);
+}
+
+
+/**
+  Handle all the command line arguments.
+
+  program_name [program options] [command [command options]]
+
+*/
+static int do_handle_options(int argc, char *argv[])
+{
+  DBUG_ENTER("do_handle_options");
+
+  const char *command_list[MAX_COMMAND_LIMIT + 1];
+  char **saved_argv= argv;
+  char **argv_cmd;
+  char *ptr;                                    /* for free. */
+  int argc_cmd;
+  int rc, i, command= -1;
+
+  if (argc < 2)
   {
-    usage();
+    usage_program();
     exit(1);
   }
 
-  if (tty_password)
-    opt_password= get_tty_password(NullS);
-
-  /* if not, set it to 'client' (default) */
+  if (!(ptr= (char *) my_malloc((argc + 2) * sizeof(char *),
+                                MYF(MY_WME))))
+    goto error;
+
+  /* Handle program options. */
+
+  /* Prepare a list of supported commands to be used by my_handle_options(). */
+  for (i= 0; (command_data[i].name != NULL) && (i < MAX_COMMAND_LIMIT); i++)
+    command_list[i]= (char *) command_data[i].name;
+  command_list[i]= NULL;
+
+  if ((rc= my_handle_options(&argc, &argv, my_program_long_options,
+                             my_program_get_one_option, command_list)))
+    exit(rc);
+
+  if (argc == 0)                                /* No command specified. */
+    goto done;
+
+  for (i= 0; command_data[i].name != NULL; i++)
+  {
+    if (!strcmp(command_data[i].name, argv[0]))
+    {
+      command= i;
+      break;
+    }
+  }
+
+  if (command == -1)
+    goto error;
+
+  /* Handle command options. */
+
+  argv_cmd= (char **)ptr;
+  argc_cmd= argc + 1;
+
+  /* Prepare a command line (argv) using the rest of the options. */
+  argv_cmd[0]= saved_argv[0];
+  memcpy((uchar *) (argv_cmd + 1), (uchar *) (argv),
+         (argc * sizeof(char *)));
+  argv_cmd[argc_cmd]= 0;
+
+  if ((rc= handle_options(&argc_cmd, &argv_cmd,
+                          command_data[command].options,
+                          command_data[command].get_one_option_func)))
+    exit(rc);
+
+  /* Do not allow multiple commands. */
+  if ( argc_cmd > 1)
+    goto error;
+
+  /* If NULL, set it to 'client' (default) */
   if (!opt_login_path)
-  {
-    login_path_specified= FALSE;
     opt_login_path= my_strdup("client", MYF(MY_WME));
-  }
-
-  error= execute_commands(argc, argv);
-  exit(error ? 1 : 0);
-  DBUG_RETURN(0);
+
+done:
+  my_free(ptr);
+  DBUG_RETURN(command);
+
+error:
+  my_free(ptr);
+  usage_program();
+  exit(1);
 }
 
 
-int execute_commands(int argc, char **argv)
+static int execute_commands(int command)
 {
   DBUG_ENTER("execute_commands");
-  DYNAMIC_STRING file_buf, path_buf;
-  int error= 0;
-
-  init_dynamic_string(&path_buf, "", MY_LINE_MAX, MY_LINE_MAX);
-  init_dynamic_string(&file_buf, "", file_size, 3 * MY_LINE_MAX);
-
-  for (; argc > 0; argv++, argc--)
-  {
-    if ((error= check_and_create_login_file()))
-      goto done;
-
-    switch(find_type(argv[0], &command_typelib, FIND_TYPE_BASIC)) {
-      case MY_CONFIG_SET :
-        verbose_msg("Executing set command.\n");
-        if (file_size)
-        {
-          if (read_and_decrypt_file(&file_buf) == -1)
-            goto done;
-        }
-
-        dynstr_append(&path_buf, "[");          /* --login=path */
-        if (opt_login_path)
-          dynstr_append(&path_buf, opt_login_path);
-        else
-          dynstr_append(&path_buf, "client");
-        dynstr_append(&path_buf, "]");
-
-        if (opt_user)                           /* --user */
-        {
-          dynstr_append(&path_buf, "\nuser = ");
-          dynstr_append(&path_buf, opt_user);
-        }
-
-        if (opt_password)                       /* --password */
-        {
-          dynstr_append(&path_buf, "\npassword = ");
-          dynstr_append(&path_buf, opt_password);
-        }
-
-        if (opt_host)                           /* --host */
-        {
-          dynstr_append(&path_buf, "\nhost = ");
-          dynstr_append(&path_buf, opt_host);
-        }
-
-        dynstr_append(&path_buf, "\n");
-
-        /* Warn if login path already exists */
-        if (opt_warn && ((locate_login_path (&file_buf, opt_login_path))
-                         != NULL))
-        {
-          int choice;
-          printf ("WARNING : \'%s\' path already exists and will be "
-                  "overwritten. \n Continue? (Press y|Y for Yes, any "
-                  "other key for No) : ",
-                  opt_login_path);
-          choice= getchar();
-
-          if (choice != (int) 'y' && choice != (int) 'Y')
-            break;                              /* skip */
-        }
-
-        /* Remove the login path. */
-        remove_login_path(&file_buf, opt_login_path);
-
-        /* Append the new login path to the file buffer. */
-        dynstr_append(&file_buf, path_buf.str);
-
-        encrypt_and_write_file(&file_buf);
-        break;
-
-      case MY_CONFIG_REMOVE :
-        verbose_msg("Executing remove command.\n");
-        if (file_size)
-        {
-          if (read_and_decrypt_file(&file_buf) == -1)
-            goto done;
-        }
-        else
-          break;                                /* Nothing to remove, skip.. */
-
-        /* Warn if no login path is specified. */
-        if (opt_warn &&
-            ((locate_login_path (&file_buf, opt_login_path)) != NULL) &&
-            (login_path_specified == FALSE)
-            )
-        {
-          int choice;
-          printf ("WARNING : No login path specified, so default login path "
-                  "will be removed. \n Continue? (Press y|Y for Yes, any "
-                  "other key for No) : ");
-          choice= getchar();
-
-          if (choice != (int) 'y' && choice != (int) 'Y')
-            break;                              /* skip */
-        }
-
-        remove_login_path(&file_buf, opt_login_path);
-
-        encrypt_and_write_file(&file_buf);
-        break;
-
-      case MY_CONFIG_PRINT :
-        verbose_msg("Executing print command.\n");
-        if (file_size)
-        {
-          if (read_and_decrypt_file(&file_buf) == -1)
-            goto done;
-        }
-        else
-          break;                                /* Nothing to print, skip..*/
-
-        print_login_path(&file_buf, opt_login_path);
-        break;
-
-      case MY_CONFIG_RESET :
-        verbose_msg("Resetting login file.\n");
-        reset_login_file(1);
-        break;
-
-      case MY_CONFIG_HELP :
-        verbose_msg("Printing usage info.\n");
-        usage();
-        break;
-
-      default :
-        printf("Error! Unknown command.\n");
-        exit(1);
-    }
-    dynstr_trunc(&file_buf, 0);
-    dynstr_trunc(&path_buf, 0);
-
-    my_close(g_fd, MYF(MY_WME));
-  }
-
-done:
-  dynstr_free(&file_buf);
-  dynstr_free(&path_buf);
-
-  DBUG_RETURN(error);
+  int rc= 0;
+
+  if ((rc= check_and_create_login_file()))
+    goto done;
+
+  switch(command_data[command].id) {
+    case MY_CONFIG_SET :
+      verbose_msg("Executing set command.\n");
+      rc= set_command();
+      break;
+
+    case MY_CONFIG_REMOVE :
+      verbose_msg("Executing remove command.\n");
+      rc= remove_command();
+      break;
+
+    case MY_CONFIG_PRINT :
+      verbose_msg("Executing print command.\n");
+      rc= print_command();
+     break;
+
+    case MY_CONFIG_RESET :
+      verbose_msg("Resetting login file.\n");
+      rc= reset_login_file(1);
+      break;
+
+    case MY_CONFIG_HELP :
+      verbose_msg("Printing usage info.\n");
+      usage_program();
+      break;
+
+    default :
+      my_perror("unknown command.");
+      exit(1);
+  }
+
+  my_close(g_fd, MYF(MY_WME));
+
+done:
+  DBUG_RETURN(rc);
+}
+
+
+/**
+  Execute 'set' command.
+
+  @param void
+
+  @return -1              Error
+           0              Success
+*/
+
+static int set_command(void)
+{
+  DBUG_ENTER("set_command");
+
+  DYNAMIC_STRING file_buf, path_buf;
+
+  init_dynamic_string(&path_buf, "", MY_LINE_MAX, MY_LINE_MAX);
+  init_dynamic_string(&file_buf, "", file_size, 3 * MY_LINE_MAX);
+
+  if (tty_password)
+    opt_password= get_tty_password(NullS);
+
+  if (file_size)
+  {
+    if (read_and_decrypt_file(&file_buf) == -1)
+      goto error;
+  }
+
+  dynstr_append(&path_buf, "[");                /* --login=path */
+  if (opt_login_path)
+    dynstr_append(&path_buf, opt_login_path);
+  else
+    dynstr_append(&path_buf, "client");
+  dynstr_append(&path_buf, "]");
+
+  if (opt_user)                                 /* --user */
+  {
+    dynstr_append(&path_buf, "\nuser = ");
+    dynstr_append(&path_buf, opt_user);
+  }
+
+  if (opt_password)                             /* --password */
+  {
+    dynstr_append(&path_buf, "\npassword = ");
+    dynstr_append(&path_buf, opt_password);
+  }
+
+  if (opt_host)                                 /* --host */
+  {
+    dynstr_append(&path_buf, "\nhost = ");
+    dynstr_append(&path_buf, opt_host);
+  }
+
+  dynstr_append(&path_buf, "\n");
+
+  /* Warn if login path already exists */
+  if (opt_warn && ((locate_login_path (&file_buf, opt_login_path))
+                   != NULL))
+  {
+    int choice;
+    printf ("WARNING : \'%s\' path already exists and will be "
+            "overwritten. \n Continue? (Press y|Y for Yes, any "
+            "other key for No) : ",
+            opt_login_path);
+    choice= getchar();
+
+    if (choice != (int) 'y' && choice != (int) 'Y')
+      goto done;                                /* skip */
+  }
+
+  /* Remove the login path. */
+  remove_login_path(&file_buf, opt_login_path);
+
+  /* Append the new login path to the file buffer. */
+  dynstr_append(&file_buf, path_buf.str);
+
+  if (encrypt_and_write_file(&file_buf) == -1)
+    goto error;
+
+done:
+  dynstr_free(&file_buf);
+  dynstr_free(&path_buf);
+  DBUG_RETURN(0);
+
+error:
+  dynstr_free(&file_buf);
+  dynstr_free(&path_buf);
+  DBUG_RETURN(-1);
+}
+
+static int remove_command(void) {
+  DBUG_ENTER("remove_command");
+
+  DYNAMIC_STRING file_buf, path_buf;
+
+  init_dynamic_string(&path_buf, "", MY_LINE_MAX, MY_LINE_MAX);
+  init_dynamic_string(&file_buf, "", file_size, 3 * MY_LINE_MAX);
+
+  if (file_size)
+  {
+    if (read_and_decrypt_file(&file_buf) == -1)
+      goto error;
+  }
+  else
+    goto done;                                  /* Nothing to remove, skip.. */
+
+  /* Warn if no login path is specified. */
+  if (opt_warn &&
+      ((locate_login_path (&file_buf, opt_login_path)) != NULL) &&
+      (login_path_specified == FALSE)
+      )
+  {
+    int choice;
+    printf ("WARNING : No login path specified, so options from the default "
+            "login path will be removed.\nContinue? (Press y|Y for Yes, "
+            "any other key for No) : ");
+    choice= getchar();
+
+    if (choice != (int) 'y' && choice != (int) 'Y')
+      goto done;                                /* skip */
+  }
+
+  remove_options(&file_buf, opt_login_path);
+
+  if (encrypt_and_write_file(&file_buf) == -1)
+    goto error;
+
+done:
+  dynstr_free(&file_buf);
+  dynstr_free(&path_buf);
+  DBUG_RETURN(0);
+
+error:
+  dynstr_free(&file_buf);
+  dynstr_free(&path_buf);
+  DBUG_RETURN(-1);
+}
+
+/**
+  Execute 'print' command.
+
+  @param void
+
+  @return -1              Error
+           0              Success
+*/
+
+static int print_command(void)
+{
+  DBUG_ENTER("print_command");
+  DYNAMIC_STRING file_buf;
+
+  init_dynamic_string(&file_buf, "", file_size, 3 * MY_LINE_MAX);
+
+  if (file_size)
+  {
+    if (read_and_decrypt_file(&file_buf) == -1)
+      goto error;
+  }
+  else
+    goto done;                                  /* Nothing to print, skip..*/
+
+  print_login_path(&file_buf, opt_login_path);
+
+done:
+  dynstr_free(&file_buf);
+  DBUG_RETURN(0);
+
+error:
+  dynstr_free(&file_buf);
+  DBUG_RETURN(-1);
 }
 
 
@@ -345,8 +664,8 @@
 
   @param void
 
-  @return 1               error
-          0               success
+  @return -1              Error
+           0              Success
 */
 
 static my_bool check_and_create_login_file(void)
@@ -370,7 +689,7 @@
   /* Get the login file name. */
   if (! my_default_get_login_file(my_login_file, sizeof(my_login_file)))
   {
-    verbose_msg("Error! Failed to set login file name.\n");
+    my_perror("failed to set login file name");
     goto error;
   }
 
@@ -402,7 +721,10 @@
       /* Create the login directory. */
       verbose_msg("%s directory doesn't exist, creating it.\n", login_dir);
       if (my_mkdir(login_dir, 0, MYF(0)))
+      {
+        my_perror("failed to create the directory");
         goto error;
+      }
     }
   }
 #endif
@@ -423,17 +745,16 @@
       verbose_msg("File has the required permission.\nOpening the file.\n");
       if ((g_fd= my_open(my_login_file, access_flag, MYF(MY_WME))) == -1)
       {
-        verbose_msg("Error! Couldn't open the file.\n");
+        my_perror("couldn't open the file");
         goto error;
       }
     }
     else
     {
       verbose_msg("File does not have the required permission.\n");
-      if (opt_warn)
-        printf ("WARNING : Login file does not have the required"
-                " file permissions.\nPlease set the mode to 600 &"
-                " run the command again.\n");
+      printf ("WARNING : Login file does not have the required"
+              " file permissions.\nPlease set the mode to 600 &"
+              " run the command again.\n");
       goto error;
     }
   }
@@ -443,7 +764,7 @@
     if ((g_fd= my_create(my_login_file, create_mode, access_flag,
                        MYF(MY_WME)) == -1))
     {
-      verbose_msg("Error! Couldn't create the login file.\n");
+      my_perror("couldn't create the login file");
       goto error;
     }
     else
@@ -453,7 +774,7 @@
 
       if((g_fd= my_open(my_login_file, access_flag, MYF(MY_WME))) == -1)
       {
-        verbose_msg("Error! couldn't open the file.\n");
+        my_perror("couldn't open the file");
         goto error;
       }
       file_size= 0;
@@ -475,7 +796,7 @@
   DBUG_RETURN(0);
 
 error:
-  DBUG_RETURN(1);
+  DBUG_RETURN(-1);
 }
 
 
@@ -575,6 +896,92 @@
 
 
 /**
+  Remove multiple options from a login path.
+*/
+static void remove_options(DYNAMIC_STRING *file_buf, const char *path_name)
+{
+  /* If nope of the options are specified remove the entire path. */
+  if (!opt_remove_host && !opt_remove_pass && !opt_remove_user)
+  {
+    remove_login_path(file_buf, path_name);
+    return;
+  }
+
+  if (opt_remove_user)
+    remove_option(file_buf, path_name, "user");
+
+  if (opt_remove_pass)
+    remove_option(file_buf, path_name, "password");
+
+  if (opt_remove_host)
+    remove_option(file_buf, path_name, "host");
+}
+
+
+/**
+  Remove an option from a login path.
+*/
+static void remove_option(DYNAMIC_STRING *file_buf, const char *path_name,
+                          const char* option_name)
+{
+  DBUG_ENTER("remove_option");
+
+  char *start= NULL, *end= NULL;
+  char *search_str;
+  int search_len, shift_len;
+  bool option_found= FALSE;
+
+  search_str= (char *) my_malloc((uint) strlen(option_name) + 2, MYF(MY_WME));
+  sprintf(search_str, "\n%s", option_name);
+
+  if ((start= locate_login_path(file_buf, path_name)) == NULL)
+    /* login path was not found, skip.. */
+    goto done;
+
+  end= strstr(start, "\n[");                    /* Next path. */
+
+  if (end)
+    search_len= end - start;
+  else
+    search_len= file_buf->length - (start - file_buf->str);
+
+  while(search_len > 1)
+  {
+    if (!strncmp(start, search_str, strlen(search_str)))
+    {
+      /* Option found. */
+      end= start;
+      while(*(++ end) != '\n')
+      {}
+      option_found= TRUE;
+      break;
+    }
+    else
+    {
+      /* Move to next line. */
+      while( (-- search_len > 1) && (*(++ start) != '\n'))
+      {}
+    }
+  }
+
+  if (option_found)
+  {
+    shift_len= file_buf->length - (end - file_buf->str);
+
+    file_buf->length -= (end - start);
+
+    while(shift_len --)
+      *(start ++)= *(end ++);
+    *start= '\0';
+  }
+
+done:
+  my_free(search_str);
+  DBUG_VOID_RETURN;
+}
+
+
+/**
   Remove the specified login path from the login file.
 
   @param file_buf  [in]   Buffer storing the unscrambled login
@@ -627,27 +1034,34 @@
   @param gen_key [in]     Flag to control the generation of
                           a new key.
 
-  @return                 void
+  @return -1              Error
+           0              Success
 */
 
-static void reset_login_file(bool gen_key)
+static int reset_login_file(bool gen_key)
 {
   DBUG_ENTER("reset_login_file");
 
   if (my_chsize(g_fd, 0, 0, MYF(MY_WME)))
+  {
     verbose_msg("Error while truncating the file.\n");
+    goto error;
+  }
 
   /* Seek to the beginning of the file. */
-  my_seek(g_fd, 0L, SEEK_SET, MYF(MY_WME));
+  if (my_seek(g_fd, 0L, SEEK_SET, MYF(MY_WME) == MY_FILEPOS_ERROR))
+    goto error;                                 /* Error. */
 
   if (gen_key)
     generate_login_key();                       /* Generate a new key. */
 
-  add_header();
-
-  file_size= 0;
-
-  DBUG_VOID_RETURN;
+  if (add_header() == -1)
+    goto error;
+
+  DBUG_RETURN(0);
+
+error:
+  DBUG_RETURN(0);
 }
 
 
@@ -698,8 +1112,8 @@
   @param file_buf  [in]   Buffer storing the unscrambled login
                           file contents.
 
-  @return                 -1, if error encountered;
-                          bytes written to the file, otherwise.
+  @return -1 Error
+           0 Success
 
   @note The contents of the file buffer are encrypted
         on a line-by-line basis with each line having
@@ -717,12 +1131,13 @@
   uint bytes_read=0, len= 0;
   int enc_len= 0;                               // Can be negative.
 
-  reset_login_file(0);
+  if (reset_login_file(0) == -1)
+    goto error;
 
   /* Move past key first. */
   if (my_seek(g_fd, MY_LOGIN_HEADER_LEN, SEEK_SET, MYF(MY_WME))
       != (MY_LOGIN_HEADER_LEN))
-    DBUG_RETURN(-1);                            /* Error while seeking. */
+    goto error;                                 /* Error while seeking. */
 
 
   tmp= &file_buf->str[bytes_read];
@@ -745,10 +1160,7 @@
 
     if ((enc_len= encrypt_buffer(&file_buf->str[bytes_read],
                                  ++ len, cipher + MAX_CIPHER_STORE_LEN)) < 0)
-    {
-      verbose_msg("Error! failed to encrypt the login file buffer.\n");
       goto error;
-    }
 
     bytes_read += len;
 
@@ -760,10 +1172,7 @@
 
     if ((my_write(g_fd, (const uchar *)cipher, enc_len + MAX_CIPHER_STORE_LEN,
                   MYF(MY_WME))) != (enc_len + MAX_CIPHER_STORE_LEN))
-    {
-      verbose_msg("Error! couldn't write to the file.\n");
       goto error;
-    }
   }
 
   verbose_msg("Successfully written encrypted data to the login file.\n");
@@ -771,9 +1180,10 @@
   /* Update file_size */
   file_size= bytes_read;
 
-  DBUG_RETURN(file_size);
+  DBUG_RETURN(0);
 
 error:
+  my_perror("couldn't encrypt the file");
   DBUG_RETURN(-1);
 }
 
@@ -785,10 +1195,8 @@
   @param file_buf  [in]   Buffer for storing the unscrambled login
                           file contents.
 
-  @return                 -1, if error encountered;
-                          total length of plain content added to
-                          the file buffer, otherwise.
-
+  @return -1 Error
+           0 Success
 */
 
 static int read_and_decrypt_file(DYNAMIC_STRING *file_buf)
@@ -797,12 +1205,12 @@
 
   char cipher[MY_LINE_MAX], plain[MY_LINE_MAX];
   uchar len_buf[MAX_CIPHER_STORE_LEN];
-  int cipher_len= 0, dec_len= 0, total_len= 0;
+  int cipher_len= 0, dec_len= 0;
 
   /* Move past key first. */
   if (my_seek(g_fd, MY_LOGIN_HEADER_LEN, SEEK_SET, MYF(MY_WME))
       != (MY_LOGIN_HEADER_LEN))
-    DBUG_RETURN(-1);                            /* Error while seeking. */
+    goto error;                                 /* Error while seeking. */
 
   /* First read the length of the cipher. */
   while (my_read(g_fd, len_buf, MAX_CIPHER_STORE_LEN,
@@ -811,25 +1219,25 @@
     cipher_len= sint4korr(len_buf);
 
     if (cipher_len > MY_LINE_MAX)
-      DBUG_RETURN(-1);
+      goto error;
 
     /* Now read 'cipher_len' bytes from the file. */
     if ((int) my_read(g_fd, (uchar *) cipher, cipher_len, MYF(MY_WME)) == cipher_len)
     {
       if ((dec_len= decrypt_buffer(cipher, cipher_len, plain)) < 0)
-      {
-        verbose_msg("Error! failed to decrypt the file.\n");
-        DBUG_RETURN(-1);
-      }
+        goto error;
 
-      total_len += dec_len;
       plain[dec_len]= 0;
       dynstr_append(file_buf, plain);
     }
   }
 
   verbose_msg("Successfully decrypted the login file.\n");
-  DBUG_RETURN(total_len);
+  DBUG_RETURN(0);
+
+error:
+  my_perror("couldn't decrypt the file");
+  DBUG_RETURN(-1);
 }
 
 
@@ -852,13 +1260,9 @@
   aes_len= my_aes_get_size(plain_len);
 
   if (my_aes_encrypt(plain, plain_len, cipher, my_key, LOGIN_KEY_LEN) == aes_len)
-  {
     DBUG_RETURN(aes_len);
-  }
-  else
-  {
-    fprintf(stderr, "Error! failed to encrypt.\n");
-  }
+
+  verbose_msg("Error! Couldn't encrypt the buffer.\n");
   DBUG_RETURN(-1);                              /* Error */
 }
 
@@ -881,14 +1285,9 @@
 
   if ((aes_length= my_aes_decrypt(cipher, cipher_len, (char *) plain,
                                   my_key, LOGIN_KEY_LEN)) > 0)
-  {
     DBUG_RETURN(aes_length);
-  }
-  else
-  {
-    fprintf(stderr, "Error! failed to decrypt.\n");
-  }
 
+  verbose_msg("Error! Couldn't decrypt the buffer.\n");
   DBUG_RETURN(-1);                              /* Error */
 }
 
@@ -901,7 +1300,7 @@
                           length written, otherwise.
 */
 
-int add_header(void)
+static int add_header(void)
 {
   DBUG_ENTER("add_header");
 
@@ -910,23 +1309,18 @@
 
   /* Write 'unused' bytes first. */
   if ((my_write(g_fd, (const uchar *) unused, 4, MYF(MY_WME))) != 4)
-  {
-    verbose_msg("Error! couldn't write to the file.\n");
     goto error;
-  }
 
   /* Write the login key. */
   if ((my_write(g_fd, (const uchar *)my_key, LOGIN_KEY_LEN, MYF(MY_WME)))
       != LOGIN_KEY_LEN)
-  {
-    verbose_msg("Error! couldn't write to the file.\n");
     goto error;
-  }
 
   verbose_msg("Key successfully written to the file.\n");
   DBUG_RETURN(MY_LOGIN_HEADER_LEN);
 
 error:
+  my_perror("file write operation failed");
   DBUG_RETURN(-1);
 }
 
@@ -955,24 +1349,25 @@
            0              Success
 */
 
-int read_login_key(void)
+static int read_login_key(void)
 {
   DBUG_ENTER("read_login_key");
 
   verbose_msg("Reading the login key.\n");
   /* Move past the unused buffer. */
   if (my_seek(g_fd, 4, SEEK_SET, MYF(MY_WME)) != 4)
-    DBUG_RETURN(-1);                            /* Error while seeking. */
+    goto error;                                 /* Error while seeking. */
 
   if (my_read(g_fd, (uchar *)my_key, LOGIN_KEY_LEN, MYF(MY_WME))
       != LOGIN_KEY_LEN)
-  {
-    verbose_msg("Failed to read login key.\n");
-    DBUG_RETURN(-1);
-  }
+    goto error;                                 /* Error while reading. */
 
   verbose_msg("Login key read successfully.\n");
   DBUG_RETURN(0);
+
+error:
+  my_perror("file read operation failed");
+  DBUG_RETURN(-1);
 }
 
 
@@ -992,22 +1387,48 @@
   DBUG_VOID_RETURN;
 }
 
-
-static void usage(void)
-{
-  print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2012"));
-  puts("MySQL Configuration Utility.");
-  printf("Usage: %s command [options] \n", my_progname);
-  my_print_help(my_long_options);
-  my_print_variables(my_long_options);
+static void my_perror(const char *msg)
+{
+  char errbuf[MYSYS_STRERROR_SIZE];
+
+  if (errno == 0)
+    fprintf(stderr, "%s\n", (msg) ? msg : "");
+  else
+    fprintf(stderr, "%s : %s\n", (msg) ? msg : "",
+            my_strerror(errbuf, sizeof(errbuf), errno));
+  // reset errno
+  errno= 0;
+}
+
+static void usage_command(int command)
+{
+  print_version();
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2012"));
+  puts("MySQL Configuration Utility.");
+  printf("\nDescription: %s\n", command_data[command].description);
+  printf("Usage: %s [program options] [%s [command options]]\n",
+         my_progname, command_data[command].name);
+  my_print_help(command_data[command].options);
+  my_print_variables(command_data[command].options);
+}
+
+
+static void usage_program(void)
+{
+  print_version();
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2012"));
+  puts("MySQL Configuration Utility.");
+  printf("Usage: %s [program options] [command [command options]]\n",
+         my_progname);
+  my_print_help(my_program_long_options);
+  my_print_variables(my_program_long_options);
   puts("\nWhere command can be any one of the following :\n\
-       set [options]             Sets user name/password/host name for a\n\
+       set [command options]     Sets user name/password/host name for a\n\
                                  given login path (section).\n\
-       remove [options]          Remove a login path from the login file.\n\
-       print [options]           Print all the options for a specified\n\
+       remove [command options]  Remove a login path from the login file.\n\
+       print [command options]   Print all the options for a specified\n\
                                  login path.\n\
-       reset                     Deletes the contents of the login file.\n\
+       reset [command options]   Deletes the contents of the login file.\n\
        help                      Display this usage/help information.\n");
 }
 
 
=== modified file 'Percona-Server/client/mysql_plugin.c'
--- Percona-Server/client/mysql_plugin.c	2012-10-03 06:13:53 +0000
+++ Percona-Server/client/mysql_plugin.c	2013-02-13 06:17:00 +0000
@@ -558,13 +558,18 @@
   const char *last_fn_libchar;
 #endif
 
+  if ((strlen(base_path) + strlen(subdir) + 1) > FN_REFLEN)
+  {
+    fprintf(stderr, "WARNING: Search path is too long\n");
+    return 1;
+  }
   strcpy(source_path, base_path);
   strcat(source_path, subdir);
   fn_format(new_path, tool_name, source_path, "", MY_UNPACK_FILENAME);
   if (file_exists(new_path))
   {
     strcpy(tool_path, new_path);
-    return 1;
+    return 0;
   }  
 
 #if __WIN__
@@ -588,11 +593,11 @@
     if (file_exists(win_abs_path))
     {
       strcpy(tool_path, win_abs_path);
-      return 1;
+      return 0;
     }
   }
 #endif
-  return 0;
+  return 1;
 }
 
 
@@ -617,12 +622,12 @@
   };
   for (i = 0 ; i < (int)array_elements(paths); i++)
   {
-    if (search_dir(base_path, tool_name, paths[i], tool_path))
+    if (!search_dir(base_path, tool_name, paths[i], tool_path))
     {
-      return 1;
+      return 0;
     }
   }
-  return 0;
+  return 1;
 }
 
 
@@ -1006,7 +1011,7 @@
   };
   for (i= 0; i < (int)array_elements(paths); i++)
   {
-    if (paths[i] && (search_paths(paths[i], tool_name, tool_path)))
+    if (paths[i] && !(search_paths(paths[i], tool_name, tool_path)))
       goto found;
   }
   fprintf(stderr, "WARNING: Cannot find %s.\n", tool_name);
 
=== modified file 'Percona-Server/client/mysql_upgrade.c'
--- Percona-Server/client/mysql_upgrade.c	2012-10-16 06:21:51 +0000
+++ Percona-Server/client/mysql_upgrade.c	2013-02-13 06:17:00 +0000
@@ -178,6 +178,7 @@
   }
   va_end(args);
 
+  DBUG_LEAVE;
   free_used_memory();
   my_end(my_end_arg);
   exit(1);
@@ -837,7 +838,7 @@
 
   dynstr_free(&ds_result);
   dynstr_free(&ds_script);
-  return found_real_errors;
+  DBUG_RETURN(found_real_errors);
 }
 
 
 
=== modified file 'Percona-Server/client/mysqladmin.cc'
--- Percona-Server/client/mysqladmin.cc	2012-12-04 08:24:59 +0000
+++ Percona-Server/client/mysqladmin.cc	2013-02-13 06:17:00 +0000
@@ -312,6 +312,8 @@
 int main(int argc,char *argv[])
 {
   int error= 0, ho_error;
+  int first_command;
+  my_bool can_handle_passwords;
   MYSQL mysql;
   char **commands, **save_argv;
 
@@ -387,6 +389,13 @@
     mysql_options(&mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN, 
                   (char*) &opt_enable_cleartext_plugin);
 
+  first_command= find_type(argv[0], &command_typelib, FIND_TYPE_BASIC);
+  can_handle_passwords= 
+    (first_command == ADMIN_PASSWORD || first_command == ADMIN_OLD_PASSWORD) ?
+    TRUE : FALSE;
+  mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
+                &can_handle_passwords);
+
   if (sql_connect(&mysql, option_wait))
   {
     /*
 
=== modified file 'Percona-Server/client/mysqlbinlog.cc'
--- Percona-Server/client/mysqlbinlog.cc	2012-10-16 06:21:51 +0000
+++ Percona-Server/client/mysqlbinlog.cc	2013-02-13 06:17:00 +0000
@@ -858,7 +858,20 @@
       reset_dynamic(&buff_ev);
 
       if (parent_query_skips)
+      {
+        /*
+          Even though there would be no need to set the flag here,
+          since parent_query_skips is never true when handling "COMMIT"
+          statements in the Query_log_event, we still need to handle DDL,
+          which causes a commit itself.
+        */
+        print_event_info->skipped_event_in_transaction= true;
         goto end;
+      }
+
+      if (((Query_log_event*) ev)->ends_group())
+        print_event_info->skipped_event_in_transaction= false;
+
       ev->print(result_file, print_event_info);
       if (head->error == -1)
         goto err;
@@ -905,7 +918,10 @@
         Note that Load event from 3.23 is not tested.
       */
       if (shall_skip_database(ce->db))
+      {
+        print_event_info->skipped_event_in_transaction= true;
         goto end;                // Next event
+      }
       /*
 	We print the event, but with a leading '#': this is just to inform 
 	the user of the original command; the command we want to execute 
@@ -1024,7 +1040,9 @@
       Execute_load_query_log_event *exlq= (Execute_load_query_log_event*)ev;
       char *fname= load_processor.grab_fname(exlq->file_id);
 
-      if (!shall_skip_database(exlq->db))
+      if (shall_skip_database(exlq->db))
+        print_event_info->skipped_event_in_transaction= true;
+      else
       {
         if (fname)
         {
@@ -1051,6 +1069,7 @@
       Table_map_log_event *map= ((Table_map_log_event *)ev);
       if (shall_skip_database(map->get_db_name()))
       {
+        print_event_info->skipped_event_in_transaction= true;
         print_event_info->m_table_map_ignored.set_table(map->get_table_id(), map);
         destroy_evt= FALSE;
         goto end;
@@ -1122,7 +1141,10 @@
 
       /* skip the event check */
       if (skip_event)
+      {
+        print_event_info->skipped_event_in_transaction= true;
         goto end;
+      }
 
       /*
         These events must be printed in base64 format, if printed.
@@ -1162,6 +1184,33 @@
       }
       break;
     }
+    case GTID_LOG_EVENT:
+    {
+      if (print_event_info->skipped_event_in_transaction == true)
+        fprintf(result_file, "COMMIT /* added by mysqlbinlog */%s\n", print_event_info->delimiter);
+      print_event_info->skipped_event_in_transaction= false;
+
+      ev->print(result_file, print_event_info);
+      if (head->error == -1)
+        goto err;
+      break;
+    }
+    case XID_EVENT:
+    {
+      print_event_info->skipped_event_in_transaction= false;
+      ev->print(result_file, print_event_info);
+      if (head->error == -1)
+        goto err;
+      break;
+    }
+    case PREVIOUS_GTIDS_LOG_EVENT:
+      if (one_database && !opt_skip_gtids)
+        warning("The option --database has been used. It may filter "
+                "parts of transactions, but will include the GTIDs in "
+                "any case. If you want to exclude or include transactions, "
+                "you should use the options --exclude-gtids or "
+                "--include-gtids, respectively, instead.");
+      /* fall through */
     default:
       ev->print(result_file, print_event_info);
       if (head->error == -1)
@@ -1745,6 +1794,9 @@
   /* Set delimiter back to semicolon */
   if (!raw_mode)
   {
+    if (print_event_info.skipped_event_in_transaction)
+      fprintf(result_file, "COMMIT /* added by mysqlbinlog */%s\n", print_event_info.delimiter);
+
     fprintf(result_file, "DELIMITER ;\n");
     strmov(print_event_info.delimiter, ";");
   }
@@ -1929,14 +1981,10 @@
   {
     command= COM_BINLOG_DUMP_GTID;
 
-    Gtid_set gtid_set(global_sid_map);
     global_sid_lock->rdlock();
 
-    gtid_set.add_gtid_set(gtid_set_excluded);
-
     // allocate buffer
-    size_t unused_size= 0;
-    size_t encoded_data_size= gtid_set.get_encoded_length();
+    size_t encoded_data_size= gtid_set_excluded->get_encoded_length();
     size_t allocation_size=
       ::BINLOG_FLAGS_INFO_SIZE + ::BINLOG_SERVER_ID_INFO_SIZE +
       ::BINLOG_NAME_SIZE_INFO_SIZE + BINLOG_NAME_INFO_SIZE +
@@ -1950,13 +1998,6 @@
     }
     uchar* ptr_buffer= command_buffer;
 
-    /*
-      The current implementation decides whether the Gtid must be
-      used based on option --exclude-gtids.
-    */
-    add_master_slave_proto(&binlog_flags,
-                           opt_exclude_gtids_str != NULL ?
-                           BINLOG_THROUGH_GTID : BINLOG_THROUGH_POSITION);
     int2store(ptr_buffer, binlog_flags);
     ptr_buffer+= ::BINLOG_FLAGS_INFO_SIZE;
     int4store(ptr_buffer, server_id);
@@ -1967,23 +2008,15 @@
     ptr_buffer+= BINLOG_NAME_INFO_SIZE;
     int8store(ptr_buffer, start_position);
     ptr_buffer+= ::BINLOG_POS_INFO_SIZE;
-
-    if (is_master_slave_proto(binlog_flags, BINLOG_THROUGH_GTID))
-    {
-      int4store(ptr_buffer, encoded_data_size);
-      ptr_buffer+= ::BINLOG_DATA_SIZE_INFO_SIZE;
-      gtid_set.encode(ptr_buffer);
-      ptr_buffer+= encoded_data_size;
-    }
-    else
-    {
-      unused_size= ::BINLOG_DATA_SIZE_INFO_SIZE + encoded_data_size;
-    }
+    int4store(ptr_buffer, encoded_data_size);
+    ptr_buffer+= ::BINLOG_DATA_SIZE_INFO_SIZE;
+    gtid_set_excluded->encode(ptr_buffer);
+    ptr_buffer+= encoded_data_size;
 
     global_sid_lock->unlock();
 
     command_size= ptr_buffer - command_buffer;
-    DBUG_ASSERT(command_size == (allocation_size - unused_size - 1));
+    DBUG_ASSERT(command_size == (allocation_size - 1));
   }
 
   if (simple_command(mysql, command, command_buffer, command_size, 1))
@@ -2701,6 +2734,8 @@
 
   if (!raw_mode)
   {
+    fprintf(result_file, "/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;\n");
+
     fprintf(result_file,
             "/*!40019 SET @@session.max_insert_delayed_threads=0*/;\n");
 
@@ -2753,6 +2788,8 @@
               "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n"
               "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n"
               "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n");
+
+    fprintf(result_file, "/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;\n");
   }
 
   if (tmpdir.list)
@@ -2789,4 +2826,3 @@
 #include "uuid.cc"
 #include "rpl_gtid_set.cc"
 #include "rpl_gtid_specification.cc"
-#include "rpl_constants.cc"
 
=== modified file 'Percona-Server/client/mysqlcheck.c'
--- Percona-Server/client/mysqlcheck.c	2012-10-16 06:21:51 +0000
+++ Percona-Server/client/mysqlcheck.c	2013-02-13 06:17:00 +0000
@@ -870,10 +870,10 @@
          NULL, opt_mysql_port, opt_mysql_unix_port, 0)))
   {
     DBerror(&mysql_connection, "when trying to connect");
-    return 1;
+    DBUG_RETURN(1);
   }
   mysql_connection.reconnect= 1;
-  return 0;
+  DBUG_RETURN(0);
 } /* dbConnect */
 
 
 
=== modified file 'Percona-Server/client/mysqldump.c'
--- Percona-Server/client/mysqldump.c	2013-01-25 11:46:09 +0000
+++ Percona-Server/client/mysqldump.c	2013-02-13 06:17:00 +0000
@@ -157,6 +157,17 @@
 FILE *md_result_file= 0;
 FILE *stderror_file=0;
 
+const char *set_gtid_purged_mode_names[]=
+{"OFF", "AUTO", "ON", NullS};
+static TYPELIB set_gtid_purged_mode_typelib=
+               {array_elements(set_gtid_purged_mode_names) -1, "",
+                set_gtid_purged_mode_names, NULL};
+static enum enum_set_gtid_purged_mode {
+  SET_GTID_PURGED_OFF= 0,
+  SET_GTID_PURGED_AUTO =1,
+  SET_GTID_PURGED_ON=2
+} opt_set_gtid_purged_mode= SET_GTID_PURGED_AUTO;
+
 #ifdef HAVE_SMEM
 static char *shared_memory_base_name=0;
 #endif
@@ -484,6 +495,15 @@
    "Add 'SET NAMES default_character_set' to the output.",
    &opt_set_charset, &opt_set_charset, 0, GET_BOOL, NO_ARG, 1,
    0, 0, 0, 0, 0},
+  {"set-gtid-purged", OPT_SET_GTID_PURGED,
+    "Add 'SET @@GLOBAL.GTID_PURGED' to the output. Possible values for "
+    "this option are ON, OFF and AUTO. If ON is used and GTIDs "
+    "are not enabled on the server, an error is generated. If OFF is "
+    "used, this option does nothing. If AUTO is used and GTIDs are enabled "
+    "on the server, 'SET @@GLOBAL.GTID_PURGED' is added to the output. "
+    "If GTIDs are disabled, AUTO does nothing. Default is AUTO.",
+    0, 0, 0, GET_STR, OPT_ARG,
+    0, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", &shared_memory_base_name, &shared_memory_base_name,
@@ -923,6 +943,13 @@
     opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
                                     opt->name);
     break;
+  case (int) OPT_SET_GTID_PURGED:
+    {
+      opt_set_gtid_purged_mode= find_type_or_exit(argument,
+                                                  &set_gtid_purged_mode_typelib,
+                                                  opt->name)-1;
+      break;
+    }
   }
   return 0;
 }
@@ -2280,7 +2307,6 @@
   const char *routine_type[]= {"FUNCTION", "PROCEDURE"};
   char       db_name_buff[NAME_LEN*2+3], name_buff[NAME_LEN*2+3];
   char       *routine_name;
-  char       *query_str;
   int        i;
   FILE       *sql_file= md_result_file;
   MYSQL_RES  *routine_res, *routine_list_res;
@@ -2374,17 +2400,6 @@
               fprintf(sql_file, "/*!50003 DROP %s IF EXISTS %s */;\n",
                       routine_type[i], routine_name);
 
-            query_str= cover_definer_clause(row[2], strlen(row[2]),
-                                            C_STRING_WITH_LEN("50020"),
-                                            C_STRING_WITH_LEN("50003"),
-                                            C_STRING_WITH_LEN(" FUNCTION"));
-
-            if (!query_str)
-              query_str= cover_definer_clause(row[2], strlen(row[2]),
-                                              C_STRING_WITH_LEN("50020"),
-                                              C_STRING_WITH_LEN("50003"),
-                                              C_STRING_WITH_LEN(" PROCEDURE"));
-
             if (mysql_num_fields(routine_res) >= 6)
             {
               if (switch_db_collation(sql_file, db_name_buff, ";",
@@ -2422,9 +2437,9 @@
 
             fprintf(sql_file,
                     "DELIMITER ;;\n"
-                    "/*!50003 %s */;;\n"
+                    "%s ;;\n"
                     "DELIMITER ;\n",
-                    (const char *) (query_str != NULL ? query_str : row[2]));
+                    (const char *) row[2]);
 
             restore_sql_mode(sql_file, ";");
 
@@ -2439,7 +2454,6 @@
               }
             }
 
-            my_free(query_str);
           }
         } /* end of routine printing */
         mysql_free_result(routine_res);
@@ -3743,17 +3757,8 @@
     DBUG_VOID_RETURN;
   }
 
-  /*
-     Check --skip-events flag: it is not enough to skip creation of events
-     discarding SHOW CREATE EVENT statements generation. The myslq.event
-     table data should be skipped too.
-  */
-  if (!opt_events && !my_strcasecmp(&my_charset_latin1, db, "mysql") &&
-      !my_strcasecmp(&my_charset_latin1, table, "event"))
-  {
-    verbose_msg("-- Skipping data table mysql.event, --skip-events was used\n");
-    DBUG_VOID_RETURN;
-  }
+  result_table= quote_name(table,table_buff, 1);
+  opt_quoted_table= quote_name(table, table_buff2, 0);
 
   verbose_msg("-- Sending SELECT query...\n");
 
@@ -5578,6 +5583,153 @@
 }
 
 
+/**
+  This function sets the session binlog in the dump file.
+  When --set-gtid-purged is used, this function is called to
+  disable the session binlog and at the end of the dump, to restore
+  the session binlog.
+
+  @note: md_result_file should have been opened, before
+         this function is called.
+
+  @param[in]      flag          If FALSE, disable binlog.
+                                If TRUE and binlog disabled previously,
+                                restore the session binlog.
+*/
+
+static void set_session_binlog(my_bool flag)
+{
+  static my_bool is_binlog_disabled= FALSE;
+
+  if (!flag && !is_binlog_disabled)
+  {
+    fprintf(md_result_file,
+            "SET @MYSQLDUMP_TEMP_LOG_BIN = @@SESSION.SQL_LOG_BIN;\n");
+    fprintf(md_result_file, "SET @@SESSION.SQL_LOG_BIN= 0;\n");
+    is_binlog_disabled= 1;
+  }
+  else if (flag && is_binlog_disabled)
+  {
+    fprintf(md_result_file,
+            "SET @@SESSION.SQL_LOG_BIN = @MYSQLDUMP_TEMP_LOG_BIN;\n");
+    is_binlog_disabled= 0;
+  }
+}
+
+
+/**
+  This function gets the GTID_EXECUTED sets from the
+  server and assigns those sets to GTID_PURGED in the
+  dump file.
+
+  @param[in]  mysql_con     connection to the server
+
+  @retval     FALSE         succesfully printed GTID_PURGED sets
+                             in the dump file.
+  @retval     TRUE          failed.
+
+*/
+
+static my_bool add_set_gtid_purged(MYSQL *mysql_con)
+{
+  MYSQL_RES  *gtid_purged_res;
+  MYSQL_ROW  gtid_set;
+  ulong     num_sets, idx;
+
+  /* query to get the GTID_EXECUTED */
+  if (mysql_query_with_error_report(mysql_con, &gtid_purged_res,
+                  "SELECT @@GLOBAL.GTID_EXECUTED"))
+    return TRUE;
+
+  /* Proceed only if gtid_purged_res is non empty */
+  if ((num_sets= mysql_num_rows(gtid_purged_res)) > 0)
+  {
+    if (opt_comments)
+      fprintf(md_result_file,
+          "\n--\n-- GTID state at the beginning of the backup \n--\n\n");
+
+    fprintf(md_result_file,"SET @@GLOBAL.GTID_PURGED='");
+
+    /* formatting is not required, even for multiple gtid sets */
+    for (idx= 0; idx< num_sets-1; idx++)
+    {
+      gtid_set= mysql_fetch_row(gtid_purged_res);
+      fprintf(md_result_file,"%s,", (char*)gtid_set[0]);
+    }
+    /* for the last set */
+    gtid_set= mysql_fetch_row(gtid_purged_res);
+    /* close the SET expression */
+    fprintf(md_result_file,"%s';\n", (char*)gtid_set[0]);
+  }
+
+  return FALSE;  /*success */
+}
+
+
+/**
+  This function processes the opt_set_gtid_purged option.
+  This function also calls set_session_binlog() function before
+  setting the SET @@GLOBAL.GTID_PURGED in the output.
+
+  @param[in]          mysql_con     the connection to the server
+
+  @retval             FALSE         successful according to the value
+                                    of opt_set_gtid_purged.
+  @retval             TRUE          fail.
+*/
+
+static my_bool process_set_gtid_purged(MYSQL* mysql_con)
+{
+  MYSQL_RES  *gtid_mode_res;
+  MYSQL_ROW  gtid_mode_row;
+  char       *gtid_mode_val= 0;
+
+  if (opt_set_gtid_purged_mode == SET_GTID_PURGED_OFF)
+    return FALSE;  /* nothing to be done */
+
+
+  /* check if gtid_mode is ON or OFF */
+  if (mysql_query_with_error_report(mysql_con, &gtid_mode_res,
+                                    "SELECT @@GTID_MODE"))
+    return TRUE;
+
+  gtid_mode_row = mysql_fetch_row(gtid_mode_res);
+  gtid_mode_val = (char*)gtid_mode_row[0];
+
+  if (gtid_mode_val && strcmp(gtid_mode_val, "OFF"))
+  {
+    /*
+       For any gtid_mode !=OFF and irrespective of --set-gtid-purged
+       being AUTO or ON,  add GTID_PURGED in the output.
+    */
+    if (opt_databases || !opt_alldbs || !opt_dump_triggers
+        || !opt_routines || !opt_events)
+    {
+      fprintf(stderr,"Warning: A partial dump from a server that has GTIDs will "
+                     "by default include the GTIDs of all transactions, even "
+                     "those that changed suppressed parts of the database. If "
+                     "you don't want to restore GTIDs, pass "
+                     "--set-gtid-purged=OFF. To make a complete dump, pass "
+                     "--all-databases --triggers --routines --events. \n");
+    }
+
+    set_session_binlog(FALSE);
+    if (add_set_gtid_purged(mysql_con))
+      return TRUE;
+  }
+  else /* gtid_mode is off */
+  {
+    if (opt_set_gtid_purged_mode == SET_GTID_PURGED_ON)
+    {
+      fprintf(stderr, "Error: Server has GTIDs disabled.\n");
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+
 /*
   Getting VIEW structure
 
@@ -5907,6 +6059,13 @@
   /* Add 'STOP SLAVE to beginning of dump */
   if (opt_slave_apply && add_stop_slave())
     goto err;
+
+
+  /* Process opt_set_gtid_purged and add SET @@GLOBAL.GTID_PURGED if required. */
+  if (process_set_gtid_purged(mysql))
+    goto err;
+
+
   if (opt_master_data && do_show_master_status(mysql))
     goto err;
   if (opt_slave_data && do_show_slave_status(mysql))
@@ -5942,6 +6101,12 @@
   if (opt_slave_data && do_start_slave_sql(mysql))
     goto err;
 
+  /*
+    if --set-gtid-purged, restore binlog at the end of the session
+    if required.
+  */
+  set_session_binlog(TRUE);
+
   /* add 'START SLAVE' to end of dump */
   if (opt_slave_apply && add_slave_statements())
     goto err;
 
=== modified file 'Percona-Server/client/mysqltest.cc'
--- Percona-Server/client/mysqltest.cc	2012-12-04 08:24:59 +0000
+++ Percona-Server/client/mysqltest.cc	2013-02-13 06:17:00 +0000
@@ -130,6 +130,7 @@
 #if !defined(HAVE_YASSL)
 static const char *opt_server_public_key= 0;
 #endif
+static my_bool can_handle_expired_passwords= TRUE;
 
 /* Info on properties that can be set with --enable_X and --disable_X */
 
@@ -1426,7 +1427,6 @@
 {
   static int dying= 0;
   va_list args;
-  DBUG_ENTER("die");
   DBUG_PRINT("enter", ("start_lineno: %d", start_lineno));
 
   /*
@@ -2571,6 +2571,7 @@
   dynstr_append_mem(&ds_res, ds_version.str, ds_version.length);
   dynstr_append(&ds_res, "\n");
   dynstr_free(&ds_version);
+  DBUG_VOID_RETURN;
 }
 
 /* List of error names to error codes */
@@ -5314,6 +5315,8 @@
   mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
                  "program_name", "mysqltest");
+  mysql_options(mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
+                &can_handle_expired_passwords);
   while(!mysql_real_connect(mysql, host,user, pass, db, port, sock,
                             CLIENT_MULTI_STATEMENTS | CLIENT_REMEMBER_OPTIONS))
   {
@@ -5417,6 +5420,8 @@
   
   mysql_options(con, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(con, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", "mysqltest");
+  mysql_options(con, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
+                &can_handle_expired_passwords);
   while (!mysql_real_connect(con, host, user, pass, db, port, sock ? sock: 0,
                           CLIENT_MULTI_STATEMENTS))
   {
 
=== modified file 'Percona-Server/client/sql_string.h'
--- Percona-Server/client/sql_string.h	2012-10-16 06:21:51 +0000
+++ Percona-Server/client/sql_string.h	2013-02-13 06:17:00 +0000
@@ -94,6 +94,9 @@
   inline const char *ptr() const { return Ptr; }
   inline char *c_ptr()
   {
+    DBUG_ASSERT(!alloced || !Ptr || !Alloced_length || 
+                (Alloced_length >= (str_length + 1)));
+
     if (!Ptr || Ptr[str_length])		/* Should be safe */
       (void) realloc(str_length);
     return Ptr;
 
=== modified file 'Percona-Server/cmake/install_layout.cmake'
--- Percona-Server/cmake/install_layout.cmake	2012-09-21 17:15:31 +0000
+++ Percona-Server/cmake/install_layout.cmake	2013-02-13 06:17:00 +0000
@@ -104,7 +104,10 @@
 # just use if(INSTALL_PLUGINTESTDIR).
 # The plugin must set its own install path for tests
 #
-FILE(GLOB plugin_tests ${CMAKE_SOURCE_DIR}/plugin/*/tests)
+FILE(GLOB plugin_tests
+  ${CMAKE_SOURCE_DIR}/plugin/*/tests
+  ${CMAKE_SOURCE_DIR}/internal/plugin/*/tests
+)
 
 #
 # STANDALONE layout
@@ -135,7 +138,7 @@
 #
 # RPM layout
 #
-# See "SPECIFIC-ULN/mysql-5.5-libdir.patch" for the differences
+# See "packaging/rpm-uln/mysql-5.5-libdir.patch" for the differences
 # which apply to RPMs in ULN (Oracle Linux), that patch file will
 # be applied at build time via "rpmbuild".
 #
 
=== modified file 'Percona-Server/cmake/mysql_version.cmake'
--- Percona-Server/cmake/mysql_version.cmake	2012-08-22 01:40:20 +0000
+++ Percona-Server/cmake/mysql_version.cmake	2013-02-13 06:17:00 +0000
@@ -54,7 +54,7 @@
   ENDIF()
 
   SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
-  MESSAGE("-- MySQL ${VERSION}")
+  MESSAGE(STATUS "MySQL ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
   SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
   # Use NDBVERSION irregardless of whether this is Cluster or not, if not
 
=== modified file 'Percona-Server/cmake/package_name.cmake'
--- Percona-Server/cmake/package_name.cmake	2012-08-22 01:40:20 +0000
+++ Percona-Server/cmake/package_name.cmake	2013-02-13 06:17:00 +0000
@@ -122,7 +122,7 @@
     SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
   ENDIF()
 
-  MESSAGE("-- Packaging as: ${package_name}")
+  MESSAGE(STATUS "Packaging as: ${package_name}")
 
   # Sometimes package suffix is added (something like "-icc-glibc23")
   IF(PACKAGE_SUFFIX)
 
=== modified file 'Percona-Server/cmake/plugin.cmake'
--- Percona-Server/cmake/plugin.cmake	2011-09-21 11:01:41 +0000
+++ Percona-Server/cmake/plugin.cmake	2013-02-13 06:17:00 +0000
@@ -39,6 +39,7 @@
       GET_FILENAME_COMPONENT(fname ${cfile} NAME)
       FILE(APPEND ${CMAKE_SOURCE_DIR}/mysql-test/collections/${fname} "${contents}")
       FILE(APPEND ${fcopied} "${fname}\n")
+      MESSAGE(STATUS "Appended ${cfile}")
     ENDFOREACH()
   ENDIF()
 ENDMACRO()
 
=== modified file 'Percona-Server/cmd-line-utils/libedit/vi.c'
--- Percona-Server/cmd-line-utils/libedit/vi.c	2011-10-13 19:47:46 +0000
+++ Percona-Server/cmd-line-utils/libedit/vi.c	2013-02-13 06:17:00 +0000
@@ -1028,7 +1028,8 @@
 		close(fd);
 		return CC_ERROR;
 	}
-	line = el_malloc(len * sizeof(*line));
+	/* XXXMYSQL: Make static analyzer happy */
+	line = el_malloc((len+1) * sizeof(*line));
 	if (line == NULL) {
 		el_free(cp);
 		return CC_ERROR;
 
=== modified file 'Percona-Server/configure.cmake'
--- Percona-Server/configure.cmake	2012-08-22 01:40:20 +0000
+++ Percona-Server/configure.cmake	2013-02-13 06:17:00 +0000
@@ -323,15 +323,14 @@
 ENDIF()
 
 # Figure out threading library
-#
+# Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT.
 FIND_PACKAGE (Threads)
 
 FUNCTION(MY_CHECK_PTHREAD_ONCE_INIT)
   CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
-  IF(NOT HAVE_WERROR_FLAG)
-    RETURN()
+  IF(HAVE_WERROR_FLAG)
+    SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
   ENDIF()
-  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
   CHECK_C_SOURCE_COMPILES("
     #include <pthread.h>
     void foo(void) {}
 
=== modified file 'Percona-Server/dbug/dbug.c'
--- Percona-Server/dbug/dbug.c	2012-12-04 08:24:59 +0000
+++ Percona-Server/dbug/dbug.c	2013-02-13 06:17:00 +0000
@@ -667,10 +667,11 @@
       /* fall through */
     case 'a':
     case 'o':
+      /* In case we already have an open file. */
+      if (!is_shared(stack, out_file))
+        DBUGCloseFile(cs, stack->out_file);
       if (sign < 0)
       {
-        if (!is_shared(stack, out_file))
-          DBUGCloseFile(cs, stack->out_file);
         stack->flags &= ~FLUSH_ON_WRITE;
         stack->out_file= stderr;
         break;
 
=== modified file 'Percona-Server/extra/yassl/include/yassl_int.hpp'
--- Percona-Server/extra/yassl/include/yassl_int.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/yassl_int.hpp	2013-02-13 06:17:00 +0000
@@ -278,6 +278,7 @@
 
     ~Sessions();
 
+    friend void Session_initialize();
     friend Sessions& GetSessions(); // singleton creator
 private:
     Sessions(const Sessions&);              // hide copy
 
=== modified file 'Percona-Server/extra/yassl/src/buffer.cpp'
--- Percona-Server/extra/yassl/src/buffer.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/src/buffer.cpp	2013-02-13 06:17:00 +0000
@@ -23,6 +23,8 @@
  */
 
 
+// First include (the generated) my_config.h, to get correct platform defines.
+#include "my_config.h"
 #include <string.h>             // memcpy
 #include "runtime.hpp"
 #include "buffer.hpp"
 
=== modified file 'Percona-Server/extra/yassl/src/handshake.cpp'
--- Percona-Server/extra/yassl/src/handshake.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/src/handshake.cpp	2013-02-13 06:17:00 +0000
@@ -762,8 +762,14 @@
 
         while (buffer.get_current() < hdr.length_ + RECORD_HEADER + offset) {
             // each message in record, can be more than 1 if not encrypted
-            if (ssl.getSecurity().get_parms().pending_ == false) // cipher on
+            if (ssl.getSecurity().get_parms().pending_ == false) { // cipher on
+                // sanity check for malicious/corrupted/illegal input
+                if (buffer.get_remaining() < hdr.length_) {
+                    ssl.SetError(bad_input);
+                    return 0;
+                }
                 decrypt_message(ssl, buffer, hdr.length_);
+            }
                 
             mySTL::auto_ptr<Message> msg(mf.CreateObject(hdr.type_));
             if (!msg.get()) {
 
=== modified file 'Percona-Server/extra/yassl/src/yassl_int.cpp'
--- Percona-Server/extra/yassl/src/yassl_int.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/src/yassl_int.cpp	2013-02-13 06:17:00 +0000
@@ -17,16 +17,19 @@
  * draft along with type conversion functions.
  */
 
+// First include (the generated) my_config.h, to get correct platform defines.
+#include "my_config.h"
+#ifdef __WIN__
+#include<Windows.h>
+#else
+#include <pthread.h>
+#endif
+
 #include "runtime.hpp"
 #include "yassl_int.hpp"
 #include "handshake.hpp"
 #include "timer.hpp"
 
-#ifdef _POSIX_THREADS
-    #include "pthread.h"
-#endif
-
-
 #ifdef HAVE_LIBZ
     #include "zlib.h"
 #endif
@@ -719,6 +722,58 @@
     }
 }
 
+#ifdef __WIN__
+typedef volatile LONG yassl_pthread_once_t;
+#define YASSL_PTHREAD_ONCE_INIT  0
+#define YASSL_PTHREAD_ONCE_INPROGRESS 1
+#define YASSL_PTHREAD_ONCE_DONE 2
+
+int yassl_pthread_once(yassl_pthread_once_t *once_control,
+    void (*init_routine)(void))
+{
+  LONG state;
+
+  /*
+    Do "dirty" read to find out if initialization is already done, to
+    save an interlocked operation in common case. Memory barriers are ensured by 
+    Visual C++ volatile implementation.
+  */
+  if (*once_control == YASSL_PTHREAD_ONCE_DONE)
+    return 0;
+
+  state= InterlockedCompareExchange(once_control, YASSL_PTHREAD_ONCE_INPROGRESS,
+                                        YASSL_PTHREAD_ONCE_INIT);
+
+  switch(state)
+  {
+  case YASSL_PTHREAD_ONCE_INIT:
+    /* This is initializer thread */
+    (*init_routine)();
+    *once_control= YASSL_PTHREAD_ONCE_DONE;
+    break;
+
+  case YASSL_PTHREAD_ONCE_INPROGRESS:
+    /* init_routine in progress. Wait for its completion */
+    while(*once_control == YASSL_PTHREAD_ONCE_INPROGRESS)
+    {
+      Sleep(1);
+    }
+    break;
+  case YASSL_PTHREAD_ONCE_DONE:
+    /* Nothing to do */
+    break;
+  }
+  return 0;
+}
+#else
+#define yassl_pthread_once_t pthread_once_t
+#if defined(PTHREAD_ONCE_INITIALIZER)
+#define YASSL_PTHREAD_ONCE_INIT PTHREAD_ONCE_INITIALIZER
+#else
+#define YASSL_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
+#endif
+#define yassl_pthread_once(C,F) pthread_once(C,F)
+#endif // __WIN__
 
 // store peer's random
 void SSL::set_random(const opaque* random, ConnectionEnd sender)
@@ -1566,11 +1621,22 @@
 
 
 static Sessions* sessionsInstance = 0;
+static yassl_pthread_once_t session_created= YASSL_PTHREAD_ONCE_INIT;
+
+void Session_initialize()
+{
+    sessionsInstance = NEW_YS Sessions;
+}
+
+extern "C"
+{
+  static void c_session_initialize() { Session_initialize(); }
+}
+
 
 Sessions& GetSessions()
 {
-    if (!sessionsInstance)
-        sessionsInstance = NEW_YS Sessions;
+    yassl_pthread_once(&session_created, c_session_initialize);
     return *sessionsInstance;
 }
 
@@ -1826,6 +1892,8 @@
 }
 
 
+extern "C"
+{
 static int
 default_password_callback(char * buffer, int size_arg, int rwflag,
                           void * /* unused: callback_data */)
@@ -1854,7 +1922,7 @@
   free(passwd);
   return passwd_len;
 }
-
+}
 
 SSL_CTX::SSL_CTX(SSL_METHOD* meth) 
     : method_(meth), certificate_(0), privateKey_(0), 
 
=== modified file 'Percona-Server/include/errmsg.h'
--- Percona-Server/include/errmsg.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/errmsg.h	2013-02-13 06:17:00 +0000
@@ -103,7 +103,8 @@
 #define CR_ALREADY_CONNECTED                    2058
 #define CR_AUTH_PLUGIN_CANNOT_LOAD              2059
 #define CR_DUPLICATE_CONNECTION_ATTR            2060
-#define CR_ERROR_LAST  /*Copy last error nr:*/  2060
+#define CR_AUTH_PLUGIN_ERR                      2061
+#define CR_ERROR_LAST  /*Copy last error nr:*/  2061
 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */
 
 #endif /* ERRMSG_INCLUDED */
 
=== modified file 'Percona-Server/include/m_ctype.h'
--- Percona-Server/include/m_ctype.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/m_ctype.h	2013-02-13 06:17:00 +0000
@@ -263,6 +263,8 @@
 } MY_CHARSET_LOADER;
 
 
+extern int (*my_string_stack_guard)(int);
+
 /* See strings/CHARSET_INFO.txt for information about this structure  */
 typedef struct my_collation_handler_st
 {
 
=== modified file 'Percona-Server/include/my_atomic.h'
--- Percona-Server/include/my_atomic.h	2011-06-30 15:46:53 +0000
+++ Percona-Server/include/my_atomic.h	2013-02-13 06:17:00 +0000
@@ -280,7 +280,9 @@
 
 #define MY_ATOMIC_OK       0
 #define MY_ATOMIC_NOT_1CPU 1
+C_MODE_START
 extern int my_atomic_initialize();
+C_MODE_END
 
 #endif
 
 
=== modified file 'Percona-Server/include/my_base.h'
--- Percona-Server/include/my_base.h	2012-10-16 06:21:51 +0000
+++ Percona-Server/include/my_base.h	2013-02-13 06:17:00 +0000
@@ -477,7 +477,8 @@
 #define HA_FTS_INVALID_DOCID      182    /* Invalid InnoDB Doc ID */
 #define HA_ERR_TABLE_IN_FK_CHECK  183    /* Table being used in foreign key check */
 #define HA_ERR_TABLESPACE_EXISTS  184    /* The tablespace existed in storage engine */
-#define HA_ERR_LAST               184    /* Copy of last error nr */
+#define HA_ERR_TOO_MANY_FIELDS    185    /* Table has too many columns */
+#define HA_ERR_LAST               185    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
 
=== modified file 'Percona-Server/include/my_getopt.h'
--- Percona-Server/include/my_getopt.h	2012-08-31 20:51:54 +0000
+++ Percona-Server/include/my_getopt.h	2013-02-13 06:17:00 +0000
@@ -109,6 +109,11 @@
 
 extern int handle_options (int *argc, char ***argv, 
 			   const struct my_option *longopts, my_get_one_option);
+extern int my_handle_options (int *argc, char ***argv,
+                              const struct my_option *longopts,
+                              my_get_one_option,
+                              const char **command_list);
+extern void my_cleanup_options(const struct my_option *options);
 extern void my_cleanup_options(const struct my_option *options);
 extern void my_print_help(const struct my_option *options);
 extern void my_print_variables(const struct my_option *options);
 
=== modified file 'Percona-Server/include/my_pthread.h'
--- Percona-Server/include/my_pthread.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/my_pthread.h	2013-02-13 06:17:00 +0000
@@ -462,14 +462,12 @@
 #ifdef HAVE_TIMESPEC_TS_SEC
 #ifndef diff_timespec
 #define diff_timespec(TS1, TS2) \
-  (((TS1.ts_sec * 1000000000) + TS1.ts_nsec) - \
-   ((TS2.ts_sec * 1000000000) + TS2.ts_nsec))
+  ((TS1.ts_sec - TS2.ts_sec) * 1000000000ULL + TS1.ts_nsec - TS2.ts_nsec)
 #endif /* !diff_timespec */
 #else
 #ifndef diff_timespec
 #define diff_timespec(TS1, TS2) \
-  (((TS1.tv_sec * 1000000000) + TS1.tv_nsec) - \
-   ((TS2.tv_sec * 1000000000) + TS2.tv_nsec))
+  ((TS1.tv_sec - TS2.tv_sec) * 1000000000ULL + TS1.tv_nsec - TS2.tv_nsec)
 #endif /* !diff_timespec */
 #endif /* HAVE_TIMESPEC_TS_SEC */
 
 
=== modified file 'Percona-Server/include/my_sys.h'
--- Percona-Server/include/my_sys.h	2013-01-21 13:20:09 +0000
+++ Percona-Server/include/my_sys.h	2013-02-13 06:17:00 +0000
@@ -159,6 +159,22 @@
 extern char *my_strdup(const char *from,myf MyFlags);
 extern char *my_strndup(const char *from, size_t length,
 				   myf MyFlags);
+
+/*
+  Switch to my_malloc() if the memory block to be allocated is bigger than
+  max_alloca_sz.
+*/
+#ifndef HAVE_ALLOCA
+#define my_safe_alloca(size, max_alloca_sz) my_alloca(size)
+#define my_safe_afree(ptr, size, max_alloca_sz) my_afree(ptr)
+#else
+#define my_safe_alloca(size, max_alloca_sz) ((size <= max_alloca_sz) ? \
+                                             my_alloca(size) : \
+                                             my_malloc(size, MYF(0)))
+#define my_safe_afree(ptr, size, max_alloca_sz) if (size > max_alloca_sz) \
+                                               my_free(ptr)
+#endif                                          /* #ifndef HAVE_ALLOCA */
+
 #if !defined(DBUG_OFF) || defined(HAVE_VALGRIND)
 /**
   Put bad content in memory to be sure it will segfault if dereferenced.
@@ -616,6 +632,13 @@
 extern int check_if_legal_filename(const char *path);
 extern int check_if_legal_tablename(const char *path);
 
+#ifdef __WIN__
+extern my_bool is_filename_allowed(const char *name, size_t length,
+                   my_bool allow_current_dir);
+#else /* __WIN__ */
+# define is_filename_allowed(name, length, allow_cwd) (TRUE)
+#endif /* __WIN__ */ 
+
 #ifdef _WIN32
 extern int nt_share_delete(const char *name,myf MyFlags);
 #define my_delete_allow_opened(fname,flags)  nt_share_delete((fname),(flags))
@@ -687,7 +710,7 @@
 extern size_t strlength(const char *str);
 extern void pack_dirname(char * to,const char *from);
 extern size_t normalize_dirname(char * to, const char *from);
-extern size_t unpack_dirname(char * to,const char *from);
+extern size_t unpack_dirname(char * to,const char *from, my_bool *is_symdir);
 extern size_t cleanup_dirname(char * to,const char *from);
 extern size_t system_filename(char * to,const char *from);
 extern size_t unpack_filename(char * to,const char *from);
@@ -758,7 +781,8 @@
 extern void my_b_seek(IO_CACHE *info,my_off_t pos);
 extern size_t my_b_gets(IO_CACHE *info, char *to, size_t max_length);
 extern my_off_t my_b_filelength(IO_CACHE *info);
-extern size_t my_b_printf(IO_CACHE *info, const char* fmt, ...);
+extern size_t my_b_printf(IO_CACHE *info, const char* fmt, ...)
+  ATTRIBUTE_FORMAT(printf, 2, 3);
 extern size_t my_b_vprintf(IO_CACHE *info, const char* fmt, va_list ap);
 extern my_bool open_cached_file(IO_CACHE *cache,const char *dir,
 				 const char *prefix, size_t cache_size,
 
=== modified file 'Percona-Server/include/mysql.h'
--- Percona-Server/include/mysql.h	2012-10-16 06:21:51 +0000
+++ Percona-Server/include/mysql.h	2013-02-13 06:17:00 +0000
@@ -174,7 +174,8 @@
   MYSQL_OPT_CONNECT_ATTR_RESET, MYSQL_OPT_CONNECT_ATTR_ADD,
   MYSQL_OPT_CONNECT_ATTR_DELETE,
   MYSQL_SERVER_PUBLIC_KEY,
-  MYSQL_ENABLE_CLEARTEXT_PLUGIN
+  MYSQL_ENABLE_CLEARTEXT_PLUGIN,
+  MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS
 };
 
 /**
 
=== modified file 'Percona-Server/include/mysql.h.pp'
--- Percona-Server/include/mysql.h.pp	2012-10-16 06:21:51 +0000
+++ Percona-Server/include/mysql.h.pp	2013-02-13 06:17:00 +0000
@@ -271,7 +271,8 @@
   MYSQL_OPT_CONNECT_ATTR_RESET, MYSQL_OPT_CONNECT_ATTR_ADD,
   MYSQL_OPT_CONNECT_ATTR_DELETE,
   MYSQL_SERVER_PUBLIC_KEY,
-  MYSQL_ENABLE_CLEARTEXT_PLUGIN
+  MYSQL_ENABLE_CLEARTEXT_PLUGIN,
+  MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS
 };
 struct st_mysql_options_extention;
 struct st_mysql_options {
 
=== modified file 'Percona-Server/include/mysql/plugin.h'
--- Percona-Server/include/mysql/plugin.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/mysql/plugin.h	2013-02-13 06:17:00 +0000
@@ -497,7 +497,7 @@
 /*
   API for Replication plugin. (MYSQL_REPLICATION_PLUGIN)
 */
- #define MYSQL_REPLICATION_INTERFACE_VERSION 0x0100
+ #define MYSQL_REPLICATION_INTERFACE_VERSION 0x0200
  
  /**
     Replication plugin descriptor
 
=== modified file 'Percona-Server/include/mysql/psi/psi.h'
--- Percona-Server/include/mysql/psi/psi.h	2012-10-16 06:21:51 +0000
+++ Percona-Server/include/mysql/psi/psi.h	2013-02-13 06:17:00 +0000
@@ -975,6 +975,9 @@
 };
 typedef struct PSI_digest_locker_state PSI_digest_locker_state;
 
+/* Duplicate of NAME_LEN, to avoid dependency on mysql_com.h */
+#define PSI_SCHEMA_NAME_LEN (64 * 3)
+
 /**
   State data storage for @c get_thread_statement_locker_v1_t,
   @c get_thread_statement_locker_v1_t.
@@ -1035,6 +1038,10 @@
   ulong m_sort_scan;
   /** Statement digest. */
   PSI_digest_locker_state m_digest_state;
+  /** Current schema name. */
+  char m_schema_name[PSI_SCHEMA_NAME_LEN];
+  /** Length in bytes of @c m_schema_name. */
+  uint m_schema_name_length;
 };
 
 /**
@@ -1299,7 +1306,7 @@
   @return an instrumented thread
 */
 typedef struct PSI_thread* (*new_thread_v1_t)
-  (PSI_thread_key key, const void *identity, ulong thread_id);
+  (PSI_thread_key key, const void *identity, ulonglong thread_id);
 
 /**
   Assign an id to an instrumented thread.
@@ -1307,7 +1314,7 @@
   @param id the id to assign
 */
 typedef void (*set_thread_id_v1_t)(struct PSI_thread *thread,
-                                   unsigned long id);
+                                   ulonglong id);
 
 /**
   Get the instrumentation for the running thread.
 
=== modified file 'Percona-Server/include/mysql/psi/psi_abi_v1.h.pp'
--- Percona-Server/include/mysql/psi/psi_abi_v1.h.pp	2012-10-16 06:21:51 +0000
+++ Percona-Server/include/mysql/psi/psi_abi_v1.h.pp	2013-02-13 06:17:00 +0000
@@ -281,6 +281,8 @@
   ulong m_sort_rows;
   ulong m_sort_scan;
   PSI_digest_locker_state m_digest_state;
+  char m_schema_name[(64 * 3)];
+  uint m_schema_name_length;
 };
 struct PSI_socket_locker_state_v1
 {
@@ -344,9 +346,9 @@
                                  const pthread_attr_t *attr,
                                  void *(*start_routine)(void*), void *arg);
 typedef struct PSI_thread* (*new_thread_v1_t)
-  (PSI_thread_key key, const void *identity, ulong thread_id);
+  (PSI_thread_key key, const void *identity, ulonglong thread_id);
 typedef void (*set_thread_id_v1_t)(struct PSI_thread *thread,
-                                   unsigned long id);
+                                   ulonglong id);
 typedef struct PSI_thread* (*get_thread_v1_t)(void);
 typedef void (*set_thread_user_v1_t)(const char *user, int user_len);
 typedef void (*set_thread_user_host_v1_t)(const char *user, int user_len,
 
=== modified file 'Percona-Server/include/mysql/thread_pool_priv.h'
--- Percona-Server/include/mysql/thread_pool_priv.h	2012-10-16 06:21:51 +0000
+++ Percona-Server/include/mysql/thread_pool_priv.h	2013-02-13 06:17:00 +0000
@@ -62,6 +62,7 @@
 void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var);
 ulong  thd_get_net_wait_timeout(THD *thd);
 my_socket thd_get_fd(THD *thd);
+int thd_store_globals(THD* thd);
 
 /* Interface to global thread list iterator functions */
 Thread_iterator thd_get_global_thread_list_begin();
 
=== modified file 'Percona-Server/include/mysql_com.h'
--- Percona-Server/include/mysql_com.h	2012-10-16 06:21:51 +0000
+++ Percona-Server/include/mysql_com.h	2013-02-13 06:17:00 +0000
@@ -180,6 +180,9 @@
 /* Enable authentication response packet to be larger than 255 bytes. */
 #define CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA (1UL << 21)
 
+/* Don't close the connection for a connection with expired password. */
+#define CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS (1UL << 22)
+
 #define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)
 #define CLIENT_REMEMBER_OPTIONS (1UL << 31)
 
@@ -190,30 +193,32 @@
 #endif
 
 /* Gather all possible capabilites (flags) supported by the server */
-#define CLIENT_ALL_FLAGS  (CLIENT_LONG_PASSWORD | \
-                           CLIENT_FOUND_ROWS | \
-                           CLIENT_LONG_FLAG | \
-                           CLIENT_CONNECT_WITH_DB | \
-                           CLIENT_NO_SCHEMA | \
-                           CLIENT_COMPRESS | \
-                           CLIENT_ODBC | \
-                           CLIENT_LOCAL_FILES | \
-                           CLIENT_IGNORE_SPACE | \
-                           CLIENT_PROTOCOL_41 | \
-                           CLIENT_INTERACTIVE | \
-                           CLIENT_SSL | \
-                           CLIENT_IGNORE_SIGPIPE | \
-                           CLIENT_TRANSACTIONS | \
-                           CLIENT_RESERVED | \
-                           CLIENT_SECURE_CONNECTION | \
-                           CLIENT_MULTI_STATEMENTS | \
-                           CLIENT_MULTI_RESULTS | \
-                           CLIENT_PS_MULTI_RESULTS | \
-                           CLIENT_SSL_VERIFY_SERVER_CERT | \
-                           CLIENT_REMEMBER_OPTIONS | \
-                           CLIENT_PLUGIN_AUTH | \
-                           CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | \
-                           CLIENT_CONNECT_ATTRS)
+#define CLIENT_ALL_FLAGS  (CLIENT_LONG_PASSWORD \
+                           | CLIENT_FOUND_ROWS \
+                           | CLIENT_LONG_FLAG \
+                           | CLIENT_CONNECT_WITH_DB \
+                           | CLIENT_NO_SCHEMA \
+                           | CLIENT_COMPRESS \
+                           | CLIENT_ODBC \
+                           | CLIENT_LOCAL_FILES \
+                           | CLIENT_IGNORE_SPACE \
+                           | CLIENT_PROTOCOL_41 \
+                           | CLIENT_INTERACTIVE \
+                           | CLIENT_SSL \
+                           | CLIENT_IGNORE_SIGPIPE \
+                           | CLIENT_TRANSACTIONS \
+                           | CLIENT_RESERVED \
+                           | CLIENT_SECURE_CONNECTION \
+                           | CLIENT_MULTI_STATEMENTS \
+                           | CLIENT_MULTI_RESULTS \
+                           | CLIENT_PS_MULTI_RESULTS \
+                           | CLIENT_SSL_VERIFY_SERVER_CERT \
+                           | CLIENT_REMEMBER_OPTIONS \
+                           | CLIENT_PLUGIN_AUTH \
+                           | CLIENT_CONNECT_ATTRS \
+                           | CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA \
+                           | CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS \
+)
 
 /*
   Switch off the flags that are optional and depending on build flags
 
=== modified file 'Percona-Server/include/welcome_copyright_notice.h'
--- Percona-Server/include/welcome_copyright_notice.h	2012-08-07 13:56:51 +0000
+++ Percona-Server/include/welcome_copyright_notice.h	2013-02-13 06:17:00 +0000
@@ -16,7 +16,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2012"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL
 
=== modified file 'Percona-Server/libmysql/errmsg.c'
--- Percona-Server/libmysql/errmsg.c	2011-09-07 10:08:09 +0000
+++ Percona-Server/libmysql/errmsg.c	2013-02-13 06:17:00 +0000
@@ -85,6 +85,8 @@
   "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again",
   "This handle is already connected. Use a separate handle for each connection.",
   "Authentication plugin '%s' cannot be loaded: %s",
+  "There is an attribute with the same name already",
+  "Authentication plugin '%s' reported error: %s",
   ""
 };
 
 
=== modified file 'Percona-Server/libmysql/libmysql.c'
--- Percona-Server/libmysql/libmysql.c	2012-06-29 14:03:28 +0000
+++ Percona-Server/libmysql/libmysql.c	2013-02-13 06:17:00 +0000
@@ -912,6 +912,16 @@
 {
   uchar buff[4];
   DBUG_ENTER("mysql_kill");
+  /*
+    Sanity check: if ulong is 64-bits, user can submit a PID here that
+    overflows our 32-bit parameter to the somewhat obsolete COM_PROCESS_KILL.
+    If this is the case, we'll flag an error here.
+    The SQL statement KILL CONNECTION is the safer option here.
+    There is an analog of this failsafe in the server as we might see old
+    libmysql connection to a new server as well as the other way around.
+  */
+  if (pid & (~0xfffffffful))
+    DBUG_RETURN(CR_INVALID_CONN_HANDLE);
   int4store(buff,pid);
   DBUG_RETURN(simple_command(mysql,COM_PROCESS_KILL,buff,sizeof(buff),0));
 }
@@ -1059,6 +1069,12 @@
 
 ulong STDCALL mysql_thread_id(MYSQL *mysql)
 {
+  /*
+    ulong may be 64-bit, but we currently only transmit 32-bit.
+    mysql_thread_id() is usually used in conjunction with mysql_kill()
+    which is similarly limited (and obsolete).
+    SELECTION CONNECTION_ID() / KILL CONNECTION avoid this issue.
+  */
   return (mysql)->thread_id;
 }
 
@@ -4050,6 +4066,7 @@
     stmt->bind was initialized in mysql_stmt_prepare
     stmt->bind overlaps with bind if mysql_stmt_bind_param
     is called from mysql_stmt_store_result.
+    BEWARE of buffer overwrite ...
   */
 
   if (stmt->bind != my_bind)
@@ -4222,7 +4239,7 @@
   if ((int) stmt->state < (int) MYSQL_STMT_FETCH_DONE)
   {
     set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL);
-    return 1;
+    DBUG_RETURN(1);
   }
   if (column >= stmt->field_count)
   {
 
=== modified file 'Percona-Server/libmysqld/lib_sql.cc'
--- Percona-Server/libmysqld/lib_sql.cc	2012-10-16 06:21:51 +0000
+++ Percona-Server/libmysqld/lib_sql.cc	2013-02-13 06:17:00 +0000
@@ -626,6 +626,9 @@
   init_max_user_conn();
   init_update_queries();
 
+  if (!opt_bootstrap)
+    servers_init(0);
+
 #ifdef HAVE_DLOPEN
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (!opt_noacl)
 
=== modified file 'Percona-Server/mysql-test/CMakeLists.txt'
--- Percona-Server/mysql-test/CMakeLists.txt	2012-02-16 09:51:14 +0000
+++ Percona-Server/mysql-test/CMakeLists.txt	2013-02-13 06:17:00 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -113,8 +113,10 @@
 FILE(GLOB infiles "collections/*.in")
 FOREACH(collin ${infiles})
   STRING(REPLACE ".in" "" collection ${collin})
+  STRING(REPLACE ".in" ".done" colldone ${collin})
   # Only generate file once
-  IF(NOT EXISTS ${collection})
+  IF(NOT EXISTS ${colldone})
     PROCESS_COLLECTION_INCLUDE(${collin} ${collection})
+    FILE(APPEND ${colldone} "${collin}\n")
   ENDIF()
 ENDFOREACH()
 
=== modified file 'Percona-Server/mysql-test/collections/default.daily'
--- Percona-Server/mysql-test/collections/default.daily	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/collections/default.daily	2013-02-13 06:17:00 +0000
@@ -1,6 +1,6 @@
 # Default suites in modes  normal(which includes binlog format stmt/mixed/row, parts), embedded and ps-protocol
 # Adding "--big-test" option to the default suite, normal(which includes binlog format stmt/mixed/row, parts), embedded and ps-protocol
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big  --vardir=var-normal-debug-big  --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big  --vardir=var-normal-debug-big  --report-features --skip-test-list=collections/disabled-daily.list
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded-debug-big  --vardir=var-embedded-debug-big  --embedded
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug-big  --vardir=var-ps-debug-big  --ps-protocol --skip-test-list=collections/disabled-daily.list 
 # Run the suites that are not part of the default - funcs_2, stress, jp, nist
@@ -16,11 +16,11 @@
 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master-debug --vardir=var-rpl_crash_safe_master-debug --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
 
 # Additional modes for rpl. Multi-Threaded Slave
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_MTS-debug --vardir=var-mts-rpl-debug --experimental=collections/default.experimental --skip-ndb  --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_MTS-debug --vardir=var-mts-rpl-debug --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
 
 # Additional runs for innodb-page-size=4k and 8k
-perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
 
 #Engine independent tests
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-myisam-engine-debug --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-myisam-engine-debug --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
@@ -31,5 +31,5 @@
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-innodb-engine-debug --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine-debug --suite=engines/iuds,engines/funcs  --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-daily.list
 
 #Memcached tests
-perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --skip-ndb --parallel=1 --retry=0 --suite=memcached --mysqld=--innodb-page-size=4k --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --parallel=1 --retry=0 --suite=memcached --mysqld=--innodb-page-size=4k --skip-test-list=collections/disabled-daily.list
 
 
=== modified file 'Percona-Server/mysql-test/collections/default.experimental'
--- Percona-Server/mysql-test/collections/default.experimental	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/collections/default.experimental	2013-02-13 06:17:00 +0000
@@ -18,13 +18,7 @@
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
 rpl.rpl_parallel_switch_sequential       # BUG#13626976 2012-02-07 dlenev Fails sporadically on pb2
-rpl.rpl_report_port                      # BUG#13812374 2012-05-10 Hemant Fails after the post fix for bug#13812374
 
-# BUG #59055 : All ndb tests should be removed from the repository
-# Leaving the sys_vars tests for now. sys_vars.all_vars.test fails on removing ndb tests
-sys_vars.ndb_log_update_as_write_basic
-sys_vars.have_ndbcluster_basic
-sys_vars.ndb_log_updated_only_basic
 sys_vars.rpl_init_slave_func		 # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
 
 rpl.rpl_mixed_mts_rec_crash_safe @solaris          # Bug#12902514 2011-08-19 andrei mts recovery tests are slow
 
=== modified file 'Percona-Server/mysql-test/collections/default.push'
--- Percona-Server/mysql-test/collections/default.push	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/collections/default.push	2013-02-13 06:17:00 +0000
@@ -1,5 +1,5 @@
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=n_mix-debug --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_ps_row-debug --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=4k
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS-debug --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb  --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl 
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=n_mix-debug --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_ps_row-debug --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --suite=innodb --mysqld=--innodb-page-size=4k
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS-debug --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl 
 
=== modified file 'Percona-Server/mysql-test/collections/default.release.in'
--- Percona-Server/mysql-test/collections/default.release.in	2012-08-22 01:40:20 +0000
+++ Percona-Server/mysql-test/collections/default.release.in	2013-02-13 06:17:00 +0000
@@ -4,15 +4,15 @@
 # include default.daily
 # include default.weekly
 
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=debug      --vardir=var-debug                       --skip-ndbcluster --skip-rpl --report-features --debug-server
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=normal     --vardir=var-normal                      --skip-ndbcluster --report-features
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps         --vardir=var-ps                          --skip-ndbcluster --ps-protocol
+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=debug      --vardir=var-debug --skip-rpl --report-features --debug-server
+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=normal     --vardir=var-normal --report-features
+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps         --vardir=var-ps --ps-protocol
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs1+ps  --vardir=var-funcs_1_ps --suite=funcs_1  --ps-protocol
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs2     --vardir=var-funcs2     --suite=funcs_2
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=partitions --vardir=var-parts      --suite=parts
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=stress     --vardir=var-stress     --suite=stress
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=jp         --vardir=var-jp         --suite=jp
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=embedded   --vardir=var-embedded                    --embedded-server --skip-rpl --skip-ndbcluster
+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=embedded   --vardir=var-embedded                    --embedded-server --skip-rpl
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=nist       --vardir=var-nist       --suite=nist
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=nist+ps    --vardir=var-nist_ps    --suite=nist     --ps-protocol
-perl mysql-test-run.pl --timer --force --comment=memcached --vardir=var-memcached --experimental=collections/default.experimental --skip-ndb --parallel=auto --retry=0 --suite=memcached --mysqld=--innodb-page-size=4k
+perl mysql-test-run.pl --timer --force --comment=memcached --vardir=var-memcached --experimental=collections/default.experimental --parallel=auto --retry=0 --suite=memcached --mysqld=--innodb-page-size=4k
 
=== modified file 'Percona-Server/mysql-test/collections/default.weekly'
--- Percona-Server/mysql-test/collections/default.weekly	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/collections/default.weekly	2013-02-13 06:17:00 +0000
@@ -11,7 +11,7 @@
 # Repeat daily run
 # big-test option for normal runs 
 # Default suites (in modes binlog format stmt/mixed/row, parts), embedded and ps-protocol
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big  --vardir=var-normal-debug-big  --report-features --skip-test-list=collections/disabled-daily.list --unit-tests --mysqld=--innodb_autoextend_increment=64
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big  --vardir=var-normal-debug-big  --report-features --skip-test-list=collections/disabled-daily.list --mysqld=--innodb_autoextend_increment=64
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded-debug-big  --vardir=var-embedded-debug-big  --embedded
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug-big  --vardir=var-ps-debug-big  --ps-protocol --skip-test-list=collections/disabled-daily.list
 
@@ -39,28 +39,28 @@
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine-debug --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine-debug --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list
 
 #Memcached tests
-perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --skip-ndb --parallel=1 --retry=0 --suite=memcached  --skip-test-list=collections/disabled-weekly.list
+perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --parallel=1 --retry=0 --suite=memcached  --skip-test-list=collections/disabled-weekly.list
 
 # Non debug runs of default suites in normal and embedded modes
-perl mysql-test-run.pl --force --debug-server --timer   --parallel=auto --experimental=collections/default.experimental --comment=normal-non-debug  --vardir=var-normal-non-debug --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
+perl mysql-test-run.pl --force --debug-server --timer   --parallel=auto --experimental=collections/default.experimental --comment=normal-non-debug  --vardir=var-normal-non-debug --report-features --skip-test-list=collections/disabled-daily.list
 perl mysql-test-run.pl --force --debug-server --timer    --parallel=auto --experimental=collections/default.experimental --comment=embedded-non-debug  --vardir=var-embedded-non-debug  --embedded
 
 
 
 # Multi-Thread Slave
-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=MTS-debug-big --vardir=var-MTS-debug-big --suite=rpl  --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=MTS-debug-big --vardir=var-MTS-debug-big --suite=rpl  --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0
 
 # Run with 4K page size
-perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix_4k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_ps_row_4k_size --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --debug-server  --timer --force --parallel=auto --comment=main_embedded_4k_size --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix_4k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_ps_row_4k_size --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
+perl mysql-test-run.pl --debug-server  --timer --force --parallel=auto --comment=main_embedded_4k_size --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
 
 # Run with 8K page size
-perl mysql-test-run.pl --debug-server  --timer --force --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix_8k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_ps_row_8k_size --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_embedded_8k_size --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
+perl mysql-test-run.pl --debug-server  --timer --force --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix_8k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_ps_row_8k_size --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_embedded_8k_size --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
 
 
 # Additional run to test rpl HASH_SCAN & INDEX_SCAN
 perl mysql-test-run.pl --force --debug-server --timer --parallel=auto --experimental=collections/default.experimental --comment=binlog_rpl_row_hash_scan --vardir=var-binlog_rpl_row_hash_scan --mysqld=--binlog-format=row --suite=binlog,rpl --mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN --big-test --testcase-timeout=60
-perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=rpl_binlog_row_hash_MTS --vardir=var-mts-rpl-binlog-hash-n_mix --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb  --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl,binlog  -mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=rpl_binlog_row_hash_MTS --vardir=var-mts-rpl-binlog-hash-n_mix --mysqld=--binlog-format=row --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl,binlog  -mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN
 
=== modified file 'Percona-Server/mysql-test/collections/disabled-gtid-on.list'
--- Percona-Server/mysql-test/collections/disabled-gtid-on.list	2012-02-16 10:44:49 +0000
+++ Percona-Server/mysql-test/collections/disabled-gtid-on.list	2013-02-13 06:17:00 +0000
@@ -40,7 +40,7 @@
 
 rpl_gtid_mode : Skipped due to problems in the test.
 binlog_gtid_errors : Skipped due to problems in the test.
-binlog_disable_gtid_unsafe_statements : Skipped due to problems in the test.
+binlog_enforce_gtid_consistency : Skipped due to problems in the test.
 rpl_gtid_execution : Skipped due to problems in the test.
 
 
 
=== renamed file 'Percona-Server/mysql-test/include/mysqlbinlog_row_engine.inc' => 'Percona-Server/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc'
=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_extra_col_master.test'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2012-08-22 01:40:20 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2013-02-13 06:17:00 +0000
@@ -1053,9 +1053,9 @@
 INSERT INTO t1 VALUES (1, @text);
 -- enable_warnings
 
-SELECT * FROM t1; 
+SELECT * FROM t1 ORDER BY c1; 
 -- sync_slave_with_master
-SELECT * FROM t1; 
+SELECT * FROM t1 ORDER BY c1; 
 
 # clean up
 -- connection master
 
=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2012-08-22 01:40:20 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2013-02-13 06:17:00 +0000
@@ -94,7 +94,7 @@
   SET GLOBAL debug="d,rotate_slave_debug_group";
   --source include/start_slave_io.inc
   let $wait_condition=SELECT Master_log_pos = $m_before_master_pos AND Master_log_name = "$m_before_master_file" FROM mysql.slave_master_info;
-  let $slave_failure_printout= 1;
+  let $show_rpl_debug_info= 1;
   --source include/wait_condition.inc
 
   #### Crashing server after assigning and processing jobs ######
 
=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test	2012-02-14 22:25:30 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test	2013-02-13 06:17:00 +0000
@@ -114,6 +114,19 @@
 --echo #                             CLEAN UP
 --echo ########################################################################
 --connection master
+# Resetting the slave's info repository type to its default (FILE)
+# should be done to any tests that starts the server with non-default (TABLE).
+# That prevents the following tests in a suite execution to hit
+# Bug #14827923 RPL TEST RPL_PARALLEL_CHANGE_MASTER FAILS WITH WARNING
+# Technically resetting of the repo type is implemented through
+# one to slave_parallel_workers. Having it zero in the info table
+# at the following restart makes the slave server to quietly migrate
+# the repository to the requested type.
+# Notice that Bug#15858271 of mtr does not allow effectiveness of
+# zeroing.
+# TODO: run the combination described on Bug#15858271 after it's fixed.
+
+--let $saved_workers= 0
 --let $commands= clean
 --source extra/rpl_tests/rpl_mts_crash_safe.inc
 
 
=== modified file 'Percona-Server/mysql-test/include/check-testcase.test'
--- Percona-Server/mysql-test/include/check-testcase.test	2012-08-22 01:40:20 +0000
+++ Percona-Server/mysql-test/include/check-testcase.test	2013-02-13 06:17:00 +0000
@@ -77,6 +77,7 @@
   --echo Master_SSL_Crlpath	
   --echo Retrieved_Gtid_Set	#
   --echo Executed_Gtid_Set	#
+  --echo Auto_Position	0
 }
 if (!$tmp) {
   # Note: after WL#5177, fields 13-18 shall not be filtered-out.
 
=== removed file 'Percona-Server/mysql-test/include/get_binlog_dump_thread_id.inc'
--- Percona-Server/mysql-test/include/get_binlog_dump_thread_id.inc	2007-02-26 08:16:22 +0000
+++ Percona-Server/mysql-test/include/get_binlog_dump_thread_id.inc	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
---exec $MYSQL test -e "show processlist" > $MYSQLTEST_VARDIR/tmp/bl_dump_thread_id
---disable_warnings
-drop table if exists t999;
---enable_warnings
-# Create a table to hold the process list
-create temporary table t999(
-  id int,
-  user char(255),
-  host char(255),
-  db char(255),
-  Command char(255),
-  time int,
-  State char(255),
-  info char(255)
-);
-# Load processlist into table, headers will create seom warnings
---disable_warnings
---replace_result $MYSQLTEST_VARDIR "."
-eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
---enable_warnings
-let $id = `select Id from t999 where Command="Binlog Dump"`;
-drop table t999;
 
=== added file 'Percona-Server/mysql-test/include/have_null_audit_plugin.inc'
--- Percona-Server/mysql-test/include/have_null_audit_plugin.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/have_null_audit_plugin.inc	2013-02-13 06:17:00 +0000
@@ -0,0 +1,22 @@
+disable_query_log;
+#
+# Check if server has support for loading plugins
+#
+if (`SELECT @@have_dynamic_loading != 'YES'`) {
+  --skip Null audit plugin requires dynamic loading
+}
+
+#
+# Check if the variable AUDIT_NULL is set
+#
+if (!$AUDIT_NULL) {
+  --skip Audit_null plugin requires the environment variable \$AUDIT_NULL to be set (normally done by mtr)
+}
+
+#
+# Check if --plugin-dir was setup for null_audit db
+#
+if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$AUDIT_NULL_OPT/'`) {
+  --skip null audit plugin requires that --plugin-dir is set to the null audit plugin dir (either the .opt file does not contain \$AUDIT_NULL_OPT or another plugin is in use)
+}
+enable_query_log;
 
=== added file 'Percona-Server/mysql-test/include/have_sha256_rsa_auth.inc'
--- Percona-Server/mysql-test/include/have_sha256_rsa_auth.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/have_sha256_rsa_auth.inc	2013-02-13 06:17:00 +0000
@@ -0,0 +1,5 @@
+# Only run this test if SHA256/RSA authentication are supported
+let $shavars= query_get_value("SELECT COUNT(*) as shavars FROM information_schema.session_variables WHERE variable_name = 'sha256_password_private_key_path'", shavars, 1);
+if ($shavars == 0){
+  skip Need SHA256/RSA authentication support;
+}
 
=== modified file 'Percona-Server/mysql-test/include/index_merge1.inc'
--- Percona-Server/mysql-test/include/index_merge1.inc	2012-08-22 01:40:20 +0000
+++ Percona-Server/mysql-test/include/index_merge1.inc	2013-02-13 06:17:00 +0000
@@ -29,31 +29,37 @@
 create table t0
 (
   key1 int not null,
-  INDEX i1(key1)
+  key2 int not null,
+  key3 int not null,
+  key4 int not null,
+  key5 int not null,
+  key6 int not null,
+  key7 int not null,
+  key8 int not null,
+  INDEX i1(key1),
+  INDEX i2(key2),
+  INDEX i3(key3),
+  INDEX i4(key4),
+  INDEX i5(key5),
+  INDEX i6(key6),
+  INDEX i7(key7),
+  INDEX i8(key8)
 );
 
 --disable_query_log
-insert into t0 values (1),(2),(3),(4),(5),(6),(7),(8);
+insert into t0 values (1,1,1,1,1,1,1,1023),(2,2,2,2,2,2,2,1022);
 
-let $1=7;
-set @d=8;
+let $1=9;
+set @d=2;
 while ($1)
 {
-  eval insert into t0 select key1+@d from t0;
+  eval insert into t0 select key1+@d, key2+@d, key3+@d, key4+@d, key5+@d,
+                             key6+@d, key7+@d, key8-@d from t0;
   eval set @d=@d*2;
   dec $1;
 }
 --enable_query_log
 
-alter table t0 add key2 int not null, add index i2(key2);
-alter table t0 add key3 int not null, add index i3(key3);
-alter table t0 add key4 int not null, add index i4(key4);
-alter table t0 add key5 int not null, add index i5(key5);
-alter table t0 add key6 int not null, add index i6(key6);
-alter table t0 add key7 int not null, add index i7(key7);
-alter table t0 add key8 int not null, add index i8(key8);
-
-update t0 set key2=key1,key3=key1,key4=key1,key5=key1,key6=key1,key7=key1,key8=1024-key1;
 analyze table t0;
 
 # 1. One index
 
=== added file 'Percona-Server/mysql-test/include/innodb_pk_extension.inc'
--- Percona-Server/mysql-test/include/innodb_pk_extension.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/innodb_pk_extension.inc	2013-02-13 06:17:00 +0000
@@ -0,0 +1,253 @@
+--source include/have_innodb.inc
+
+CREATE TABLE t1
+(
+ pk_1 INT,
+ pk_2 INT,
+ f1 DATETIME,
+ f2 INT,
+ PRIMARY KEY(pk_1, pk_2),
+ KEY k1(f1),
+ KEY k2(f2)
+) ENGINE = InnoDB;
+
+INSERT INTO t1 VALUES
+(1, 1, '2000-01-01', 1), (1, 2, '2000-01-02', 2), (1, 3, '2000-01-03', 3), (1, 4, '2000-01-04', 4), (1, 5, '2000-01-05', 5),
+(2, 1, '2000-01-01', 6), (2, 2, '2000-01-02', 7), (2, 3, '2000-01-03', 8), (2, 4, '2000-01-04', 9), (2, 5, '2000-01-05', 10),
+(3, 1, '2000-01-01', 11), (3, 2, '2000-01-02', 12), (3, 3, '2000-01-03', 13), (3, 4, '2000-01-04', 14), (3, 5, '2000-01-05', 15),
+(4, 1, '2000-01-01', 16), (4, 2, '2000-01-02', 17), (4, 3, '2000-01-03', 18), (4, 4, '2000-01-04', 19), (4, 5, '2000-01-05', 20),
+(5, 1, '2000-01-01', 21), (5, 2, '2000-01-02', 22), (5, 3, '2000-01-03', 23), (5, 4, '2000-01-04', 24), (5, 5, '2000-01-05', 25),
+(6, 1, '2000-01-06', 26), (6, 2, '2000-01-06', 27), (6, 3, '2000-01-03', 28), (6, 4, '2000-01-06', 29), (6, 5, '2000-01-06', 30),
+(7, 1, '2000-01-06', 31), (7, 2, '2000-01-06', 32), (7, 3, '2000-01-03', 33), (7, 4, '2000-01-06', 34), (7, 5, '2000-01-06', 35),
+(8, 1, '2000-01-06', 36), (8, 2, '2000-01-06', 37), (8, 3, '2000-01-03', 38), (8, 4, '2000-01-06', 39), (8, 5, '2000-01-06', 40),
+(9, 1, '2000-01-06', 41), (9, 2, '2000-01-06', 42), (9, 3, '2000-01-03', 43), (9, 4, '2000-01-06', 44), (9, 5, '2000-01-06', 45);
+
+INSERT INTO t1 VALUES
+(11, 1, '2000-01-01', 1), (11, 2, '2000-01-02', 2), (11, 3, '2000-01-03', 3), (11, 4, '2000-01-04', 4), (11, 5, '2000-01-05', 5),
+(12, 1, '2000-01-01', 6), (12, 2, '2000-01-02', 7), (12, 3, '2000-01-03', 8), (12, 4, '2000-01-04', 9), (12, 5, '2000-01-05', 10),
+(13, 1, '2000-01-01', 11), (13, 2, '2000-01-02', 12), (13, 3, '2000-01-03', 13), (13, 4, '2000-01-04', 14), (13, 5, '2000-01-05', 15),
+(14, 1, '2000-01-01', 16), (14, 2, '2000-01-02', 17), (14, 3, '2000-01-03', 18), (14, 4, '2000-01-04', 19), (14, 5, '2000-01-05', 20),
+(15, 1, '2000-01-01', 1), (15, 2, '2000-01-02', 2), (15, 3, '2000-01-03', 3), (15, 4, '2000-01-04', 4), (15, 5, '2000-01-05', 5),
+(16, 1, '2000-01-06', 6), (16, 2, '2000-01-06', 7), (16, 3, '2000-01-03', 8), (16, 4, '2000-01-06', 9), (16, 5, '2000-01-06', 10),
+(17, 1, '2000-01-06', 31), (17, 2, '2000-01-06', 32), (17, 3, '2000-01-03', 33), (17, 4, '2000-01-06', 34), (17, 5, '2000-01-06', 35),
+(18, 1, '2000-01-06', 36), (18, 2, '2000-01-06', 37), (18, 3, '2000-01-03', 38), (18, 4, '2000-01-06', 39), (18, 5, '2000-01-06', 40),
+(19, 1, '2000-01-06', 1), (19, 2, '2000-01-06', 2), (19, 3, '2000-01-03', 3), (19, 4, '2000-01-06', 4), (19, 5, '2000-01-06', 5);
+
+
+INSERT INTO t1 VALUES
+(21, 1, '2000-01-01', 1), (21, 2, '2000-01-02', 2), (31, 3, '2000-01-03', 3), (41, 4, '2000-01-04', 4), (51, 5, '2000-01-05', 5),
+(22, 1, '2000-01-01', 6), (22, 2, '2000-01-02', 7), (32, 3, '2000-01-03', 8), (42, 4, '2000-01-04', 9), (52, 5, '2000-01-05', 10),
+(23, 1, '2000-01-01', 11), (23, 2, '2000-01-02', 12), (33, 3, '2000-01-03', 13), (43, 4, '2000-01-04', 14), (53, 5, '2000-01-05', 15),
+(24, 1, '2000-01-01', 16), (24, 2, '2000-01-02', 17), (34, 3, '2000-01-03', 18), (44, 4, '2000-01-04', 19), (54, 5, '2000-01-05', 20),
+(25, 1, '2000-01-01', 1), (25, 2, '2000-01-02', 2), (35, 3, '2000-01-03', 3), (45, 4, '2000-01-04', 4), (55, 5, '2000-01-05', 5),
+(26, 1, '2000-01-06', 6), (26, 2, '2000-01-06', 7), (36, 3, '2000-01-03', 8), (46, 4, '2000-01-06', 9), (56, 5, '2000-01-06', 10),
+(27, 1, '2000-01-06', 31), (27, 2, '2000-01-06', 32), (37, 3, '2000-01-03', 33), (47, 4, '2000-01-06', 34), (57, 5, '2000-01-06', 35),
+(28, 1, '2000-01-06', 36), (28, 2, '2000-01-06', 37), (38, 3, '2000-01-03', 38), (48, 4, '2000-01-06', 39), (58, 5, '2000-01-06', 40),
+(29, 1, '2000-01-06', 1), (29, 2, '2000-01-06', 2), (39, 3, '2000-01-03', 3), (49, 4, '2000-01-06', 4), (59, 5, '2000-01-06', 5);
+
+INSERT INTO t1 SELECT pk_1 + 60, pk_2, f1, f2 FROM t1;
+INSERT INTO t1 SELECT pk_1 + 120, pk_2, f1, f2 FROM t1;
+INSERT INTO t1 SELECT pk_1 + 240, pk_2, f1, f2 FROM t1;
+INSERT INTO t1 SELECT pk_1, pk_2 + 10, f1, f2 FROM t1;
+
+ANALYZE TABLE t1;
+
+--echo #
+--echo # REF access optimization
+--echo #
+
+--replace_column 9 #
+EXPLAIN SELECT count(*) FROM t1 WHERE pk_1 = 3 and f1 = '2000-01-03';
+FLUSH STATUS;
+SELECT count(*) FROM t1 WHERE pk_1 = 3 and f1 = '2000-01-03';
+SHOW STATUS LIKE 'handler_read%';
+
+--replace_column 9 #
+EXPLAIN SELECT pk_2 FROM t1 WHERE pk_1 = 3 and f1 = '2000-01-03';
+FLUSH STATUS;
+SELECT pk_2 FROM t1 WHERE pk_1 = 3 and f1 = '2000-01-03';
+SHOW STATUS LIKE 'handler_read%';
+
+--echo #
+--echo # RANGE access optimization
+--echo #
+
+--replace_column 9 #
+EXPLAIN SELECT count(*) FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
+FLUSH STATUS;
+SELECT count(*) FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
+SHOW STATUS LIKE 'handler_read%';
+
+--replace_column 9 #
+EXPLAIN SELECT pk_1, pk_2 FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
+FLUSH STATUS;
+SELECT pk_1, pk_2 FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
+SHOW STATUS LIKE 'handler_read%';
+
+--echo #
+--echo # MAX/MIN optimization
+--echo #
+
+--replace_column 9 #
+EXPLAIN SELECT MIN(pk_1) FROM t1 WHERE f1 = '2000-01-03';
+FLUSH STATUS;
+SELECT MIN(pk_1) FROM t1 WHERE f1 = '2000-01-03';
+SHOW STATUS LIKE 'handler_read%';
+
+--replace_column 9 #
+EXPLAIN SELECT MIN(pk_1) FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
+FLUSH STATUS;
+SELECT MIN(pk_1) FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
+SHOW STATUS LIKE 'handler_read%';
+
+--replace_column 9 #
+EXPLAIN SELECT MAX(pk_1) FROM t1 WHERE f1 = '2000-01-03';
+FLUSH STATUS;
+SELECT MAX(pk_1) FROM t1 WHERE f1 = '2000-01-03';
+SHOW STATUS LIKE 'handler_read%';
+
+--replace_column 9 #
+EXPLAIN SELECT MAX(pk_1) FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
+FLUSH STATUS;
+SELECT MAX(pk_1) FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
+SHOW STATUS LIKE 'handler_read%';
+
+--echo #
+--echo # Loose index scan
+--echo #
+
+--replace_column 9 #
+EXPLAIN SELECT MIN(pk_1) FROM t1 WHERE f2 BETWEEN 13 AND 14 GROUP BY f2;
+FLUSH STATUS;
+SELECT MIN(pk_1) FROM t1 WHERE f2 BETWEEN 13 AND 14 GROUP BY f2;
+SHOW STATUS LIKE 'handler_read%';
+
+--replace_column 9 #
+EXPLAIN SELECT MIN(pk_1) FROM t1 WHERE f2 IN (1, 2) GROUP BY f2;
+FLUSH STATUS;
+SELECT MIN(pk_1) FROM t1 WHERE f2 IN (1, 2) GROUP BY f2;
+SHOW STATUS LIKE 'handler_read%';
+
+--echo #
+--echo # JOIN optimization
+--echo #
+
+--replace_column 9 #
+EXPLAIN SELECT count(*) FROM t1 AS t1 JOIN t1 AS t2
+ON t2.pk_1 = t1.pk_1 WHERE t1.f1 = '2000-01-03' AND t2.f1 = '2000-01-03';
+FLUSH STATUS;
+SELECT count(*) FROM t1 AS t1 JOIN t1 AS t2
+ON t2.pk_1 = t1.pk_1 WHERE t1.f1 = '2000-01-03' AND t2.f1 = '2000-01-03';
+SHOW STATUS LIKE 'handler_read%';
+
+--echo #
+--echo # Optimization of sorting
+--echo #
+
+--replace_column 9 #
+EXPLAIN SELECT f1, pk_1, pk_2 FROM t1 WHERE pk_1 = 3 AND f1 = '2000-01-03'
+ORDER BY pk_2 DESC LIMIT 5;
+FLUSH STATUS;
+SELECT f1, pk_1, pk_2 FROM t1 WHERE pk_1 = 3 AND f1 = '2000-01-03'
+ORDER BY pk_2 DESC LIMIT 5;
+SHOW STATUS LIKE 'handler_read%';
+
+--replace_column 9 #
+EXPLAIN SELECT f1, pk_1, pk_2 FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03'
+ORDER BY pk_2 DESC LIMIT 5;
+FLUSH STATUS;
+SELECT f1, pk_1, pk_2 FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03'
+ORDER BY pk_2 DESC LIMIT 5;
+SHOW STATUS LIKE 'handler_read%';
+
+DROP TABLE t1;
+
+--echo #
+--echo # Max key part limitation
+--echo #
+
+CREATE TABLE t1
+(
+  f1 INT, f2 INT, f3 INT, f4 INT, f5 INT, f6 INT, f7 INT, f8 INT, f9 INT, f10 INT,
+  f11 INT, f12 INT, f13 INT, f14 INT, f15 INT, f16 INT, f17 INT, f18 INT,
+  PRIMARY KEY (f1, f2, f3, f4, f5, f6, f7, f8, f9, f10),
+  KEY k1 (f11, f12, f13, f14, f15, f16, f17)
+) ENGINE = InnoDB;
+
+--replace_column 9 #
+EXPLAIN SELECT f17 FROM t1 FORCE INDEX (k1) WHERE
+f1 = 0 AND f2 = 0 AND f3 = 0 AND f4 = 0 AND f5 = 0 AND
+f6 = 0 AND f7 = 0 AND f8 = 0 AND f9 = 0 AND f10 = 0 AND
+f11 = 0 AND f12 = 0 AND f13 = 0 AND f14 = 0 AND
+f15 = 0 AND f16 = 0 AND f17 = 0;
+
+--replace_column 9 #
+EXPLAIN SELECT f17 FROM t1 FORCE INDEX (k1) WHERE
+f1 = 0 AND f2 = 0 AND f3 = 0 AND f4 = 0 AND f5 = 0 AND
+f6 = 0 AND f7 = 0 AND f8 = 0 AND f9 = 0 AND
+f11 = 0 AND f12 = 0 AND f13 = 0 AND f14 = 0 AND
+f15 = 0 AND f16 = 0 AND f17 = 0;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Max key length limitation
+--echo #
+
+CREATE TABLE t1
+(
+  f1 VARCHAR(500), f2 VARCHAR(500), f3 VARCHAR(500),
+  f4 VARCHAR(500), f5 VARCHAR(500), f6 VARCHAR(500),
+  f7 VARCHAR(500),
+  PRIMARY KEY (f1, f2, f3, f4),
+  KEY k1 (f5, f6, f7)
+) ENGINE = InnoDB;
+
+--replace_column 9 #
+EXPLAIN SELECT f5 FROM t1 FORCE INDEX (k1) WHERE
+f1 = 'a' AND f2 = 'a' AND f3 = 'a' AND f4 = 'a' AND
+f5 = 'a' AND f6 = 'a' AND f7 = 'a';
+
+--replace_column 9 #
+EXPLAIN SELECT f5 FROM t1 FORCE INDEX (k1) WHERE
+f1 = 'a' AND f2 = 'a' AND f3 = 'a' AND
+f5 = 'a' AND f6 = 'a' AND f7 = 'a';
+
+--replace_column 9 #
+EXPLAIN SELECT f5 FROM t1 FORCE INDEX (k1) WHERE
+f1 = 'a' AND f2 = 'a' AND f4 = 'a' AND
+f5 = 'a' AND f6 = 'a' AND f7 = 'a';
+
+DROP TABLE t1;
+
+--echo #
+--echo # Unique extended key
+--echo #
+
+CREATE TABLE t1
+(
+  pk INT NOT NULL auto_increment,
+  f1 INT NOT NULL,
+  KEY (f1),
+  PRIMARY KEY (pk)
+) ENGINE = INNODB;
+
+CREATE TABLE t2
+(
+  f1 INT,
+  f2 INT
+) ENGINE = INNODB;
+
+INSERT INTO t1(f1) VALUES (1),(2);
+INSERT INTO t1(f1) SELECT f1 + 2 FROM t1;
+INSERT INTO t1(f1) SELECT f1 + 4 FROM t1;
+ANALYZE TABLE t1;
+
+INSERT INTO t2 VALUES (1,1), (2,2);
+
+EXPLAIN SELECT t2.f1 FROM t2 JOIN t1 IGNORE INDEX(primary) ON t2.f1 = t1.pk and t2.f2 = t1.f1;
+FLUSH STATUS;
+SELECT t2.f1 FROM t2 JOIN t1 IGNORE INDEX(primary) ON t2.f1 = t1.pk and t2.f2 = t1.f1;
+SHOW STATUS LIKE 'Handler_read%';
+
+DROP TABLE t1, t2;
 
=== modified file 'Percona-Server/mysql-test/include/master-slave.inc'
--- Percona-Server/mysql-test/include/master-slave.inc	2012-03-06 14:29:42 +0000
+++ Percona-Server/mysql-test/include/master-slave.inc	2013-02-13 06:17:00 +0000
@@ -11,12 +11,13 @@
 #   [--let $rpl_skip_start_slave= 1]
 #   [--let $rpl_debug= 1]
 #   [--let $slave_timeout= NUMBER]
+#   [--let $use_gtids= 1]
 #   --source include/master-slave.inc
 #
 # Parameters:
 #   $rpl_check_server_ids, $rpl_skip_reset_master_and_slave,
 #   $rpl_skip_change_master, $rpl_skip_start_slave, $rpl_debug,
-#   $slave_timeout
+#   $slave_timeout, $use_gtids
 #     See include/rpl_init.inc
 #
 #   $rpl_server_count
 
=== modified file 'Percona-Server/mysql-test/include/mtr_check.sql'
--- Percona-Server/mysql-test/include/mtr_check.sql	2012-03-06 14:29:42 +0000
+++ Percona-Server/mysql-test/include/mtr_check.sql	2013-02-13 06:17:00 +0000
@@ -63,7 +63,7 @@
   SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
     WHERE variable_name NOT IN ('timestamp', 'server_uuid',
                                 'innodb_file_format_max',
-                                'gtid_done', 'gtid_lost')
+                                'gtid_executed', 'gtid_purged')
     ORDER BY VARIABLE_NAME;
 
   -- Dump all databases, there should be none
 
=== modified file 'Percona-Server/mysql-test/include/mtr_warnings.sql'
--- Percona-Server/mysql-test/include/mtr_warnings.sql	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/include/mtr_warnings.sql	2013-02-13 06:17:00 +0000
@@ -88,7 +88,7 @@
 INSERT INTO global_suppressions VALUES
  (".SELECT UNIX_TIMESTAMP... failed on master"),
  ("Aborted connection"),
- ("Client requested master to start replication from impossible position"),
+ ("Client requested master to start replication from position"),
  ("Could not find first log file name in binary log"),
  ("Enabling keys got errno"),
  ("Error reading master configuration"),
@@ -178,7 +178,8 @@
 
  /* Added 2009-08-XX after fixing Bug #42408 */
 
- ("Although a path was specified for the .* option, log tables are used"),
+ ("Although a path was specified for the --general-log-file option, log tables are used"),
+ ("Although a path was specified for the --slow-query-log-file option, log tables are used"),
  ("Backup: Operation aborted"),
  ("Restore: Operation aborted"),
  ("Restore: The grant .* was skipped because the user does not exist"),
 
=== modified file 'Percona-Server/mysql-test/include/mysqld--help.inc'
--- Percona-Server/mysql-test/include/mysqld--help.inc	2013-01-21 13:20:09 +0000
+++ Percona-Server/mysql-test/include/mysqld--help.inc	2013-02-13 06:17:00 +0000
@@ -16,8 +16,8 @@
 perl;
   # Variables which we don't want to display in the result file since
   # their paths may vary:
-  @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
-               log-slow-queries pid-file slow-query-log-file
+  @skipvars=qw/basedir open-files-limit general-log-file plugin-dir
+               pid-file slow-query-log-file
 			   datadir slave-load-tmpdir tmpdir socket table-definition-cache table-open-cache/;
 
   # Plugins which may or may not be there:
 
=== modified file 'Percona-Server/mysql-test/include/not_ndb_default.inc'
--- Percona-Server/mysql-test/include/not_ndb_default.inc	2011-04-15 08:55:50 +0000
+++ Percona-Server/mysql-test/include/not_ndb_default.inc	2013-02-13 06:17:00 +0000
@@ -1,4 +1,6 @@
---require r/not_ndb_default.require
-disable_query_log;
-select convert(@@storage_engine using latin1) NOT IN ("ndbcluster","NDBCLUSTER") as "TRUE";
-enable_query_log;
+# Skip the test in case the default storage engine is NDB.
+
+if (`SELECT CONVERT(@@default_storage_engine USING latin1) IN ('ndbcluster','NDBCLUSTER')`)
+{
+  --skip Test requires default storage engine (@@default_storage_engine) != NDB
+}
 
=== added file 'Percona-Server/mysql-test/include/not_sha256_rsa_auth.inc'
--- Percona-Server/mysql-test/include/not_sha256_rsa_auth.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/not_sha256_rsa_auth.inc	2013-02-13 06:17:00 +0000
@@ -0,0 +1,5 @@
+# Only run this test if YaSSL is supported
+let $shavars= query_get_value("SELECT COUNT(*) as shavars FROM information_schema.session_variables WHERE variable_name = 'sha256_password_private_key_path'", shavars, 1);
+if ($shavars != 0){
+  skip Need YaSSL support;
+}
 
=== modified file 'Percona-Server/mysql-test/include/read_many_rows.inc'
--- Percona-Server/mysql-test/include/read_many_rows.inc	2010-10-25 09:20:53 +0000
+++ Percona-Server/mysql-test/include/read_many_rows.inc	2013-02-13 06:17:00 +0000
@@ -112,7 +112,7 @@
 insert into t1 values(1);
 
 connection con2;
---error 1213
+--error 1213,1205
 reap;
 select @a;
 # check that the whole transaction was rolled back
 
=== modified file 'Percona-Server/mysql-test/include/rpl_init.inc'
--- Percona-Server/mysql-test/include/rpl_init.inc	2012-01-30 19:56:21 +0000
+++ Percona-Server/mysql-test/include/rpl_init.inc	2013-02-13 06:17:00 +0000
@@ -51,6 +51,7 @@
 #    [--let $rpl_skip_reset_master_and_slave= 1]
 #    [--let $rpl_debug= 1]
 #    [--let $slave_timeout= NUMBER]
+#    [--let $use_gtids= 1]
 #    --source include/rpl_init.inc
 #
 #    Parameters:
@@ -104,6 +105,9 @@
 #      Timeout used when waiting for the slave threads to start.
 #      See include/wait_for_slave_param.inc
 #
+#    $use_gtids
+#      Use option MASTER_AUTO_POSITION = 1 to CHANGE MASTER.
+#
 #
 # ==== Side effects ====
 #
 
=== modified file 'Percona-Server/mysql-test/include/rpl_start_server.inc'
--- Percona-Server/mysql-test/include/rpl_start_server.inc	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/include/rpl_start_server.inc	2013-02-13 06:17:00 +0000
@@ -23,7 +23,7 @@
 #
 #   $rpl_start_with_gtids
 #     If set, the server will start with GTIDs on, i.e.:
-#       --gtid-mode=on --disable-gtid-unsafe-statements
+#       --gtid-mode=on --enforce-gtid-consistency
 #       --log-bin --log-slave-updates
 #       --default-storage-engine=InnoDB --default-tmp-storage-engine=InnoDB
 #
@@ -61,7 +61,7 @@
 if ($rpl_start_with_gtids)
 {
   --let $_rpl_start_server_info= $_rpl_start_server_info gtids=on
-  --let _RPL_START_SERVER_PARAMETERS= $_RPL_START_SERVER_PARAMETERS --log-bin --log-slave-updates --disable-gtid-unsafe-statements --gtid-mode=on --default-storage-engine=InnoDB --default-tmp-storage-engine=InnoDB
+  --let _RPL_START_SERVER_PARAMETERS= $_RPL_START_SERVER_PARAMETERS --log-bin --log-slave-updates --enforce-gtid-consistency --gtid-mode=on --default-storage-engine=InnoDB --default-tmp-storage-engine=InnoDB
 }
 if ($rpl_server_parameters != '')
 {
 
=== modified file 'Percona-Server/mysql-test/include/save_master_pos.inc'
--- Percona-Server/mysql-test/include/save_master_pos.inc	2012-02-17 19:46:49 +0000
+++ Percona-Server/mysql-test/include/save_master_pos.inc	2013-02-13 06:17:00 +0000
@@ -29,7 +29,7 @@
 
 if ($use_gtids)
 {
-  --let $_saved_gtids= `SELECT @@global.gtid_done`
+  --let $_saved_gtids= `SELECT @@global.gtid_executed`
   if ($rpl_debug)
   {
     --echo save_master_pos saved gtid='$_saved_gtids'
 
=== modified file 'Percona-Server/mysql-test/include/show_events.inc'
--- Percona-Server/mysql-test/include/show_events.inc	2012-08-22 01:40:20 +0000
+++ Percona-Server/mysql-test/include/show_events.inc	2013-02-13 06:17:00 +0000
@@ -79,7 +79,7 @@
 if ($keep_gtid_events)
 {
   let $pre_script= $pre_script
-    my DOLLARuuid_regex = '[0-9A-F]{8}-(?:[0-9A-F]{4}-){3}[0-9A-F]{12}';
+    my DOLLARuuid_regex = '[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}';
     my DOLLARuuid_sidno_regex = DOLLARuuid_regex.'(?::[0-9]+(?:-[0-9]+)?)+';
   ||
   --let $script= $script s{DOLLARuuid_sidno_regex(?:,DOLLARuuid_sidno_regex)*}{Gtid_set};
 
=== modified file 'Percona-Server/mysql-test/include/show_rpl_debug_info.inc'
--- Percona-Server/mysql-test/include/show_rpl_debug_info.inc	2012-02-17 19:46:49 +0000
+++ Percona-Server/mysql-test/include/show_rpl_debug_info.inc	2013-02-13 06:17:00 +0000
@@ -42,6 +42,7 @@
 --enable_query_log
 --enable_result_log
 --enable_warnings
+--enable_connect_log
 --disable_abort_on_error
 --horizontal_results
 
@@ -71,7 +72,7 @@
   --echo
   --echo **** GTID_* on $CURRENT_CONNECTION ****
   query_vertical
-  SELECT @@GLOBAL.GTID_DONE, @@GLOBAL.GTID_LOST, @@GLOBAL.GTID_OWNED, @@SESSION.GTID_DONE, @@SESSION.GTID_OWNED;
+  SELECT @@GLOBAL.GTID_EXECUTED, @@GLOBAL.GTID_PURGED, @@GLOBAL.GTID_OWNED, @@SESSION.GTID_EXECUTED, @@SESSION.GTID_OWNED;
   --echo
   --echo **** SHOW SLAVE STATUS on $CURRENT_CONNECTION ****
   query_vertical SHOW SLAVE STATUS;
@@ -97,7 +98,12 @@
   let $relaylog_name= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1);
   --echo relaylog_name = '$relaylog_name'
   eval SHOW RELAYLOG EVENTS IN '$relaylog_name';
-
+  --echo
+  --echo **** slave_relay_info on $CURRENT_CONNECTION ****
+  SELECT * FROM mysql.slave_relay_log_info;
+  --echo
+  --echo **** slave_master_info on $CURRENT_CONNECTION ****
+  SELECT * FROM mysql.slave_master_info;
 
   --let $_rpl_is_first_server= 0
   --dec $_rpl_server
 
=== added file 'Percona-Server/mysql-test/include/stop_dump_threads.inc'
--- Percona-Server/mysql-test/include/stop_dump_threads.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/stop_dump_threads.inc	2013-02-13 06:17:00 +0000
@@ -0,0 +1,33 @@
+# ==== Purpose ====
+#
+# Stop all dump threads on the server of the current connection.
+#
+# ==== Usage ====
+#
+# --source include/stop_dump_threads.inc
+
+--let $include_filename= stop_dump_threads.inc
+--source include/begin_include_file.inc
+
+
+--let $_sdt_show_rpl_debug_info_old= $show_rpl_debug_info
+--let $show_rpl_debug_info= 1
+--disable_query_log
+--disable_result_log
+
+--let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
+
+while ($_sdt_dump_thread_id != '')
+{
+  eval KILL $_sdt_dump_thread_id;
+  --let $wait_condition= SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = $_sdt_dump_thread_id
+  --source include/wait_condition.inc
+
+  --let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
+}
+
+
+--let $show_rpl_debug_info= $_sdt_show_rpl_debug_info_old
+
+--let $include_filename= stop_dump_threads.inc
+--source include/end_include_file.inc
 
=== modified file 'Percona-Server/mysql-test/include/subquery_sj.inc'
--- Percona-Server/mysql-test/include/subquery_sj.inc	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/include/subquery_sj.inc	2013-02-13 06:17:00 +0000
@@ -2545,7 +2545,7 @@
   varchar_nokey varchar(1) NOT NULL
 );
 INSERT INTO BB VALUES ('i'),('t');
--- error ER_OPERAND_COLUMNS
+-- error ER_BAD_FIELD_ERROR
 SELECT varchar_nokey FROM C
 WHERE (varchar_nokey, OUTR) IN (SELECT varchar_nokey
                                 FROM BB);
 
=== modified file 'Percona-Server/mysql-test/include/sync_slave_sql.inc'
--- Percona-Server/mysql-test/include/sync_slave_sql.inc	2012-02-17 19:46:49 +0000
+++ Percona-Server/mysql-test/include/sync_slave_sql.inc	2013-02-13 06:17:00 +0000
@@ -3,7 +3,7 @@
 # This file does the same as the built-in command sync_with_master,
 # but more flexible. In particular:
 #  - Can use a custom timeout.
-#  - Can use SQL_THREAD_WAIT_AFTER_GTIDS instead of MASTER_POS_WAIT.
+#  - Can use WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS instead of MASTER_POS_WAIT.
 #  - The position can be set by the user, it is not restricted to
 #    save_master_pos
 #
@@ -41,9 +41,9 @@
 {
   if ($rpl_debug)
   {
-    --echo debug: SQL_THREAD_WAIT_AFTER_GTIDS('$_saved_gtids', $_sss_slave_timeout)
+    --echo debug: WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS('$_saved_gtids', $_sss_slave_timeout)
   }
-  --let $_sss_result= `SELECT SQL_THREAD_WAIT_AFTER_GTIDS('$_saved_gtids', $_sss_slave_timeout)`
+  --let $_sss_result= `SELECT WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS('$_saved_gtids', $_sss_slave_timeout)`
 }
 if (!$use_gtids)
 {
 
=== modified file 'Percona-Server/mysql-test/include/wait_condition.inc'
--- Percona-Server/mysql-test/include/wait_condition.inc	2012-08-22 01:40:20 +0000
+++ Percona-Server/mysql-test/include/wait_condition.inc	2013-02-13 06:17:00 +0000
@@ -13,7 +13,7 @@
 #
 #   OR
 #
-#    let $slave_failure_printout= 1; # to force post-failure printout
+#    let $show_rpl_debug_info= 1; # to force post-failure printout
 #    let $wait_timeout= 60; # Override default 30 seconds with 60.
 #    let $wait_condition=
 #      SELECT c = 3 FROM t;
@@ -53,16 +53,9 @@
 }
 if (!$success)
 {
-  if ($slave_failure_printout)
+  if ($show_rpl_debug_info)
   {
-     --connection slave
-     --echo
-     --echo *** Slave server status: ***
-     --echo
-     --query_vertical show slave status
-     --query_vertical show processlist
-     --query_vertical select * from mysql.slave_relay_log_info
-     --query_vertical select * from mysql.slave_master_info
+    --source include/show_rpl_debug_info.inc
   }
   die Timeout in wait_condition.inc for $wait_condition;
 }
 
=== added file 'Percona-Server/mysql-test/include/wait_time_until_connected_again.inc'
--- Percona-Server/mysql-test/include/wait_time_until_connected_again.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/wait_time_until_connected_again.inc	2013-02-13 06:17:00 +0000
@@ -0,0 +1,27 @@
+#
+# Include this script to wait until the connection to the
+# server has been restored or timeout occurs
+# Unlike wait_until_connected_again the variable counter must be set outside as var. 
+# set WAIT_COUNT before executinmg this include file.
+--disable_result_log
+--disable_query_log
+let $counter= $WAIT_COUNT;
+let $mysql_errno= 9999;
+while ($mysql_errno)
+{
+  # Strangely enough, the server might return "Too many connections"
+  # while being shutdown, thus 1040 is an "allowed" error
+  # See BUG#36228
+  --error 0,1040,1053,2002,2003,2006,2013
+  show status;
+
+  dec $counter;
+  if (!$counter)
+  {
+    --echo Waited $WAIT_COUNT * 0.5 sec.
+    --die Server failed to restart
+  }
+  --sleep 0.5
+}
+--enable_query_log
+--enable_result_log
 
=== modified file 'Percona-Server/mysql-test/include/write_result_to_file.inc'
--- Percona-Server/mysql-test/include/write_result_to_file.inc	2012-02-08 13:28:38 +0000
+++ Percona-Server/mysql-test/include/write_result_to_file.inc	2013-02-13 06:17:00 +0000
@@ -4,11 +4,13 @@
 # if the output needs more advanced parsing than can be done by
 # mysqltest commands.
 #
+# The statement is sent to mysqld on current connection using
+# the mysql command line client.
+#
 # ==== Usage ====
 #
 # --let $statement= <STATEMENT>
 # --let $output_file= {<FILE>|GENERATE}
-# [--let $server_number= <NUMBER>]
 # [--let $dont_print_statement= 1]
 # --source include/write_result_to_file.inc
 #
@@ -16,10 +18,6 @@
 #   $statement
 #     The statement to execute.
 #
-#   $server_number
-#     1 for the master, 2 for the slave, 3 for next server, etc.
-#     If omitted, uses current connection.
-#
 #   $output_file
 #     Name of file to write. If omitted, generates a new filename and
 #     stores the name both in the mysqltest variable $output_file and
@@ -30,16 +28,14 @@
 #     statement contains non-deterministic output, set this variable
 #     to suppress it.
 
---let _WRTF_SERVER_NUMBER= $server_number
-if (!$server_number)
-{
-  --let _WRTF_SERVER_NUMBER= `SELECT 1 + @@PORT - $MASTER_MYPORT`
-}
+# Get the port and socket used by mysqld on current connection
+--let _WRTF_SERVER_PORT= `SELECT @@PORT`
+--let _WRTF_SERVER_SOCKET= `SELECT @@SOCKET`
 
---let $_write_result_msg= [server=$_WRTF_SERVER_NUMBER]
+--let $_write_result_msg= [connection=$CURRENT_CONNECTION]
 if (!$dont_print_statement)
 {
-  --let $_write_result_msg= [server=$_WRTF_SERVER_NUMBER statement=$statement]
+  --let $_write_result_msg= [connection=$CURRENT_CONNECTION statement=$statement]
 }
 
 --let $include_filename= write_result_to_file.inc $_write_result_msg
@@ -63,12 +59,16 @@
 --let _WRTF_OUTPUT_FILE= $output_file
 
 perl;
+  use strict;
   my $stmt= $ENV{'_WRTF_STATEMENT'};
-  my $server_number= $ENV{'_WRTF_SERVER_NUMBER'};
+  # Connecting mysql to same mysqld as current connectiona
+  # by overriding port and socket
   my $mysql = $ENV{'MYSQL'};
-  $mysql =~ s/( --|$)/ --defaults-group-suffix=.$server_number$1/;
+  my $server_port= $ENV{'_WRTF_SERVER_PORT'};
+  my $server_socket= $ENV{'_WRTF_SERVER_SOCKET'};
+  $mysql .= " --port=$server_port --socket=$server_socket";
   my $outfile = $ENV{'_WRTF_OUTPUT_FILE'};
-  open MYSQL, "| $mysql > $outfile" or die "Failed to open pipe to client on server '$server_number': $!";
+  open MYSQL, "| $mysql > $outfile" or die "Failed to open MYSQL pipe: '$mysql > $outfile'";
   print MYSQL $stmt, ';' or die "Error printing statement to MYSQL pipe: $!";
   close MYSQL or die "Error closing MYSQL pipe: $!";
 EOF
 
=== modified file 'Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt'
--- Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt	2011-05-20 11:50:50 +0000
+++ Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt	2013-02-13 06:17:00 +0000
@@ -29,4 +29,4 @@
 IF(WIN32)
   INSTALL(TARGETS my_safe_kill DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
 ENDIF()
-INSTALL(FILES safe_process.pl Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
+INSTALL(FILES Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
 
=== modified file 'Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc'
--- Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc	2011-09-07 10:08:09 +0000
+++ Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc	2013-02-13 06:17:00 +0000
@@ -152,12 +152,19 @@
   pid_t own_pid= getpid();
   pid_t parent_pid= getppid();
   bool nocore = false;
-
+  struct sigaction sa,sa_abort;
+
+  sa.sa_handler= handle_signal;
+  sa.sa_flags= SA_NOCLDSTOP;
+  sigemptyset(&sa.sa_mask);
+
+  sa_abort.sa_handler= handle_abort;
+  sigemptyset(&sa_abort.sa_mask);
   /* Install signal handlers */
-  signal(SIGTERM, handle_signal);
-  signal(SIGINT,  handle_signal);
-  signal(SIGCHLD, handle_signal);
-  signal(SIGABRT, handle_abort);
+  sigaction(SIGTERM, &sa,NULL);
+  sigaction(SIGINT, &sa,NULL);
+  sigaction(SIGCHLD, &sa,NULL);
+  sigaction(SIGABRT, &sa_abort,NULL);
 
   sprintf(safe_process_name, "safe_process[%ld]", (long) own_pid);
 
 
=== removed file 'Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.pl'
--- Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.pl	2011-09-07 10:08:09 +0000
+++ Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.pl	1970-01-01 00:00:00 +0000
@@ -1,166 +0,0 @@
-#!/usr/bin/perl
-# -*- cperl -*-
-
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-use strict;
-use warnings;
-
-use lib 'lib';
-use My::SafeProcess::Base;
-use POSIX qw(WNOHANG);
-
-###########################################################################
-# Util functions
-###########################################################################
-
-#
-#Print message to stderr
-#
-my $verbose= 0;
-sub message {
-  if ($verbose > 0){
-    use Time::localtime;
-    my $tm= localtime();
-    my $timestamp= sprintf("%02d%02d%02d %2d:%02d:%02d",
-			   $tm->year % 100, $tm->mon+1, $tm->mday,
-			   $tm->hour, $tm->min, $tm->sec);
-    print STDERR $timestamp, " monitor[$$]: ", @_, "\n";
-  }
-}
-
-
-###########################################################################
-# Main program
-###########################################################################
-
-my $terminated= 0;
-
-# Protect against being killed in the middle
-# of child creation, just set the terminated flag
-# to make sure the child will be killed off
-# when program is ready to do that
-$SIG{TERM}= sub { message("!Got signal @_"); $terminated= 1; };
-$SIG{INT}= sub { message("!Got signal @_"); $terminated= 1; };
-
-my $parent_pid= getppid();
-
-my $found_double_dash= 0;
-while (my $arg= shift(@ARGV)){
-
-  if ($arg =~ /^--$/){
-    $found_double_dash= 1;
-    last;
-  }
-  elsif ($arg =~ /^--verbose$/){
-    $verbose= 1;
-  }
-  else {
-    die "Unknown option: $arg";
-  }
-}
-
-my $path=       shift(@ARGV); # Executable
-
-die "usage:\n" .
-    " safe_process.pl [opts] -- <path> [<args> [...<args_n>]]"
-  unless defined $path || $found_double_dash;
-
-
-message("started");
-#message("path: '$path'");
-message("parent: $parent_pid");
-
-# Start process to monitor
-my $child_pid=
-  create_process(
-		 path     => $path,
-		 args     => \@ARGV,
-		 setpgrp  => 1,
-		);
-message("Started child $child_pid");
-
-eval {
-  sub handle_signal {
-    $terminated= 1;
-    message("Got signal @_");
-
-    # Ignore all signals
-    foreach my $name (keys %SIG){
-      $SIG{$name}= 'IGNORE';
-    }
-
-    die "signaled\n";
-  };
-  local $SIG{TERM}= \&handle_signal;
-  local $SIG{INT}=  \&handle_signal;
-  local $SIG{CHLD}= sub {
-    message("Got signal @_");
-    kill('KILL', -$child_pid);
-    my $ret= waitpid($child_pid, 0);
-    if ($? & 127){
-      exit(65); # Killed by signal
-    }
-    exit($? >> 8);
-  };
-
-  # Monitoring loop
-  while(!$terminated) {
-
-    # Check if parent is still alive
-    if (kill(0, $parent_pid) < 1){
-      message("Parent is not alive anymore");
-      last;
-    }
-
-    # Wait for child to terminate but wakeup every
-    # second to also check that parent is still alive
-    my $ret_pid;
-    $ret_pid= waitpid($child_pid, &WNOHANG);
-    if ($ret_pid == $child_pid) {
-      # Process has exited, collect return status
-      my $ret_code= $? >> 8;
-      message("Child exit: $ret_code");
-      # Exit with exit status of the child
-      exit ($ret_code);
-    }
-    sleep(1);
-  }
-};
-if ( $@ ) {
-  # The monitoring loop should have been
-  # broken by handle_signal
-  warn "Unexpected: $@" unless ( $@ =~ /signaled/ );
-}
-
-# Use negative pid in order to kill the whole
-# process group
-#
-my $ret= kill('KILL', -$child_pid);
-message("Killed child: $child_pid, ret: $ret");
-if ($ret > 0) {
-  message("Killed child: $child_pid");
-  # Wait blocking for the child to return
-  my $ret_pid= waitpid($child_pid, 0);
-  if ($ret_pid != $child_pid){
-    message("unexpected pid $ret_pid returned from waitpid($child_pid)");
-  }
-}
-
-message("DONE!");
-exit (1);
-
-
 
=== modified file 'Percona-Server/mysql-test/lib/mtr_cases.pm'
--- Percona-Server/mysql-test/lib/mtr_cases.pm	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/lib/mtr_cases.pm	2013-02-13 06:17:00 +0000
@@ -295,6 +295,7 @@
 			      "storage/*/mtr",
 			      # Look in plugin specific suite dir
 			      "plugin/$suite/tests",
+			      "internal/plugin/$suite/tests",
 			     ],
 			     [$suite, "mtr"], ($suite =~ /^i_/));
       return unless $suitedir;
@@ -986,18 +987,11 @@
   if ( $tinfo->{'ndb_test'} )
   {
     # This is a NDB test
-    if ( $::opt_skip_ndbcluster == 2 )
-    {
-      # Ndb is not supported, skip it
-      $tinfo->{'skip'}= 1;
-      $tinfo->{'comment'}= "No ndbcluster support or ndb tests not enabled";
-      return $tinfo;
-    }
-    elsif ( $::opt_skip_ndbcluster )
-    {
-      # All ndb test's should be skipped
-      $tinfo->{'skip'}= 1;
-      $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
+    if ( $::ndbcluster_enabled == 0)
+    {
+      # ndbcluster is disabled
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "ndbcluster disabled";
       return $tinfo;
     }
   }
 
=== modified file 'Percona-Server/mysql-test/lib/mtr_report.pm'
--- Percona-Server/mysql-test/lib/mtr_report.pm	2012-08-22 04:47:43 +0000
+++ Percona-Server/mysql-test/lib/mtr_report.pm	2013-02-13 06:17:00 +0000
@@ -28,7 +28,7 @@
 		mtr_verbose_restart mtr_report_test_passed
 		mtr_report_test_skipped mtr_print
 		mtr_report_test_subunit
-		mtr_report_test);
+		mtr_report_test isotime);
 
 use mtr_match;
 use Subunit;
@@ -111,6 +111,8 @@
   $tinfo->{'result'}= 'MTR_RES_PASSED';
 
   mtr_report_test($tinfo);
+
+  resfile_global("endtime ", isotime (time));
 }
 
 
@@ -598,4 +600,12 @@
 }
 
 
+# Used by --result-file for for formatting times
+
+sub isotime($) {
+  my ($sec,$min,$hr,$day,$mon,$yr)= gmtime($_[0]);
+  return sprintf "%d-%02d-%02dT%02d:%02d:%02dZ",
+    $yr+1900, $mon+1, $day, $hr, $min, $sec;
+}
+
 1;
 
=== modified file 'Percona-Server/mysql-test/mysql-test-run.pl'
--- Percona-Server/mysql-test/mysql-test-run.pl	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/mysql-test-run.pl	2013-02-13 06:17:00 +0000
@@ -164,7 +164,7 @@
 
 # If you add a new suite, please check TEST_DIRS in Makefile.am.
 #
-my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,innodb_fts,perfschema,funcs_1,opt_trace";
+my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,innodb_fts,perfschema,funcs_1,opt_trace,parts";
 my $opt_suites;
 
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
@@ -315,8 +315,9 @@
 
 our $opt_warnings= 1;
 
-our $opt_include_ndbcluster= 0;
-our $opt_skip_ndbcluster= 1;
+our $ndbcluster_enabled= 0;
+my $opt_include_ndbcluster= 0;
+my $opt_skip_ndbcluster= 0;
 
 my $exe_ndbd;
 my $exe_ndbmtd;
@@ -339,14 +340,6 @@
 select(STDOUT);
 $| = 1; # Automatically flush STDOUT
 
-# Used by --result-file for for formatting times
-
-sub isotime($) {
-  my ($sec,$min,$hr,$day,$mon,$yr)= gmtime($_[0]);
-  return sprintf "%d-%02d-%02dT%02d:%02d:%02dZ",
-    $yr+1900, $mon+1, $day, $hr, $min, $sec;
-}
-
 main();
 
 
@@ -370,26 +363,6 @@
 
   if (!$opt_suites) {
     $opt_suites= $DEFAULT_SUITES;
-
-    # Check for any extra suites to enable based on the path name
-    my %extra_suites=
-      (
-       "mysql-5.1-new-ndb"              => "ndb_team",
-       "mysql-5.1-new-ndb-merge"        => "ndb_team",
-       "mysql-5.1-telco-6.2"            => "ndb_team",
-       "mysql-5.1-telco-6.2-merge"      => "ndb_team",
-       "mysql-5.1-telco-6.3"            => "ndb_team",
-       "mysql-6.0-ndb"                  => "ndb_team",
-      );
-
-    foreach my $dir ( reverse splitdir($basedir) ) {
-      my $extra_suite= $extra_suites{$dir};
-      if (defined $extra_suite) {
-	mtr_report("Found extra suite: $extra_suite");
-	$opt_suites= "$extra_suite,$opt_suites";
-	last;
-      }
-    }
   }
   mtr_report("Using suites: $opt_suites") unless @opt_cases;
 
@@ -463,6 +436,7 @@
 
   # Also read from any plugin local or suite specific plugin.defs
   for (glob "$basedir/plugin/*/tests/mtr/plugin.defs".
+            " $basedir/internal/plugin/*/tests/mtr/plugin.defs".
             " suite/*/plugin.defs") {
     read_plugin_defs($_);
   }
@@ -730,6 +704,10 @@
 	    else {
 	      mtr_report("\nRetrying test $tname, ".
 			 "attempt($retries/$opt_retry)...\n");
+              #saving the log file as filename.failed in case of retry
+              my $worker_logdir= $result->{savedir};
+              my $log_file_name=dirname($worker_logdir)."/".$result->{shortname}.".log";
+              rename $log_file_name,$log_file_name.".failed";
 	      delete($result->{result});
 	      $result->{retries}= $retries+1;
 	      $result->write_test($sock, 'TESTCASE');
@@ -1079,7 +1057,7 @@
              # Control what test suites or cases to run
              'force'                    => \$opt_force,
              'with-ndbcluster-only'     => \&collect_option,
-             'include-ndbcluster'       => \$opt_include_ndbcluster,
+             'ndb|include-ndbcluster'   => \$opt_include_ndbcluster,
              'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster,
              'suite|suites=s'           => \$opt_suites,
              'skip-rpl'                 => \&collect_option,
@@ -1535,7 +1513,6 @@
       }
       $ENV{'PATH'}= "$ENV{'PATH'}".$separator.$lib_mysqld;
     }
-    $opt_skip_ndbcluster= 1;       # Turn off use of NDB cluster
     $opt_skip_ssl= 1;              # Turn off use of SSL
 
     # Turn off use of bin log
@@ -2036,7 +2013,7 @@
                          "$bindir/libmysqld/examples/mysql_embedded",
                          "$bindir/bin/mysql_embedded");
 
-  if ( ! $opt_skip_ndbcluster )
+  if ( $ndbcluster_enabled )
   {
     # Look for single threaded NDB
     $exe_ndbd=
@@ -2312,7 +2289,7 @@
   # --------------------------------------------------------------------------
   # Add the path where libndbclient can be found
   # --------------------------------------------------------------------------
-  if ( !$opt_skip_ndbcluster )
+  if ( $ndbcluster_enabled )
   {
     push(@ld_library_paths,  
 	 "$basedir/storage/ndb/src/.libs",
@@ -2406,7 +2383,7 @@
   # ----------------------------------------------------
   # Setup env for NDB
   # ----------------------------------------------------
-  if ( ! $opt_skip_ndbcluster )
+  if ( $ndbcluster_enabled )
   {
     $ENV{'NDB_MGM'}=
       my_find_bin($bindir,
@@ -2838,37 +2815,87 @@
 sub check_ndbcluster_support ($) {
   my $mysqld_variables= shift;
 
+  my $ndbcluster_supported = 0;
+  if ($mysqld_variables{'ndb-connectstring'})
+  {
+    $ndbcluster_supported = 1;
+  }
+
+  if ($opt_skip_ndbcluster && $opt_include_ndbcluster)
+  {
+    # User is ambivalent. Theoretically the arg which was
+    # given last on command line should win, but that order is
+    # unknown at this time.
+    mtr_error("Ambigous command, both --include-ndbcluster " .
+	      " and --skip-ndbcluster was specified");
+  }
+
   # Check if this is MySQL Cluster, ie. mysql version string ends
   # with -ndb-Y.Y.Y[-status]
   if ( defined $mysql_version_extra &&
-       $mysql_version_extra =~ /^-ndb-/ )
-  {
-    mtr_report(" - MySQL Cluster");
-    # Enable ndb engine and add more test suites
-    $opt_include_ndbcluster = 1;
-    $DEFAULT_SUITES.=",ndb,ndb_binlog,rpl_ndb,ndb_rpl,ndb_memcache";
-  }
-
-  if ($opt_include_ndbcluster)
-  {
-    $opt_skip_ndbcluster= 0;
-  }
-
-  if ($opt_skip_ndbcluster)
-  {
-    mtr_report(" - skipping ndbcluster");
-    return;
-  }
-
-  if ( ! $mysqld_variables{'ndb-connectstring'} )
-  {
-    mtr_report(" - skipping ndbcluster, mysqld not compiled with ndbcluster");
-    $opt_skip_ndbcluster= 2;
-    return;
-  }
-
-  mtr_report(" - using ndbcluster when necessary, mysqld supports it");
-
+       $mysql_version_extra =~ /-ndb-([0-9]*)\.([0-9]*)\.([0-9]*)/ )
+  {
+    # MySQL Cluster tree
+    mtr_report(" - MySQL Cluster detected");
+
+    if ($opt_skip_ndbcluster)
+    {
+      mtr_report(" - skipping ndbcluster(--skip-ndbcluster)");
+      return;
+    }
+
+    if (!$ndbcluster_supported)
+    {
+      # MySQL Cluster tree, but mysqld was not compiled with
+      # ndbcluster -> fail unless --skip-ndbcluster was used
+      mtr_error("This is MySQL Cluster but mysqld does not " .
+		"support ndbcluster. Use --skip-ndbcluster to " .
+		"force mtr to run without it.");
+    }
+
+    # mysqld was compiled with ndbcluster -> auto enable
+  }
+  else
+  {
+    # Not a MySQL Cluster tree
+    if (!$ndbcluster_supported)
+    {
+      if ($opt_include_ndbcluster)
+      {
+	mtr_error("Could not detect ndbcluster support ".
+		  "requested with --include-ndbcluster");
+      }
+
+      # Silently skip, mysqld was compiled without ndbcluster
+      # which is the default case
+      return;
+    }
+
+    if ($opt_skip_ndbcluster)
+    {
+      # Compiled with ndbcluster but ndbcluster skipped
+      mtr_report(" - skipping ndbcluster(--skip-ndbcluster)");
+      return;
+    }
+
+
+    # Not a MySQL Cluster tree, enable ndbcluster
+    # if --include-ndbcluster was used
+    if ($opt_include_ndbcluster)
+    {
+      # enable ndbcluster
+    }
+    else
+    {
+      mtr_report(" - skipping ndbcluster(disabled by default)");
+      return;
+    }
+  }
+
+  mtr_report(" - enabling ndbcluster");
+  $ndbcluster_enabled= 1;
+  # Add MySQL Cluster test suites
+  $DEFAULT_SUITES.=",ndb,ndb_binlog,rpl_ndb,ndb_rpl,ndb_memcache";
   return;
 }
 
@@ -6257,6 +6284,7 @@
         $err_in_report= 1 if $line =~ /ERROR SUMMARY: [1-9]/;
         $err_in_report= 1 if $line =~ /definitely lost: [1-9]/;
         $err_in_report= 1 if $line =~ /possibly lost: [1-9]/;
+        $err_in_report= 1 if $line =~ /still reachable: [1-9]/;
       }
     }
 
@@ -6282,6 +6310,7 @@
 
   # Just ignore if not configured/built to run ctest
   if (! -f "CTestTestfile.cmake") {
+    mtr_report("No unit tests found.");
     chdir($olddir);
     return;
   }
@@ -6292,6 +6321,7 @@
   # Also silently ignore if we don't have ctest and didn't insist
   # Special override: also ignore in Pushbuild, some platforms may not have it
   # Now, run ctest and collect output
+  $ENV{CTEST_OUTPUT_ON_FAILURE} = 1;
   my $ctest_out= `ctest $ctest_vs 2>&1`;
   if ($? == $no_ctest && $opt_ctest == -1 && ! defined $ENV{PB2WORKDIR}) {
     chdir($olddir);
 
=== modified file 'Percona-Server/mysql-test/r/alter_table.result'
--- Percona-Server/mysql-test/r/alter_table.result	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/r/alter_table.result	2013-02-13 06:17:00 +0000
@@ -1581,9 +1581,9 @@
 ERROR HY000: Unknown LOCK type 'INVALID'
 ALTER TABLE m1 ENABLE KEYS, LOCK= DEFAULT;
 ALTER TABLE m1 ENABLE KEYS, LOCK= NONE;
-ERROR 42000: This version of MySQL doesn't yet support 'ALTER TABLE m1 ENABLE KEYS, LOCK= NONE'
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
 ALTER TABLE m1 ENABLE KEYS, LOCK= SHARED;
-ERROR 42000: This version of MySQL doesn't yet support 'ALTER TABLE m1 ENABLE KEYS, LOCK= SHARED'
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
 ALTER TABLE m1 ENABLE KEYS, LOCK= EXCLUSIVE;
 ALTER TABLE t1 DROP INDEX i1, DROP INDEX i2, DROP INDEX i3, DROP INDEX i4;
 #
@@ -1603,7 +1603,7 @@
 Warnings:
 Note	1831	Duplicate index 'i3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
 ALTER TABLE t1 ADD INDEX i4(b), ALGORITHM= COPY, LOCK= NONE;
-ERROR 42000: This version of MySQL doesn't yet support 'ALTER TABLE t1 ADD INDEX i4(b), ALGORITHM= COPY, LOCK= NONE'
+ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED.
 ALTER TABLE t1 ADD INDEX i5(b), ALGORITHM= COPY, LOCK= SHARED;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 1
@@ -1615,13 +1615,13 @@
 Warnings:
 Note	1831	Duplicate index 'i6' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= INPLACE, LOCK= NONE;
-ERROR 42000: This version of MySQL doesn't yet support 'ALTER TABLE m1 ENABLE KEYS, ALGORITHM= INPLACE, LOCK= NONE'
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= INPLACE, LOCK= SHARED;
-ERROR 42000: This version of MySQL doesn't yet support 'ALTER TABLE m1 ENABLE KEYS, ALGORITHM= INPLACE, LOCK= SHARED'
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= INPLACE, LOCK= EXCLUSIVE;
 affected rows: 0
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= COPY, LOCK= NONE;
-ERROR 42000: This version of MySQL doesn't yet support 'ALTER TABLE m1 ENABLE KEYS, ALGORITHM= COPY, LOCK= NONE'
+ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED.
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= COPY, LOCK= SHARED;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0
@@ -1721,7 +1721,7 @@
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0
 ALTER TABLE ti1 ADD PRIMARY KEY(a), ALGORITHM=INPLACE;
-ERROR 42000: This version of MySQL doesn't yet support 'ALTER TABLE ti1 ADD PRIMARY KEY(a), ALGORITHM=INPLACE'
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY.
 ALTER TABLE ti1 ADD PRIMARY KEY(a);
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0
@@ -1794,9 +1794,12 @@
 ALTER TABLE tm1 MODIFY COLUMN e INT FIRST;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0
+SET @orig_sql_mode = @@sql_mode;
+SET @@sql_mode = 'STRICT_TRANS_TABLES';
 ALTER TABLE ti1 MODIFY COLUMN c INT NOT NULL;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
+SET @@sql_mode = @orig_sql_mode;
 ALTER TABLE tm1 MODIFY COLUMN c INT NOT NULL;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0
 
=== modified file 'Percona-Server/mysql-test/r/connect.result'
--- Percona-Server/mysql-test/r/connect.result	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/r/connect.result	2013-02-13 06:17:00 +0000
@@ -340,15 +340,16 @@
 ERROR HY000: You must SET PASSWORD before executing this statement
 CALL test_t1(last_t1() + 1);
 ERROR HY000: You must SET PASSWORD before executing this statement
-# setting a password with a user name is no good
+# setting a password with a user name is ok if it exactly matches the
+# authenticated user.
 SET PASSWORD FOR must_change@localhost = PASSWORD('aha3');
-ERROR HY000: You must SET PASSWORD before executing this statement
 SELECT USER();
-ERROR HY000: You must SET PASSWORD before executing this statement
+USER()
+must_change@localhost
 SELECT last_t1();
-ERROR HY000: You must SET PASSWORD before executing this statement
+last_t1()
+4
 CALL test_t1(last_t1() + 1);
-ERROR HY000: You must SET PASSWORD before executing this statement
 # setting a password for the current user works
 SET PASSWORD FOR CURRENT_USER() = PASSWORD('aha3');
 SELECT USER();
@@ -356,7 +357,7 @@
 must_change@localhost
 SELECT last_t1();
 last_t1()
-4
+5
 CALL test_t1(last_t1() + 1);
 # testing the ALTER USER command
 # try a single user
@@ -392,6 +393,21 @@
 DROP FUNCTION last_t1;
 DROP TABLE t1;
 DROP USER must_change@localhost;
+#
+# WL#6587:  Protocol support for password expiration
+#
+CREATE USER wl6587@localhost IDENTIFIED BY 'wl6587';
+ALTER USER wl6587@localhost PASSWORD EXPIRE;
+# non-interactive mysql should fail
+Warning: Using a password on the command line interface can be insecure.
+ERROR 1820 (HY000): You must SET PASSWORD before executing this statement
+# mysqladmin non-password should fail
+Warning: Using a password on the command line interface can be insecure.
+mysqladmin: connect to server at 'localhost' failed
+error: 'You must SET PASSWORD before executing this statement'
+# mysqladmin password should work
+Warning: Using a password on the command line interface can be insecure.
+DROP USER wl6587@localhost;
 # ------------------------------------------------------------------
 # -- End of 5.6 tests
 # ------------------------------------------------------------------
 
=== modified file 'Percona-Server/mysql-test/r/create.result'
--- Percona-Server/mysql-test/r/create.result	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/r/create.result	2013-02-13 06:17:00 +0000
@@ -1889,7 +1889,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `ID` bigint(4) NOT NULL DEFAULT '0',
+  `ID` bigint(21) unsigned NOT NULL DEFAULT '0',
   `USER` varchar(16) NOT NULL DEFAULT '',
   `HOST` varchar(64) NOT NULL DEFAULT '',
   `DB` varchar(64) DEFAULT NULL,
@@ -1904,7 +1904,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `ID` bigint(4) NOT NULL DEFAULT '0',
+  `ID` bigint(21) unsigned NOT NULL DEFAULT '0',
   `USER` varchar(16) NOT NULL DEFAULT '',
   `HOST` varchar(64) NOT NULL DEFAULT '',
   `DB` varchar(64) DEFAULT NULL,
 
=== modified file 'Percona-Server/mysql-test/r/ctype_binary.result'
--- Percona-Server/mysql-test/r/ctype_binary.result	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/r/ctype_binary.result	2013-02-13 06:17:00 +0000
@@ -746,7 +746,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(10) NOT NULL DEFAULT ''
+  `c1` varbinary(21) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(inet_aton('127.1.1.1')));
 
=== modified file 'Percona-Server/mysql-test/r/ctype_cp1251.result'
--- Percona-Server/mysql-test/r/ctype_cp1251.result	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/r/ctype_cp1251.result	2013-02-13 06:17:00 +0000
@@ -1138,7 +1138,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET cp1251 NOT NULL DEFAULT ''
+  `c1` varchar(21) CHARACTER SET cp1251 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(inet_aton('127.1.1.1')));
 
=== modified file 'Percona-Server/mysql-test/r/ctype_latin1.result'
--- Percona-Server/mysql-test/r/ctype_latin1.result	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/r/ctype_latin1.result	2013-02-13 06:17:00 +0000
@@ -1165,7 +1165,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) NOT NULL DEFAULT ''
+  `c1` varchar(21) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(inet_aton('127.1.1.1')));
 
=== modified file 'Percona-Server/mysql-test/r/ctype_ucs.result'
--- Percona-Server/mysql-test/r/ctype_ucs.result	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/r/ctype_ucs.result	2013-02-13 06:17:00 +0000
@@ -2083,7 +2083,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET ucs2 NOT NULL DEFAULT ''
+  `c1` varchar(21) CHARACTER SET ucs2 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(inet_aton('127.1.1.1')));
 
=== modified file 'Percona-Server/mysql-test/r/ctype_utf8.result'
--- Percona-Server/mysql-test/r/ctype_utf8.result	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/r/ctype_utf8.result	2013-02-13 06:17:00 +0000
@@ -2992,7 +2992,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 NOT NULL DEFAULT ''
+  `c1` varchar(21) CHARACTER SET utf8 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(inet_aton('127.1.1.1')));
 
=== modified file 'Percona-Server/mysql-test/r/ddl_i18n_koi8r.result'
--- Percona-Server/mysql-test/r/ddl_i18n_koi8r.result	2011-10-25 10:23:23 +0000
+++ Percona-Server/mysql-test/r/ddl_i18n_koi8r.result	2013-02-13 06:17:00 +0000
@@ -734,7 +734,7 @@
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p1`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
 OUT ÐÁÒÁÍ2 CHAR(10))
 BEGIN
@@ -751,7 +751,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END */;;
+END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@@ -768,7 +768,7 @@
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p2`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -785,7 +785,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END */;;
+END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@@ -810,7 +810,7 @@
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p3`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
 OUT ÐÁÒÁÍ2 CHAR(10))
 BEGIN
@@ -827,7 +827,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END */;;
+END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@@ -844,7 +844,7 @@
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p4`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -861,7 +861,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END */;;
+END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 
=== modified file 'Percona-Server/mysql-test/r/ddl_i18n_utf8.result'
--- Percona-Server/mysql-test/r/ddl_i18n_utf8.result	2011-10-25 10:23:23 +0000
+++ Percona-Server/mysql-test/r/ddl_i18n_utf8.result	2013-02-13 06:17:00 +0000
@@ -734,7 +734,7 @@
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p1`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -751,7 +751,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END */;;
+END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@@ -768,7 +768,7 @@
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p2`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -785,7 +785,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END */;;
+END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@@ -810,7 +810,7 @@
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p3`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -827,7 +827,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END */;;
+END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@@ -844,7 +844,7 @@
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p4`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -861,7 +861,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END */;;
+END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 
=== modified file 'Percona-Server/mysql-test/r/derived.result'
--- Percona-Server/mysql-test/r/derived.result	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/r/derived.result	2013-02-13 06:17:00 +0000
@@ -171,6 +171,10 @@
 create table t2 (mat_id MEDIUMINT UNSIGNED NOT NULL, pla_id MEDIUMINT UNSIGNED NOT NULL);
 insert into t1 values (NULL, 'a', 1), (NULL, 'b', 2), (NULL, 'c', 3), (NULL, 'd', 4), (NULL, 'e', 5), (NULL, 'f', 6), (NULL, 'g', 7), (NULL, 'h', 8), (NULL, 'i', 9);
 insert into t2 values (1, 100), (1, 101), (1, 102), (2, 100), (2, 103), (2, 104), (3, 101), (3, 102), (3, 105);
+analyze table t1, t2;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
 SELECT STRAIGHT_JOIN d.pla_id, m2.mat_id FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum;
 pla_id	mat_id
 100	1
@@ -190,13 +194,13 @@
 explain SELECT STRAIGHT_JOIN d.pla_id, m2.mat_id FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	m2	ALL	NULL	NULL	NULL	NULL	9	NULL
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	9	Using where; Using join buffer (Block Nested Loop)
+1	PRIMARY	<derived2>	ref	<auto_key0>	<auto_key0>	7	test.m2.matintnum	2	NULL
 2	DERIVED	mp	ALL	NULL	NULL	NULL	NULL	9	Using temporary; Using filesort
 2	DERIVED	m1	eq_ref	PRIMARY	PRIMARY	3	test.mp.mat_id	1	NULL
 explain SELECT STRAIGHT_JOIN d.pla_id, m2.test FROM t1 m2  INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	m2	ALL	NULL	NULL	NULL	NULL	9	NULL
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	9	Using where; Using join buffer (Block Nested Loop)
+1	PRIMARY	<derived2>	ref	<auto_key0>	<auto_key0>	7	test.m2.matintnum	2	NULL
 2	DERIVED	mp	ALL	NULL	NULL	NULL	NULL	9	Using temporary; Using filesort
 2	DERIVED	m1	eq_ref	PRIMARY	PRIMARY	3	test.mp.mat_id	1	NULL
 drop table t1,t2;
 
=== modified file 'Percona-Server/mysql-test/r/disabled_replication.result'
--- Percona-Server/mysql-test/r/disabled_replication.result	2012-03-14 12:38:08 +0000
+++ Percona-Server/mysql-test/r/disabled_replication.result	2013-02-13 06:17:00 +0000
@@ -1,5 +1,5 @@
 SHOW SLAVE STATUS;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_UUID	Master_Info_File	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Master_Retry_Count	Master_Bind	Last_IO_Error_Timestamp	Last_SQL_Error_Timestamp	Master_SSL_Crl	Master_SSL_Crlpath	Retrieved_Gtid_Set	Executed_Gtid_Set
+Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_UUID	Master_Info_File	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Master_Retry_Count	Master_Bind	Last_IO_Error_Timestamp	Last_SQL_Error_Timestamp	Master_SSL_Crl	Master_SSL_Crlpath	Retrieved_Gtid_Set	Executed_Gtid_Set	Auto_Position
 RESET SLAVE;
 ERROR HY000: Slave is not configured or failed to initialize properly. You must at least set --server-id to enable either a master or a slave. Additional error messages can be found in the MySQL error log.
 SHOW RELAYLOG EVENTS;
 
=== added file 'Percona-Server/mysql-test/r/disconnect_on_expired_password_default.result'
--- Percona-Server/mysql-test/r/disconnect_on_expired_password_default.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/disconnect_on_expired_password_default.result	2013-02-13 06:17:00 +0000
@@ -0,0 +1,34 @@
+SHOW VARIABLES LIKE 'disconnect_on_expired_password';
+Variable_name	Value
+disconnect_on_expired_password	ON
+## Test mysql client in non-interactrive mode
+CREATE USER 'bernt';
+SET PASSWORD FOR 'bernt' = PASSWORD('secret');
+ALTER USER 'bernt' PASSWORD EXPIRE;
+# Attempt to login should fail
+Warning: Using a password on the command line interface can be insecure.
+ERROR 1820 (HY000): You must SET PASSWORD before executing this statement
+DROP USER 'bernt';
+## Test mysqltest
+CREATE USER 'bernt';
+SET PASSWORD FOR 'bernt' = PASSWORD('secret');
+ALTER USER 'bernt' PASSWORD EXPIRE;
+# Login with mysqltest should work
+# But doing something should fail
+SELECT 1;
+ERROR HY000: You must SET PASSWORD before executing this statement
+# Setting password should work
+SET PASSWORD = PASSWORD('newsecret');
+DROP USER 'bernt';
+## Test mysqladmin
+CREATE USER 'bernt';
+SET PASSWORD FOR 'bernt' = PASSWORD('secret');
+GRANT ALL ON *.* TO 'bernt' WITH GRANT OPTION;
+ALTER USER 'bernt' PASSWORD EXPIRE;
+# Doing something should not connect
+Warning: Using a password on the command line interface can be insecure.
+MYSQLADMIN: connect to server at 'localhost' failed
+error: 'You must SET PASSWORD before executing this statement'
+# Setting password should succeed
+Warning: Using a password on the command line interface can be insecure.
+DROP USER 'bernt';
 
=== added file 'Percona-Server/mysql-test/r/disconnect_on_expired_password_off.result'
--- Percona-Server/mysql-test/r/disconnect_on_expired_password_off.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/disconnect_on_expired_password_off.result	2013-02-13 06:17:00 +0000
@@ -0,0 +1,33 @@
+SHOW VARIABLES LIKE 'disconnect_on_expired_password';
+Variable_name	Value
+disconnect_on_expired_password	OFF
+## Test mysql client in non-interactive mode
+CREATE USER 'bernt';
+SET PASSWORD FOR 'bernt' = PASSWORD('secret');
+ALTER USER 'bernt' PASSWORD EXPIRE;
+# Should connect, but doing something should fail
+Warning: Using a password on the command line interface can be insecure.
+ERROR 1820 (HY000) at line 1: You must SET PASSWORD before executing this statement
+# Login and set password should succeed
+Warning: Using a password on the command line interface can be insecure.
+DROP USER 'bernt';
+## Test mysqltest login
+CREATE USER 'bernt';
+SET PASSWORD FOR 'bernt' = PASSWORD('secret');
+ALTER USER 'bernt' PASSWORD EXPIRE;
+# Login with mysqltest should work
+# But doing something should fail
+SELECT 1;
+ERROR HY000: You must SET PASSWORD before executing this statement
+DROP USER 'bernt';
+## Test mysqladmin
+CREATE USER 'bernt';
+SET PASSWORD FOR 'bernt' = PASSWORD('secret');
+GRANT ALL ON *.* TO 'bernt' WITH GRANT OPTION;
+ALTER USER 'bernt' PASSWORD EXPIRE;
+# Doing something should connect but fail
+Warning: Using a password on the command line interface can be insecure.
+MYSQLADMIN: reload failed; error: 'You must SET PASSWORD before executing this statement'
+# Setting password should succeed
+Warning: Using a password on the command line interface can be insecure.
+DROP USER 'bernt';
 
=== modified file 'Percona-Server/mysql-test/r/distinct.result'
--- Percona-Server/mysql-test/r/distinct.result	2012-10-16 06:21:51 +0000
+++ Percona-Server/mysql-test/r/distinct.result	2013-02-13 06:17:00 +0000
@@ -232,7 +232,7 @@
 1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	1	Using index
 explain SELECT distinct a from t3 order by a desc limit 2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t3	index	NULL	a	5	NULL	40	Using index
+1	SIMPLE	t3	range	NULL	a	5	NULL	10	Using index for group-by; Using temporary; Using filesort
 explain SELECT distinct a,b from t3 order by a+1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	204	Using temporary; Using filesort
@@ -242,6 +242,43 @@
 explain SELECT a,b from t3 group by a,b order by a+1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	204	Using temporary; Using filesort
+ SELECT distinct t1.a from t1;
+a
+1
+2