diff -Nru percona-xtrabackup-2.2.3/client/client_priv.h percona-xtrabackup-2.3.7/client/client_priv.h
--- percona-xtrabackup-2.2.3/client/client_priv.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/client/client_priv.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2014, 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
@@ -99,6 +99,7 @@
   OPT_CONFIG_ALL,
   OPT_SERVER_PUBLIC_KEY,
   OPT_ENABLE_CLEARTEXT_PLUGIN,
+  OPT_CONNECTION_SERVER_ID,
   OPT_MAX_CLIENT_OPTION
 };
 
diff -Nru percona-xtrabackup-2.2.3/client/mysqladmin.cc percona-xtrabackup-2.3.7/client/mysqladmin.cc
--- percona-xtrabackup-2.2.3/client/mysqladmin.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/client/mysqladmin.cc	2017-02-27 07:47:02.000000000 +0000
@@ -75,6 +75,7 @@
                                   char *argument);
 static my_bool sql_connect(MYSQL *mysql, uint wait);
 static int execute_commands(MYSQL *mysql,int argc, char **argv);
+static char **mask_password(int argc, char ***argv);
 static int drop_db(MYSQL *mysql,const char *db);
 extern "C" sig_handler endprog(int signal_number);
 static void nice_time(ulong sec,char *buff);
@@ -314,11 +315,11 @@
 
 int main(int argc,char *argv[])
 {
-  int error= 0, ho_error;
+  int error= 0, ho_error, temp_argc;
   int first_command;
   my_bool can_handle_passwords;
   MYSQL mysql;
-  char **commands, **save_argv;
+  char **commands, **save_argv, **temp_argv;
 
   MY_INIT(argv[0]);
   mysql_init(&mysql);
@@ -333,6 +334,9 @@
     free_defaults(save_argv);
     exit(ho_error);
   }
+  temp_argv= mask_password(argc, &argv);
+  temp_argc= argc;
+
   if (debug_info_flag)
     my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO;
   if (debug_check_flag)
@@ -343,7 +347,7 @@
     usage();
     exit(1);
   }
-  commands = argv;
+  commands = temp_argv;
   if (tty_password)
     opt_password = get_tty_password(NullS);
 
@@ -509,6 +513,13 @@
   my_free(shared_memory_base_name);
 #endif
   free_defaults(save_argv);
+  temp_argc--;
+  while(temp_argc >= 0)
+  {
+    my_free(temp_argv[temp_argc]);
+    temp_argc--;
+  }
+  my_free(temp_argv);
   my_end(my_end_arg);
   exit(error ? 1 : 0);
   return 0;
@@ -982,7 +993,10 @@
         }
       }
       else
+      {
+        print_cmdline_password_warning();
         typed_password= argv[1];
+      }
 
       if (typed_password[0])
       {
@@ -1166,6 +1180,47 @@
   return 0;
 }
 
+/**
+   @brief Masking the password if it is passed as command line argument.
+
+   @details It works in Linux and changes cmdline in ps and /proc/pid/cmdline,
+            but it won't work for history file of shell.
+            The command line arguments are copied to another array and the
+            password in the argv is masked. This function is called just after
+            "handle_options" because in "handle_options", the agrv pointers
+            are altered which makes freeing of dynamically allocated memory
+            difficult. The password masking is done before all other operations
+            in order to minimise the time frame of password visibility via cmdline.
+
+   @param argc            command line options (count)
+   @param argv            command line options (values)
+
+   @return temp_argv      copy of argv
+*/
+
+static char **mask_password(int argc, char ***argv)
+{
+  char **temp_argv;
+  temp_argv= (char **)(my_malloc(sizeof(char *) * argc, MYF(MY_WME)));
+  argc--;
+  while (argc > 0)
+  {
+    temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
+    if (find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_PASSWORD ||
+        find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_OLD_PASSWORD)
+    {
+      char *start= (*argv)[argc];
+      while (*start)
+        *start++= 'x';
+      start= (*argv)[argc];
+      if (*start)
+        start[1]= 0;                         /* Cut length of argument */
+     }
+    argc--;
+  }
+  temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
+  return(temp_argv);
+}
 
 static void print_version(void)
 {
diff -Nru percona-xtrabackup-2.2.3/client/mysqlbinlog.cc percona-xtrabackup-2.3.7/client/mysqlbinlog.cc
--- percona-xtrabackup-2.2.3/client/mysqlbinlog.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/client/mysqlbinlog.cc	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,7 @@
 #define CLIENT_CAPABILITIES	(CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES)
 
 char server_version[SERVER_VERSION_LENGTH];
-ulong server_id = 0;
+ulong filter_server_id = 0;
 /* 
   One statement can result in a sequence of several events: Intvar_log_events,
   User_var_log_events, and Rand_log_events, followed by one
@@ -125,7 +125,10 @@
 static my_bool to_last_remote_log= 0, stop_never= 0;
 static my_bool opt_verify_binlog_checksum= 1;
 static ulonglong offset = 0;
-static uint stop_never_server_id= 1;
+static int64 stop_never_slave_server_id= -1;
+#ifndef DBUG_OFF
+static int64 connection_server_id= -1;
+#endif //DBUG_OFF
 static char* host = 0;
 static int port= 0;
 static uint my_end_arg;
@@ -150,7 +153,6 @@
 static char *start_datetime_str, *stop_datetime_str;
 static my_time_t start_datetime= 0, stop_datetime= MY_TIME_T_MAX;
 static ulonglong rec_count= 0;
-static ushort binlog_flags = 0; 
 static MYSQL* mysql = NULL;
 static char* dirname_for_local_load= 0;
 static uint opt_server_id_bits = 0;
@@ -196,7 +198,9 @@
                                           const char* logname);
 static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
                                            const char* logname);
-static Exit_status dump_log_entries(const char* logname);
+static Exit_status dump_single_log(PRINT_EVENT_INFO *print_event_info,
+                                   const char* logname);
+static Exit_status dump_multiple_logs(int argc, char **argv);
 static Exit_status safe_connect();
 
 /*
@@ -869,7 +873,7 @@
         events.
       */
       if (ev_type != ROTATE_EVENT &&
-          server_id && (server_id != ev->server_id))
+          filter_server_id && (filter_server_id != ev->server_id))
         goto end;
     }
     if (((my_time_t) (ev->when.tv_sec) >= stop_datetime)
@@ -945,9 +949,20 @@
       {
         in_transaction= false;
         print_event_info->skipped_event_in_transaction= false;
+        if (print_event_info->is_gtid_next_set)
+          print_event_info->is_gtid_next_valid= false;
       }
       else if (starts_group)
         in_transaction= true;
+      else
+      {
+        /*
+          We are not in a transaction and are not seeing a BEGIN or
+          COMMIT. So this is an implicitly committing DDL.
+         */
+        if (print_event_info->is_gtid_next_set && !in_transaction)
+          print_event_info->is_gtid_next_valid= false;
+      }
 
       ev->print(result_file, print_event_info);
       if (head->error == -1)
@@ -1284,6 +1299,8 @@
     case GTID_LOG_EVENT:
     {
       seen_gtids= true;
+      print_event_info->is_gtid_next_set= true;
+      print_event_info->is_gtid_next_valid= true;
       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;
@@ -1297,6 +1314,8 @@
     {
       in_transaction= false;
       print_event_info->skipped_event_in_transaction= false;
+      if (print_event_info->is_gtid_next_set)
+        print_event_info->is_gtid_next_valid= false;
       ev->print(result_file, print_event_info);
       if (head->error == -1)
         goto err;
@@ -1319,9 +1338,11 @@
             since there may be no gtids on the next one.
           */
           seen_gtids= false;
-          fprintf(result_file, "SET @@SESSION.GTID_NEXT= 'AUTOMATIC' "
-                               "/* added by mysqlbinlog */ %s\n", 
-                               print_event_info->delimiter);
+          fprintf(result_file, "%sAUTOMATIC' /* added by mysqlbinlog */ %s\n",
+                  Gtid_log_event::SET_STRING_PREFIX,
+                  print_event_info->delimiter);
+          print_event_info->is_gtid_next_set= false;
+          print_event_info->is_gtid_next_valid= true;
         }
       }
       ev->print(result_file, print_event_info);
@@ -1478,7 +1499,7 @@
     &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"server-id", OPT_SERVER_ID,
    "Extract only binlog entries created by the server having the given id.",
-   &server_id, &server_id, 0, GET_ULONG,
+   &filter_server_id, &filter_server_id, 0, GET_ULONG,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"server-id-bits", 0,
    "Set number of significant bits in server-id",
@@ -1533,9 +1554,15 @@
    &stop_never, &stop_never, 0,
    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"stop-never-slave-server-id", OPT_WAIT_SERVER_ID,
-   "The slave server ID used for stop-never",
-   &stop_never_server_id, &stop_never_server_id, 0,
-   GET_UINT, REQUIRED_ARG, 65535, 1, 65535, 0, 0, 0},
+   "The slave server_id used for --read-from-remote-server --stop-never.",
+   &stop_never_slave_server_id, &stop_never_slave_server_id, 0,
+   GET_LL, REQUIRED_ARG, -1, -1, 0xFFFFFFFFLL, 0, 0, 0},
+#ifndef DBUG_OFF
+  {"connection-server-id", OPT_CONNECTION_SERVER_ID,
+   "The slave server_id used for --read-from-remote-server.",
+   &connection_server_id, &connection_server_id, 0,
+   GET_LL, REQUIRED_ARG, -1, -1, 0xFFFFFFFFLL, 0, 0, 0},
+#endif
   {"stop-position", OPT_STOP_POSITION,
    "Stop reading the binlog at position N. Applies to the last binlog "
    "passed on the command line.",
@@ -1870,11 +1897,35 @@
   @retval OK_STOP No error, but the end of the specified range of
   events to process has been reached and the program should terminate.
 */
-static Exit_status dump_log_entries(const char* logname)
+static Exit_status dump_single_log(PRINT_EVENT_INFO *print_event_info,
+                                   const char* logname)
 {
-  DBUG_ENTER("dump_log_entries");
+  DBUG_ENTER("dump_single_log");
+
+  Exit_status rc= OK_CONTINUE;
+
+  switch (opt_remote_proto)
+  {
+    case BINLOG_LOCAL:
+      rc= dump_local_log_entries(print_event_info, logname);
+    break;
+    case BINLOG_DUMP_NON_GTID:
+    case BINLOG_DUMP_GTID:
+      rc= dump_remote_log_entries(print_event_info, logname);
+    break;
+    default:
+      DBUG_ASSERT(0);
+    break;
+  }
+  DBUG_RETURN(rc);
+}
+
 
+static Exit_status dump_multiple_logs(int argc, char **argv)
+{
+  DBUG_ENTER("dump_multiple_logs");
   Exit_status rc= OK_CONTINUE;
+
   PRINT_EVENT_INFO print_event_info;
   if (!print_event_info.init_ok())
     DBUG_RETURN(ERROR_STOP);
@@ -1890,18 +1941,18 @@
   
   print_event_info.verbose= short_form ? 0 : verbose;
 
-  switch (opt_remote_proto)
+  // Dump all logs.
+  my_off_t save_stop_position= stop_position;
+  stop_position= ~(my_off_t)0;
+  for (int i= 0; i < argc; i++)
   {
-    case BINLOG_LOCAL:
-      rc= dump_local_log_entries(&print_event_info, logname);
-    break;
-    case BINLOG_DUMP_NON_GTID:
-    case BINLOG_DUMP_GTID:
-      rc= dump_remote_log_entries(&print_event_info, logname);
-    break;
-    default:
-      DBUG_ASSERT(0);
-    break;
+    if (i == argc - 1) // last log, --stop-position applies
+      stop_position= save_stop_position;
+    if ((rc= dump_single_log(&print_event_info, argv[i])) != OK_CONTINUE)
+      break;
+
+    // For next log, --start-position does not apply
+    start_position= BIN_LOG_HEADER_SIZE;
   }
 
   if (buff_ev.elements > 0)
@@ -1928,6 +1979,14 @@
     if (print_event_info.skipped_event_in_transaction)
       fprintf(result_file, "COMMIT /* added by mysqlbinlog */%s\n", print_event_info.delimiter);
 
+    if (!print_event_info.is_gtid_next_valid)
+    {
+      fprintf(result_file, "%sAUTOMATIC' /* added by mysqlbinlog */%s\n",
+              Gtid_log_event::SET_STRING_PREFIX,
+              print_event_info.delimiter);
+      print_event_info.is_gtid_next_set= false;
+      print_event_info.is_gtid_next_valid= true;
+    }
     fprintf(result_file, "DELIMITER ;\n");
     strmov(print_event_info.delimiter, ";");
   }
@@ -2022,6 +2081,12 @@
 }
 
 
+static int get_dump_flags()
+{
+  return stop_never ? 0 : BINLOG_DUMP_NON_BLOCK;
+}
+
+
 /**
   Requests binlog dump from a remote server and prints the events it
   receives.
@@ -2070,7 +2135,21 @@
     Fake a server ID to log continously. This will show as a
     slave on the mysql server.
   */
-  server_id= ((to_last_remote_log && stop_never) ? stop_never_server_id : 0);
+  if (to_last_remote_log && stop_never)
+  {
+    if (stop_never_slave_server_id == -1)
+      server_id= 1;
+    else
+      server_id= stop_never_slave_server_id;
+  }
+  else
+    server_id= 0;
+#ifndef DBUG_OFF
+  if (connection_server_id != -1)
+    server_id= connection_server_id;
+
+#endif
+
   size_t tlen = strlen(logname);
   if (tlen > UINT_MAX) 
   {
@@ -2098,7 +2177,7 @@
     */
     int4store(ptr_buffer, (uint32) start_position);
     ptr_buffer+= ::BINLOG_POS_OLD_INFO_SIZE;
-    int2store(ptr_buffer, binlog_flags);
+    int2store(ptr_buffer, get_dump_flags());
     ptr_buffer+= ::BINLOG_FLAGS_INFO_SIZE;
     int4store(ptr_buffer, server_id);
     ptr_buffer+= ::BINLOG_SERVER_ID_INFO_SIZE;
@@ -2129,7 +2208,7 @@
     }
     uchar* ptr_buffer= command_buffer;
 
-    int2store(ptr_buffer, binlog_flags);
+    int2store(ptr_buffer, get_dump_flags());
     ptr_buffer+= ::BINLOG_FLAGS_INFO_SIZE;
     int4store(ptr_buffer, server_id);
     ptr_buffer+= ::BINLOG_SERVER_ID_INFO_SIZE;
@@ -2292,8 +2371,14 @@
             error("Could not create log file '%s'", log_file_name);
             DBUG_RETURN(ERROR_STOP);
           }
-          my_fwrite(result_file, (const uchar*) BINLOG_MAGIC,
-                    BIN_LOG_HEADER_SIZE, MYF(0));
+          DBUG_EXECUTE_IF("simulate_result_file_write_error_for_FD_event",
+                          DBUG_SET("+d,simulate_fwrite_error"););
+          if (my_fwrite(result_file, (const uchar*) BINLOG_MAGIC,
+                        BIN_LOG_HEADER_SIZE, MYF(MY_NABP)))
+          {
+            error("Could not write into log file '%s'", log_file_name);
+            DBUG_RETURN(ERROR_STOP);
+          }
           /*
             Need to handle these events correctly in raw mode too 
             or this could get messy
@@ -2316,7 +2401,13 @@
 
       if (raw_mode)
       {
-        my_fwrite(result_file, net->read_pos + 1 , len - 1, MYF(0));
+        DBUG_EXECUTE_IF("simulate_result_file_write_error",
+                        DBUG_SET("+d,simulate_fwrite_error"););
+        if (my_fwrite(result_file, net->read_pos + 1 , len - 1, MYF(MY_NABP)))
+        {
+          error("Could not write into log file '%s'", log_file_name);
+          retval= ERROR_STOP;
+        }
         if (ev)
         {
           ev->temp_buf=0;
@@ -2769,6 +2860,15 @@
 
   global_sid_lock->unlock();
 
+#ifndef DBUG_OFF
+  if (connection_server_id == 0 && stop_never)
+    error("Cannot set --server-id=0 when --stop-never is specified.");
+  if (connection_server_id != -1 && stop_never_slave_server_id != -1)
+    error("Cannot set --connection-server-id= %lld and "
+          "--stop-never-slave-server-id= %lld. ", connection_server_id,
+          stop_never_slave_server_id);
+#endif
+
   DBUG_RETURN(OK_CONTINUE);
 }
 
@@ -2812,22 +2912,22 @@
 {
   char **defaults_argv;
   Exit_status retval= OK_CONTINUE;
-  ulonglong save_stop_position;
   MY_INIT(argv[0]);
   DBUG_ENTER("main");
   DBUG_PROCESS(argv[0]);
 
   my_init_time(); // for time functions
-   /*
+  tzset(); // set tzname
+  /*
     A pointer of type Log_event can point to
      INTVAR
      USER_VAR
      RANDOM
-    events,  when we allocate a element of sizeof(Log_event*) 
+    events,  when we allocate a element of sizeof(Log_event*)
     for the DYNAMIC_ARRAY.
   */
 
-  if((my_init_dynamic_array(&buff_ev, sizeof(buff_event_info), 
+  if((my_init_dynamic_array(&buff_ev, sizeof(buff_event_info),
                             INTVAR_DYNAMIC_INIT, INTVAR_DYNAMIC_INCR)))
     exit(1);
 
@@ -2853,6 +2953,7 @@
     exit(1);
   }
 
+  umask(((~my_umask) & 0666));
   /* Check for argument conflicts and do any post-processing */
   if (args_post_process() == ERROR_STOP)
     exit(1);
@@ -2908,17 +3009,7 @@
               "\n/*!40101 SET NAMES %s */;\n", charset);
   }
 
-  for (save_stop_position= stop_position, stop_position= ~(my_off_t)0 ;
-       (--argc >= 0) ; )
-  {
-    if (argc == 0) // last log, --stop-position applies
-      stop_position= save_stop_position;
-    if ((retval= dump_log_entries(*argv++)) != OK_CONTINUE)
-      break;
-
-    // For next log, --start-position does not apply
-    start_position= BIN_LOG_HEADER_SIZE;
-  }
+  retval= dump_multiple_logs(argc, argv);
 
   if (!raw_mode)
   {
diff -Nru percona-xtrabackup-2.2.3/client/mysql.cc percona-xtrabackup-2.3.7/client/mysql.cc
--- percona-xtrabackup-2.2.3/client/mysql.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/client/mysql.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1404,6 +1404,17 @@
 
 sig_handler mysql_end(int sig)
 {
+#ifndef _WIN32
+  /*
+    Ingnoring SIGQUIT, SIGINT and SIGHUP signals when cleanup process starts.
+    This will help in resolving the double free issues, which occures in case
+    the signal handler function is started in between the clean up function.
+  */
+  signal(SIGQUIT, SIG_IGN);
+  signal(SIGINT, SIG_IGN);
+  signal(SIGHUP, SIG_IGN);
+#endif
+
   mysql_close(&mysql);
 #ifdef HAVE_READLINE
   if (!status.batch && !quick && !opt_html && !opt_xml &&
diff -Nru percona-xtrabackup-2.2.3/client/mysql_config_editor.cc percona-xtrabackup-2.3.7/client/mysql_config_editor.cc
--- percona-xtrabackup-2.2.3/client/mysql_config_editor.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/client/mysql_config_editor.cc	2017-02-27 07:47:02.000000000 +0000
@@ -49,8 +49,8 @@
   excluding the header part.
 */
 static size_t file_size;
-static char *opt_user= NULL, *opt_password= NULL, *opt_host=NULL,
-            *opt_login_path= NULL, *opt_socket= NULL, *opt_port= NULL;
+static const char *opt_user= NULL, *opt_password= NULL, *opt_host=NULL,
+            *opt_login_path= "client", *opt_socket= NULL, *opt_port= NULL;
 
 static char my_login_file[FN_REFLEN];
 static char my_key[LOGIN_KEY_LEN];
@@ -140,11 +140,11 @@
   {"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},
+   &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"socket", 'S', "Socket path to be entered into login file.", &opt_socket,
-   &opt_socket, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   &opt_socket, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"port", 'P', "Port number to be entered into login file.", &opt_port,
-   &opt_port, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   &opt_port, 0, GET_STR, 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},
@@ -454,10 +454,6 @@
   if ( argc_cmd > 1)
     goto error;
 
-  /* If NULL, set it to 'client' (default) */
-  if (!opt_login_path)
-    opt_login_path= my_strdup("client", MYF(MY_WME));
-
 done:
   my_free(ptr);
   DBUG_RETURN(command);
@@ -1046,7 +1042,7 @@
   DBUG_ENTER("remove_login_path");
 
   char *start=NULL, *end= NULL;
-  int tot_len, len, diff;
+  int to_move, len, diff;
 
   if((start= locate_login_path(file_buf, path_name)) == NULL)
     /* login path was not found, skip.. */
@@ -1058,7 +1054,7 @@
   {
     end ++;                                     /* Move past '\n' */
     len= ((diff= (start - end)) > 0) ? diff : - diff;
-    tot_len= file_buf->length - len ;
+    to_move= file_buf->length - (end - file_buf->str);
   }
   else
   {
@@ -1067,7 +1063,7 @@
     goto done;
   }
 
-  while(tot_len --)
+  while(to_move --)
     *(start ++)= *(end ++);
 
   *start= '\0';
diff -Nru percona-xtrabackup-2.2.3/client/mysqldump.c percona-xtrabackup-2.3.7/client/mysqldump.c
--- percona-xtrabackup-2.2.3/client/mysqldump.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/client/mysqldump.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -614,7 +614,7 @@
 
 void check_io(FILE *file)
 {
-  if (ferror(file))
+  if (ferror(file) || errno == 5)
     die(EX_EOF, "Got errno %d on write", errno);
 }
 
@@ -1907,7 +1907,7 @@
                           const char *str_create)
 {
   uint i;
-  my_bool body_found= 0;
+  my_bool body_found __attribute__((unused)) = 0;
   char *create_stmt_ptr= NULL;
   ulong create_stmt_len= 0;
   MYSQL_FIELD *field;
@@ -2574,7 +2574,7 @@
 
       if (strcmp (table_type, "VIEW") == 0)         /* view */
         print_comment(sql_file, 0,
-                      "\n--\n-- Temporary table structure for view %s\n--\n\n",
+                      "\n--\n-- Temporary view structure for view %s\n--\n\n",
                       result_table);
       else
         print_comment(sql_file, 0,
@@ -2601,7 +2601,7 @@
         char *scv_buff= NULL;
         my_ulonglong n_cols;
 
-        verbose_msg("-- It's a view, create dummy table for view\n");
+        verbose_msg("-- It's a view, create dummy view\n");
 
         /* save "show create" statement for later */
         if ((row= mysql_fetch_row(result)) && (scv_buff=row[1]))
@@ -2674,7 +2674,7 @@
           fprintf(sql_file,
                   "SET @saved_cs_client     = @@character_set_client;\n"
                   "SET character_set_client = utf8;\n"
-                  "/*!50001 CREATE TABLE %s (\n",
+                  "/*!50001 CREATE VIEW %s AS SELECT \n",
                   result_table);
 
           /*
@@ -2683,31 +2683,24 @@
             there should be a _trailing_ comma.
           */
 
+
           row= mysql_fetch_row(result);
 
           /*
-            The actual column type doesn't matter anyway, since the table will
-            be dropped at run time.
-            We do tinyint to avoid hitting the row size limit.
+            A temporary view is created to resolve the view interdependencies.
+            This temporary view is dropped when the actual view is created.
           */
-          fprintf(sql_file, "  %s tinyint NOT NULL",
+
+          fprintf(sql_file, " 1 AS %s",
                   quote_name(row[0], name_buff, 0));
 
           while((row= mysql_fetch_row(result)))
           {
-            /* col name, col type */
-            fprintf(sql_file, ",\n  %s tinyint NOT NULL",
+            fprintf(sql_file, ",\n 1 AS %s",
                     quote_name(row[0], name_buff, 0));
           }
 
-          /*
-            Stand-in tables are always MyISAM tables as the default
-            engine might have a column-limit that's lower than the
-            number of columns in the view, and MyISAM support is
-            guaranteed to be in the server anyway.
-          */
-          fprintf(sql_file,
-                  "\n) ENGINE=MyISAM */;\n"
+          fprintf(sql_file,"*/;\n"
                   "SET character_set_client = @saved_cs_client;\n");
 
           check_io(sql_file);
@@ -3635,7 +3628,8 @@
                    field->type == MYSQL_TYPE_BLOB ||
                    field->type == MYSQL_TYPE_LONG_BLOB ||
                    field->type == MYSQL_TYPE_MEDIUM_BLOB ||
-                   field->type == MYSQL_TYPE_TINY_BLOB)) ? 1 : 0;
+                   field->type == MYSQL_TYPE_TINY_BLOB ||
+                   field->type == MYSQL_TYPE_GEOMETRY)) ? 1 : 0;
         if (extended_insert && !opt_xml)
         {
           if (i == 0)
@@ -5586,15 +5580,8 @@
                 "\n--\n-- Final view structure for view %s\n--\n\n",
                 result_table);
 
-  /* Table might not exist if this view was dumped with --tab. */
-  fprintf(sql_file, "/*!50001 DROP TABLE IF EXISTS %s*/;\n", opt_quoted_table);
-  if (opt_drop)
-  {
-    fprintf(sql_file, "/*!50001 DROP VIEW IF EXISTS %s*/;\n",
-            opt_quoted_table);
-    check_io(sql_file);
-  }
-
+  verbose_msg("-- Dropping the temporary view structure created\n");
+  fprintf(sql_file, "/*!50001 DROP VIEW IF EXISTS %s*/;\n", opt_quoted_table);
 
   my_snprintf(query, sizeof(query),
               "SELECT CHECK_OPTION, DEFINER, SECURITY_TYPE, "
@@ -5768,7 +5755,7 @@
 int main(int argc, char **argv)
 {
   char bin_log_name[FN_REFLEN];
-  int exit_code;
+  int exit_code, md_result_fd;
   MY_INIT("mysqldump");
 
   compatible_mode_normal_str[0]= 0;
@@ -5867,19 +5854,36 @@
       dump_all_tablespaces();
     dump_all_databases();
   }
-  else if (argc > 1 && !opt_databases)
-  {
-    /* Only one database and selected table(s) */
-    if (!opt_alltspcs && !opt_notspcs)
-      dump_tablespaces_for_tables(*argv, (argv + 1), (argc -1));
-    dump_selected_tables(*argv, (argv + 1), (argc - 1));
-  }
   else
   {
-    /* One or more databases, all tables */
-    if (!opt_alltspcs && !opt_notspcs)
-      dump_tablespaces_for_databases(argv);
-    dump_databases(argv);
+    // Check all arguments meet length condition. Currently database and table
+    // names are limited to NAME_LEN bytes and stack-based buffers assumes
+    // that escaped name will be not longer than NAME_LEN*2 + 2 bytes long.
+    int argument;
+    for (argument= 0; argument < argc; argument++)
+    {
+      size_t argument_length= strlen(argv[argument]);
+      if (argument_length > NAME_LEN)
+      {
+        die(EX_CONSCHECK, "[ERROR] Argument '%s' is too long, it cannot be "
+          "name for any table or database.\n", argv[argument]);
+      }
+    }
+
+    if (argc > 1 && !opt_databases)
+    {
+      /* Only one database and selected table(s) */
+      if (!opt_alltspcs && !opt_notspcs)
+        dump_tablespaces_for_tables(*argv, (argv + 1), (argc - 1));
+      dump_selected_tables(*argv, (argv + 1), (argc - 1));
+    }
+    else
+    {
+      /* One or more databases, all tables */
+      if (!opt_alltspcs && !opt_notspcs)
+        dump_tablespaces_for_databases(argv);
+      dump_databases(argv);
+    }
   }
 
   /* if --dump-slave , start the slave sql thread */
@@ -5896,8 +5900,19 @@
   if (opt_slave_apply && add_slave_statements())
     goto err;
 
-  /* ensure dumped data flushed */
-  if (md_result_file && fflush(md_result_file))
+  if (md_result_file)
+    md_result_fd= my_fileno(md_result_file);
+
+  /* 
+     Ensure dumped data flushed.
+     First we will flush the file stream data to kernel buffers with fflush().
+     Second we will flush the kernel buffers data to physical disk file with
+     my_sync(), this will make sure the data succeessfully dumped to disk file.
+     fsync() fails with EINVAL if stdout is not redirected to any file, hence
+     MY_IGNORE_BADFD is passed to ingnore that error.
+  */
+  if (md_result_file &&
+      (fflush(md_result_file) || my_sync(md_result_fd, MYF(MY_IGNORE_BADFD))))
   {
     if (!first_error)
       first_error= EX_MYSQLERR;
diff -Nru percona-xtrabackup-2.2.3/cmake/build_configurations/compiler_options.cmake percona-xtrabackup-2.3.7/cmake/build_configurations/compiler_options.cmake
--- percona-xtrabackup-2.2.3/cmake/build_configurations/compiler_options.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/build_configurations/compiler_options.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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
@@ -43,47 +43,16 @@
     SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
   ENDIF()
 
-  # HPUX flags
-  IF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-    IF(CMAKE_C_COMPILER_ID MATCHES "HP")
-      IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
-        SET(COMMON_C_FLAGS                 "+DSitanium2 -mt -AC99")
-        SET(COMMON_CXX_FLAGS               "+DSitanium2 -mt -Aa")
-        SET(CMAKE_C_FLAGS_DEBUG            "+O0 -g ${COMMON_C_FLAGS}")
-        SET(CMAKE_CXX_FLAGS_DEBUG          "+O0 -g ${COMMON_CXX_FLAGS}")
-        # We have seen compiler bugs with optimisation and -g, so disabled for now
-        SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "+O2 ${COMMON_C_FLAGS}")
-        SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "+O2 ${COMMON_CXX_FLAGS}")
-      ENDIF()
-    ENDIF()
-    SET(WITH_SSL no)
-  ENDIF()
-
-  # Linux flags
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
-      SET(COMMON_C_FLAGS                 "-static-intel -static-libgcc -g -mp -restrict")
-      SET(COMMON_CXX_FLAGS               "-static-intel -static-libgcc -g -mp -restrict")
-      IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
-        SET(COMMON_C_FLAGS               "${COMMON_C_FLAGS} -no-ftz -no-prefetch")
-        SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS} -no-ftz -no-prefetch")
-      ENDIF()
-      SET(CMAKE_C_FLAGS_DEBUG            "${COMMON_C_FLAGS}")
-      SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
-      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O3 -unroll2 -ip ${COMMON_C_FLAGS}")
-      SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -unroll2 -ip ${COMMON_CXX_FLAGS}")
-      SET(WITH_SSL no)
-    ENDIF()
+  # Default Clang flags
+  IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
   ENDIF()
-
-  # OSX flags
-  IF(APPLE)
-    SET(COMMON_C_FLAGS                 "-g -fno-strict-aliasing")
-    SET(COMMON_CXX_FLAGS               "-g -fno-strict-aliasing")
-    SET(CMAKE_C_FLAGS_DEBUG            "${COMMON_C_FLAGS}")
+  IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
     SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-Os ${COMMON_C_FLAGS}")
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os ${COMMON_CXX_FLAGS}")
+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
   ENDIF()
 
   # Solaris flags
@@ -93,9 +62,15 @@
       SET(WITH_MYSQLD_LDFLAGS "-lmtmalloc" CACHE STRING "")
     ENDIF()
     IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
+
+      SET(SUNPRO_CXX_LIBRARY "stlport4" CACHE STRING
+        "What C++ library to use. The server needs stlport4. It is possible to build the client libraries with -DWITHOUT_SERVER=1 -DSUNPRO_CXX_LIBRARY=Cstd")
+
+      MESSAGE(STATUS "SUNPRO_CXX_LIBRARY ${SUNPRO_CXX_LIBRARY}")
+
       IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
         SET(COMMON_C_FLAGS                   "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
-        SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic -library=stlport4")
+        SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic -library=${SUNPRO_CXX_LIBRARY}")
         # We have to specify "-xO1" for DEBUG flags here,
         # see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6879978
         SET(CMAKE_C_FLAGS_DEBUG              "-xO1 ${COMMON_C_FLAGS}")
@@ -110,7 +85,7 @@
       ELSE() 
         # Assume !x86 is SPARC
         SET(COMMON_C_FLAGS                 "-g -Xa -xstrconst -mt")
-        SET(COMMON_CXX_FLAGS               "-g0 -mt -library=stlport4")
+        SET(COMMON_CXX_FLAGS               "-g0 -mt -library=${SUNPRO_CXX_LIBRARY}")
         IF(32BIT)
           SET(COMMON_C_FLAGS               "${COMMON_C_FLAGS} -xarch=sparc")
           SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS} -xarch=sparc")
diff -Nru percona-xtrabackup-2.2.3/cmake/build_configurations/feature_set.cmake percona-xtrabackup-2.3.7/cmake/build_configurations/feature_set.cmake
--- percona-xtrabackup-2.2.3/cmake/build_configurations/feature_set.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/build_configurations/feature_set.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -77,6 +77,5 @@
   ENDFOREACH()
 ENDIF()
 
-OPTION(ENABLED_LOCAL_INFILE "" ON)
 SET(WITH_SSL bundled CACHE STRING "")
-SET(WITH_ZLIB bundled CACHE STRING "")
+SET(WITH_ZLIB system CACHE STRING "")
diff -Nru percona-xtrabackup-2.2.3/cmake/build_configurations/mysql_release.cmake percona-xtrabackup-2.3.7/cmake/build_configurations/mysql_release.cmake
--- percona-xtrabackup-2.2.3/cmake/build_configurations/mysql_release.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/build_configurations/mysql_release.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -19,6 +19,7 @@
 INCLUDE(CheckLibraryExists)
 
 OPTION(DEBUG_EXTNAME "" ON)
+OPTION(ENABLED_LOCAL_INFILE "" ON)
 
 IF(NOT COMPILATION_COMMENT)
   SET(COMPILATION_COMMENT "MySQL Community Server (GPL)")
diff -Nru percona-xtrabackup-2.2.3/cmake/build_configurations/xtrabackup_release.cmake percona-xtrabackup-2.3.7/cmake/build_configurations/xtrabackup_release.cmake
--- percona-xtrabackup-2.2.3/cmake/build_configurations/xtrabackup_release.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/build_configurations/xtrabackup_release.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -18,7 +18,7 @@
 INCLUDE(CheckLibraryExists)
 
 SET(WITH_INNOBASE_STORAGE_ENGINE ON)
-SET(WITH_ZLIB bundled)
+SET(WITH_ZLIB system)
 
 IF(WIN32)
   IF(NOT CMAKE_USING_VC_FREE_TOOLS)
@@ -52,6 +52,8 @@
 
     # Enable fast mutexes on Linux
     OPTION(WITH_FAST_MUTEXES "" ON)
+    # Enable building man pages on Linux by default
+    OPTION(WITH_MAN_PAGES "" ON)
   ENDIF()
 
 ENDIF()
diff -Nru percona-xtrabackup-2.2.3/cmake/compile_flags.cmake percona-xtrabackup-2.3.7/cmake/compile_flags.cmake
--- percona-xtrabackup-2.2.3/cmake/compile_flags.cmake	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/compile_flags.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,44 @@
+# Copyright (c) 2014, 2015, 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
+
+
+## ADD_COMPILE_FLAGS(<source files> COMPILE_FLAGS <flags>)
+MACRO(ADD_COMPILE_FLAGS)
+  SET(FILES "")
+  SET(FLAGS "")
+  SET(COMPILE_FLAGS_SEEN)
+  FOREACH(ARG ${ARGV})
+    IF(ARG STREQUAL "COMPILE_FLAGS")
+      SET(COMPILE_FLAGS_SEEN 1)
+    ELSEIF(COMPILE_FLAGS_SEEN)
+      LIST(APPEND FLAGS ${ARG})
+    ELSE()
+      LIST(APPEND FILES ${ARG})
+    ENDIF()
+  ENDFOREACH()
+  FOREACH(FILE ${FILES})
+    FOREACH(FLAG ${FLAGS})
+      GET_SOURCE_FILE_PROPERTY(PROP ${FILE} COMPILE_FLAGS)
+      IF(NOT PROP)
+        SET(PROP ${FLAG})
+      ELSE()
+        SET(PROP "${PROP} ${FLAG}")
+      ENDIF()
+      SET_SOURCE_FILES_PROPERTIES(
+        ${FILE} PROPERTIES COMPILE_FLAGS "${PROP}"
+        )
+    ENDFOREACH()
+  ENDFOREACH()
+ENDMACRO()
diff -Nru percona-xtrabackup-2.2.3/cmake/cpack_source_ignore_files.cmake percona-xtrabackup-2.3.7/cmake/cpack_source_ignore_files.cmake
--- percona-xtrabackup-2.2.3/cmake/cpack_source_ignore_files.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/cpack_source_ignore_files.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -14,9 +14,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 SET(CPACK_SOURCE_IGNORE_FILES
-\\\\.bzr/
-\\\\.bzr-mysql
-\\\\.bzrignore
 CMakeCache\\\\.txt
 cmake_dist\\\\.cmake
 CPackSourceConfig\\\\.cmake
diff -Nru percona-xtrabackup-2.2.3/cmake/curl.cmake percona-xtrabackup-2.3.7/cmake/curl.cmake
--- percona-xtrabackup-2.2.3/cmake/curl.cmake	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/curl.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+# Copyright (c) 2014 Percona LLC and/or its affiliates
+#
+# 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 
+
+MACRO(FIND_CURL)
+
+FIND_PACKAGE(CURL)
+IF(CURL_FOUND)
+    MESSAGE(STATUS "CURL libraries found at: ${CURL_LIBRARIES}")
+    MESSAGE(STATUS "CURL includes found at: ${CURL_INCLUDE_DIRS}")
+ELSE()
+    MESSAGE(SEND_ERROR "Could not find cURL on your system")
+ENDIF(CURL_FOUND)
+
+ENDMACRO()
diff -Nru percona-xtrabackup-2.2.3/cmake/dtrace.cmake percona-xtrabackup-2.3.7/cmake/dtrace.cmake
--- percona-xtrabackup-2.2.3/cmake/dtrace.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/dtrace.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -40,7 +40,16 @@
    SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
  ENDIF()
  SET(HAVE_DTRACE ${ENABLE_DTRACE})
- IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+ EXECUTE_PROCESS(
+   COMMAND ${DTRACE} -V
+   OUTPUT_VARIABLE out)
+ IF(out MATCHES "Sun D" OR out MATCHES "Oracle D")
+   IF(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND
+      NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+     SET(HAVE_REAL_DTRACE_INSTRUMENTING ON CACHE BOOL "Real DTrace detected")
+   ENDIF()
+ ENDIF()
+ IF(HAVE_REAL_DTRACE_INSTRUMENTING)
    IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
      SET(DTRACE_FLAGS -32 CACHE INTERNAL "DTrace architecture flags")
    ELSE()
@@ -93,7 +102,7 @@
     ADD_DEPENDENCIES(${target} gen_dtrace_header)
 
     # Invoke dtrace to generate object file and link it together with target.
-    IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    IF(HAVE_REAL_DTRACE_INSTRUMENTING)
       SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir)
       SET(outfile ${objdir}/${target}_dtrace.o)
       GET_TARGET_PROPERTY(target_type ${target} TYPE)
@@ -110,12 +119,22 @@
         WORKING_DIRECTORY ${objdir}
       )
     ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+      # dtrace on Linux runs gcc and uses flags from environment
+      SET(CFLAGS_SAVED $ENV{CFLAGS})
+      # We want to strip off all warning flags, including -Werror=xxx-xx,
+      # but keep flags like
+      #  -Wp,-D_FORTIFY_SOURCE=2
+      STRING(REGEX REPLACE "-W[A-Za-z0-9][-A-Za-z0-9=]+" ""
+        C_FLAGS "${CMAKE_C_FLAGS}")
+
+      SET(ENV{CFLAGS} ${C_FLAGS})
       SET(outfile "${CMAKE_BINARY_DIR}/probes_mysql.o")
       # Systemtap object
       EXECUTE_PROCESS(
         COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
         -o ${outfile}
         )
+      SET(ENV{CFLAGS} ${CFLAGS_SAVED})
     ENDIF()
 
     # Do not try to extend the library if we have not built the .o file
@@ -151,7 +170,7 @@
 # run them again through dtrace -G to generate an ELF file that links
 # to mysqld.
 MACRO (DTRACE_INSTRUMENT_STATIC_LIBS target libs)
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND ENABLE_DTRACE)
+IF(HAVE_REAL_DTRACE_INSTRUMENTING AND ENABLE_DTRACE)
   # Filter out non-static libraries in the list, if any
   SET(static_libs)
   FOREACH(lib ${libs})
diff -Nru percona-xtrabackup-2.2.3/cmake/FindLibEv.cmake percona-xtrabackup-2.3.7/cmake/FindLibEv.cmake
--- percona-xtrabackup-2.2.3/cmake/FindLibEv.cmake	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/FindLibEv.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,49 @@
+# Copyright (c) 2014 Percona LLC and/or its affiliates
+#
+# 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 
+
+# This module defines
+#  LIBEV_INCLUDE_DIRS, where to find LibEv headers
+#  LIBEV_LIBRARIES, LibEv libraries
+#  LIBEV_FOUND, If false, do not try to use ant
+
+find_path(LIBEV_INCLUDE_DIRS ev.h PATHS
+    /usr/include
+    /usr/local/include
+    /opt/local/include
+    /usr/include/libev
+  )
+
+set(LIBEV_LIB_PATHS /usr/lib /usr/local/lib /opt/local/lib)
+find_library(LIBEV_LIB NAMES ev PATHS ${LIBEV_LIB_PATHS})
+
+if (LIBEV_LIB AND LIBEV_INCLUDE_DIRS)
+  set(LIBEV_FOUND TRUE)
+  set(LIBEV_LIBRARIES ${LIBEV_LIB})
+else ()
+  set(LIBEV_FOUND FALSE)
+endif ()
+
+if (LIBEV_FOUND)
+  if (NOT LIBEV_FIND_QUIETLY)
+    message(STATUS "Found libev: ${LIBEV_LIBRARIES}")
+  endif ()
+else ()
+  message(STATUS "libev NOT found.")
+endif ()
+
+mark_as_advanced(
+    LIBEV_LIB
+    LIBEV_INCLUDE_DIRS
+  )
diff -Nru percona-xtrabackup-2.2.3/cmake/info_macros.cmake.in percona-xtrabackup-2.3.7/cmake/info_macros.cmake.in
--- percona-xtrabackup-2.2.3/cmake/info_macros.cmake.in	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/info_macros.cmake.in	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -23,11 +23,14 @@
 # If further variables are used in this file, add them to this list.
 
 SET(VERSION "@VERSION@")
+SET(MAJOR_VERSION "@MAJOR_VERSION@")
+SET(MINOR_VERSION "@MINOR_VERSION@")
+SET(PATCH_VERSION "@PATCH_VERSION@")
 SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
 SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
 SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CMAKE_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")
-SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@")
+SET(GIT_EXECUTABLE "@GIT_EXECUTABLE@")
 SET(CMAKE_CROSSCOMPILING "@CMAKE_CROSSCOMPILING@")
 SET(CMAKE_HOST_SYSTEM "@CMAKE_HOST_SYSTEM@")
 SET(CMAKE_HOST_SYSTEM_PROCESSOR "@CMAKE_HOST_SYSTEM_PROCESSOR@")
@@ -36,34 +39,51 @@
  
  
 # Create an "INFO_SRC" file with information about the source (only).
-# We use "bzr version-info", if possible, and the "VERSION" contents.
+# We use "git log", if possible, and the "VERSION" contents.
 #
-# Outside development (BZR tree), the "INFO_SRC" file will not be modified
+# Outside development (git tree), the "INFO_SRC" file will not be modified
 # provided it exists (from "make dist" or a source tarball creation).
 
 MACRO(CREATE_INFO_SRC target_dir)
   SET(INFO_SRC "${target_dir}/INFO_SRC")
 
-  IF(BZR_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/.bzr)
-    # Sources are in a BZR repository: Always update.
-    # Add a timeout in case BZR hangs forever ...
+  SET(PERLSCRIPT
+    "use warnings; use POSIX qw(strftime); "
+    "print strftime \"%F %T %z\", localtime;")
+  EXECUTE_PROCESS(
+    COMMAND perl -e "${PERLSCRIPT}"
+    RESULT_VARIABLE result
+    OUTPUT_VARIABLE bdate
+    ERROR_VARIABLE error
+  )
+  IF(error)
+    MESSAGE(STATUS "Could not determine build-date: <${error}>")
+  ENDIF()
+
+  IF(GIT_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+    # Sources are in a GIT repository: Always update.
     EXECUTE_PROCESS(
-      COMMAND ${BZR_EXECUTABLE} version-info ${CMAKE_SOURCE_DIR}
+      COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE bname
+    )
+
+    EXECUTE_PROCESS(
+      COMMAND ${GIT_EXECUTABLE} log -1
+      --pretty="commit: %H%ndate: %ci%nbuild-date: ${bdate} %nshort: %h%nbranch: ${bname}"
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       OUTPUT_VARIABLE VERSION_INFO
-      RESULT_VARIABLE RESULT
-      ERROR_VARIABLE ERROR
-      TIMEOUT 10
     )
-    IF(NOT RESULT EQUAL 0)
-      MESSAGE(STATUS "Error from ${BZR_EXECUTABLE}: ${ERROR}")
-      SET(BZR_EXECUTABLE)
-    ENDIF()
+
+    ## Output from git is quoted with "", remove them.
+    STRING(REPLACE "\"" "" VERSION_INFO "${VERSION_INFO}")
     FILE(WRITE ${INFO_SRC} "${VERSION_INFO}\n")
     # to debug, add: FILE(APPEND ${INFO_SRC} "\nResult ${RESULT}\n")
     # For better readability ...
-    FILE(APPEND ${INFO_SRC} "\nMySQL source ${VERSION}\n")
+    FILE(APPEND ${INFO_SRC}
+      "MySQL source ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}\n")
   ELSEIF(EXISTS ${INFO_SRC})
-    # Outside a BZR tree, there is no need to change an existing "INFO_SRC",
+    # Outside a git tree, there is no need to change an existing "INFO_SRC",
     # it cannot be improved.
   ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC)
     # If we are building from a source distribution, it also contains "INFO_SRC".
diff -Nru percona-xtrabackup-2.2.3/cmake/info_src.cmake percona-xtrabackup-2.3.7/cmake/info_src.cmake
--- percona-xtrabackup-2.2.3/cmake/info_src.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/info_src.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -16,11 +16,11 @@
 
 # The sole purpose of this cmake control file is to create the "INFO_SRC" file.
 
-# As long as and "bzr pull" (or "bzr commit") is followed by a "cmake",
+# As long as and "git pull" (or "git commit") is followed by a "cmake",
 # the call in top level "CMakeLists.txt" is sufficient.
 # This file is to provide a separate target for the "make" phase,
-# to ensure the BZR revision-id is correct even after a sequence
-#   cmake ; make ; bzr pull ; make
+# to ensure the git commit hash is correct even after a sequence
+#   cmake ; make ; git pull ; make
 
 
 # Get the macros which handle the "INFO_*" files.
diff -Nru percona-xtrabackup-2.2.3/cmake/install_macros.cmake percona-xtrabackup-2.3.7/cmake/install_macros.cmake
--- percona-xtrabackup-2.2.3/cmake/install_macros.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/install_macros.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -21,26 +21,35 @@
     GET_TARGET_PROPERTY(location ${target} LOCATION)
     GET_TARGET_PROPERTY(type ${target} TYPE)
     IF(NOT INSTALL_LOCATION)
-      IF(type MATCHES "STATIC_LIBRARY" OR type MATCHES "MODULE_LIBRARY" OR type MATCHES "SHARED_LIBRARY")
+      IF(type MATCHES "STATIC_LIBRARY"
+          OR type MATCHES "MODULE_LIBRARY"
+          OR type MATCHES "SHARED_LIBRARY")
         SET(INSTALL_LOCATION "lib")
       ELSEIF(type MATCHES "EXECUTABLE")
         SET(INSTALL_LOCATION "bin")
       ELSE()
-        MESSAGE(FATAL_ERROR "cannot determine type of ${target}. Don't now where to install")
+        MESSAGE(FATAL_ERROR
+          "cannot determine type of ${target}. Don't now where to install")
      ENDIF()
     ENDIF()
     STRING(REPLACE ".exe" ".pdb" pdb_location ${location})
     STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
     STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})
     IF(CMAKE_GENERATOR MATCHES "Visual Studio")
-      STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location})
+      STRING(REPLACE
+        "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
+        pdb_location ${pdb_location})
     ENDIF()
     IF(target STREQUAL "mysqld")
 	  SET(comp Server)
     ELSE()
       SET(comp Debuginfo)
     ENDIF()	  
-    INSTALL(FILES ${pdb_location} DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
+    # No .pdb file for static libraries.
+    IF(NOT type MATCHES "STATIC_LIBRARY")
+      INSTALL(FILES ${pdb_location}
+        DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
+    ENDIF()
   ENDFOREACH()
   ENDIF()
 ENDMACRO()
diff -Nru percona-xtrabackup-2.2.3/cmake/libev.cmake percona-xtrabackup-2.3.7/cmake/libev.cmake
--- percona-xtrabackup-2.2.3/cmake/libev.cmake	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/libev.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+# Copyright (c) 2014 Percona LLC and/or its affiliates
+#
+# 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 
+
+MACRO(FIND_EV)
+
+FIND_PACKAGE(LibEv)
+IF(LIBEV_FOUND)
+    MESSAGE(STATUS "libev libraries found at: ${LIBEV_LIBRARIES}")
+    MESSAGE(STATUS "libev includes found at: ${LIBEV_INCLUDE_DIRS}")
+ELSE()
+    MESSAGE(SEND_ERROR "Could not find libev on your system")
+ENDIF(LIBEV_FOUND)
+
+ENDMACRO()
diff -Nru percona-xtrabackup-2.2.3/cmake/maintainer.cmake percona-xtrabackup-2.3.7/cmake/maintainer.cmake
--- percona-xtrabackup-2.2.3/cmake/maintainer.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/maintainer.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -13,44 +13,39 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-INCLUDE(CheckCCompilerFlag)
-
-# Setup GCC (GNU C compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS)
-  SET(MY_MAINTAINER_WARNINGS
-      "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing  -Werror")
-
-  CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
-                        HAVE_DECLARATION_AFTER_STATEMENT)
-  IF(HAVE_DECLARATION_AFTER_STATEMENT)
-    SET(MY_MAINTAINER_DECLARATION_AFTER_STATEMENT
-        "-Wdeclaration-after-statement")
-  ENDIF()
-  SET(MY_MAINTAINER_C_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} ${MY_MAINTAINER_DECLARATION_AFTER_STATEMENT}"
-      CACHE STRING "C warning options used in maintainer builds.")
-  # Do not make warnings in checks into errors.
-  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error")
-ENDMACRO()
-
-
-# Setup G++ (GNU C++ compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS)
-  SET(MY_MAINTAINER_CXX_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} -Wno-unused-parameter -Woverloaded-virtual"
-      CACHE STRING "C++ warning options used in maintainer builds.")
-ENDMACRO()
-
-# Setup ICC (Intel C Compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS)
-  SET(MY_MAINTAINER_WARNINGS "-Wcheck")
-  SET(MY_MAINTAINER_C_WARNINGS "${MY_MAINTAINER_WARNINGS}"
-      CACHE STRING "C warning options used in maintainer builds.")
-ENDMACRO()
-
-# Setup ICPC (Intel C++ Compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS)
-  SET(MY_MAINTAINER_CXX_WARNINGS "${MY_MAINTAINER_WARNINGS}"
-      CACHE STRING "C++ warning options used in maintainer builds.")
-ENDMACRO()
-
+# Common warning flags for GCC, G++, Clang and Clang++
+SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security")
+MY_CHECK_C_COMPILER_FLAG("-Wvla" HAVE_WVLA) # Requires GCC 4.3+ or Clang
+IF(HAVE_WVLA)
+  SET(MY_WARNING_FLAGS "${MY_WARNING_FLAGS} -Wvla")
+ENDIF()
+
+# Common warning flags for GCC and Clang
+SET(MY_C_WARNING_FLAGS
+    "${MY_WARNING_FLAGS} -Wwrite-strings -Wdeclaration-after-statement")
+
+# Common warning flags for G++ and Clang++
+SET(MY_CXX_WARNING_FLAGS
+    "${MY_WARNING_FLAGS} -Woverloaded-virtual -Wno-unused-parameter")
+
+# Extra warning flags for Clang++
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(MY_CXX_WARNING_FLAGS
+      "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
+ENDIF()
+
+# Turn on Werror (warning => error) when using maintainer mode.
+IF(MYSQL_MAINTAINER_MODE)
+  SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror")
+  SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror")
+  SET(COMPILE_FLAG_WERROR 1)
+ENDIF()
+
+# Set warning flags for GCC/Clang
+IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}")
+ENDIF()
+# Set warning flags for G++/Clang++
+IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_WARNING_FLAGS}")
+ENDIF()
diff -Nru percona-xtrabackup-2.2.3/cmake/make_dist.cmake.in percona-xtrabackup-2.3.7/cmake/make_dist.cmake.in
--- percona-xtrabackup-2.2.3/cmake/make_dist.cmake.in	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/make_dist.cmake.in	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -14,7 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 # Make source distribution
-# If bzr is present, run bzr export.
+# If git is present, run git archive.
 # Otherwise, just run cpack with source configuration.
 
 SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
@@ -22,13 +22,12 @@
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "@CPACK_SOURCE_PACKAGE_FILE_NAME@")
 SET(CMAKE_CPACK_COMMAND  "@CMAKE_CPACK_COMMAND@")
 SET(CMAKE_COMMAND  "@CMAKE_COMMAND@")
-SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@")
+SET(GIT_EXECUTABLE "@GIT_EXECUTABLE@")
 SET(GTAR_EXECUTABLE "@GTAR_EXECUTABLE@")
 SET(TAR_EXECUTABLE "@TAR_EXECUTABLE@")
 SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CMAKE_MAKE_PROGRAM "@CMAKE_MAKE_PROGRAM@")
 SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
-SET(PLUGIN_REPOS "@PLUGIN_REPOS@")
 
 SET(VERSION "@VERSION@")
 
@@ -40,38 +39,54 @@
 FILE(REMOVE_RECURSE ${PACKAGE_DIR})
 FILE(REMOVE ${PACKAGE_DIR}.tar.gz )
 
-IF(BZR_EXECUTABLE)
-  MESSAGE(STATUS "Running bzr export")
+# Only allow git if source dir itself is a git repository
+IF(GIT_EXECUTABLE)
   EXECUTE_PROCESS(
-    COMMAND "${BZR_EXECUTABLE}" export 
-    ${PACKAGE_DIR}
+    COMMAND "${GIT_EXECUTABLE}" rev-parse --show-toplevel
+    OUTPUT_VARIABLE GIT_ROOT
+    ERROR_VARIABLE GIT_ROOT_ERROR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     RESULT_VARIABLE RESULT
   )
 
-  IF(NOT RESULT EQUAL 0)
-   SET(BZR_EXECUTABLE)
+  IF(NOT RESULT EQUAL 0 OR NOT GIT_ROOT STREQUAL ${CMAKE_SOURCE_DIR})
+    MESSAGE(STATUS "This is not a git repository")
+    SET(GIT_EXECUTABLE)
   ENDIF()
 ENDIF()
 
-IF(BZR_EXECUTABLE)
-  FOREACH(REPO ${PLUGIN_REPOS})
-    GET_FILENAME_COMPONENT(PLUGIN_NAME ${REPO} NAME)
-    SET(DEST ${PACKAGE_DIR}/plugin/${PLUGIN_NAME})
-    MESSAGE(STATUS "Running bzr export for plugin/${PLUGIN_NAME}")
+IF(GIT_EXECUTABLE)
+  MESSAGE(STATUS "Running git archive -o ${PACKAGE_DIR}.tar")
+  EXECUTE_PROCESS(
+    COMMAND "${GIT_EXECUTABLE}" archive --format=tar
+    --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ -o ${PACKAGE_DIR}.tar HEAD
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    RESULT_VARIABLE RESULT
+  )
+  IF(NOT RESULT EQUAL 0)
+    SET(GIT_EXECUTABLE)
+  ELSE()
+    # Unpack tarball
     EXECUTE_PROCESS(
-      COMMAND "${BZR_EXECUTABLE}" export ${DEST}
-      WORKING_DIRECTORY ${REPO}
-      RESULT_VARIABLE RESULT
+      COMMAND ${CMAKE_COMMAND} -E tar xf ${PACKAGE_DIR}.tar
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      RESULT_VARIABLE TAR_RESULT
     )
-    IF(NOT RESULT EQUAL 0)
-      MESSAGE(STATUS "bzr export failed")
+    IF(NOT TAR_RESULT EQUAL 0)
+      SET(GIT_EXECUTABLE)
+    ELSE()
+      # Remove tarball after unpacking
+      EXECUTE_PROCESS(
+        COMMAND ${CMAKE_COMMAND} -E remove ${PACKAGE_DIR}.tar
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      )
     ENDIF()
-  ENDFOREACH()
+  ENDIF()
 ENDIF()
 
-IF(NOT BZR_EXECUTABLE)
-  MESSAGE(STATUS "bzr not found or source dir is not a repo, use CPack")
+IF(NOT GIT_EXECUTABLE)
+  MESSAGE(STATUS "git not found or source dir is not a repo, use CPack")
   
   IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     # In-source build is the worst option, we have to cleanup source tree.
diff -Nru percona-xtrabackup-2.2.3/cmake/mysql_version.cmake percona-xtrabackup-2.3.7/cmake/mysql_version.cmake
--- percona-xtrabackup-2.2.3/cmake/mysql_version.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/mysql_version.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -82,19 +82,31 @@
   SET(CPACK_PACKAGE_VERSION_MINOR ${XB_MINOR_VERSION})
   SET(CPACK_PACKAGE_VERSION_PATCH ${XB_PATCH_VERSION})
 
-  IF (EXISTS ${CMAKE_SOURCE_DIR}/.bzr)
+  IF (EXISTS ${CMAKE_SOURCE_DIR}/.git)
     EXECUTE_PROCESS(
-      COMMAND ${BZR_EXECUTABLE} version-info --custom --template "{revno}" ${CMAKE_SOURCE_DIR}
+      COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       OUTPUT_VARIABLE XB_REVISION
       RESULT_VARIABLE RESULT
       ERROR_VARIABLE ERROR
       TIMEOUT 10
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     IF(NOT RESULT EQUAL 0)
-      MESSAGE(STATUS "Error from ${BZR_EXECUTABLE}: ${ERROR}")
-      SET(BZR_EXECUTABLE)
+      MESSAGE(STATUS "Error from ${GIT_EXECUTABLE}: ${ERROR}")
+      SET(GIT_EXECUTABLE)
     ENDIF()
-
+  ELSEIF (EXISTS ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC)
+    EXECUTE_PROCESS(
+      COMMAND grep "^short: " Docs/INFO_SRC
+      COMMAND sed -e "s/short: //"
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE XB_REVISION
+      RESULT_VARIABLE RESULT
+      ERROR_VARIABLE ERROR
+      TIMEOUT 10
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
   ENDIF()
 ENDMACRO()
 
diff -Nru percona-xtrabackup-2.2.3/cmake/os/Darwin.cmake percona-xtrabackup-2.3.7/cmake/os/Darwin.cmake
--- percona-xtrabackup-2.2.3/cmake/os/Darwin.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/os/Darwin.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -15,24 +15,6 @@
 
 # This file includes OSX specific options and quirks, related to system checks
 
-# Workaround for CMake bug#9051
-# (CMake does not pass CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET when 
-# running TRY_COMPILE)
-
-IF(CMAKE_OSX_SYSROOT)
- SET(ENV{CMAKE_OSX_SYSROOT} ${CMAKE_OSX_SYSROOT})
-ENDIF()
-IF(CMAKE_OSX_SYSROOT)
- SET(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSX_DEPLOYMENT_TARGET})
-ENDIF()
-
-IF(CMAKE_OSX_DEPLOYMENT_TARGET)
-  # Workaround linker problems  on OSX 10.4
-  IF(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.5")
-    ADD_DEFINITIONS(-fno-common)
-  ENDIF()
-ENDIF()
-
 # This is used for the version_compile_machine variable.
 IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
   SET(MYSQL_MACHINE_TYPE "x86_64")
diff -Nru percona-xtrabackup-2.2.3/cmake/os/Linux.cmake percona-xtrabackup-2.3.7/cmake/os/Linux.cmake
--- percona-xtrabackup-2.2.3/cmake/os/Linux.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/os/Linux.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -20,7 +20,6 @@
 
 # Something that needs to be set on legacy reasons
 SET(TARGET_OS_LINUX 1)
-SET(HAVE_NPTL 1)
 SET(_GNU_SOURCE 1)
 
 # Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
diff -Nru percona-xtrabackup-2.2.3/cmake/os/WindowsCache.cmake percona-xtrabackup-2.3.7/cmake/os/WindowsCache.cmake
--- percona-xtrabackup-2.2.3/cmake/os/WindowsCache.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/os/WindowsCache.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -20,6 +20,7 @@
 # different results.
 
 IF(MSVC)
+SET(HAVE_LLVM_LIBCPP CACHE  INTERNAL "")
 SET(HAVE_ACCESS 1 CACHE  INTERNAL "")
 SET(HAVE_AIO_H CACHE  INTERNAL "")
 SET(HAVE_AIO_READ CACHE  INTERNAL "")
@@ -44,7 +45,6 @@
 SET(HAVE_CXXABI_H CACHE INTERNAL "")
 SET(HAVE_DECL_MADVISE CACHE  INTERNAL "")
 SET(HAVE_DIRECTIO CACHE  INTERNAL "")
-SET(HAVE_DIRENT_H CACHE  INTERNAL "")
 SET(HAVE_DLERROR CACHE  INTERNAL "")
 SET(HAVE_DLFCN_H CACHE  INTERNAL "")
 SET(HAVE_DLOPEN CACHE  INTERNAL "")
@@ -87,7 +87,7 @@
 SET(HAVE_GETRUSAGE CACHE  INTERNAL "")
 SET(HAVE_GETTIMEOFDAY CACHE  INTERNAL "")
 SET(HAVE_GETWD CACHE  INTERNAL "")
-SET(HAVE_GMTIME_R CACHE  INTERNAL "")
+SET(HAVE_GMTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_GRP_H CACHE  INTERNAL "")
 SET(HAVE_IA64INTRIN_H CACHE  INTERNAL "")
 SET(HAVE_IEEEFP_H CACHE  INTERNAL "")
@@ -110,7 +110,7 @@
 SET(HAVE_LDIV 1 CACHE  INTERNAL "")
 SET(HAVE_LIMITS_H 1 CACHE  INTERNAL "")
 SET(HAVE_LOCALE_H 1 CACHE  INTERNAL "")
-SET(HAVE_LOCALTIME_R CACHE  INTERNAL "")
+SET(HAVE_LOCALTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_LOG2 CACHE  INTERNAL "")
 SET(HAVE_LONGJMP 1 CACHE  INTERNAL "")
 SET(HAVE_LRAND48 CACHE  INTERNAL "")
@@ -162,7 +162,6 @@
 SET(HAVE_PUTENV 1 CACHE  INTERNAL "")
 SET(HAVE_PWD_H CACHE  INTERNAL "")
 SET(HAVE_RDTSCLL CACHE  INTERNAL "")
-SET(HAVE_READDIR_R CACHE  INTERNAL "")
 SET(HAVE_READLINK CACHE  INTERNAL "")
 SET(HAVE_READ_REAL_TIME CACHE  INTERNAL "")
 SET(HAVE_REALPATH CACHE  INTERNAL "")
diff -Nru percona-xtrabackup-2.2.3/cmake/os/Windows.cmake percona-xtrabackup-2.3.7/cmake/os/Windows.cmake
--- percona-xtrabackup-2.2.3/cmake/os/Windows.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/os/Windows.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -63,28 +63,37 @@
 ENDIF()
 
 IF(MSVC)
-  # Enable debug info also in Release build, and create PDB to be able to analyze 
-  # crashes
-  FOREACH(lang C CXX)
-    SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Zi")
-  ENDFOREACH()
+  # Enable debug info also in Release build,
+  # and create PDB to be able to analyze crashes.
   FOREACH(type EXE SHARED MODULE)
-   SET(CMAKE_{type}_LINKER_FLAGS_RELEASE "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
+   SET(CMAKE_{type}_LINKER_FLAGS_RELEASE
+     "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
   ENDFOREACH()
   
-  # Force static runtime libraries
-  # Choose C++ exception handling:
-  #   If /EH is not specified, the compiler will catch structured and
-  #   C++ exceptions, but will not destroy C++ objects that will go out of
-  #   scope as a result of the exception.
-  #   /EHsc catches C++ exceptions only and tells the compiler to assume that
-  #   extern C functions never throw a C++ exception.
+  # For release types Debug Release RelWithDebInfo (but not MinSizeRel):
+  # - Force static runtime libraries
+  # - Choose C++ exception handling:
+  #     If /EH is not specified, the compiler will catch structured and
+  #     C++ exceptions, but will not destroy C++ objects that will go out of
+  #     scope as a result of the exception.
+  #     /EHsc catches C++ exceptions only and tells the compiler to assume that
+  #     extern C functions never throw a C++ exception.
+  # - Choose debugging information:
+  #     /Z7
+  #     Produces an .obj file containing full symbolic debugging
+  #     information for use with the debugger. The symbolic debugging
+  #     information includes the names and types of variables, as well as
+  #     functions and line numbers. No .pdb file is produced by the compiler.
+  FOREACH(lang C CXX)
+    SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Z7")
+  ENDFOREACH()
   FOREACH(flag 
-   CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO 
-   CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT 
+   CMAKE_C_FLAGS_RELEASE    CMAKE_C_FLAGS_RELWITHDEBINFO 
+   CMAKE_C_FLAGS_DEBUG      CMAKE_C_FLAGS_DEBUG_INIT 
    CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
-   CMAKE_CXX_FLAGS_DEBUG  CMAKE_CXX_FLAGS_DEBUG_INIT)
+   CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT)
    STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
+   STRING(REPLACE "/Zi"  "/Z7" "${flag}" "${${flag}}")
    SET("${flag}" "${${flag}} /EHsc")
   ENDFOREACH()
   
diff -Nru percona-xtrabackup-2.2.3/cmake/plugin.cmake percona-xtrabackup-2.3.7/cmake/plugin.cmake
--- percona-xtrabackup-2.2.3/cmake/plugin.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/plugin.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -231,11 +231,4 @@
       ADD_SUBDIRECTORY(${dir})
     ENDIF()
   ENDFOREACH()
-  FOREACH(dir ${dirs_plugin})
-    IF (EXISTS ${dir}/.bzr)
-      MESSAGE(STATUS "Found repo ${dir}/.bzr")
-      LIST(APPEND PLUGIN_BZR_REPOS "${dir}")
-    ENDIF()
-  ENDFOREACH()
-  SET(PLUGIN_REPOS "${PLUGIN_BZR_REPOS}" CACHE INTERNAL "")
 ENDMACRO()
diff -Nru percona-xtrabackup-2.2.3/cmake/ssl.cmake percona-xtrabackup-2.3.7/cmake/ssl.cmake
--- percona-xtrabackup-2.2.3/cmake/ssl.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/cmake/ssl.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, 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
@@ -52,6 +52,9 @@
     ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include
   )
   SET(SSL_LIBRARIES  yassl taocrypt)
+  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET})
+  ENDIF()
   SET(SSL_INCLUDE_DIRS ${INC_DIRS})
   SET(SSL_INTERNAL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL)
   SET(SSL_DEFINES "-DHAVE_YASSL -DYASSL_PREFIX -DHAVE_OPENSSL -DMULTI_THREADED")
@@ -163,7 +166,7 @@
     # Encoded as MNNFFPPS: major minor fix patch status
     FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
       OPENSSL_VERSION_NUMBER
-      REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+      REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
     )
     STRING(REGEX REPLACE
       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
@@ -172,8 +175,7 @@
 
     IF(OPENSSL_INCLUDE_DIR AND
        OPENSSL_LIBRARY   AND
-       CRYPTO_LIBRARY      AND
-       OPENSSL_MAJOR_VERSION STREQUAL "1"
+       CRYPTO_LIBRARY
       )
       SET(OPENSSL_FOUND TRUE)
     ELSE()
@@ -227,14 +229,29 @@
       SET(SSL_INTERNAL_INCLUDE_DIRS "")
       SET(SSL_DEFINES "-DHAVE_OPENSSL")
     ELSE()
-      IF(WITH_SSL STREQUAL "system")
-        MESSAGE(SEND_ERROR "Cannot find appropriate system libraries for SSL. Use  WITH_SSL=bundled to enable SSL support")
-      ENDIF()
-      MYSQL_USE_BUNDLED_SSL()
+
+      UNSET(WITH_SSL_PATH)
+      UNSET(WITH_SSL_PATH CACHE)
+      UNSET(OPENSSL_ROOT_DIR)
+      UNSET(OPENSSL_ROOT_DIR CACHE)
+      UNSET(OPENSSL_INCLUDE_DIR)
+      UNSET(OPENSSL_INCLUDE_DIR CACHE)
+      UNSET(OPENSSL_APPLINK_C)
+      UNSET(OPENSSL_APPLINK_C CACHE)
+      UNSET(OPENSSL_LIBRARY)
+      UNSET(OPENSSL_LIBRARY CACHE)
+      UNSET(CRYPTO_LIBRARY)
+      UNSET(CRYPTO_LIBRARY CACHE)
+
+      MESSAGE(SEND_ERROR
+        "Cannot find appropriate system libraries for SSL. "
+        "Make sure you've specified a supported SSL version. "
+        "Consult the documentation for WITH_SSL alternatives")
     ENDIF()
   ELSE()
     MESSAGE(SEND_ERROR
-      "Wrong option for WITH_SSL. Valid values are: " ${WITH_SSL_DOC})
+      "Wrong option or path for WITH_SSL. "
+      "Valid options are : ${WITH_SSL_DOC}")
   ENDIF()
 ENDMACRO()
 
diff -Nru percona-xtrabackup-2.2.3/CMakeLists.txt percona-xtrabackup-2.3.7/CMakeLists.txt
--- percona-xtrabackup-2.2.3/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -19,8 +19,27 @@
  CMAKE_POLICY(VERSION 2.8)
 endif()
 
+# We use PROPERTIES LINK_INTERFACE_LIBRARIES. See cmake --help-policy CMP0022
+IF(CMAKE_VERSION VERSION_EQUAL "2.8.12" OR
+   CMAKE_VERSION VERSION_GREATER "2.8.12")
+ CMAKE_POLICY(SET CMP0022 OLD)
+ENDIF()
+
+# We use the LOCATION target property (CMP0026)
+# and get_target_property() for non-existent targets (CMP0045)
+# and INSTALL_NAME_DIR (CMP0042)
+IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
+   CMAKE_VERSION VERSION_GREATER "3.0.0")
+ CMAKE_POLICY(SET CMP0026 OLD)
+ CMAKE_POLICY(SET CMP0045 OLD)
+ CMAKE_POLICY(SET CMP0042 OLD)
+ENDIF()
+
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
+# Will set GIT_EXECUTABLE and GIT_FOUND
+FIND_PACKAGE(Git)
+
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # First, decide about build type (debug or release)
@@ -60,15 +79,8 @@
  "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
  CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel")
 
-# Possibly temporary fix: Clang on 32 bit causes non-debug server to crash
-IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
-  SET(CMAKE_CXX_COMPILER g++)
-ENDIF()
-
 IF(WITH_DEBUG)
   SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)
-  SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL
-      "MySQL maintainer-specific development environment")
   IF(UNIX AND NOT APPLE)
     # Compiling with PIC speeds up embedded build, on PIC sensitive systems 
     # Predefine it to ON, in case user chooses to build embedded. 
@@ -98,6 +110,15 @@
 ENDIF()
 PROJECT(${MYSQL_PROJECT_NAME})
 
+# Maintainer mode is default on only for Linux debug builds using GCC/G++
+IF(CMAKE_BUILD_TYPE MATCHES "Debug" OR WITH_DEBUG)
+  IF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND
+     CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
+    SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL
+        "MySQL maintainer-specific development environment")
+  ENDIF()
+ENDIF()
+
 OPTION(WITH_DEFAULT_COMPILER_OPTIONS
   "Use flags from cmake/build_configurations/compiler_options.cmake"
   ON)
@@ -154,31 +175,6 @@
   INCLUDE(${CMAKE_SOURCE_DIR}/cmake/build_configurations/feature_set.cmake)
 ENDIF()
 
-#
-# Control aspects of the development environment which are
-# specific to MySQL maintainers and developers.
-#
-INCLUDE(maintainer)
-
-OPTION(MYSQL_MAINTAINER_MODE
-       "MySQL maintainer-specific development environment" OFF)
-
-# Whether the maintainer mode compiler options should be enabled.
-IF(MYSQL_MAINTAINER_MODE)
-  IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
-    SET_MYSQL_MAINTAINER_GNU_C_OPTIONS()
-  ENDIF()
-  IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS()
-  ENDIF()
-  IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
-    SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS()
-  ENDIF()
-  IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS()
-  ENDIF()
-ENDIF()
-
 # Add macros
 INCLUDE(character_sets)
 INCLUDE(cpu_info)
@@ -207,13 +203,17 @@
 IF(UNIX)
   OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
 ENDIF()
-OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" OFF)
+IF(NOT WITHOUT_SERVER)
+  OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" OFF)
+ENDIF()
 MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED)
 
 OPTION(WITH_XTRABACKUP "Build XtraBackup" ON)
 # Disallow WITH_XTRABACKUP=OFF builds
 IF(NOT WITH_XTRABACKUP)
   MESSAGE(FATAL_ERROR "This branch does not support -DWITH_XTRABACKUP=OFF configuration.")
+ELSE()
+  ADD_DEFINITIONS(-DXTRABACKUP)
 ENDIF()
 # Disallow WITHOUT_SERVER=ON builds
 IF(WITHOUT_SERVER)
@@ -433,30 +433,22 @@
 # Why doesn't these flags affect the entire build?
 # Because things may already have been included with ADD_SUBDIRECTORY
 #
-IF(MYSQL_MAINTAINER_MODE)
-  # Set compiler flags required under maintainer mode.
-  MESSAGE(STATUS "C warning options: ${MY_MAINTAINER_C_WARNINGS}")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_MAINTAINER_C_WARNINGS}")
-  MESSAGE(STATUS "C++ warning options: ${MY_MAINTAINER_CXX_WARNINGS}")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_MAINTAINER_CXX_WARNINGS}")
-ENDIF()
+OPTION(MYSQL_MAINTAINER_MODE
+       "MySQL maintainer-specific development environment" OFF)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-  STRING(REGEX MATCH "-Werror"
-    BUILD_WITH_WERROR ${CMAKE_CXX_FLAGS})
-  IF(BUILD_WITH_WERROR)
-    SET("COMPILE_FLAG_WERROR" 1)
-  ENDIF()
-ENDIF()
+INCLUDE(maintainer)
 
 IF(WITH_UNIT_TESTS)
  ENABLE_TESTING()
 ENDIF()
 
 IF(NOT WITHOUT_SERVER)
-SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
- # Add storage engines and plugins.
- CONFIGURE_PLUGINS()
+  SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
+  # Add storage engines and plugins.
+  CONFIGURE_PLUGINS()
+ELSE()
+  # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
+  ADD_SUBDIRECTORY(storage/ndb)
 ENDIF()
 
 ADD_SUBDIRECTORY(include)
@@ -477,21 +469,21 @@
   IF(WIN32)
     ADD_DEFINITIONS( /D _VARIADIC_MAX=10 )
   ENDIF()
+  # libc++ doesn't have tuple in tr1
+  IF(HAVE_LLVM_LIBCPP)
+    ADD_DEFINITIONS(-DGTEST_USE_OWN_TR1_TUPLE=1)
+  ENDIF()
   ADD_SUBDIRECTORY(unittest/gunit)
 ENDIF()
 
+ADD_SUBDIRECTORY(sql/share)
 ADD_SUBDIRECTORY(extra)
 IF(NOT WITHOUT_SERVER)
   ADD_SUBDIRECTORY(sql)
-  ADD_SUBDIRECTORY(sql/share)
   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
   IF(WITH_EMBEDDED_SERVER) 
    ADD_SUBDIRECTORY(libmysqld)
   ENDIF(WITH_EMBEDDED_SERVER)
-
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-    ADD_SUBDIRECTORY(internal)
-  ENDIF()
 ENDIF()
 
 INCLUDE(cmake/abi_check.cmake)
@@ -504,13 +496,14 @@
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
     ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)
 CONFIGURE_FILE(
-    ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
+    ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
+    ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
 
 # Handle the "INFO_*" files.
 INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
 # Source: This can be done during the cmake phase, all information is
 # available, but should be repeated on each "make" just in case someone
-# does "cmake ; make ; bzr pull ; make".
+# does "cmake ; make ; git pull ; make".
 CREATE_INFO_SRC(${CMAKE_BINARY_DIR}/Docs)
 ADD_CUSTOM_TARGET(INFO_SRC ALL
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_src.cmake
@@ -540,3 +533,37 @@
 ENDIF()
 
 INCLUDE(CPack)
+
+# C compiler flags consist of:
+# CPPFLAGS        Taken from environment, see above.
+# ADD_DEFINITIONS In each individual CMakeLists.txt
+# CMAKE_C_FLAGS   From command line.
+#                 We extend these in maintainer.cmake
+# ENV{CFLAGS}     From environment, but environment is ignored if
+#                 CMAKE_C_FLAGS is also given on command line
+# CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}
+#                 We extend these in compiler_options.cmake
+#
+# Note that CMakeCache.txt contains cmake builtins for these variables,
+# *not* the values that will actually be used:
+
+IF(CMAKE_GENERATOR MATCHES "Makefiles")
+  MESSAGE(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+ENDIF()
+GET_PROPERTY(cwd_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+MESSAGE(STATUS "COMPILE_DEFINITIONS: ${cwd_definitions}")
+MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
+MESSAGE(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+IF(CMAKE_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Makefiles")
+  STRING(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKEBT)
+  MESSAGE(STATUS "CMAKE_C_FLAGS_${CMAKEBT}: ${CMAKE_C_FLAGS_${CMAKEBT}}")
+  MESSAGE(STATUS "CMAKE_CXX_FLAGS_${CMAKEBT}: ${CMAKE_CXX_FLAGS_${CMAKEBT}}")
+ENDIF()
+IF(NOT CMAKE_GENERATOR MATCHES "Makefiles")
+  MESSAGE(STATUS "CMAKE_C_FLAGS_DEBUG: ${CMAKE_C_FLAGS_DEBUG}")
+  MESSAGE(STATUS "CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}")
+  MESSAGE(STATUS
+    "CMAKE_C_FLAGS_RELWITHDEBINFO: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  MESSAGE(STATUS
+    "CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+ENDIF()
diff -Nru percona-xtrabackup-2.2.3/config.h.cmake percona-xtrabackup-2.3.7/config.h.cmake
--- percona-xtrabackup-2.2.3/config.h.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/config.h.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2014, 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
@@ -19,6 +19,7 @@
 /* Headers we may want to use. */
 #cmakedefine STDC_HEADERS 1
 #cmakedefine _GNU_SOURCE 1
+#cmakedefine HAVE_LLVM_LIBCPP 1
 #cmakedefine HAVE_ALLOCA_H 1
 #cmakedefine HAVE_AIO_H 1
 #cmakedefine HAVE_ARPA_INET_H 1
@@ -30,7 +31,6 @@
 #cmakedefine HAVE_CXXABI_H 1
 #cmakedefine HAVE_NCURSES_H 1
 #cmakedefine HAVE_NDIR_H 1
-#cmakedefine HAVE_DIRENT_H 1
 #cmakedefine HAVE_DLFCN_H 1
 #cmakedefine HAVE_EXECINFO_H 1
 #cmakedefine HAVE_FCNTL_H 1
@@ -187,7 +187,6 @@
 #cmakedefine HAVE_LSTAT 1
 #cmakedefine HAVE_MEMALIGN 1
 /* #cmakedefine HAVE_MLOCK 1 see Bug#54662 */
-#cmakedefine HAVE_NPTL 1
 #cmakedefine HAVE_NL_LANGINFO 1
 #cmakedefine HAVE_MADVISE 1
 #cmakedefine HAVE_DECL_MADVISE 1
@@ -233,7 +232,6 @@
 #cmakedefine HAVE_PUTENV 1
 #cmakedefine HAVE_RE_COMP 1
 #cmakedefine HAVE_REGCOMP 1
-#cmakedefine HAVE_READDIR_R 1
 #cmakedefine HAVE_READLINK 1
 #cmakedefine HAVE_REALPATH 1
 #cmakedefine HAVE_RENAME 1
diff -Nru percona-xtrabackup-2.2.3/configure.cmake percona-xtrabackup-2.3.7/configure.cmake
--- percona-xtrabackup-2.2.3/configure.cmake	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/configure.cmake	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -21,6 +21,7 @@
 INCLUDE (CheckFunctionExists)
 INCLUDE (CheckCCompilerFlag)
 INCLUDE (CheckCSourceRuns)
+INCLUDE (CheckCXXSourceRuns)
 INCLUDE (CheckSymbolExists)
 
 
@@ -57,40 +58,39 @@
 # other threads.
 SET(SIGNAL_WITH_VIO_SHUTDOWN 1)
 
-# Always enable -Wall for gnu C/C++
-# Remember to strip off these in scripts/CMakeLists.txt
-IF(CMAKE_COMPILER_IS_GNUCXX)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter")
-ENDIF()
-IF(CMAKE_COMPILER_IS_GNUCC)
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-ENDIF()
-
-# Remember to strip off these in scripts/CMakeLists.txt
-IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  SET(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -Wall -Wno-null-conversion -Wno-unused-private-field")
-ENDIF()
-IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-  SET(CMAKE_C_FLAGS
-    "${CMAKE_C_FLAGS} -Wall -Wno-null-conversion -Wno-unused-private-field")
-ENDIF()
-
 # The default C++ library for SunPro is really old, and not standards compliant.
-# http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html
+# http://www.oracle.com/technetwork/server-storage/solaris10/cmp-stlport-libcstd-142559.html
 # Use stlport rather than Rogue Wave.
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
   IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
-    SET(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -library=stlport4")
+    IF(SUNPRO_CXX_LIBRARY)
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=${SUNPRO_CXX_LIBRARY}")
+    ELSE()
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
+    ENDIF()
   ENDIF()
 ENDIF()
 
+# Check to see if we are using LLVM's libc++ rather than e.g. libstd++
+# Can then check HAVE_LLBM_LIBCPP later without including e.g. ciso646.
+CHECK_CXX_SOURCE_RUNS("
+#include <ciso646>
+int main()
+{
+#ifdef _LIBCPP_VERSION
+  return 0;
+#else
+  return 1;
+#endif
+}" HAVE_LLVM_LIBCPP)
+
 MACRO(DIRNAME IN OUT)
   GET_FILENAME_COMPONENT(${OUT} ${IN} PATH)
 ENDMACRO()
 
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
+   CMAKE_C_COMPILER_ID MATCHES "SunPro" AND
+   CMAKE_CXX_FLAGS MATCHES "stlport4")
   DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
   SET(STLPORT_SUFFIX "lib/stlport4")
   IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
@@ -245,6 +245,7 @@
 # Tests for header files
 #
 INCLUDE (CheckIncludeFiles)
+INCLUDE (CheckIncludeFileCXX)
 
 CHECK_INCLUDE_FILES ("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
 CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
@@ -252,8 +253,7 @@
 CHECK_INCLUDE_FILES (aio.h HAVE_AIO_H)
 CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H)
-CHECK_INCLUDE_FILES (cxxabi.h HAVE_CXXABI_H)
-CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
+CHECK_INCLUDE_FILE_CXX (cxxabi.h HAVE_CXXABI_H)
 CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
 CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILES (fcntl.h HAVE_FCNTL_H)
@@ -474,7 +474,6 @@
 CHECK_FUNCTION_EXISTS (pthread_threadmask HAVE_PTHREAD_THREADMASK)
 CHECK_FUNCTION_EXISTS (pthread_yield_np HAVE_PTHREAD_YIELD_NP)
 CHECK_FUNCTION_EXISTS (putenv HAVE_PUTENV)
-CHECK_FUNCTION_EXISTS (readdir_r HAVE_READDIR_R)
 CHECK_FUNCTION_EXISTS (readlink HAVE_READLINK)
 CHECK_FUNCTION_EXISTS (re_comp HAVE_RE_COMP)
 CHECK_FUNCTION_EXISTS (regcomp HAVE_REGCOMP)
diff -Nru percona-xtrabackup-2.2.3/debian/changelog percona-xtrabackup-2.3.7/debian/changelog
--- percona-xtrabackup-2.2.3/debian/changelog	2016-05-20 03:42:55.000000000 +0000
+++ percona-xtrabackup-2.3.7/debian/changelog	2017-03-06 16:27:42.000000000 +0000
@@ -1,3 +1,15 @@
+percona-xtrabackup (2.3.7-0ubuntu0.16.04.1) xenial-security; urgency=medium
+
+  * SECURITY UPDATE: Update to 2.3.7 to fix security issue and to
+    support update of percona-xtradb-cluster-5.6 to 5.6.34-26.19
+    (LP: #1668934):
+    - CVE-2016-6225
+  * Updates for new release:
+    - d/control: Add new BD's on libcurl4-openssl-dev, libev-dev,
+      python-docutils, python-sphinx and vim-common.
+
+ -- James Page <james.page@ubuntu.com>  Mon, 06 Mar 2017 10:42:42 +0000
+
 percona-xtrabackup (2.2.3-2.1build1.1) xenial; urgency=medium
 
   * Recompile to resolve miscompilation on s390x architecture. LP:
diff -Nru percona-xtrabackup-2.2.3/debian/control percona-xtrabackup-2.3.7/debian/control
--- percona-xtrabackup-2.2.3/debian/control	2014-07-23 21:53:17.000000000 +0000
+++ percona-xtrabackup-2.3.7/debian/control	2017-03-06 16:02:17.000000000 +0000
@@ -1,7 +1,8 @@
 Source: percona-xtrabackup
 Section: database
 Priority: extra
-Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org> 
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org> 
 Uploaders: George Ormond Lorch III <george.lorch@percona.com>,
            Alexey Bychko <alexey.bychko@percona.com>,
            Tomislav Plavcic <tomislav.plavcic@percona.com>
@@ -11,12 +12,17 @@
                cmake,
                debhelper (>= 7.3),
                libaio-dev,
+               libcurl4-openssl-dev,
+               libev-dev,
                libgcrypt-dev,
                libncurses-dev,
                libssl-dev,
                libtool,
                libz-dev,
-               lsb-release
+               lsb-release,
+               python-docutils,
+               python-sphinx,
+               vim-common
 Standards-Version: 3.9.5
 Homepage: http://www.percona.com/software/percona-xtrabackup
 
diff -Nru percona-xtrabackup-2.2.3/debian/gbp.conf percona-xtrabackup-2.3.7/debian/gbp.conf
--- percona-xtrabackup-2.2.3/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/debian/gbp.conf	2017-03-06 16:27:37.000000000 +0000
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch = ubuntu/xenial
+pristine-tar = True
diff -Nru percona-xtrabackup-2.2.3/Docs/INFO_SRC percona-xtrabackup-2.3.7/Docs/INFO_SRC
--- percona-xtrabackup-2.2.3/Docs/INFO_SRC	2014-07-22 17:14:03.000000000 +0000
+++ percona-xtrabackup-2.3.7/Docs/INFO_SRC	2017-02-27 07:49:21.000000000 +0000
@@ -1,8 +1,8 @@
-revision-id: george.lorch@percona.com-20140722165031-rru2w122wuri2ldn
-date: 2014-07-22 09:50:31 -0700
-build-date: 2014-07-22 13:14:03 -0400
-revno: 4983
-branch-nick: percona-xtrabackup-2.2-debian-source-for-inclusion
+commit: 40f611ffc8761b47552d04ed5bb26c49b688db51
+date: 2017-02-27 09:47:02 +0200
+build-date: 2017-02-27 07:49:21 +0000 
+short: 40f611f
+branch: HEAD
 
 
-MySQL source 5.6.17
+MySQL source 5.6.24
diff -Nru percona-xtrabackup-2.2.3/extra/charset2html.c percona-xtrabackup-2.3.7/extra/charset2html.c
--- percona-xtrabackup-2.2.3/extra/charset2html.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/charset2html.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-/* Copyright (c) 2000, 2002-2004, 2007, 2008 MySQL AB
-   Use is subject to license terms
-
-   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 Street, Fifth Floor, Boston, MA 02110-1301, USA 
- */
-
-/*
-  Written by Alexander Barkov to check what 
-  a charset is in your favorite web browser
-*/
-
-#include <my_global.h>
-#include <m_ctype.h>
-#include <my_sys.h>
-#include <mysql_version.h>
-
-#include <stdio.h>
-
-typedef struct char_info_st 
-{
-  int cod;
-  int srt;
-  int uni;
-  int low;
-  int upp;
-  int ctp;
-} MY_CH;
-
-static int chcmp(const void *vf, const void *vs)
-{
-  const MY_CH *f=vf;
-  const MY_CH *s=vs;
-  
-  return f->srt-s->srt ? f->srt-s->srt : f->uni-s->uni;
-}
-
-static void print_cs(CHARSET_INFO *cs)
-{
-  uint  i;
-  int   srt;
-  int   clr=0;
-  MY_CH ch[256];
-    
-  printf("<HTML>\n");
-  printf("<HEAD>\n");
-  printf("</HEAD>\n");
-  printf("<BODY><PRE>\n");
-  printf("Charset %s\n",cs->name);
-
-  printf("<TABLE>\n");
-  printf("<TR><TH>Code<TH>Uni<TH>Sort<TH>Ctype<TH>Ch<TH>Lo<TH>Up</TR>");
-  
-  for (i=0; i<256; i++)
-  {
-    ch[i].cod=i;
-    ch[i].srt=cs->sort_order ? cs->sort_order[i] : i;
-    ch[i].uni=cs->tab_to_uni[i];
-    ch[i].low=cs->tab_to_uni[cs->to_lower[i]];
-    ch[i].upp=cs->tab_to_uni[cs->to_upper[i]];
-    ch[i].ctp=cs->ctype[i+1];
-  }
-  
-  qsort(ch,256,sizeof(MY_CH),&chcmp);
-  srt=ch[0].srt;
-  
-  for (i=0; i<256; i++)
-  {
-    clr = (srt!=ch[i].srt) ? !clr : clr;
-    
-    printf("<TR bgcolor=#%s>",clr ? "DDDDDD" : "EEEE99");
-    printf("<TD>%02X",ch[i].cod);
-    printf("<TD>%04X",ch[i].uni);
-    printf("<TD>%02X",ch[i].srt);
-    
-    printf("<TD>%s%s%s%s%s%s%s%s",
-    		ch[i].ctp & _MY_U ? "U" : "",
-    		ch[i].ctp & _MY_L ? "L" : "",
-    		ch[i].ctp & _MY_NMR ? "N" : "",
-    		ch[i].ctp & _MY_SPC ? "S" : "",
-    		ch[i].ctp & _MY_PNT ? "P" : "",
-    		ch[i].ctp & _MY_CTR ? "C" : "",
-    		ch[i].ctp & _MY_B ? "B" : "",
-    		ch[i].ctp & _MY_X ? "X" : "");
-    
-    if ((ch[i].uni >= 0x80) && (ch[i].uni <= 0x9F))
-    {
-      /* 
-       Control characters 0x0080..0x009F are dysplayed by some
-       browers as if they were letters. Don't print them to
-       avoid confusion.
-      */
-      printf("<TD>ctrl<TD>ctrl<TD>ctrl");
-    }
-    else
-    {
-      printf("<TD>&#%d;",ch[i].uni);
-      printf("<TD>&#%d;",ch[i].low);
-      printf("<TD>&#%d;",ch[i].upp);
-    }
-    printf("</TR>\n");
-    srt=ch[i].srt;
-  }
-  printf("</TABLE>\n");
-  printf("</PRE></BODY>\n");
-  printf("</HTML>\n");
-}
-
-static void print_index()
-{
-  CHARSET_INFO **cs;
-  int clr=0; 
-  
-  get_charset_by_name("",MYF(0));	/* To execute init_available_charsets */
-  
-  printf("All charsets\n");
-  printf("<table border=1>\n");
-  printf("<tr bgcolor=EEEE99><th>ID<th>Charset<th>Collation<th>Def<th>Bin<th>Com<th>Comment\n");
-  for (cs=all_charsets ; cs < all_charsets+256; cs++)
-  {
-    if (!cs[0])
-      continue;
-    printf("<tr bgcolor=#%s><td><a href=\"?%s\">%d</a><td>%s<td>%s<td>%s<td>%s<td>%s<td>%s\n",
-    	   (clr= !clr) ? "DDDDDD" : "EEEE99",
-    	   cs[0]->name,cs[0]->number,cs[0]->csname,
-    	   cs[0]->name,
-    	   (cs[0]->state & MY_CS_PRIMARY)  ? "def " : "&nbsp;",
-    	   (cs[0]->state & MY_CS_BINSORT)  ? "bin " : "&nbsp;",
-    	   (cs[0]->state & MY_CS_COMPILED) ? "com " : "&nbsp;",
-    	   cs[0]->comment);
-  }
-  printf("</table>\n");
-}
-
-int main(int argc, char **argv) {
-  const char *the_set = NULL;
-  int argcnt = 1;
-  CHARSET_INFO *cs;
-
-  if (getenv("SCRIPT_NAME"))
-  {
-    printf("Content-Type: text/html\r\n\r\n");
-  }
-  my_init();
-
-  if (argc > argcnt && argv[argcnt][0] == '-' && argv[argcnt][1] == '#')
-  {
-    DBUG_PUSH(argv[argcnt++]+2);
-  }
-
-  if (argc > argcnt)
-    the_set = argv[argcnt++];
-
-  if (argc > argcnt)
-    charsets_dir = argv[argcnt++];
-
-  if (!the_set)
-  {
-    print_index();
-    return 0;
-  }
-  
-  if (!(cs= get_charset_by_name(the_set, MYF(MY_WME))))
-    return 1;
-
-  print_cs(cs);
-
-  return 0;
-}
diff -Nru percona-xtrabackup-2.2.3/extra/mysql_waitpid.c percona-xtrabackup-2.3.7/extra/mysql_waitpid.c
--- percona-xtrabackup-2.2.3/extra/mysql_waitpid.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/mysql_waitpid.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2014, 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
@@ -64,6 +64,10 @@
 
   progname= argv[0];
 
+  fprintf(stderr, 
+	  "Warning: %s is deprecated and will be removed in a future version.\n", 
+	  progname);
+
   if (handle_options(&argc, &argv, my_long_options, get_one_option))
     exit(-1);
   if (!argv[0] || !argv[1] || (pid= atoi(argv[0])) <= 0 ||
diff -Nru percona-xtrabackup-2.2.3/extra/replace.c percona-xtrabackup-2.3.7/extra/replace.c
--- percona-xtrabackup-2.2.3/extra/replace.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/replace.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -1020,7 +1020,7 @@
   updated=retain=0;
   reset_buffer();
 
-  while ((error=fill_buffer_retaining(fileno(in),retain)) > 0)
+  while ((error=fill_buffer_retaining(my_fileno(in),retain)) > 0)
   {
     end_of_line=buffer ;
     buffer[bufbytes]=0;			/* Sentinel  */
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/certs/ca-cert.pem percona-xtrabackup-2.3.7/extra/yassl/certs/ca-cert.pem
--- percona-xtrabackup-2.2.3/extra/yassl/certs/ca-cert.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/certs/ca-cert.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,45 +1,45 @@
 -----BEGIN CERTIFICATE-----
-MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
-A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
-dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
-MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
-aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
-MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
-8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
-EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
-dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
-mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
-CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
-BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
-P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
-dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
-BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
-9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
-PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
-Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
-G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
-ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
-rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==
+MIIEqjCCA5KgAwIBAgIJAJpBR82hFGKMMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
+VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8G
+A1UECgwIU2F3dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3
+dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAe
+Fw0xNDA3MTEwMzIwMDhaFw0xNzA0MDYwMzIwMDhaMIGUMQswCQYDVQQGEwJVUzEQ
+MA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8GA1UECgwIU2F3
+dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
+LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL8Myi0Ush6EQlvNOB9K8k11EPG2NZ/fyn0D
+mNOs3gNm7irx2LB9bgdUCxCYIU2AyxIg58xP3kV9yXJ3MurKkLtpUhADL6jzlcXx
+i2JWG+9nb6QQQZWtCpvjpcCw0nB2UDBbqOgILHztp6J6jTgpHKzH7fJ8lbCVgn1J
+XDjNdyXvvYB1U5Q8PcpjW58VtdMdEy8Z0TzbdjrMuH3J5cLX2kBv2CHccxtCLVOc
+/hr8fat6Nj+Y3oR8BWfOahQ4h6nxjLVoy2h/cSAr9aBj9VYvoybSt2+xWhfXOJkI
+/pNYb/7DE0kIFgunTWcAUjFnI06Y7VFFHbkE2Qvs2CizS73tNnkCAwEAAaOB/DCB
++TAdBgNVHQ4EFgQUJ45nEXTDJh0/7TNjs6TYHTDl6NUwgckGA1UdIwSBwTCBvoAU
+J45nEXTDJh0/7TNjs6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290
+aDETMBEGA1UECwwKQ29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
+MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tggkAmkFHzaEUYowwDAYD
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAeXgMbXmIkfw6FZz5J2IW8CEf
++n0/oqgyHvfyEal0FnRe3BjK8AAq1QMGJjDxR4P9Mm787apPfQxjYDEvfAy/mWaH
+7ScIhi3EM+iYIxz+o9uaSU78WkLvccM/rdxKqNKjHQmsMwR7hvNtAFmjyNvRPHP2
+DpDWXkngvzZjCHulsI81O1aMETVJBBzQ57pWxQ0KkY3Wt2IZNBJSTNJtfMU9DxiB
+VMv2POWE0tZxFewaNAvwoCF0Q8ijsN/ZZ9rirZNI+KCHvXkU4GIK3/cxLjF70TIq
+Cv5dFO/ZZFDkg5G8cA3XiI3ZvIQOxRqzv2QCTlGRpKKFFYOv8FubKElfsrMD2A==
 -----END CERTIFICATE-----
 Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            e9:d0:a7:5f:79:25:f4:3c
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
+            9a:41:47:cd:a1:14:62:8c
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Validity
-            Not Before: Oct 24 18:18:15 2011 GMT
-            Not After : Jul 20 18:18:15 2014 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
+            Not Before: Jul 11 03:20:08 2014 GMT
+            Not After : Apr  6 03:20:08 2017 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
+                Public-Key: (2048 bit)
+                Modulus:
                     00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
                     f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
                     de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
@@ -64,24 +64,24 @@
                 27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
             X509v3 Authority Key Identifier: 
                 keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=info@yassl.com
-                serial:E9:D0:A7:5F:79:25:F4:3C
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+                serial:9A:41:47:CD:A1:14:62:8C
 
             X509v3 Basic Constraints: 
                 CA:TRUE
     Signature Algorithm: sha1WithRSAEncryption
-        5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
-        4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
-        e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
-        f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
-        af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
-        98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
-        8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
-        1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
-        61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
-        1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
-        60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
-        18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
-        f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
-        b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
-        5a:1f:7f:ca
+         79:78:0c:6d:79:88:91:fc:3a:15:9c:f9:27:62:16:f0:21:1f:
+         fa:7d:3f:a2:a8:32:1e:f7:f2:11:a9:74:16:74:5e:dc:18:ca:
+         f0:00:2a:d5:03:06:26:30:f1:47:83:fd:32:6e:fc:ed:aa:4f:
+         7d:0c:63:60:31:2f:7c:0c:bf:99:66:87:ed:27:08:86:2d:c4:
+         33:e8:98:23:1c:fe:a3:db:9a:49:4e:fc:5a:42:ef:71:c3:3f:
+         ad:dc:4a:a8:d2:a3:1d:09:ac:33:04:7b:86:f3:6d:00:59:a3:
+         c8:db:d1:3c:73:f6:0e:90:d6:5e:49:e0:bf:36:63:08:7b:a5:
+         b0:8f:35:3b:56:8c:11:35:49:04:1c:d0:e7:ba:56:c5:0d:0a:
+         91:8d:d6:b7:62:19:34:12:52:4c:d2:6d:7c:c5:3d:0f:18:81:
+         54:cb:f6:3c:e5:84:d2:d6:71:15:ec:1a:34:0b:f0:a0:21:74:
+         43:c8:a3:b0:df:d9:67:da:e2:ad:93:48:f8:a0:87:bd:79:14:
+         e0:62:0a:df:f7:31:2e:31:7b:d1:32:2a:0a:fe:5d:14:ef:d9:
+         64:50:e4:83:91:bc:70:0d:d7:88:8d:d9:bc:84:0e:c5:1a:b3:
+         bf:64:02:4e:51:91:a4:a2:85:15:83:af:f0:5b:9b:28:49:5f:
+         b2:b3:03:d8
Binary files /tmp/tmpDsbHOr/KYyEySuP7r/percona-xtrabackup-2.2.3/extra/yassl/certs/client-cert.der and /tmp/tmpDsbHOr/dNxW0q5roZ/percona-xtrabackup-2.3.7/extra/yassl/certs/client-cert.der differ
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/certs/client-cert.pem percona-xtrabackup-2.3.7/extra/yassl/certs/client-cert.pem
--- percona-xtrabackup-2.2.3/extra/yassl/certs/client-cert.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/certs/client-cert.pem	2017-02-27 07:47:02.000000000 +0000
@@ -2,17 +2,17 @@
     Data:
         Version: 3 (0x2)
         Serial Number:
-            87:4a:75:be:91:66:d8:3d
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=info@yassl.com
+            b6:63:af:8f:5d:62:57:a0
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Programming, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Validity
-            Not Before: Oct 24 18:21:55 2011 GMT
-            Not After : Jul 20 18:21:55 2014 GMT
-        Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=info@yassl.com
+            Not Before: Jul 11 17:39:44 2014 GMT
+            Not After : Apr  6 17:39:44 2017 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Programming, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
+                Public-Key: (2048 bit)
+                Modulus:
                     00:c3:03:d1:2b:fe:39:a4:32:45:3b:53:c8:84:2b:
                     2a:7c:74:9a:bd:aa:2a:52:07:47:d6:a6:36:b2:07:
                     32:8e:d0:ba:69:7b:c6:c3:44:9e:d4:81:48:fd:2d:
@@ -37,51 +37,51 @@
                 33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
             X509v3 Authority Key Identifier: 
                 keyid:33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
-                DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=Programming/CN=www.yassl.com/emailAddress=info@yassl.com
-                serial:87:4A:75:BE:91:66:D8:3D
+                DirName:/C=US/ST=Montana/L=Bozeman/O=wolfSSL/OU=Programming/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+                serial:B6:63:AF:8F:5D:62:57:A0
 
             X509v3 Basic Constraints: 
                 CA:TRUE
     Signature Algorithm: sha1WithRSAEncryption
-        1c:7c:42:81:29:9e:21:cf:d0:d8:c1:54:6f:cc:ae:14:09:38:
-        ff:68:98:9a:95:53:76:18:7b:e6:30:76:ec:28:0d:75:a7:de:
-        e0:cd:8e:d5:55:23:6a:47:2b:4e:8d:fc:7d:06:a3:d8:0f:ad:
-        5e:d6:04:c9:00:33:fb:77:27:d3:b5:03:b3:7b:21:74:31:0b:
-        4a:af:2d:1a:b3:93:8e:cc:f3:5f:3d:90:3f:cc:e3:55:19:91:
-        7b:78:24:2e:4a:09:bb:18:4e:61:2d:9c:c6:0a:a0:34:91:88:
-        70:6b:3b:48:47:bc:79:94:a2:a0:4d:32:47:54:c2:a3:dc:2e:
-        d2:51:4c:29:39:11:ff:e2:15:5e:58:97:36:f6:e9:06:06:86:
-        0e:8d:9d:95:03:72:b2:8b:19:7c:e9:14:6e:a1:88:73:68:58:
-        6d:71:5e:c2:d5:d3:13:d2:5f:de:ea:03:be:e2:00:40:e5:ce:
-        fd:e6:92:31:57:c3:eb:bb:66:ac:cb:2f:1a:fa:e0:62:a2:47:
-        f4:93:43:2a:4b:6c:5e:0a:2f:f9:e7:e6:4a:63:86:b0:ac:2a:
-        a1:eb:b4:5b:67:cd:32:e4:b6:11:4b:9a:72:66:0d:a2:4a:76:
-        8f:fe:22:bc:83:fd:db:b7:d5:a9:ee:05:c9:b1:71:7e:1b:2b:
-        e1:e3:af:c0
+         85:10:90:c5:5d:de:25:8c:f2:57:7b:2d:14:1c:05:f9:71:63:
+         40:b0:e3:c1:c1:2e:13:2a:7a:b7:d6:24:58:87:eb:03:fb:0d:
+         af:e0:f4:d0:c8:bc:51:36:10:4f:79:cc:4f:66:7d:af:99:cb:
+         7b:ce:68:94:c6:36:aa:42:6e:8c:78:5b:b2:85:ca:d1:e1:a8:
+         31:d1:81:d9:f9:c1:a3:9e:34:43:ef:0a:79:7d:3e:83:61:fc:
+         14:5c:d1:dd:bc:0e:d7:51:b7:71:6e:41:7e:8b:2c:5a:9a:cb:
+         77:4b:6a:f5:06:ff:02:af:1e:e6:63:4f:bc:44:d9:3f:56:9e:
+         09:9c:43:f9:55:21:32:46:82:09:86:a9:7b:74:1c:9e:5a:2a:
+         bf:03:79:91:cb:f2:29:7f:c9:15:82:89:b9:53:cd:7e:07:90:
+         a9:5d:76:e1:19:5e:0d:58:b8:59:d5:0d:df:23:ab:6b:63:76:
+         19:9e:9c:df:b0:57:49:6c:d0:86:97:c3:6c:3c:fa:e0:56:c2:
+         1b:e3:a1:42:1a:58:62:85:9d:74:19:83:08:af:59:90:f8:99:
+         bd:67:d3:4a:ea:0e:c9:ca:61:8a:0d:8a:42:cc:90:e9:2e:c2:
+         54:73:7f:5e:af:8d:e2:32:cb:45:20:d6:19:4d:5b:77:31:cc:
+         0f:2d:c0:7e
 -----BEGIN CERTIFICATE-----
-MIIEmDCCA4CgAwIBAgIJAIdKdb6RZtg9MA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-VQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwG
-A1UEChMFeWFTU0wxFDASBgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cu
-eWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMTEw
-MjQxODIxNTVaFw0xNDA3MjAxODIxNTVaMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UE
-CBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDAS
-BgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMMD0Sv+OaQyRTtTyIQrKnx0mr2qKlIHR9amNrIHMo7Quml7xsNE
-ntSBSP0taKKLZ7uhdcg2LErSG/eLus8N+e/s8YEee5sDR5q/Zcx/ZSRppugUiVvk
-NPfFsBST9Wd7Onp44QFWVpGmE0KN0jxAnEzv0YbfN1EbDKE79fGjSjXk4c6W3xt+
-v06X0BDoqAgwga8gC0MUxXRntDKCb42GwohAmTaDuh5AciIX11JlJHOwzu8Zza7/
-eGx7wBID1E5yDVBtO6M7o5lencjZDIWz2YrZVCbbbfqsu/8lTMTRefRx04ZAGBOw
-Y7VyTjDEl4SGLVYv1xX3f8Cu9fxb5fuhutMCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
-M9hFZtdohxh+VA1wJ5HHJteFZcAwgcMGA1UdIwSBuzCBuIAUM9hFZtdohxh+VA1w
-J5HHJteFZcChgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24x
-ETAPBgNVBAcTCFBvcnRsYW5kMQ4wDAYDVQQKEwV5YVNTTDEUMBIGA1UECxMLUHJv
-Z3JhbW1pbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEW
-DmluZm9AeWFzc2wuY29tggkAh0p1vpFm2D0wDAYDVR0TBAUwAwEB/zANBgkqhkiG
-9w0BAQUFAAOCAQEAHHxCgSmeIc/Q2MFUb8yuFAk4/2iYmpVTdhh75jB27CgNdafe
-4M2O1VUjakcrTo38fQaj2A+tXtYEyQAz+3cn07UDs3shdDELSq8tGrOTjszzXz2Q
-P8zjVRmRe3gkLkoJuxhOYS2cxgqgNJGIcGs7SEe8eZSioE0yR1TCo9wu0lFMKTkR
-/+IVXliXNvbpBgaGDo2dlQNysosZfOkUbqGIc2hYbXFewtXTE9Jf3uoDvuIAQOXO
-/eaSMVfD67tmrMsvGvrgYqJH9JNDKktsXgov+efmSmOGsKwqoeu0W2fNMuS2EUua
-cmYNokp2j/4ivIP927fVqe4FybFxfhsr4eOvwA==
+MIIEqjCCA5KgAwIBAgIJALZjr49dYlegMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
+VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEQMA4G
+A1UECgwHd29sZlNTTDEUMBIGA1UECwwLUHJvZ3JhbW1pbmcxGDAWBgNVBAMMD3d3
+dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAe
+Fw0xNDA3MTExNzM5NDRaFw0xNzA0MDYxNzM5NDRaMIGUMQswCQYDVQQGEwJVUzEQ
+MA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEQMA4GA1UECgwHd29s
+ZlNTTDEUMBIGA1UECwwLUHJvZ3JhbW1pbmcxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
+LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMMD0Sv+OaQyRTtTyIQrKnx0mr2qKlIHR9am
+NrIHMo7Quml7xsNEntSBSP0taKKLZ7uhdcg2LErSG/eLus8N+e/s8YEee5sDR5q/
+Zcx/ZSRppugUiVvkNPfFsBST9Wd7Onp44QFWVpGmE0KN0jxAnEzv0YbfN1EbDKE7
+9fGjSjXk4c6W3xt+v06X0BDoqAgwga8gC0MUxXRntDKCb42GwohAmTaDuh5AciIX
+11JlJHOwzu8Zza7/eGx7wBID1E5yDVBtO6M7o5lencjZDIWz2YrZVCbbbfqsu/8l
+TMTRefRx04ZAGBOwY7VyTjDEl4SGLVYv1xX3f8Cu9fxb5fuhutMCAwEAAaOB/DCB
++TAdBgNVHQ4EFgQUM9hFZtdohxh+VA1wJ5HHJteFZcAwgckGA1UdIwSBwTCBvoAU
+M9hFZtdohxh+VA1wJ5HHJteFZcChgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRAwDgYDVQQKDAd3b2xmU1NM
+MRQwEgYDVQQLDAtQcm9ncmFtbWluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
+MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tggkAtmOvj11iV6AwDAYD
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAhRCQxV3eJYzyV3stFBwF+XFj
+QLDjwcEuEyp6t9YkWIfrA/sNr+D00Mi8UTYQT3nMT2Z9r5nLe85olMY2qkJujHhb
+soXK0eGoMdGB2fnBo540Q+8KeX0+g2H8FFzR3bwO11G3cW5BfossWprLd0tq9Qb/
+Aq8e5mNPvETZP1aeCZxD+VUhMkaCCYape3QcnloqvwN5kcvyKX/JFYKJuVPNfgeQ
+qV124RleDVi4WdUN3yOra2N2GZ6c37BXSWzQhpfDbDz64FbCG+OhQhpYYoWddBmD
+CK9ZkPiZvWfTSuoOycphig2KQsyQ6S7CVHN/Xq+N4jLLRSDWGU1bdzHMDy3Afg==
 -----END CERTIFICATE-----
Binary files /tmp/tmpDsbHOr/KYyEySuP7r/percona-xtrabackup-2.2.3/extra/yassl/certs/client-key.der and /tmp/tmpDsbHOr/dNxW0q5roZ/percona-xtrabackup-2.3.7/extra/yassl/certs/client-key.der differ
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/certs/client-keyEnc.pem percona-xtrabackup-2.3.7/extra/yassl/certs/client-keyEnc.pem
--- percona-xtrabackup-2.2.3/extra/yassl/certs/client-keyEnc.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/certs/client-keyEnc.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,30 +1,12 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-CBC,B9D8FB94E38635AB
+DEK-Info: DES-EDE3-CBC,BDE979D13CCC0ABD
 
-3OTcffWLy2Ddlu2oUwnMWkvIb3e9wLL1jrKOpC0aeb//uiawgw50+KuU4pewB5fN
-lfEJwpX4NjfPL+Nk+B1VAVrv5gwk5/SY9SwIJluutzmGS4TfVOhqi2SVd0mc9kOD
-cSWQ9ltAohFu67jdx36j2u+eghDTOjls1lM8EpzL5cu3Bp4G+ST0nXAdnGtSZdV6
-eToLWjIHiC/JqeRSsKAlG0M5verw14sbb5MO4ZQF4Tdu0fCFgFvDSUM2V4ZLtS1N
-VysLEkHoF56YKZ5H2FYLxOVDpn5lSiLnOgRbteEzsysyJ1zLxXWFFwJPCpLVNL0e
-P7OoEoCR+oAdzGkkPF+EdMoULtQP+n6U7jGx3oFVS17NORIFvyxyP0hD4pGTGLnl
-qAEk30lhKGAE5GgvA2itxZIno/sxPKr5T5Sc2yWh9RdQuLWYNrOb8Kz8J1iXV5l6
-/5TLGu5XVWIlBnUtjMFUe5M54tqGQ6SuDUlL2ud5YeLVN0T+RU/bqV2fXGoBUqKb
-Oe8PECm62Ls0wjv27BIOXXV32WSXwsywSzBqq2YXZ5zc9Q0+Mf1Zl6jKwcr8rXhv
-rA2kcpicONryggsPZnn/us1bVuWKndsCbm7A5om6HowpamNMPuxhISigzzE59L6X
-X6Sl2F0N0zhrfUVlAAlfYTrwcQVtyBDj1xp2nzJFocurJt9EylLaT0Sw3nxWtuOg
-yQuF05UPCzxqow/7dMVqtQKng0ptpsn/E+Kr/Egk1YaTpUUxref6mD3R1S+qWML8
-uqTa3y1CWd4u+aJZH2oZU3gmEd8GvuWnmhsw8iTyq1bzYIga1rQZqh4W5Ok9V+jR
-GioT/x3mTIhtuEZ1Cmhne5qM3gWYgM3rC3D4+RnUFeThOC5lHtOYHtIEpg66cs7g
-QYAn75ghEkyfG7ZvdxAU9Ngn6hckux9tFu3GmeEtdqhVOHaOMaYi60uGSk6uBnTv
-P1sUqi70kMrIBWU7TgldKlTqVdReM87Nkb2O5v1xqtoswLWIi65hFWTqt/H65c1H
-aEBG1cBqnqBMYuFk8b4TzZbuU9o1UKj0/6N5mpm//BmW65B0htEDP7IYpGF0mt0H
-LkU+4ISmuLfPfQeviYio6/yASaFkHpxfK7N8CQvmyAG9U8FHRio2QCGSb2EO+BnT
-Bti6L9oMiQbAsCLWTbvBhCVxdncFw1ncq8gkPMXjEEVUsqAo5Kg+903pRHUyHLzS
-R6R3C6tTJnNtucJ0zqQMF3K1FHS1m8GrOm+hskJLTHgZLdz6tFTYkXfZBSCwIl7s
-plg0wq9CrNC2B8MczWn/j3/h7qSI3wBNqADHMdoiOHECffCeyGEYjW3+0iMoj1m1
-wY0DIym4DDRzk6wsEesxVi8iiCVpYwWnjJAvWYECEO+hWuwCez+eGVkhCT/5g3xW
-hPSRhivNuJT05tdR5o+yqONHn1eAQH7Ar3cj+neY5WC0iS5FK9axTqbHXotofD1e
-pJX17ZVWsmIIpRvAWGD+LOcfTMZsaB9DJbkrPSWlMW3lC2S5JOq8OgfMNWIDDUN1
-guwpK5Z/lWV1qMMnaWeDVgPH/G0FssECXlCU5+/Ol654h8tm2bRXYAYHPM+OoW67
+N7yz2JV13EmQ7MZPL5wamid5+G1V1gp8FKqMemAC5JDxonS/W9oViMLUcxbfPTDx
+FznKdYSVTIQ7vv3ofmDG4MEyV/2C568N2kdtAw+jTfrZFN+IU9CI+W+In/nacirF
+02sAcvDMofustnooKNOO7/iyb5+3vRvEt5vSSRQn5WuSQ9sUKjuzoLs/lbf7fyAt
+4NeqfI3rYBZXxiUOLITOGXzGNRuFoY+o2uDCfelLAJ8uhiVG6ME3LeJEo1dT5lZ8
+CSJOLPasKg0iG4V7olM4j9FvAfZr48RRsSfUen756Jo2HpI4bad8LKhFYIdNs2Au
+WwKLmjpo6QB9hBmRshR04rEXPdrgTqLBExCE08PyaGYnWU8ggWritCeBzDQFj/n4
+sI+NO0Mymuvg98e5RpO52lg3Xnqv9RIK3guLFOmI6aEHC0PS4WwOEQ==
 -----END RSA PRIVATE KEY-----
Binary files /tmp/tmpDsbHOr/KYyEySuP7r/percona-xtrabackup-2.2.3/extra/yassl/certs/dsa1024.der and /tmp/tmpDsbHOr/dNxW0q5roZ/percona-xtrabackup-2.3.7/extra/yassl/certs/dsa1024.der differ
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/certs/dsa1024.pem percona-xtrabackup-2.3.7/extra/yassl/certs/dsa1024.pem
--- percona-xtrabackup-2.2.3/extra/yassl/certs/dsa1024.pem	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/certs/dsa1024.pem	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBvAIBAAKBgQC9Ue5KMuCKx+rG4epwxFFDzyoH4ccSwlglXsRdvqswDRK/oQvT
+NNNoWiVxTn3kvQ8qDlhWy9KjGTrqr/ttgmh56FFpe6tz4yTgCNyR9D+eGclD7lNf
+dPUc4E3SA6efopG6+ymI55bS+9xUFTG402UCrYSKT59zI2HBfuI6dltsxQIVAJHJ
+7WDQ+jBn/nmMyCQzdi+0qJx1AoGBAJJacRK36s5yGY1b6qhxWqvpoAC+SfEKylZn
+YWGYf2PM+Iwo6AgPKEw6BSsX+7Nmc4Gjyr4JWhComKi6onPamO/A2CbMM0DCxb47
+BeLBWfqWAgXVj0CODT4MQos5yugnviR/YpEgbzLxvrXr469lKWsAyB19/gFmGmQW
+cCgAwGm6AoGBAJ3LY89yHyvQ/TsQ6zlYbovjbk/ogndsMqPdNUvL4RuPTgJP/caa
+DDa0XJ7ak6A7TJ+QheLNwOXoZPYJC4EGFSDAXpYniGhbWIrVTCGe6lmZDfnx40WX
+S0kk3m/DHaC03ElLAiybxVGxyqoUfbT3Zv1JwftWMuiqHH5uADhdXuXVAhQ01VXa
+Rr8IPem35lKghVKnq/kGQw==
+-----END DSA PRIVATE KEY-----
Binary files /tmp/tmpDsbHOr/KYyEySuP7r/percona-xtrabackup-2.2.3/extra/yassl/certs/dsa512.der and /tmp/tmpDsbHOr/dNxW0q5roZ/percona-xtrabackup-2.3.7/extra/yassl/certs/dsa512.der differ
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/certs/dsa512.pem percona-xtrabackup-2.3.7/extra/yassl/certs/dsa512.pem
--- percona-xtrabackup-2.2.3/extra/yassl/certs/dsa512.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/certs/dsa512.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIH3AgEAAkEAmSlpgMk8mGhFqYL+Z+uViMW0DNYmRZUZLKAgW37faencww/zYQol
-m/IhAWrNqow358pm21b0D3160Ri5Qv0bEQIVAK0lKasKnwkcwa0DIHZ/prfdTQMJ
-AkASiJna59ALk5vm7jwhf5yztI2ljOI3gD8X0YFPvfBxtjIIVN2/AeKzdwZkdYoE
-1nk5sQIDA8YGdOWQBQoQRhkxAkAEhKAmMXIM6E9dUxdisYDKwBZfwx7qxdmYOPm+
-VlNHaM4IIlccuw13kc9bNu3zJIKQis2QfNt3+Rctc3Pvu7mCAhQjg+e+aqykxwwc
-E2V27tjDFY02uA==
------END DSA PRIVATE KEY-----
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/certs/server-cert.pem percona-xtrabackup-2.3.7/extra/yassl/certs/server-cert.pem
--- percona-xtrabackup-2.2.3/extra/yassl/certs/server-cert.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/certs/server-cert.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,17 +1,17 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
-        Serial Number: 2 (0x2)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Validity
-            Not Before: Oct 24 18:27:13 2011 GMT
-            Not After : Jul 20 18:27:13 2014 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=Support, CN=www.yassl.com/emailAddress=info@yassl.com
+            Not Before: Jul 11 17:20:14 2014 GMT
+            Not After : Apr  6 17:20:14 2017 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Support, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
+                Public-Key: (2048 bit)
+                Modulus:
                     00:c0:95:08:e1:57:41:f2:71:6d:b7:d2:45:41:27:
                     01:65:c6:45:ae:f2:bc:24:30:b8:95:ce:2f:4e:d6:
                     f6:1c:88:bc:7c:9f:fb:a8:67:7f:fe:5c:9c:51:75:
@@ -31,59 +31,74 @@
                     a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
                     ad:d7
                 Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
+            X509v3 Authority Key Identifier: 
+                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+                serial:9A:41:47:CD:A1:14:62:8C
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
     Signature Algorithm: sha1WithRSAEncryption
-        71:4e:d3:62:df:cc:4c:f7:cd:b7:6e:52:0b:6c:6e:e0:bd:c2:
-        2d:07:d7:c0:b0:6e:43:1e:35:bc:30:01:50:f0:ff:99:23:6c:
-        18:1a:41:b6:11:d6:d4:19:61:fd:e4:77:97:1c:39:e1:57:ab:
-        c5:15:63:77:11:36:5e:74:e2:24:0b:1f:41:78:ad:b7:81:e7:
-        b4:40:66:80:f0:4b:91:a0:6d:a8:6e:3d:53:d9:8b:ce:2a:e1:
-        0b:45:65:87:a1:96:ae:ee:3e:88:d5:12:1f:78:17:ae:2c:c5:
-        73:44:d8:dc:f4:af:d8:cc:ae:4c:e1:0c:be:55:a4:99:f7:6e:
-        96:c0:c8:45:87:bf:dc:51:57:ff:9e:73:37:6a:18:9c:c3:f9:
-        22:7a:f4:b0:52:bd:fc:21:30:f8:c5:ff:1e:87:7d:ad:a2:5a:
-        35:f5:22:a8:b4:0a:76:38:e6:76:b0:98:af:1b:ec:8a:0a:43:
-        74:d2:85:34:37:84:07:e1:f6:23:b2:29:de:a6:b6:b7:4c:57:
-        7e:96:06:cb:a9:16:25:29:3a:03:2d:55:7d:a6:8c:a4:f7:9e:
-        81:c9:95:b6:7c:c1:4a:ce:94:66:0c:ca:88:eb:d2:09:f5:5b:
-        19:58:82:df:27:fd:67:95:78:b7:02:06:d5:a7:61:bd:ef:3a:
-        fc:b2:61:cd
+         3d:8c:70:05:5b:62:4b:bf:6c:b6:48:61:01:10:1d:5e:05:ba:
+         55:94:2c:ae:59:6f:97:80:5d:6c:86:ec:9a:eb:15:45:44:e4:
+         56:f8:75:ca:8a:45:32:f4:c7:e1:fa:f2:98:1c:91:d3:3f:e8:
+         0e:c9:1b:fa:e1:79:99:67:0e:0d:6b:8a:ec:1a:2c:59:c4:34:
+         04:8d:39:77:cd:b5:e9:60:5b:82:bf:34:ce:ed:c6:4f:3f:b4:
+         5c:4d:8a:b4:f4:0a:04:12:a0:56:c1:e1:33:37:a1:54:87:48:
+         e9:81:c2:0f:8f:6f:d3:52:4c:4c:32:4c:6b:9f:3a:04:8f:77:
+         5d:ad:dc:3d:2b:f2:c9:df:3c:60:5d:d8:fc:86:72:7c:3d:d0:
+         84:4b:8c:df:26:43:fe:c0:cc:5b:e1:36:b3:3d:32:28:a3:ef:
+         0c:20:d6:b1:50:39:d6:67:a9:8b:84:bc:92:34:eb:19:23:e8:
+         10:8f:ea:bd:18:8c:93:27:3c:74:75:8e:58:04:fa:2a:74:44:
+         7d:fc:4d:39:df:54:17:ba:78:e1:5d:6a:70:d3:7c:a2:80:81:
+         e6:19:51:91:c3:44:51:ec:bb:88:a9:53:e1:d7:a9:8c:28:f4:
+         21:1c:42:51:09:b4:12:6d:a0:d6:25:09:85:c6:2a:0c:af:a7:
+         58:e6:52:8b
 -----BEGIN CERTIFICATE-----
-MIIDkDCCAngCAQIwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
-aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
-MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTExMDI0MTgyNzEzWhcN
-MTQwNzIwMTgyNzEzWjCBijELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmEx
-EDAOBgNVBAcTB0JvemVtYW4xDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwdTdXBw
-b3J0MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZv
-QHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFX
-QfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hnf/5cnFF194rKB+c1L4/h
-vXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/XGQ0lT+FjY1GLC2Q/rUO4
-pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo
-3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4
-D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHm
-YYPF0pbf2dBPrdcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU7TYt/MTPfNt25S
-C2xu4L3CLQfXwLBuQx41vDABUPD/mSNsGBpBthHW1Blh/eR3lxw54VerxRVjdxE2
-XnTiJAsfQXitt4HntEBmgPBLkaBtqG49U9mLzirhC0Vlh6GWru4+iNUSH3gXrizF
-c0TY3PSv2MyuTOEMvlWkmfdulsDIRYe/3FFX/55zN2oYnMP5Inr0sFK9/CEw+MX/
-Hod9raJaNfUiqLQKdjjmdrCYrxvsigpDdNKFNDeEB+H2I7Ip3qa2t0xXfpYGy6kW
-JSk6Ay1VfaaMpPeegcmVtnzBSs6UZgzKiOvSCfVbGViC3yf9Z5V4twIG1adhve86
-/LJhzQ==
+MIIEnjCCA4agAwIBAgIBATANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xETAPBgNVBAoMCFNh
+d3Rvb3RoMRMwEQYDVQQLDApDb25zdWx0aW5nMRgwFgYDVQQDDA93d3cud29sZnNz
+bC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMTQwNzEx
+MTcyMDE0WhcNMTcwNDA2MTcyMDE0WjCBkDELMAkGA1UEBhMCVVMxEDAOBgNVBAgM
+B01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xEDAOBgNVBAoMB3dvbGZTU0wxEDAO
+BgNVBAsMB1N1cHBvcnQxGDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqG
+SIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMCVCOFXQfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hn
+f/5cnFF194rKB+c1L4/hvXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/X
+GQ0lT+FjY1GLC2Q/rUO4pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bM
+QLRpo0YzaYduxLsXpvPo3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq
+0KGWSrzh1Bpbx6DAwWN4D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ
+6dgIvDMgs1gip6rrxOHmYYPF0pbf2dBPrdcCAwEAAaOB/DCB+TAdBgNVHQ4EFgQU
+sxEyyZKYhOLJ+NA7bgNCyh8OjjwwgckGA1UdIwSBwTCBvoAUJ45nEXTDJh0/7TNj
+s6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5h
+MRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290aDETMBEGA1UECwwK
+Q29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29tMR8wHQYJKoZIhvcN
+AQkBFhBpbmZvQHdvbGZzc2wuY29tggkAmkFHzaEUYowwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAPYxwBVtiS79stkhhARAdXgW6VZQsrllvl4BdbIbs
+musVRUTkVvh1yopFMvTH4frymByR0z/oDskb+uF5mWcODWuK7BosWcQ0BI05d821
+6WBbgr80zu3GTz+0XE2KtPQKBBKgVsHhMzehVIdI6YHCD49v01JMTDJMa586BI93
+Xa3cPSvyyd88YF3Y/IZyfD3QhEuM3yZD/sDMW+E2sz0yKKPvDCDWsVA51mepi4S8
+kjTrGSPoEI/qvRiMkyc8dHWOWAT6KnREffxNOd9UF7p44V1qcNN8ooCB5hlRkcNE
+Uey7iKlT4depjCj0IRxCUQm0Em2g1iUJhcYqDK+nWOZSiw==
 -----END CERTIFICATE-----
 Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            e9:d0:a7:5f:79:25:f4:3c
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
+            9a:41:47:cd:a1:14:62:8c
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Validity
-            Not Before: Oct 24 18:18:15 2011 GMT
-            Not After : Jul 20 18:18:15 2014 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
+            Not Before: Jul 11 03:20:08 2014 GMT
+            Not After : Apr  6 03:20:08 2017 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
+                Public-Key: (2048 bit)
+                Modulus:
                     00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
                     f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
                     de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
@@ -104,54 +119,55 @@
                     36:79
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
-            X509v3 Subject Key Identifier:
+            X509v3 Subject Key Identifier: 
                 27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-            X509v3 Authority Key Identifier:
+            X509v3 Authority Key Identifier: 
                 keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=info@yassl.com
-                serial:E9:D0:A7:5F:79:25:F4:3C
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+                serial:9A:41:47:CD:A1:14:62:8C
 
-            X509v3 Basic Constraints:
+            X509v3 Basic Constraints: 
                 CA:TRUE
     Signature Algorithm: sha1WithRSAEncryption
-        5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
-        4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
-        e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
-        f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
-        af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
-        98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
-        8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
-        1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
-        61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
-        1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
-        60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
-        18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
-        f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
-        b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
-        5a:1f:7f:ca
+         79:78:0c:6d:79:88:91:fc:3a:15:9c:f9:27:62:16:f0:21:1f:
+         fa:7d:3f:a2:a8:32:1e:f7:f2:11:a9:74:16:74:5e:dc:18:ca:
+         f0:00:2a:d5:03:06:26:30:f1:47:83:fd:32:6e:fc:ed:aa:4f:
+         7d:0c:63:60:31:2f:7c:0c:bf:99:66:87:ed:27:08:86:2d:c4:
+         33:e8:98:23:1c:fe:a3:db:9a:49:4e:fc:5a:42:ef:71:c3:3f:
+         ad:dc:4a:a8:d2:a3:1d:09:ac:33:04:7b:86:f3:6d:00:59:a3:
+         c8:db:d1:3c:73:f6:0e:90:d6:5e:49:e0:bf:36:63:08:7b:a5:
+         b0:8f:35:3b:56:8c:11:35:49:04:1c:d0:e7:ba:56:c5:0d:0a:
+         91:8d:d6:b7:62:19:34:12:52:4c:d2:6d:7c:c5:3d:0f:18:81:
+         54:cb:f6:3c:e5:84:d2:d6:71:15:ec:1a:34:0b:f0:a0:21:74:
+         43:c8:a3:b0:df:d9:67:da:e2:ad:93:48:f8:a0:87:bd:79:14:
+         e0:62:0a:df:f7:31:2e:31:7b:d1:32:2a:0a:fe:5d:14:ef:d9:
+         64:50:e4:83:91:bc:70:0d:d7:88:8d:d9:bc:84:0e:c5:1a:b3:
+         bf:64:02:4e:51:91:a4:a2:85:15:83:af:f0:5b:9b:28:49:5f:
+         b2:b3:03:d8
 -----BEGIN CERTIFICATE-----
-MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
-A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
-dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
-MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
-aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
-MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
-8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
-EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
-dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
-mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
-CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
-BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
-P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
-dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
-BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
-9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
-PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
-Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
-G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
-ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
-rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==
+MIIEqjCCA5KgAwIBAgIJAJpBR82hFGKMMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
+VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8G
+A1UECgwIU2F3dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3
+dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAe
+Fw0xNDA3MTEwMzIwMDhaFw0xNzA0MDYwMzIwMDhaMIGUMQswCQYDVQQGEwJVUzEQ
+MA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8GA1UECgwIU2F3
+dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
+LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL8Myi0Ush6EQlvNOB9K8k11EPG2NZ/fyn0D
+mNOs3gNm7irx2LB9bgdUCxCYIU2AyxIg58xP3kV9yXJ3MurKkLtpUhADL6jzlcXx
+i2JWG+9nb6QQQZWtCpvjpcCw0nB2UDBbqOgILHztp6J6jTgpHKzH7fJ8lbCVgn1J
+XDjNdyXvvYB1U5Q8PcpjW58VtdMdEy8Z0TzbdjrMuH3J5cLX2kBv2CHccxtCLVOc
+/hr8fat6Nj+Y3oR8BWfOahQ4h6nxjLVoy2h/cSAr9aBj9VYvoybSt2+xWhfXOJkI
+/pNYb/7DE0kIFgunTWcAUjFnI06Y7VFFHbkE2Qvs2CizS73tNnkCAwEAAaOB/DCB
++TAdBgNVHQ4EFgQUJ45nEXTDJh0/7TNjs6TYHTDl6NUwgckGA1UdIwSBwTCBvoAU
+J45nEXTDJh0/7TNjs6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290
+aDETMBEGA1UECwwKQ29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
+MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tggkAmkFHzaEUYowwDAYD
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAeXgMbXmIkfw6FZz5J2IW8CEf
++n0/oqgyHvfyEal0FnRe3BjK8AAq1QMGJjDxR4P9Mm787apPfQxjYDEvfAy/mWaH
+7ScIhi3EM+iYIxz+o9uaSU78WkLvccM/rdxKqNKjHQmsMwR7hvNtAFmjyNvRPHP2
+DpDWXkngvzZjCHulsI81O1aMETVJBBzQ57pWxQ0KkY3Wt2IZNBJSTNJtfMU9DxiB
+VMv2POWE0tZxFewaNAvwoCF0Q8ijsN/ZZ9rirZNI+KCHvXkU4GIK3/cxLjF70TIq
+Cv5dFO/ZZFDkg5G8cA3XiI3ZvIQOxRqzv2QCTlGRpKKFFYOv8FubKElfsrMD2A==
+-----END CERTIFICATE-----
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/certs/server-keyEnc.pem percona-xtrabackup-2.3.7/extra/yassl/certs/server-keyEnc.pem
--- percona-xtrabackup-2.2.3/extra/yassl/certs/server-keyEnc.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/certs/server-keyEnc.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-CBC,08132C1FFF5BC8CC
+DEK-Info: DES-CBC,136C7D8A69656668
 
-W+krChiFlNU+koE0Bep+U45OG4V4IFZv67ex6yJHgcsPd+HQ692A/h+5dYc8rdlW
-2LDgSODHHIMTt6RVJDxXxXs3qFmJQbnVXeXxV209X8EfaRarh+yiMKeUP6K8hIvj
-+IYRma6iKOs+d4KlcZZudGs2f/x8nhxXbmQtrLhGd4h91mnJk2sKmiz7UkUy6Qng
-gOHnT2dfF4Qk2ZYsjisRHjpWZiqh40GO1LuTgUjZoH+LGhMwMwOAE6+ss5xa+yE+
-Xd9Yljm0/QW68JILkCJQjLDRvPGxDJyvYq6TT/kSElsRlI/AuRrZH1YVD3hn/xjx
-tDoEB+JEbH6iu9ne2srxnGSKLzoUbb4XPaCjLIW9BJf7oANmmFQpZZQiRTyIUVWi
-IE5hJciqF7ra7IwfZAW/PeWGXpzNOVN9QAvyAMsmvUCzJdxd1ySUatjhZ+mSFYGk
-rDVtyrgt4ZQgV0EdJV0Yn1ZWMOk1qEKXT0JAnI+9S6Y+QEdwXmdz3xlVuq61Jvub
-iJUVepnD/1QeFfWy8JwlscWpWFrkr569f3SNG+FGb6fufnUP7K6sX3urj+pj1QET
-f9NmmvLBsVsbj1Egg3wnxbVHIUPky64LY04wtNJaAwhuG6mKCvaClKYMTmTCyrzP
-aRwghhMQ3yHUbo2A1ZppYsXXg8lX30eW+5O77N9Q3xfP0phODHXsnXhBH09ml1JQ
-MmiCaL5n6sIVcjtFmN/kyaEuz/1VrBSaDCPeW88n61UXUidXrGOZN/2c/2xFir8B
-2rdE82lQLl07SJxzQQ6aJVvrc5tnbV/ENDySS5dG6Yl/w89/nuu0RFHmAweKqfGC
-8m0XOkmonIk6h3YT7XrkE0b/2jkf1mMaMKrGGfRmxqNt1nGxMCJHAO/Sn9v+I9rU
-W7HCZ04RTnRp1BXcqDxdwlveDKJRVfiKOSSEOpEXXlexS5R1vikmxrCwK5YVUTkT
-3tgahVtHJkFHnBHBzXyHUDwWahxZaU9TO43z0JFxs0zINWUWppldf0oyWjP1FSrI
-a9tXBs7aoykUY9Av9K0p4UJJU005qzD/tuegZFX34wRETJO0BJnlZHTTZSqLSVX+
-KZg4nPq8Xii1VHta3tgw7up2z1tpepsBerTsRQ1+IDpxLaIxgt9am0hXVTiMLex/
-DD9UvQC/eBUmpmWraK/Mqeq/UrPl+lmeoXsG6LWIvEp9d19rJ/3OhIJf2pDh9dC8
-NzJoNP9qOrDajAwzeeF5dbQxCaG+X8am9s4wryC0p+NrQ0tzv8efey0zBodDIOgo
-F1G7+ADgHy+V565q8sdL52xx0xB9Ty5p9IOfOUbxa3K65TJf/I/QAQjl4LyTbkfr
-kzpYAG2uF55EB3Eq3aMrj47pzZy0ELXXN2qYJ9Oelgl+h6MzYbmd+Wm+A2Cofv3u
-7ANAyjAYN7/Lo3lTFAt7sXAXGKnqw62JNSSMkIqZVrG5dn7Jxj5AJCVyYxTrm6Y+
-DDcblX47XrWxVoVJN/dLJZ8FzWs4o/8w9Yn8U54Ci7F0g+j2f+OpDy9PGFYT9pKw
-xWG8chkYE6QPilEYvdi26ZnZ3u236q9PMtyRP87NmBN2sLkj/rbBTzBxWIaGS+Mt
+jvNTyPaztxPIoAzbdmZnD0Zw2+60tMxNc0GMHNmeOyG25aHP/dT+TWiKFpFVkkkY
+uoCIhYUyw7gmpw+CnRJwWd+ans4nrvAjwy5oWJvarvsyUpjqvnPoIlAqd+d4TDKN
+eESzcI76+gHdisAtCrQD+fGqgTZhli5TgDbnpasL/QnY2qDlutvakkVw7gPXe156
+2Phy8WN+efr65J6wt3K/dj7Datl9u4JeHQK81gYyWBVX+EagEjPGDzkFQCj9Z0q7
+8K3iB5GW1JAqJS0IfZPB40AnSTF/n1TL1SN3qfU3l7hTGNrx9o7580bgDEoAR7pI
+F8eZlS15KHtZmh11AnU1KTKZ6kmgnNqeMTGMN6N0ct2wMKW1dV87eTDlF0oiR2ol
+XwtFgKmrIjfpmzkdWjbJmWnGMjD56KdiFZga/ZyKMsPrVoYLgfJEpn36iQspfygx
+HCGNTf0PjIsjEWU0WyQiF86t+c45W3wNFsv/AxVyfMl+su02yrd6u2ecuQDir3Cs
+b2k8IKtQgVe/NIpEWLKuiHG5oedIPPQyDYK5uq+gHxCGeOoKnWlsWFEHZRiza4X5
+tbgTrJB8Sw0ENWrvVGGmQZN4pSImlsMwzQ2qik5CQ00N1b3+56/obn0z75I3bUSb
+tC5g8DRjl6oclAenNgh/MYMT287y5W2dD4npxHcekX4O3J2CDXNfg4vV2j5GRxtg
+LVJdYE2p7bpYePCDHrYng8b9ubBprx0CrEnkIvvtUjzNPf6VDL0+MBKl+XgR2/nz
+iRqTuZnlGGOyM+KYDwXpgwfs/HfvFGksxTAlO/40GkGh+WGPaIoNyCK0SgQKhyb4
+JIkR0vd2/yLg3lWMJrGwh7A0Gm07Z/781oURP3uWd+PaCOgGcd5ipcAjcEyuxNly
+AthipWqmQWUcbf6Z2N9j3OA22Hv2Uzk8HSfi9VOZtL9svdEEZ0NnOekJgnc6stQp
+bXiknlK/T5WdrWxSyCfgUq68Vf6DFfIRAVuFdJ3WHT2wVXHrDfft6D+Ne/XCxPoE
+8zGmkyusaph33UHQ1oNyUbLbwcDCDSmOo8gYoedD3IwxtMA3wJRugomqosItwV8X
+vkgmcy8eSE/+gZUxJEN2gnLcfKFhCkC80J6oFhmoDD6vuUnPHcFdKZgVPw2rzPk5
+Vb1kX+gpORplYmKpq1vz/ujscL4T0TmYLz02hkIS4edpW55ncTTv7JWefpRiTB1J
+RB3td3me4htqR+YIDWJ+emrOmqsCG2WvpAS+MTw2mj1jYk9LL/ZYobTjSCEWmuwT
+yVK6m303irR7HQDauxhslRFgoK21w63viOyj5NKIU1gQtaAANGDxcgORC1XLjjgt
+oNutSQA+7P42vfHSHK4cnTBXl6V32H/GyVpdHQOZqSrqIjgLmUZodSmRPROxosZF
+a46B1O7m/rJFxkiKW4vod+/WqjoE0Hhfrb8rRrkRjzGeCqqSSnQ3vrunVkvF8hlA
+b6FOv4ZBJL4piC1GKH+rscqke9NEiDqXN8C3iYz86jbck/Ha21yUS8T3X7N52sg+
+B3AmOGnLK6BebYeto9vZxQjacChJZSixSxLV+l9/nVQ0+mW42azHdzk0ru59TGAj
 -----END RSA PRIVATE KEY-----
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/CMakeLists.txt percona-xtrabackup-2.3.7/extra/yassl/CMakeLists.txt
--- percona-xtrabackup-2.2.3/extra/yassl/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -33,7 +33,6 @@
 ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(yassl)
 
-INSTALL_DEBUG_SYMBOLS(yassl)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/examples/client/client.cpp percona-xtrabackup-2.3.7/extra/yassl/examples/client/client.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/examples/client/client.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/examples/client/client.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -18,6 +18,10 @@
 
 /* client.cpp  */
 
+// takes an optional command line argument of cipher list to make scripting
+// easier
+
+
 #include "../../testsuite/test.hpp"
 
 //#define TEST_RESUME
@@ -73,11 +77,16 @@
 #ifdef NON_BLOCKING
     tcp_set_nonblocking(sockfd);
 #endif
-
     SSL_METHOD* method = TLSv1_client_method();
     SSL_CTX*    ctx = SSL_CTX_new(method);
 
     set_certs(ctx);
+    if (argc >= 2) {
+        printf("setting cipher list to %s\n", argv[1]);
+        if (SSL_CTX_set_cipher_list(ctx, argv[1]) != SSL_SUCCESS) {
+            ClientError(ctx, NULL, sockfd, "set_cipher_list error\n");
+        }
+    }
     SSL* ssl = SSL_new(ctx);
 
     SSL_set_fd(ssl, sockfd);
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/examples/server/server.cpp percona-xtrabackup-2.3.7/extra/yassl/examples/server/server.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/examples/server/server.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/examples/server/server.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -18,6 +18,9 @@
 
 /* server.cpp */
 
+// takes 2 optional command line argument to make scripting
+// if the first  command line argument is 'n' client auth is disabled
+// if the second command line argument is 'd' DSA certs are used instead of RSA
 
 #include "../../testsuite/test.hpp"
 
@@ -69,6 +72,9 @@
     char**   argv     = 0;
 
     set_args(argc, argv, *static_cast<func_args*>(args));
+#ifdef SERVER_READY_FILE
+    set_file_ready("server_ready", *static_cast<func_args*>(args));
+#endif
     tcp_accept(sockfd, clientfd, *static_cast<func_args*>(args));
 
     tcp_close(sockfd);
@@ -77,8 +83,21 @@
     SSL_CTX*    ctx = SSL_CTX_new(method);
 
     //SSL_CTX_set_cipher_list(ctx, "RC4-SHA:RC4-MD5");
-    SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, 0);
-    set_serverCerts(ctx);
+    
+    // should we disable client auth
+    if (argc >= 2 && argv[1][0] == 'n')
+        printf("disabling client auth\n");
+    else
+        SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, 0);
+
+    // are we using DSA certs
+    if (argc >= 3 && argv[2][0] == 'd') {
+        printf("using DSA certs\n");
+        set_dsaServerCerts(ctx);
+    }
+    else {
+        set_serverCerts(ctx);
+    }
     DH* dh = set_tmpDH(ctx);
 
     SSL* ssl = SSL_new(ctx);
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/include/buffer.hpp percona-xtrabackup-2.3.7/extra/yassl/include/buffer.hpp
--- percona-xtrabackup-2.2.3/extra/yassl/include/buffer.hpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/include/buffer.hpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -48,7 +48,11 @@
 
 
 struct NoCheck {
-    void check(uint, uint);
+    int check(uint, uint);
+};
+
+struct Check {
+    int check(uint, uint);
 };
 
 /* input_buffer operates like a smart c style array with a checking option, 
@@ -60,11 +64,13 @@
  * write to the buffer bulk wise and have the correct size
  */
 
-class input_buffer : public NoCheck {
+class input_buffer : public Check {
     uint   size_;                // number of elements in buffer
     uint   current_;             // current offset position in buffer
     byte*  buffer_;              // storage for buffer
     byte*  end_;                 // end of storage marker
+    int    error_;               // error number
+    byte   zero_;                // for returning const reference to zero byte
 public:
     input_buffer();
 
@@ -93,6 +99,10 @@
 
     uint get_remaining() const;
 
+    int  get_error()     const;
+
+    void set_error();
+
     void set_current(uint i);
 
     // read only access through [], advance current
@@ -103,7 +113,7 @@
     bool eof();
 
     // peek ahead
-    byte peek() const;
+    byte peek();
 
     // write function, should use at/near construction
     void assign(const byte* t, uint s);
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/include/openssl/ssl.h percona-xtrabackup-2.3.7/extra/yassl/include/openssl/ssl.h
--- percona-xtrabackup-2.2.3/extra/yassl/include/openssl/ssl.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/include/openssl/ssl.h	2017-02-27 07:47:02.000000000 +0000
@@ -34,7 +34,7 @@
 #include "rsa.h"
 
 
-#define YASSL_VERSION "2.3.0"
+#define YASSL_VERSION "2.3.7"
 
 
 #if defined(__cplusplus)
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/include/yassl_int.hpp percona-xtrabackup-2.3.7/extra/yassl/include/yassl_int.hpp
--- percona-xtrabackup-2.2.3/extra/yassl/include/yassl_int.hpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/include/yassl_int.hpp	2017-02-27 07:47:02.000000000 +0000
@@ -107,6 +107,25 @@
 };
 
 
+// track received messages to explicitly disallow duplicate messages
+struct RecvdMessages {
+    uint8 gotClientHello_;
+    uint8 gotServerHello_;
+    uint8 gotCert_;
+    uint8 gotServerKeyExchange_;
+    uint8 gotCertRequest_;
+    uint8 gotServerHelloDone_;
+    uint8 gotCertVerify_;
+    uint8 gotClientKeyExchange_;
+    uint8 gotFinished_;
+    RecvdMessages() : gotClientHello_(0), gotServerHello_(0), gotCert_(0),
+                      gotServerKeyExchange_(0), gotCertRequest_(0),
+                      gotServerHelloDone_(0), gotCertVerify_(0),
+                      gotClientKeyExchange_(0), gotFinished_(0)
+                    {} 
+};
+
+
 // combines all states
 class States {
     RecordLayerState recordLayer_;
@@ -115,6 +134,7 @@
     ServerState      serverState_;
     ConnectState     connectState_;
     AcceptState      acceptState_;
+    RecvdMessages    recvdMessages_;
     char             errorString_[MAX_ERROR_SZ];
     YasslError       what_;
 public:
@@ -137,6 +157,7 @@
     AcceptState&      UseAccept();
     char*             useString();
     void              SetError(YasslError);
+    int               SetMessageRecvd(HandShakeType);
 private:
     States(const States&);              // hide copy
     States& operator=(const States&);   // and assign
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/README percona-xtrabackup-2.3.7/extra/yassl/README
--- percona-xtrabackup-2.2.3/extra/yassl/README	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/README	2017-02-27 07:47:02.000000000 +0000
@@ -12,15 +12,50 @@
 
 *** end Note ***
 
-yaSSL Release notes, version 2.3.0 (12/5/2013)
+yaSSL Release notes, version 2.3.7 (12/10/2014)
+    This release of yaSSL fixes the potential to process duplicate handshake
+    messages by explicitly marking/checking received handshake messages.
 
-  This release of yaSSL updates asm for newer GCC versions.
+yaSSL Release notes, version 2.3.6 (11/25/2014)
+
+    This release of yaSSL fixes some valgrind warnings/errors including
+    uninitialized reads and off by one index errors induced from fuzzing
+    the handshake.  These were reported by Oracle. 
+
+yaSSL Release notes, version 2.3.5 (9/29/2014)
+
+    This release of yaSSL fixes an RSA Padding check vulnerability reported by
+    Intel Security Advanced Threat Research team
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+yaSSL Release notes, version 2.3.4 (8/15/2014)
+
+    This release of yaSSL adds checking to the input_buffer class itself.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+yaSSL Release notes, version 2.3.2 (7/25/2014)
+
+    This release of yaSSL updates test certs.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.3.0 (12/5/2013)
+
+    This release of yaSSL updates asm for newer GCC versions.
 
 See normal  build instructions below under 1.0.6.
 See libcurl build instructions below under 1.3.0 and note in 1.5.8.
 
 
-*****************yaSSL Release notes, version 2.2.3b (4/23/2013)
+*****************yaSSL Release notes, version 2.2.3 (4/23/2013)
 
     This release of yaSSL updates the test certificates as they were expired
 
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/src/buffer.cpp percona-xtrabackup-2.3.7/extra/yassl/src/buffer.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/src/buffer.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/src/buffer.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -34,8 +34,19 @@
 
 
 
-void NoCheck::check(uint, uint) 
+/* return 0 on check success, always true for NoCheck policy */
+int NoCheck::check(uint, uint) 
 {
+    return 0;
+}
+
+/* return 0 on check success */
+int Check::check(uint i, uint max) 
+{
+    if (i < max)
+        return 0;
+
+    return -1;
 }
 
 
@@ -50,18 +61,20 @@
 
 
 input_buffer::input_buffer() 
-    : size_(0), current_(0), buffer_(0), end_(0) 
+    : size_(0), current_(0), buffer_(0), end_(0), error_(0), zero_(0)
 {}
 
 
 input_buffer::input_buffer(uint s) 
-    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s)
+    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s),
+      error_(0), zero_(0)
 {}
 
 
 // with assign
 input_buffer::input_buffer(uint s, const byte* t, uint len) 
-    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s) 
+    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s),
+      error_(0), zero_(0)
 { 
     assign(t, len); 
 }
@@ -76,8 +89,10 @@
 // users can pass defualt zero length buffer and then allocate
 void input_buffer::allocate(uint s) 
 { 
-    buffer_ = NEW_YS byte[s];
-    end_ = buffer_ + s; 
+    if (error_ == 0) {
+        buffer_ = NEW_YS byte[s];
+        end_ = buffer_ + s;
+    }
 }
 
 
@@ -92,40 +107,67 @@
 // if you know the size before the write use assign()
 void input_buffer::add_size(uint i) 
 { 
-    check(size_ + i-1, get_capacity()); 
-    size_ += i; 
+    if (error_ == 0 && check(size_ + i-1, get_capacity()) == 0)
+        size_ += i;
+    else
+        error_ = -1;
 }
 
 
 uint input_buffer::get_capacity()  const 
 { 
-    return (uint) (end_ - buffer_); 
+    if (error_ == 0)
+        return end_ - buffer_;
+
+    return 0;
 }
 
 
 uint input_buffer::get_current()   const 
 { 
-    return current_; 
+    if (error_ == 0)
+        return current_;
+
+    return 0;
 }
 
 
 uint input_buffer::get_size()      const 
 { 
-    return size_; 
+    if (error_ == 0)
+        return size_;
+
+    return 0;
 }
 
 
 uint input_buffer::get_remaining() const 
 { 
-    return size_ - current_; 
+    if (error_ == 0)
+        return size_ - current_;
+
+    return 0;
+}
+
+
+int input_buffer::get_error() const 
+{ 
+    return error_;
+}
+
+
+void input_buffer::set_error()
+{ 
+    error_ = -1;
 }
 
 
 void input_buffer::set_current(uint i) 
 {
-    if (i)
-        check(i - 1, size_); 
-    current_ = i; 
+    if (error_ == 0 && i && check(i - 1, size_) == 0)
+        current_ = i;
+    else
+        error_ = -1;
 }
 
 
@@ -133,40 +175,59 @@
 // user passes in AUTO index for ease of use
 const byte& input_buffer::operator[](uint i) 
 {
-    check(current_, size_);
-    return buffer_[current_++];
+    if (error_ == 0 && check(current_, size_) == 0)
+        return buffer_[current_++];
+
+    error_ = -1;
+    return zero_;
 }
 
 
 // end of input test
 bool input_buffer::eof() 
 { 
+    if (error_ != 0)
+        return true;
+
     return current_ >= size_; 
 }
 
 
 // peek ahead
-byte input_buffer::peek() const
+byte input_buffer::peek()
 {
-    return buffer_[current_];
+    if (error_ == 0 && check(current_, size_) == 0)
+        return buffer_[current_];
+
+    error_ = -1;
+    return 0;
 }
 
 
 // write function, should use at/near construction
 void input_buffer::assign(const byte* t, uint s)
 {
-    check(current_, get_capacity());
-    add_size(s);
-    memcpy(&buffer_[current_], t, s);
+    if (t && error_ == 0 && check(current_, get_capacity()) == 0) {
+        add_size(s);
+        if (error_ == 0) {
+            memcpy(&buffer_[current_], t, s);
+            return;  // success
+        }
+    }
+
+    error_ = -1;
 }
 
 
 // use read to query input, adjusts current
 void input_buffer::read(byte* dst, uint length)
 {
-    check(current_ + length - 1, size_);
-    memcpy(dst, &buffer_[current_], length);
-    current_ += length;
+    if (dst && error_ == 0 && check(current_ + length - 1, size_) == 0) {
+        memcpy(dst, &buffer_[current_], length);
+        current_ += length;
+    } else {
+        error_ = -1;
+    }
 }
 
 
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/src/handshake.cpp percona-xtrabackup-2.3.7/extra/yassl/src/handshake.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/src/handshake.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/src/handshake.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -522,7 +522,7 @@
 // some clients still send sslv2 client hello
 void ProcessOldClientHello(input_buffer& input, SSL& ssl)
 {
-    if (input.get_remaining() < 2) {
+    if (input.get_error() || input.get_remaining() < 2) {
         ssl.SetError(bad_input);
         return;
     }
@@ -549,20 +549,24 @@
 
     byte len[2];
 
-    input.read(len, sizeof(len));
+    len[0] = input[AUTO];
+    len[1] = input[AUTO];
     ato16(len, ch.suite_len_);
 
-    input.read(len, sizeof(len));
+    len[0] = input[AUTO];
+    len[1] = input[AUTO];
     uint16 sessionLen;
     ato16(len, sessionLen);
     ch.id_len_ = sessionLen;
 
-    input.read(len, sizeof(len));
+    len[0] = input[AUTO];
+    len[1] = input[AUTO];
     uint16 randomLen;
     ato16(len, randomLen);
 
-    if (ch.suite_len_ > MAX_SUITE_SZ || sessionLen > ID_LEN ||
-                                        randomLen > RAN_LEN) {
+    if (input.get_error() || ch.suite_len_ > MAX_SUITE_SZ ||
+                             ch.suite_len_ > input.get_remaining() ||
+                             sessionLen > ID_LEN || randomLen > RAN_LEN) {
         ssl.SetError(bad_input);
         return;
     }
@@ -580,13 +584,12 @@
     ch.suite_len_ = j;
 
     if (ch.id_len_)
-        input.read(ch.session_id_, ch.id_len_);
+        input.read(ch.session_id_, ch.id_len_);   // id_len_ from sessionLen
 
     if (randomLen < RAN_LEN)
         memset(ch.random_, 0, RAN_LEN - randomLen);
     input.read(&ch.random_[RAN_LEN - randomLen], randomLen);
  
-
     ch.Process(input, ssl);
 }
 
@@ -783,6 +786,9 @@
             ssl.verifyState(hdr);
         }
 
+        if (ssl.GetError())
+            return 0;
+
         // make sure we have enough input in buffer to process this record
         if (needHdr || hdr.length_ > buffer.get_remaining()) {
             // put header in front for next time processing
@@ -795,6 +801,9 @@
 
         while (buffer.get_current() < hdr.length_ + RECORD_HEADER + offset) {
             // each message in record, can be more than 1 if not encrypted
+            if (ssl.GetError())
+                return 0;
+
             if (ssl.getSecurity().get_parms().pending_ == false) { // cipher on
                 // sanity check for malicious/corrupted/illegal input
                 if (buffer.get_remaining() < hdr.length_) {
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/src/ssl.cpp percona-xtrabackup-2.3.7/extra/yassl/src/ssl.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/src/ssl.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/src/ssl.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -790,7 +790,10 @@
             strncpy(name, path, MAX_PATH - 1 - HALF_PATH);
             strncat(name, "/", 1);
             strncat(name, entry->d_name, HALF_PATH);
-            if (stat(name, &buf) < 0) return SSL_BAD_STAT;
+            if (stat(name, &buf) < 0) {
+                closedir(dir);
+                return SSL_BAD_STAT;
+            }
      
             if (S_ISREG(buf.st_mode))
                 ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/src/yassl_imp.cpp percona-xtrabackup-2.3.7/extra/yassl/src/yassl_imp.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/src/yassl_imp.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/src/yassl_imp.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -220,18 +220,29 @@
 // read PreMaster secret and decrypt, server side
 void EncryptedPreMasterSecret::read(SSL& ssl, input_buffer& input)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     const CertManager& cert = ssl.getCrypto().get_certManager();
     RSA rsa(cert.get_privateKey(), cert.get_privateKeyLength(), false);
     uint16 cipherLen = rsa.get_cipherLength();
     if (ssl.isTLS()) {
         byte len[2];
-        input.read(len, sizeof(len));
+        len[0] = input[AUTO];
+        len[1] = input[AUTO];
         ato16(len, cipherLen);
     }
     alloc(cipherLen);
     input.read(secret_, length_);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     opaque preMasterSecret[SECRET_LEN];
+    memset(preMasterSecret, 0, sizeof(preMasterSecret));
     rsa.decrypt(preMasterSecret, secret_, length_, 
                 ssl.getCrypto().get_random());
 
@@ -277,6 +288,11 @@
 // read client's public key, server side
 void ClientDiffieHellmanPublic::read(SSL& ssl, input_buffer& input)
 {
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     DiffieHellman& dh = ssl.useCrypto().use_dh();
 
     uint16 keyLength;
@@ -285,8 +301,17 @@
     tmp[1] = input[AUTO];
     ato16(tmp, keyLength);
 
+    if (keyLength < dh.get_agreedKeyLength()/2) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     alloc(keyLength);
     input.read(Yc_, keyLength);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     dh.makeAgreement(Yc_, keyLength); 
 
     // because of encoding, first byte might be 0, don't use for preMaster 
@@ -331,6 +356,10 @@
 // read server's p, g, public key and sig, client side
 void DH_Server::read(SSL& ssl, input_buffer& input)
 {
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
     uint16 length, messageTotal = 6; // pSz + gSz + pubSz
     byte tmp[2];
 
@@ -341,6 +370,10 @@
     messageTotal += length;
 
     input.read(parms_.alloc_p(length), length);
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // g
     tmp[0] = input[AUTO];
@@ -349,6 +382,10 @@
     messageTotal += length;
 
     input.read(parms_.alloc_g(length), length);
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // pub
     tmp[0] = input[AUTO];
@@ -357,20 +394,36 @@
     messageTotal += length;
 
     input.read(parms_.alloc_pub(length), length);
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // save message for hash verify
     input_buffer message(messageTotal);
     input.set_current(input.get_current() - messageTotal);
     input.read(message.get_buffer(), messageTotal);
     message.add_size(messageTotal);
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // signature
     tmp[0] = input[AUTO];
     tmp[1] = input[AUTO];
     ato16(tmp, length);
 
+    if (length == 0) {
+        ssl.SetError(bad_input);
+        return;
+    }
     signature_ = NEW_YS byte[length];
     input.read(signature_, length);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // verify signature
     byte hash[FINISHED_SZ];
@@ -645,6 +698,10 @@
 {
     ssl.verifyState(*this);
     if (ssl.GetError()) return;
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     const HandShakeFactory& hsf = ssl.getFactory().getHandShake();
     mySTL::auto_ptr<HandShakeBase> hs(hsf.CreateObject(type_));
     if (!hs.get()) {
@@ -810,8 +867,19 @@
 
 
 // CipherSpec processing handler
-void ChangeCipherSpec::Process(input_buffer&, SSL& ssl)
+void ChangeCipherSpec::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
+    // detect duplicate change_cipher
+    if (ssl.getSecurity().get_parms().pending_ == false) {
+        ssl.order_error();
+        return;
+    }
+
     ssl.useSecurity().use_parms().pending_ = false;
     if (ssl.getSecurity().get_resuming()) {
         if (ssl.getSecurity().get_parms().entity_ == client_end)
@@ -873,6 +941,11 @@
 // Alert processing handler
 void Alert::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     if (ssl.getSecurity().get_parms().pending_ == false)  { // encrypted alert
         int            aSz = get_length();  // alert size already read on input
         opaque         verify[SHA_LEN];
@@ -890,12 +963,19 @@
 
         if (ssl.getSecurity().get_parms().cipher_type_ == block) {
             int    ivExtra = 0;
+            opaque fill;
 
             if (ssl.isTLSv1_1())
                 ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
             int padSz = ssl.getSecurity().get_parms().encrypt_size_ - ivExtra -
                         aSz - digestSz;
-            input.set_current(input.get_current() + padSz);
+            for (int i = 0; i < padSz; i++) 
+                fill = input[AUTO];
+        }
+
+        if (input.get_error()) {
+            ssl.SetError(bad_input);
+            return;
         }
 
         // verify
@@ -1112,6 +1192,11 @@
 // Process handler for Data
 void Data::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     int msgSz = ssl.getSecurity().get_parms().encrypt_size_;
     int pad   = 0, padSz = 0;
     int ivExtra = 0;
@@ -1154,7 +1239,7 @@
 
     int dataSz = msgSz - ivExtra - digestSz - pad - padSz;
 
-    if (dataSz < 0) {
+    if (dataSz < 0 || dataSz > (MAX_RECORD_SIZE + COMPRESS_EXTRA)) {
         ssl.SetError(bad_input);
         return;
     }
@@ -1180,6 +1265,10 @@
 
     // advance past mac and fill
     input.set_current(input.get_current() + digestSz + pad + padSz);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 }
 
 
@@ -1244,6 +1333,11 @@
 // certificate processing handler
 void Certificate::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     CertManager& cm = ssl.useCrypto().use_certManager();
   
     uint32 list_sz;
@@ -1412,6 +1506,10 @@
     
     // Session
     hello.id_len_ = input[AUTO];
+    if (hello.id_len_ > ID_LEN) {
+        input.set_error(); 
+        return input;
+    }
     if (hello.id_len_)
         input.read(hello.session_id_, hello.id_len_);
  
@@ -1452,8 +1550,13 @@
 
 
 // Server Hello processing handler
-void ServerHello::Process(input_buffer&, SSL& ssl)
+void ServerHello::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     if (ssl.GetMultiProtocol()) {   // SSLv23 support
         if (ssl.isTLS() && server_version_.minor_ < 1)
             // downgrade to SSLv3
@@ -1547,8 +1650,12 @@
 
 
 // Server Hello Done processing handler
-void ServerHelloDone::Process(input_buffer&, SSL& ssl)
+void ServerHelloDone::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     ssl.useStates().useClient() = serverHelloDoneComplete;
 }
 
@@ -1667,8 +1774,13 @@
 
 
 // Client Hello processing handler
-void ClientHello::Process(input_buffer&, SSL& ssl)
+void ClientHello::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     // store version for pre master secret
     ssl.useSecurity().use_connection().chVersion_ = client_version_;
 
@@ -1800,9 +1912,17 @@
 // Server Key Exchange processing handler
 void ServerKeyExchange::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     createKey(ssl);
     if (ssl.GetError()) return;
     server_key_->read(ssl, input);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     ssl.useStates().useClient() = serverKeyExchangeComplete;
 }
@@ -1924,27 +2044,32 @@
 {
     // types
     request.typeTotal_ = input[AUTO];
+    if (request.typeTotal_ > CERT_TYPES) {
+        input.set_error();
+        return input;
+    }
     for (int i = 0; i < request.typeTotal_; i++)
         request.certificate_types_[i] = ClientCertificateType(input[AUTO]);
 
-    byte tmp[REQUEST_HEADER];
-    input.read(tmp, sizeof(tmp));
+    byte tmp[2];
+    tmp[0] = input[AUTO];
+    tmp[1] = input[AUTO];
     uint16 sz;
     ato16(tmp, sz);
 
     // authorities
     while (sz) {
         uint16 dnSz;
-        input.read(tmp, sizeof(tmp));
+        tmp[0] = input[AUTO];
+        tmp[1] = input[AUTO];
         ato16(tmp, dnSz);
-        
-        DistinguishedName dn;
-        request.certificate_authorities_.push_back(dn = NEW_YS 
-                                                  byte[REQUEST_HEADER + dnSz]);
-        memcpy(dn, tmp, REQUEST_HEADER);
-        input.read(&dn[REQUEST_HEADER], dnSz);
+       
+        input.set_current(input.get_current() + dnSz);
 
         sz -= dnSz + REQUEST_HEADER;
+
+        if (input.get_error())
+            break;
     }
 
     return input;
@@ -1983,8 +2108,12 @@
 
 
 // CertificateRequest processing handler
-void CertificateRequest::Process(input_buffer&, SSL& ssl)
+void CertificateRequest::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     CertManager& cm = ssl.useCrypto().use_certManager();
 
     cm.setSendVerify();
@@ -2067,12 +2196,18 @@
 input_buffer& operator>>(input_buffer& input, CertificateVerify& request)
 {
     byte tmp[VERIFY_HEADER];
-    input.read(tmp, sizeof(tmp));
+    tmp[0] = input[AUTO];
+    tmp[1] = input[AUTO];
 
     uint16 sz = 0;
     ato16(tmp, sz);
     request.set_length(sz);
 
+    if (sz == 0) {
+        input.set_error();
+        return input;
+    }
+
     request.signature_ = NEW_YS byte[sz];
     input.read(request.signature_, sz);
 
@@ -2091,8 +2226,13 @@
 
 
 // CertificateVerify processing handler
-void CertificateVerify::Process(input_buffer&, SSL& ssl)
+void CertificateVerify::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     const Hashes&      hashVerify = ssl.getHashes().get_certVerify();
     const CertManager& cert       = ssl.getCrypto().get_certManager();
 
@@ -2131,9 +2271,17 @@
 // Client Key Exchange processing handler
 void ClientKeyExchange::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     createKey(ssl);
     if (ssl.GetError()) return;
     client_key_->read(ssl, input);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     if (ssl.getCrypto().get_certManager().verifyPeer())
         build_certHashes(ssl, ssl.useHashes().use_certVerify());
@@ -2220,11 +2368,19 @@
 // Finished processing handler
 void Finished::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     // verify hashes
     const  Finished& verify = ssl.getHashes().get_verify();
     uint finishedSz = ssl.isTLS() ? TLS_FINISHED_SZ : FINISHED_SZ;
     
     input.read(hashes_.md5_, finishedSz);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     if (memcmp(&hashes_, &verify.hashes_, finishedSz)) {
         ssl.SetError(verify_error);
@@ -2246,19 +2402,23 @@
     opaque mac[SHA_LEN];   // max size
     int    digestSz = ssl.getCrypto().get_digest().get_digestSize();
     input.read(mac, digestSz);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     uint ivExtra = 0;
     if (ssl.getSecurity().get_parms().cipher_type_ == block)
         if (ssl.isTLSv1_1())
             ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
 
+    opaque fill;
     int    padSz = ssl.getSecurity().get_parms().encrypt_size_ - ivExtra -
                      HANDSHAKE_HEADER - finishedSz - digestSz;
-    input.set_current(input.get_current() + padSz);
-
-    // verify mac
-    if (memcmp(mac, verifyMAC, digestSz)) {
-        ssl.SetError(verify_error);
+    for (int i = 0; i < padSz; i++) 
+        fill = input[AUTO];
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
         return;
     }
 
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/src/yassl_int.cpp percona-xtrabackup-2.3.7/extra/yassl/src/yassl_int.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/src/yassl_int.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/src/yassl_int.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2014, 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
@@ -256,6 +256,77 @@
 }
 
 
+// mark message recvd, check for duplicates, return 0 on success
+int States::SetMessageRecvd(HandShakeType hst)
+{
+    switch (hst) {
+        case hello_request:
+            break;  // could send more than one
+
+        case client_hello:
+            if (recvdMessages_.gotClientHello_)
+                return -1;
+            recvdMessages_.gotClientHello_ = 1;
+            break;
+
+        case server_hello:
+            if (recvdMessages_.gotServerHello_)
+                return -1;
+            recvdMessages_.gotServerHello_ = 1;
+            break;
+
+        case certificate:
+            if (recvdMessages_.gotCert_)
+                return -1;
+            recvdMessages_.gotCert_ = 1;
+            break;
+
+        case server_key_exchange:
+            if (recvdMessages_.gotServerKeyExchange_)
+                return -1;
+            recvdMessages_.gotServerKeyExchange_ = 1;
+            break;
+
+        case certificate_request:
+            if (recvdMessages_.gotCertRequest_)
+                return -1;
+            recvdMessages_.gotCertRequest_ = 1;
+            break;
+
+        case server_hello_done:
+            if (recvdMessages_.gotServerHelloDone_)
+                return -1;
+            recvdMessages_.gotServerHelloDone_ = 1;
+            break;
+
+        case certificate_verify:
+            if (recvdMessages_.gotCertVerify_)
+                return -1;
+            recvdMessages_.gotCertVerify_ = 1;
+            break;
+
+        case client_key_exchange:
+            if (recvdMessages_.gotClientKeyExchange_)
+                return -1;
+            recvdMessages_.gotClientKeyExchange_ = 1;
+            break;
+
+        case finished:
+            if (recvdMessages_.gotFinished_)
+                return -1;
+            recvdMessages_.gotFinished_ = 1;
+            break;
+
+
+        default:
+            return -1;
+
+    }
+
+    return 0;
+}
+
+
 sslFactory::sslFactory() :           
         messageFactory_(InitMessageFactory),
         handShakeFactory_(InitHandShakeFactory),
@@ -1251,6 +1322,11 @@
         return;
     }
 
+    if (states_.SetMessageRecvd(hsHeader.get_handshakeType()) != 0) {
+        order_error();
+        return;
+    }
+
     if (secure_.get_parms().entity_ == client_end)
         verifyClientState(hsHeader.get_handshakeType());
     else
@@ -2638,8 +2714,9 @@
     int DeCompress(input_buffer& in, int sz, input_buffer& out)
     {
         byte tmp[LENGTH_SZ];
-    
-        in.read(tmp, sizeof(tmp));
+   
+        tmp[0] = in[AUTO]; 
+        tmp[1] = in[AUTO]; 
 
         uint16 len;
         ato16(tmp, len);
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/CMakeLists.txt percona-xtrabackup-2.3.7/extra/yassl/taocrypt/CMakeLists.txt
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -36,7 +36,6 @@
 ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(taocrypt)
 
-INSTALL_DEBUG_SYMBOLS(taocrypt)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/asn.hpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/asn.hpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/asn.hpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/asn.hpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -261,8 +261,8 @@
 enum SigType  { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA = 649,
                 SHA256wRSA = 655, SHA384wRSA = 656, SHA512wRSA = 657,
                 SHA256wDSA = 416 };
-enum HashType { MD2h = 646, MD5h = 649, SHAh = 88, SHA256h = 414,
-                SHA384h = 415, SHA512h = 416 };
+enum HashType { MD2h = 646, MD5h = 649, SHAh = 88, SHA256h = 414, SHA384h = 415,
+                SHA512h = 416 };
 enum KeyType  { DSAk = 515, RSAk = 645 };     // sums of algo OID
 
 
@@ -300,11 +300,11 @@
     byte*     signature_;
     char      issuer_[ASN_NAME_MAX];    // Names
     char      subject_[ASN_NAME_MAX];   // Names
-    char      beforeDate_[MAX_DATE_SZ]; // valid before date
-    byte      beforeDateType_;          // beforeDate time type
-    char      afterDate_[MAX_DATE_SZ];  // valid after date
-    byte      afterDateType_;           // afterDate time type
-    bool      verify_;                  // Default to yes, but could be off
+    char      beforeDate_[MAX_DATE_SZ+1]; // valid before date, +null term
+    byte      beforeDateType_;            // beforeDate time type
+    char      afterDate_[MAX_DATE_SZ+1];  // valid after date, +null term
+    byte      afterDateType_;             // afterDate time type
+    bool      verify_;                    // Default to yes, but could be off
 
     void   ReadHeader();
     void   Decode(SignerList*, CertType);
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/block.hpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/block.hpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/block.hpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/block.hpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -74,7 +74,7 @@
     if (preserve) {
         A b = A();
         typename A::pointer newPointer = b.allocate(newSize, 0);
-        memcpy(newPointer, p, sizeof(T) * min((word32) oldSize, (word32) newSize));
+        memcpy(newPointer, p, sizeof(T) * min(oldSize, newSize));
         a.deallocate(p, oldSize);
         STL::swap(a, b);
         return newPointer;
@@ -186,9 +186,9 @@
 
     ~Block() { allocator_.deallocate(buffer_, sz_); }
 private:
+    A      allocator_;
     word32 sz_;     // size in Ts
     T*     buffer_;
-    A      allocator_;
 };
 
 
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/integer.hpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/integer.hpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/integer.hpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/integer.hpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -47,7 +47,7 @@
 
 #ifdef TAOCRYPT_X86ASM_AVAILABLE
     #if defined(__GNUC__) && (__GNUC__ >= 4)
-        // GCC 4 or greater optimizes too much inline on recursive for bigint,
+        // GCC 4 or greater optimizes too much inline on recursive for bigint, 
         // -O3 just as fast without asm here anyway
         #undef TAOCRYPT_X86ASM_AVAILABLE
     #endif
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/pwdbased.hpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/pwdbased.hpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/pwdbased.hpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/pwdbased.hpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -16,6 +16,7 @@
    MA  02110-1301  USA.
 */
 
+
 /* pwdbased.hpp defines PBKDF2 from PKCS #5
 */
 
@@ -48,10 +49,7 @@
                                  word32 pLen, const byte* salt, word32 sLen,
                                  word32 iterations) const
 {
-    if (dLen > MaxDerivedKeyLength())
-        return 0;
-
-    if (iterations < 0)
+	if (dLen > MaxDerivedKeyLength())
         return 0;
 
     ByteBlock buffer(T::DIGEST_SIZE);
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/runtime.hpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/runtime.hpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/runtime.hpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/runtime.hpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -34,7 +34,10 @@
 
 // Handler for pure virtual functions
 namespace __Crun {
-    void pure_error(void);
+    static void pure_error(void)
+    {
+       // "Pure virtual method called, Aborted", GCC 4.2 str cmp fix
+    }
 } // namespace __Crun
 
 #endif // __sun
@@ -48,7 +51,15 @@
 #if defined(DO_TAOCRYPT_KERNEL_MODE)
     #include "kernelc.hpp"
 #endif
-    int __cxa_pure_virtual () __attribute__ ((weak));
+
+/* Disallow inline __cxa_pure_virtual() */
+static int __cxa_pure_virtual() __attribute__((noinline, used));
+static int __cxa_pure_virtual()
+{
+    // oops, pure virtual called!
+    return 0;
+}
+
 } // extern "C"
 
 #endif // __GNUC__ > 2
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/sha.hpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/sha.hpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/include/sha.hpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/include/sha.hpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/aes.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/aes.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/aes.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/aes.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -66,7 +66,7 @@
                 in  += BLOCK_SIZE;
             }
         }
-    else {
+        else {
             while (blocks--) {
                 AsmDecrypt(in, out, (void*)Td0);
                 
@@ -79,8 +79,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-       }
-   }
+        }
+    }
 }
 
 #endif // DO_AES_ASM
@@ -466,14 +466,13 @@
             "movd mm7, ebp;" \
             "movd mm4, eax;" \
             "mov  ebp, edx;"  \
-            "sub  esp, 4;"
-
+            "sub  esp, 4;" 
         #define EPILOG()  \
             "add esp, 4;" \
             "pop ebp;" \
             "pop ebx;" \
-                   "emms;" \
-                   ".att_syntax;" \
+       	    "emms;" \
+       	    ".att_syntax;" \
                 : \
                 : "c" (this), "S" (inBlock), "d" (boxes), "a" (outBlock) \
                 : "%edi", "memory", "cc" \
@@ -834,9 +833,9 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked)
+    __declspec(naked) 
 #else
-    __attribute__ ((noinline)) 
+    __attribute__ ((noinline))
 #endif
 void AES::AsmDecrypt(const byte* inBlock, byte* outBlock, void* boxes) const
 {
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/algebra.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/algebra.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/algebra.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/algebra.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+/*
+   Copyright (c) 2000, 2014, 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
@@ -183,10 +184,10 @@
 
 struct WindowSlider
 {
-    WindowSlider(const Integer &expIn, bool fastNegateIn,
+    WindowSlider(const Integer &exp, bool fastNegate,
                  unsigned int windowSizeIn=0)
-        : exp(expIn), windowModulus(Integer::One()), windowSize(windowSizeIn),
-          windowBegin(0), fastNegate(fastNegateIn), firstTime(true),
+        : exp(exp), windowModulus(Integer::One()), windowSize(windowSizeIn),
+          windowBegin(0), fastNegate(fastNegate), firstTime(true),
           finished(false)
     {
         if (windowSize == 0)
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/arc4.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/arc4.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/arc4.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/arc4.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -121,12 +121,11 @@
         "push ebx;" \
         "push ebp;" \
         "mov ebp, eax;"
-
     #define EPILOG()  \
         "pop ebp;" \
         "pop ebx;" \
-               "emms;" \
-               ".att_syntax;" \
+       	"emms;" \
+       	".att_syntax;" \
             : \
             : "c" (this), "D" (out), "S" (in), "a" (length) \
             : "%edx", "memory", "cc" \
@@ -180,7 +179,7 @@
 #ifdef _MSC_VER
     AS1( loopStart: )  // loopStart
 #else
-    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
 #endif
 
     // y = (y+a) & 0xff;
@@ -232,7 +231,7 @@
 
 AS1( nothing:                           )
 
-    // inline adjust
+    // inline adjust 
     AS2(    add   esp, 4               )   // fix room on stack
 
     EPILOG()
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/asn.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/asn.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/asn.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/asn.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -685,7 +685,7 @@
     }
 
     sigLength_ = GetLength(source_);
-    if (sigLength_ == 0 || source_.IsLeft(sigLength_) == false) {
+    if (sigLength_ <= 1 || source_.IsLeft(sigLength_) == false) {
         source_.SetError(CONTENT_E);
         return 0;
     }
@@ -773,7 +773,7 @@
     while (source_.get_index() < length) {
         GetSet();
         if (source_.GetError().What() == SET_E) {
-            source_.SetError(NO_ERROR_E);  // extensions may only have sequence
+            source_.SetError(NO_ERROR_E);  // extensions may only have sequence 
             source_.prev();
         }
         GetSequence();
@@ -844,10 +844,8 @@
             if (source_.IsLeft(length) == false) return;
 
             if (email) {
-                if (!(ptr = AddTag(ptr, buf_end, "/emailAddress=", 14, length))) {
-                    source_.SetError(CONTENT_E);
-                    return;
-                }
+                if (!(ptr = AddTag(ptr, buf_end, "/emailAddress=", 14, length)))
+                    return; 
             }
 
             source_.advance(length);
@@ -1018,11 +1016,17 @@
         RSA_PublicKey pubKey(pub);
         RSAES_Encryptor enc(pubKey);
 
+        if (pubKey.FixedCiphertextLength() != sigLength_) {
+            source_.SetError(SIG_LEN_E);
+            return false;
+        }
+
         return enc.SSL_Verify(build.get_buffer(), build.size(), signature_);
     }
     else  { // DSA
         // extract r and s from sequence
         byte seqDecoded[DSA_SIG_SZ];
+        memset(seqDecoded, 0, sizeof(seqDecoded));
         DecodeDSA_Signature(seqDecoded, signature_, sigLength_);
 
         DSA_PublicKey pubKey(pub);
@@ -1080,12 +1084,10 @@
                                       0x02, 0x02, 0x05, 0x00};
     static const byte sha256AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
                                          0x04, 0x02, 0x01, 0x05, 0x00 };
-#ifdef WORD64_AVAILABLE
     static const byte sha384AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
                                          0x04, 0x02, 0x02, 0x05, 0x00 };
     static const byte sha512AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
                                          0x04, 0x02, 0x03, 0x05, 0x00 };
-#endif
     int algoSz = 0;
     const byte* algoName = 0;
 
@@ -1100,7 +1102,6 @@
         algoName = sha256AlgoID;
         break;
 
-#ifdef WORD64_AVAILABLE
     case SHA384h:
         algoSz = sizeof(sha384AlgoID);
         algoName = sha384AlgoID;
@@ -1110,7 +1111,6 @@
         algoSz = sizeof(sha512AlgoID);
         algoName = sha512AlgoID;
         break;
-#endif
 
     case MD2h:
         algoSz = sizeof(md2AlgoID);
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/blowfish.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/blowfish.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/blowfish.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/blowfish.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -237,8 +237,8 @@
         #define EPILOG()  \
             "pop ebp;" \
             "pop ebx;" \
-                   "emms;" \
-                   ".att_syntax;" \
+       	    "emms;" \
+       	    ".att_syntax;" \
                 : \
                 : "c" (this), "S" (inBlock), "a" (outBlock) \
                 : "%edi", "%edx", "memory", "cc" \
@@ -291,7 +291,7 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked)
+    __declspec(naked) 
 #else
     __attribute__ ((noinline))
 #endif
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/des.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/des.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/des.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/des.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -641,9 +641,9 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked)
+    __declspec(naked) 
 #else
-    __attribute__ ((noinline)) 
+    __attribute__ ((noinline))
 #endif
 void DES_EDE3::AsmProcess(const byte* in, byte* out, void* box) const
 {
@@ -663,8 +663,8 @@
     #define EPILOG()  \
         "pop ebp;" \
         "pop ebx;" \
-               "emms;" \
-               ".att_syntax;" \
+       	"emms;" \
+       	".att_syntax;" \
             :  \
             : "d" (this), "S" (in), "a" (box), "c" (out) \
             : "%edi", "memory", "cc" \
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/integer.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/integer.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/integer.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/integer.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+/*
+   Copyright (c) 2000, 2014, 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
@@ -51,9 +52,8 @@
     #endif
 #elif defined(_MSC_VER) && defined(_M_IX86)
 /*    #pragma message("You do not seem to have the Visual C++ Processor Pack ")
-     #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
-*/
     #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
+*/
 #elif defined(__GNUC__) && defined(__i386__)
 /*   #warning You do not have GCC 3.3 or later, or did not specify the -msse2 \
              compiler option. Use of SSE2 intrinsics will be disabled.
@@ -277,7 +277,12 @@
     word GetHighHalfAsBorrow() const {return 0-halfs_.high;}
 
 private:
-    struct dword_struct
+    union
+    {
+    #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
+        dword whole_;
+    #endif
+        struct
         {
         #ifdef LITTLE_ENDIAN_ORDER
             word low;
@@ -286,14 +291,7 @@
             word high;
             word low;
         #endif
-    };
-
-    union
-    {
-    #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-        dword whole_;
-    #endif
-        struct dword_struct halfs_;
+        } halfs_;
     };
 };
 
@@ -1196,24 +1194,20 @@
     #define AS1(x) #x ";"
     #define AS2(x, y) #x ", " #y ";"
     #define AddPrologue \
-        word res; \
         __asm__ __volatile__ \
         ( \
             "push %%ebx;"	/* save this manually, in case of -fPIC */ \
-            "mov %3, %%ebx;" \
+            "mov %2, %%ebx;" \
             ".intel_syntax noprefix;" \
             "push ebp;"
     #define AddEpilogue \
             "pop ebp;" \
             ".att_syntax prefix;" \
             "pop %%ebx;" \
-            "mov %%eax, %0;" \
-                    : "=g" (res) \
+                    : \
                     : "c" (C), "d" (A), "m" (B), "S" (N) \
                     : "%edi", "memory", "cc" \
-        ); \
-        return res;
-
+        );
     #define MulPrologue \
         __asm__ __volatile__ \
         ( \
@@ -2607,18 +2601,20 @@
 void Integer::Decode(const byte* input, unsigned int inputLen, Signedness s)
 {
     unsigned int idx(0);
-    byte b = input[idx++];
+    byte b = 0; 
+    if (inputLen>0)
+        b = input[idx];   // peek
     sign_  = ((s==SIGNED) && (b & 0x80)) ? NEGATIVE : POSITIVE;
 
     while (inputLen>0 && (sign_==POSITIVE ? b==0 : b==0xff))
     {
-        inputLen--;
-        b = input[idx++];
+        idx++;   // skip
+        if (--inputLen>0)
+            b = input[idx];  // peek
     }
 
     reg_.CleanNew(RoundupSize(BytesToWords(inputLen)));
 
-    --idx;
     for (unsigned int i=inputLen; i > 0; i--)
     {
         b = input[idx++];
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/md5.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/md5.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/md5.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/md5.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -223,7 +223,7 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked)
+    __declspec(naked) 
 #else
     __attribute__ ((noinline))
 #endif
@@ -242,8 +242,8 @@
     #define EPILOG()  \
         "pop ebp;" \
         "pop ebx;" \
-               "emms;" \
-               ".att_syntax;" \
+       	"emms;" \
+       	".att_syntax;" \
             : \
             : "c" (this), "D" (data), "a" (times) \
             : "%esi", "%edx", "memory", "cc" \
@@ -297,7 +297,7 @@
 #ifdef _MSC_VER
     AS1( loopStart: )  // loopStart
 #else
-    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
 #endif
 
     // set up
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/misc.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/misc.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/misc.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/misc.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -84,17 +84,7 @@
 
     }
 
-#ifdef __sun
-
-// Handler for pure virtual functions
-namespace __Crun {
-    void pure_error() {
-    }
-}
-
-#endif
-
-#if defined(__ICC) || defined(__INTEL_COMPILER) || (__GNUC__ > 2)
+#if defined(__ICC) || defined(__INTEL_COMPILER)
 
 extern "C" {
 
@@ -175,6 +165,14 @@
 
 #ifdef TAOCRYPT_X86ASM_AVAILABLE
 
+#ifndef _MSC_VER
+    static jmp_buf s_env;
+    static void SigIllHandler(int)
+    {
+        longjmp(s_env, 1);
+    }
+#endif
+
 
 bool HaveCpuId()
 {
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/rabbit.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/rabbit.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/rabbit.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/rabbit.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -227,10 +227,10 @@
     /* Encrypt/decrypt remaining data */
     if (msglen) {
 
-      word32 tmp[4];
-      byte*  buffer = (byte*)tmp;
+        word32 tmp[4];
+        byte*  buffer = (byte*)tmp;
 
-      memset(tmp, 0, sizeof(tmp));   /* help static analysis */
+        memset(tmp, 0, sizeof(tmp));   /* help static analysis */
 
         /* Iterate the system */
         NextState(Work);
@@ -238,11 +238,11 @@
         /* Generate 16 bytes of pseudo-random data */
         tmp[0] = LITTLE32(workCtx_.x[0] ^
                   (workCtx_.x[5]>>16) ^ U32V(workCtx_.x[3]<<16));
-        tmp[1] = LITTLE32(workCtx_.x[2] ^
+        tmp[1] = LITTLE32(workCtx_.x[2] ^ 
                   (workCtx_.x[7]>>16) ^ U32V(workCtx_.x[5]<<16));
-        tmp[2] = LITTLE32(workCtx_.x[4] ^
+        tmp[2] = LITTLE32(workCtx_.x[4] ^ 
                   (workCtx_.x[1]>>16) ^ U32V(workCtx_.x[7]<<16));
-        tmp[3] = LITTLE32(workCtx_.x[6] ^
+        tmp[3] = LITTLE32(workCtx_.x[6] ^ 
                   (workCtx_.x[3]>>16) ^ U32V(workCtx_.x[1]<<16));
 
         /* Encrypt/decrypt the data */
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/random.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/random.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/random.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/random.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -27,6 +27,7 @@
 #include <time.h>
 
 #if defined(_WIN32)
+    #define _WIN32_WINNT 0x0400
     #include <windows.h>
     #include <wincrypt.h>
 #else
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/ripemd.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/ripemd.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/ripemd.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/ripemd.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -507,6 +507,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void RIPEMD160::AsmTransform(const byte* data, word32 times)
 {
@@ -520,12 +522,11 @@
         ".intel_syntax noprefix;" \
         "push ebx;" \
         "push ebp;"
-
     #define EPILOG()  \
         "pop ebp;" \
         "pop ebx;" \
-               "emms;" \
-               ".att_syntax;" \
+       	"emms;" \
+       	".att_syntax;" \
             : \
             : "c" (this), "D" (data), "d" (times) \
             : "%esi", "%eax", "memory", "cc" \
@@ -571,7 +572,7 @@
 #ifdef _MSC_VER
     AS1( loopStart: )  // loopStart
 #else
-    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
 #endif
 
     AS2(    movd  mm2, edx              )   // store times_
@@ -830,7 +831,7 @@
     AS1(    jnz   0b )         // loopStart
 #endif
 
-    // inline adjust
+    // inline adjust 
     AS2(    add   esp, 24               )   // fix room on stack
 
     EPILOG()
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/rsa.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/rsa.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/rsa.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/rsa.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -177,7 +177,7 @@
 
     // skip past the padding until we find the separator
     unsigned i=1;
-    while (i<pkcsBlockLen && pkcsBlock[i++]) { // null body
+    while (i<pkcsBlockLen && pkcsBlock[i++] == 0xFF) { // null body
         }
     if (!(i==pkcsBlockLen || pkcsBlock[i-1]==0))
         return 0;
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/sha.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/sha.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/sha.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/sha.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -776,12 +776,11 @@
         ".intel_syntax noprefix;" \
         "push ebx;" \
         "push ebp;"
-
     #define EPILOG()  \
         "pop ebp;" \
         "pop ebx;" \
-               "emms;" \
-               ".att_syntax;" \
+       	"emms;" \
+       	".att_syntax;" \
             : \
             : "c" (this), "D" (data), "a" (times) \
             : "%esi", "%edx", "memory", "cc" \
@@ -830,7 +829,7 @@
 #ifdef _MSC_VER
     AS1( loopStart: )  // loopStart
 #else
-    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
 #endif
 
     // byte reverse 16 words of input, 4 at a time, put on stack for W[]
@@ -1022,7 +1021,7 @@
     AS1(    jnz   0b )         // loopStart
 #endif
 
-    // inline adjust
+    // inline adjust 
     AS2(    add   esp, 68               )   // fix room on stack
 
     EPILOG()
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/twofish.cpp percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/twofish.cpp
--- percona-xtrabackup-2.2.3/extra/yassl/taocrypt/src/twofish.cpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/taocrypt/src/twofish.cpp	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -285,12 +285,11 @@
             "push ebp;" \
             "movd mm3, eax;" \
             "movd mm6, ebp;"
-
         #define EPILOG()  \
             "pop ebp;" \
             "pop ebx;" \
-                   "emms;" \
-                   ".att_syntax;" \
+       	    "emms;" \
+       	    ".att_syntax;" \
                 : \
                 : "D" (this), "S" (inBlock), "a" (outBlock) \
                 : "%ecx", "%edx", "memory", "cc" \
@@ -479,7 +478,7 @@
     AS2(    movd  ebp, mm6                      )
     AS2(    movd  esi, mm0                      ) // k_
     #ifdef __GNUC__
-       AS2(    movd  edi, mm3                  ) // outBlock
+        AS2(    movd  edi, mm3                  ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif
@@ -500,7 +499,7 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked)
+    __declspec(naked) 
 #else
     __attribute__ ((noinline))
 #endif
@@ -551,7 +550,7 @@
     AS2(    movd  ebp, mm6                      )
     AS2(    movd  esi, mm0                      ) // k_
     #ifdef __GNUC__
-        AS2(    movd   edi, mm3                 ) // outBlock
+        AS2(    movd  edi, mm3                  ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/testsuite/cipher-test.sh percona-xtrabackup-2.3.7/extra/yassl/testsuite/cipher-test.sh
--- percona-xtrabackup-2.2.3/extra/yassl/testsuite/cipher-test.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/testsuite/cipher-test.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# test all yassl cipher suties 
+# 
+
+
+server_pid=$no_pid
+
+
+do_cleanup() {
+    echo "in cleanup"
+
+    if [[ $server_pid != $no_pid ]]
+    then
+        echo "killing server"
+        kill -9 $server_pid
+    fi
+}
+
+do_trap() {
+    echo "got trap"
+    do_cleanup
+    exit -1
+}
+
+trap do_trap INT TERM
+
+
+# make sure example server and client are built
+if test ! -s ../examples/server/server; then
+    echo "Please build yaSSL first, example server missing"
+    exit -1
+fi
+
+if test ! -s ../examples/client/client; then
+    echo "Please build yaSSL first, example client missing"
+    exit -1
+fi
+
+
+# non DSA suites
+for suite in {"DHE-RSA-AES256-SHA","AES256-SHA","DHE-RSA-AES128-SHA","AES128-SHA","AES256-RMD","AES128-RMD","DES-CBC3-RMD","DHE-RSA-AES256-RMD","DHE-RSA-AES128-RMD","DHE-RSA-DES-CBC3-RMD","RC4-SHA","RC4-MD5","DES-CBC3-SHA","DES-CBC-SHA","EDH-RSA-DES-CBC3-SHA","EDH-RSA-DES-CBC-SHA"}
+do
+  for client_auth in {y,n}
+  do
+    echo "Trying $suite client auth = $client_auth ..."
+
+    if test -e server_ready; then
+        echo -e "removing exisitng server_ready file"
+        rm server_ready
+    fi
+    ../examples/server/server $client_auth &
+    server_pid=$!
+
+    while [ ! -s server_ready ]; do
+        echo -e "waiting for server_ready file..."
+        sleep 0.1
+    done
+
+    ../examples/client/client $suite
+    client_result=$?
+
+    wait $server_pid
+    server_result=$?
+
+    server_pid=$no_pid
+
+    if [[ $client_result != 0 ]]
+    then
+        echo "Client Error"
+        exit $client_result
+    fi
+
+    if [[ $server_result != 0 ]]
+    then
+        echo "Server Error"
+        exit $server_result
+    fi
+
+  done   # end client auth loop
+done  # end non dsa suite list
+echo -e "Non DSA Loop SUCCESS"
+
+
+
+# DSA suites
+for suite in {"DHE-DSS-AES256-SHA","DHE-DSS-AES128-SHA","DHE-DSS-AES256-RMD","DHE-DSS-AES128-RMD","DHE-DSS-DES-CBC3-RMD","EDH-DSS-DES-CBC3-SHA","EDH-DSS-DES-CBC-SHA"}
+do
+  for client_auth in {y,n}
+  do
+    echo "Trying $suite client auth = $client_auth ..."
+
+    if test -e server_ready; then
+        echo -e "removing exisitng server_ready file"
+        rm server_ready
+    fi
+    # d signifies DSA
+    ../examples/server/server $client_auth d &
+    server_pid=$!
+
+    while [ ! -s server_ready ]; do
+        echo -e "waiting for server_ready file..."
+        sleep 0.1
+    done
+
+    ../examples/client/client $suite
+    client_result=$?
+
+    wait $server_pid
+    server_result=$?
+
+    server_pid=$no_pid
+
+    if [[ $client_result != 0 ]]
+    then
+        echo "Client Error"
+        exit $client_result
+    fi
+
+    if [[ $server_result != 0 ]]
+    then
+        echo "Server Error"
+        exit $server_result
+    fi
+
+  done   # end client auth loop
+done  # end dsa suite list
+echo -e "DSA Loop SUCCESS"
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/extra/yassl/testsuite/test.hpp percona-xtrabackup-2.3.7/extra/yassl/testsuite/test.hpp
--- percona-xtrabackup-2.2.3/extra/yassl/testsuite/test.hpp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/extra/yassl/testsuite/test.hpp	2017-02-27 07:47:02.000000000 +0000
@@ -131,9 +131,10 @@
     int    argc;
     char** argv;
     int    return_code;
+    const char* file_ready;
     tcp_ready* signal_;
 
-    func_args(int c = 0, char** v = 0) : argc(c), argv(v) {}
+    func_args(int c = 0, char** v = 0) : argc(c), argv(v), file_ready(0) {}
 
     void SetSignal(tcp_ready* p) { signal_ = p; }
 };
@@ -146,6 +147,7 @@
 // yaSSL
 const char* const    yasslIP      = "127.0.0.1";
 const unsigned short yasslPort    =  11111;
+const unsigned short proxyPort    =  12345;
 
 
 // client
@@ -172,13 +174,13 @@
 
 // server dsa
 const char* const dsaCert = "../certs/dsa-cert.pem";
-const char* const dsaKey  = "../certs/dsa512.der";
+const char* const dsaKey  = "../certs/dsa1024.der";
 
 const char* const dsaCert2 = "../../certs/dsa-cert.pem";
-const char* const dsaKey2  = "../../certs/dsa512.der";
+const char* const dsaKey2  = "../../certs/dsa1024.der";
 
 const char* const dsaCert3 = "../../../certs/dsa-cert.pem";
-const char* const dsaKey3  = "../../../certs/dsa512.der";
+const char* const dsaKey3  = "../../../certs/dsa1024.der";
 
 
 // CA 
@@ -222,6 +224,13 @@
         if (SSL_CTX_load_verify_locations(ctx, certSuite, 0) != SSL_SUCCESS)
             if (SSL_CTX_load_verify_locations(ctx, certDebug,0) != SSL_SUCCESS)
                 err_sys("failed to use certificate: certs/client-cert.pem");
+
+    // DSA cert 
+    if (SSL_CTX_load_verify_locations(ctx, dsaCert, 0) != SSL_SUCCESS)
+        if (SSL_CTX_load_verify_locations(ctx, dsaCert2, 0) != SSL_SUCCESS)
+            if (SSL_CTX_load_verify_locations(ctx, dsaCert3, 0) != SSL_SUCCESS)
+                err_sys("failed to use certificate: certs/dsa-cert.pem");
+
 }
 
 
@@ -298,7 +307,7 @@
             != SSL_SUCCESS) 
                 if (SSL_CTX_use_PrivateKey_file(ctx, dsaKey3,SSL_FILETYPE_ASN1)
                     != SSL_SUCCESS) 
-                    err_sys("failed to use key file: certs/dsa512.der");
+                    err_sys("failed to use key file: certs/dsa1024.der");
 }
 
 
@@ -310,6 +319,12 @@
 }
 
 
+inline void set_file_ready(const char* name, func_args& args)
+{
+    args.file_ready = name;
+}
+
+
 inline void tcp_set_nonblocking(SOCKET_T& sockfd)
 {
 #ifdef NON_BLOCKING
@@ -349,7 +364,11 @@
         */   // end external testing later
 #else
     addr.sin_family = AF_INET_V;
+#ifdef YASSL_PROXY_PORT
+    addr.sin_port = htons(proxyPort);
+#else
     addr.sin_port = htons(yasslPort);
+#endif
     addr.sin_addr.s_addr = inet_addr(yasslIP);
 #endif
 
@@ -401,6 +420,16 @@
 }
 
 
+inline void create_ready_file(func_args& args)
+{
+    FILE* f = fopen(args.file_ready, "w+");
+
+    if (f) {
+        fputs("ready", f);
+        fclose(f);
+    }
+}
+
 
 inline void tcp_accept(SOCKET_T& sockfd, SOCKET_T& clientfd, func_args& args)
 {
@@ -418,6 +447,9 @@
     pthread_mutex_unlock(&ready.mutex_);
 #endif
 
+    if (args.file_ready)
+        create_ready_file(args);
+
     clientfd = accept(sockfd, (sockaddr*)&client, (ACCEPT_THIRD_T)&client_len);
 
     if (clientfd == (SOCKET_T) -1) {
diff -Nru percona-xtrabackup-2.2.3/.gitignore percona-xtrabackup-2.3.7/.gitignore
--- percona-xtrabackup-2.2.3/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/.gitignore	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,3155 @@
+*-t
+*_test
+*.Plo
+*.Po
+*.a
+*.bb
+*.bbg
+*.bin
+*.cdf
+*.core
+*.d
+*.da
+*.dir
+*.dll
+*.dylib
+*.exe
+*.exp
+*.gcda
+*.gcno
+*.gcov
+*.idb
+*.ilk
+*.la
+*.lai
+*.lib
+*.lo
+*.manifest
+*.map
+*.o
+*.obj
+*.old
+*.pch
+*.pdb
+*.reject
+*.res
+*.rule
+*.sbr
+*.so
+*.so.*
+*.spec
+*.user
+*.vcproj
+*.vcproj.cmake
+*.vcxproj
+*.vcxproj.filters
+*/*.dir/*
+Debug
+MySql.sdf
+Win32
+*/*_pure_*warnings
+*/.deps
+*/.libs/*
+*/.pure
+*/debug/*
+*/minsizerel/*
+*/release/*
+RelWithDebInfo
+*~
+.*.swp
+./CMakeCache.txt
+./MySql.ncb
+./MySql.sln
+./MySql.suo
+./README.build-files
+./cmakecache.txt
+./config.h
+./copy_mysql_files.bat
+./fix-project-files
+./mysql*.ds?
+./mysql.ncb
+./mysql.sln
+./mysql.suo
+./prepare
+.DS_Store
+.defs.mk
+.depend
+.depend.mk
+.deps
+.gdb_history
+.gdbinit
+.libs
+.o
+.out
+.snprj/*
+.vimrc
+50
+=6
+BUILD/compile-pentium-maintainer
+BitKeeper/etc/RESYNC_TREE
+BitKeeper/etc/config
+BitKeeper/etc/csets
+BitKeeper/etc/csets-in
+BitKeeper/etc/csets-out
+BitKeeper/etc/gone
+BitKeeper/etc/level
+BitKeeper/etc/pushed
+BitKeeper/post-commit
+BitKeeper/post-commit-manual
+BitKeeper/tmp/*
+BitKeeper/tmp/bkr3sAHD
+BitKeeper/tmp/gone
+CMakeFiles
+CMakeFiles/*
+CTestTestfile.cmake
+COPYING
+COPYING.LIB
+Docs/#manual.texi#
+Docs/INSTALL-BINARY
+Docs/Images/myaccess-odbc.txt
+Docs/Images/myaccess.txt
+Docs/Images/myarchitecture.txt
+Docs/Images/mydll-properties.txt
+Docs/Images/mydsn-example.txt
+Docs/Images/mydsn-icon.txt
+Docs/Images/mydsn-options.txt
+Docs/Images/mydsn-setup.txt
+Docs/Images/mydsn-test-fail.txt
+Docs/Images/mydsn-test-success.txt
+Docs/Images/mydsn-trace.txt
+Docs/Images/mydsn.txt
+Docs/Images/myflowchart.txt
+Docs/include.texi
+Docs/internals.html
+Docs/internals.info
+Docs/internals.pdf
+Docs/internals.txt
+Docs/internals_toc.html
+Docs/manual.aux
+Docs/manual.cp
+Docs/manual.cps
+Docs/manual.de.log
+Docs/manual.dvi
+Docs/manual.fn
+Docs/manual.fns
+Docs/manual.html
+Docs/manual.ky
+Docs/manual.log
+Docs/manual.pdf
+Docs/manual.pg
+Docs/manual.texi.orig
+Docs/manual.texi.rej
+Docs/manual.toc
+Docs/manual.tp
+Docs/manual.txt
+Docs/manual.vr
+Docs/manual_a4.ps
+Docs/manual_letter.ps
+Docs/manual_toc.html
+Docs/my_sys.doc
+Docs/mysql.info
+Docs/mysql.xml
+Docs/safe-mysql.xml
+Docs/tex.fmt
+Docs/texi2dvi.out
+EXCEPTIONS-CLIENT
+INSTALL-SOURCE
+INSTALL-WIN-SOURCE
+Logs/*
+MIRRORS
+Makefile
+Makefile.in
+Makefile.in'
+PENDING/*
+scripts/scripts
+TAGS
+VC++Files/client/mysql_amd64.dsp
+ac_available_languages_fragment
+acinclude.m4
+aclocal.m4
+analyse.test
+autom4te-2.53.cache/*
+autom4te-2.53.cache/output.0
+autom4te-2.53.cache/requests
+autom4te-2.53.cache/traces.0
+autom4te.cache/*
+autom4te.cache/output.0
+autom4te.cache/requests
+autom4te.cache/traces.0
+bdb/*.ds?
+bdb/*.vcproj
+bdb/README
+bdb/btree/btree_auto.c
+bdb/build_unix/*
+bdb/build_vxworks/db.h
+bdb/build_vxworks/db_int.h
+bdb/build_win32/db.h
+bdb/build_win32/db_archive.dsp
+bdb/build_win32/db_checkpoint.dsp
+bdb/build_win32/db_config.h
+bdb/build_win32/db_cxx.h
+bdb/build_win32/db_deadlock.dsp
+bdb/build_win32/db_dll.dsp
+bdb/build_win32/db_dump.dsp
+bdb/build_win32/db_int.h
+bdb/build_win32/db_java.dsp
+bdb/build_win32/db_load.dsp
+bdb/build_win32/db_perf.dsp
+bdb/build_win32/db_printlog.dsp
+bdb/build_win32/db_recover.dsp
+bdb/build_win32/db_stat.dsp
+bdb/build_win32/db_static.dsp
+bdb/build_win32/db_tcl.dsp
+bdb/build_win32/db_test.dsp
+bdb/build_win32/db_upgrade.dsp
+bdb/build_win32/db_verify.dsp
+bdb/build_win32/ex_access.dsp
+bdb/build_win32/ex_btrec.dsp
+bdb/build_win32/ex_env.dsp
+bdb/build_win32/ex_lock.dsp
+bdb/build_win32/ex_mpool.dsp
+bdb/build_win32/ex_tpcb.dsp
+bdb/build_win32/excxx_access.dsp
+bdb/build_win32/excxx_btrec.dsp
+bdb/build_win32/excxx_env.dsp
+bdb/build_win32/excxx_lock.dsp
+bdb/build_win32/excxx_mpool.dsp
+bdb/build_win32/excxx_tpcb.dsp
+bdb/build_win32/include.tcl
+bdb/build_win32/libdb.def
+bdb/build_win32/libdb.rc
+bdb/db/crdel_auto.c
+bdb/db/db_auto.c
+bdb/dbinc_auto/*.*
+bdb/dbreg/dbreg_auto.c
+bdb/dist/autom4te-2.53.cache/*
+bdb/dist/autom4te-2.53.cache/output.0
+bdb/dist/autom4te-2.53.cache/requests
+bdb/dist/autom4te-2.53.cache/traces.0
+bdb/dist/autom4te.cache/*
+bdb/dist/autom4te.cache/output.0
+bdb/dist/autom4te.cache/requests
+bdb/dist/autom4te.cache/traces.0
+bdb/dist/config.hin
+bdb/dist/configure
+bdb/dist/db.h
+bdb/dist/db_config.h
+bdb/dist/db_cxx.h
+bdb/dist/db_int.h
+bdb/dist/include.tcl
+bdb/dist/tags
+bdb/dist/template/db_server_proc
+bdb/dist/template/gen_client_ret
+bdb/dist/template/rec_btree
+bdb/dist/template/rec_crdel
+bdb/dist/template/rec_db
+bdb/dist/template/rec_dbreg
+bdb/dist/template/rec_fileops
+bdb/dist/template/rec_hash
+bdb/dist/template/rec_log
+bdb/dist/template/rec_qam
+bdb/dist/template/rec_txn
+bdb/examples_c/ex_apprec/ex_apprec_auto.c
+bdb/examples_c/ex_apprec/ex_apprec_auto.h
+bdb/examples_c/ex_apprec/ex_apprec_template
+bdb/examples_java
+bdb/fileops/fileops_auto.c
+bdb/hash/hash_auto.c
+bdb/include/btree_auto.h
+bdb/include/btree_ext.h
+bdb/include/clib_ext.h
+bdb/include/common_ext.h
+bdb/include/crdel_auto.h
+bdb/include/db_auto.h
+bdb/include/db_ext.h
+bdb/include/db_server.h
+bdb/include/env_ext.h
+bdb/include/gen_client_ext.h
+bdb/include/gen_server_ext.h
+bdb/include/hash_auto.h
+bdb/include/hash_ext.h
+bdb/include/lock_ext.h
+bdb/include/log_auto.h
+bdb/include/log_ext.h
+bdb/include/mp_ext.h
+bdb/include/mutex_ext.h
+bdb/include/os_ext.h
+bdb/include/qam_auto.h
+bdb/include/qam_ext.h
+bdb/include/rpc_client_ext.h
+bdb/include/rpc_server_ext.h
+bdb/include/tcl_ext.h
+bdb/include/txn_auto.h
+bdb/include/txn_ext.h
+bdb/include/xa_ext.h
+bdb/java/src/com/sleepycat/db/Db.java
+bdb/java/src/com/sleepycat/db/DbBtreeStat.java
+bdb/java/src/com/sleepycat/db/DbConstants.java
+bdb/java/src/com/sleepycat/db/DbHashStat.java
+bdb/java/src/com/sleepycat/db/DbLockStat.java
+bdb/java/src/com/sleepycat/db/DbLogStat.java
+bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
+bdb/java/src/com/sleepycat/db/DbQueueStat.java
+bdb/java/src/com/sleepycat/db/DbRepStat.java
+bdb/java/src/com/sleepycat/db/DbTxnStat.java
+bdb/libdb_java/java_stat_auto.c
+bdb/libdb_java/java_stat_auto.h
+bdb/log/log_auto.c
+bdb/qam/qam_auto.c
+bdb/rpc_client/db_server_clnt.c
+bdb/rpc_client/gen_client.c
+bdb/rpc_server/c/db_server_proc.c
+bdb/rpc_server/c/db_server_proc.sed
+bdb/rpc_server/c/db_server_svc.c
+bdb/rpc_server/c/db_server_xdr.c
+bdb/rpc_server/c/gen_db_server.c
+bdb/rpc_server/db_server.x
+bdb/rpc_server/db_server_proc.sed
+bdb/rpc_server/db_server_svc.c
+bdb/rpc_server/db_server_xdr.c
+bdb/rpc_server/gen_db_server.c
+bdb/test/TESTS
+bdb/test/include.tcl
+bdb/test/logtrack.list
+bdb/txn/txn_auto.c
+binary/*
+bkpull.log
+bkpull.log*
+bkpull.log.2
+bkpull.log.3
+bkpull.log.4
+bkpull.log.5
+bkpull.log.6
+bkpush.log
+bkpush.log*
+build.log
+build_tags.sh
+client/#mysql.cc#
+client/*.ds?
+client/*.vcproj
+client/.deps/base64.Po
+client/.deps/completion_hash.Po
+client/.deps/dummy.Po
+client/.deps/mf_tempdir.Po
+client/.deps/my_bit.Po
+client/.deps/my_bitmap.Po
+client/.deps/my_getsystime.Po
+client/.deps/my_new.Po
+client/.deps/my_user.Po
+client/.deps/my_vle.Po
+client/.deps/mysql.Po
+client/.deps/mysql_upgrade.Po
+client/.deps/mysqladmin.Po
+client/.deps/mysqlbinlog.Po
+client/.deps/mysqlcheck.Po
+client/.deps/mysqldump.Po
+client/.deps/mysqlimport.Po
+client/.deps/mysqlshow.Po
+client/.deps/mysqlslap.Po
+client/.deps/mysqltest.Po
+client/.deps/readline.Po
+client/.deps/sql_string.Po
+client/.libs -prune
+client/.libs/lt-mysql
+client/.libs/lt-mysqladmin
+client/.libs/lt-mysqlbinlog
+client/.libs/lt-mysqlcheck
+client/.libs/lt-mysqldump
+client/.libs/lt-mysqlimport
+client/.libs/lt-mysqlshow
+client/.libs/lt-mysqlslap
+client/.libs/lt-mysqltest
+client/.libs/mysql
+client/.libs/mysql_upgrade
+client/.libs/mysqladmin
+client/.libs/mysqlbinlog
+client/.libs/mysqlcheck
+client/.libs/mysqldump
+client/.libs/mysqlimport
+client/.libs/mysqlshow
+client/.libs/mysqlslap
+client/.libs/mysqltest
+client/completion_hash.cpp
+client/decimal.c
+client/insert_test
+client/link_sources
+client/log_event.cc
+client/log_event.h
+client/log_event_old.cc
+client/log_event_old.h
+client/mf_iocache.c
+client/mf_iocache.cc
+client/my_decimal.cc
+client/my_decimal.h
+client/my_user.c
+client/mysql
+client/mysql.cpp
+client/mysql_config_editor
+client/mysql_upgrade
+client/mysqladmin
+client/mysqladmin.c
+client/mysqladmin.cpp
+client/mysqlbinlog
+client/mysqlbinlog.cpp
+client/mysqlcheck
+client/mysqldump
+client/mysqlimport
+client/mysqlmanager-pwgen
+client/mysqlmanagerc
+client/mysqlshow
+client/mysqlslap
+client/mysqltest
+client/mysqltestmanager-pwgen
+client/mysqltestmanagerc
+client/mysys_priv.h
+client/readline.cpp
+client/rpl_constants.h
+client/rpl_record_old.cc
+client/rpl_record_old.h
+client/rpl_tblmap.h
+client/rpl_tblmap.cc
+client/rpl_utility.h
+client/rpl_utility.cc
+client/select_test
+client/sql_const.h
+client/sql_string.cpp
+client/ssl_test
+client/thimble
+client/thread_test
+client/tmp.diff
+client_debug/*
+client_release/*
+client_test
+cmake_install.cmake
+cmd-line-utils/libedit/.deps/chared.Po
+cmd-line-utils/libedit/.deps/common.Po
+cmd-line-utils/libedit/.deps/el.Po
+cmd-line-utils/libedit/.deps/emacs.Po
+cmd-line-utils/libedit/.deps/fcns.Po
+cmd-line-utils/libedit/.deps/fgetln.Po
+cmd-line-utils/libedit/.deps/help.Po
+cmd-line-utils/libedit/.deps/hist.Po
+cmd-line-utils/libedit/.deps/history.Po
+cmd-line-utils/libedit/.deps/key.Po
+cmd-line-utils/libedit/.deps/map.Po
+cmd-line-utils/libedit/.deps/parse.Po
+cmd-line-utils/libedit/.deps/prompt.Po
+cmd-line-utils/libedit/.deps/read.Po
+cmd-line-utils/libedit/.deps/readline.Po
+cmd-line-utils/libedit/.deps/refresh.Po
+cmd-line-utils/libedit/.deps/search.Po
+cmd-line-utils/libedit/.deps/sig.Po
+cmd-line-utils/libedit/.deps/strlcat.Po
+cmd-line-utils/libedit/.deps/strlcpy.Po
+cmd-line-utils/libedit/.deps/term.Po
+cmd-line-utils/libedit/.deps/tokenizer.Po
+cmd-line-utils/libedit/.deps/tty.Po
+cmd-line-utils/libedit/.deps/unvis.Po
+cmd-line-utils/libedit/.deps/vi.Po
+cmd-line-utils/libedit/.deps/vis.Po
+cmd-line-utils/libedit/common.h
+cmd-line-utils/libedit/makelist
+cmd-line-utils/readline/.deps/bind.Po
+cmd-line-utils/readline/.deps/callback.Po
+cmd-line-utils/readline/.deps/compat.Po
+cmd-line-utils/readline/.deps/complete.Po
+cmd-line-utils/readline/.deps/display.Po
+cmd-line-utils/readline/.deps/funmap.Po
+cmd-line-utils/readline/.deps/histexpand.Po
+cmd-line-utils/readline/.deps/histfile.Po
+cmd-line-utils/readline/.deps/history.Po
+cmd-line-utils/readline/.deps/histsearch.Po
+cmd-line-utils/readline/.deps/input.Po
+cmd-line-utils/readline/.deps/isearch.Po
+cmd-line-utils/readline/.deps/keymaps.Po
+cmd-line-utils/readline/.deps/kill.Po
+cmd-line-utils/readline/.deps/macro.Po
+cmd-line-utils/readline/.deps/mbutil.Po
+cmd-line-utils/readline/.deps/misc.Po
+cmd-line-utils/readline/.deps/nls.Po
+cmd-line-utils/readline/.deps/parens.Po
+cmd-line-utils/readline/.deps/readline.Po
+cmd-line-utils/readline/.deps/rltty.Po
+cmd-line-utils/readline/.deps/savestring.Po
+cmd-line-utils/readline/.deps/search.Po
+cmd-line-utils/readline/.deps/shell.Po
+cmd-line-utils/readline/.deps/signals.Po
+cmd-line-utils/readline/.deps/terminal.Po
+cmd-line-utils/readline/.deps/text.Po
+cmd-line-utils/readline/.deps/tilde.Po
+cmd-line-utils/readline/.deps/undo.Po
+cmd-line-utils/readline/.deps/util.Po
+cmd-line-utils/readline/.deps/vi_mode.Po
+cmd-line-utils/readline/.deps/xmalloc.Po
+comon.h
+comp_err/*.ds?
+comp_err/*.vcproj
+compile
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.lineno
+contrib/*.ds?
+contrib/*.vcproj
+core
+core.*
+cscope.in.out
+cscope.out
+cscope.po.out
+db-*.*.*
+dbug/*.ds?
+dbug/*.vcproj
+dbug/.deps/dbug.Po
+dbug/.deps/dbug_analyze.Po
+dbug/.deps/factorial.Po
+dbug/.deps/my_main.Po
+dbug/.deps/sanity.Po
+dbug/dbug_analyze
+dbug/example*.r
+dbug/factorial
+dbug/factorial.r
+dbug/main.r
+dbug/output*.r
+dbug/user.ps
+dbug/user.t
+debian/control
+debian/defs.mk
+depcomp
+emacs.h
+examples/*.ds?
+examples/*.vcproj
+examples/udf_example/udf_example.def
+extra/.deps/comp_err.Po
+extra/.deps/innochecksum.Po
+extra/.deps/my_print_defaults.Po
+extra/.deps/mysql_waitpid.Po
+extra/.deps/perror.Po
+extra/.deps/replace.Po
+extra/.deps/resolve_stack_dump.Po
+extra/.deps/resolveip.Po
+extra/comp_err
+extra/created_include_files
+extra/innochecksum
+extra/my_print_defaults
+extra/mysql_install
+extra/mysql_tzinfo_to_sql
+extra/mysql_waitpid
+extra/mysqld_ername.h
+extra/mysqld_error.h
+extra/perror
+extra/replace
+extra/resolve_stack_dump
+extra/resolveip
+extra/sql_state.h
+extra/tztime.cc
+extra/yassl/src/.deps/buffer.Plo
+extra/yassl/src/.deps/cert_wrapper.Plo
+extra/yassl/src/.deps/crypto_wrapper.Plo
+extra/yassl/src/.deps/handshake.Plo
+extra/yassl/src/.deps/lock.Plo
+extra/yassl/src/.deps/log.Plo
+extra/yassl/src/.deps/socket_wrapper.Plo
+extra/yassl/src/.deps/ssl.Plo
+extra/yassl/src/.deps/template_instnt.Plo
+extra/yassl/src/.deps/timer.Plo
+extra/yassl/src/.deps/yassl_error.Plo
+extra/yassl/src/.deps/yassl_imp.Plo
+extra/yassl/src/.deps/yassl_int.Plo
+extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po
+extra/yassl/taocrypt/benchmark/benchmark
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-hash.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo
+extra/yassl/taocrypt/test/.deps/test-test.Po
+extra/yassl/taocrypt/test/test
+extra/yassl/testsuite/.deps/testsuite-client.Po
+extra/yassl/testsuite/.deps/testsuite-echoclient.Po
+extra/yassl/testsuite/.deps/testsuite-echoserver.Po
+extra/yassl/testsuite/.deps/testsuite-server.Po
+extra/yassl/testsuite/.deps/testsuite-test.Po
+extra/yassl/testsuite/.deps/testsuite-testsuite.Po
+extra/yassl/testsuite/testsuite
+fcns.c
+fcns.h
+gdbinit
+gmon.out
+hardcopy.0
+heap/*.ds?
+heap/*.vcproj
+heap/hp_test1
+heap/hp_test2
+help
+help.c
+help.h
+include/abi_check
+include/check_abi
+include/link_sources
+include/my_config.h
+include/my_global.h
+include/mysql_h.ic
+include/mysql_version.h
+include/mysqld_ername.h
+include/mysqld_error.h
+include/mysqld_error.h.rule
+include/openssl
+include/probes_mysql_dtrace.h
+include/readline
+include/readline/*.h
+include/readline/readline.h
+include/sql_state.h
+include/widec.h
+innobase/*.ds?
+innobase/*.vcproj
+innobase/autom4te-2.53.cache/*
+innobase/autom4te-2.53.cache/output.0
+innobase/autom4te-2.53.cache/requests
+innobase/autom4te-2.53.cache/traces.0
+innobase/autom4te.cache/*
+innobase/autom4te.cache/output.0
+innobase/autom4te.cache/requests
+innobase/autom4te.cache/traces.0
+innobase/configure.lineno
+innobase/conftest.s1
+innobase/conftest.subs
+innobase/ib_config.h
+innobase/ib_config.h.in
+innobase/mkinstalldirs
+innobase/stamp-h1
+insert_test
+install
+install-sh
+isam/*.ds?
+isam/*.vcproj
+isam/isamchk
+isam/isamlog
+isam/pack_isam
+isam/test1
+isam/test2
+isam/test3
+isamchk/*.ds?
+isamchk/*.vcproj
+item_xmlfunc.cc
+lib_debug/*
+lib_release/*
+libmysql/*.c
+libmysql/*.ds?
+libmysql/*.vcproj
+libmysql/.deps/array.Plo
+libmysql/.deps/bchange.Plo
+libmysql/.deps/bcmp.Plo
+libmysql/.deps/bmove.Plo
+libmysql/.deps/bmove_upp.Plo
+libmysql/.deps/charset-def.Plo
+libmysql/.deps/charset.Plo
+libmysql/.deps/client.Plo
+libmysql/.deps/conf_to_src.Po
+libmysql/.deps/ctype-big5.Plo
+libmysql/.deps/ctype-bin.Plo
+libmysql/.deps/ctype-cp932.Plo
+libmysql/.deps/ctype-czech.Plo
+libmysql/.deps/ctype-euc_kr.Plo
+libmysql/.deps/ctype-eucjpms.Plo
+libmysql/.deps/ctype-extra.Plo
+libmysql/.deps/ctype-gb2312.Plo
+libmysql/.deps/ctype-gbk.Plo
+libmysql/.deps/ctype-latin1.Plo
+libmysql/.deps/ctype-mb.Plo
+libmysql/.deps/ctype-simple.Plo
+libmysql/.deps/ctype-sjis.Plo
+libmysql/.deps/ctype-tis620.Plo
+libmysql/.deps/ctype-uca.Plo
+libmysql/.deps/ctype-ucs2.Plo
+libmysql/.deps/ctype-ujis.Plo
+libmysql/.deps/ctype-utf8.Plo
+libmysql/.deps/ctype-win1250ch.Plo
+libmysql/.deps/ctype.Plo
+libmysql/.deps/dbug.Plo
+libmysql/.deps/default.Plo
+libmysql/.deps/default_modify.Plo
+libmysql/.deps/errmsg.Plo
+libmysql/.deps/errors.Plo
+libmysql/.deps/get_password.Plo
+libmysql/.deps/hash.Plo
+libmysql/.deps/int2str.Plo
+libmysql/.deps/is_prefix.Plo
+libmysql/.deps/libmysql.Plo
+libmysql/.deps/list.Plo
+libmysql/.deps/llstr.Plo
+libmysql/.deps/longlong2str.Plo
+libmysql/.deps/manager.Plo
+libmysql/.deps/md5.Plo
+libmysql/.deps/mf_cache.Plo
+libmysql/.deps/mf_dirname.Plo
+libmysql/.deps/mf_fn_ext.Plo
+libmysql/.deps/mf_format.Plo
+libmysql/.deps/mf_iocache.Plo
+libmysql/.deps/mf_iocache2.Plo
+libmysql/.deps/mf_loadpath.Plo
+libmysql/.deps/mf_pack.Plo
+libmysql/.deps/mf_path.Plo
+libmysql/.deps/mf_tempfile.Plo
+libmysql/.deps/mf_unixpath.Plo
+libmysql/.deps/mf_wcomp.Plo
+libmysql/.deps/mulalloc.Plo
+libmysql/.deps/my_alloc.Plo
+libmysql/.deps/my_chsize.Plo
+libmysql/.deps/my_compress.Plo
+libmysql/.deps/my_create.Plo
+libmysql/.deps/my_delete.Plo
+libmysql/.deps/my_div.Plo
+libmysql/.deps/my_error.Plo
+libmysql/.deps/my_file.Plo
+libmysql/.deps/my_fopen.Plo
+libmysql/.deps/my_fstream.Plo
+libmysql/.deps/my_gethostbyname.Plo
+libmysql/.deps/my_getopt.Plo
+libmysql/.deps/my_getwd.Plo
+libmysql/.deps/my_init.Plo
+libmysql/.deps/my_lib.Plo
+libmysql/.deps/my_malloc.Plo
+libmysql/.deps/my_messnc.Plo
+libmysql/.deps/my_net.Plo
+libmysql/.deps/my_once.Plo
+libmysql/.deps/my_open.Plo
+libmysql/.deps/my_port.Plo
+libmysql/.deps/my_pread.Plo
+libmysql/.deps/my_pthread.Plo
+libmysql/.deps/my_read.Plo
+libmysql/.deps/my_realloc.Plo
+libmysql/.deps/my_rename.Plo
+libmysql/.deps/my_seek.Plo
+libmysql/.deps/my_sleep.Plo
+libmysql/.deps/my_static.Plo
+libmysql/.deps/my_strtoll10.Plo
+libmysql/.deps/my_symlink.Plo
+libmysql/.deps/my_thr_init.Plo
+libmysql/.deps/my_time.Plo
+libmysql/.deps/my_vsnprintf.Plo
+libmysql/.deps/my_write.Plo
+libmysql/.deps/net.Plo
+libmysql/.deps/pack.Plo
+libmysql/.deps/password.Plo
+libmysql/.deps/safemalloc.Plo
+libmysql/.deps/sha1.Plo
+libmysql/.deps/str2int.Plo
+libmysql/.deps/str_alloc.Plo
+libmysql/.deps/strcend.Plo
+libmysql/.deps/strcont.Plo
+libmysql/.deps/strend.Plo
+libmysql/.deps/strfill.Plo
+libmysql/.deps/string.Plo
+libmysql/.deps/strinstr.Plo
+libmysql/.deps/strmake.Plo
+libmysql/.deps/strmov.Plo
+libmysql/.deps/strnlen.Plo
+libmysql/.deps/strnmov.Plo
+libmysql/.deps/strtod.Plo
+libmysql/.deps/strtoll.Plo
+libmysql/.deps/strtoull.Plo
+libmysql/.deps/strxmov.Plo
+libmysql/.deps/strxnmov.Plo
+libmysql/.deps/thr_mutex.Plo
+libmysql/.deps/typelib.Plo
+libmysql/.deps/vio.Plo
+libmysql/.deps/viosocket.Plo
+libmysql/.deps/viossl.Plo
+libmysql/.deps/viosslfactories.Plo
+libmysql/.deps/xml.Plo
+libmysql/.libs/libmysqlclient.lai
+libmysql/.libs/libmysqlclient.so.15
+libmysql/.libs/libmysqlclient.so.15.0.0
+libmysql/conf_to_src
+libmysql/debug/libmysql.exp
+libmysql/libmysql.ver
+libmysql/link_sources
+libmysql/my_static.h
+libmysql/my_time.c
+libmysql/mysys_priv.h
+libmysql/net.c
+libmysql/release/libmysql.exp
+libmysql/vio_priv.h
+libmysql/viosocket.o.6WmSJk
+libmysql_r/*.c
+libmysql_r/.deps/array.Plo
+libmysql_r/.deps/bchange.Plo
+libmysql_r/.deps/bcmp.Plo
+libmysql_r/.deps/bmove.Plo
+libmysql_r/.deps/bmove_upp.Plo
+libmysql_r/.deps/charset-def.Plo
+libmysql_r/.deps/charset.Plo
+libmysql_r/.deps/client.Plo
+libmysql_r/.deps/conf_to_src.Po
+libmysql_r/.deps/ctype-big5.Plo
+libmysql_r/.deps/ctype-bin.Plo
+libmysql_r/.deps/ctype-cp932.Plo
+libmysql_r/.deps/ctype-czech.Plo
+libmysql_r/.deps/ctype-euc_kr.Plo
+libmysql_r/.deps/ctype-eucjpms.Plo
+libmysql_r/.deps/ctype-extra.Plo
+libmysql_r/.deps/ctype-gb2312.Plo
+libmysql_r/.deps/ctype-gbk.Plo
+libmysql_r/.deps/ctype-latin1.Plo
+libmysql_r/.deps/ctype-mb.Plo
+libmysql_r/.deps/ctype-simple.Plo
+libmysql_r/.deps/ctype-sjis.Plo
+libmysql_r/.deps/ctype-tis620.Plo
+libmysql_r/.deps/ctype-uca.Plo
+libmysql_r/.deps/ctype-ucs2.Plo
+libmysql_r/.deps/ctype-ujis.Plo
+libmysql_r/.deps/ctype-utf8.Plo
+libmysql_r/.deps/ctype-win1250ch.Plo
+libmysql_r/.deps/ctype.Plo
+libmysql_r/.deps/dbug.Plo
+libmysql_r/.deps/default.Plo
+libmysql_r/.deps/default_modify.Plo
+libmysql_r/.deps/errmsg.Plo
+libmysql_r/.deps/errors.Plo
+libmysql_r/.deps/get_password.Plo
+libmysql_r/.deps/hash.Plo
+libmysql_r/.deps/int2str.Plo
+libmysql_r/.deps/is_prefix.Plo
+libmysql_r/.deps/libmysql.Plo
+libmysql_r/.deps/list.Plo
+libmysql_r/.deps/llstr.Plo
+libmysql_r/.deps/longlong2str.Plo
+libmysql_r/.deps/manager.Plo
+libmysql_r/.deps/md5.Plo
+libmysql_r/.deps/mf_cache.Plo
+libmysql_r/.deps/mf_dirname.Plo
+libmysql_r/.deps/mf_fn_ext.Plo
+libmysql_r/.deps/mf_format.Plo
+libmysql_r/.deps/mf_iocache.Plo
+libmysql_r/.deps/mf_iocache2.Plo
+libmysql_r/.deps/mf_loadpath.Plo
+libmysql_r/.deps/mf_pack.Plo
+libmysql_r/.deps/mf_path.Plo
+libmysql_r/.deps/mf_tempfile.Plo
+libmysql_r/.deps/mf_unixpath.Plo
+libmysql_r/.deps/mf_wcomp.Plo
+libmysql_r/.deps/mulalloc.Plo
+libmysql_r/.deps/my_alloc.Plo
+libmysql_r/.deps/my_chsize.Plo
+libmysql_r/.deps/my_compress.Plo
+libmysql_r/.deps/my_create.Plo
+libmysql_r/.deps/my_delete.Plo
+libmysql_r/.deps/my_div.Plo
+libmysql_r/.deps/my_error.Plo
+libmysql_r/.deps/my_file.Plo
+libmysql_r/.deps/my_fopen.Plo
+libmysql_r/.deps/my_fstream.Plo
+libmysql_r/.deps/my_gethostbyname.Plo
+libmysql_r/.deps/my_getopt.Plo
+libmysql_r/.deps/my_getwd.Plo
+libmysql_r/.deps/my_init.Plo
+libmysql_r/.deps/my_lib.Plo
+libmysql_r/.deps/my_malloc.Plo
+libmysql_r/.deps/my_messnc.Plo
+libmysql_r/.deps/my_net.Plo
+libmysql_r/.deps/my_once.Plo
+libmysql_r/.deps/my_open.Plo
+libmysql_r/.deps/my_port.Plo
+libmysql_r/.deps/my_pread.Plo
+libmysql_r/.deps/my_pthread.Plo
+libmysql_r/.deps/my_read.Plo
+libmysql_r/.deps/my_realloc.Plo
+libmysql_r/.deps/my_rename.Plo
+libmysql_r/.deps/my_seek.Plo
+libmysql_r/.deps/my_sleep.Plo
+libmysql_r/.deps/my_static.Plo
+libmysql_r/.deps/my_strtoll10.Plo
+libmysql_r/.deps/my_symlink.Plo
+libmysql_r/.deps/my_thr_init.Plo
+libmysql_r/.deps/my_time.Plo
+libmysql_r/.deps/my_vsnprintf.Plo
+libmysql_r/.deps/my_write.Plo
+libmysql_r/.deps/net.Plo
+libmysql_r/.deps/pack.Plo
+libmysql_r/.deps/password.Plo
+libmysql_r/.deps/safemalloc.Plo
+libmysql_r/.deps/sha1.Plo
+libmysql_r/.deps/str2int.Plo
+libmysql_r/.deps/str_alloc.Plo
+libmysql_r/.deps/strcend.Plo
+libmysql_r/.deps/strcont.Plo
+libmysql_r/.deps/strend.Plo
+libmysql_r/.deps/strfill.Plo
+libmysql_r/.deps/string.Plo
+libmysql_r/.deps/strinstr.Plo
+libmysql_r/.deps/strmake.Plo
+libmysql_r/.deps/strmov.Plo
+libmysql_r/.deps/strnlen.Plo
+libmysql_r/.deps/strnmov.Plo
+libmysql_r/.deps/strtod.Plo
+libmysql_r/.deps/strtoll.Plo
+libmysql_r/.deps/strtoull.Plo
+libmysql_r/.deps/strxmov.Plo
+libmysql_r/.deps/strxnmov.Plo
+libmysql_r/.deps/thr_mutex.Plo
+libmysql_r/.deps/typelib.Plo
+libmysql_r/.deps/vio.Plo
+libmysql_r/.deps/viosocket.Plo
+libmysql_r/.deps/viossl.Plo
+libmysql_r/.deps/viosslfactories.Plo
+libmysql_r/.deps/xml.Plo
+libmysql_r/.libs/libmysqlclient_r.lai
+libmysql_r/.libs/libmysqlclient_r.so.15
+libmysql_r/.libs/libmysqlclient_r.so.15.0.0
+libmysql_r/acconfig.h
+libmysql_r/client_settings.h
+libmysql_r/conf_to_src
+libmysql_r/link_sources
+libmysql_r/my_static.h
+libmysql_r/mysys_priv.h
+libmysql_r/vio_priv.h
+libmysqld/*.ds?
+libmysqld/*.vcproj
+libmysqld/.deps/client.Po
+libmysqld/.deps/derror.Po
+libmysqld/.deps/discover.Po
+libmysqld/.deps/emb_qcache.Po
+libmysqld/.deps/errmsg.Po
+libmysqld/.deps/event_data_objects.Po
+libmysqld/.deps/event_db_repository.Po
+libmysqld/.deps/event_queue.Po
+libmysqld/.deps/event_scheduler.Po
+libmysqld/.deps/events.Po
+libmysqld/.deps/field.Po
+libmysqld/.deps/field_conv.Po
+libmysqld/.deps/filesort.Po
+libmysqld/.deps/get_password.Po
+libmysqld/.deps/gstream.Po
+libmysqld/.deps/ha_berkeley.Po
+libmysqld/.deps/ha_federated.Po
+libmysqld/.deps/ha_heap.Po
+libmysqld/.deps/ha_innodb.Po
+libmysqld/.deps/ha_myisam.Po
+libmysqld/.deps/ha_myisammrg.Po
+libmysqld/.deps/ha_ndbcluster.Po
+libmysqld/.deps/ha_ndbcluster_binlog.Po
+libmysqld/.deps/ha_partition.Po
+libmysqld/.deps/handler.Po
+libmysqld/.deps/hash_filo.Po
+libmysqld/.deps/hostname.Po
+libmysqld/.deps/init.Po
+libmysqld/.deps/item.Po
+libmysqld/.deps/item_buff.Po
+libmysqld/.deps/item_cmpfunc.Po
+libmysqld/.deps/item_create.Po
+libmysqld/.deps/item_func.Po
+libmysqld/.deps/item_geofunc.Po
+libmysqld/.deps/item_row.Po
+libmysqld/.deps/item_strfunc.Po
+libmysqld/.deps/item_subselect.Po
+libmysqld/.deps/item_sum.Po
+libmysqld/.deps/item_timefunc.Po
+libmysqld/.deps/item_uniq.Po
+libmysqld/.deps/item_xmlfunc.Po
+libmysqld/.deps/key.Po
+libmysqld/.deps/lib_sql.Po
+libmysqld/.deps/libmysql.Po
+libmysqld/.deps/libmysqld.Po
+libmysqld/.deps/lock.Po
+libmysqld/.deps/log.Po
+libmysqld/.deps/log_event.Po
+libmysqld/.deps/my_decimal.Po
+libmysqld/.deps/my_time.Po
+libmysqld/.deps/my_user.Po
+libmysqld/.deps/net_serv.Po
+libmysqld/.deps/opt_range.Po
+libmysqld/.deps/opt_sum.Po
+libmysqld/.deps/pack.Po
+libmysqld/.deps/parse_file.Po
+libmysqld/.deps/partition_info.Po
+libmysqld/.deps/password.Po
+libmysqld/.deps/procedure.Po
+libmysqld/.deps/protocol.Po
+libmysqld/.deps/records.Po
+libmysqld/.deps/rpl_filter.Po
+libmysqld/.deps/rpl_injector.Po
+libmysqld/.deps/set_var.Po
+libmysqld/.deps/sp.Po
+libmysqld/.deps/sp_cache.Po
+libmysqld/.deps/sp_head.Po
+libmysqld/.deps/sp_pcontext.Po
+libmysqld/.deps/sp_rcontext.Po
+libmysqld/.deps/spatial.Po
+libmysqld/.deps/sql_acl.Po
+libmysqld/.deps/sql_analyse.Po
+libmysqld/.deps/sql_base.Po
+libmysqld/.deps/sql_builtin.Po
+libmysqld/.deps/sql_cache.Po
+libmysqld/.deps/sql_class.Po
+libmysqld/.deps/sql_crypt.Po
+libmysqld/.deps/sql_cursor.Po
+libmysqld/.deps/sql_db.Po
+libmysqld/.deps/sql_delete.Po
+libmysqld/.deps/sql_truncate.Po
+libmysqld/.deps/sql_reload.Po
+libmysqld/.deps/datadict.Po
+libmysqld/.deps/sql_derived.Po
+libmysqld/.deps/sql_do.Po
+libmysqld/.deps/sql_error.Po
+libmysqld/.deps/sql_handler.Po
+libmysqld/.deps/sql_help.Po
+libmysqld/.deps/sql_insert.Po
+libmysqld/.deps/sql_lex.Po
+libmysqld/.deps/sql_list.Po
+libmysqld/.deps/sql_load.Po
+libmysqld/.deps/sql_manager.Po
+libmysqld/.deps/sql_map.Po
+libmysqld/.deps/sql_parse.Po
+libmysqld/.deps/sql_partition.Po
+libmysqld/.deps/sql_plugin.Po
+libmysqld/.deps/sql_prepare.Po
+libmysqld/.deps/sql_rename.Po
+libmysqld/.deps/sql_select.Po
+libmysqld/.deps/sql_show.Po
+libmysqld/.deps/sql_state.Po
+libmysqld/.deps/sql_string.Po
+libmysqld/.deps/sql_table.Po
+libmysqld/.deps/sql_tablespace.Po
+libmysqld/.deps/sql_test.Po
+libmysqld/.deps/sql_trigger.Po
+libmysqld/.deps/sql_udf.Po
+libmysqld/.deps/sql_union.Po
+libmysqld/.deps/sql_update.Po
+libmysqld/.deps/sql_view.Po
+libmysqld/.deps/sql_yacc.Po
+libmysqld/.deps/stacktrace.Po
+libmysqld/.deps/strfunc.Po
+libmysqld/.deps/table.Po
+libmysqld/.deps/thr_malloc.Po
+libmysqld/.deps/time.Po
+libmysqld/.deps/tztime.Po
+libmysqld/.deps/uniques.Po
+libmysqld/.deps/unireg.Po
+libmysqld/backup_dir
+libmysqld/client.c
+libmysqld/client_settings.h
+libmysqld/cmake_dummy.c
+libmysqld/convert.cc
+libmysqld/derror.cc
+libmysqld/discover.cc
+libmysqld/emb_qcache.cpp
+libmysqld/errmsg.c
+libmysqld/event.cc
+libmysqld/event_data_objects.cc
+libmysqld/event_db_repository.cc
+libmysqld/event_executor.cc
+libmysqld/event_queue.cc
+libmysqld/event_scheduler.cc
+libmysqld/event_timed.cc
+libmysqld/events.cc
+libmysqld/examples/.deps/completion_hash.Po
+libmysqld/examples/.deps/mysql.Po
+libmysqld/examples/.deps/mysql_client_test.Po
+libmysqld/examples/.deps/mysqltest.Po
+libmysqld/examples/.deps/readline.Po
+libmysqld/examples/client_test.c
+libmysqld/examples/client_test.cc
+libmysqld/examples/completion_hash.cc
+libmysqld/examples/completion_hash.h
+libmysqld/examples/link_sources
+libmysqld/examples/my_readline.h
+libmysqld/examples/mysql
+libmysqld/examples/mysql.cc
+libmysqld/examples/mysql_client_test.c
+libmysqld/examples/mysql_client_test_embedded
+libmysqld/examples/mysqltest
+libmysqld/examples/mysqltest.c
+libmysqld/examples/mysqltest_embedded
+libmysqld/examples/readline.cc
+libmysqld/examples/sql_string.cc
+libmysqld/examples/sql_string.h
+libmysqld/examples/test-gdbinit
+libmysqld/field.cc
+libmysqld/field_conv.cc
+libmysqld/filesort.cc
+libmysqld/get_password.c
+libmysqld/gstream.cc
+libmysqld/ha_archive.cc
+libmysqld/ha_berkeley.cc
+libmysqld/ha_blackhole.cc
+libmysqld/ha_example.cc
+libmysqld/ha_federated.cc
+libmysqld/ha_heap.cc
+libmysqld/ha_innobase.cc
+libmysqld/ha_innodb.cc
+libmysqld/ha_isam.cc
+libmysqld/ha_isammrg.cc
+libmysqld/ha_myisam.cc
+libmysqld/ha_myisammrg.cc
+libmysqld/ha_ndbcluster.cc
+libmysqld/ha_ndbcluster_binlog.cc
+libmysqld/ha_ndbcluster_cond.cc
+libmysqld/ha_partition.cc
+libmysqld/ha_tina.cc
+libmysqld/handler.cc
+libmysqld/handlerton.cc
+libmysqld/hash_filo.cc
+libmysqld/hostname.cc
+libmysqld/init.cc
+libmysqld/item.cc
+libmysqld/item_buff.cc
+libmysqld/item_cmpfunc.cc
+libmysqld/item_create.cc
+libmysqld/item_func.cc
+libmysqld/item_geofunc.cc
+libmysqld/item_row.cc
+libmysqld/item_strfunc.cc
+libmysqld/item_subselect.cc
+libmysqld/item_sum.cc
+libmysqld/item_timefunc.cc
+libmysqld/item_uniq.cc
+libmysqld/key.cc
+libmysqld/lex_hash.h
+libmysqld/lib_sql.cpp
+libmysqld/libmysql.c
+libmysqld/link_sources
+libmysqld/lock.cc
+libmysqld/log.cc
+libmysqld/log_event.cc
+libmysqld/log_event_old.cc
+libmysqld/md5.c
+libmysqld/message.h
+libmysqld/message.rc
+libmysqld/mf_iocache.cc
+libmysqld/mini_client.cc
+libmysqld/my_decimal.cc
+libmysqld/my_time.c
+libmysqld/my_user.c
+libmysqld/net_pkg.cc
+libmysqld/net_serv.cc
+libmysqld/opt_ft.cc
+libmysqld/opt_range.cc
+libmysqld/opt_sum.cc
+libmysqld/pack.c
+libmysqld/parse_file.cc
+libmysqld/partition_info.cc
+libmysqld/password.c
+libmysqld/procedure.cc
+libmysqld/protocol.cc
+libmysqld/protocol_cursor.cc
+libmysqld/records.cc
+libmysqld/repl_failsafe.cc
+libmysqld/rpl_filter.cc
+libmysqld/rpl_handler.cc
+libmysqld/rpl_injector.cc
+libmysqld/rpl_record.cc
+libmysqld/rpl_record_old.cc
+libmysqld/rpl_utility.cc
+libmysqld/scheduler.cc
+libmysqld/set_var.cc
+libmysqld/sha2.cc
+libmysqld/simple-test
+libmysqld/slave.cc
+libmysqld/sp.cc
+libmysqld/sp_cache.cc
+libmysqld/sp_head.cc
+libmysqld/sp_pcontext.cc
+libmysqld/sp_rcontext.cc
+libmysqld/spatial.cc
+libmysqld/sql_acl.cc
+libmysqld/sql_alloc_error_handler.cc
+libmysqld/sql_analyse.cc
+libmysqld/sql_base.cc
+libmysqld/sql_builtin.cc
+libmysqld/sql_cache.cc
+libmysqld/sql_class.cc
+libmysqld/sql_command
+libmysqld/sql_connect.cc
+libmysqld/sql_crypt.cc
+libmysqld/sql_cursor.cc
+libmysqld/sql_cursor.h
+libmysqld/sql_db.cc
+libmysqld/sql_delete.cc
+libmysqld/sql_truncate.cc
+libmysqld/sql_reload.cc
+libmysqld/datadict.cc
+libmysqld/sql_derived.cc
+libmysqld/sql_do.cc
+libmysqld/sql_error.cc
+libmysqld/sql_handler.cc
+libmysqld/sql_help.cc
+libmysqld/sql_insert.cc
+libmysqld/sql_lex.cc
+libmysqld/sql_list.cc
+libmysqld/sql_load.cc
+libmysqld/sql_locale.cc
+libmysqld/sql_manager.cc
+libmysqld/sql_map.cc
+libmysqld/sql_olap.cc
+libmysqld/sql_parse.cc
+libmysqld/sql_partition.cc
+libmysqld/sql_plugin.cc
+libmysqld/sql_prepare.cc
+libmysqld/sql_profile.cc
+libmysqld/sql_rename.cc
+libmysqld/sql_repl.cc
+libmysqld/sql_select.cc
+libmysqld/sql_servers.cc
+libmysqld/sql_show.cc
+libmysqld/sql_state.c
+libmysqld/sql_string.cc
+libmysqld/sql_table.cc
+libmysqld/sql_tablespace.cc
+libmysqld/sql_test.cc
+libmysqld/sql_trigger.cc
+libmysqld/sql_udf.cc
+libmysqld/sql_union.cc
+libmysqld/sql_unions.cc
+libmysqld/sql_update.cc
+libmysqld/sql_view.cc
+libmysqld/sql_yacc.cc
+libmysqld/sql_yacc.cpp
+libmysqld/sql_yacc.h
+libmysqld/stacktrace.c
+libmysqld/strfunc.cc
+libmysqld/table.cc
+libmysqld/thr_malloc.cc
+libmysqld/sql_time.cc
+libmysqld/tztime.cc
+libmysqld/uniques.cc
+libmysqld/unireg.cc
+libmysqltest/*.ds?
+libmysqltest/*.vcproj
+libmysqltest/mytest.c
+libtool
+linked_client_sources
+linked_include_sources
+linked_libmysql_r_sources
+linked_libmysql_sources
+linked_libmysqld_sources
+linked_libmysqldex_sources
+linked_server_sources
+linked_tools_sources
+locked
+ltmain.sh
+man/*.1
+merge/*.ds?
+merge/*.vcproj
+missing
+mit-pthreads/config.flags
+mit-pthreads/include/bits
+mit-pthreads/include/pthread/machdep.h
+mit-pthreads/include/pthread/posix.h
+mit-pthreads/include/sys
+mit-pthreads/machdep.c
+mit-pthreads/pg++
+mit-pthreads/pgcc
+mit-pthreads/syscall.S
+mkinstalldirs
+my_print_defaults/*.ds?
+my_print_defaults/*.vcproj
+myisam/*.ds?
+myisam/*.vcproj
+myisam/FT1.MYD
+myisam/FT1.MYI
+myisam/ft_dump
+myisam/ft_eval
+myisam/ft_test1
+myisam/ftbench/data
+myisam/ftbench/t
+myisam/ftbench/var/*
+myisam/mi_test1
+myisam/mi_test2
+myisam/mi_test3
+myisam/mi_test_all
+myisam/myisam.log
+myisam/myisam_ftdump
+myisam/myisamchk
+myisam/myisamlog
+myisam/myisampack
+myisam/rt_test
+myisam/rt_test.MYD
+myisam/rt_test.MYI
+myisam/sp_test
+myisam/test1.MYD
+myisam/test1.MYI
+myisam/test2.MYD
+myisam/test2.MYI
+myisam_ftdump/*.ds?
+myisam_ftdump/*.vcproj
+myisamchk/*.ds?
+myisamchk/*.vcproj
+myisamlog/*.ds?
+myisamlog/*.vcproj
+myisammrg/*.ds?
+myisammrg/*.vcproj
+myisampack/*.ds?
+myisampack/*.vcproj
+mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
+mysql-4.0.2-alpha.tar.gz
+mysql-4.1.8-win-src.zip
+mysql-5.0.2-alpha.tar.gz
+mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
+mysql-test/*.ds?
+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
+mysql-test/install_test_db
+mysql-test/lib/My/SafeProcess/my_safe_process
+mysql-test/lib/init_db.sql
+mysql-test/linux_sys_vars.inc
+mysql-test/load_sysvars.inc
+mysql-test/mtr
+mysql-test/mysql-test-run
+mysql-test/mysql-test-gcov.err
+mysql-test/mysql-test-gcov.msg
+mysql-test/mysql-test-run-shell
+mysql-test/mysql-test-run.log
+mysql-test/mysql_test_run_new
+mysql-test/ndb/ndbcluster
+mysql-test/partitions.log
+mysql-test/r/*.err
+mysql-test/r/*.log
+mysql-test/r/*.out
+mysql-test/r/*.reject
+mysql-test/r/index_merge_load.result
+mysql-test/r/max_allowed_packet_func.result
+mysql-test/r/rpl000001.eval
+mysql-test/r/rpl000002.eval
+mysql-test/r/rpl000014.eval
+mysql-test/r/rpl000015.eval
+mysql-test/r/rpl000016.eval
+mysql-test/r/rpl_log.eval
+mysql-test/r/slave-running.eval
+mysql-test/r/slave-stopped.eval
+mysql-test/r/tmp.result
+mysql-test/reg.log
+mysql-test/rpl.log
+mysql-test/share/mysql
+mysql-test/std_data/*.pem
+mysql-test/suite/funcs_1.tar.gz
+mysql-test/suite/funcs_1.tar.zip
+mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings
+mysql-test/suite/funcs_1/r/innodb_views.warnings
+mysql-test/suite/funcs_1/r/memory_trig_03e.warnings
+mysql-test/suite/funcs_1/r/memory_views.warnings
+mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings
+mysql-test/suite/funcs_1/r/myisam_views.warnings
+mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings
+mysql-test/suite/funcs_1/r/ndb_views.warnings
+mysql-test/suite/partitions/r/dif
+mysql-test/suite/partitions/r/diff
+mysql-test/suite/partitions/r/partition.result
+mysql-test/suite/partitions/r/partition_bit_ndb.warnings
+mysql-test/suite/partitions/r/partition_special_innodb.warnings
+mysql-test/suite/partitions/r/partition_special_myisam.warnings
+mysql-test/suite/partitions/r/partition_t55.out
+mysql-test/suite/partitions/r/partition_t55.refout
+mysql-test/suite/partitions/t/partition.test
+mysql-test/t/index_merge.load
+mysql-test/t/tmp.test
+mysql-test/var
+mysql-test/var/*
+mysql-test/windows_sys_vars.inc
+mysql.kdevprj
+mysql.proj
+sql_priv.h
+mysqlbinlog/*.ds?
+mysqlbinlog/*.vcproj
+mysqlcheck/*.ds?
+mysqlcheck/*.vcproj
+mysqld.S
+mysqld.sym
+mysqldemb/*.ds?
+mysqldemb/*.vcproj
+mysqlserver/*.ds?
+mysqlserver/*.vcproj
+mysys/#mf_iocache.c#
+mysys/*.ds?
+mysys/*.vcproj
+mysys/.deps/array.Po
+mysys/.deps/base64.Po
+mysys/.deps/charset-def.Po
+mysys/.deps/charset.Po
+mysys/.deps/checksum.Po
+mysys/.deps/default.Po
+mysys/.deps/default_modify.Po
+mysys/.deps/errors.Po
+mysys/.deps/hash.Po
+mysys/.deps/list.Po
+mysys/.deps/md5.Po
+mysys/.deps/mf_brkhant.Po
+mysys/.deps/mf_cache.Po
+mysys/.deps/mf_dirname.Po
+mysys/.deps/mf_fn_ext.Po
+mysys/.deps/mf_format.Po
+mysys/.deps/mf_getdate.Po
+mysys/.deps/mf_iocache.Po
+mysys/.deps/mf_iocache2.Po
+mysys/.deps/mf_keycache.Po
+mysys/.deps/mf_keycaches.Po
+mysys/.deps/mf_loadpath.Po
+mysys/.deps/mf_pack.Po
+mysys/.deps/mf_path.Po
+mysys/.deps/mf_qsort.Po
+mysys/.deps/mf_qsort2.Po
+mysys/.deps/mf_radix.Po
+mysys/.deps/mf_same.Po
+mysys/.deps/mf_sort.Po
+mysys/.deps/mf_strip.Po
+mysys/.deps/mf_tempdir.Po
+mysys/.deps/mf_tempfile.Po
+mysys/.deps/mf_unixpath.Po
+mysys/.deps/mf_wcomp.Po
+mysys/.deps/mf_wfile.Po
+mysys/.deps/mulalloc.Po
+mysys/.deps/my_access.Po
+mysys/.deps/my_aes.Po
+mysys/.deps/my_alarm.Po
+mysys/.deps/my_alloc.Po
+mysys/.deps/my_append.Po
+mysys/.deps/my_atomic.Po
+mysys/.deps/my_bit.Po
+mysys/.deps/my_bitmap.Po
+mysys/.deps/my_chsize.Po
+mysys/.deps/my_clock.Po
+mysys/.deps/my_compress.Po
+mysys/.deps/my_copy.Po
+mysys/.deps/my_crc32.Po
+mysys/.deps/my_create.Po
+mysys/.deps/my_delete.Po
+mysys/.deps/my_div.Po
+mysys/.deps/my_dup.Po
+mysys/.deps/my_error.Po
+mysys/.deps/my_file.Po
+mysys/.deps/my_fopen.Po
+mysys/.deps/my_fstream.Po
+mysys/.deps/my_gethostbyname.Po
+mysys/.deps/my_gethwaddr.Po
+mysys/.deps/my_getncpus.Po
+mysys/.deps/my_getopt.Po
+mysys/.deps/my_getsystime.Po
+mysys/.deps/my_getwd.Po
+mysys/.deps/my_handler.Po
+mysys/.deps/my_init.Po
+mysys/.deps/my_largepage.Po
+mysys/.deps/my_lib.Po
+mysys/.deps/my_libwrap.Po
+mysys/.deps/my_lock.Po
+mysys/.deps/my_lockmem.Po
+mysys/.deps/my_lread.Po
+mysys/.deps/my_lwrite.Po
+mysys/.deps/my_malloc.Po
+mysys/.deps/my_memmem.Po
+mysys/.deps/my_messnc.Po
+mysys/.deps/my_mkdir.Po
+mysys/.deps/my_mmap.Po
+mysys/.deps/my_net.Po
+mysys/.deps/my_netware.Po
+mysys/.deps/my_new.Po
+mysys/.deps/my_once.Po
+mysys/.deps/my_open.Po
+mysys/.deps/my_port.Po
+mysys/.deps/my_pread.Po
+mysys/.deps/my_pthread.Po
+mysys/.deps/my_quick.Po
+mysys/.deps/my_read.Po
+mysys/.deps/my_realloc.Po
+mysys/.deps/my_redel.Po
+mysys/.deps/my_rename.Po
+mysys/.deps/my_seek.Po
+mysys/.deps/my_semaphore.Po
+mysys/.deps/my_sleep.Po
+mysys/.deps/my_static.Po
+mysys/.deps/my_symlink.Po
+mysys/.deps/my_symlink2.Po
+mysys/.deps/my_sync.Po
+mysys/.deps/my_thr_init.Po
+mysys/.deps/my_vle.Po
+mysys/.deps/my_windac.Po
+mysys/.deps/my_write.Po
+mysys/.deps/ptr_cmp.Po
+mysys/.deps/queues.Po
+mysys/.deps/rijndael.Po
+mysys/.deps/safemalloc.Po
+mysys/.deps/sha1.Po
+mysys/.deps/string.Po
+mysys/.deps/thr_alarm.Po
+mysys/.deps/thr_lock.Po
+mysys/.deps/thr_mutex.Po
+mysys/.deps/thr_rwlock.Po
+mysys/.deps/tree.Po
+mysys/.deps/trie.Po
+mysys/.deps/typelib.Po
+mysys/getopt.c
+mysys/getopt1.c
+mysys/main.cc
+mysys/my_new.cpp
+mysys/raid.cpp
+mysys/ste5KbMa
+mysys/test_atomic
+mysys/test_bitmap
+mysys/test_charset
+mysys/test_dir
+mysys/test_gethwaddr
+mysys/test_io_cache
+mysys/test_thr_alarm
+mysys/test_thr_lock
+mysys/test_vsnprintf
+mysys/testhash
+ndb/bin/DbAsyncGenerator
+ndb/bin/DbCreate
+ndb/bin/acid
+ndb/bin/async-lmc-bench-l-p10.sh
+ndb/bin/async-lmc-bench-l.sh
+ndb/bin/async-lmc-bench-p10.sh
+ndb/bin/async-lmc-bench.sh
+ndb/bin/atrt
+ndb/bin/atrt-analyze-result.sh
+ndb/bin/atrt-clear-result.sh
+ndb/bin/atrt-gather-result.sh
+ndb/bin/atrt-setup.sh
+ndb/bin/bankCreator
+ndb/bin/bankMakeGL
+ndb/bin/bankSumAccounts
+ndb/bin/bankTimer
+ndb/bin/bankTransactionMaker
+ndb/bin/bankValidateAllGLs
+ndb/bin/basicTransporterTest
+ndb/bin/benchronja
+ndb/bin/bulk_copy
+ndb/bin/copy_tab
+ndb/bin/create_all_tabs
+ndb/bin/create_index
+ndb/bin/create_tab
+ndb/bin/delete_all
+ndb/bin/desc
+ndb/bin/drop_all_tabs
+ndb/bin/drop_index
+ndb/bin/drop_tab
+ndb/bin/flexAsynch
+ndb/bin/flexBench
+ndb/bin/flexHammer
+ndb/bin/flexScan
+ndb/bin/flexTT
+ndb/bin/hugoCalculator
+ndb/bin/hugoFill
+ndb/bin/hugoLoad
+ndb/bin/hugoLockRecords
+ndb/bin/hugoPkDelete
+ndb/bin/hugoPkRead
+ndb/bin/hugoPkReadRecord
+ndb/bin/hugoPkUpdate
+ndb/bin/hugoScanRead
+ndb/bin/hugoScanUpdate
+ndb/bin/index
+ndb/bin/index2
+ndb/bin/initronja
+ndb/bin/interpreterInTup
+ndb/bin/list_tables
+ndb/bin/make-config.sh
+ndb/bin/mgmtclient
+ndb/bin/mgmtsrvr
+ndb/bin/mkconfig
+ndb/bin/ndb
+ndb/bin/ndb_cpcc
+ndb/bin/ndb_cpcd
+ndb/bin/ndb_rep
+ndb/bin/ndbsql
+ndb/bin/newton_basic
+ndb/bin/newton_br
+ndb/bin/newton_pb
+ndb/bin/newton_perf
+ndb/bin/perfTransporterTest
+ndb/bin/printConfig
+ndb/bin/printSchemafile
+ndb/bin/printSysfile
+ndb/bin/redoLogFileReader
+ndb/bin/restart
+ndb/bin/restarter
+ndb/bin/restarter2
+ndb/bin/restarts
+ndb/bin/restore
+ndb/bin/select_all
+ndb/bin/select_count
+ndb/bin/telco
+ndb/bin/testBackup
+ndb/bin/testBank
+ndb/bin/testBasic
+ndb/bin/testBasicAsynch
+ndb/bin/testCopy
+ndb/bin/testDataBuffers
+ndb/bin/testDict
+ndb/bin/testGrep
+ndb/bin/testGrepVerify
+ndb/bin/testIndex
+ndb/bin/testInterpreter
+ndb/bin/testKernelDataBuffer
+ndb/bin/testLongSig
+ndb/bin/testMgm
+ndb/bin/testMgmapi
+ndb/bin/testNdbApi
+ndb/bin/testNodeRestart
+ndb/bin/testOIBasic
+ndb/bin/testOdbcDriver
+ndb/bin/testOperations
+ndb/bin/testRestartGci
+ndb/bin/testScan
+ndb/bin/testScanInterpreter
+ndb/bin/testSimplePropertiesSection
+ndb/bin/testSystemRestart
+ndb/bin/testTimeout
+ndb/bin/testTransactions
+ndb/bin/test_cpcd
+ndb/bin/test_event
+ndb/bin/verify_index
+ndb/bin/waiter
+ndb/config/autom4te.cache/*
+ndb/config/config.mk
+ndb/examples/ndbapi_example1/ndbapi_example1
+ndb/examples/ndbapi_example2/ndbapi_example2
+ndb/examples/ndbapi_example3/ndbapi_example3
+ndb/examples/ndbapi_example5/ndbapi_example5
+ndb/examples/select_all/select_all
+ndb/include/ndb_global.h
+ndb/include/ndb_types.h
+ndb/include/ndb_version.h
+ndb/lib/libMGM_API.so
+ndb/lib/libNDB_API.so
+ndb/lib/libNDB_ODBC.so
+ndb/lib/libNEWTON_API.so
+ndb/lib/libNEWTON_BASICTEST_COMMON.so
+ndb/lib/libREP_API.so
+ndb/lib/libndbclient.so
+ndb/lib/libndbclient_extra.so
+ndb/src/common/debugger/libtrace.dsp
+ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
+ndb/src/common/logger/liblogger.dsp
+ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
+ndb/src/common/mgmcommon/printConfig/*.d
+ndb/src/common/portlib/libportlib.dsp
+ndb/src/common/transporter/libtransporter.dsp
+ndb/src/common/util/libgeneral.dsp
+ndb/src/common/util/testBitmask.cpp
+ndb/src/cw/cpcd/ndb_cpcd
+ndb/src/dummy.cpp
+ndb/src/kernel/blocks/backup/libbackup.dsp
+ndb/src/kernel/blocks/backup/restore/ndb_restore
+ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
+ndb/src/kernel/blocks/dbacc/libdbacc.dsp
+ndb/src/kernel/blocks/dbdict/libdbdict.dsp
+ndb/src/kernel/blocks/dbdih/libdbdih.dsp
+ndb/src/kernel/blocks/dblqh/libdblqh.dsp
+ndb/src/kernel/blocks/dbtc/libdbtc.dsp
+ndb/src/kernel/blocks/dbtup/libdbtup.dsp
+ndb/src/kernel/blocks/dbtux/libdbtux.dsp
+ndb/src/kernel/blocks/dbutil/libdbutil.dsp
+ndb/src/kernel/blocks/grep/libgrep.dsp
+ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
+ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
+ndb/src/kernel/blocks/qmgr/libqmgr.dsp
+ndb/src/kernel/blocks/suma/libsuma.dsp
+ndb/src/kernel/blocks/trix/libtrix.dsp
+ndb/src/kernel/error/liberror.dsp
+ndb/src/kernel/ndbd
+ndb/src/kernel/ndbd.dsp
+ndb/src/kernel/vm/libkernel.dsp
+ndb/src/libndb.ver
+ndb/src/libndbclient.dsp
+ndb/src/mgmapi/libmgmapi.dsp
+ndb/src/mgmclient/libndbmgmclient.dsp
+ndb/src/mgmclient/ndb_mgm
+ndb/src/mgmclient/ndb_mgm.dsp
+ndb/src/mgmclient/test_cpcd/*.d
+ndb/src/mgmsrv/ndb_mgmd
+ndb/src/mgmsrv/ndb_mgmd.dsp
+ndb/src/ndbapi/libndbapi.dsp
+ndb/test/ndbapi/bank/bankCreator
+ndb/test/ndbapi/bank/bankMakeGL
+ndb/test/ndbapi/bank/bankSumAccounts
+ndb/test/ndbapi/bank/bankTimer
+ndb/test/ndbapi/bank/bankTransactionMaker
+ndb/test/ndbapi/bank/bankValidateAllGLs
+ndb/test/ndbapi/bank/testBank
+ndb/test/ndbapi/create_all_tabs
+ndb/test/ndbapi/create_tab
+ndb/test/ndbapi/drop_all_tabs
+ndb/test/ndbapi/flexAsynch
+ndb/test/ndbapi/flexBench
+ndb/test/ndbapi/flexBench.dsp
+ndb/test/ndbapi/flexHammer
+ndb/test/ndbapi/flexTT
+ndb/test/ndbapi/testBackup
+ndb/test/ndbapi/testBasic
+ndb/test/ndbapi/testBasic.dsp
+ndb/test/ndbapi/testBasicAsynch
+ndb/test/ndbapi/testBlobs
+ndb/test/ndbapi/testBlobs.dsp
+ndb/test/ndbapi/testDataBuffers
+ndb/test/ndbapi/testDeadlock
+ndb/test/ndbapi/testDict
+ndb/test/ndbapi/testIndex
+ndb/test/ndbapi/testMgm
+ndb/test/ndbapi/testNdbApi
+ndb/test/ndbapi/testNodeRestart
+ndb/test/ndbapi/testOIBasic
+ndb/test/ndbapi/testOperations
+ndb/test/ndbapi/testRestartGci
+ndb/test/ndbapi/testSRBank
+ndb/test/ndbapi/testScan
+ndb/test/ndbapi/testScan.dsp
+ndb/test/ndbapi/testScanInterpreter
+ndb/test/ndbapi/testScanPerf
+ndb/test/ndbapi/testSystemRestart
+ndb/test/ndbapi/testTimeout
+ndb/test/ndbapi/testTransactions
+ndb/test/ndbapi/test_event
+ndb/test/run-test/atrt
+ndb/test/src/libNDBT.dsp
+ndb/test/tools/copy_tab
+ndb/test/tools/create_index
+ndb/test/tools/hugoCalculator
+ndb/test/tools/hugoFill
+ndb/test/tools/hugoLoad
+ndb/test/tools/hugoLockRecords
+ndb/test/tools/hugoPkDelete
+ndb/test/tools/hugoPkRead
+ndb/test/tools/hugoPkReadRecord
+ndb/test/tools/hugoPkUpdate
+ndb/test/tools/hugoScanRead
+ndb/test/tools/hugoScanUpdate
+ndb/test/tools/ndb_cpcc
+ndb/test/tools/restart
+ndb/test/tools/verify_index
+ndb/tools/ndb_config
+ndb/tools/ndb_delete_all
+ndb/tools/ndb_delete_all.dsp
+ndb/tools/ndb_desc
+ndb/tools/ndb_desc.dsp
+ndb/tools/ndb_drop_index
+ndb/tools/ndb_drop_index.dsp
+ndb/tools/ndb_drop_table
+ndb/tools/ndb_drop_table.dsp
+ndb/tools/ndb_restore
+ndb/tools/ndb_select_all
+ndb/tools/ndb_select_all.dsp
+ndb/tools/ndb_select_count
+ndb/tools/ndb_select_count.dsp
+ndb/tools/ndb_show_tables
+ndb/tools/ndb_show_tables.dsp
+ndb/tools/ndb_test_platform
+ndb/tools/ndb_waiter
+ndb/tools/ndb_waiter.dsp
+ndbcluster-1186
+ndbcluster-1186/SCCS
+ndbcluster-1186/config.ini
+ndbcluster-1186/ndb_1.pid
+ndbcluster-1186/ndb_1_out.log
+ndbcluster-1186/ndb_1_signal.log
+ndbcluster-1186/ndb_2.pid
+ndbcluster-1186/ndb_2_out.log
+ndbcluster-1186/ndb_2_signal.log
+ndbcluster-1186/ndb_3.pid
+ndbcluster-1186/ndb_3_cluster.log
+ndbcluster-1186/ndb_3_out.log
+ndbcluster-1186/ndbcluster.pid
+netware/.deps/libmysqlmain.Po
+netware/.deps/my_manage.Po
+netware/.deps/mysql_install_db.Po
+netware/.deps/mysql_test_run.Po
+netware/.deps/mysqld_safe.Po
+netware/init_db.sql
+netware/libmysql.imp
+netware/test_db.sql
+pack_isam/*.ds?
+perror/*.ds?
+perror/*.vcproj
+plugin/fulltext/.deps/mypluglib_la-plugin_example.Plo
+plugin/fulltext/.libs/mypluglib.lai
+plugin/fulltext/.libs/mypluglib.so.0
+plugin/fulltext/.libs/mypluglib.so.0.0.0
+pstack/.deps/bucomm.Po
+pstack/.deps/debug.Po
+pstack/.deps/filemode.Po
+pstack/.deps/ieee.Po
+pstack/.deps/linuxthreads.Po
+pstack/.deps/pstack.Po
+pstack/.deps/rddbg.Po
+pstack/.deps/stabs.Po
+pull.log
+regex/*.ds?
+regex/*.vcproj
+regex/.deps/debug.Po
+regex/.deps/main.Po
+regex/.deps/regcomp.Po
+regex/.deps/regerror.Po
+regex/.deps/regexec.Po
+regex/.deps/regfree.Po
+regex/.deps/reginit.Po
+regex/.deps/split.Po
+regex/re
+repl-tests/test-repl-ts/repl-timestamp.master.reject
+repl-tests/test-repl/foo-dump-slave.master.
+repl-tests/test-repl/sum-wlen-slave.master.
+repl-tests/test-repl/sum-wlen-slave.master.re
+repl-tests/test-repl/sum-wlen-slave.master.reje
+replace/*.ds?
+replace/*.vcproj
+scripts/comp_sql
+scripts/fill_func_tables
+scripts/fill_func_tables.sql
+scripts/fill_help_tables
+scripts/fill_help_tables.sql
+scripts/make_binary_distribution
+scripts/make_sharedlib_distribution
+scripts/make_win_binary_distribution
+scripts/make_win_src_distribution
+scripts/make_win_src_distribution_old
+scripts/msql2mysql
+scripts/mysql_config
+scripts/mysql_convert_table_format
+scripts/mysql_create_system_tables
+scripts/mysql_explain_log
+scripts/mysql_find_rows
+scripts/mysql_fix_extensions
+scripts/mysql_fix_privilege_tables
+scripts/mysql_fix_privilege_tables.sql
+scripts/mysql_fix_privilege_tables.sql.rule
+scripts/mysql_fix_privilege_tables_sql.c
+scripts/mysql_fix_privilege_tables_sql.c.rule
+scripts/mysql_install_db
+scripts/mysql_secure_installation
+scripts/mysql_setpermission
+scripts/mysql_tableinfo
+scripts/mysql_upgrade
+scripts/mysql_upgrade_shell
+scripts/mysql_zap
+scripts/mysqlaccess
+scripts/mysqlbug
+scripts/mysqld_multi
+scripts/mysqld_safe
+scripts/mysqldumpslow
+scripts/mysqlhotcopy
+scripts/mysqlhotcopy.sh.rej
+scripts/safe_mysqld
+select_test
+server-tools/instance-manager/.deps/buffer.Po
+server-tools/instance-manager/.deps/command.Po
+server-tools/instance-manager/.deps/commands.Po
+server-tools/instance-manager/.deps/guardian.Po
+server-tools/instance-manager/.deps/instance.Po
+server-tools/instance-manager/.deps/instance_map.Po
+server-tools/instance-manager/.deps/instance_options.Po
+server-tools/instance-manager/.deps/liboptions_la-options.Plo
+server-tools/instance-manager/.deps/liboptions_la-priv.Plo
+server-tools/instance-manager/.deps/listener.Po
+server-tools/instance-manager/.deps/log.Po
+server-tools/instance-manager/.deps/manager.Po
+server-tools/instance-manager/.deps/messages.Po
+server-tools/instance-manager/.deps/mysql_connection.Po
+server-tools/instance-manager/.deps/mysqlmanager.Po
+server-tools/instance-manager/.deps/net_serv.Po
+server-tools/instance-manager/.deps/parse.Po
+server-tools/instance-manager/.deps/parse_output.Po
+server-tools/instance-manager/.deps/protocol.Po
+server-tools/instance-manager/.deps/thread_registry.Po
+server-tools/instance-manager/.deps/user_management_commands.Po
+server-tools/instance-manager/.deps/user_map.Po
+server-tools/instance-manager/buffer.cpp
+server-tools/instance-manager/client.c
+server-tools/instance-manager/client_settings.h
+server-tools/instance-manager/command.cpp
+server-tools/instance-manager/commands.cpp
+server-tools/instance-manager/errmsg.c
+server-tools/instance-manager/guardian.cpp
+server-tools/instance-manager/instance.cpp
+server-tools/instance-manager/instance_map.cpp
+server-tools/instance-manager/instance_options.cpp
+server-tools/instance-manager/listener.cpp
+server-tools/instance-manager/log.cpp
+server-tools/instance-manager/manager.cpp
+server-tools/instance-manager/messages.cpp
+server-tools/instance-manager/mysql_connection.cpp
+server-tools/instance-manager/mysqlmanager
+server-tools/instance-manager/mysqlmanager.cpp
+server-tools/instance-manager/net_serv.cc
+server-tools/instance-manager/options.cpp
+server-tools/instance-manager/parse.cpp
+server-tools/instance-manager/parse_output.cpp
+server-tools/instance-manager/priv.cpp
+server-tools/instance-manager/protocol.cpp
+server-tools/instance-manager/thr_alarm.c
+server-tools/instance-manager/thread_registry.cpp
+server-tools/instance-manager/user_map.cpp
+sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
+sql-bench/bench-count-distinct
+sql-bench/bench-init.pl
+sql-bench/compare-results
+sql-bench/compare-results-all
+sql-bench/copy-db
+sql-bench/crash-me
+sql-bench/gif/*
+sql-bench/graph-compare-results
+sql-bench/innotest1
+sql-bench/innotest1a
+sql-bench/innotest1b
+sql-bench/innotest2
+sql-bench/innotest2a
+sql-bench/innotest2b
+sql-bench/output/*
+sql-bench/run-all-tests
+sql-bench/server-cfg
+sql-bench/template.html
+sql-bench/test-ATIS
+sql-bench/test-alter-table
+sql-bench/test-big-tables
+sql-bench/test-connect
+sql-bench/test-create
+sql-bench/test-insert
+sql-bench/test-select
+sql-bench/test-transactions
+sql-bench/test-wisconsin
+sql/*.cpp
+sql/*.ds?
+sql/*.def
+sql/*.vcproj
+sql/.deps/client.Po
+sql/.deps/derror.Po
+sql/.deps/des_key_file.Po
+sql/.deps/discover.Po
+sql/.deps/event_data_objects.Po
+sql/.deps/event_db_repository.Po
+sql/.deps/event_queue.Po
+sql/.deps/event_scheduler.Po
+sql/.deps/events.Po
+sql/.deps/field.Po
+sql/.deps/field_conv.Po
+sql/.deps/filesort.Po
+sql/.deps/gen_lex_hash.Po
+sql/.deps/gstream.Po
+sql/.deps/ha_berkeley.Po
+sql/.deps/ha_federated.Po
+sql/.deps/ha_heap.Po
+sql/.deps/ha_innodb.Po
+sql/.deps/ha_myisam.Po
+sql/.deps/ha_myisammrg.Po
+sql/.deps/ha_ndbcluster.Po
+sql/.deps/ha_ndbcluster_binlog.Po
+sql/.deps/ha_partition.Po
+sql/.deps/handler.Po
+sql/.deps/hash_filo.Po
+sql/.deps/hostname.Po
+sql/.deps/init.Po
+sql/.deps/item.Po
+sql/.deps/item_buff.Po
+sql/.deps/item_cmpfunc.Po
+sql/.deps/item_create.Po
+sql/.deps/item_func.Po
+sql/.deps/item_geofunc.Po
+sql/.deps/item_row.Po
+sql/.deps/item_strfunc.Po
+sql/.deps/item_subselect.Po
+sql/.deps/item_sum.Po
+sql/.deps/item_timefunc.Po
+sql/.deps/item_uniq.Po
+sql/.deps/item_xmlfunc.Po
+sql/.deps/key.Po
+sql/.deps/lock.Po
+sql/.deps/log.Po
+sql/.deps/log_event.Po
+sql/.deps/mf_iocache.Po
+sql/.deps/mini_client_errors.Po
+sql/.deps/my_decimal.Po
+sql/.deps/my_lock.Po
+sql/.deps/my_time.Po
+sql/.deps/my_user.Po
+sql/.deps/mysql_tzinfo_to_sql.Po
+sql/.deps/mysqld.Po
+sql/.deps/net_serv.Po
+sql/.deps/opt_range.Po
+sql/.deps/opt_sum.Po
+sql/.deps/pack.Po
+sql/.deps/parse_file.Po
+sql/.deps/partition_info.Po
+sql/.deps/password.Po
+sql/.deps/procedure.Po
+sql/.deps/protocol.Po
+sql/.deps/records.Po
+sql/.deps/repl_failsafe.Po
+sql/.deps/rpl_filter.Po
+sql/.deps/rpl_injector.Po
+sql/.deps/rpl_tblmap.Po
+sql/.deps/set_var.Po
+sql/.deps/slave.Po
+sql/.deps/sp.Po
+sql/.deps/sp_cache.Po
+sql/.deps/sp_head.Po
+sql/.deps/sp_pcontext.Po
+sql/.deps/sp_rcontext.Po
+sql/.deps/spatial.Po
+sql/.deps/sql_acl.Po
+sql/.deps/sql_analyse.Po
+sql/.deps/sql_base.Po
+sql/.deps/sql_binlog.Po
+sql/.deps/sql_builtin.Po
+sql/.deps/sql_cache.Po
+sql/.deps/sql_class.Po
+sql/.deps/sql_client.Po
+sql/.deps/sql_crypt.Po
+sql/.deps/sql_cursor.Po
+sql/.deps/sql_db.Po
+sql/.deps/sql_delete.Po
+sql/.deps/sql_truncate.Po
+sql/.deps/sql_reload.Po
+sql/.deps/datadict.Po
+sql/.deps/sql_derived.Po
+sql/.deps/sql_do.Po
+sql/.deps/sql_error.Po
+sql/.deps/sql_handler.Po
+sql/.deps/sql_help.Po
+sql/.deps/sql_insert.Po
+sql/.deps/sql_lex.Po
+sql/.deps/sql_list.Po
+sql/.deps/sql_load.Po
+sql/.deps/sql_manager.Po
+sql/.deps/sql_map.Po
+sql/.deps/sql_olap.Po
+sql/.deps/sql_parse.Po
+sql/.deps/sql_partition.Po
+sql/.deps/sql_plugin.Po
+sql/.deps/sql_prepare.Po
+sql/.deps/sql_rename.Po
+sql/.deps/sql_repl.Po
+sql/.deps/sql_select.Po
+sql/.deps/sql_show.Po
+sql/.deps/sql_state.Po
+sql/.deps/sql_string.Po
+sql/.deps/sql_table.Po
+sql/.deps/sql_tablespace.Po
+sql/.deps/sql_test.Po
+sql/.deps/sql_trigger.Po
+sql/.deps/sql_udf.Po
+sql/.deps/sql_union.Po
+sql/.deps/sql_update.Po
+sql/.deps/sql_view.Po
+sql/.deps/sql_yacc.Po
+sql/.deps/stacktrace.Po
+sql/.deps/strfunc.Po
+sql/.deps/table.Po
+sql/.deps/thr_malloc.Po
+sql/.deps/time.Po
+sql/.deps/tztime.Po
+sql/.deps/udf_example.Plo
+sql/.deps/uniques.Po
+sql/.deps/unireg.Po
+sql/.gdbinit
+sql/.libs/udf_example.lai
+sql/.libs/udf_example.so.0
+sql/.libs/udf_example.so.0.0.0
+sql/client.c
+sql/cmake_dummy.cc
+sql/Doxyfile
+sql/cscope.out
+sql/f.c
+sql/gen_lex_hash
+sql/gmon.out
+sql/handlerton.cc
+sql/html
+sql/latex
+sql/lex_hash.h
+sql/lex_hash.h.rule
+sql/link_sources
+sql/max/*
+sql/message.h
+sql/message.mc
+sql/message.rc
+sql/mini_client_errors.c
+sql/my_time.c
+sql/my_user.c
+sql/mysql_tzinfo_to_sql
+sql/mysql_tzinfo_to_sql.cc
+sql/mysql_tzinfo_to_sql_tztime.cc
+sql/mysqlbinlog
+sql/mysqld
+sql/mysqld-purecov
+sql/mysqld-purify
+sql/mysqld-quantify
+sql/new.cc
+sql/pack.c
+sql/safe_to_cache_query.txt
+sql/share/*.sys
+sql/share/charsets/gmon.out
+sql/share/fixerrmsg.pl
+sql/share/gmon.out
+sql/share/iso639-2.txt
+sql/share/mysql
+sql/share/norwegian-ny/errmsg.sys
+sql/share/norwegian/errmsg.sys
+sql/sql_builtin.cc
+sql/sql_select.cc.orig
+sql/sql_yacc.cc
+sql/sql_yacc.h
+sql/sql_yacc.h.rule
+sql/sql_yacc.output
+sql/sql_yacc.yy.orig
+sql/test_time
+sql/udf_example.so
+sql_error.cc
+sql_prepare.cc
+stamp-h
+stamp-h.in
+stamp-h1
+stamp-h1.in
+stamp-h2
+stamp-h2.in
+stamp-h3
+stamp-h4
+start_mysqld.sh
+storage/archive/.deps/archive_test-archive_test.Po
+storage/archive/.deps/archive_test-azio.Po
+storage/archive/.deps/ha_archive_la-azio.Plo
+storage/archive/.deps/ha_archive_la-ha_archive.Plo
+storage/archive/.deps/libarchive_a-azio.Po
+storage/archive/.deps/libarchive_a-ha_archive.Po
+storage/archive/archive_reader
+storage/archive/archive_test
+storage/bdb/*.ds?
+storage/bdb/*.vcproj
+storage/bdb/README
+storage/bdb/btree/btree_auto.c
+storage/bdb/btree/btree_autop.c
+storage/bdb/build_unix/*
+storage/bdb/build_vxworks/BerkeleyDB20.wpj
+storage/bdb/build_vxworks/BerkeleyDB20small.wpj
+storage/bdb/build_vxworks/BerkeleyDB22.wpj
+storage/bdb/build_vxworks/BerkeleyDB22small.wpj
+storage/bdb/build_vxworks/db.h
+storage/bdb/build_vxworks/db_config.h
+storage/bdb/build_vxworks/db_config_small.h
+storage/bdb/build_vxworks/db_deadlock/db_deadlock20.wpj
+storage/bdb/build_vxworks/db_deadlock/db_deadlock22.wpj
+storage/bdb/build_vxworks/db_int.h
+storage/bdb/build_vxworks/dbdemo/dbdemo.c
+storage/bdb/build_vxworks/dbdemo/dbdemo20.wpj
+storage/bdb/build_vxworks/dbdemo/dbdemo22.wpj
+storage/bdb/build_win32/*.dsp
+storage/bdb/build_win32/*.h
+storage/bdb/build_win32/db.h
+storage/bdb/build_win32/db_archive.dsp
+storage/bdb/build_win32/db_checkpoint.dsp
+storage/bdb/build_win32/db_config.h
+storage/bdb/build_win32/db_cxx.h
+storage/bdb/build_win32/db_deadlock.dsp
+storage/bdb/build_win32/db_dll.dsp
+storage/bdb/build_win32/db_dump.dsp
+storage/bdb/build_win32/db_int.h
+storage/bdb/build_win32/db_java.dsp
+storage/bdb/build_win32/db_load.dsp
+storage/bdb/build_win32/db_perf.dsp
+storage/bdb/build_win32/db_printlog.dsp
+storage/bdb/build_win32/db_recover.dsp
+storage/bdb/build_win32/db_stat.dsp
+storage/bdb/build_win32/db_static.dsp
+storage/bdb/build_win32/db_tcl.dsp
+storage/bdb/build_win32/db_test.dsp
+storage/bdb/build_win32/db_upgrade.dsp
+storage/bdb/build_win32/db_verify.dsp
+storage/bdb/build_win32/ex_access.dsp
+storage/bdb/build_win32/ex_btrec.dsp
+storage/bdb/build_win32/ex_env.dsp
+storage/bdb/build_win32/ex_lock.dsp
+storage/bdb/build_win32/ex_mpool.dsp
+storage/bdb/build_win32/ex_tpcb.dsp
+storage/bdb/build_win32/excxx_access.dsp
+storage/bdb/build_win32/excxx_btrec.dsp
+storage/bdb/build_win32/excxx_env.dsp
+storage/bdb/build_win32/excxx_lock.dsp
+storage/bdb/build_win32/excxx_mpool.dsp
+storage/bdb/build_win32/excxx_tpcb.dsp
+storage/bdb/build_win32/include.tcl
+storage/bdb/build_win32/libdb.def
+storage/bdb/build_win32/libdb.rc
+storage/bdb/build_win64/*.dsp
+storage/bdb/build_win64/*.dsw
+storage/bdb/build_win64/*.h
+storage/bdb/db/crdel_auto.c
+storage/bdb/db/crdel_autop.c
+storage/bdb/db/db_auto.c
+storage/bdb/db/db_autop.c
+storage/bdb/dbinc_auto/*.*
+storage/bdb/dbreg/dbreg_auto.c
+storage/bdb/dbreg/dbreg_autop.c
+storage/bdb/dist/autom4te-2.53.cache/*
+storage/bdb/dist/autom4te-2.53.cache/output.0
+storage/bdb/dist/autom4te-2.53.cache/requests
+storage/bdb/dist/autom4te-2.53.cache/traces.0
+storage/bdb/dist/autom4te.cache/*
+storage/bdb/dist/autom4te.cache/output.0
+storage/bdb/dist/autom4te.cache/requests
+storage/bdb/dist/autom4te.cache/traces.0
+storage/bdb/dist/config.hin
+storage/bdb/dist/configure
+storage/bdb/dist/tags
+storage/bdb/dist/template/db_server_proc
+storage/bdb/dist/template/gen_client_ret
+storage/bdb/dist/template/rec_btree
+storage/bdb/dist/template/rec_crdel
+storage/bdb/dist/template/rec_db
+storage/bdb/dist/template/rec_dbreg
+storage/bdb/dist/template/rec_fileops
+storage/bdb/dist/template/rec_hash
+storage/bdb/dist/template/rec_log
+storage/bdb/dist/template/rec_qam
+storage/bdb/dist/template/rec_txn
+storage/bdb/examples_c/ex_apprec/ex_apprec_auto.c
+storage/bdb/examples_c/ex_apprec/ex_apprec_auto.h
+storage/bdb/examples_c/ex_apprec/ex_apprec_template
+storage/bdb/examples_java
+storage/bdb/fileops/fileops_auto.c
+storage/bdb/fileops/fileops_autop.c
+storage/bdb/hash/hash_auto.c
+storage/bdb/hash/hash_autop.c
+storage/bdb/include/btree_auto.h
+storage/bdb/include/btree_ext.h
+storage/bdb/include/clib_ext.h
+storage/bdb/include/common_ext.h
+storage/bdb/include/crdel_auto.h
+storage/bdb/include/db_auto.h
+storage/bdb/include/db_ext.h
+storage/bdb/include/db_server.h
+storage/bdb/include/env_ext.h
+storage/bdb/include/gen_client_ext.h
+storage/bdb/include/gen_server_ext.h
+storage/bdb/include/hash_auto.h
+storage/bdb/include/hash_ext.h
+storage/bdb/include/lock_ext.h
+storage/bdb/include/log_auto.h
+storage/bdb/include/log_ext.h
+storage/bdb/include/mp_ext.h
+storage/bdb/include/mutex_ext.h
+storage/bdb/include/os_ext.h
+storage/bdb/include/qam_auto.h
+storage/bdb/include/qam_ext.h
+storage/bdb/include/rpc_client_ext.h
+storage/bdb/include/rpc_server_ext.h
+storage/bdb/include/tcl_ext.h
+storage/bdb/include/txn_auto.h
+storage/bdb/include/txn_ext.h
+storage/bdb/include/xa_ext.h
+storage/bdb/java/src/com/sleepycat/db/Db.java
+storage/bdb/java/src/com/sleepycat/db/DbBtreeStat.java
+storage/bdb/java/src/com/sleepycat/db/DbConstants.java
+storage/bdb/java/src/com/sleepycat/db/DbHashStat.java
+storage/bdb/java/src/com/sleepycat/db/DbLockStat.java
+storage/bdb/java/src/com/sleepycat/db/DbLogStat.java
+storage/bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
+storage/bdb/java/src/com/sleepycat/db/DbQueueStat.java
+storage/bdb/java/src/com/sleepycat/db/DbRepStat.java
+storage/bdb/java/src/com/sleepycat/db/DbTxnStat.java
+storage/bdb/libdb_java/java_stat_auto.c
+storage/bdb/libdb_java/java_stat_auto.h
+storage/bdb/libdb_java/java_util.i
+storage/bdb/log/log_auto.c
+storage/bdb/qam/qam_auto.c
+storage/bdb/qam/qam_autop.c
+storage/bdb/rep/rep_auto.c
+storage/bdb/rep/rep_autop.c
+storage/bdb/rpc_client/db_server_clnt.c
+storage/bdb/rpc_client/gen_client.c
+storage/bdb/rpc_server/c/db_server_proc.c
+storage/bdb/rpc_server/c/db_server_proc.sed
+storage/bdb/rpc_server/c/db_server_svc.c
+storage/bdb/rpc_server/c/db_server_xdr.c
+storage/bdb/rpc_server/c/gen_db_server.c
+storage/bdb/rpc_server/db_server.x
+storage/bdb/rpc_server/db_server_proc.sed
+storage/bdb/rpc_server/db_server_svc.c
+storage/bdb/rpc_server/db_server_xdr.c
+storage/bdb/rpc_server/gen_db_server.c
+storage/bdb/test/TESTS
+storage/bdb/test/include.tcl
+storage/bdb/test/logtrack.list
+storage/bdb/txn/txn_auto.c
+storage/bdb/txn/txn_autop.c
+storage/blackhole/.deps/ha_blackhole_la-ha_blackhole.Plo
+storage/blackhole/.deps/libblackhole_a-ha_blackhole.Po
+storage/csv/.deps/ha_csv_la-ha_tina.Plo
+storage/csv/.deps/libcsv_a-ha_tina.Po
+storage/example/.deps/ha_example_la-ha_example.Plo
+storage/example/.deps/libexample_a-ha_example.Po
+storage/heap/.deps/_check.Po
+storage/heap/.deps/_rectest.Po
+storage/heap/.deps/hp_block.Po
+storage/heap/.deps/hp_clear.Po
+storage/heap/.deps/hp_close.Po
+storage/heap/.deps/hp_create.Po
+storage/heap/.deps/hp_delete.Po
+storage/heap/.deps/hp_extra.Po
+storage/heap/.deps/hp_hash.Po
+storage/heap/.deps/hp_info.Po
+storage/heap/.deps/hp_open.Po
+storage/heap/.deps/hp_panic.Po
+storage/heap/.deps/hp_rename.Po
+storage/heap/.deps/hp_rfirst.Po
+storage/heap/.deps/hp_rkey.Po
+storage/heap/.deps/hp_rlast.Po
+storage/heap/.deps/hp_rnext.Po
+storage/heap/.deps/hp_rprev.Po
+storage/heap/.deps/hp_rrnd.Po
+storage/heap/.deps/hp_rsame.Po
+storage/heap/.deps/hp_scan.Po
+storage/heap/.deps/hp_static.Po
+storage/heap/.deps/hp_test1.Po
+storage/heap/.deps/hp_test2.Po
+storage/heap/.deps/hp_update.Po
+storage/heap/.deps/hp_write.Po
+storage/heap/hp_test1
+storage/heap/hp_test2
+storage/innobase/autom4te-2.53.cache/*
+storage/innobase/autom4te-2.53.cache/output.0
+storage/innobase/autom4te-2.53.cache/requests
+storage/innobase/autom4te-2.53.cache/traces.0
+storage/innobase/autom4te.cache/*
+storage/innobase/autom4te.cache/output.0
+storage/innobase/autom4te.cache/requests
+storage/innobase/autom4te.cache/traces.0
+storage/innobase/btr/.deps/btr0btr.Po
+storage/innobase/btr/.deps/btr0cur.Po
+storage/innobase/btr/.deps/btr0pcur.Po
+storage/innobase/btr/.deps/btr0sea.Po
+storage/innobase/buf/.deps/buf0buf.Po
+storage/innobase/buf/.deps/buf0flu.Po
+storage/innobase/buf/.deps/buf0lru.Po
+storage/innobase/buf/.deps/buf0rea.Po
+storage/innobase/configure.lineno
+storage/innobase/conftest.s1
+storage/innobase/conftest.subs
+storage/innobase/data/.deps/data0data.Po
+storage/innobase/data/.deps/data0type.Po
+storage/innobase/dict/.deps/dict0boot.Po
+storage/innobase/dict/.deps/dict0crea.Po
+storage/innobase/dict/.deps/dict0dict.Po
+storage/innobase/dict/.deps/dict0load.Po
+storage/innobase/dict/.deps/dict0mem.Po
+storage/innobase/dyn/.deps/dyn0dyn.Po
+storage/innobase/eval/.deps/eval0eval.Po
+storage/innobase/eval/.deps/eval0proc.Po
+storage/innobase/fil/.deps/fil0fil.Po
+storage/innobase/fsp/.deps/fsp0fsp.Po
+storage/innobase/fut/.deps/fut0fut.Po
+storage/innobase/fut/.deps/fut0lst.Po
+storage/innobase/ha/.deps/ha0ha.Po
+storage/innobase/ha/.deps/hash0hash.Po
+storage/innobase/ib_config.h
+storage/innobase/ib_config.h.in
+storage/innobase/ibuf/.deps/ibuf0ibuf.Po
+storage/innobase/lock/.deps/lock0lock.Po
+storage/innobase/log/.deps/log0log.Po
+storage/innobase/log/.deps/log0recv.Po
+storage/innobase/mach/.deps/mach0data.Po
+storage/innobase/mem/.deps/mem0mem.Po
+storage/innobase/mem/.deps/mem0pool.Po
+storage/innobase/mkinstalldirs
+storage/innobase/mtr/.deps/mtr0log.Po
+storage/innobase/mtr/.deps/mtr0mtr.Po
+storage/innobase/os/.deps/os0file.Po
+storage/innobase/os/.deps/os0proc.Po
+storage/innobase/os/.deps/os0sync.Po
+storage/innobase/os/.deps/os0thread.Po
+storage/innobase/page/.deps/page0cur.Po
+storage/innobase/page/.deps/page0page.Po
+storage/innobase/pars/.deps/lexyy.Po
+storage/innobase/pars/.deps/pars0grm.Po
+storage/innobase/pars/.deps/pars0opt.Po
+storage/innobase/pars/.deps/pars0pars.Po
+storage/innobase/pars/.deps/pars0sym.Po
+storage/innobase/que/.deps/que0que.Po
+storage/innobase/read/.deps/read0read.Po
+storage/innobase/rem/.deps/rem0cmp.Po
+storage/innobase/rem/.deps/rem0rec.Po
+storage/innobase/row/.deps/row0ins.Po
+storage/innobase/row/.deps/row0mysql.Po
+storage/innobase/row/.deps/row0purge.Po
+storage/innobase/row/.deps/row0row.Po
+storage/innobase/row/.deps/row0sel.Po
+storage/innobase/row/.deps/row0uins.Po
+storage/innobase/row/.deps/row0umod.Po
+storage/innobase/row/.deps/row0undo.Po
+storage/innobase/row/.deps/row0upd.Po
+storage/innobase/row/.deps/row0vers.Po
+storage/innobase/srv/.deps/srv0que.Po
+storage/innobase/srv/.deps/srv0srv.Po
+storage/innobase/srv/.deps/srv0start.Po
+storage/innobase/stamp-h1
+storage/innobase/sync/.deps/sync0arr.Po
+storage/innobase/sync/.deps/sync0rw.Po
+storage/innobase/sync/.deps/sync0sync.Po
+storage/innobase/thr/.deps/thr0loc.Po
+storage/innobase/trx/.deps/trx0purge.Po
+storage/innobase/trx/.deps/trx0rec.Po
+storage/innobase/trx/.deps/trx0roll.Po
+storage/innobase/trx/.deps/trx0rseg.Po
+storage/innobase/trx/.deps/trx0sys.Po
+storage/innobase/trx/.deps/trx0trx.Po
+storage/innobase/trx/.deps/trx0undo.Po
+storage/innobase/usr/.deps/usr0sess.Po
+storage/innobase/ut/.deps/ut0byte.Po
+storage/innobase/ut/.deps/ut0dbg.Po
+storage/innobase/ut/.deps/ut0list.Po
+storage/innobase/ut/.deps/ut0mem.Po
+storage/innobase/ut/.deps/ut0rnd.Po
+storage/innobase/ut/.deps/ut0ut.Po
+storage/innobase/ut/.deps/ut0vec.Po
+storage/innobase/ut/.deps/ut0wqueue.Po
+storage/myisam/.deps/ft_boolean_search.Po
+storage/myisam/.deps/ft_nlq_search.Po
+storage/myisam/.deps/ft_parser.Po
+storage/myisam/.deps/ft_static.Po
+storage/myisam/.deps/ft_stopwords.Po
+storage/myisam/.deps/ft_update.Po
+storage/myisam/.deps/mi_cache.Po
+storage/myisam/.deps/mi_changed.Po
+storage/myisam/.deps/mi_check.Po
+storage/myisam/.deps/mi_checksum.Po
+storage/myisam/.deps/mi_close.Po
+storage/myisam/.deps/mi_create.Po
+storage/myisam/.deps/mi_dbug.Po
+storage/myisam/.deps/mi_delete.Po
+storage/myisam/.deps/mi_delete_all.Po
+storage/myisam/.deps/mi_delete_table.Po
+storage/myisam/.deps/mi_dynrec.Po
+storage/myisam/.deps/mi_extra.Po
+storage/myisam/.deps/mi_info.Po
+storage/myisam/.deps/mi_key.Po
+storage/myisam/.deps/mi_keycache.Po
+storage/myisam/.deps/mi_locking.Po
+storage/myisam/.deps/mi_log.Po
+storage/myisam/.deps/mi_open.Po
+storage/myisam/.deps/mi_packrec.Po
+storage/myisam/.deps/mi_page.Po
+storage/myisam/.deps/mi_panic.Po
+storage/myisam/.deps/mi_preload.Po
+storage/myisam/.deps/mi_range.Po
+storage/myisam/.deps/mi_rename.Po
+storage/myisam/.deps/mi_rfirst.Po
+storage/myisam/.deps/mi_rkey.Po
+storage/myisam/.deps/mi_rlast.Po
+storage/myisam/.deps/mi_rnext.Po
+storage/myisam/.deps/mi_rnext_same.Po
+storage/myisam/.deps/mi_rprev.Po
+storage/myisam/.deps/mi_rrnd.Po
+storage/myisam/.deps/mi_rsame.Po
+storage/myisam/.deps/mi_rsamepos.Po
+storage/myisam/.deps/mi_scan.Po
+storage/myisam/.deps/mi_search.Po
+storage/myisam/.deps/mi_static.Po
+storage/myisam/.deps/mi_statrec.Po
+storage/myisam/.deps/mi_test1.Po
+storage/myisam/.deps/mi_test2.Po
+storage/myisam/.deps/mi_test3.Po
+storage/myisam/.deps/mi_unique.Po
+storage/myisam/.deps/mi_update.Po
+storage/myisam/.deps/mi_write.Po
+storage/myisam/.deps/myisam_ftdump.Po
+storage/myisam/.deps/myisamchk.Po
+storage/myisam/.deps/myisamlog.Po
+storage/myisam/.deps/myisampack.Po
+storage/myisam/.deps/rt_index.Po
+storage/myisam/.deps/rt_key.Po
+storage/myisam/.deps/rt_mbr.Po
+storage/myisam/.deps/rt_split.Po
+storage/myisam/.deps/rt_test.Po
+storage/myisam/.deps/sort.Po
+storage/myisam/.deps/sp_key.Po
+storage/myisam/.deps/sp_test.Po
+storage/myisam/FT1.MYD
+storage/myisam/FT1.MYI
+storage/myisam/ft_dump
+storage/myisam/ft_eval
+storage/myisam/ft_test1
+storage/myisam/ftbench/data
+storage/myisam/ftbench/t
+storage/myisam/ftbench/var/*
+storage/myisam/mi_test1
+storage/myisam/mi_test2
+storage/myisam/mi_test3
+storage/myisam/mi_test_all
+storage/myisam/myisam.log
+storage/myisam/myisam_ftdump
+storage/myisam/myisamchk
+storage/myisam/myisamlog
+storage/myisam/myisampack
+storage/myisam/rt_test
+storage/myisam/rt_test.MYD
+storage/myisam/rt_test.MYI
+storage/myisam/sp_test
+storage/myisam/test1.MYD
+storage/myisam/test1.MYI
+storage/myisam/test2.MYD
+storage/myisam/test2.MYI
+storage/myisammrg/.deps/myrg_close.Po
+storage/myisammrg/.deps/myrg_create.Po
+storage/myisammrg/.deps/myrg_delete.Po
+storage/myisammrg/.deps/myrg_extra.Po
+storage/myisammrg/.deps/myrg_info.Po
+storage/myisammrg/.deps/myrg_locking.Po
+storage/myisammrg/.deps/myrg_open.Po
+storage/myisammrg/.deps/myrg_panic.Po
+storage/myisammrg/.deps/myrg_queue.Po
+storage/myisammrg/.deps/myrg_range.Po
+storage/myisammrg/.deps/myrg_rfirst.Po
+storage/myisammrg/.deps/myrg_rkey.Po
+storage/myisammrg/.deps/myrg_rlast.Po
+storage/myisammrg/.deps/myrg_rnext.Po
+storage/myisammrg/.deps/myrg_rnext_same.Po
+storage/myisammrg/.deps/myrg_rprev.Po
+storage/myisammrg/.deps/myrg_rrnd.Po
+storage/myisammrg/.deps/myrg_rsame.Po
+storage/myisammrg/.deps/myrg_static.Po
+storage/myisammrg/.deps/myrg_update.Po
+storage/myisammrg/.deps/myrg_write.Po
+storage/ndb/bin/DbAsyncGenerator
+storage/ndb/bin/DbCreate
+storage/ndb/bin/acid
+storage/ndb/bin/async-lmc-bench-l-p10.sh
+storage/ndb/bin/async-lmc-bench-l.sh
+storage/ndb/bin/async-lmc-bench-p10.sh
+storage/ndb/bin/async-lmc-bench.sh
+storage/ndb/bin/atrt
+storage/ndb/bin/atrt-analyze-result.sh
+storage/ndb/bin/atrt-clear-result.sh
+storage/ndb/bin/atrt-gather-result.sh
+storage/ndb/bin/atrt-setup.sh
+storage/ndb/bin/bankCreator
+storage/ndb/bin/bankMakeGL
+storage/ndb/bin/bankSumAccounts
+storage/ndb/bin/bankTimer
+storage/ndb/bin/bankTransactionMaker
+storage/ndb/bin/bankValidateAllGLs
+storage/ndb/bin/basicTransporterTest
+storage/ndb/bin/benchronja
+storage/ndb/bin/bulk_copy
+storage/ndb/bin/copy_tab
+storage/ndb/bin/create_all_tabs
+storage/ndb/bin/create_index
+storage/ndb/bin/create_tab
+storage/ndb/bin/delete_all
+storage/ndb/bin/desc
+storage/ndb/bin/drop_all_tabs
+storage/ndb/bin/drop_index
+storage/ndb/bin/drop_tab
+storage/ndb/bin/flexAsynch
+storage/ndb/bin/flexBench
+storage/ndb/bin/flexHammer
+storage/ndb/bin/flexScan
+storage/ndb/bin/flexTT
+storage/ndb/bin/hugoCalculator
+storage/ndb/bin/hugoFill
+storage/ndb/bin/hugoLoad
+storage/ndb/bin/hugoLockRecords
+storage/ndb/bin/hugoPkDelete
+storage/ndb/bin/hugoPkRead
+storage/ndb/bin/hugoPkReadRecord
+storage/ndb/bin/hugoPkUpdate
+storage/ndb/bin/hugoScanRead
+storage/ndb/bin/hugoScanUpdate
+storage/ndb/bin/index
+storage/ndb/bin/index2
+storage/ndb/bin/initronja
+storage/ndb/bin/interpreterInTup
+storage/ndb/bin/list_tables
+storage/ndb/bin/make-config.sh
+storage/ndb/bin/mgmtclient
+storage/ndb/bin/mgmtsrvr
+storage/ndb/bin/mkconfig
+storage/ndb/bin/ndb
+storage/ndb/bin/ndb_cpcc
+storage/ndb/bin/ndb_cpcd
+storage/ndb/bin/ndb_rep
+storage/ndb/bin/ndbsql
+storage/ndb/bin/newton_basic
+storage/ndb/bin/newton_br
+storage/ndb/bin/newton_pb
+storage/ndb/bin/newton_perf
+storage/ndb/bin/perfTransporterTest
+storage/ndb/bin/printConfig
+storage/ndb/bin/printSchemafile
+storage/ndb/bin/printSysfile
+storage/ndb/bin/redoLogFileReader
+storage/ndb/bin/restart
+storage/ndb/bin/restarter
+storage/ndb/bin/restarter2
+storage/ndb/bin/restarts
+storage/ndb/bin/restore
+storage/ndb/bin/select_all
+storage/ndb/bin/select_count
+storage/ndb/bin/telco
+storage/ndb/bin/testBackup
+storage/ndb/bin/testBank
+storage/ndb/bin/testBasic
+storage/ndb/bin/testBasicAsynch
+storage/ndb/bin/testCopy
+storage/ndb/bin/testDataBuffers
+storage/ndb/bin/testDict
+storage/ndb/bin/testGrep
+storage/ndb/bin/testGrepVerify
+storage/ndb/bin/testIndex
+storage/ndb/bin/testInterpreter
+storage/ndb/bin/testKernelDataBuffer
+storage/ndb/bin/testLongSig
+storage/ndb/bin/testMgm
+storage/ndb/bin/testMgmapi
+storage/ndb/bin/testNdbApi
+storage/ndb/bin/testNodeRestart
+storage/ndb/bin/testOIBasic
+storage/ndb/bin/testOdbcDriver
+storage/ndb/bin/testOperations
+storage/ndb/bin/testRestartGci
+storage/ndb/bin/testScan
+storage/ndb/bin/testScanInterpreter
+storage/ndb/bin/testSimplePropertiesSection
+storage/ndb/bin/testSystemRestart
+storage/ndb/bin/testTimeout
+storage/ndb/bin/testTransactions
+storage/ndb/bin/test_cpcd
+storage/ndb/bin/test_event
+storage/ndb/bin/verify_index
+storage/ndb/bin/waiter
+storage/ndb/config/autom4te.cache/*
+storage/ndb/config/config.mk
+storage/ndb/examples/ndbapi_example1/ndbapi_example1
+storage/ndb/examples/ndbapi_example2/ndbapi_example2
+storage/ndb/examples/ndbapi_example3/ndbapi_example3
+storage/ndb/examples/ndbapi_example5/ndbapi_example5
+storage/ndb/examples/select_all/select_all
+storage/ndb/include/ndb_global.h
+storage/ndb/include/ndb_types.h
+storage/ndb/include/ndb_version.h
+storage/ndb/lib/libMGM_API.so
+storage/ndb/lib/libNDB_API.so
+storage/ndb/lib/libNDB_ODBC.so
+storage/ndb/lib/libNEWTON_API.so
+storage/ndb/lib/libNEWTON_BASICTEST_COMMON.so
+storage/ndb/lib/libREP_API.so
+storage/ndb/lib/libndbclient.so
+storage/ndb/lib/libndbclient_extra.so
+storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent
+storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2
+storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async
+storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1
+storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event
+storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries
+storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan
+storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple
+storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual
+storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index
+storage/ndb/src/common/debugger/libtrace.dsp
+storage/ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
+storage/ndb/src/common/logger/liblogger.dsp
+storage/ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
+storage/ndb/src/common/mgmcommon/printConfig/*.d
+storage/ndb/src/common/portlib/libportlib.dsp
+storage/ndb/src/common/transporter/libtransporter.dsp
+storage/ndb/src/common/util/libgeneral.dsp
+storage/ndb/src/common/util/testBitmask.cpp
+storage/ndb/src/cw/cpcd/ndb_cpcd
+storage/ndb/src/dummy.cpp
+storage/ndb/src/kernel/blocks/backup/libbackup.dsp
+storage/ndb/src/kernel/blocks/backup/ndb_print_backup_file
+storage/ndb/src/kernel/blocks/backup/restore/ndb_restore
+storage/ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
+storage/ndb/src/kernel/blocks/dbacc/libdbacc.dsp
+storage/ndb/src/kernel/blocks/dbdict/libdbdict.dsp
+storage/ndb/src/kernel/blocks/dbdict/ndb_print_schema_file
+storage/ndb/src/kernel/blocks/dbdih/libdbdih.dsp
+storage/ndb/src/kernel/blocks/dbdih/ndb_print_sys_file
+storage/ndb/src/kernel/blocks/dblqh/libdblqh.dsp
+storage/ndb/src/kernel/blocks/dbtc/libdbtc.dsp
+storage/ndb/src/kernel/blocks/dbtup/libdbtup.dsp
+storage/ndb/src/kernel/blocks/dbtup/test_varpage
+storage/ndb/src/kernel/blocks/dbtux/libdbtux.dsp
+storage/ndb/src/kernel/blocks/dbutil/libdbutil.dsp
+storage/ndb/src/kernel/blocks/grep/libgrep.dsp
+storage/ndb/src/kernel/blocks/ndb_print_file
+storage/ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
+storage/ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
+storage/ndb/src/kernel/blocks/qmgr/libqmgr.dsp
+storage/ndb/src/kernel/blocks/suma/libsuma.dsp
+storage/ndb/src/kernel/blocks/trix/libtrix.dsp
+storage/ndb/src/kernel/error/liberror.dsp
+storage/ndb/src/kernel/ndbd
+storage/ndb/src/kernel/ndbd.dsp
+storage/ndb/src/kernel/vm/libkernel.dsp
+storage/ndb/src/libndb.ver
+storage/ndb/src/libndbclient.dsp
+storage/ndb/src/mgmapi/libmgmapi.dsp
+storage/ndb/src/mgmclient/libndbmgmclient.dsp
+storage/ndb/src/mgmclient/ndb_mgm
+storage/ndb/src/mgmclient/ndb_mgm.dsp
+storage/ndb/src/mgmclient/test_cpcd/*.d
+storage/ndb/src/mgmsrv/ndb_mgmd
+storage/ndb/src/mgmsrv/ndb_mgmd.dsp
+storage/ndb/src/ndbapi/libndbapi.dsp
+storage/ndb/src/ndbapi/ndberror_check
+storage/ndb/test/ndbapi/DbAsyncGenerator
+storage/ndb/test/ndbapi/DbCreate
+storage/ndb/test/ndbapi/bank/bankCreator
+storage/ndb/test/ndbapi/bank/bankMakeGL
+storage/ndb/test/ndbapi/bank/bankSumAccounts
+storage/ndb/test/ndbapi/bank/bankTimer
+storage/ndb/test/ndbapi/bank/bankTransactionMaker
+storage/ndb/test/ndbapi/bank/bankValidateAllGLs
+storage/ndb/test/ndbapi/bank/testBank
+storage/ndb/test/ndbapi/create_all_tabs
+storage/ndb/test/ndbapi/create_tab
+storage/ndb/test/ndbapi/drop_all_tabs
+storage/ndb/test/ndbapi/flexAsynch
+storage/ndb/test/ndbapi/flexBench
+storage/ndb/test/ndbapi/flexBench.dsp
+storage/ndb/test/ndbapi/flexHammer
+storage/ndb/test/ndbapi/flexTT
+storage/ndb/test/ndbapi/ndbapi_slow_select
+storage/ndb/test/ndbapi/testBackup
+storage/ndb/test/ndbapi/testBasic
+storage/ndb/test/ndbapi/testBasic.dsp
+storage/ndb/test/ndbapi/testBasicAsynch
+storage/ndb/test/ndbapi/testBitfield
+storage/ndb/test/ndbapi/testBlobs
+storage/ndb/test/ndbapi/testBlobs.dsp
+storage/ndb/test/ndbapi/testDataBuffers
+storage/ndb/test/ndbapi/testDeadlock
+storage/ndb/test/ndbapi/testDict
+storage/ndb/test/ndbapi/testIndex
+storage/ndb/test/ndbapi/testIndexStat
+storage/ndb/test/ndbapi/testInterpreter
+storage/ndb/test/ndbapi/testLcp
+storage/ndb/test/ndbapi/testMgm
+storage/ndb/test/ndbapi/testNdbApi
+storage/ndb/test/ndbapi/testNodeRestart
+storage/ndb/test/ndbapi/testOIBasic
+storage/ndb/test/ndbapi/testOperations
+storage/ndb/test/ndbapi/testPartitioning
+storage/ndb/test/ndbapi/testReadPerf
+storage/ndb/test/ndbapi/testRestartGci
+storage/ndb/test/ndbapi/testSRBank
+storage/ndb/test/ndbapi/testScan
+storage/ndb/test/ndbapi/testScan.dsp
+storage/ndb/test/ndbapi/testScanInterpreter
+storage/ndb/test/ndbapi/testScanPerf
+storage/ndb/test/ndbapi/testSystemRestart
+storage/ndb/test/ndbapi/testTimeout
+storage/ndb/test/ndbapi/testTransactions
+storage/ndb/test/ndbapi/test_event
+storage/ndb/test/ndbapi/test_event_merge
+storage/ndb/test/run-test/atrt
+storage/ndb/test/src/libNDBT.dsp
+storage/ndb/test/tools/copy_tab
+storage/ndb/test/tools/create_index
+storage/ndb/test/tools/hugoCalculator
+storage/ndb/test/tools/hugoFill
+storage/ndb/test/tools/hugoLoad
+storage/ndb/test/tools/hugoLockRecords
+storage/ndb/test/tools/hugoPkDelete
+storage/ndb/test/tools/hugoPkRead
+storage/ndb/test/tools/hugoPkReadRecord
+storage/ndb/test/tools/hugoPkUpdate
+storage/ndb/test/tools/hugoScanRead
+storage/ndb/test/tools/hugoScanUpdate
+storage/ndb/test/tools/listen_event
+storage/ndb/test/tools/ndb_cpcc
+storage/ndb/test/tools/rep_latency
+storage/ndb/test/tools/restart
+storage/ndb/test/tools/verify_index
+storage/ndb/tools/ndb_config
+storage/ndb/tools/ndb_delete_all
+storage/ndb/tools/ndb_delete_all.dsp
+storage/ndb/tools/ndb_desc
+storage/ndb/tools/ndb_desc.dsp
+storage/ndb/tools/ndb_drop_index
+storage/ndb/tools/ndb_drop_index.dsp
+storage/ndb/tools/ndb_drop_table
+storage/ndb/tools/ndb_drop_table.dsp
+storage/ndb/tools/ndb_restore
+storage/ndb/tools/ndb_select_all
+storage/ndb/tools/ndb_select_all.dsp
+storage/ndb/tools/ndb_select_count
+storage/ndb/tools/ndb_select_count.dsp
+storage/ndb/tools/ndb_show_tables
+storage/ndb/tools/ndb_show_tables.dsp
+storage/ndb/tools/ndb_test_platform
+storage/ndb/tools/ndb_waiter
+storage/ndb/tools/ndb_waiter.dsp
+strings/*.ds?
+strings/*.vcproj
+strings/.deps/bchange.Po
+strings/.deps/bcmp.Po
+strings/.deps/bfill.Po
+strings/.deps/bmove.Po
+strings/.deps/bmove512.Po
+strings/.deps/bmove_upp.Po
+strings/.deps/conf_to_src.Po
+strings/.deps/ctype-big5.Po
+strings/.deps/ctype-bin.Po
+strings/.deps/ctype-cp932.Po
+strings/.deps/ctype-czech.Po
+strings/.deps/ctype-euc_kr.Po
+strings/.deps/ctype-eucjpms.Po
+strings/.deps/ctype-extra.Po
+strings/.deps/ctype-gb2312.Po
+strings/.deps/ctype-gbk.Po
+strings/.deps/ctype-latin1.Po
+strings/.deps/ctype-mb.Po
+strings/.deps/ctype-simple.Po
+strings/.deps/ctype-sjis.Po
+strings/.deps/ctype-tis620.Po
+strings/.deps/ctype-uca.Po
+strings/.deps/ctype-ucs2.Po
+strings/.deps/ctype-ujis.Po
+strings/.deps/ctype-utf8.Po
+strings/.deps/ctype-win1250ch.Po
+strings/.deps/ctype.Po
+strings/.deps/decimal.Po
+strings/.deps/int2str.Po
+strings/.deps/is_prefix.Po
+strings/.deps/llstr.Po
+strings/.deps/longlong2str.Po
+strings/.deps/longlong2str_asm.Po
+strings/.deps/my_strchr.Po
+strings/.deps/my_strtoll10.Po
+strings/.deps/my_vsnprintf.Po
+strings/.deps/r_strinstr.Po
+strings/.deps/str2int.Po
+strings/.deps/str_alloc.Po
+strings/.deps/strappend.Po
+strings/.deps/strcend.Po
+strings/.deps/strcont.Po
+strings/.deps/strend.Po
+strings/.deps/strfill.Po
+strings/.deps/strinstr.Po
+strings/.deps/strmake.Po
+strings/.deps/strmov.Po
+strings/.deps/strnlen.Po
+strings/.deps/strnmov.Po
+strings/.deps/strstr.Po
+strings/.deps/strtod.Po
+strings/.deps/strtol.Po
+strings/.deps/strtoll.Po
+strings/.deps/strtoul.Po
+strings/.deps/strtoull.Po
+strings/.deps/strxmov.Po
+strings/.deps/strxnmov.Po
+strings/.deps/xml.Po
+strings/conf_to_src
+strings/ctype_autoconf.c
+strings/ctype_extra_sources.c
+strings/str_test
+strings/test_decimal
+support-files/*.ini
+support-files/MacOSX/Description.plist
+support-files/MacOSX/Info.plist
+support-files/MacOSX/ReadMe.txt
+support-files/MacOSX/StartupParameters.plist
+support-files/MacOSX/postflight
+support-files/MacOSX/postinstall
+support-files/MacOSX/preflight
+support-files/MacOSX/preinstall
+support-files/binary-configure
+support-files/my-huge.cnf
+support-files/my-innodb-heavy-4G.cnf
+support-files/my-large.cnf
+support-files/my-medium.cnf
+support-files/my-small.cnf
+support-files/mysql-3.23.25-beta.spec
+support-files/mysql-3.23.26-beta.spec
+support-files/mysql-3.23.27-beta.spec
+support-files/mysql-3.23.28-gamma.spec
+support-files/mysql-3.23.29-gamma.spec
+support-files/mysql-log-rotate
+support-files/mysql.server
+support-files/mysql.spec
+support-files/mysqld_multi.server
+support-files/ndb-config-2-node.ini
+tags
+test/ndbapi/bank/bankCreator
+test/ndbapi/bank/bankMakeGL
+test/ndbapi/bank/bankSumAccounts
+test/ndbapi/bank/bankTimer
+test/ndbapi/bank/bankTransactionMaker
+test/ndbapi/bank/bankValidateAllGLs
+test/ndbapi/bank/testBank
+test/ndbapi/create_all_tabs
+test/ndbapi/create_tab
+test/ndbapi/drop_all_tabs
+test/ndbapi/flexAsynch
+test/ndbapi/flexBench
+test/ndbapi/flexHammer
+test/ndbapi/flexTT
+test/ndbapi/testBackup
+test/ndbapi/testBasic
+test/ndbapi/testBasicAsynch
+test/ndbapi/testBlobs
+test/ndbapi/testDataBuffers
+test/ndbapi/testDeadlock
+test/ndbapi/testDict
+test/ndbapi/testIndex
+test/ndbapi/testMgm
+test/ndbapi/testNdbApi
+test/ndbapi/testNodeRestart
+test/ndbapi/testOIBasic
+test/ndbapi/testOperations
+test/ndbapi/testRestartGci
+test/ndbapi/testScan
+test/ndbapi/testScanInterpreter
+test/ndbapi/testScanPerf
+test/ndbapi/testSystemRestart
+test/ndbapi/testTimeout
+test/ndbapi/testTransactions
+test/ndbapi/test_event
+test/run-test/atrt
+test/tools/copy_tab
+test/tools/create_index
+test/tools/hugoCalculator
+test/tools/hugoFill
+test/tools/hugoLoad
+test/tools/hugoLockRecords
+test/tools/hugoPkDelete
+test/tools/hugoPkRead
+test/tools/hugoPkReadRecord
+test/tools/hugoPkUpdate
+test/tools/hugoScanRead
+test/tools/hugoScanUpdate
+test/tools/ndb_cpcc
+test/tools/restart
+test/tools/verify_index
+test1/*
+test_xml
+tests/*.ds?
+tests/*.vcproj
+tests/.deps/dummy.Po
+tests/.deps/insert_test.Po
+tests/.deps/mysql_client_test.Po
+tests/.deps/select_test.Po
+tests/.deps/thread_test.Po
+tests/.libs -prune
+tests/.libs/lt-mysql_client_test
+tests/.libs/mysql_client_test
+tests/bug25714
+tests/client_test
+tests/connect_test
+tests/mysql_client_test
+thr_insert_test/*
+thr_test/*
+thread_test
+tmp/*
+tools/.libs -prune
+tools/my_vsnprintf.c
+tools/mysqlmanager
+tools/mysqlmngd
+tools/mysqltestmanager
+tools/mysys_priv.h
+unittest/examples/*.t
+unittest/examples/.deps/no_plan-t.Po
+unittest/examples/.deps/simple-t.Po
+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
+unittest/mytap/.deps/tap.Po
+unittest/mytap/t/*.t
+unittest/mytap/t/.deps/basic-t.Po
+unittest/unit
+vi.h
+vio/*.ds?
+vio/*.vcproj
+vio/.deps/dummy.Po
+vio/.deps/test-ssl.Po
+vio/.deps/test-sslclient.Po
+vio/.deps/test-sslserver.Po
+vio/.deps/vio.Po
+vio/.deps/viosocket.Po
+vio/.deps/viossl.Po
+vio/.deps/viosslfactories.Po
+vio/test-ssl
+vio/test-sslclient
+vio/test-sslserver
+vio/viotest-ssl
+vio/viotest-sslconnect.cpp
+vio/viotest.cpp
+win/configure.data
+win/vs71cache.txt
+win/vs8cache.txt
+win/nmake_cache.txt
+ylwrap
+zlib/*.ds?
+zlib/*.vcproj
+mysql-test/bug36522-64.tar
+mysql-test/bug36522.tar
+mysql-test/t.log
+mysql-test/tps.log
+libmysqld/event_parse_data.cc
+autom4te.cache
+sql/share/czech
+sql/share/danish
+sql/share/dutch
+sql/share/english
+sql/share/estonian
+sql/share/french
+sql/share/german
+sql/share/greek
+sql/share/hungarian
+sql/share/italian
+sql/share/japanese
+sql/share/japanese-sjis
+sql/share/korean
+sql/share/norwegian
+sql/share/norwegian-ny
+sql/share/polish
+sql/share/portuguese
+sql/share/romanian
+sql/share/russian
+sql/share/serbian
+sql/share/slovak
+sql/share/spanish
+sql/share/swedish
+sql/share/ukrainian
+*.jar
+*.dylib
+*.stamp
+storage/ndb/**/*.dir
+storage/ndb/**/CMakeFiles
+storage/ndb/**/target
+storage/ndb/**/*.class
+storage/ndb/src/ndbjtie/**/*.sh
+storage/ndb/src/ndbjtie/**/*.log
+storage/ndb/src/ndbjtie/jtie/test/myapi/myapi_test
+storage/ndb/clusterj/**/*MANIFEST.MF
+storage/ndb/clusterj/**/*manifest.mf
+storage/ndb/test/crund/*.cnf
+storage/ndb/test/crund/*.ini*
+storage/ndb/test/crund/*.properties
+storage/ndb/test/crund/build/
+storage/ndb/test/crund/javadoc/
+storage/ndb/test/crund/lib/
+storage/ndb/test/crund/**/log*
+storage/ndb/test/crund/martins_little_helpers/src/utils/Properties_test
+storage/ndb/test/crund/martins_little_helpers/src/utils/hrt_stopwatch_test
+storage/ndb/test/crund/martins_little_helpers/src/utils/hrt_utils_test
+storage/ndb/test/crund/martins_little_helpers/src/utils/utils_HrtStopwatch.h
+storage/ndb/test/crund/martins_little_helpers/src/utils/utils_JniInstrumentationTest.h
+storage/ndb/test/crund/scripts/ndblog
+storage/ndb/test/crund/scripts/results
+storage/ndb/test/crund/src/crundndb/NdbApiDriver
+storage/ndb/test/crund/src/crundndb/com_mysql_cluster_crund_NdbApiLoad.h
+storage/ndb/test/crund/tws/tws_java/build/
+storage/ndb/test/crund/tws/tws_java/nbproject/configs/
+storage/ndb/test/crund/tws/tws_java/nbproject/private/
+storage/ndb/test/crund/tws/tws_java/run.properties
+storage/ndb/test/crund/tws/*.properties
+storage/ndb/test/crund/tws/tws_cpp/TwsDriver
+
+libmysqld/examples/mysqltest.cc
+libmysqld/sql_signal.cc
+libmysqld/debug_sync.cc
+dbug/tests
+libmysqld/mdl.cc
+client/transaction.h
+libmysqld/transaction.cc
+libmysqld/sys_vars.cc
+libmysqld/keycaches.cc
+client/dtoa.c
+libmysqld/opt_trace.cc
+libmysqld/sql_audit.cc
+storage/archive/archive_performance
+storage/archive/concurrency_test
+libmysql_r/client_settings.h
+libmysqld/scheduler.cc
+libmysqld/sql_connect.cc
+libmysqld/sql_tablespace.cc
+mysql-test/dump.txt
+configure.am
+run_collection*.cmake
+configure.am
+run_collection*.cmake
+cmake_install.cmake
+CMakeFiles.cmake
+CPackConfig.cmake
+CPackSourceConfig.cmake
+CTestTestfile.cmake
+make_dist.cmake
+_CPack_Packages
+merge_archives*.cmake
+libmysqld/des_key_file.cc
+CPackConfig.cmake
+CPackSourceConfig.cmake
+make_dist.cmake
+client/echo
+libmysql/libmysql_exports_file.cc
+libmysql/merge_archives_mysqlclient.cmake
+libmysqld/merge_archives_mysqlserver.cmake
+libmysqld/mysqlserver_depends.c
+libmysqld/examples/mysql_embedded
+libmysqld/sql_bootstrap.cc
+sql/dummy.bak
+mysys/thr_lock
+mysys/queues
+libmysqld/binlog.cc
+libmysqld/sql_alter.cc
+libmysqld/sql_partition_admin.cc
+generated
+doxyerror.log
+VERSION.dep
+info_macros.cmake
+Docs/INFO_BIN
+Docs/INFO_SRC
+Testing
+FilesCopied
+source_downloads
+client/mysql_plugin
+support-files/plugins.files
+storage/perfschema/pfs_lex_token.h
+storage/perfschema/gen_pfs_lex_token
+sql/share/bulgarian
+sql/lex_token.h
+sql/gen_lex_token
+storage/innobase/xtrabackup/test/var/*
+storage/innobase/xtrabackup/test/results/*
+storage/innobase/xtrabackup/test/test_results.subunit
+storage/innobase/xtrabackup/src/xbcloud
+storage/innobase/xtrabackup/src/xbcrypt
+storage/innobase/xtrabackup/src/xbstream
+storage/innobase/xtrabackup/innobackupex
+storage/innobase/xtrabackup/src/xtrabackup
+storage/innobase/xtrabackup/src/xtrabackup_version.h
+storage/innobase/xtrabackup/src/innobackupex
+storage/innobase/xtrabackup/src/version_check_pl.h
+/CMakeCache.txt
+/storage/innobase/xtrabackup/src/libarchive/DartConfiguration.tcl
+/storage/innobase/xtrabackup/src/libarchive/cmake.tmp/CheckFuncs_stub.c
diff -Nru percona-xtrabackup-2.2.3/include/errmsg.h percona-xtrabackup-2.3.7/include/errmsg.h
--- percona-xtrabackup-2.2.3/include/errmsg.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/errmsg.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef ERRMSG_INCLUDED
 #define ERRMSG_INCLUDED
 
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -32,7 +32,9 @@
 #define CR_MIN_ERROR		2000	/* For easier client code */
 #define CR_MAX_ERROR		2999
 #if !defined(ER)
-#define ER(X) client_errors[(X)-CR_MIN_ERROR]
+#define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \
+               client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_ERROR])
+
 #endif
 #define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
 
diff -Nru percona-xtrabackup-2.2.3/include/lf.h percona-xtrabackup-2.3.7/include/lf.h
--- percona-xtrabackup-2.2.3/include/lf.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/lf.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2015, 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
@@ -244,6 +244,9 @@
 int lf_hash_insert(LF_HASH *hash, LF_PINS *pins, const void *data);
 void *lf_hash_search(LF_HASH *hash, LF_PINS *pins, const void *key, uint keylen);
 int lf_hash_delete(LF_HASH *hash, LF_PINS *pins, const void *key, uint keylen);
+typedef int lf_hash_match_func(const uchar *el);
+void *lf_hash_random_match(LF_HASH *hash, LF_PINS *pins,
+                           lf_hash_match_func *match, uint rand_val);
 /*
   shortcut macros to access underlying pinbox functions from an LF_HASH
   see _lf_pinbox_get_pins() and _lf_pinbox_put_pins()
diff -Nru percona-xtrabackup-2.2.3/include/my_base.h percona-xtrabackup-2.3.7/include/my_base.h
--- percona-xtrabackup-2.2.3/include/my_base.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/my_base.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -541,7 +541,6 @@
 #define HA_STATE_BUFF_SAVED	512	/* If current keybuff is info->buff */
 #define HA_STATE_ROW_CHANGED	1024	/* To invalide ROW cache */
 #define HA_STATE_EXTEND_BLOCK	2048
-#define HA_STATE_RNEXT_SAME	4096	/* rnext_same occupied lastkey2 */
 
 /* myisampack expects no more than 32 field types. */
 enum en_fieldtype {
diff -Nru percona-xtrabackup-2.2.3/include/my_default.h percona-xtrabackup-2.3.7/include/my_default.h
--- percona-xtrabackup-2.2.3/include/my_default.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/my_default.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2014, 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
@@ -36,6 +36,7 @@
                          char **group_suffix, char **login_path);
 int my_load_defaults(const char *conf_file, const char **groups,
                      int *argc, char ***argv, const char ***);
+int check_file_permissions(const char *file_name);
 int load_defaults(const char *conf_file, const char **groups,
                   int *argc, char ***argv);
 int my_search_option_files(const char *conf_file, int *argc,
diff -Nru percona-xtrabackup-2.2.3/include/my_getopt.h percona-xtrabackup-2.3.7/include/my_getopt.h
--- percona-xtrabackup-2.2.3/include/my_getopt.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/my_getopt.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2014, 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,6 +113,7 @@
                               const struct my_option *longopts,
                               my_get_one_option,
                               const char **command_list);
+extern void print_cmdline_password_warning();
 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);
diff -Nru percona-xtrabackup-2.2.3/include/my_global.h percona-xtrabackup-2.3.7/include/my_global.h
--- percona-xtrabackup-2.2.3/include/my_global.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/my_global.h	2017-02-27 07:47:02.000000000 +0000
@@ -333,9 +333,6 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef HAVE_SYS_TIMEB_H
-#include <sys/timeb.h>				/* Avoid warnings on SCO */
-#endif
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
@@ -763,38 +760,28 @@
 #define SIZE_T_MAX      (~((size_t) 0))
 #endif
 
-#ifndef isfinite
-#ifdef HAVE_FINITE
-#define isfinite(x) finite(x)
-#else
-#define finite(x) (1.0 / fabs(x) > 0.0)
-#endif /* HAVE_FINITE */
-#endif /* isfinite */
-
 #include <math.h>
-#ifndef HAVE_ISNAN
-#define isnan(x) ((x) != (x))
-#endif
-C_MODE_START
-extern double my_double_isnan(double x);
-C_MODE_END
 
-#ifdef HAVE_ISINF
-/* Check if C compiler is affected by GCC bug #39228 */
-#if !defined(__cplusplus) && defined(HAVE_BROKEN_ISINF)
-/* Force store/reload of the argument to/from a 64-bit double */
-static inline double my_isinf(double x)
-{
-  volatile double t= x;
-  return isinf(t);
-}
-#else
-/* System-provided isinf() is available and safe to use */
-#define my_isinf(X) isinf(X)
-#endif
-#else /* !HAVE_ISINF */
-#define my_isinf(X) (!finite(X) && !isnan(X))
-#endif
+#if (__cplusplus >= 201103L)
+  /* For C++11 use the new std functions rather than C99 macros. */
+  #include <cmath>
+  #define my_isfinite(X) std::isfinite(X)
+  #define my_isnan(X) std::isnan(X)
+  #define my_isinf(X) std::isinf(X)
+#else
+  #ifdef HAVE_LLVM_LIBCPP /* finite is deprecated in libc++ */
+    #define my_isfinite(X) isfinite(X)
+  #else
+    #define my_isfinite(X) finite(X)
+  #endif
+  #define my_isnan(X) isnan(X)
+  #ifdef HAVE_ISINF
+    /* System-provided isinf() is available and safe to use */
+    #define my_isinf(X) isinf(X)
+  #else /* !HAVE_ISINF */
+    #define my_isinf(X) (!my_isfinite(X) && !my_isnan(X))
+  #endif
+#endif /* __cplusplus >= 201103L */
 
 /* Define missing math constants. */
 #ifndef M_PI
@@ -1193,7 +1180,9 @@
 /* Things we don't need in the embedded version of MySQL */
 /* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */
 
+#if !defined(XTRABACKUP)
 #undef HAVE_OPENSSL
+#endif
 #undef HAVE_SMEM				/* No shared memory */
 
 #endif /* EMBEDDED_LIBRARY */
diff -Nru percona-xtrabackup-2.2.3/include/my_pthread.h percona-xtrabackup-2.3.7/include/my_pthread.h
--- percona-xtrabackup-2.2.3/include/my_pthread.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/my_pthread.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -144,8 +144,18 @@
 int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack);
 int pthread_attr_destroy(pthread_attr_t *connect_att);
 int my_pthread_once(my_pthread_once_t *once_control,void (*init_routine)(void));
-struct tm *localtime_r(const time_t *timep,struct tm *tmp);
-struct tm *gmtime_r(const time_t *timep,struct tm *tmp);
+
+static inline struct tm *localtime_r(const time_t *timep, struct tm *tmp)
+{
+  localtime_s(tmp, timep);
+  return tmp;
+}
+
+static inline struct tm *gmtime_r(const time_t *clock, struct tm *res)
+{
+  gmtime_s(res, clock);
+  return res;
+}
 
 void pthread_exit(void *a);
 int pthread_join(pthread_t thread, void **value_ptr);
@@ -853,18 +863,7 @@
 extern uint my_thread_end_wait_time;
 #define my_thread_var (_my_thread_var())
 #define my_errno my_thread_var->thr_errno
-/*
-  Keep track of shutdown,signal, and main threads so that my_end() will not
-  report errors with them
-*/
-
-/* Which kind of thread library is in use */
-
-#define THD_LIB_OTHER 1
-#define THD_LIB_NPTL  2
-#define THD_LIB_LT    4
 
-extern uint thd_lib_detected;
 
 /*
   thread_safe_xxx functions are for critical statistic or counters.
diff -Nru percona-xtrabackup-2.2.3/include/mysql/plugin.h percona-xtrabackup-2.3.7/include/mysql/plugin.h
--- percona-xtrabackup-2.2.3/include/mysql/plugin.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/mysql/plugin.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/include/mysql/psi/mysql_statement.h percona-xtrabackup-2.3.7/include/mysql/psi/mysql_statement.h
--- percona-xtrabackup-2.2.3/include/mysql/psi/mysql_statement.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/mysql/psi/mysql_statement.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.   
+/* Copyright (c) 2010, 2015, 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
@@ -41,7 +41,6 @@
   do {} while (0)
 #endif
 
-#ifdef HAVE_PSI_STATEMENT_INTERFACE
 #ifdef HAVE_PSI_STATEMENT_DIGEST_INTERFACE
   #define MYSQL_DIGEST_START(LOCKER) \
     inline_mysql_digest_start(LOCKER)
@@ -49,17 +48,13 @@
   #define MYSQL_DIGEST_START(LOCKER) \
     NULL
 #endif
-#else
-  #define MYSQL_DIGEST_START(LOCKER) \
-    NULL
-#endif
 
 #ifdef HAVE_PSI_STATEMENT_DIGEST_INTERFACE
-  #define MYSQL_ADD_TOKEN(LOCKER, T, Y) \
-    inline_mysql_add_token(LOCKER, T, Y)
+  #define MYSQL_DIGEST_END(LOCKER, DIGEST) \
+    inline_mysql_digest_end(LOCKER, DIGEST)
 #else
-  #define MYSQL_ADD_TOKEN(LOCKER, T, Y) \
-    NULL
+  #define MYSQL_DIGEST_END(LOCKER, DIGEST) \
+    do {} while (0)
 #endif
 
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
@@ -132,20 +127,17 @@
   PSI_digest_locker* digest_locker= NULL;
 
   if (likely(locker != NULL))
-    digest_locker= PSI_STATEMENT_CALL(digest_start)(locker);
+    digest_locker= PSI_DIGEST_CALL(digest_start)(locker);
   return digest_locker;
 }
 #endif
 
 #ifdef HAVE_PSI_STATEMENT_DIGEST_INTERFACE
-static inline struct PSI_digest_locker *
-inline_mysql_add_token(PSI_digest_locker *locker, uint token,
-                       void *yylval)
+static inline void
+inline_mysql_digest_end(PSI_digest_locker *locker, const sql_digest_storage *digest)
 {
   if (likely(locker != NULL))
-    locker= PSI_STATEMENT_CALL(digest_add_token)(locker, token,
-                                      (OPAQUE_LEX_YYSTYPE*)yylval);
-  return locker;
+    PSI_DIGEST_CALL(digest_end)(locker, digest);
 }
 #endif
 
diff -Nru percona-xtrabackup-2.2.3/include/mysql/psi/psi_abi_v0.h.pp percona-xtrabackup-2.3.7/include/mysql/psi/psi_abi_v0.h.pp
--- percona-xtrabackup-2.2.3/include/mysql/psi/psi_abi_v0.h.pp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/mysql/psi/psi_abi_v0.h.pp	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #include "mysql/psi/psi.h"
 C_MODE_START
 struct TABLE_SHARE;
-struct OPAQUE_LEX_YYSTYPE;
+struct sql_digest_storage;
 struct PSI_mutex;
 typedef struct PSI_mutex PSI_mutex;
 struct PSI_rwlock;
diff -Nru percona-xtrabackup-2.2.3/include/mysql/psi/psi_abi_v1.h.pp percona-xtrabackup-2.3.7/include/mysql/psi/psi_abi_v1.h.pp
--- percona-xtrabackup-2.2.3/include/mysql/psi/psi_abi_v1.h.pp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/mysql/psi/psi_abi_v1.h.pp	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #include "mysql/psi/psi.h"
 C_MODE_START
 struct TABLE_SHARE;
-struct OPAQUE_LEX_YYSTYPE;
+struct sql_digest_storage;
 struct PSI_mutex;
 typedef struct PSI_mutex PSI_mutex;
 struct PSI_rwlock;
@@ -241,20 +241,6 @@
   void *m_wait;
   uint m_index;
 };
-struct PSI_digest_storage
-{
-  my_bool m_full;
-  int m_byte_count;
-  uint m_charset_number;
-  unsigned char m_token_array[1024];
-};
-typedef struct PSI_digest_storage PSI_digest_storage;
-struct PSI_digest_locker_state
-{
-  int m_last_id_index;
-  PSI_digest_storage m_digest_storage;
-};
-typedef struct PSI_digest_locker_state PSI_digest_locker_state;
 struct PSI_statement_locker_state_v1
 {
   my_bool m_discarded;
@@ -280,7 +266,7 @@
   ulong m_sort_range;
   ulong m_sort_rows;
   ulong m_sort_scan;
-  PSI_digest_locker_state m_digest_state;
+  const struct sql_digest_storage *m_digest;
   char m_schema_name[(64 * 3)];
   uint m_schema_name_length;
 };
@@ -508,8 +494,8 @@
 typedef void (*set_socket_thread_owner_v1_t)(struct PSI_socket *socket);
 typedef struct PSI_digest_locker * (*digest_start_v1_t)
   (struct PSI_statement_locker *locker);
-typedef struct PSI_digest_locker* (*digest_add_token_v1_t)
-  (struct PSI_digest_locker *locker, uint token, struct OPAQUE_LEX_YYSTYPE *yylval);
+typedef void (*digest_end_v1_t)
+  (struct PSI_digest_locker *locker, const struct sql_digest_storage *digest);
 typedef int (*set_thread_connect_attrs_v1_t)(const char *buffer, uint length,
                                              const void *from_cs);
 struct PSI_v1
@@ -610,7 +596,7 @@
   set_socket_info_v1_t set_socket_info;
   set_socket_thread_owner_v1_t set_socket_thread_owner;
   digest_start_v1_t digest_start;
-  digest_add_token_v1_t digest_add_token;
+  digest_end_v1_t digest_end;
   set_thread_connect_attrs_v1_t set_thread_connect_attrs;
 };
 typedef struct PSI_v1 PSI;
diff -Nru percona-xtrabackup-2.2.3/include/mysql/psi/psi_abi_v2.h.pp percona-xtrabackup-2.3.7/include/mysql/psi/psi_abi_v2.h.pp
--- percona-xtrabackup-2.2.3/include/mysql/psi/psi_abi_v2.h.pp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/mysql/psi/psi_abi_v2.h.pp	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #include "mysql/psi/psi.h"
 C_MODE_START
 struct TABLE_SHARE;
-struct OPAQUE_LEX_YYSTYPE;
+struct sql_digest_storage;
 struct PSI_mutex;
 typedef struct PSI_mutex PSI_mutex;
 struct PSI_rwlock;
diff -Nru percona-xtrabackup-2.2.3/include/mysql/psi/psi.h percona-xtrabackup-2.3.7/include/mysql/psi/psi.h
--- percona-xtrabackup-2.2.3/include/mysql/psi/psi.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/mysql/psi/psi.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -43,18 +43,8 @@
 C_MODE_START
 
 struct TABLE_SHARE;
-/*
-  There are 3 known bison parsers in the server:
-  - (1) the SQL parser itself, sql/sql_yacc.yy
-  - (2) storage/innobase/fts/fts0pars.y
-  - (3) storage/innobase/pars/pars0grm.y
-  What is instrumented here are the tokens from the SQL query text (1),
-  to make digests.
-  Now, to avoid name pollution and conflicts with different YYSTYPE definitions,
-  an opaque structure is used here.
-  The real type to use when invoking the digest api is LEX_YYSTYPE.
-*/
-struct OPAQUE_LEX_YYSTYPE;
+
+struct sql_digest_storage;
 
 /**
   @file mysql/psi/psi.h
@@ -952,29 +942,6 @@
   uint m_index;
 };
 
-#define PSI_MAX_DIGEST_STORAGE_SIZE 1024
-
-/**
-  Structure to store token count/array for a statement
-  on which digest is to be calculated.
-*/
-struct PSI_digest_storage
-{
-  my_bool m_full;
-  int m_byte_count;
-  /** Character set number. */
-  uint m_charset_number;
-  unsigned char m_token_array[PSI_MAX_DIGEST_STORAGE_SIZE];
-};
-typedef struct PSI_digest_storage PSI_digest_storage;
-
-struct PSI_digest_locker_state
-{
-  int m_last_id_index;
-  PSI_digest_storage m_digest_storage;
-};
-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)
 
@@ -1037,7 +1004,7 @@
   /** Metric, number of sort scans. */
   ulong m_sort_scan;
   /** Statement digest. */
-  PSI_digest_locker_state m_digest_state;
+  const struct sql_digest_storage *m_digest;
   /** Current schema name. */
   char m_schema_name[PSI_SCHEMA_NAME_LEN];
   /** Length in bytes of @c m_schema_name. */
@@ -1902,11 +1869,15 @@
 */
 typedef void (*set_socket_thread_owner_v1_t)(struct PSI_socket *socket);
 
+/**
+  Get a digest locker for the current statement.
+  @param locker a statement locker for the running thread
+*/
 typedef struct PSI_digest_locker * (*digest_start_v1_t)
   (struct PSI_statement_locker *locker);
 
-typedef struct PSI_digest_locker* (*digest_add_token_v1_t)
-  (struct PSI_digest_locker *locker, uint token, struct OPAQUE_LEX_YYSTYPE *yylval);
+typedef void (*digest_end_v1_t)
+  (struct PSI_digest_locker *locker, const struct sql_digest_storage *digest);
 
 /**
   Stores an array of connection attributes
@@ -2118,8 +2089,8 @@
   set_socket_thread_owner_v1_t set_socket_thread_owner;
   /** @sa digest_start_v1_t. */
   digest_start_v1_t digest_start;
-  /** @sa digest_add_token_v1_t. */
-  digest_add_token_v1_t digest_add_token;
+  /** @sa digest_end_v1_t. */
+  digest_end_v1_t digest_end;
   /** @sa set_thread_connect_attrs_v1_t. */
   set_thread_connect_attrs_v1_t set_thread_connect_attrs;
 };
@@ -2414,6 +2385,10 @@
 #define PSI_STATEMENT_CALL(M) PSI_DYNAMIC_CALL(M)
 #endif
 
+#ifndef PSI_DIGEST_CALL
+#define PSI_DIGEST_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
 #ifndef PSI_TABLE_CALL
 #define PSI_TABLE_CALL(M) PSI_DYNAMIC_CALL(M)
 #endif
diff -Nru percona-xtrabackup-2.2.3/include/mysql/thread_pool_priv.h percona-xtrabackup-2.3.7/include/mysql/thread_pool_priv.h
--- percona-xtrabackup-2.2.3/include/mysql/thread_pool_priv.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/mysql/thread_pool_priv.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2015, 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
@@ -35,6 +35,7 @@
 #include <debug_sync.h>
 #include <sql_profile.h>
 #include <table.h>
+#include "field.h"
 #include <set>
 
 typedef std::set<THD*>::iterator Thread_iterator;
diff -Nru percona-xtrabackup-2.2.3/include/my_sys.h percona-xtrabackup-2.3.7/include/my_sys.h
--- percona-xtrabackup-2.2.3/include/my_sys.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/my_sys.h	2017-02-27 07:47:02.000000000 +0000
@@ -712,7 +712,6 @@
 extern size_t system_filename(char * to,const char *from);
 extern size_t unpack_filename(char * to,const char *from);
 extern char * intern_filename(char * to,const char *from);
-extern char * directory_file_name(char * dst, const char *src);
 extern int pack_filename(char * to, const char *name, size_t max_length);
 extern char * my_path(char * to,const char *progname,
 			 const char *own_pathname_part);
diff -Nru percona-xtrabackup-2.2.3/include/violite.h percona-xtrabackup-2.3.7/include/violite.h
--- percona-xtrabackup-2.2.3/include/violite.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/violite.h	2017-02-27 07:47:02.000000000 +0000
@@ -142,7 +142,7 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#ifndef EMBEDDED_LIBRARY
+#if !defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP)
 enum enum_ssl_init_error
 {
   SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY, 
@@ -170,7 +170,7 @@
                       const char *cipher, enum enum_ssl_init_error *error,
                       const char *crl_file, const char *crl_path);
 void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd);
-#endif /* ! EMBEDDED_LIBRARY */
+#endif /* ! EMBEDDED_LIBRARY) || XTRABACKUP */
 #endif /* HAVE_OPENSSL */
 
 void ssl_start(void);
diff -Nru percona-xtrabackup-2.2.3/include/welcome_copyright_notice.h percona-xtrabackup-2.3.7/include/welcome_copyright_notice.h
--- percona-xtrabackup-2.2.3/include/welcome_copyright_notice.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/include/welcome_copyright_notice.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -16,7 +16,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2014"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2015"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL
diff -Nru percona-xtrabackup-2.2.3/libmysql/authentication_win/CMakeLists.txt percona-xtrabackup-2.3.7/libmysql/authentication_win/CMakeLists.txt
--- percona-xtrabackup-2.2.3/libmysql/authentication_win/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/libmysql/authentication_win/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -32,7 +32,6 @@
 
 SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
 
-INSTALL_DEBUG_SYMBOLS(auth_win_client)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru percona-xtrabackup-2.2.3/libmysql/CMakeLists.txt percona-xtrabackup-2.3.7/libmysql/CMakeLists.txt
--- percona-xtrabackup-2.2.3/libmysql/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/libmysql/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -183,7 +183,6 @@
 MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL 1)
 
 # Visual Studio users need debug  static library for debug projects
-INSTALL_DEBUG_SYMBOLS(clientlib)
 IF(MSVC)
 ENDIF()
 
diff -Nru percona-xtrabackup-2.2.3/libmysql/errmsg.c percona-xtrabackup-2.3.7/libmysql/errmsg.c
--- percona-xtrabackup-2.2.3/libmysql/errmsg.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/libmysql/errmsg.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -107,6 +107,8 @@
 
 void init_client_errs(void)
 {
+  compile_time_assert(array_elements(client_errors) ==
+                      (CR_ERROR_LAST - CR_ERROR_FIRST + 2));
   (void) my_error_register(get_client_errmsgs, CR_ERROR_FIRST, CR_ERROR_LAST);
 }
 
diff -Nru percona-xtrabackup-2.2.3/libmysql/libmysql.c percona-xtrabackup-2.3.7/libmysql/libmysql.c
--- percona-xtrabackup-2.2.3/libmysql/libmysql.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/libmysql/libmysql.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -1335,6 +1335,10 @@
     res= net_realloc(net, buf_length + length);
     if (res)
     {
+      if (net->last_errno == ER_OUT_OF_RESOURCES)
+        net->last_errno= CR_OUT_OF_MEMORY;
+      else if (net->last_errno == ER_NET_PACKET_TOO_LARGE)
+        net->last_errno= CR_NET_PACKET_TOO_LARGE;
       strmov(net->sqlstate, unknown_sqlstate);
       strmov(net->last_error, ER(net->last_errno));
     }
diff -Nru percona-xtrabackup-2.2.3/libmysqld/CMakeLists.txt percona-xtrabackup-2.3.7/libmysqld/CMakeLists.txt
--- percona-xtrabackup-2.2.3/libmysqld/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/libmysqld/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -81,7 +81,7 @@
 
 ADD_CONVENIENCE_LIBRARY(sql_embedded ${SQL_EMBEDDED_SOURCES})
 DTRACE_INSTRUMENT(sql_embedded)
-ADD_DEPENDENCIES(sql_embedded GenError GenServerSource)
+ADD_DEPENDENCIES(sql_embedded GenError GenServerSource GenDigestServerSource)
 
 # On Windows, static embedded server library is called mysqlserver.lib
 # On Unix, it is libmysqld.a
diff -Nru percona-xtrabackup-2.2.3/libmysqld/lib_sql.cc percona-xtrabackup-2.3.7/libmysqld/lib_sql.cc
--- percona-xtrabackup-2.2.3/libmysqld/lib_sql.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/libmysqld/lib_sql.cc	2017-02-27 07:47:02.000000000 +0000
@@ -2,6 +2,9 @@
  * Copyright (c)  2000
  * SWsoft  company
  *
+ * Modifications copyright (c) 2001, 2014. Oracle and/or its affiliates.
+ * All rights reserved.
+ *
  * This material is provided "as is", with absolutely no warranty expressed
  * or implied. Any use is at your own risk.
  *
@@ -424,11 +427,7 @@
   thd->clear_data_list();
   thd->store_globals();
   thd->release_resources();
-
-  mysql_mutex_lock(&LOCK_thread_count);
   remove_global_thread(thd);
-  mysql_mutex_unlock(&LOCK_thread_count);
-
   delete thd;
   my_pthread_setspecific_ptr(THR_THD,  0);
   mysql->thd=0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/collections/default.experimental percona-xtrabackup-2.3.7/mysql-test/collections/default.experimental
--- percona-xtrabackup-2.2.3/mysql-test/collections/default.experimental	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/collections/default.experimental	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,6 @@
 parts.partition_debug_innodb             # Bug#14150368 2013-03-07 anitha Failing very frequently on PB2
 
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
-rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
 rpl.rpl_spec_variables @solaris          # Bug #17337114 2013-08-20 Luis Soares failing on pb2 with timeout for 'CHECK WARNINGS'
 rpl.rpl_gtid_logs_without_rotate_or_stop_event @windows    # Bug#16207800 2013-02-09 anitha Fails very frequently on windows
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_fill.inc percona-xtrabackup-2.3.7/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_fill.inc
--- percona-xtrabackup-2.2.3/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_fill.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_fill.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,53 @@
+# ==== Purpose ====
+#
+# Add [position|datetime] data to mysqlbinlog.  To generate a binary log with
+# a few deterministic,increasing timestamps.
+#
+# ==== Implementation ====
+
+# We need to set fixed timestamps in this test.
+# Use a date in the future to keep a growing timestamp along the
+# binlog (including the Start_log_event). This test will work
+# unchanged everywhere, because mysql-test-run has fixed TZ, which it
+# exports (so mysqlbinlog has same fixed TZ).
+#
+# ===== Assumption ========
+# As this is a generic file and be used by other test, So we have made an
+# assumption that a table is already created with defination like
+# CREATE TABLE t1 (a INT);
+#
+
+# Binlog 1:
+# One transaction with timestamp 2031-01-01 12:00:00
+--let $datetime_1= 2031-01-01 12:00:00
+eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_1");
+INSERT INTO t1 VALUES(1);
+--let $pos_1= query_get_value(SHOW MASTER STATUS, Position, 1)
+
+# One transaction with timestamp 2032-01-01 12:00:00
+--let $datetime_2= 2032-01-01 12:00:00
+eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_2");
+INSERT INTO t1 VALUES(2);
+--let $pos_2= query_get_value(SHOW MASTER STATUS, Position, 1)
+
+# One transaction with timestamp 2033-01-01 12:00:00
+eval SET TIMESTAMP= UNIX_TIMESTAMP("2033-01-01 12:00:00");
+INSERT INTO t1 VALUES(3);
+
+--let $file_1= query_get_value(SHOW MASTER STATUS, File, 1)
+FLUSH LOGS;
+
+#Binlog 2:
+# One transaction with timestamp 2034-01-01 12:00:00
+SET TIMESTAMP= UNIX_TIMESTAMP("2034-01-01 12:00:00");
+INSERT INTO t1 VALUES(4);
+--let $pos_3= query_get_value(SHOW MASTER STATUS, Position, 1)
+
+# One transaction with timestamp 2035-01-01 12:00:00
+--let $datetime_3= 2035-01-01 12:00:00
+eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_3");
+INSERT INTO t1 VALUES(5);
+
+--let $file_2= query_get_value(SHOW MASTER STATUS, File, 1)
+FLUSH LOGS;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc percona-xtrabackup-2.3.7/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc
--- percona-xtrabackup-2.2.3/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc	2017-02-27 07:47:02.000000000 +0000
@@ -11,36 +11,7 @@
 CREATE TABLE t1 (a INT);
 RESET MASTER;
 
-# We need to set fixed timestamps in this test.
-# Use a date in the future to keep a growing timestamp along the
-# binlog (including the Start_log_event). This test will work 
-# unchanged everywhere, because mysql-test-run has fixed TZ, which it
-# exports (so mysqlbinlog has same fixed TZ).
---let $datetime_1= 2031-01-01 12:00:00
-eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_1");
-INSERT INTO t1 VALUES(1);
---let $pos_1= query_get_value(SHOW MASTER STATUS, Position, 1)
-
---let $datetime_2= 2032-01-01 12:00:00
-eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_2");
-INSERT INTO t1 VALUES(2);
---let $pos_2= query_get_value(SHOW MASTER STATUS, Position, 1)
-
-eval SET TIMESTAMP= UNIX_TIMESTAMP("2033-01-01 12:00:00");
-INSERT INTO t1 VALUES(3);
-
---let $file_1= query_get_value(SHOW MASTER STATUS, File, 1)
-FLUSH LOGS;
-
-SET TIMESTAMP= UNIX_TIMESTAMP("2034-01-01 12:00:00");
-INSERT INTO t1 VALUES(4);
---let $pos_3= query_get_value(SHOW MASTER STATUS, Position, 1)
---let $datetime_3= 2035-01-01 12:00:00
-eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_3");
-INSERT INTO t1 VALUES(5);
-
---let $file_2= query_get_value(SHOW MASTER STATUS, File, 1)
-FLUSH LOGS;
+--source extra/binlog_tests/binlog_mysqlbinlog_fill.inc
 
 --let $MYSQLD_DATADIR= `select @@datadir`
 
@@ -80,12 +51,14 @@
 --let $extra_options= --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT $file_1 $file_2
 --source extra/binlog_tests/mysqlbinlog_start_stop_1.inc
 
+
 # ==== to-last-log ====
 
 --let $extra_options= --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT $file_1
---let $option= --to-last-log
+--let $options= --to-last-log
 --source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
 
+
 --echo
 --echo ==== clean up ====
 DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_1.inc percona-xtrabackup-2.3.7/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_1.inc
--- percona-xtrabackup-2.2.3/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_1.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_1.inc	2017-02-27 07:47:02.000000000 +0000
@@ -27,26 +27,26 @@
 #   $extra_options
 #     Options for mysqlbinlog, specifying which input file to read.
 
---let $option= --base64-output=never
+--let $options= --base64-output=never
 --source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
 
---let $option= --offset=2
+--let $options= --offset=2
 --source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
 
---let $option= --start-position=$start_position
+--let $options= --start-position=$start_position
 --source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
 
---let $option= --stop-position=$stop_position
+--let $options= --stop-position=$stop_position
 --source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
 
---let $option= --start-position=$start_position --stop-position=$stop_position
+--let $options= --start-position=$start_position --stop-position=$stop_position
 --source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
 
---let $option= "--start-datetime=$start_datetime"
+--let $options= "--start-datetime=$start_datetime"
 --source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
 
---let $option= "--stop-datetime=$stop_datetime"
+--let $options= "--stop-datetime=$stop_datetime"
 --source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
 
---let $option= "--start-datetime=$start_datetime" "--stop-datetime=$stop_datetime"
+--let $options= "--start-datetime=$start_datetime" "--stop-datetime=$stop_datetime"
 --source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc percona-xtrabackup-2.3.7/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc
--- percona-xtrabackup-2.2.3/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc	2017-02-27 07:47:02.000000000 +0000
@@ -20,15 +20,24 @@
 
 
 # Pretty-print $option_text
---let $option_text= `SELECT SUBSTR(REPLACE('$option', '"', ''), 3)`
-while (`SELECT LOCATE('=', '$option_text')`)
+--let $option_text= `SELECT REPLACE('$options', '"', '')`
+--let $eq_pos= `SELECT LOCATE('=', '$option_text')`
+while ($eq_pos != 0)
 {
-  --let $dash_pos= `SELECT LOCATE('--', '$option_text')`
-  --let $option_text= `SELECT CONCAT(SUBSTR('$option_text', 1, LOCATE('=', '$option_text') - 1), IF($dash_pos, CONCAT(' ', SUBSTR('$option_text', $dash_pos + 2)), ''))`
+  --let $dash_pos= `SELECT LOCATE('--', '$option_text', $eq_pos)`
+  --let $left_part= `SELECT SUBSTR('$option_text', 1, $eq_pos - 1)`
+  --let $right_part=
+  if ($dash_pos != 0) {
+    --let $right_part= `SELECT CONCAT(' ', SUBSTR('$option_text', $dash_pos + 2))`
+  }
+  --let $option_text= $left_part$right_part
+  --let $eq_pos= `SELECT LOCATE('=', '$option_text')`
 }
+--let $option_text= `SELECT REPLACE('$option_text', '--', '')`
+
 --echo
 --echo ---- $option_text ----
 
 # Print output
 --replace_regex /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID'/ /([0-9A-Fa-f\-]{36})\:[0-9]+\-[0-9]+/UUID:#-#/
---exec $MYSQL_BINLOG --short-form $option $extra_options
+--exec $MYSQL_BINLOG --short-form $options $extra_options
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_crash_safe.inc percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_crash_safe.inc
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_crash_safe.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_crash_safe.inc	2017-02-27 07:47:02.000000000 +0000
@@ -95,7 +95,10 @@
     {
       if ($failure != 'd,crash_after_apply')
       {
-        --let $outcome= O1
+        if ($failure != 'd,crash_after_commit_before_update_pos')
+        {
+          --let $outcome= O1
+        }
       }
     }
     --echo FAILURE $failure and OUTCOME $outcome
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_crash_safe.test percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_crash_safe.test
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_crash_safe.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_crash_safe.test	2017-02-27 07:47:02.000000000 +0000
@@ -2,16 +2,17 @@
 #  This test case aims at checking if a slave does not go out of sync after
 #  injecting crashes at specific points. The following scenarios are analyzed:
 #
-#     |------------+-----------------------+---------+---------+---------|
-#     | SCENARIO # | SCENARIO              | CRASH-1 | CRASH-2 | CRASH-3 |
-#     |------------+-----------------------+---------+---------+---------|
-#     |          1 | T                     | O1      | O1      | O2      |
-#     |          2 | T-*                   | O1      | O1      | O2      |
-#     |          3 | B T T-* C             | O1      | O1      | O2      |
-#     |          4 | B T-* T C             | O1      | O1      | O2      |
-#     |          5 | N                     | O3      | O3      | O2      |
-#     |          6 | N-*                   | O3      | O3      | O2      |
-#     |------------+-----------------------+---------+---------+---------|
+#  Following table represents the outcomes when Rli are on table.
+#     |------------+-----------------------+---------+---------+---------+---------|
+#     | SCENARIO # | SCENARIO              | CRASH-1 | CRASH-2 | CRASH-3 | CRASH-4 |
+#     |------------+-----------------------+---------+---------+---------+---------|
+#     |          1 | T                     | O1      | O1      | O2      | O2      |
+#     |          2 | T-*                   | O1      | O1      | O2      | O2      |
+#     |          3 | B T T-* C             | O1      | O1      | O2      | O2      |
+#     |          4 | B T-* T C             | O1      | O1      | O2      | O2      |
+#     |          5 | N                     | O3      | O3      | O2      | O3      |
+#     |          6 | N-*                   | O3      | O3      | O2      | O3      |
+#     |------------+-----------------------+---------+---------+---------+---------|
 #
 #  Legend:
 #
@@ -45,6 +46,9 @@
 #  CRASH-3 - crash_after_commit_and_update_pos - after committing and updating
 #  the positions.
 #
+#  CRASH-4 - crash_after_commit_before_update_pos - after committing and
+#  updating positions in (FILE).
+#
 #  After injecting the faults, we expect the following outcomes:
 #
 #  O1. In this case, the slave shall correctly recover to "S" without going out
@@ -88,7 +92,7 @@
 --echo #                         EXECUTE CASES CRASHING THE XID
 --echo ###################################################################################
 connection master;
---let $failures= d,crash_after_apply d,crash_before_update_pos d,crash_after_update_pos_before_apply
+--let $failures= d,crash_after_apply d,crash_before_update_pos d,crash_after_update_pos_before_apply d,crash_after_commit_before_update_pos
 #
 # Executes a set of tests while there are crash points in $failures.
 #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_deadlock.test percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_deadlock.test
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_deadlock.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_deadlock.test	2017-02-27 07:47:02.000000000 +0000
@@ -181,9 +181,7 @@
 
 let $slave_sql_errno= 1205; # ER_LOCK_TIMEOUT
 let $show_slave_sql_error= 0;
-let $rpl_debug= 1;
 source include/wait_for_slave_sql_error.inc;
-let $rpl_debug= 0;
 
 rollback;
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_gtid_drop_table.inc percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_gtid_drop_table.inc
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_gtid_drop_table.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_gtid_drop_table.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,48 @@
+# ==== Purpose ====
+#
+# This include will try to issue the $statement after setting GTID_NEXT to the
+# $next_gtid variable expecting $expected_error if it is defined and non-zero.
+#
+# If the $expected_error is defined and non-zero, this include will also
+# rollback the statement to release the ownership of the previously set GTID.
+#
+# ==== Usage ====
+#
+# --let $statement= XXX
+# --let $next_gtid= 'UUID:NUMBER'
+# [--$expected_error= ER_XXX]
+# --source extra/rpl_tests/rpl_gtid_drop_table.inc
+#
+# Parameters:
+#   $statement
+#     The SQL statement to be executed.
+#
+#   $next_gtid
+#     The GTID to be set as GTID_NEXT.
+#
+#   $expected_error
+#     The error expected when issuing the command.
+#     Optional, not set means no expected error.
+
+if (!$statement)
+{
+  --die ERROR IN TEST: the "statement" variable must be set
+}
+
+if (!$next_gtid)
+{
+  --die ERROR IN TEST: the "next_gtid" variable must be set
+}
+
+--eval SET GTID_NEXT= $next_gtid
+if ($expected_error)
+{
+  --echo ## Expecting error $expected_error after the statement
+  --error $expected_error
+  --eval $statement
+  ROLLBACK;
+}
+if (!$expected_error)
+{
+  --eval $statement
+}
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,112 @@
+#
+# This test will verify if the slave SQL thread and the slave IO thread behave
+# correctly when the IO thread is restarted in the middle of a transaction.
+#
+# It is expected that the IO thread will retrieve again the partial transaction
+# from the beginning and that the SQL thread will rollback the partially
+# retrieved transaction before applying the fully retrieved one.
+#
+# This test will insert some data in the master and then will stop the slave
+# IO thread right after queuing an event of a given type, starting the IO
+# thread again to fully retrieve the partially received transaction.
+#
+
+--source include/have_gtid.inc
+
+# As this test depends on the use of a User_var_log_event in a DML statement
+# we have to use statement based replication.
+--source include/have_binlog_format_statement.inc
+--source include/force_restart.inc
+# Enable auto_position protocol
+--let $use_gtids= 1
+--let $rpl_gtid_utils= 1
+--source include/master-slave.inc
+# Test should run only on debug build
+source include/have_debug.inc;
+source include/have_debug_sync.inc;
+
+# Initial setup
+--connection master
+CREATE TABLE t1(i INT) ENGINE=InnoDB;
+# The following "FLUSH LOGS" will make the master to clear the "created" flag
+# of the Format Description events in the next binlog files (and also in
+# their replicated versions in the slave's relaylog).
+FLUSH LOGS;
+--source include/sync_slave_sql_with_master.inc
+SET @save_debug=@@global.debug;
+
+#
+# Actual test starts here.
+#
+# Test will do the following five iterations
+#     1.Stop I/O thread after reading GTID_LOG_EVENT
+#     2.Stop I/O thread after reading QUERY_LOG_EVENT
+#     3.Stop I/O thread after reading XID_LOG_EVENT
+#        which is equal to I/O thread sync with master
+#     4.Stop I/O thread after the gtid is in EXECUTED_GTID_SET
+#       i.e., after sync slave sql thread with master.
+#     5.Stop I/O thread after reading USER_VAR_LOG_EVENT
+# and after that make sure there are no missing gtid events
+# i.e., we will verify this by doing diff between master:t1,
+# slave:t1.
+
+--let $i=1
+while ($i <= 5)
+{
+  if ($i == 1)
+  {
+    SET GLOBAL DEBUG='d,stop_io_after_reading_gtid_log_event';
+  }
+  if ($i == 2)
+  {
+    SET GLOBAL DEBUG='d,stop_io_after_reading_query_log_event';
+  }
+  if ($i == 3)
+  {
+    # Stopping sql thread to make sure that case 3 is not equal to case 4.
+    --source include/stop_slave_sql.inc
+    SET GLOBAL DEBUG='d,stop_io_after_reading_xid_log_event';
+  }
+  if ($i == 5)
+  {
+    SET GLOBAL DEBUG='d,stop_io_after_reading_user_var_log_event';
+  }
+  --connection master
+  BEGIN;
+  --eval INSERT INTO t1 VALUES ($i)
+  --eval SET @v= $i * 100
+  --eval INSERT INTO t1 VALUES (@v)
+  COMMIT;
+  --connection slave
+  if ($i == 4)
+  {
+    --connection master
+    --source include/sync_slave_sql_with_master.inc
+    --source include/stop_slave_io.inc
+  }
+  --source include/wait_for_slave_io_to_stop.inc
+  # Remove the debug point and restart the slave threads
+  SET GLOBAL DEBUG= @save_debug;
+
+  --source include/start_slave_io.inc
+  if ($i == 3)
+  {
+    --source include/start_slave_sql.inc
+  }
+  # Do one more insert on master and then sync slave with master (to make sure
+  # that re-replicating the events are done successfully.
+  --connection master
+  --eval INSERT INTO t1 VALUES ($i)
+  --source include/sync_slave_sql_with_master.inc
+  # Now compare master and slave's t1 table data
+  # to prove that there are no missing gtids.
+  --let diff_tables= master:t1, slave:t1
+  --source include/diff_tables.inc
+  --inc $i
+}
+
+# Cleanup
+--connection master
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_kill_query.inc percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_kill_query.inc
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_kill_query.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_kill_query.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,129 @@
+# ==== Purpose ====
+#
+# This is an auxiliary file used by rpl_kill_query.test.
+#
+# The purpose is to generate a statement that updates a
+# non-transactional table, and kill the statement in the middle,
+# so that it gets half-executed.
+#
+# ==== Usage ====
+#
+# --let $database= DATABASE
+# --let $table= TABLE
+# --source include/rpl_kill_query.inc
+#
+# Parameters:
+#   $database
+#     The current database will be set to $database before executing the
+#     killed statement.
+#
+#   $table
+#     The statement will modify this table.
+#
+# Assumptions:
+# - $database should *not* be created before executing this script.
+#
+# ==== Implementation ====
+#
+# Apparently, not all statements can be killed in the middle; a simple
+# INSERT does not seem to work.  One case that can be killed is an
+# INSERT with a trigger; then there is a check for being killed in the
+# trigger invocation.
+#
+# So our approach is to put a BEFORE INSERT trigger on the table.  The
+# trigger will execute fast for the first row, and go to sleep for the
+# second row. This allows us to kill the query in the middle of the
+# sleep. Then, we make sure to wait until *after* the first row is
+# inserted, and *before* the sleep is finished.  That ensures that at
+# least one row is inserted in the trigger table, and not both rows
+# are inserted in the main table, so the statement is half-executed,
+# as required.
+#
+# To sleep on the second row, we use a SLEEP() inside a condition that
+# is triggered only for the second row.
+#
+# To indicate to other threads that the first row has been inserted,
+# we do SET @@GLOBAL.BINLOG_FORMAT = ROW before going to sleep.  (It
+# does not seem to be enough to wait for rows to be inserted in the
+# main table or trigger table, probably since locks prevent other
+# threads from seeing the partial insert even in a non-transactional
+# table.)  This will not affect execution since the global values is
+# only used as default for new connections.
+#
+# As a sanity-check, we verify that after the query is killed, at most
+# one row has been inserted in the main table, and at least one row
+# has been inserted in the second table.
+
+
+--let $_rkq_current_database_old= `SELECT DATABASE()`
+
+--let $assert_cond= @@GLOBAL.BINLOG_FORMAT = "STATEMENT"
+--let $assert_text= Test only works if binlog_format is statement
+--source include/assert.inc
+
+# Get connection id
+--source include/rpl_connection_master.inc
+--let $connection_id= `SELECT CONNECTION_ID()`
+
+# Create database, table, and trigger table
+eval CREATE DATABASE $database;
+eval USE $database;
+eval CREATE TABLE $table (a INT) ENGINE = MyISAM;
+eval CREATE TABLE trigger_table (a INT) ENGINE = MyISAM;
+
+# This master-only trigger will sleep for N seconds when the value N
+# is inserted to a row.
+SET SQL_LOG_BIN=0;
+--delimiter |
+eval
+CREATE TRIGGER trig1 BEFORE INSERT ON $table FOR EACH ROW
+BEGIN
+  IF NEW.a != 0 THEN
+    SET @@GLOBAL.BINLOG_FORMAT = 'row';
+    DO SLEEP(1000000);
+  END IF;
+  INSERT INTO trigger_table VALUES (1);
+END|
+--delimiter ;
+SET SQL_LOG_BIN=1;
+
+# Sleep 1000000 seconds before inserting the second row.
+--send
+eval INSERT INTO $table VALUES (0), (1);
+
+# Wait until the sleep for the second row happens.
+--source include/rpl_connection_master1.inc
+
+--let $wait_condition= SELECT @@GLOBAL.BINLOG_FORMAT = 'ROW'
+--let $show_rpl_debug_info= 1
+--source include/wait_condition.inc
+
+# Kill query.
+--replace_result $connection_id <CONNECTION_ID>
+eval KILL QUERY $connection_id;
+
+# Get the error message.
+--source include/rpl_connection_master.inc
+--error ER_QUERY_INTERRUPTED
+reap;
+
+SET @@GLOBAL.BINLOG_FORMAT = 'STATEMENT';
+
+# Check that at most one row was inserted in main table.
+--let $assert_text= At most one row should be inserted in $database.$table
+--let $assert_cond= COUNT(*) <= 1 FROM $database.$table
+--source include/assert.inc
+
+# Check that at least one row was inserted in trigger table.
+--let $assert_text= At least one row should be inserted in $database.trigger_table
+--let $assert_cond= COUNT(*) >= 1 FROM $database.trigger_table
+--source include/assert.inc
+
+# Clean up.
+SET SQL_LOG_BIN=0;
+eval DROP TRIGGER trig1;
+SET SQL_LOG_BIN=1;
+DROP TABLE trigger_table;
+eval DROP TABLE $table;
+eval DROP DATABASE $database;
+--eval USE $_rkq_current_database_old
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2017-02-27 07:47:02.000000000 +0000
@@ -119,9 +119,7 @@
   --let $rpl_server_number= 2
   --let $rpl_server_parameters= --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0
 
-  --let $rpl_debug= 1
   --source include/rpl_start_server.inc
-  --let $rpl_debug= 0
 
   START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
   --let $slave_param= Until_Condition
@@ -134,9 +132,7 @@
   --echo ** regular restart **
   --let $rpl_server_number= 2
   --let $rpl_server_parameters= --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1
-  --let $rpl_debug= 1
   --source include/rpl_restart_server.inc
-  --let $rpl_debug= 0
 
   #### Checking if the recovery worked and the coordinator has an updated state. ####
   --connection slave
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,36 @@
+# ==== Implementation ====
+#
+# 1. Set debug point to rotate relay log after table_map_event.
+# 2. Wait for io thread to receive table_map_event and stop it.
+# 3. Start the io thread after it is stopped.
+# 4. Check that there is no failure on replication.
+#
+
+# Initial setup
+--source include/rpl_connection_master.inc
+CREATE TABLE t1(i INT) ENGINE=InnoDB;
+FLUSH LOGS;
+--source include/sync_slave_sql_with_master.inc
+
+# Set debug point to rotate relay log after table_map_event.
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,stop_io_after_reading_table_map_event';
+--source include/rpl_connection_master.inc
+INSERT INTO t1 VALUES (1);
+
+--source include/rpl_connection_slave.inc
+# Wait for io thread to receive table_map_event and stop it.
+--source include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+
+# Start the io thread after it is stopped.
+--source include/start_slave_io.inc
+
+# Check that their is no failure on replication.
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_row_blob.test percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_row_blob.test
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_row_blob.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_row_blob.test	2017-02-27 07:47:02.000000000 +0000
@@ -33,10 +33,7 @@
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 1;
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 2;
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 3;
-save_master_pos;
-connection slave;
-sync_with_master; 
---source include/wait_for_ndb_to_binlog.inc
+--source include/sync_slave_sql_with_master.inc
 --echo
 --echo **** Data Insert Validation Slave Section test.t1 ****
 --echo
@@ -56,10 +53,7 @@
 --echo
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 1;
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 2;
-save_master_pos;
-connection slave;
-sync_with_master; 
---source include/wait_for_ndb_to_binlog.inc
+--source include/sync_slave_sql_with_master.inc
 --echo
 --echo **** Data Update Validation Slave Section test.t1 ****
 --echo
@@ -127,10 +121,7 @@
 FROM test.t2 WHERE c1=1;
 SELECT c1, LENGTH(c2), SUBSTR(c2,1+2*900,2), LENGTH(c4), SUBSTR(c4,1+3*900,3)
 FROM test.t2 WHERE c1=2;
-save_master_pos;
-connection slave;
-sync_with_master; 
---source include/wait_for_ndb_to_binlog.inc
+--source include/sync_slave_sql_with_master.inc
 --echo
 --echo **** Data Insert Validation Slave Section test.t2 ****
 --echo
@@ -153,10 +144,7 @@
 FROM test.t2 WHERE c1=1;
 SELECT c1, LENGTH(c2), SUBSTR(c2,1+2*900,2), LENGTH(c4), SUBSTR(c4,1+3*900,3)
 FROM test.t2 WHERE c1=2;
-save_master_pos;
-connection slave;
-sync_with_master; 
---source include/wait_for_ndb_to_binlog.inc
+--source include/sync_slave_sql_with_master.inc
 --echo
 --echo **** Data Update Validation Slave Section test.t2 ****
 --echo
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_row_func003.test percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_row_func003.test
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_row_func003.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_row_func003.test	2017-02-27 07:47:02.000000000 +0000
@@ -54,14 +54,8 @@
 ROLLBACK;
 SET AUTOCOMMIT=1;
 
-# Sync master and slave for all engines except NDB
-if (`SELECT UPPER(LEFT('$engine_type', 3)) != 'NDB'`) {
-  --source include/sync_slave_sql_with_master.inc
-  connection master;
-}
-# Sync master and slave for NDB engine
-let $wait_time= 6;
---source include/wait_for_ndb_to_binlog.inc
+--source include/sync_slave_sql_with_master.inc
+connection master;
 
 # Time to dump the databases and so we can see if they match
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_row_sp003.test percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_row_sp003.test
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_row_sp003.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_row_sp003.test	2017-02-27 07:47:02.000000000 +0000
@@ -54,9 +54,7 @@
 connection master;
 SELECT * FROM test.t1; 
 #show binlog events;
---source include/wait_for_ndb_to_binlog.inc
 --source include/sync_slave_sql_with_master.inc
-connection slave;
 SELECT * FROM test.t1;
 
 connection master;
@@ -68,7 +66,6 @@
 SELECT * FROM test.t1;
 
 --source include/sync_slave_sql_with_master.inc
-connection slave;
 SELECT * FROM test.t1;
 connection master;
 #show binlog events from 720;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_stop_slave.test percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_stop_slave.test
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_stop_slave.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_stop_slave.test	2017-02-27 07:47:02.000000000 +0000
@@ -42,6 +42,10 @@
 connection slave1;
 --echo # To resume slave SQL thread
 SET DEBUG_SYNC= 'now SIGNAL signal.continue';
+# wait for the sql thread to come out of the
+# waiting phase before resetting the signals
+--let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and info LIKE '%INSERT INTO t1 VALUES (1)%'
+--source include/wait_condition.inc
 SET DEBUG_SYNC= 'RESET';
 
 --echo
diff -Nru percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_trig004.test percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_trig004.test
--- percona-xtrabackup-2.2.3/mysql-test/extra/rpl_tests/rpl_trig004.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/extra/rpl_tests/rpl_trig004.test	2017-02-27 07:47:02.000000000 +0000
@@ -35,10 +35,7 @@
 #show binlog events; 
 select * from test.t1;
 select * from test.t2;
-let $wait_time= 10;
---source include/wait_for_ndb_to_binlog.inc
 --source include/sync_slave_sql_with_master.inc
-connection slave;
 select * from test.t1;
 select * from test.t2;
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/begin_include_file.inc percona-xtrabackup-2.3.7/mysql-test/include/begin_include_file.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/begin_include_file.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/begin_include_file.inc	2017-02-27 07:47:02.000000000 +0000
@@ -34,6 +34,7 @@
 #
 # # At the beginning of include/my_file.inc:
 # --let $include_filename= my_file.inc
+# [--let $include_silent= 1]
 # [--let $rpl_debug= 1]
 # --source include/begin_include_file.inc
 #
@@ -74,6 +75,13 @@
 if ($rpl_debug)
 {
   --echo $_include_file_indent==== BEGIN include/$include_filename ====
+  # Print this text (just once) to prevent checking in result files containing
+  # debug info.
+  if (!$printed_this_should_not_be_checked_in)
+  {
+    --echo DO_NOT_CHECK_IN_THIS_LINE: \$rpl_debug should only be used for debugging. Never check in a test that has $rpl_debug=1.
+    --let $printed_this_should_not_be_checked_in= 1
+  }
 }
 
 --let $_include_file_enabled_warnings= $ENABLED_WARNINGS$_include_file_enabled_warnings
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/change_file_perms.inc percona-xtrabackup-2.3.7/mysql-test/include/change_file_perms.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/change_file_perms.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/change_file_perms.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,12 @@
+# $file_perms need to be in octal base
+# Provide a file name and the required new file permissions.
+# The file's permissions will be changed as per the input file
+# permissions.
+
+--perl
+use strict;
+my $file_perms= $ENV{'_FILE_PERMS_'} or die "File permissions are not set";
+my $input_file= $ENV{'_INPUT_FILE_'} or die "Input file is not set";
+die ('Unable to find file \'$input_file\'') unless (-e $input_file);
+chmod(oct($file_perms), $input_file) or die ('Unable to set file permissions for file \'$input_file\'');
+EOF
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/eval.inc percona-xtrabackup-2.3.7/mysql-test/include/eval.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/eval.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/eval.inc	2017-02-27 07:47:02.000000000 +0000
@@ -36,7 +36,6 @@
 #
 # --let $eval_expr= [SHOW SLAVE STATUS, Relay_Log_Pos, 1] + 47
 # [--let $eval_no_result= 1]
-# [--let $eval_quiet= 1]
 # [--let $rpl_debug= 1]
 # --source include/eval.inc
 # --echo Result was '$eval_result'
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/get_file_permissions.inc percona-xtrabackup-2.3.7/mysql-test/include/get_file_permissions.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/get_file_permissions.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/get_file_permissions.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,9 @@
+--perl
+use strict;
+my $input_file= $ENV{'_INPUT_FILE_'} or die "Input file is not set";
+my $mode = (stat($input_file))[2];
+open(FILE, ">", "$ENV{MYSQL_TMP_DIR}/permissions.inc") or die;
+my $perm= $mode & 07777;
+print FILE "let \$FILE_PERMISSIONS= $perm;\n";
+close FILE;
+EOF
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/get_ndb_epochs.inc percona-xtrabackup-2.3.7/mysql-test/include/get_ndb_epochs.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/get_ndb_epochs.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/get_ndb_epochs.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,60 @@
+# ==== Purpose ====
+#
+# Extract the epoch values from SHOW ENGINE NDB STATUS.
+#
+# ==== Usage ====
+#
+# --source include/get_ndb_epochs.inc
+# --echo $ndb_latest_epoch
+# --echo $ndb_latest_trans_epoch
+# --echo $ndb_latest_received_binlog_epoch
+# --echo $ndb_latest_handled_binlog_epoch
+# --echo $ndb_latest_applied_binlog_epoch
+#
+# ==== Parameters ====
+#
+# $ndb_status_binlog_row
+#   The row number of the output of SHOW ENGINE NDB STATUS
+#   last was seen.
+#   No need to set explictly, but used between sourcing this
+#   include file several times, since it is highly probable
+#   (but not certain) that same row number also applies next
+#   time.
+
+if (!$ndb_status_binlog_row)
+{
+  let $ndb_status_binlog_row = 1;
+}
+
+# Try two times, in case the row number of binlog state changes
+# between two invocations of SHOW ENGINE NDB STATUS.
+let $attempts= 2;
+while ($attempts)
+{
+  let $q= query_get_value(SHOW ENGINE NDB STATUS, Status, $ndb_status_binlog_row);
+  if ( `SELECT '$q' = 'No such row'` )
+  {
+    dec $attempts;
+    if (!$attempts)
+    {
+      echo ERROR IN TEST: No binlog row found in SHOW ENGINE NDB STATUS;
+      die ERROR IN TEST: No binlog row found in SHOW ENGINE NDB STATUS;
+    }
+    # row will be increased to 1 further down
+    let $ndb_status_binlog_row = 0;
+  }
+  if (`SELECT INSTR('$q', 'latest_epoch=')`)
+  {
+    let $attempts = 0 ;
+  }
+  if ($attempts)
+  {
+    inc $ndb_status_binlog_row;
+  }
+}
+
+let $ndb_latest_epoch= `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING('$q', INSTR('$q', 'latest_epoch=')), ',', 1), '=', -1)`;
+let $ndb_latest_trans_epoch= `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING('$q', INSTR('$q', 'latest_trans_epoch=')), ',', 1), '=', -1)`;
+let $ndb_latest_received_binlog_epoch= `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING('$q', INSTR('$q', 'latest_received_binlog_epoch=')), ',', 1), '=', -1)`;
+let $ndb_latest_handled_binlog_epoch= `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING('$q', INSTR('$q', 'latest_handled_binlog_epoch=')), ',', 1), '=', -1)`;
+let $ndb_latest_applied_binlog_epoch= `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING('$q', INSTR('$q', 'latest_applied_binlog_epoch=')), ',', 1), '=', -1)`;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/gtid_step_assert.inc percona-xtrabackup-2.3.7/mysql-test/include/gtid_step_assert.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/gtid_step_assert.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/gtid_step_assert.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,96 @@
+# ==== Purpose ====
+#
+# Assert that exactly one GTID (or a specified number) was added to
+# @@GLOBAL.GTID_EXECUTED since last call to gtid_step_reset.inc or
+# gtid_step_assert.inc
+#
+# ==== Usage ====
+#
+# [--let $gtid_step_count= N]
+# [--let $gtid_step_only_count= [0|1]]
+# [--let $gtid_step_uuid= UUID]
+# --source include/gtid_step_assert.inc
+#
+# Parameters:
+#   $gtid_step_count
+#     Assert that N GTIDs were added to @@GLOBAL.GTID_EXECUTED. If
+#     this is not given, the default value is 1.
+#
+#   $gtid_step_only_count
+#     By default, this script checks the numeric component of the
+#     GTIDs added to @@GLOBAL.GTID_EXECUTED to see that the correct
+#     number was generated.  If this parameter is nonzero, it only
+#     counts the number of added GTIDs to see that it is equal to
+#     $gtid_step_count, without caring that they were generated in
+#     order (or generated on this server).
+#
+#   $gtid_step_uuid
+#     By default, when $gtid_step_count is not set, asserts that the
+#     uuid component of all GTIDs added to @@GLOBAL.GTID_EXECUTED is
+#     equal to @@GLOBAL.SERVER_UUID.  If this parameter is given, uses
+#     that UUID instead.
+#
+# ==== Example ====
+#
+# # (1) Remember the current position.
+# --source include/gtid_step_reset.inc
+# CREATE TABLE t1 (a INT);
+# # (2) Assert that exactly one GTID was generated since (1).
+# --source include/gtid_step_assert.inc
+# INSERT INTO t1 VALUES (1);
+# INSERT INTO t1 VALUES (2);
+# # (3) Assert that exactly 2 GTIDs were generated since (2).
+# --let $gtid_step_count= 2
+# --source include/gtid_step_assert.inc
+# # (4) Assert that no GTID was generated since (3).
+# --let $gtid_step_count= 0
+# --source include/gtid_step_assert.inc
+
+if ($uuidf == '')
+{
+  --die You must source gtid_utils.inc before using gtid_step_assert.inc
+}
+
+--let $_gtid_step_count= 1
+if ($gtid_step_count != '')
+{
+  --let $_gtid_step_count= $gtid_step_count
+}
+
+--let $_gtid_step_only_count= 0
+if ($gtid_step_only_count != '')
+{
+  --let $_gtid_step_only_count= $gtid_step_only_count
+}
+
+--let $include_filename= gtid_step_assert.inc [count=$_gtid_step_count, only_count=$_gtid_step_only_count]
+--source include/begin_include_file.inc
+
+--let $_gtid_step_uuid= $gtid_step_uuid
+if ($_gtid_step_uuid == '')
+{
+  --let $_gtid_step_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+}
+
+--let $_gsa_extra_debug_eval_old= $extra_debug_eval
+--let $extra_debug_eval= @@GLOBAL.GTID_EXECUTED, GTID_NEXT_GENERATED_SET("$gtid_step_last", "$_gtid_step_uuid", $_gtid_step_count), GTID_SUBTRACT(@@GLOBAL.GTID_EXECUTED, "$gtid_step_last")
+
+if ($_gtid_step_only_count)
+{
+  --let $assert_text= Exactly $_gtid_step_count GTIDs should have been committed since last invocation
+  --let $assert_cond= GTID_COUNT(GTID_SUBTRACT(@@GLOBAL.GTID_EXECUTED, "$gtid_step_last")) = $_gtid_step_count
+  --source include/assert.inc
+}
+if (!$_gtid_step_only_count)
+{
+  --let $assert_text= Exactly $_gtid_step_count GTIDs should have been generated since last invocation
+  --let $assert_cond= GTID_NEXT_GENERATED_SET("$gtid_step_last", "$_gtid_step_uuid", $_gtid_step_count) = GTID_SUBTRACT(@@GLOBAL.GTID_EXECUTED, "$gtid_step_last")
+  --source include/assert.inc
+}
+
+--let $extra_debug_eval= $_gsa_extra_debug_eval_old
+
+--source include/gtid_step_reset.inc
+
+--let $include_filename= gtid_step_assert.inc
+--source include/end_include_file.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/gtid_step_reset.inc percona-xtrabackup-2.3.7/mysql-test/include/gtid_step_reset.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/gtid_step_reset.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/gtid_step_reset.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# ==== Purpose ====
+#
+# Remember the current value of @@GLOBAL.GTID_EXECUTED to be used by
+# subsequent calls to gtid_step_assert.inc
+#
+# ==== Usage ====
+#
+# --source include/gtid_step_reset.inc
+#
+# See gtid_step_assert.inc for details and examples.
+
+--let $include_filename= gtid_step_reset.inc
+--source include/begin_include_file.inc
+
+--let $gtid_step_last= `SELECT @@GLOBAL.GTID_EXECUTED`
+
+--let $include_filename= gtid_step_reset.inc
+--source include/end_include_file.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/gtid_utils_end.inc percona-xtrabackup-2.3.7/mysql-test/include/gtid_utils_end.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/gtid_utils_end.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/gtid_utils_end.inc	2017-02-27 07:47:02.000000000 +0000
@@ -14,11 +14,17 @@
 DROP FUNCTION GTID_IS_EQUAL;
 DROP FUNCTION GTID_IS_DISJOINT;
 DROP FUNCTION GTID_IS_DISJOINT_UNION;
+DROP FUNCTION GTID_NORMALIZE;
 DROP FUNCTION GTID_UNION;
-DROP FUNCTION GTID_INTERSECT;
+DROP FUNCTION GTID_INTERSECTION;
 DROP FUNCTION GTID_SYMMETRIC_DIFFERENCE;
 DROP FUNCTION GTID_SUBTRACT_UUID;
-DROP FUNCTION GTID_INTERSECT_UUID;
+DROP FUNCTION GTID_INTERSECTION_WITH_UUID;
+DROP FUNCTION IFZERO;
+DROP FUNCTION LOCATE2;
+DROP FUNCTION GTID_COUNT;
+DROP FUNCTION GTID_NEXT_GENERATED;
+DROP FUNCTION GTID_NEXT_GENERATED_SET;
 DROP FUNCTION GTID_COMPARE;
 DROP FUNCTION NUMBER_TO_UUID;
 DROP FUNCTION UUID_TO_NUMBER;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/gtid_utils.inc percona-xtrabackup-2.3.7/mysql-test/include/gtid_utils.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/gtid_utils.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/gtid_utils.inc	2017-02-27 07:47:02.000000000 +0000
@@ -4,22 +4,33 @@
 # The functions are typically useful to check assertions related to
 # GTIDs. The following functions are defined:
 #
-#   GTID_IS_EQUAL(g1, g2)
-#     True if g1 and g2 are the same set
-#   GTID_IS_DISJOINT(g1, g2)
-#     True if g1 and g2 are disjoint
-#   GTID_IS_DISJOINT_UNION(g1, g2, sum)
-#     True if sum is the disjoint union of g1 and g2
-#   GTID_UNION(g1, g2)
-#     Return the union of g1 and g2
-#   GTID_INTERSECTION(g1, g2)
-#     Return the union of g1 and g2
-#   GTID_SYMMETRIC_DIFFERENCE(g1, g2)
-#     Return the symmetric difference of g1 and g2
-#   GTID_SUBTRACT_UUID(gtid, uuid)
+#   GTID_IS_EQUAL(gtid_set_1, gtid_set_2)
+#     True if gtid_set_1 and gtid_set_2 are the same set
+#   GTID_IS_DISJOINT(gtid_set_1, gtid_set_2)
+#     True if gtid_set_1 and gtid_set_2 are disjoint
+#   GTID_IS_DISJOINT_UNION(gtid_set_1, gtid_set_2, sum)
+#     True if sum is the disjoint union of gtid_set_1 and gtid_set_2
+#   GTID_NORMALIZE(gtid_set)
+#     Return the gtid set in a normalized form: all uuids in alphabetic
+#     order, all intervals compressed and in order, no whitespace, all
+#     lowercase.
+#   GTID_UNION(gtid_set_1, gtid_set_2)
+#     Return the union of gtid_set_1 and gtid_set_2
+#   GTID_INTERSECTION(gtid_set_1, gtid_set_2)
+#     Return the intersection of gtid_set_1 and gtid_set_2
+#   GTID_SYMMETRIC_DIFFERENCE(gtid_set_1, gtid_set_2)
+#     Return the symmetric difference of gtid_set_1 and gtid_set_2
+#   GTID_SUBTRACT_UUID(gtid_set, uuid)
 #     Remove the UUID from the GTID set
-#   GTID_INTERSECTION_WITH_UUID(gtid, uuid)
+#   GTID_INTERSECTION_WITH_UUID(gtid_set, uuid)
 #     Return only the gtids with the given uuid from the GTID set
+#   GTID_COUNT(gtid_set)
+#     Return the number of gtids in the gtid_set.
+#   GTID_NEXT_GENERATED(gtid_set, uuid)
+#     Return the next GNO that will be generated for the given uuid.
+#   GTID_NEXT_GENERATED_SET(gtid_set, uuid, count)
+#     Return the GTID set consisting of the next 'count' GTIDs that will
+#     be generated for the given uuid.
 #   GTID_COMPARE(old, diff, new)
 #     The same as GTID_IS_DISJOINT_UNION, except it has the following
 #     additional feature: if diff begins by '~', then it returns true
@@ -38,10 +49,18 @@
 #
 # ==== Usage ====
 #
+# You should not normally source this file directly; instead set
+# $rpl_gtid_utils=1 before sourcing master-slave.inc or rpl_init.inc.
+# Then, the functions are automatically dropped in rpl_end.inc, and
+# RESET MASTER is executed so that the functions do not pollute the
+# binary log.
+#
+# If you really need to use this file manually, do this:
+#
 #  1. Create the stored functions at the beginning of the test script:
 #
 #       --source include/gtid_utils.inc
-# 
+#
 #  2. Use the functions as you like during the test script.
 #
 #  3. Delete the stored functions at the end of the test script:
@@ -52,7 +71,10 @@
 --let $include_filename= gtid_utils.inc
 --source include/begin_include_file.inc
 
---disable_query_log
+if (!$rpl_debug)
+{
+  --disable_query_log
+}
 
 --delimiter |
 
@@ -75,60 +97,131 @@
 --let $uuidf= ffffffff-ffff-ffff-ffff-ffffffffffff
 
 # Return nonzero if the two gtid_sets are equal.
-CREATE FUNCTION GTID_IS_EQUAL(g1 TEXT(10000), g2 TEXT(10000))
+CREATE FUNCTION GTID_IS_EQUAL(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
 RETURNS INT
-BEGIN
-  RETURN GTID_SUBSET(g1, g2) AND GTID_SUBSET(g2, g1);
-END|
+RETURN GTID_SUBSET(gtid_set_1, gtid_set_2) AND GTID_SUBSET(gtid_set_2, gtid_set_1)|
 
 # Return nonzero if the two gtid_sets are disjoint.
-CREATE FUNCTION GTID_IS_DISJOINT(g1 TEXT(10000), g2 TEXT(10000))
+CREATE FUNCTION GTID_IS_DISJOINT(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
 RETURNS INT
-BEGIN
-  RETURN GTID_SUBSET(g1, GTID_SUBTRACT(g1, g2));
-END|
+RETURN GTID_SUBSET(gtid_set_1, GTID_SUBTRACT(gtid_set_1, gtid_set_2))|
 
-# Return true if g1 union g2 = sum, and g1 and g2 are disjoint.
-CREATE FUNCTION GTID_IS_DISJOINT_UNION(g1 TEXT(10000), g2 TEXT(10000), sum TEXT(10000))
+# Return true if gtid_set_1 union gtid_set_2 = sum, and gtid_set_1 and gtid_set_2 are disjoint.
+CREATE FUNCTION GTID_IS_DISJOINT_UNION(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000), sum TEXT(10000))
 RETURNS INT
-BEGIN
-  RETURN GTID_IS_EQUAL(GTID_SUBTRACT(sum, g1), g2) AND
-         GTID_IS_EQUAL(GTID_SUBTRACT(sum, g2), g1);
-END|
+RETURN GTID_IS_EQUAL(GTID_SUBTRACT(sum, gtid_set_1), gtid_set_2) AND
+       GTID_IS_EQUAL(GTID_SUBTRACT(sum, gtid_set_2), gtid_set_1)|
 
-# Return the union of g1 and g2.
-CREATE FUNCTION GTID_UNION(g1 TEXT(10000), g2 TEXT(10000))
+# Return a normalized form of the GTID (all uppercase, no whitespace,
+# no duplicates, uuids in alphabetic order, intervals in numeric
+# order).
+CREATE FUNCTION GTID_NORMALIZE(g TEXT(10000))
 RETURNS TEXT(10000)
-BEGIN
-  RETURN GTID_SUBTRACT(CONCAT(g1, ',', g2), '');
-END|
+RETURN GTID_SUBTRACT(g, '')|
 
-# Return the intersection of g1 and g2.
-CREATE FUNCTION GTID_INTERSECT(g1 TEXT(10000), g2 TEXT(10000))
+# Return the union of gtid_set_1 and gtid_set_2.
+CREATE FUNCTION GTID_UNION(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
 RETURNS TEXT(10000)
-BEGIN
-  RETURN GTID_SUBTRACT(g1, GTID_SUBTRACT(g1, g2));
-END|
+RETURN GTID_NORMALIZE(CONCAT(gtid_set_1, ',', gtid_set_2))|
 
-# Return the symmetric difference between g1 and g2.
-CREATE FUNCTION GTID_SYMMETRIC_DIFFERENCE(g1 TEXT(10000), g2 TEXT(10000))
+# Return the intersection of gtid_set_1 and gtid_set_2.
+CREATE FUNCTION GTID_INTERSECTION(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
 RETURNS TEXT(10000)
-BEGIN
-  RETURN SUBTRACT(CONCAT(g1, ',', g2), GTID_INTERSECTION(g1, g2));
-END|
+RETURN GTID_SUBTRACT(gtid_set_1, GTID_SUBTRACT(gtid_set_1, gtid_set_2))|
+
+# Return the symmetric difference between gtid_set_1 and gtid_set_2.
+CREATE FUNCTION GTID_SYMMETRIC_DIFFERENCE(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
+RETURNS TEXT(10000)
+RETURN GTID_SUBTRACT(CONCAT(gtid_set_1, ',', gtid_set_2), GTID_INTERSECTION(gtid_set_1, gtid_set_2))|
 
 # Return the gtid with uuid removed.
-CREATE FUNCTION GTID_SUBTRACT_UUID(gtid TEXT(10000), uuid TEXT(10000))
+CREATE FUNCTION GTID_SUBTRACT_UUID(gtid_set TEXT(10000), uuid TEXT(100))
 RETURNS TEXT(10000)
+RETURN GTID_SUBTRACT(gtid_set, CONCAT(UUID, ':1-', 1 << 63 - 1))|
+
+# Return the intersection of gtid and uuid.
+CREATE FUNCTION GTID_INTERSECTION_WITH_UUID(gtid_set TEXT(10000), uuid TEXT(100))
+RETURNS TEXT(10000)
+RETURN GTID_SUBTRACT(gtid_set, GTID_SUBTRACT_UUID(gtid_set, uuid))|
+
+# If the first argument is nonzero, return it, else return the second argument
+CREATE FUNCTION IFZERO(a INT, b INT)
+RETURNS INT
+RETURN IF(a = 0, b, a)|
+
+# Like the builtin LOCATE, but returns length+1 rather than 0 if nothing found.
+CREATE FUNCTION LOCATE2(needle TEXT(10000), haystack TEXT(10000), offset INT)
+RETURNS INT
+RETURN IFZERO(LOCATE(needle, haystack, offset), LENGTH(haystack) + 1)|
+
+# Return the number of GTIDs in the given GTID set.
+CREATE FUNCTION GTID_COUNT(gtid_set TEXT(10000))
+RETURNS INT
 BEGIN
-  RETURN GTID_SUBTRACT(gtid, CONCAT(UUID, ':1-', 1 << 62));
+  DECLARE result BIGINT DEFAULT 0;
+  DECLARE colon_pos INT;
+  DECLARE next_dash_pos INT;
+  DECLARE next_colon_pos INT;
+  DECLARE next_comma_pos INT;
+  SET gtid_set = GTID_NORMALIZE(gtid_set);
+  SET colon_pos = LOCATE2(':', gtid_set, 1);
+  WHILE colon_pos != LENGTH(gtid_set) + 1 DO
+     SET next_dash_pos = LOCATE2('-', gtid_set, colon_pos + 1);
+     SET next_colon_pos = LOCATE2(':', gtid_set, colon_pos + 1);
+     SET next_comma_pos = LOCATE2(',', gtid_set, colon_pos + 1);
+     IF next_dash_pos < next_colon_pos AND next_dash_pos < next_comma_pos THEN
+       SET result = result +
+         SUBSTR(gtid_set, next_dash_pos + 1,
+                LEAST(next_colon_pos, next_comma_pos) - (next_dash_pos + 1)) -
+         SUBSTR(gtid_set, colon_pos + 1, next_dash_pos - (colon_pos + 1)) + 1;
+     ELSE
+       SET result = result + 1;
+     END IF;
+     SET colon_pos = next_colon_pos;
+  END WHILE;
+  RETURN result;
 END|
 
-# Return the intersection of gtid and uuid.
-CREATE FUNCTION GTID_INTERSECT_UUID(gtid TEXT(10000), uuid TEXT(10000))
+# Return the next GNO (numeric component) to be generated for the given UUID
+CREATE FUNCTION GTID_NEXT_GENERATED(gtid_set TEXT(10000), uuid TEXT(100))
+RETURNS INT
+BEGIN
+  DECLARE gtid_uuid TEXT(10000) DEFAULT GTID_INTERSECTION_WITH_UUID(gtid_set, uuid);
+  DECLARE colon_pos INT DEFAULT LOCATE2(':', gtid_uuid, 1);
+  DECLARE next_dash_pos INT DEFAULT LOCATE2('-', gtid_uuid, colon_pos + 1);
+  DECLARE next_comma_pos INT DEFAULT LOCATE2(',', gtid_uuid, colon_pos + 1);
+  DECLARE next_colon_pos INT DEFAULT LOCATE2(':', gtid_uuid, colon_pos + 1);
+  IF gtid_uuid = '' THEN
+    RETURN 1;
+  ELSEIF SUBSTR(gtid_uuid, colon_pos + 1,
+                 LEAST(next_dash_pos, next_comma_pos, next_colon_pos) -
+                 (colon_pos + 1)) != '1' THEN
+    RETURN 1;
+  ELSEIF next_dash_pos < LEAST(next_comma_pos, next_colon_pos) THEN
+    RETURN SUBSTR(gtid_uuid, next_dash_pos + 1,
+                  LEAST(next_comma_pos, next_colon_pos) -
+                  (next_dash_pos + 1)) + 1;
+  ELSE
+    RETURN 2;
+  END IF;
+END|
+
+# Return a GTID set consisting of the the next 'count' GTIDs that will
+# be generated for the given UUID.
+# This is inefficient if count is big, consider optimizing it if needed.
+CREATE FUNCTION GTID_NEXT_GENERATED_SET(gtid_set TEXT(10000), uuid TEXT(100), count INT)
 RETURNS TEXT(10000)
 BEGIN
-  RETURN GTID_SUBTRACT(gtid, GTID_SUBTRACT_UUID(gtid, uuid));
+  DECLARE result TEXT(10000) DEFAULT '';
+  DECLARE number INT;
+  DECLARE new_gtid VARCHAR(100);
+  WHILE count > 0 DO
+    SET new_gtid = CONCAT(uuid, ':', GTID_NEXT_GENERATED(gtid_set, uuid));
+    SET result = GTID_UNION(result, new_gtid);
+    SET gtid_set = GTID_UNION(gtid_set, new_gtid);
+    SET count = count - 1;
+  END WHILE;
+  RETURN result;
 END|
 
 # Return true if gtid_set 'new' is obtained by adding 'diff' to 'old',
@@ -137,16 +230,7 @@
 # removed) from 'new'.
 CREATE FUNCTION GTID_COMPARE(old TEXT(10000), diff TEXT(10000), new TEXT(10000))
 RETURNS INT
-BEGIN
-  DECLARE tilde_pos INT DEFAULT LOCATE('~', diff);
-  DECLARE to_add TEXT(10000);
-  DECLARE to_remove TEXT(10000);
-  IF tilde_pos != 0 THEN
-    RETURN GTID_IS_DISJOINT_UNION(new, SUBSTR(diff, 2), old);
-  ELSE
-    RETURN GTID_IS_DISJOINT_UNION(old, diff, new);
-  END IF;
-END|
+RETURN IF(SUBSTR(diff, 1, 1) != '~', GTID_IS_DISJOINT_UNION(old, diff, new), GTID_IS_DISJOINT_UNION(new, SUBSTR(diff, 2), old))|
 
 # convert strings like '1:4-5,97:1' to
 # '01010101-0101-0101-0101-010101010101:4-5,97979797-9797-9797-9797-979797979797:1'
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/have_mysql_no_login_plugin.inc percona-xtrabackup-2.3.7/mysql-test/include/have_mysql_no_login_plugin.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/have_mysql_no_login_plugin.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/have_mysql_no_login_plugin.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+#
+# Check if server has support for loading plugins
+#
+if (`SELECT @@have_dynamic_loading != 'YES'`) {
+  --skip mysql_no_login requires dynamic loading
+}
+
+#
+# Check if the variable MYSQL_NO_LOGIN is set
+#
+if (!$MYSQL_NO_LOGIN) {
+  --skip mysql_no_login requires the environment variable \$MYSQL_NO_LOGIN to be set (normally done by mtr)
+}
+
+#
+# Check if --plugin-dir was setup for mysql_no_login
+#
+if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$MYSQL_NO_LOGIN_OPT/'`) {
+  --skip mysql_no_login requires that --plugin-dir is set to the mysql_no_login dir (either the .opt file does not contain \$MYSQL_NO_LOGIN_OPT or another plugin is in use)
+}
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/have_util_nc.inc percona-xtrabackup-2.3.7/mysql-test/include/have_util_nc.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/have_util_nc.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/have_util_nc.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,53 @@
+# ==== Purpose ====
+#
+# Check if nc/netcat utility is available
+# The variable $nc contains name of utility
+# (nc or netcat)
+#
+# ==== Usage ====
+#
+# --source include/have_util_nc.inc
+# ...
+# --exec $nc some options
+#
+
+disable_result_log;
+disable_query_log;
+
+--let $nc=
+--let $_outfile= $MYSQLTEST_VARDIR/tmp/have_nc.tmp
+
+# find nc
+
+--error 0,1,127
+--exec nc -h > $_outfile 2>&1
+--eval SET @content = LOAD_FILE('$_outfile')
+--remove_file $_outfile
+
+if (`SELECT LOCATE('usage', @content) > 0`) {
+  --let $nc= nc
+  SET @content="";
+}
+
+# find netcat
+
+if (`SELECT '$nc' = ''`) {
+  --error 0,1,127
+  --exec netcat -h > $_outfile 2>&1
+  --eval SET @content = LOAD_FILE('$_outfile')
+  --remove_file $_outfile
+}
+
+if (`SELECT LOCATE('usage', @content) > 0`) {
+  --let $nc= netcat
+ SET @content="";
+}
+
+# Skip the test case if utility not found
+if (`SELECT '$nc' = ''`) {
+  --skip nc/netcat not found
+}
+
+enable_query_log;
+enable_result_log;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/install_semisync.inc percona-xtrabackup-2.3.7/mysql-test/include/install_semisync.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/install_semisync.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/install_semisync.inc	2017-02-27 07:47:02.000000000 +0000
@@ -5,7 +5,6 @@
 --source include/begin_include_file.inc
 
 --source include/not_embedded.inc
---source include/not_gtid_enabled.inc
 --source include/have_semisync_plugin.inc
 
 --connection master
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/linux.inc percona-xtrabackup-2.3.7/mysql-test/include/linux.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/linux.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/linux.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,5 @@
+if (`select convert(@@version_compile_os using latin1) IN ("Linux") = 0`)
+{
+  skip Needs Linux;
+}
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/master-slave.inc percona-xtrabackup-2.3.7/mysql-test/include/master-slave.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/master-slave.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/master-slave.inc	2017-02-27 07:47:02.000000000 +0000
@@ -12,12 +12,13 @@
 #   [--let $rpl_debug= 1]
 #   [--let $slave_timeout= NUMBER]
 #   [--let $use_gtids= 1]
+#   [--let $rpl_gtid_utils= 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, $use_gtids
+#   $slave_timeout, $use_gtids, $rpl_gtid_utils
 #     See include/rpl_init.inc
 #
 #   $rpl_server_count
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/mtr_warnings.sql percona-xtrabackup-2.3.7/mysql-test/include/mtr_warnings.sql
--- percona-xtrabackup-2.2.3/mysql-test/include/mtr_warnings.sql	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/mtr_warnings.sql	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2008, 2015, 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
@@ -243,7 +243,7 @@
  
  ("Changed limits: max_open_files: *"),
  ("Changed limits: max_connections: *"),
- ("Changed limits: table_cache: *"),
+ ("Changed limits: table_open_cache: *"),
  ("Could not increase number of max_open_files to more than *"),
 
  ("THE_LAST_SUPPRESSION")||
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/plugin.defs percona-xtrabackup-2.3.7/mysql-test/include/plugin.defs
--- percona-xtrabackup-2.2.3/mysql-test/include/plugin.defs	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/plugin.defs	2017-02-27 07:47:02.000000000 +0000
@@ -45,3 +45,4 @@
 libmemcached       plugin/innodb_memcached/daemon_memcached DAEMON_MEMCACHED daemon_memcached
 innodb_engine      plugin/innodb_memcached/innodb_memcache INNODB_ENGINE
 validate_password  plugin/password_validation VALIDATE_PASSWORD validate_password
+mysql_no_login     plugin/mysql_no_login      MYSQL_NO_LOGIN    mysql_no_login
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/rpl_connection_master1.inc percona-xtrabackup-2.3.7/mysql-test/include/rpl_connection_master1.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/rpl_connection_master1.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/rpl_connection_master1.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2 @@
+let $rpl_connection_name= master1;
+source include/rpl_connection.inc;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/rpl_end.inc percona-xtrabackup-2.3.7/mysql-test/include/rpl_end.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/rpl_end.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/rpl_end.inc	2017-02-27 07:47:02.000000000 +0000
@@ -16,6 +16,7 @@
 #
 # [--let $rpl_only_running_threads= 1]
 # [--let $rpl_debug= 1]
+# [--let $rpl_gtid_utils= 1]
 # --source include/rpl_end.inc
 #
 # Parameters:
@@ -27,6 +28,9 @@
 #   $rpl_debug
 #     See include/rpl_init.inc
 #
+#   $rpl_gtid_utils
+#     Source include/gtid_utils_end.inc on every server.
+#
 # Note:
 #   This script will fail if Last_SQL_Error or Last_IO_Error is
 #   nonempty.  If you expect an error in the SQL thread, you should
@@ -79,15 +83,10 @@
 --source include/rpl_sync.inc
 --source include/rpl_stop_slaves.inc
 
-# Revert to default (gtid-mode=off).
-if ($use_gtids == 1)
-{
-  --let $use_gtids= 0
-}
-
 # mtr configures server 2 to be a slave before it runs the test. We
 # have to restore that state now, so we change topology to 1->2.
 --let $rpl_topology= none
+--let $use_gtids= 0
 --source include/rpl_change_topology.inc
 
 
@@ -96,6 +95,15 @@
 --let $_rpl_one= _1
 while ($_rpl_server)
 {
+  if ($rpl_gtid_utils)
+  {
+    # Drop gtid_utils
+    --let $rpl_connection_name= server_$_rpl_server
+    --source include/rpl_connection.inc
+    --source include/gtid_utils_end.inc
+    --connection default
+  }
+  # Unconfigure connections
   --disconnect server_$_rpl_server
   --disconnect server_$_rpl_server$_rpl_one
   --dec $_rpl_server
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/rpl_init.inc percona-xtrabackup-2.3.7/mysql-test/include/rpl_init.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/rpl_init.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/rpl_init.inc	2017-02-27 07:47:02.000000000 +0000
@@ -51,6 +51,7 @@
 #    [--let $rpl_debug= 1]
 #    [--let $slave_timeout= NUMBER]
 #    [--let $use_gtids= 1]
+#    [--let $rpl_gtid_utils= 1]
 #    --source include/rpl_init.inc
 #
 #    Parameters:
@@ -107,6 +108,10 @@
 #    $use_gtids
 #      Use option MASTER_AUTO_POSITION = 1 to CHANGE MASTER.
 #
+#    $rpl_gtid_utils
+#      Create stored functions for GTID manipulation on every server (see
+#      gtid_utils.inc).
+#
 #
 # ==== Side effects ====
 #
@@ -198,6 +203,10 @@
   --let $rpl_connection_name= server_$_rpl_server
   --source include/rpl_connection.inc
   USE test;
+  if ($rpl_gtid_utils)
+  {
+    --source include/gtid_utils.inc
+  }
   if (!$rpl_skip_reset_master_and_slave)
   {
     RESET MASTER;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/rpl_stop_server.inc percona-xtrabackup-2.3.7/mysql-test/include/rpl_stop_server.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/rpl_stop_server.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/rpl_stop_server.inc	2017-02-27 07:47:02.000000000 +0000
@@ -6,6 +6,7 @@
 #
 # --let $rpl_server_number= N
 # [--let $rpl_debug= 1]
+# [--let $rpl_force_stop= 1]
 # --source include/rpl_stop_server.inc
 #
 # Parameters:
@@ -17,6 +18,8 @@
 #
 #   $rpl_debug
 #     See include/rpl_init.inc
+#   $rpl_force_stop
+#     Kill the server immediately i.e., --shutdown_server 0
 #
 # ==== See also ====
 #
@@ -48,11 +51,15 @@
 
 # Send shutdown to the connected server and give
 # it 14 seconds to die before zapping it
-shutdown_server 14;
-
+--let $shutdown_server_timeout= 14
+if ($rpl_force_stop)
+{
+   # if force_stop is set, shutdown server immediately(equal to killing the server)
+   --let $shutdown_server_timeout= 0
+}
+shutdown_server $shutdown_server_timeout;
 --source include/wait_until_disconnected.inc
 
-
 --let $rpl_connection_name= $_rpl_stop_server_old_connection
 --source include/rpl_connection.inc
 --dec $_include_file_depth
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/save_io_thread_pos.inc percona-xtrabackup-2.3.7/mysql-test/include/save_io_thread_pos.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/save_io_thread_pos.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/save_io_thread_pos.inc	2017-02-27 07:47:02.000000000 +0000
@@ -28,7 +28,7 @@
 
 if ($use_gtids)
 {
-  --let $_saved_gtids= query_get_value(SHOW SLAVE STATUS, Retrieved_Gtid_set, 1)
+  --let $_saved_gtids= query_get_value(SHOW SLAVE STATUS, Retrieved_Gtid_Set, 1)
   if ($rpl_debug)
   {
     --echo save_io_thread_pos.inc saved gtid='$_saved_gtids'
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/save_master_pos.inc percona-xtrabackup-2.3.7/mysql-test/include/save_master_pos.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/save_master_pos.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/save_master_pos.inc	2017-02-27 07:47:02.000000000 +0000
@@ -27,18 +27,21 @@
 --let $include_filename= save_master_pos.inc
 --source include/begin_include_file.inc
 
+#
+# Always save master positions, this will be useful to check missing GTIDs.
+#
+--let $_saved_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $_saved_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
 if ($use_gtids)
 {
   --let $_saved_gtids= `SELECT @@global.gtid_executed`
   if ($rpl_debug)
   {
-    --echo save_master_pos saved gtid='$_saved_gtids'
+    --echo save_master_pos saved gtid='$_saved_gtids', file='$_saved_file', pos='$_saved_pos'
   }
 }
 if (!$use_gtids)
 {
-  --let $_saved_file= query_get_value(SHOW MASTER STATUS, File, 1)
-  --let $_saved_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
   if ($rpl_debug)
   {
     --echo save_master_pos saved file='$_saved_file', pos='$_saved_pos'
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/show_all_binlogs.inc percona-xtrabackup-2.3.7/mysql-test/include/show_all_binlogs.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/show_all_binlogs.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/show_all_binlogs.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,66 @@
+# ==== Purpose ====
+#
+# Print the contents of all binary logs to the result log. This must
+# only be used for debugging.
+#
+# ==== Usage ====
+#
+# [--let $output_file= FILENAME]
+# [--let $append= 1]
+# [--let $rpl_debug= 1]
+# --source include/show_all_binlogs.inc
+#
+# Parameters:
+#
+#   $output_file
+#     By default, output is printed to the result log.  If you need to
+#     print it to a specific file, specify the filename with this
+#     parameter.
+#
+#   $append
+#     By default, if $output_file is specified and the file exists,
+#     this script truncates the file before it writes to it.  If
+#     $append is specified, the file is not truncated and the contents
+#     of the binary log is appended to the end.
+#
+#   $rpl_debug
+#     See rpl_init.inc
+
+--let $include_filename= show_all_binlogs.inc
+--source include/begin_include_file.inc
+
+
+--disable_query_log
+
+if ($output_file == '')
+{
+  --echo DO_NOT_CHECK_IN_THIS_LINE: include/show_all_binlogs.inc should only be used for debugging. Never check in a test that calls it on success.
+}
+
+--let $number= 1
+--let $binlog_file= query_get_value(SHOW BINARY LOGS, Log_name, $number)
+while ($binlog_file != 'No such row')
+{
+  --let $statement= SHOW BINLOG EVENTS IN '$binlog_file'
+  --let $header= ======== $statement ========
+
+  if ($output_file != '')
+  {
+    --let $write_var= $header
+    --let $write_to_file= $output_file
+    --source include/write_var_to_file.inc
+
+    --source include/write_result_to_file.inc
+  }
+  if ($output_file == '')
+  {
+    --echo $header
+    eval $statement;
+  }
+  --inc $number
+
+  --let $binlog_file= query_get_value(SHOW BINARY LOGS, Log_name, $number)
+}
+
+
+--source include/end_include_file.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/show_all_relay_logs.inc percona-xtrabackup-2.3.7/mysql-test/include/show_all_relay_logs.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/show_all_relay_logs.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/show_all_relay_logs.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,70 @@
+# ==== Purpose ====
+#
+# Print the contents of all relay logs to the result log. This must
+# only be used for debugging.
+#
+# ==== Usage ====
+#
+# [--let $output_file= FILENAME]
+# [--let $append= 1]
+# [--let $rpl_debug= 1]
+# --source include/show_all_binlogs.inc
+#
+# Parameters:
+#
+#   $output_file
+#     By default, output is printed to the result log.  If you need to
+#     print it to a specific file, specify the filename with this
+#     parameter.
+#
+#   $append
+#     By default, if $output_file is specified and the file exists,
+#     this script truncates the file before it writes to it.  If
+#     $append is specified, the file is not truncated and the contents
+#     of the binary log is appended to the end.
+#
+#   $rpl_debug
+#     See rpl_init.inc
+
+--let $include_filename= show_all_relay_logs.inc
+--source include/begin_include_file.inc
+
+
+--disable_query_log
+
+if ($output_file == '')
+{
+  --echo DO_NOT_CHECK_IN_THIS_LINE: include/show_all_relay_logs.inc should only be used for debugging. Never check in a test that calls it on success.
+}
+
+--let $last_relay_log_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1)
+--let $relay_log_base= `SELECT SUBSTRING_INDEX('$last_relay_log_file', '.', 1)`
+--let $relay_log_count= `SELECT CONCAT('1', SUBSTRING_INDEX('$last_relay_log_file', '.', -1)) - 1000000`
+--let $number= 1
+while ($number <= $relay_log_count)
+{
+  --let $padded_number= `SELECT LPAD('$number', 6, '0')`
+  --let $statement= SHOW RELAYLOG EVENTS IN '$relay_log_base.$padded_number'
+  --let $header= ======== $statement ========
+
+  if ($output_file != '')
+  {
+    --let $write_to_file= $output_file
+    --let $write_var= $header
+    --let $allow_error= 1
+    --source include/write_var_to_file.inc
+
+    --source include/write_result_to_file.inc
+  }
+  if ($output_file == '')
+  {
+    --echo $header
+    --error 0, 1220 # 1220 = ER_ERROR_WHEN_EXECUTING_COMMAND
+    eval $statement;
+  }
+
+  --inc $number
+}
+
+
+--source include/end_include_file.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/show_rpl_debug_info.inc percona-xtrabackup-2.3.7/mysql-test/include/show_rpl_debug_info.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/show_rpl_debug_info.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/show_rpl_debug_info.inc	2017-02-27 07:47:02.000000000 +0000
@@ -21,6 +21,8 @@
 # ==== Usage ====
 #
 # [--let $rpl_only_current_connection= 1]
+# [--let $extra_debug_info= some text]
+# [--let $extra_debug_eval= expression parsable by include/eval.inc]
 # --source include/show_rpl_debug_info.inc
 #
 # Parameters:
@@ -28,7 +30,14 @@
 #     By default, debug info is printed from all connections, starting
 #     with the current connection. If this variable is set, debug
 #     info is printed only for the current connection.
-#     
+#
+#   $extra_debug_info
+#     This text is printed verbatim to the output. Useful for helper
+#     scripts to supply extra diagnostic output.
+#
+#   $extra_debug_eval
+#     Expression in the form expected by include/eval.inc, which will
+#     be evaluated and printed to the output.
 #
 # ==== Side effects ====
 #
@@ -56,6 +65,8 @@
 }
 --inc $_rpl_server
 
+--echo DO_NOT_CHECK_IN_THIS_LINE: include/show_rpl_debug_info.inc should only be used for debugging. Never check in a test that calls it on success.
+
 --echo CURRENT_CONNECTION = '$_rpl_old_con'
 
 while ($_rpl_server)
@@ -124,6 +135,12 @@
 
 --echo rand_seed: '$rand_seed' _rand_state: '$_rand_state'
 --echo extra debug info if any: '$extra_debug_info'
+if ($extra_debug_eval)
+{
+  --let $eval_expr= $extra_debug_eval
+  --source include/eval.inc
+  --echo extra evaluated debug info: '$eval_result'
+}
 
 --connection $_rpl_old_con
 --enable_abort_on_error
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/stop_dump_threads.inc percona-xtrabackup-2.3.7/mysql-test/include/stop_dump_threads.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/stop_dump_threads.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/stop_dump_threads.inc	2017-02-27 07:47:02.000000000 +0000
@@ -15,7 +15,7 @@
 --disable_query_log
 --disable_result_log
 
---let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
+--let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump' OR COMMAND = 'Binlog Dump GTID'`
 
 while ($_sdt_dump_thread_id != '')
 {
@@ -23,10 +23,9 @@
   --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 $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump' OR COMMAND = 'Binlog Dump GTID'`
 }
 
-
 --let $show_rpl_debug_info= $_sdt_show_rpl_debug_info_old
 
 --let $include_filename= stop_dump_threads.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/subquery_mat.inc percona-xtrabackup-2.3.7/mysql-test/include/subquery_mat.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/subquery_mat.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/subquery_mat.inc	2017-02-27 07:47:02.000000000 +0000
@@ -1417,6 +1417,53 @@
 
 DROP TABLE t1,t2,t3;
 
+--echo #
+--echo # Bug#19297190 NOT IN DOESN'T RETURN EXPECTED RESULT
+--echo #
+
+CREATE TABLE t1 (a VARCHAR(500) CHARACTER SET UTF8) ENGINE=INNODB;
+
+# Fill the table with 32 distinct long rows (>32kB of data)
+SET @str= repeat("a",450);
+SET @num=1000;
+INSERT INTO t1 VALUES (CONCAT((@num:=@num+1), @str));
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+SELECT COUNT(*) FROM t1;
+
+ANALYZE TABLE t1;
+
+let $query=
+SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+  SELECT t2.a FROM t1 as t2
+);
+
+# If subq-mat is used, this will force MEMORY->MYISAM tmp table conversion:
+set @save_heap_size= @@max_heap_table_size;
+set @@max_heap_table_size= 16384;
+
+# Uses IN->EXISTS because field too long for subq-materialization:
+eval EXPLAIN $query;
+eval $query;
+
+# Make field just below the length limit:
+# Silence truncation warnings:
+--disable_warnings
+ALTER TABLE t1 MODIFY a VARCHAR(332) CHARACTER SET UTF8;
+--enable_warnings
+
+# Now subquery materialization can be used, and result is still correct:
+eval EXPLAIN $query;
+eval $query;
+
+DROP TABLE t1;
+set @@max_heap_table_size= @save_heap_size;
+
 --echo # End of 5.6 tests
 
 set @@optimizer_switch=@old_opt_switch;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/subquery_sj.inc percona-xtrabackup-2.3.7/mysql-test/include/subquery_sj.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/subquery_sj.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/subquery_sj.inc	2017-02-27 07:47:02.000000000 +0000
@@ -6442,6 +6442,86 @@
 
 --echo # End of test for bug#14064201.
 
+--echo #
+--echo # Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+--echo #               && IDX < PARENT_JOIN->TABLES
+--echo #
+
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+
+SELECT(SELECT  1
+       FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+         FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+	(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+  	(SELECT d FROM c)) as cc FROM  c;
+DROP TABLE b,c;
+
+--echo #
+--echo # Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+--echo #
+CREATE TABLE b (
+  d INT(11)
+);
+CREATE TABLE c (
+  d BLOB
+) ;
+CREATE TABLE d (
+  b INT(11)
+);
+
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+
+DROP TABLE b,c,d;
+
+--echo #
+--echo # Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+--echo #
+CREATE TABLE t1 (
+  ID int(11) NOT NULL AUTO_INCREMENT,
+  id2 int(11) DEFAULT NULL,
+  id3 int(11) DEFAULT NULL,
+  id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+  id5 int(11) DEFAULT NULL,
+  PRIMARY KEY (ID),
+  KEY id2 (id2),
+  KEY id3 (id3),
+  KEY id5 (id5)
+) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+
+CREATE TABLE t2 (
+  id6 int(11) NOT NULL,
+  id7 int(11) NOT NULL,
+  PRIMARY KEY (id6,id7),
+  KEY id7 (id7)
+) ENGINE=InnoDB;
+
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+
+SELECT ID
+   FROM t1 p0
+   WHERE  p0.id3=1
+   AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+
+DROP TABLE t1,t2;
+
 set @@optimizer_switch=@old_opt_switch;
 # New tests go here.
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/sync_slave_sql.inc percona-xtrabackup-2.3.7/mysql-test/include/sync_slave_sql.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/sync_slave_sql.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/sync_slave_sql.inc	2017-02-27 07:47:02.000000000 +0000
@@ -22,6 +22,11 @@
 #
 #   $use_gtids
 #     If set, uses GTIDs instead of filename and offset for positions.
+#
+#   $ignore_gtids_on_sync
+#     Forces the use of master file and position, even if $use_gtids is set.
+#     This might be used if the slave will not have all the GTIDs of the master
+#     but have to read and apply all master events to the end.
 
 --let $include_filename= sync_slave_sql.inc
 --source include/begin_include_file.inc
@@ -34,10 +39,40 @@
 
 if ($rpl_debug)
 {
-  --echo use_gtids='$use_gtids' _saved_gtids='$_saved_gtids' _saved_file='$_saved_file' _saved_pos='$_saved_pos' timeout='$_sss_slave_timeout'
+  --echo use_gtids='$use_gtids' ignore_gtids_on_sync='$ignore_gtids_on_sync' _saved_gtids='$_saved_gtids' _saved_file='$_saved_file' _saved_pos='$_saved_pos' timeout='$_sss_slave_timeout'
+}
+
+#
+# Verify if the SQL thread is already updated by the master position
+# regardless the use if GTIDs. If the SQL thread is already updated,
+# we can reduce the slave timeout of WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS
+# to a minimum because there in nothing else to sync.
+# As there is a possibility of missing GTIDs on slave, this reduced
+# timeout will make mtr throw an error almost promptly, without having
+# to wait 300 seconds to notice a sync problem between master and slave.
+#
+--let $_slave_master_file= query_get_value(SHOW SLAVE STATUS, Relay_Master_Log_File, 1)
+--let $_slave_master_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1)
+if ($_slave_master_file == $_saved_file)
+{
+  if ($_slave_master_pos == $_saved_pos)
+  {
+    if ($rpl_debug)
+    {
+      --echo debug: It seems that SQL thread is already synced (by verifying master file and position)
+      --echo debug: Changing slave timeout to 1 seconds
+    }
+    --let $_sss_slave_timeout= 1
+  }
+}
+
+--let $_sync_with_gtids= $use_gtids
+if ($ignore_gtids_on_sync)
+{
+  --let $_sync_with_gtids= 0
 }
 
-if ($use_gtids)
+if ($_sync_with_gtids)
 {
   if ($rpl_debug)
   {
@@ -45,7 +80,7 @@
   }
   --let $_sss_result= `SELECT WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS('$_saved_gtids', $_sss_slave_timeout)`
 }
-if (!$use_gtids)
+if (!$_sync_with_gtids)
 {
   if ($rpl_debug)
   {
@@ -61,7 +96,7 @@
 }
 if ($_sss_result == -1)
 {
-  --let $error_type= Timeout after $slave_timeout seconds.
+  --let $error_type= Timeout after $_sss_slave_timeout seconds.
 }
 
 if ($_sss_result < 0)
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/sync_slave_sql_with_master.inc percona-xtrabackup-2.3.7/mysql-test/include/sync_slave_sql_with_master.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/sync_slave_sql_with_master.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/sync_slave_sql_with_master.inc	2017-02-27 07:47:02.000000000 +0000
@@ -37,6 +37,7 @@
 --let $include_filename= sync_slave_sql_with_master.inc
 --source include/begin_include_file.inc
 
+--source include/wait_for_ndb_committed_to_binlog.inc
 --source include/save_master_pos.inc
 
 --let $rpl_connection_name= slave
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/uninstall_semisync.inc percona-xtrabackup-2.3.7/mysql-test/include/uninstall_semisync.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/uninstall_semisync.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/uninstall_semisync.inc	2017-02-27 07:47:02.000000000 +0000
@@ -13,6 +13,11 @@
 UNINSTALL PLUGIN rpl_semi_sync_slave;
 
 --connection master
+# After BUG#17638477 fix, uninstallation of rpl_semi_sync_master
+#  is not allowed when there are semi sync slaves. Hence kill
+#  all dump threads before uninstalling it.
+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
+--source include/stop_dump_threads.inc
 UNINSTALL PLUGIN rpl_semi_sync_master;
 --enable_warnings
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/wait_for_ndb_committed_to_binlog.inc percona-xtrabackup-2.3.7/mysql-test/include/wait_for_ndb_committed_to_binlog.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/wait_for_ndb_committed_to_binlog.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/wait_for_ndb_committed_to_binlog.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,57 @@
+# ==== Purpose ====
+# 
+# Several test primitives from mysql-test/extra/rpl_tests 
+# are shared for test cases for MyISAM, InnoDB, NDB and
+# other engines.
+# For NDB engine all events will be added by NDB injector
+# so tests only can continue after injector is ready, 
+# this file waits for all committed transactions (at start
+# of file) are injected into the binlog.
+#
+# ==== Usage ====
+#
+# let $wait_timeout= 150;
+# --source include/wait_for_ndb_committed_to_binlog.inc
+#
+# ==== Parameters =====
+#
+# $wait_timeout
+#   Time to wait in seconds for epoch to be injected in binlog.
+#   On timeout test dies.
+#
+
+if (`SELECT 1 FROM information_schema.engines WHERE engine = 'ndbcluster' AND support IN ('YES', 'DEFAULT')`)
+{
+  let $max_run_time= 150;
+  if ($wait_timeout)
+  {
+    let $max_run_time= $wait_timeout;
+  }
+  # Reset $wait_timeout so that its value won't be used on subsequent
+  # calls, and default will be used instead.
+  let $wait_timeout= 0;
+
+  # The smallest timespan till UNIX_TIMESTAMP() gets incremented is ~0 seconds.
+  # We add one second to avoid the case that somebody measures timespans on a
+  # real clock with fractions of seconds, detects that n seconds are sufficient,
+  # assigns n to this routine and suffers because he sometimes gets n - 1
+  # seconds in reality.
+
+  let $max_end_time= `SELECT UNIX_TIMESTAMP() + $max_run_time + 1`;
+
+  source include/get_ndb_epochs.inc;
+
+  while (`SELECT $ndb_latest_trans_epoch > $ndb_latest_handled_binlog_epoch AND UNIX_TIMESTAMP() <= $max_end_time`)
+  {
+    # Sleep a bit to avoid too heavy load.
+    sleep 0.1;
+
+    source include/get_ndb_epochs.inc;
+  }
+
+  if (`SELECT $ndb_latest_trans_epoch > $ndb_latest_handled_binlog_epoch`)
+  {
+    echo ERROR IN TEST: Timeout in waiting for epoch $ndb_latest_trans_epoch to be handled, last handled is $ndb_latest_handled_binlog_epoch;
+    die ERROR IN TEST: Timeout in waiting for epoch to be handled;
+  }
+}
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/wait_for_ndb_to_binlog.inc percona-xtrabackup-2.3.7/mysql-test/include/wait_for_ndb_to_binlog.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/wait_for_ndb_to_binlog.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/wait_for_ndb_to_binlog.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# ==== Purpose ====
-# 
-# Several test primitives from mysql-test/extra/rpl_tests 
-# are shared for test cases for MyISAM, InnoDB, NDB and
-# other engines.
-# For NDB engine all events will be added by NDB injector
-# so tests only can continue after injector is ready, 
-# this test waits for proper injector thread state.
-#
-# ==== Usage ====
-#
-# let $engine_type= NDB;
-# --source include/wait_for_ndb_to_binlog.inc
-#
-# ==== Parameters =====
-#
-# $engine_type
-#   Type of engine. If type is NDB then it waits for injector
-#   thread proper state.
-
-if (`SELECT UPPER(LEFT('$engine_type',3)) = 'NDB'`) {
-  let $show_statement= SHOW PROCESSLIST;
-  let $field= State;
-  let $condition= = 'Waiting for event from ndbcluster';
-  source include/wait_show_condition.inc;
-}
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/wait_for_slave_param.inc percona-xtrabackup-2.3.7/mysql-test/include/wait_for_slave_param.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/wait_for_slave_param.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/wait_for_slave_param.inc	2017-02-27 07:47:02.000000000 +0000
@@ -12,7 +12,7 @@
 # [--let $slave_timeout= NUMBER]
 # [--let $slave_error_param= [Slave_SQL_Errno | Slave_IO_Errno]]
 # [--let $rpl_debug= 1]
-# --source include/slave_wait_param.inc
+# --source include/wait_for_slave_param.inc
 #
 # Parameters:
 #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/wait_for_slave_sql_error.inc percona-xtrabackup-2.3.7/mysql-test/include/wait_for_slave_sql_error.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/wait_for_slave_sql_error.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/wait_for_slave_sql_error.inc	2017-02-27 07:47:02.000000000 +0000
@@ -6,7 +6,7 @@
 #
 # ==== Usage ====
 #
-# --let $slave_sql_errno= NUMBER
+# --let $slave_sql_errno= NUMBER [, NUMBER ...] [# comment]
 # [--let $show_slave_sql_error= 1]
 # [--let $rpl_debug= 1]
 # [--let $slave_timeout= NUMBER]
@@ -14,7 +14,13 @@
 #
 # Parameters:
 #   $slave_sql_errno
-#     The expected SQL error number.  This is required.
+#     The expected SQL error numbers. This can be either a single
+#     number, or a comma-separated list of numbers. Examples:
+#       --let $slave_sql_errno= 1040, 1053, 2002, 2003, 2006, 2013
+#       --let $slave_sql_errno= 1593 # ER_SLAVE_FATAL_ERROR
+#     It is allowed to add a comment at the end of the line, and it
+#     is strongly advised to put the symbolic name of the error in
+#     this comment, like the example above.
 #     (After BUG#41956 has been fixed, this will be required to be a
 #     symbolic name instead of a number.)
 #
@@ -50,7 +56,15 @@
   --die !!!ERROR IN TEST: you must set \$slave_sql_errno before sourcing wait_for_slave_sql_error.inc
 }
 
-if (`SELECT $_wfsse_errno NOT IN ($slave_sql_errno)`) {
+# Strip away comments
+--let $_slave_sql_errno= `SELECT IF(LOCATE('#', '$slave_sql_errno') != 0, SUBSTR('$slave_sql_errno', 1, LOCATE('#', '$slave_sql_errno') - 1), '$slave_sql_errno')`
+
+if ($rpl_debug)
+{
+  --echo # debug: slave_sql_errno='$_slave_sql_errno'; stripped from comments='$_slave_sql_errno' wfsie_errno='$_wfsie_errno'
+}
+
+if (`SELECT $_wfsse_errno NOT IN ($_slave_sql_errno)`) {
   --echo **** Slave stopped with wrong error code: $_wfsse_errno (expected $slave_sql_errno) ****
   source include/show_rpl_debug_info.inc;
   --echo **** Slave stopped with wrong error code: $_wfsse_errno (expected $slave_sql_errno) ****
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/wait_for_slave_sql_to_stop.inc percona-xtrabackup-2.3.7/mysql-test/include/wait_for_slave_sql_to_stop.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/wait_for_slave_sql_to_stop.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/wait_for_slave_sql_to_stop.inc	2017-02-27 07:47:02.000000000 +0000
@@ -31,6 +31,7 @@
 
 --let $slave_param= Slave_SQL_Running
 --let $slave_param_value= No
+--let $slave_param_comparison= =
 --let $slave_error_param= Last_SQL_Errno
 --source include/wait_for_slave_param.inc
 --let $slave_error_param= 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/wait_show_condition.inc percona-xtrabackup-2.3.7/mysql-test/include/wait_show_condition.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/wait_show_condition.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/wait_show_condition.inc	2017-02-27 07:47:02.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # USAGE
 #
-#    All rows of the result must fulfil the condition if $all_rows_fulfil is 1
+#    All rows of the result must fulfil the condition if $wait_for_all is 1
 #    else at least one of the result must fulfil the condition.
 #    let $wait_for_all= 1; 
 #    let $show_statement= SHOW PROCESSLIST;
@@ -87,6 +87,11 @@
            # We are behind the last row of the result set.
            let $process_result= 0;
 	   let $do_loop= 0;
+           # For string fields and for "!=" comparision, it is possible that
+           # above if condition (i.e., SELECT '$field_value' $condition) is
+           # true and the current if condition is also true. So set $found=0
+           # here explicitly
+           let $found= 0;
         }
         inc $rowno;
      }
diff -Nru percona-xtrabackup-2.2.3/mysql-test/include/write_result_to_file.inc percona-xtrabackup-2.3.7/mysql-test/include/write_result_to_file.inc
--- percona-xtrabackup-2.2.3/mysql-test/include/write_result_to_file.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/include/write_result_to_file.inc	2017-02-27 07:47:02.000000000 +0000
@@ -12,6 +12,8 @@
 # --let $statement= <STATEMENT>
 # --let $output_file= {<FILE>|GENERATE}
 # [--let $dont_print_statement= 1]
+# [--let $allow_error= 1]
+# [--let $append= 1]
 # --source include/write_result_to_file.inc
 #
 # Parameters:
@@ -27,6 +29,14 @@
 #     By default, the statement is echoed to the result log.  If the
 #     statement contains non-deterministic output, set this variable
 #     to suppress it.
+#
+#   $allow_error
+#     By default, this script causes the test to fail if the statement
+#     generates an error.  If $allow_error is set, errors are ignored.
+#
+#   $append
+#     By default, any existing file is overwritten. If $append is
+#     specified, and the file exists, it appends to the file.
 
 # Get the port and socket used by mysqld on current connection
 --let _WRTF_SERVER_PORT= `SELECT @@PORT`
@@ -58,19 +68,37 @@
 }
 --let _WRTF_OUTPUT_FILE= $output_file
 
+if ($allow_error)
+{
+  --let _WRTF_ALLOW_ERROR= 1
+}
+if (!$allow_error)
+{
+  --let _WRTF_ALLOW_ERROR= 0
+}
+if ($append)
+{
+  --let _WRTF_APPEND= 1
+}
+if (!$append)
+{
+  --let _WRTF_APPEND= 0
+}
+
 perl;
   use strict;
   my $stmt= $ENV{'_WRTF_STATEMENT'};
   # Connecting mysql to same mysqld as current connectiona
   # by overriding port and socket
-  my $mysql = $ENV{'MYSQL'};
+  my $mysql= $ENV{'MYSQL'};
   my $server_port= $ENV{'_WRTF_SERVER_PORT'};
   my $server_socket= $ENV{'_WRTF_SERVER_SOCKET'};
+  my $redirection_type= $ENV{'_WRTF_APPEND'} ? '>>' : '>';
   $mysql .= " --port=$server_port --socket=$server_socket";
   my $outfile = $ENV{'_WRTF_OUTPUT_FILE'};
-  open MYSQL, "| $mysql > $outfile" or die "Failed to open MYSQL pipe: '$mysql > $outfile'";
+  open MYSQL, "| $mysql $redirection_type $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: $!";
+  close MYSQL or $ENV{'_WRTF_ALLOW_ERROR'} or die "Error closing MYSQL pipe: $!";
 EOF
 
 --let $include_filename= write_result_to_file.inc [$write_result_msg]
diff -Nru percona-xtrabackup-2.2.3/mysql-test/lib/My/SafeProcess/CMakeLists.txt percona-xtrabackup-2.3.7/mysql-test/lib/My/SafeProcess/CMakeLists.txt
--- percona-xtrabackup-2.2.3/mysql-test/lib/My/SafeProcess/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/lib/My/SafeProcess/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -29,7 +29,7 @@
     STRING(REPLACE " -library=stlport4" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
     STRING(REPLACE " -library=stlport4" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
     STRING(REPLACE " -library=stlport4" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-    STRING(REGEX REPLACE " -R[^ ]+" "" CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS})
+    STRING(REGEX REPLACE " -R[^ ]+" "" CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
   ENDIF()
 ENDIF()
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/mtr.out-of-source percona-xtrabackup-2.3.7/mysql-test/mtr.out-of-source
--- percona-xtrabackup-2.2.3/mysql-test/mtr.out-of-source	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/mtr.out-of-source	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
 # Call mtr in out-of-source build
-$ENV{MTR_BINDIR} = "@CMAKE_BINARY_DIR@";
-chdir("@CMAKE_SOURCE_DIR@/mysql-test");
-exit(system($^X, "@CMAKE_SOURCE_DIR@/mysql-test/mysql-test-run.pl", @ARGV) >> 8);
+$ENV{MTR_BINDIR} = '@CMAKE_BINARY_DIR@';
+chdir('@CMAKE_SOURCE_DIR@/mysql-test');
+exit(system($^X, '@CMAKE_SOURCE_DIR@/mysql-test/mysql-test-run.pl', @ARGV) >> 8);
diff -Nru percona-xtrabackup-2.2.3/mysql-test/mysql-test-run.pl percona-xtrabackup-2.3.7/mysql-test/mysql-test-run.pl
--- percona-xtrabackup-2.2.3/mysql-test/mysql-test-run.pl	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/mysql-test-run.pl	2017-02-27 07:47:02.000000000 +0000
@@ -235,6 +235,7 @@
 our $opt_client_ddd;
 my $opt_boot_ddd;
 our $opt_manual_gdb;
+our $opt_manual_lldb;
 our $opt_manual_dbx;
 our $opt_manual_ddd;
 our $opt_manual_debug;
@@ -1092,6 +1093,7 @@
              'gdb'                      => \$opt_gdb,
              'client-gdb'               => \$opt_client_gdb,
              'manual-gdb'               => \$opt_manual_gdb,
+             'manual-lldb'              => \$opt_manual_lldb,
 	     'boot-gdb'                 => \$opt_boot_gdb,
              'manual-debug'             => \$opt_manual_debug,
              'ddd'                      => \$opt_ddd,
@@ -1548,8 +1550,9 @@
       $opt_debugger= undef;
     }
 
-    if ( $opt_gdb || $opt_ddd || $opt_manual_gdb || $opt_manual_ddd ||
-	 $opt_manual_debug || $opt_debugger || $opt_dbx || $opt_manual_dbx)
+    if ( $opt_gdb || $opt_ddd || $opt_manual_gdb || $opt_manual_lldb || 
+         $opt_manual_ddd || $opt_manual_debug || $opt_debugger || $opt_dbx || 
+         $opt_manual_dbx)
     {
       mtr_error("You need to use the client debug options for the",
 		"embedded server. Ex: --client-gdb");
@@ -1575,9 +1578,9 @@
   # --------------------------------------------------------------------------
   # Check debug related options
   # --------------------------------------------------------------------------
-  if ( $opt_gdb || $opt_client_gdb || $opt_ddd || $opt_client_ddd ||
-       $opt_manual_gdb || $opt_manual_ddd || $opt_manual_debug ||
-       $opt_dbx || $opt_client_dbx || $opt_manual_dbx ||
+  if ( $opt_gdb || $opt_client_gdb || $opt_ddd || $opt_client_ddd || 
+       $opt_manual_gdb || $opt_manual_lldb || $opt_manual_ddd || 
+       $opt_manual_debug || $opt_dbx || $opt_client_dbx || $opt_manual_dbx || 
        $opt_debugger || $opt_client_debugger )
   {
     # Indicate that we are using debugger
@@ -2473,6 +2476,11 @@
   $ENV{'MYSQL_BUG25714'}=  native_path($exe_bug25714);
 
   # ----------------------------------------------------
+  # Get the bin dir
+  # ----------------------------------------------------
+  $ENV{'MYSQL_BIN_PATH'}=  native_path($bindir);
+
+  # ----------------------------------------------------
   # mysql_fix_privilege_tables.sql
   # ----------------------------------------------------
   my $file_mysql_fix_privilege_tables=
@@ -2537,6 +2545,14 @@
 				 "$path_client_bindir/perror");
   $ENV{'MY_PERROR'}= native_path($exe_perror);
 
+  # ----------------------------------------------------
+  # replace
+  # ----------------------------------------------------
+  my $exe_replace= mtr_exe_exists(vs_config_dirs('extra', 'replace'),
+                                 "$basedir/extra/replace",
+                                 "$path_client_bindir/replace");
+  $ENV{'REPLACE'}= native_path($exe_replace);
+
   # Create an environment variable to make it possible
   # to detect that valgrind is being used from test cases
   $ENV{'VALGRIND_TEST'}= $opt_valgrind;
@@ -5158,10 +5174,17 @@
 
   my $found_skip_core= 0;
   my $found_no_console= 0;
+  my $found_log_error= 0;
   foreach my $arg ( @$extra_opts )
   {
     # Skip --defaults-file option since it's handled above.
     next if $arg =~ /^--defaults-file/;
+   
+
+    if ($arg eq "--log-error")
+    {
+      $found_log_error= 1;
+    }
 
     # Allow --skip-core-file to be set in <testname>-[master|slave].opt file
     if ($arg eq "--skip-core-file")
@@ -5192,7 +5215,7 @@
     }
   }
   $opt_skip_core = $found_skip_core;
-  if (IS_WINDOWS && !$found_no_console)
+  if (IS_WINDOWS && !$found_no_console && !$found_log_error)
   {
     # Trick the server to send output to stderr, with --console
     mtr_add_arg($args, "--console");
@@ -5254,6 +5277,10 @@
   {
     gdb_arguments(\$args, \$exe, $mysqld->name());
   }
+  elsif ( $opt_manual_lldb )
+  {
+    lldb_arguments(\$args, \$exe, $mysqld->name());
+  }
   elsif ( $opt_ddd || $opt_manual_ddd )
   {
     ddd_arguments(\$args, \$exe, $mysqld->name());
@@ -6013,6 +6040,24 @@
   return $proc;
 }
 
+sub create_debug_statement {
+  my $args= shift;
+  my $input= shift;
+
+  # Put $args into a single string
+  my $str= join(" ", @$$args);
+  my $runline= $input ? "run $str < $input" : "run $str";
+
+  # add quotes to escape ; in plugin_load option
+  my $pos1 = index($runline, "--plugin_load=");
+  if ( $pos1 != -1 ) {
+    my $pos2 = index($runline, " ",$pos1);
+    substr($runline,$pos1+14,0) = "\"";
+    substr($runline,$pos2+1,0) = "\"";
+  }
+
+  return $runline;
+}
 
 #
 # Modify the exe and args so that program is run in gdb in xterm
@@ -6028,9 +6073,7 @@
   # Remove the old gdbinit file
   unlink($gdb_init_file);
 
-  # Put $args into a single string
-  my $str= join(" ", @$$args);
-  my $runline= $input ? "run $str < $input" : "run $str";
+  my $runline=create_debug_statement($args,$input);
 
   # write init file for mysqld or client
   mtr_tofile($gdb_init_file,
@@ -6066,6 +6109,32 @@
   $$exe= "xterm";
 }
 
+ #
+# Modify the exe and args so that program is run in lldb
+#
+sub lldb_arguments {
+  my $args= shift;
+  my $exe= shift;
+  my $type= shift;
+  my $input= shift;
+
+  my $lldb_init_file= "$opt_vardir/tmp/lldbinit.$type";
+  unlink($lldb_init_file);
+
+  my $runline=create_debug_statement($args,$input);
+
+  # write init file for mysqld or client
+  mtr_tofile($lldb_init_file,
+	     "b main\n" .
+	     $runline);
+
+    print "\nTo start lldb for $type, type in another window:\n";
+    print "cd $glob_mysql_test_dir && lldb -s $lldb_init_file $$exe\n";
+
+    # Indicate the exe should not be started
+    $$exe= undef;
+    return;
+}
 
 #
 # Modify the exe and args so that program is run in ddd
@@ -6081,9 +6150,7 @@
   # Remove the old gdbinit file
   unlink($gdb_init_file);
 
-  # Put $args into a single string
-  my $str= join(" ", @$$args);
-  my $runline= $input ? "run $str < $input" : "run $str";
+  my $runline=create_debug_statement($args,$input);
 
   # write init file for mysqld or client
   mtr_tofile($gdb_init_file,
@@ -6544,6 +6611,8 @@
                         test(s)
   manual-dbx            Let user manually start mysqld in dbx, before running
                         test(s)
+  manual-lldb           Let user manually start mysqld in lldb, before running 
+                        test(s)
   strace-client         Create strace output for mysqltest client, 
   strace-server         Create strace output for mysqltest server, 
   max-save-core         Limit the number of core files saved (to avoid filling
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/alter_table.result percona-xtrabackup-2.3.7/mysql-test/r/alter_table.result
--- percona-xtrabackup-2.2.3/mysql-test/r/alter_table.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/alter_table.result	2017-02-27 07:47:02.000000000 +0000
@@ -1987,3 +1987,561 @@
 ERROR HY000: Storage engine 'InnoDB' does not support system tables. [mysql.help_topic]
 use test;
 # End of Bug#11815557
+#
+# BUG#17246318 - ALTER TABLE SHOULD NOT ALLOW CREATION OF TABLES
+#                WITH BOTH 5.5 AND 5.6 TEMPORALS
+#
+# BUG 18985760 -"FAST" ALTER TABLE CHANGE ON ENUM COLUMN 
+#                TRIGGERS FULL TABLE REBUILD.
+# Test for the case where 'avoid_temporal_upgrade' is set
+# to the DEFAULT value(OFF).
+ALTER TABLE t1 ENGINE= INNODB;
+#ALTER operations using INPLACE algorithm is disallowed
+#since the table contains old temporal type.
+ALTER TABLE t1 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type INPLACE. Try ALGORITHM=COPY.
+ALTER TABLE t1 ADD COLUMN fld4 TIMESTAMP FIRST, ALGORITHM= INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type INPLACE. Try ALGORITHM=COPY.
+ALTER TABLE t1 ADD COLUMN fld4 TIMESTAMP AFTER f_timestamp, ALGORITHM= INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type INPLACE. Try ALGORITHM=COPY.
+ALTER TABLE t1 CHANGE COLUMN f_time fld4 TIMESTAMP, ALGORITHM= INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type INPLACE. Try ALGORITHM=COPY.
+ALTER TABLE t1 MODIFY f_datetime TIME, ALGORITHM= INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type INPLACE. Try ALGORITHM=COPY.
+ALTER TABLE t1 ADD INDEX index1(f_datetime), ALGORITHM= INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type INPLACE. Try ALGORITHM=COPY.
+#ALTER operations using COPY algorithm is allowed
+#when the table contains old temporal type.
+#Note: Timestamp encoding remains the same for the non-fractional part
+#even in the 5.6 format. Hence there is no change in the display before
+#and after upgrade.
+#ADD COLUMN upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= COPY;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#ADD COLUMN FIRST upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP FIRST, ALGORITHM= COPY;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#ADD COLUMN AFTER upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP AFTER f_timestamp, ALGORITHM= COPY;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#CHANGE COLUMN upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 CHANGE COLUMN f_timestamp fld4 TIMESTAMP, ALGORITHM= COPY;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, fld4, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(fld4)) FROM t2;
+f_time	f_datetime	fld4	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(fld4))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#MODIFY COLUMN upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 MODIFY f_timestamp TIME, ALGORITHM= COPY;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	22:22:22	816596	998AAB6596	816596
+DROP TABLE t2;
+#ADD INDEX upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD INDEX index1(f_timestamp), ALGORITHM= COPY;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#ALTER operations using DEFAULT algorithm is allowed
+#when the table contains old temporal type.
+#ADD COLUMN upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= DEFAULT;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#ADD COLUMN FIRST upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP FIRST, ALGORITHM= DEFAULT;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#ADD COLUMN AFTER upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP AFTER f_timestamp, ALGORITHM= DEFAULT;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#CHANGE COLUMN upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 CHANGE COLUMN f_timestamp fld4 DATETIME, ALGORITHM= DEFAULT;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, fld4, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(fld4)) FROM t2;
+f_time	f_datetime	fld4	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(fld4))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	998AAB6596
+DROP TABLE t2;
+#MODIFY COLUMN upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 MODIFY f_timestamp TIME, ALGORITHM= DEFAULT;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	22:22:22	816596	998AAB6596	816596
+DROP TABLE t2;
+#ADD INDEX upgrades the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD INDEX index1(f_timestamp), ALGORITHM= DEFAULT;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#ALTER TABLE FORCE upgrades the old temporal types.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 FORCE;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+DROP TABLE t2;
+#Examples where the NOT NULL/NULL FLAG and DEFAULT values are retained
+#after upgrade.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+#Before upgrade.
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `f_time` time DEFAULT NULL,
+  `f_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `f_datetime` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= COPY;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+#After upgrade.
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `f_time` time DEFAULT NULL,
+  `f_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `f_datetime` datetime DEFAULT NULL,
+  `fld4` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+#Examples of the Alter operation which does not upgrade
+#the temporal formats. 
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+10:10:10	2010-10-10 10:10:10	2031-11-21 17:11:01	818A92	0000124821911312	7468F975
+00:00:00	2000-01-01 01:01:01	2001-01-21 18:11:01	800000	00001230A2EA8AB5	3A6AFC05
+01:01:10	2020-01-01 01:01:01	1980-11-21 18:06:01	80277E	0000125F33D85AB5	147BF1D9
+NULL	2000-01-01 01:01:01	2015-11-21 17:11:01	NULL	00001230A2EA8AB5	56507B75
+00:00:00	NULL	2011-11-21 17:11:01	800000	NULL	4ECA5BF5
+ALTER TABLE t1 DROP COLUMN f_timestamp;
+SELECT f_time, f_datetime, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)) FROM t1;
+f_time	f_datetime	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))
+10:10:10	2010-10-10 10:10:10	818A92	0000124821911312
+00:00:00	2000-01-01 01:01:01	800000	00001230A2EA8AB5
+01:01:10	2020-01-01 01:01:01	80277E	0000125F33D85AB5
+NULL	2000-01-01 01:01:01	NULL	00001230A2EA8AB5
+00:00:00	NULL	800000	NULL
+RENAME TABLE t1 to t3;
+SELECT f_time, f_datetime, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)) FROM t3;
+f_time	f_datetime	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))
+10:10:10	2010-10-10 10:10:10	818A92	0000124821911312
+00:00:00	2000-01-01 01:01:01	800000	00001230A2EA8AB5
+01:01:10	2020-01-01 01:01:01	80277E	0000125F33D85AB5
+NULL	2000-01-01 01:01:01	NULL	00001230A2EA8AB5
+00:00:00	NULL	800000	NULL
+#Once the old temporal type is upgraded to new temporal type,
+#ADD/CHANGE COLUMN, ADD INDEX operations succeed using INPLACE
+#ALGORITHM.
+ALTER TABLE t2 ADD COLUMN fld5 INT, ALGORITHM= INPLACE;
+ALTER TABLE t2 ADD INDEX index2(fld5), ALGORITHM= INPLACE;
+ALTER TABLE t2 CHANGE fld5 fld6 INT, ALGORITHM= INPLACE;
+ALTER TABLE t2 MODIFY fld6 INT, ALGORITHM= INPLACE;
+#Cleanup
+DROP TABLE t2, t3;
+#
+# BUG 18985760 -"FAST" ALTER TABLE CHANGE ON ENUM COLUMN 
+#                TRIGGERS FULL TABLE REBUILD.
+#   
+# To support INPLACE ALTER table operations later in the test.
+ALTER TABLE t1 ENGINE= INNODB;
+#Test cases with the global variable 'avoid_temporal_upgrade'
+#enabled.
+SET @save_avoid_temporal_upgrade= @@global.avoid_temporal_upgrade;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SET GLOBAL avoid_temporal_upgrade= ON;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+#ALTER operations using INPLACE algorithm are allowed
+#when the table contains old temporal type since
+#the global variable 'avoid_temporal_upgrade' is
+#enabled. The old temporal types are not upgraded. 
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= INPLACE;
+SELECT f_time, f_datetime, f_timestamp, fld4, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)),
+HEX(WEIGHT_STRING(fld4)) FROM t2;
+f_time	f_datetime	f_timestamp	fld4	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))	HEX(WEIGHT_STRING(fld4))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	0000-00-00 00:00:00	83640E	0000124A7C3C8A4E	4ECAA4EE	00000000
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld5 TIME DEFAULT '101010' FIRST, ALGORITHM= INPLACE;
+SELECT f_time, f_datetime, f_timestamp, fld5, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)),
+HEX(WEIGHT_STRING(fld5)) FROM t2;
+f_time	f_datetime	f_timestamp	fld5	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))	HEX(WEIGHT_STRING(fld5))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	10:10:10	83640E	0000124A7C3C8A4E	4ECAA4EE	80A28A
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld6 TIMESTAMP AFTER f_timestamp, ALGORITHM= INPLACE;
+SELECT f_time, f_datetime, f_timestamp, fld6, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)),
+HEX(WEIGHT_STRING(fld6)) FROM t2;
+f_time	f_datetime	f_timestamp	fld6	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))	HEX(WEIGHT_STRING(fld6))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	0000-00-00 00:00:00	83640E	0000124A7C3C8A4E	4ECAA4EE	00000000
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD INDEX index1(f_datetime), ALGORITHM= INPLACE;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+DROP TABLE t2;
+#ALTER operations using COPY algorithm are allowed
+#when the table contains old temporal type and 
+#does not upgrade the old temporal types.
+#ADD COLUMN does not upgrade the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+#ADD COLUMN FIRST does not upgrade the old temporal type.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld5 TIMESTAMP FIRST, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+#ADD COLUMN AFTER does not upgrade the old temporal type.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld6 TIMESTAMP AFTER f_timestamp, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+#CHANGE COLUMN upgrades the old temporal type only for the column which
+#is changed.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 CHANGE COLUMN f_datetime fld7 DATETIME, ALGORITHM= COPY;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	4ECAA4EE
+#MODIFY COLUMN upgrades the old temporal type only for the column
+#modified.
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	4ECAA4EE
+ALTER TABLE t2 MODIFY f_timestamp DATETIME, ALGORITHM= COPY;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	998AAB6596
+#ADD INDEX does not upgrade the old temporal type.
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	998AAB6596
+ALTER TABLE t2 ADD INDEX index1(f_time), ALGORITHM= COPY;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	998AAB6596
+DROP TABLE t2;
+#ALTER operations using DEFAULT algorithm are allowed
+#when the table contains old temporal type and does not
+#upgrade the old temporal types.
+#ADD COLUMN does not upgrade the old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+#ADD COLUMN FIRST does not upgrade the old temporal type.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld5 TIMESTAMP FIRST, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+#ADD COLUMN AFTER does not upgrade the old temporal type.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 ADD COLUMN fld6 TIMESTAMP AFTER f_timestamp, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+#CHANGE COLUMN upgrades the old temporal type only for the column which
+#is changed.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 CHANGE COLUMN f_datetime fld7 DATETIME, ALGORITHM= DEFAULT;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	4ECAA4EE
+#MODIFY COLUMN upgrades the old temporal type only for the column
+#modified.
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	4ECAA4EE
+ALTER TABLE t2 MODIFY f_timestamp DATETIME, ALGORITHM= DEFAULT;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	998AAB6596
+#ADD INDEX does not upgrade the old temporal type.
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	998AAB6596
+ALTER TABLE t2 ADD INDEX index1(f_time), ALGORITHM= DEFAULT;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	fld7	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(fld7))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	998AAB6596	998AAB6596
+DROP TABLE t2;
+#ALTER TABLE FORCE does not upgrade the old temporal types.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+ALTER TABLE t2 FORCE;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+DROP TABLE t2;
+SET @@global.avoid_temporal_upgrade= @save_avoid_temporal_upgrade;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+#Test cases with the session variable 'show_old_temporals'
+#enabled.
+#Setup
+CREATE TABLE t2(fld1 time, fld2 datetime, fld3 timestamp);
+SET @save_show_old_temporals= @@session.show_old_temporals;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET SESSION show_old_temporals= ON;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+#Displays a comment to indicate that the columns are of 5.5
+#binary format
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f_time` time /* 5.5 binary format */ DEFAULT NULL,
+  `f_timestamp` timestamp /* 5.5 binary format */ NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `f_datetime` datetime /* 5.5 binary format */ DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+COLUMN_TYPE
+time /* 5.5 binary format */
+timestamp /* 5.5 binary format */
+datetime /* 5.5 binary format */
+#Since the temporal types are in new format, no comment is 
+#displayed
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `fld1` time DEFAULT NULL,
+  `fld2` datetime DEFAULT NULL,
+  `fld3` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t2';
+COLUMN_TYPE
+time
+datetime
+timestamp
+#Does not display the comment for table with old temporal types 
+#since the session variable 'show_old_temporals' is OFF.
+SET SESSION show_old_temporals= OFF;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f_time` time DEFAULT NULL,
+  `f_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `f_datetime` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+COLUMN_TYPE
+time
+timestamp
+datetime
+#Cleanup
+SET @@session.show_old_temporals= @save_show_old_temporals;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+DROP TABLE t1, t2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/bug17076131.result percona-xtrabackup-2.3.7/mysql-test/r/bug17076131.result
--- percona-xtrabackup-2.2.3/mysql-test/r/bug17076131.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/bug17076131.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,12 @@
+#
+# Bug#17076131 MYSQLDUMP FAILS WHEN ERR LOG ON RUNNING SERVER IS
+#              DELETED ON WINDOWS
+#
+# Creating file aliases.
+# Executing mysqldump normally.
+# Removing Error_log file.
+# Executing mysqldump after deleting error_log file.
+# Checking diff of the 2 dumps.
+# No Difference found.
+# Clean Up.
+# End of Test.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/check_auto_permission.result percona-xtrabackup-2.3.7/mysql-test/r/check_auto_permission.result
--- percona-xtrabackup-2.2.3/mysql-test/r/check_auto_permission.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/check_auto_permission.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,3 @@
+CALL mtr.add_suppression("World-writable config file './auto.cnf' is ignored");
+CALL mtr.add_suppression("World-writable config file './auto.cnf' has been removed.");
+include/assert.inc [File permissions should be equl to decimal 432(i.e octal 660).]
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/connect.result percona-xtrabackup-2.3.7/mysql-test/r/connect.result
--- percona-xtrabackup-2.2.3/mysql-test/r/connect.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/connect.result	2017-02-27 07:47:02.000000000 +0000
@@ -81,12 +81,15 @@
 Warnings:
 Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 update mysql.user set password=old_password("gambling2"), plugin="mysql_old_password" where user=_binary"test";
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 flush privileges;
 set password="";
 set password='gambling3';
 ERROR HY000: Password hash should be a 16-digit hexadecimal number
 set password=old_password('gambling3');
 Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 show tables;
 Tables_in_mysql
@@ -252,10 +255,12 @@
 CREATE USER old_pwd@localhost IDENTIFIED WITH 'mysql_old_password';
 SET PASSWORD FOR old_pwd@localhost= OLD_PASSWORD('aha');
 Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 #Expect deprecation warning
 SET PASSWORD FOR old_pwd@localhost = OLD_PASSWORD('aha2');
 Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 #Expect deprecation warning
 GRANT SELECT on test.* TO old_gpwd@localhost 
@@ -266,6 +271,7 @@
 IDENTIFIED WITH 'mysql_old_password';
 SET PASSWORD FOR old_gpwd@localhost= OLD_PASSWORD('aha4');
 Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 #Expected normal flush, no warnings  
 FLUSH PRIVILEGES;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/count_distinct.result percona-xtrabackup-2.3.7/mysql-test/r/count_distinct.result
--- percona-xtrabackup-2.2.3/mysql-test/r/count_distinct.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/count_distinct.result	2017-02-27 07:47:02.000000000 +0000
@@ -94,3 +94,161 @@
 2
 drop table t1;
 drop view v1;
+#
+# Bug#11760197: INCORRECT RESULTS WITH COUNT DISTINCT AND BIG_TABLES
+#
+CREATE TABLE t1 (a INT PRIMARY KEY);
+INSERT INTO t1 VALUES (1),(2);
+SET @big_tables_save= @@big_tables;
+SET SESSION big_tables=0;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+COUNT(DISTINCT t1.a)
+1
+SET SESSION big_tables=1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+COUNT(DISTINCT t1.a)
+1
+DROP TABLE  t1;
+CREATE TABLE t1 (a BLOB ,PRIMARY KEY(a(10)));
+INSERT INTO t1 VALUES (1),(2);
+SET SESSION big_tables=0;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+COUNT(DISTINCT t1.a)
+1
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = '1';
+COUNT(DISTINCT t1.a)
+1
+SET SESSION big_tables=1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+COUNT(DISTINCT t1.a)
+1
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = '1';
+COUNT(DISTINCT t1.a)
+1
+DROP TABLE  t1;
+CREATE TABLE t1 (a CHAR PRIMARY KEY);
+INSERT INTO t1 VALUES (1),(2);
+SET SESSION big_tables=0;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+COUNT(DISTINCT t1.a)
+1
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = '1';
+COUNT(DISTINCT t1.a)
+1
+SET SESSION big_tables=1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+COUNT(DISTINCT t1.a)
+1
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = '1';
+COUNT(DISTINCT t1.a)
+1
+SET SESSION big_tables= @big_tables_save;
+DROP TABLE  t1;
+#
+# BUG#17607155: ASSERTION FAILED: 
+#               ((ITEM_RESULT_FIELD*)ITEM)->RESULT_FIELD
+#
+CREATE TABLE t (a INT)ENGINE=INNODB;
+INSERT t VALUES(1);
+SELECT '' FROM t GROUP BY 1 WITH ROLLUP HAVING GROUP_CONCAT('');
+
+DROP TABLE t;
+#
+# BUG#17957913: ASSERTION `((ITEM_RESULT_FIELD*)ITEM)->RESULT_FIELD'
+#               FAILS IN CREATE_TMP_FIELD
+#
+CREATE TABLE t1 ( i INT );
+INSERT INTO t1 VALUES (1),(2);
+SELECT GROUP_CONCAT(i,'foo') AS f1 FROM t1 GROUP BY 'a' WITH ROLLUP;
+f1
+1foo,2foo
+1foo,2foo
+DROP TABLE t1;
+#
+# Bug #17555462: SELECT DISTINCT OF VIEW WITH CONSTANT STRING
+#                RETURNS WRONG RESULT
+#
+CREATE TABLE t (x char(3));
+INSERT INTO t VALUES ('foo'), ('bar');
+CREATE VIEW v AS SELECT 'x' AS x FROM t;
+SELECT DISTINCT x FROM v;
+x
+x
+DROP TABLE t;
+DROP VIEW v;
+#
+# Bug #17634335 SELECT DISTINCT...GROUP BY RETURNS WRONG
+#               RESULTS IN SOME CASES
+#
+CREATE TABLE t1 (
+a int(11) DEFAULT NULL,
+b int(11) DEFAULT NULL,
+c int(11) DEFAULT NULL
+) ENGINE=InnoDB;
+INSERT INTO t1
+VALUES (1,1,1),(1,2,1),(1,3,0),
+(1,4,0),(2,1,1),(2,2,1),(2,3,0),(2,4,0);
+SELECT DISTINCT a, b
+FROM (SELECT * FROM t1 ORDER BY a, b) AS f
+GROUP BY a,c;
+a	b
+1	3
+1	1
+2	3
+2	1
+SELECT DISTINCT a, b, 0
+FROM (SELECT * FROM t1 ORDER BY a, b) AS f
+GROUP BY a,c;
+a	b	0
+1	3	0
+1	1	0
+2	3	0
+2	1	0
+DROP TABLE t1;
+#
+# Bug #18853696 WRONG RESULT FOR COUNT DISTINCT OF RESULT 
+#               OF JOINED DERIVED TABLE
+#
+CREATE TABLE t1 (
+pk INT NOT NULL,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key)
+);
+INSERT INTO t1 VALUES (10,'x','x');
+INSERT INTO t1 VALUES (11,'d','d');
+INSERT INTO t1 VALUES (12,'r','r');
+INSERT INTO t1 VALUES (13,'f','f');
+INSERT INTO t1 VALUES (14,'y','y');
+CREATE TABLE t2 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_varchar_key VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key)
+);
+INSERT INTO t2 VALUES (1,7,'x');
+SELECT COUNT( DISTINCT table1.col_varchar_key )
+FROM t2 AS table1
+JOIN (SELECT * FROM t1) AS table2
+ON ( table2.pk = table1.col_int_nokey )
+WHERE table1.pk = 1;
+COUNT( DISTINCT table1.col_varchar_key )
+0
+SELECT COUNT( DISTINCT table1.col_varchar_key )
+FROM t2 AS table1
+JOIN t1 AS table2
+ON ( table2.pk = table1.col_int_nokey )
+WHERE table1.pk = 1;
+COUNT( DISTINCT table1.col_varchar_key )
+0
+SELECT COUNT( table1.col_varchar_key )
+FROM t2 AS table1
+JOIN (SELECT * FROM t1) AS table2
+ON ( table2.pk = table1.col_int_nokey )
+WHERE table1.pk = 1;
+COUNT( table1.col_varchar_key )
+0
+DROP TABLE t1,t2;
+# End of test for Bug#18853696
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/create.result percona-xtrabackup-2.3.7/mysql-test/r/create.result
--- percona-xtrabackup-2.2.3/mysql-test/r/create.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/create.result	2017-02-27 07:47:02.000000000 +0000
@@ -318,7 +318,7 @@
 Note	1050	Table 't1' already exists
 show status like "Opened_tables";
 Variable_name	Value
-Opened_tables	2
+Opened_tables	1
 select * from t1;
 a	b
 1	1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ctype_binary.result percona-xtrabackup-2.3.7/mysql-test/r/ctype_binary.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ctype_binary.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ctype_binary.result	2017-02-27 07:47:02.000000000 +0000
@@ -494,7 +494,12 @@
 select old_password('a'), hex(old_password('a'));
 old_password('a')	hex(old_password('a'))
 60671c896665c3fa	36303637316338393636363563336661
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 create table t1 as select old_password('a') as c1;
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2578,6 +2583,8 @@
 charset(@x)	collation(@x)
 binary	binary
 SET @x=old_password('a');
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
 binary	binary
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ctype_cp1251.result percona-xtrabackup-2.3.7/mysql-test/r/ctype_cp1251.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ctype_cp1251.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ctype_cp1251.result	2017-02-27 07:47:02.000000000 +0000
@@ -886,7 +886,12 @@
 select old_password('a'), hex(old_password('a'));
 old_password('a')	hex(old_password('a'))
 60671c896665c3fa	36303637316338393636363563336661
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 create table t1 as select old_password('a') as c1;
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2970,6 +2975,8 @@
 charset(@x)	collation(@x)
 cp1251	cp1251_general_ci
 SET @x=old_password('a');
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
 cp1251	cp1251_general_ci
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ctype_cp932.result percona-xtrabackup-2.3.7/mysql-test/r/ctype_cp932.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ctype_cp932.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ctype_cp932.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,35 @@
+#
+# Bug #11755818 LIKE DOESN'T MATCH WHEN CP932_BIN/SJIS_BIN COLLATIONS ARE 
+#               USED.
+#
+SET @old_character_set_client= @@character_set_client;
+SET @old_character_set_connection= @@character_set_connection;
+SET @old_character_set_results= @@character_set_results;
+SET character_set_client= 'utf8';
+SET character_set_connection= 'utf8';
+SET character_set_results= 'utf8';
+CREATE TABLE t1 (a VARCHAR(10) COLLATE cp932_bin);
+INSERT INTO t1 VALUES('ｶｶ');
+SELECT * FROM t1 WHERE a LIKE '%ｶ';
+a
+ｶｶ
+SELECT * FROM t1 WHERE a LIKE '_ｶ';
+a
+ｶｶ
+SELECT * FROM t1 WHERE a LIKE '%_ｶ';
+a
+ｶｶ
+ALTER TABLE t1 MODIFY a VARCHAR(100) COLLATE sjis_bin;
+SELECT * FROM t1 WHERE a LIKE '%ｶ';
+a
+ｶｶ
+SELECT * FROM t1 WHERE a LIKE '_ｶ';
+a
+ｶｶ
+SELECT * FROM t1 WHERE a LIKE '%_ｶ';
+a
+ｶｶ
+DROP TABLE t1;
+SET @@character_set_client= @old_character_set_client;
+SET @@character_set_connection= @old_character_set_connection;
+SET @@character_set_results= @old_character_set_results;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ctype_latin1.result percona-xtrabackup-2.3.7/mysql-test/r/ctype_latin1.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ctype_latin1.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ctype_latin1.result	2017-02-27 07:47:02.000000000 +0000
@@ -913,7 +913,12 @@
 select old_password('a'), hex(old_password('a'));
 old_password('a')	hex(old_password('a'))
 60671c896665c3fa	36303637316338393636363563336661
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 create table t1 as select old_password('a') as c1;
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2997,6 +3002,8 @@
 charset(@x)	collation(@x)
 latin1	latin1_swedish_ci
 SET @x=old_password('a');
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
 latin1	latin1_swedish_ci
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ctype_ucs.result percona-xtrabackup-2.3.7/mysql-test/r/ctype_ucs.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ctype_ucs.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ctype_ucs.result	2017-02-27 07:47:02.000000000 +0000
@@ -1831,7 +1831,12 @@
 select old_password('a'), hex(old_password('a'));
 old_password('a')	hex(old_password('a'))
 0705298948d1f92f	0030003700300035003200390038003900340038006400310066003900320066
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 create table t1 as select old_password('a') as c1;
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -3915,6 +3920,8 @@
 charset(@x)	collation(@x)
 ucs2	ucs2_general_ci
 SET @x=old_password('a');
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
 ucs2	ucs2_general_ci
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ctype_utf8.result percona-xtrabackup-2.3.7/mysql-test/r/ctype_utf8.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ctype_utf8.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ctype_utf8.result	2017-02-27 07:47:02.000000000 +0000
@@ -2740,7 +2740,12 @@
 select old_password('a'), hex(old_password('a'));
 old_password('a')	hex(old_password('a'))
 60671c896665c3fa	36303637316338393636363563336661
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 create table t1 as select old_password('a') as c1;
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -4824,6 +4829,8 @@
 charset(@x)	collation(@x)
 utf8	utf8_general_ci
 SET @x=old_password('a');
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
 utf8	utf8_general_ci
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ddl_i18n_koi8r.result percona-xtrabackup-2.3.7/mysql-test/r/ddl_i18n_koi8r.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ddl_i18n_koi8r.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ddl_i18n_koi8r.result	2017-02-27 07:47:02.000000000 +0000
@@ -260,7 +260,7 @@
 
 SHOW CREATE PROCEDURE p1|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1		CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
+p1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
 OUT ÐÁÒÁÍ2 CHAR(10))
 BEGIN
@@ -281,7 +281,7 @@
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2		CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
+p2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -302,7 +302,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p3		CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
+p3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
 OUT ÐÁÒÁÍ2 CHAR(10))
 BEGIN
@@ -323,7 +323,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p4		CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
+p4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -376,7 +376,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -394,7 +394,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -412,7 +412,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -430,7 +430,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 
 SET @a = '1'|
@@ -506,7 +506,7 @@
 
 SHOW CREATE PROCEDURE p1|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1		CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
+p1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
 OUT ÐÁÒÁÍ2 CHAR(10))
 BEGIN
@@ -527,7 +527,7 @@
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2		CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
+p2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -548,7 +548,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p3		CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
+p3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
 OUT ÐÁÒÁÍ2 CHAR(10))
 BEGIN
@@ -569,7 +569,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p4		CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
+p4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -622,7 +622,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -640,7 +640,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -658,7 +658,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -676,7 +676,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 
 SET @a = '1'|
@@ -732,7 +732,7 @@
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
@@ -766,7 +766,7 @@
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
@@ -808,7 +808,7 @@
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
@@ -842,7 +842,7 @@
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
@@ -908,7 +908,7 @@
 
 SHOW CREATE PROCEDURE p1|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1		CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
+p1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
 OUT ÐÁÒÁÍ2 CHAR(10))
 BEGIN
@@ -929,7 +929,7 @@
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2		CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
+p2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -950,7 +950,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p3		CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
+p3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT ÐÁÒÁÍ1 CHAR(10),
 OUT ÐÁÒÁÍ2 CHAR(10))
 BEGIN
@@ -971,7 +971,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p4		CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
+p4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT ÐÁÒÁÍ1 CHAR(10) CHARACTER SET utf8,
 OUT ÐÁÒÁÍ2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -1024,7 +1024,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1042,7 +1042,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1060,7 +1060,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1078,7 +1078,7 @@
 @@character_set_client AS c8;
 SET ÐÁÒÁÍ1 = 'a';
 SET ÐÁÒÁÍ2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 
 SET @a = '1'|
@@ -1200,7 +1200,7 @@
 
 SHOW CREATE TRIGGER trg1|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg1		CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+trg1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1216,7 +1216,7 @@
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg2		CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
+trg2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1232,7 +1232,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg3		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
+trg3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1248,7 +1248,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg4		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
+trg4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1276,7 +1276,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	BEFORE	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1288,7 +1288,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	AFTER	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 use mysqltest2|
 
@@ -1305,7 +1305,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	BEFORE	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1317,7 +1317,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	AFTER	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 use mysqltest1|
 
 
@@ -1334,7 +1334,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1349,7 +1349,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1364,7 +1364,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1379,7 +1379,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 
 SET @a1 = '1'|
@@ -1473,7 +1473,7 @@
 
 SHOW CREATE TRIGGER trg1|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg1		CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+trg1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1489,7 +1489,7 @@
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg2		CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
+trg2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1505,7 +1505,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg3		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
+trg3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1521,7 +1521,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg4		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
+trg4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1549,7 +1549,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	BEFORE	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1561,7 +1561,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	AFTER	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 use mysqltest2|
 
@@ -1578,7 +1578,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	BEFORE	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1590,7 +1590,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	AFTER	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 use mysqltest1|
 
 
@@ -1607,7 +1607,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1622,7 +1622,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1637,7 +1637,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1652,7 +1652,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 
 SET @a1 = '1'|
@@ -1750,7 +1750,7 @@
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
@@ -1779,7 +1779,7 @@
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
@@ -1829,7 +1829,7 @@
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
@@ -1858,7 +1858,7 @@
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
@@ -1908,7 +1908,7 @@
 
 SHOW CREATE TRIGGER trg1|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg1		CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+trg1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1924,7 +1924,7 @@
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg2		CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
+trg2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1940,7 +1940,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg3		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
+trg3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1956,7 +1956,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg4		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
+trg4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1984,7 +1984,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	BEFORE	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -1996,7 +1996,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	AFTER	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 use mysqltest2|
 
@@ -2013,7 +2013,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	BEFORE	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(ÐÅÒÅÍ1));
@@ -2025,7 +2025,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	AFTER	NULL		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 use mysqltest1|
 
 
@@ -2042,7 +2042,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2057,7 +2057,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2072,7 +2072,7 @@
 SET @a1 = 'ÔÅËÓÔ';
 SET @a1 =     'ÔÅËÓÔ';
 SET @a2 =  'ÔÅËÓÔ';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2087,7 +2087,7 @@
 SET @b1 = 'ÔÅËÓÔ';
 SET @b1 =     'ÔÅËÓÔ';
 SET @b2 =  'ÔÅËÓÔ';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 
 SET @a1 = '1'|
@@ -2226,7 +2226,7 @@
 
 SHOW CREATE EVENT ev1|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev1	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10);
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2239,7 +2239,7 @@
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev2		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev2	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2252,7 +2252,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2265,7 +2265,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2303,7 +2303,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2316,7 +2316,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2329,7 +2329,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2342,7 +2342,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 
 ALTER DATABASE mysqltest1 COLLATE cp866_general_ci|
@@ -2361,7 +2361,7 @@
 
 SHOW CREATE EVENT ev1|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev1	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10);
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2374,7 +2374,7 @@
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev2		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev2	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2387,7 +2387,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2400,7 +2400,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2438,7 +2438,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2451,7 +2451,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2464,7 +2464,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2477,7 +2477,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 ---> Dump of mysqltest1
 
@@ -2494,7 +2494,7 @@
 /*!50003 SET character_set_results = koi8r */ ;;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = '' */ ;;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2522,7 +2522,7 @@
 /*!50003 SET character_set_results = koi8r */ ;;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = '' */ ;;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2561,7 +2561,7 @@
 /*!50003 SET character_set_results = koi8r */ ;;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = '' */ ;;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2589,7 +2589,7 @@
 /*!50003 SET character_set_results = koi8r */ ;;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = '' */ ;;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev4` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2634,7 +2634,7 @@
 
 SHOW CREATE EVENT ev1|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev1	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10);
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2647,7 +2647,7 @@
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev2		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev2	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2660,7 +2660,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2673,7 +2673,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(ÐÅÒÅÍ1) AS c1,
@@ -2711,7 +2711,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2724,7 +2724,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2737,7 +2737,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2750,7 +2750,7 @@
 COLLATION( 'ÔÅËÓÔ') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 -------------------------------------------------------------------
 DDL statements within stored routine.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ddl_i18n_utf8.result percona-xtrabackup-2.3.7/mysql-test/r/ddl_i18n_utf8.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ddl_i18n_utf8.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ddl_i18n_utf8.result	2017-02-27 07:47:02.000000000 +0000
@@ -260,7 +260,7 @@
 
 SHOW CREATE PROCEDURE p1|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1		CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
+p1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -281,7 +281,7 @@
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2		CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
+p2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -302,7 +302,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p3		CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
+p3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -323,7 +323,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p4		CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
+p4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -376,7 +376,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -394,7 +394,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -412,7 +412,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -430,7 +430,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 
 SET @a = '1'|
@@ -506,7 +506,7 @@
 
 SHOW CREATE PROCEDURE p1|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1		CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
+p1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -527,7 +527,7 @@
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2		CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
+p2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -548,7 +548,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p3		CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
+p3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -569,7 +569,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p4		CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
+p4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -622,7 +622,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -640,7 +640,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -658,7 +658,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -676,7 +676,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 
 SET @a = '1'|
@@ -732,7 +732,7 @@
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT парам1 CHAR(10),
@@ -766,7 +766,7 @@
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
@@ -808,7 +808,7 @@
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT парам1 CHAR(10),
@@ -842,7 +842,7 @@
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
@@ -908,7 +908,7 @@
 
 SHOW CREATE PROCEDURE p1|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1		CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
+p1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -929,7 +929,7 @@
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2		CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
+p2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -950,7 +950,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p3		CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
+p3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -971,7 +971,7 @@
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p4		CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
+p4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -1024,7 +1024,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1042,7 +1042,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1060,7 +1060,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1078,7 +1078,7 @@
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 
 SET @a = '1'|
@@ -1200,7 +1200,7 @@
 
 SHOW CREATE TRIGGER trg1|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg1		CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+trg1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1216,7 +1216,7 @@
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg2		CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
+trg2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1232,7 +1232,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg3		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
+trg3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1248,7 +1248,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg4		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
+trg4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1276,7 +1276,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	BEFORE	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1288,7 +1288,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	AFTER	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 use mysqltest2|
 
@@ -1305,7 +1305,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	BEFORE	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1317,7 +1317,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	AFTER	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 use mysqltest1|
 
 
@@ -1334,7 +1334,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1349,7 +1349,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1364,7 +1364,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1379,7 +1379,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 
 SET @a1 = '1'|
@@ -1473,7 +1473,7 @@
 
 SHOW CREATE TRIGGER trg1|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg1		CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+trg1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1489,7 +1489,7 @@
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg2		CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
+trg2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1505,7 +1505,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg3		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
+trg3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1521,7 +1521,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg4		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
+trg4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1549,7 +1549,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	BEFORE	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1561,7 +1561,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	AFTER	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 use mysqltest2|
 
@@ -1578,7 +1578,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	BEFORE	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1590,7 +1590,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	AFTER	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 use mysqltest1|
 
 
@@ -1607,7 +1607,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1622,7 +1622,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1637,7 +1637,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1652,7 +1652,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 
 SET @a1 = '1'|
@@ -1750,7 +1750,7 @@
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
@@ -1779,7 +1779,7 @@
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
@@ -1829,7 +1829,7 @@
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
@@ -1858,7 +1858,7 @@
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
@@ -1908,7 +1908,7 @@
 
 SHOW CREATE TRIGGER trg1|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg1		CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+trg1	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1924,7 +1924,7 @@
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg2		CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
+trg2	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1940,7 +1940,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg3		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
+trg3	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1956,7 +1956,7 @@
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-trg4		CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
+trg4	NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1984,7 +1984,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	BEFORE	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1996,7 +1996,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	AFTER	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 use mysqltest2|
 
@@ -2013,7 +2013,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	BEFORE	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -2025,7 +2025,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	AFTER	NULL		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	NULL	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 use mysqltest1|
 
 
@@ -2042,7 +2042,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2057,7 +2057,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2072,7 +2072,7 @@
 SET @a1 = 'тек�т';
 SET @a2 =  'тек�т';
 SET @a3 =     'тек�т';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2087,7 +2087,7 @@
 SET @b1 = 'тек�т';
 SET @b2 =  'тек�т';
 SET @b3 =     'тек�т';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 
 SET @a1 = '1'|
@@ -2226,7 +2226,7 @@
 
 SHOW CREATE EVENT ev1|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev1	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10);
 SELECT
 COLLATION(перем1) AS c1,
@@ -2239,7 +2239,7 @@
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev2		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev2	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2252,7 +2252,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2265,7 +2265,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2303,7 +2303,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2316,7 +2316,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2329,7 +2329,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2342,7 +2342,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 
 ALTER DATABASE mysqltest1 COLLATE cp866_general_ci|
@@ -2361,7 +2361,7 @@
 
 SHOW CREATE EVENT ev1|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev1	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10);
 SELECT
 COLLATION(перем1) AS c1,
@@ -2374,7 +2374,7 @@
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev2		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev2	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2387,7 +2387,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2400,7 +2400,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2438,7 +2438,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2451,7 +2451,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2464,7 +2464,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2477,7 +2477,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 ---> Dump of mysqltest1
 
@@ -2494,7 +2494,7 @@
 /*!50003 SET character_set_results = utf8 */ ;;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = '' */ ;;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2522,7 +2522,7 @@
 /*!50003 SET character_set_results = utf8 */ ;;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = '' */ ;;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2561,7 +2561,7 @@
 /*!50003 SET character_set_results = utf8 */ ;;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = '' */ ;;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2589,7 +2589,7 @@
 /*!50003 SET character_set_results = utf8 */ ;;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = '' */ ;;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev4` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2634,7 +2634,7 @@
 
 SHOW CREATE EVENT ev1|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev1	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10);
 SELECT
 COLLATION(перем1) AS c1,
@@ -2647,7 +2647,7 @@
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev2		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev2	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2660,7 +2660,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2673,7 +2673,7 @@
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2711,7 +2711,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2724,7 +2724,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2737,7 +2737,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2750,7 +2750,7 @@
 COLLATION(    'тек�т') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL		NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 -------------------------------------------------------------------
 DDL statements within stored routine.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/debug_sync.result percona-xtrabackup-2.3.7/mysql-test/r/debug_sync.result
--- percona-xtrabackup-2.2.3/mysql-test/r/debug_sync.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/debug_sync.result	2017-02-27 07:47:02.000000000 +0000
@@ -2,7 +2,7 @@
 DROP TABLE IF EXISTS t1;
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: ''
+debug_sync	ON - signals: ''
 SET DEBUG_SYNC='p0 SIGNAL s1 WAIT_FOR s2 TIMEOUT 6 EXECUTE 2 HIT_LIMIT 3';
 SET DEBUG_SYNC='p0 SIGNAL s1 WAIT_FOR s2 TIMEOUT 6 EXECUTE 2';
 SET DEBUG_SYNC='p0 SIGNAL s1 WAIT_FOR s2 TIMEOUT 6           HIT_LIMIT 3';
@@ -150,34 +150,34 @@
 SET DEBUG_SYNC= @myvar;
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'from_myvar'
+debug_sync	ON - signals: 'from_myvar'
 SET DEBUG_SYNC= LEFT('now SIGNAL from_function_cut_here', 24);
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'from_function'
+debug_sync	ON - signals: 'from_function,from_myvar'
 SET DEBUG_SYNC= 'now SIGNAL something';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'something'
+debug_sync	ON - signals: 'from_function,from_myvar,something'
 SET DEBUG_SYNC= 'now WAIT_FOR nothing TIMEOUT 0';
 Warnings:
 Warning	####	debug sync point wait timed out
 SET DEBUG_SYNC= 'now SIGNAL nothing';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'nothing'
+debug_sync	ON - signals: 'from_function,from_myvar,nothing,something'
 SET DEBUG_SYNC= 'now WAIT_FOR nothing TIMEOUT 0';
 SET DEBUG_SYNC= 'now SIGNAL something EXECUTE 0';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 'nothing'
+debug_sync	ON - signals: 'from_function,from_myvar,something'
 SET DEBUG_SYNC= 'now WAIT_FOR anotherthing TIMEOUT 0 EXECUTE 0';
 SET DEBUG_SYNC= 'now HIT_LIMIT 1';
 ERROR HY000: debug sync point hit limit reached
 SET DEBUG_SYNC= 'RESET';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: ''
+debug_sync	ON - signals: ''
 SET DEBUG_SYNC= 'p1abcd   SIGNAL s1 EXECUTE 2';
 SET DEBUG_SYNC= 'p2abc    SIGNAL s2 EXECUTE 2';
 SET DEBUG_SYNC= 'p9abcdef SIGNAL s9 EXECUTE 2';
@@ -190,23 +190,23 @@
 SET DEBUG_SYNC= 'p4a      TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's4'
+debug_sync	ON - signals: 's4'
 SET DEBUG_SYNC= 'p1abcd   TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's1'
+debug_sync	ON - signals: 's1,s4'
 SET DEBUG_SYNC= 'p7       TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's7'
+debug_sync	ON - signals: 's1,s4,s7'
 SET DEBUG_SYNC= 'p9abcdef TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's9'
+debug_sync	ON - signals: 's1,s4,s7,s9'
 SET DEBUG_SYNC= 'p3abcdef TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's3'
+debug_sync	ON - signals: 's1,s3,s4,s7,s9'
 SET DEBUG_SYNC= 'p1abcd   CLEAR';
 SET DEBUG_SYNC= 'p2abc    CLEAR';
 SET DEBUG_SYNC= 'p5abcde  CLEAR';
@@ -219,19 +219,19 @@
 SET DEBUG_SYNC= 'p1abcd   TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's3'
+debug_sync	ON - signals: 's1,s3,s4,s7,s9'
 SET DEBUG_SYNC= 'p7       TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's3'
+debug_sync	ON - signals: 's1,s3,s4,s7,s9'
 SET DEBUG_SYNC= 'p9abcdef TEST';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: 's3'
+debug_sync	ON - signals: 's1,s3,s4,s7,s9'
 SET DEBUG_SYNC= 'RESET';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
-debug_sync	ON - current signal: ''
+debug_sync	ON - signals: ''
 CREATE USER mysqltest_1@localhost;
 GRANT SUPER ON *.* TO mysqltest_1@localhost;
 connection con1, mysqltest_1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/derived.result percona-xtrabackup-2.3.7/mysql-test/r/derived.result
--- percona-xtrabackup-2.2.3/mysql-test/r/derived.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/derived.result	2017-02-27 07:47:02.000000000 +0000
@@ -2010,3 +2010,197 @@
 SET @@SESSION.optimizer_switch= @save_optimizer_switch;
 DROP TABLE t2, t1;
 # End of test for Bug #17814492
+#
+# Bug #18607971 : 5.5 TO 5.6 REGRESSION WITH A SUBQUERY IN THE FROM
+#                 CLAUSE.
+#
+CREATE TABLE t(id INT PRIMARY KEY,
+c1 INT, c2 INT, key(c2)) engine=InnoDB;
+INSERT INTO t(id, c1, c2) VALUES(1, 2, 3), (2, 3, 4), (3, 3, 4), (4, 3, 4);
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+EXPLAIN SELECT * FROM
+(SELECT t1.c1
+FROM t t1 INNER JOIN t t2 ON t1.c1= 3
+GROUP BY t1.c1) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
+2	DERIVED	t2	index	NULL	c2	5	NULL	4	Using index; Using join buffer (Block Nested Loop)
+EXPLAIN SELECT * FROM
+(SELECT t1.id
+FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.id
+GROUP BY t1.id, t2.c2) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	const	PRIMARY	PRIMARY	4	const	1	NULL
+2	DERIVED	t2	const	PRIMARY	PRIMARY	4	const	1	NULL
+EXPLAIN SELECT * FROM
+(SELECT t1.c1
+FROM t t1 INNER JOIN t t2 ON t1.c1= 3 AND t2.c2= 3
+GROUP BY t1.c1) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t2	ref	c2	c2	5	const	1	Using index
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	Using where; Using join buffer (Block Nested Loop)
+EXPLAIN SELECT * FROM
+(SELECT t1.c1
+FROM t t1 INNER JOIN t t2 ON t1.c1= 3 AND t2.c2= 3
+GROUP BY t1.c1, t2.c2) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t2	ref	c2	c2	5	const	1	Using index
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	Using where; Using join buffer (Block Nested Loop)
+EXPLAIN SELECT * FROM
+(SELECT t1.c1
+FROM t t1 INNER JOIN t t2 ON t1.c1= 3 AND t2.c2= 3
+GROUP BY t1.c1, t1.id) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	Using join buffer (Block Nested Loop)
+2	DERIVED	t2	ref	c2	c2	5	const	1	Using index; Using temporary; Using filesort
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	Using where; Using join buffer (Block Nested Loop)
+EXPLAIN SELECT * FROM
+(SELECT t1.id
+FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.c1
+GROUP BY t2.c1, t1.id) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	const	PRIMARY	PRIMARY	4	const	1	NULL
+2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
+EXPLAIN SELECT * FROM
+(SELECT t1.id
+FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.id
+GROUP BY t2.c1, t1.id) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	const	PRIMARY	PRIMARY	4	const	1	NULL
+2	DERIVED	t2	const	PRIMARY	PRIMARY	4	const	1	NULL
+EXPLAIN SELECT * FROM
+(SELECT t1.id
+FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.id
+GROUP BY t2.c2, t1.id) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	const	PRIMARY	PRIMARY	4	const	1	NULL
+2	DERIVED	t2	const	PRIMARY	PRIMARY	4	const	1	NULL
+EXPLAIN SELECT * FROM
+(SELECT t1.id
+FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.id
+GROUP BY t1.id, t2.c2) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	const	PRIMARY	PRIMARY	4	const	1	NULL
+2	DERIVED	t2	const	PRIMARY	PRIMARY	4	const	1	NULL
+EXPLAIN SELECT * FROM
+(SELECT t1.id
+FROM t t1 INNER JOIN t t2 INNER JOIN t t3 ON t1.id=1 AND t1.c1=t2.id AND t2.c1=t3.id
+GROUP BY t1.id, t2.c2, t3.c2) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	const	PRIMARY	PRIMARY	4	const	1	NULL
+2	DERIVED	t2	const	PRIMARY	PRIMARY	4	const	1	NULL
+2	DERIVED	t3	const	PRIMARY	PRIMARY	4	const	1	NULL
+EXPLAIN SELECT * FROM
+(SELECT DISTINCT t1.id
+FROM t t1
+WHERE t1.id= 1) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	const	PRIMARY	PRIMARY	4	const	1	Using index
+EXPLAIN SELECT * FROM
+(SELECT t1.id + 1
+FROM t t1 INNER JOIN t t2 ON t1.id= 1
+GROUP BY t1.id + 1) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	const	PRIMARY	PRIMARY	4	const	1	Using index
+2	DERIVED	t2	index	NULL	c2	5	NULL	4	Using index
+EXPLAIN SELECT * FROM
+(SELECT t1.c1
+FROM t t1 INNER JOIN t t2 ON t1.c1= 3
+GROUP BY 1.5) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
+2	DERIVED	t2	index	NULL	c2	5	NULL	4	Using index; Using join buffer (Block Nested Loop)
+EXPLAIN SELECT * FROM
+(SELECT t1.id
+FROM t t1 INNER JOIN t t2 ON mod(t1.id,1000)= 1
+GROUP BY t1.id) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	16	Using join buffer (Block Nested Loop)
+2	DERIVED	t1	index	PRIMARY,c2	c2	5	NULL	4	Using where; Using index; Using temporary; Using filesort
+2	DERIVED	t2	index	NULL	c2	5	NULL	4	Using index; Using join buffer (Block Nested Loop)
+EXPLAIN SELECT * FROM
+(SELECT t1.id + 1
+FROM t t1 INNER JOIN t t2 ON t1.id + 1= 2
+GROUP BY t1.id + 1) a, t b
+WHERE b.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	b	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t1	index	PRIMARY,c2	c2	5	NULL	4	Using where; Using index
+2	DERIVED	t2	index	NULL	c2	5	NULL	4	Using index; Using join buffer (Block Nested Loop)
+CREATE VIEW v1 AS SELECT c1 a FROM t WHERE c1 = 3;
+CREATE VIEW v2 AS SELECT c2 b FROM t WHERE c2 > 3;
+EXPLAIN SELECT * FROM (SELECT v1.a
+FROM v1 LEFT OUTER JOIN v2 ON v1.a = v2.b
+GROUP BY v1.a) p, t q
+WHERE q.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	q	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t	ALL	NULL	NULL	NULL	NULL	4	Using where
+2	DERIVED	t	ref	c2	c2	5	const	1	Using where; Using index
+DROP VIEW v1;
+CREATE VIEW v1 AS SELECT c1 a FROM t;
+EXPLAIN SELECT * FROM (SELECT v1.a
+FROM v1 LEFT OUTER JOIN v2 ON v1.a = v2.b AND v1.a = 10
+GROUP BY v1.a) p, t q
+WHERE q.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	q	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	Using join buffer (Block Nested Loop)
+2	DERIVED	t	ALL	NULL	NULL	NULL	NULL	4	Using temporary; Using filesort
+2	DERIVED	t	ref	c2	c2	5	func	1	Using where; Using index
+EXPLAIN SELECT * FROM (SELECT v1.a
+FROM v1 LEFT OUTER JOIN v2 ON v1.a = v2.b
+WHERE v1.a = 3
+GROUP BY v1.a) p, t q
+WHERE q.id BETWEEN 1 AND 10;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	NULL
+1	PRIMARY	q	range	PRIMARY	PRIMARY	4	NULL	4	Using where
+2	DERIVED	t	ALL	NULL	NULL	NULL	NULL	4	Using where
+2	DERIVED	t	ref	c2	c2	5	const	1	Using where; Using index
+DROP VIEW v1, v2;
+DROP TABLE t;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/distinct.result percona-xtrabackup-2.3.7/mysql-test/r/distinct.result
--- percona-xtrabackup-2.2.3/mysql-test/r/distinct.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/distinct.result	2017-02-27 07:47:02.000000000 +0000
@@ -212,12 +212,12 @@
 show status like 'Handler_read%';
 Variable_name	Value
 Handler_read_first	1
-Handler_read_key	1
+Handler_read_key	4
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	208
 Handler_read_prev	0
 Handler_read_rnd	0
-Handler_read_rnd_next	2
+Handler_read_rnd_next	1
 explain SELECT distinct t1.a from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	PRIMARY	PRIMARY	4	NULL	4	Using index
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/dynamic_tracing.result percona-xtrabackup-2.3.7/mysql-test/r/dynamic_tracing.result
--- percona-xtrabackup-2.2.3/mysql-test/r/dynamic_tracing.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/dynamic_tracing.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,39 @@
+CREATE PROCEDURE create_table_and_insert_rows()
+BEGIN
+DECLARE count INT;
+SET count = 1;
+SELECT SLEEP(10);
+CREATE TABLE t1 (f1 INT);
+INSERT INTO t1 VALUES (7894);
+WHILE count <= 5 DO
+INSERT INTO t1 SELECT * FROM t1;
+SET count = count + 1;
+END WHILE;
+SET count = 1;
+WHILE count <= 10000 DO
+SELECT SQL_NO_CACHE count(*) from t1;
+SET count = count + 1;
+END WHILE;
+END
+$
+CALL create_table_and_insert_rows();
+SELECT SLEEP(4);
+
+ Dynamic tracing ...... started.
+
+ query-parse-start    : 1
+ query-parse-done     : 1
+ select-start         : 1
+ select-done          : 1
+ net-read-start       : 1
+ net-read-done        : 1
+ handler_rdlock_start : 1
+ handler_rdlock_done  : 1
+
+ Expected probe hits  : 8
+ Actual probe hits    : 8
+
+ Dynamic tracing ...... completed.
+
+DROP TABLE t1;
+DROP PROCEDURE create_table_and_insert_rows;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/file_contents.result percona-xtrabackup-2.3.7/mysql-test/r/file_contents.result
--- percona-xtrabackup-2.2.3/mysql-test/r/file_contents.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/file_contents.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 
 Checking 'INFO_SRC' and 'INFO_BIN'
-INFO_SRC: Found MySQL version number / Found BZR revision id
+INFO_SRC: Found MySQL version number / Found GIT revision id
 INFO_BIN: Found 'Compiler ... used' line / Found 'Feature flags' line
 
 End of tests
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/func_crypt.result percona-xtrabackup-2.3.7/mysql-test/r/func_crypt.result
--- percona-xtrabackup-2.2.3/mysql-test/r/func_crypt.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/func_crypt.result	2017-02-27 07:47:02.000000000 +0000
@@ -20,15 +20,21 @@
 select old_password('abc');
 old_password('abc')
 7cd2b5942be28759
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 select old_password('');
 old_password('')
 
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 select password('gabbagabbahey');
 password('gabbagabbahey')
 *B0F99D2963660DD7E16B751EC9EE2F17B6A68FA6
 select old_password('idkfa');
 old_password('idkfa')
 5c078dc54ca0fcca
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 select length(password('1'));
 length(password('1'))
 41
@@ -41,6 +47,8 @@
 select old_password(NULL);
 old_password(NULL)
 NULL
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 select password(NULL);
 password(NULL)
 
@@ -51,12 +59,16 @@
 select old_password('');
 old_password('')
 
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 select password('idkfa');
 password('idkfa')
 *B669C9DAC3AA6F2254B03CDEF8DFDD6B2D1054BA
 select old_password('idkfa');
 old_password('idkfa')
 5c078dc54ca0fcca
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 set old_passwords=1;
 select password('idkfa');
 password('idkfa')
@@ -64,6 +76,8 @@
 select old_password('idkfa');
 old_password('idkfa')
 5c078dc54ca0fcca
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 set global old_passwords=0;
 select password('idkfa');
 password('idkfa')
@@ -71,6 +85,8 @@
 select old_password('idkfa');
 old_password('idkfa')
 5c078dc54ca0fcca
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 set old_passwords=0;
 select password('idkfa ');
 password('idkfa ')
@@ -84,13 +100,18 @@
 select old_password('idkfa');
 old_password('idkfa')
 5c078dc54ca0fcca
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 select old_password(' i 	 d k f a ');
 old_password(' i 	 d k f a ')
 5c078dc54ca0fcca
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 explain extended select password('idkfa '), old_password('idkfa');
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 Note	1003	/* select#1 */ select password('idkfa ') AS `password('idkfa ')`,old_password('idkfa') AS `old_password('idkfa')`
 select encrypt('1234','_.');
 encrypt('1234','_.')
@@ -104,6 +125,8 @@
 SELECT OLD_PASSWORD(c1), PASSWORD(c1) FROM t1;
 OLD_PASSWORD(c1)	PASSWORD(c1)
 77023ffe214c04ff	*82E58A2C08AAFE72C8EB523069CD8ADB33F78F58
+Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 DROP TABLE t1;
 End of 5.0 tests
 #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/group_min_max_innodb.result percona-xtrabackup-2.3.7/mysql-test/r/group_min_max_innodb.result
--- percona-xtrabackup-2.2.3/mysql-test/r/group_min_max_innodb.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/group_min_max_innodb.result	2017-02-27 07:47:02.000000000 +0000
@@ -119,3 +119,205 @@
 1
 DROP TABLE t1;
 End of 5.5 tests
+#
+# Bug#17909656 - WRONG RESULTS FOR A SIMPLE QUERY WITH GROUP BY
+#
+CREATE TABLE t0 (
+i1 INTEGER NOT NULL
+);
+INSERT INTO t0 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
+(11),(12),(13),(14),(15),(16),(17),(18),(19),(20),
+(21),(22),(23),(24),(25),(26),(27),(28),(29),(30);
+CREATE TABLE t1 (
+c1 CHAR(1) NOT NULL,
+i1 INTEGER NOT NULL,
+i2 INTEGER NOT NULL,
+UNIQUE KEY k1 (c1,i2)
+) ENGINE=InnoDB;
+INSERT INTO t1 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'F',i1,i1 FROM t0;
+CREATE TABLE t2 (
+c1 CHAR(1) NOT NULL,
+i1 INTEGER NOT NULL,
+i2 INTEGER NOT NULL,
+UNIQUE KEY k2 (c1,i1,i2)
+) ENGINE=InnoDB;
+INSERT INTO t2 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'F',i1,i1 FROM t0;
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+set optimizer_trace_max_mem_size=1048576;
+set @@session.optimizer_trace='enabled=on';
+set end_markers_in_json=on;
+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	ROWS	Using where; Using index
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
+GROUP BY c1;
+c1	max(i2)
+C	17
+F	30
+SELECT TRACE RLIKE 'minmax_keypart_in_disjunctive_query'
+AS OK FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+1
+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	ROWS	Using where; Using index
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
+GROUP BY c1;
+c1	max(i2)
+C	30
+F	17
+SELECT TRACE RLIKE 'minmax_keypart_in_disjunctive_query'
+AS OK FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+1
+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	ROWS	Using where; Using index for group-by
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
+GROUP BY c1;
+c1	max(i2)
+C	17
+F	17
+SELECT TRACE RLIKE 'minmax_keypart_in_disjunctive_query'
+AS OK FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+0
+EXPLAIN SELECT c1, max(i2) FROM t1 
+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	ROWS	Using where; Using index
+SELECT c1, max(i2) FROM t1 
+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
+GROUP BY c1;
+c1	max(i2)
+C	30
+SELECT TRACE RLIKE 'minmax_keypart_in_disjunctive_query'
+AS OK FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+1
+EXPLAIN SELECT c1, i1, max(i2) FROM t2
+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
+GROUP BY c1,i1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	k2	k2	5	NULL	ROWS	Using where; Using index
+SELECT c1, i1, max(i2) FROM t2
+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
+GROUP BY c1,i1;
+c1	i1	max(i2)
+C	17	17
+F	17	17
+SELECT TRACE RLIKE 'minmax_keypart_in_disjunctive_query'
+AS OK FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+0
+EXPLAIN SELECT c1, i1, max(i2) FROM t2 
+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
+GROUP BY c1,i1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	k2	k2	5	NULL	ROWS	Using where; Using index
+SELECT c1, i1, max(i2) FROM t2 
+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
+GROUP BY c1,i1;
+c1	i1	max(i2)
+C	17	17
+F	17	17
+SELECT TRACE RLIKE 'minmax_keypart_in_disjunctive_query'
+AS OK FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+0
+EXPLAIN SELECT c1, i1, max(i2) FROM t2 
+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
+GROUP BY c1,i1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	index	k2	k2	9	NULL	ROWS	Using where; Using index
+SELECT c1, i1, max(i2) FROM t2 
+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
+GROUP BY c1,i1;
+c1	i1	max(i2)
+A	17	17
+B	17	17
+C	1	1
+C	2	2
+C	3	3
+C	4	4
+C	5	5
+C	6	6
+C	7	7
+C	8	8
+C	9	9
+C	10	10
+C	11	11
+C	12	12
+C	13	13
+C	14	14
+C	15	15
+C	16	16
+C	17	17
+C	18	18
+C	19	19
+C	20	20
+C	21	21
+C	22	22
+C	23	23
+C	24	24
+C	25	25
+C	26	26
+C	27	27
+C	28	28
+C	29	29
+C	30	30
+D	17	17
+E	17	17
+F	1	1
+F	2	2
+F	3	3
+F	4	4
+F	5	5
+F	6	6
+F	7	7
+F	8	8
+F	9	9
+F	10	10
+F	11	11
+F	12	12
+F	13	13
+F	14	14
+F	15	15
+F	16	16
+F	17	17
+F	18	18
+F	19	19
+F	20	20
+F	21	21
+F	22	22
+F	23	23
+F	24	24
+F	25	25
+F	26	26
+F	27	27
+F	28	28
+F	29	29
+F	30	30
+SELECT TRACE RLIKE 'minmax_keypart_in_disjunctive_query'
+AS OK FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+0
+SET optimizer_trace_max_mem_size=DEFAULT;
+SET optimizer_trace=DEFAULT;
+SET end_markers_in_json=DEFAULT;
+DROP TABLE t0,t1,t2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/group_min_max.result percona-xtrabackup-2.3.7/mysql-test/r/group_min_max.result
--- percona-xtrabackup-2.2.3/mysql-test/r/group_min_max.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/group_min_max.result	2017-02-27 07:47:02.000000000 +0000
@@ -3004,7 +3004,7 @@
 0	NULL
 EXPLAIN SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	a	a	5	NULL	9	Using index for group-by
+1	SIMPLE	t2	index	a	a	15	NULL	16	Using index
 SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
 SUM(DISTINCT a)	MAX(b)
 1	8
@@ -3032,7 +3032,7 @@
 168
 EXPLAIN SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	a	a	5	NULL	9	Using index for group-by
+1	SIMPLE	t2	index	a	a	15	NULL	16	Using index
 SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
 (SUM(DISTINCT a) + MAX(b))
 9
@@ -3060,3 +3060,81 @@
 1	SIMPLE	t1	range	PRIMARY	PRIMARY	5	NULL	9	Using index for group-by (scanning)
 drop table t1;
 # End of test#50539.
+#
+# Bug#17217128 -  BAD INTERACTION BETWEEN MIN/MAX AND
+#                 "HAVING SUM(DISTINCT)": WRONG RESULTS.
+#
+CREATE TABLE t (a INT, b INT, KEY(a,b));
+INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5);
+set optimizer_trace_max_mem_size=1048576;
+set @@session.optimizer_trace='enabled=on';
+set end_markers_in_json=on;
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+a	SUM(DISTINCT a)	MIN(b)
+1	1	0
+2	2	2
+3	3	2
+4	4	4
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	a	a	10	NULL	7	Using index
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+1
+SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+a	SUM(DISTINCT a)	MAX(b)
+1	1	1
+2	2	2
+3	3	3
+4	4	5
+EXPLAIN SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	a	a	10	NULL	7	Using index
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+1
+SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+a	MAX(b)
+1	1
+2	2
+3	3
+4	5
+EXPLAIN SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	a	a	10	NULL	7	Using index
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+1
+SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+SUM(DISTINCT a)	MIN(b)	MAX(b)
+10	0	5
+EXPLAIN SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	a	a	10	NULL	7	Using index
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+1
+SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+a	SUM(DISTINCT a)	MIN(b)	MAX(b)
+1	1	0	1
+2	2	2	2
+3	3	2	3
+4	4	4	5
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	a	a	10	NULL	7	Using index
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+OK
+1
+SET optimizer_trace_max_mem_size=DEFAULT;
+SET optimizer_trace=DEFAULT;
+SET end_markers_in_json=DEFAULT;
+DROP TABLE t;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/have_cp1251.require percona-xtrabackup-2.3.7/mysql-test/r/have_cp1251.require
--- percona-xtrabackup-2.2.3/mysql-test/r/have_cp1251.require	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/have_cp1251.require	2017-02-27 07:47:02.000000000 +0000
@@ -1,2 +1,2 @@
 Collation	Charset	Id	Default	Compiled	Sortlen
-cp1251_general_ci	cp1251	51	Yes		0
+cp1251_general_ci	cp1251	51	Yes	Yes	1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/have_cp866.require percona-xtrabackup-2.3.7/mysql-test/r/have_cp866.require
--- percona-xtrabackup-2.2.3/mysql-test/r/have_cp866.require	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/have_cp866.require	2017-02-27 07:47:02.000000000 +0000
@@ -1,2 +1,2 @@
 Collation	Charset	Id	Default	Compiled	Sortlen
-cp866_general_ci	cp866	36	Yes		0
+cp866_general_ci	cp866	36	Yes	Yes	1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/have_koi8r.require percona-xtrabackup-2.3.7/mysql-test/r/have_koi8r.require
--- percona-xtrabackup-2.2.3/mysql-test/r/have_koi8r.require	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/have_koi8r.require	2017-02-27 07:47:02.000000000 +0000
@@ -1,2 +1,2 @@
 Collation	Charset	Id	Default	Compiled	Sortlen
-koi8r_general_ci	koi8r	7	Yes		0
+koi8r_general_ci	koi8r	7	Yes	Yes	1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/information_schema.result percona-xtrabackup-2.3.7/mysql-test/r/information_schema.result
--- percona-xtrabackup-2.2.3/mysql-test/r/information_schema.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/information_schema.result	2017-02-27 07:47:02.000000000 +0000
@@ -2080,6 +2080,21 @@
 drop database mysqltest;
 use test;
 #
+# Test for bug #16869534 - "QUERYING SUBSET OF COLUMNS DOESN'T USE TABLE
+#                           CACHE; OPENED_TABLES INCREASES"
+#
+SELECT * FROM INFORMATION_SCHEMA.TABLES;
+SELECT VARIABLE_VALUE INTO @val1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+VARIABLE_NAME LIKE 'Opened_tables';
+SELECT ENGINE FROM INFORMATION_SCHEMA.TABLES;
+# The below SELECT query should give same output as above SELECT query.
+SELECT VARIABLE_VALUE INTO @val2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+VARIABLE_NAME LIKE 'Opened_tables';
+# The below select should return '1'
+SELECT @val1 = @val2;
+@val1 = @val2
+1
+#
 # End of 5.5 tests
 #
 #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/innodb_recovery_with_upper_case_names.result percona-xtrabackup-2.3.7/mysql-test/r/innodb_recovery_with_upper_case_names.result
--- percona-xtrabackup-2.2.3/mysql-test/r/innodb_recovery_with_upper_case_names.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/innodb_recovery_with_upper_case_names.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,48 @@
+Bug #18412598  UNCLEAN SYSTEM SHUTDOWN RECOVERY FAILS
+FOR SCHEMA WITH CAPITAL LETTERS
+create database MYDB;
+USE MYDB;
+CREATE TABLE mytable (id int primary key) ENGINE=innodb;
+CREATE TABLE FOO (id int,constraint FOREIGN KEY (id) REFERENCES mytable(id) ON DELETE CASCADE) ENGINE=innodb;
+CREATE TABLE mytable_ref (id int,constraint FOREIGN KEY (id) REFERENCES FOO(id) ON DELETE CASCADE) ENGINE=innodb;
+INSERT INTO mytable VALUES (10),(20),(30),(40);
+INSERT INTO FOO VALUES (20),(10);
+INSERT INTO mytable_ref VALUES (20),(10);
+SHOW VARIABLES LIKE 'innodb_fast_shutdown';
+Variable_name	Value
+innodb_fast_shutdown	2
+START TRANSACTION;
+INSERT INTO mytable VALUES (50);
+INSERT INTO FOO VALUES (50);
+INSERT INTO mytable_ref VALUES (50);
+# Restart the server. This will go into crash recovery mode
+USE MYDB;
+SELECT * FROM mytable;
+id
+10
+20
+30
+40
+SELECT * FROM FOO;
+id
+10
+20
+SELECT * FROM mytable_ref;
+id
+10
+20
+DELETE FROM mytable WHERE id =10;
+SELECT * FROM FOO;
+id
+20
+SELECT * FROM mytable_ref;
+id
+20
+CREATE TABLE MYtable (id int) ENGINE=innodb;
+ERROR 42S01: Table 'mytable' already exists
+CREATE TABLE Foo (id int) ENGINE=innodb;
+ERROR 42S01: Table 'foo' already exists
+DROP TABLE mytable_ref,FOO;
+DROP TABLE mytable;
+use test;
+DROP DATABASE MYDB;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/loaddata.result percona-xtrabackup-2.3.7/mysql-test/r/loaddata.result
--- percona-xtrabackup-2.2.3/mysql-test/r/loaddata.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/loaddata.result	2017-02-27 07:47:02.000000000 +0000
@@ -520,3 +520,15 @@
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;
 End of 5.1 tests
+#
+# Bug#11759519 INFINITE HANG WITH 100% CPU USAGE WITH LOAD DATA LOCAL AND IMPORT ERRORS
+#
+SET @old_mode= @@sql_mode;
+CREATE TABLE t1 (fld1 INT);
+SET sql_mode='strict_all_tables';
+# Without fix, load data hangs forever.
+LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/mysql' REPLACE INTO TABLE t1
+FIELDS TERMINATED BY 't' LINES TERMINATED BY '';
+Got one of the listed errors
+SET @@sql_mode= @old_mode;
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/lock_sync.result percona-xtrabackup-2.3.7/mysql-test/r/lock_sync.result
--- percona-xtrabackup-2.2.3/mysql-test/r/lock_sync.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/lock_sync.result	2017-02-27 07:47:02.000000000 +0000
@@ -752,6 +752,9 @@
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(a INT) engine=InnoDB;
 INSERT INTO t1 VALUES (1), (2);
+# Note: This test now provides coverage for the scenario where
+# opening of table during analyze phase of OPTIMIZE TABLE
+# fails (instead of original coverage for open_ltable() code).
 # Connection con1
 SET SESSION lock_wait_timeout= 1;
 SET DEBUG_SYNC= 'ha_admin_open_ltable SIGNAL opti_recreate WAIT_FOR opti_analyze';
@@ -761,7 +764,7 @@
 SET DEBUG_SYNC= 'now WAIT_FOR opti_recreate';
 SET DEBUG_SYNC= 'after_lock_tables_takes_lock SIGNAL thrlock WAIT_FOR release_thrlock';
 # Sending:
-INSERT INTO t1 VALUES (3);
+LOCK TABLES t1 WRITE;
 # Connection default
 SET DEBUG_SYNC= 'now WAIT_FOR thrlock';
 SET DEBUG_SYNC= 'now SIGNAL opti_analyze';
@@ -775,7 +778,7 @@
 Error	1205	Lock wait timeout exceeded; try restarting transaction
 SET DEBUG_SYNC= 'now SIGNAL release_thrlock';
 # Connection con2
-# Reaping: INSERT INTO t1 VALUES (3)
+# Reaping: LOCK TABLES t1 WRITE
 # Connection default
 DROP TABLE t1;
 SET DEBUG_SYNC= 'RESET';
@@ -814,3 +817,90 @@
 SET DEBUG_SYNC= 'RESET';
 DROP VIEW v1;
 DROP TABLE t1;
+#
+#Bug#18110156: RECREATE+ANALYZE OPTIMIZE TABLE T AND ONLINE 
+#              ALTER TABLE T MAY DEADLOCK
+CREATE TABLE t1 (fld1 INT) ENGINE=InnoDB;
+connection con1;
+SET DEBUG_SYNC= 'before_lock_tables_takes_lock SIGNAL before_thr_lock WAIT_FOR do_thr_lock EXECUTE 3';
+SET DEBUG_SYNC= 'ha_admin_open_ltable SIGNAL opti_recreate WAIT_FOR opti_analyze';
+OPTIMIZE TABLE t1;
+connection con2;
+# Skip thr_lock acquisition during the initial phase of OPTIMIZE TABLE
+SET DEBUG_SYNC= 'now WAIT_FOR before_thr_lock';
+SET DEBUG_SYNC= 'now SIGNAL do_thr_lock';
+# Skip thr_lock acquisition during the recreate phase of OPTIMIZE TABLE
+SET DEBUG_SYNC= 'now WAIT_FOR before_thr_lock';
+SET DEBUG_SYNC= 'now SIGNAL do_thr_lock';
+SET DEBUG_SYNC= 'now WAIT_FOR opti_recreate';
+SET DEBUG_SYNC= 'alter_table_inplace_after_lock_downgrade SIGNAL lock_downgraded
+WAIT_FOR finish_alter';
+ALTER TABLE t1 ADD INDEX index1(fld1), ALGORITHM=INPLACE, LOCK=NONE;
+#Without the patch, the test case hangs.
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR lock_downgraded';
+SET DEBUG_SYNC= 'now SIGNAL opti_analyze';
+SET DEBUG_SYNC= 'now WAIT_FOR before_thr_lock';
+SET DEBUG_SYNC= 'now SIGNAL finish_alter';
+SET DEBUG_SYNC= 'now SIGNAL do_thr_lock';
+#Reap: OPTIMIZE TABLE t1
+connection con1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	status	OK
+#Reap: ALTER TABLE t1
+connection con2;
+#Clean up.
+DROP TABLE t1;
+SET DEBUG_SYNC= 'RESET';
+#
+# Bug#19070633 - POSSIBLE ACCESS TO FREED MEMORY IN IS_FREE_LOCK() AND IS_USED_LOCK().
+#
+# Verifying issue for IS_FREE_LOCK() function.
+SELECT GET_LOCK("lock_19070633", 600);
+GET_LOCK("lock_19070633", 600)
+1
+connect  con1, localhost, root,,;
+# Waiting after getting user level lock info and releasing mutex.
+SET DEBUG_SYNC= 'after_getting_user_level_lock_info SIGNAL parked WAIT_FOR go';
+# Sending: SELECT IS_FREE_LOCK("lock_19070633");
+SELECT IS_FREE_LOCK("lock_19070633");
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR parked';
+SELECT RELEASE_LOCK("lock_19070633");
+RELEASE_LOCK("lock_19070633")
+1
+# Signaling connection con1 after releasing the lock.
+# Without fix, accessing user level lock info in con1 would result in
+# crash or valgrind issue invalid read is reported.
+SET DEBUG_SYNC= 'now SIGNAL go';
+connection con1;
+# Reaping: SELECT IS_FREE_LOCK("lock_19070633");
+IS_FREE_LOCK("lock_19070633")
+0
+connection default;
+# Verifying issue for IS_USED_LOCK() function.
+SELECT GET_LOCK("lock_19070633", 600);
+GET_LOCK("lock_19070633", 600)
+1
+connection con1;
+# Waiting after getting user level lock info and releasing mutex.
+SET DEBUG_SYNC= 'after_getting_user_level_lock_info SIGNAL parked WAIT_FOR go';
+# Sending: SELECT IS_USED_LOCK("lock_19070633");
+SELECT IS_USED_LOCK("lock_19070633");
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR parked';
+SELECT RELEASE_LOCK("lock_19070633");
+RELEASE_LOCK("lock_19070633")
+1
+# Signaling connection con1 after releasing the lock.
+# Without fix, accessing user level lock info in con1 would result in
+# crash or valgrind issue invalid read is reported.
+SET DEBUG_SYNC= 'now SIGNAL go';
+connection con1;
+# Reaping: SELECT IS_USED_LOCK("lock_19070633");
+IS_USED_LOCK("lock_19070633")
+#
+connection default;
+SET DEBUG_SYNC= 'RESET';
+disconnect con1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/log_errchk.result percona-xtrabackup-2.3.7/mysql-test/r/log_errchk.result
--- percona-xtrabackup-2.2.3/mysql-test/r/log_errchk.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/log_errchk.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,10 @@
+call mtr.add_suppression("Could not open");
+# Case 1: Setting fife file to general_log_file and slow_query_log_file
+#         system variable.
+SET GLOBAL general_log_file="MYSQLTEST_VARDIR/tmp/general_log.fifo";;
+ERROR 42000: Variable 'general_log_file' can't be set to the value of 'MYSQLTEST_VARDIR/tmp/general_log.fifo'
+SET GLOBAL slow_query_log_file="MYSQLTEST_VARDIR/tmp/slow_log.fifo";;
+ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of 'MYSQLTEST_VARDIR/tmp/slow_log.fifo'
+# Case 2: Starting server with fifo file as general log file
+#         and slow query log file.
+Setting fifo file as general log file and slow query log failed.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/myisam.result percona-xtrabackup-2.3.7/mysql-test/r/myisam.result
--- percona-xtrabackup-2.2.3/mysql-test/r/myisam.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/myisam.result	2017-02-27 07:47:02.000000000 +0000
@@ -2537,3 +2537,82 @@
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'lhsi'
 DROP TABLE t1;
+#
+# Bug 17156940 THE UPDATE AND SELECT BEHAVE DIFFERENTLY
+#              UNDER THE SAME CONDITIONS.
+#
+CREATE TABLE t1 (
+col1 VARCHAR(255) DEFAULT NULL,
+col1_id INT(11) DEFAULT NULL,
+KEY col1 (col1),
+KEY col1_id (col1_id)
+) ENGINE=MyISAM;
+INSERT INTO t1 (col1, col1_id) VALUES
+('5cm', 10000), ('people', 10000), ('king', 10000), ('queen', 10000),
+('minister', 10000), ('servent', 13000);
+INSERT INTO t1 (col1, col1_id)
+SELECT col1, col1_id FROM t1 WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_id)
+SELECT col1, col1_id FROM t1 WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_id)
+SELECT col1, col1_id FROM t1 WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_id) VALUES
+('5cm ', 10000), ('5cm ', 10000);
+SELECT col1, hex(col1), col1_id, count(*) from t1
+WHERE col1= '5cm' GROUP BY hex(col1), col1_id;
+col1	hex(col1)	col1_id	count(*)
+5cm	35636D	10000	1
+5cm 	35636D20	10000	2
+UPDATE t1 SET col1_id= 1414 WHERE col1= '5cm';
+SELECT count(*) FROM t1 WHERE col1= '5cm';
+count(*)
+3
+SELECT count(*) FROM t1 WHERE col1_id= 1414;
+count(*)
+3
+DELETE FROM t1 WHERE col1= '5cm';
+SELECT count(*) FROM t1 WHERE col1= '5cm';
+count(*)
+0
+DROP TABLE t1;
+# Test for multi column key.
+CREATE TABLE t1 (
+col1 VARCHAR(255) DEFAULT NULL,
+col1_dummy VARCHAR(25) DEFAULT NULL,
+col1_id INT(11) DEFAULT NULL,
+col1_id_dummy INT(10) DEFAULT NULL,
+KEY col1 (col1, col1_dummy),
+KEY col1_id (col1, col1_id_dummy)
+) ENGINE=MyISAM;
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy) VALUES
+('5cm', '5cm' , 10000, 100), ('people', 'people', 10000, 100),
+('king', 'king' , 10000, 100), ('queen', 'queen', 10000, 100),
+('minister', 'minister', 10000, 100), ('servent', 'servent', 13000, 100);
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy)
+SELECT col1, col1_dummy, col1_id, col1_id_dummy FROM t1
+WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy)
+SELECT col1, col1_dummy, col1_id, col1_id_dummy FROM t1
+WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy)
+SELECT col1, col1_dummy, col1_id, col1_id_dummy FROM t1
+WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy) VALUES
+('5cm ', '5cm ',  10000, 100), ('5cm ', '5cm ', 10000, 100);
+SELECT col1, hex(col1), col1_id, count(*) from t1 WHERE col1= '5cm'
+  GROUP BY hex(col1), col1_id;
+col1	hex(col1)	col1_id	count(*)
+5cm	35636D	10000	1
+5cm 	35636D20	10000	2
+UPDATE t1 SET col1_id= 1414 WHERE col1= '5cm' AND col1_dummy= '5cm';
+SELECT count(*) FROM t1 WHERE col1= '5cm';
+count(*)
+3
+SELECT count(*) FROM t1 WHERE col1_id= 1414;
+count(*)
+3
+DELETE FROM t1 WHERE col1= '5cm' AND col1_dummy= '5cm';
+SELECT count(*) FROM t1 WHERE col1= '5cm';
+count(*)
+0
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/mysqlbinlog_debug.result percona-xtrabackup-2.3.7/mysql-test/r/mysqlbinlog_debug.result
--- percona-xtrabackup-2.2.3/mysql-test/r/mysqlbinlog_debug.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/mysqlbinlog_debug.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,7 @@
+#
+# Bug#18742916 : MYSQLBINLOG --RAW DOES NOT CHECK FOR ERRORS
+#
+ERROR: Could not write into log file 'MYSQLTEST_VARDIR/tmp/master-bin.000001'
+ERROR: Could not write into log file 'MYSQLTEST_VARDIR/tmp/master-bin.000001'
+
+End of tests
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/mysqlbinlog_mixed_or_statment.result percona-xtrabackup-2.3.7/mysql-test/r/mysqlbinlog_mixed_or_statment.result
--- percona-xtrabackup-2.2.3/mysql-test/r/mysqlbinlog_mixed_or_statment.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/mysqlbinlog_mixed_or_statment.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+#
+# Bug#18913551 - LOCK TABLES USES INCORRECT LOCK FOR IMPLICITLY USED
+#                TABLES.
+#
+SET @org_concurrent_insert= @@global.concurrent_insert;
+SET @@global.concurrent_insert=1;
+CREATE TABLE t1(a INT) ENGINE=MyISAM;
+CREATE FUNCTION f1() RETURNS INT RETURN (SELECT MIN(a) FROM t1);
+CREATE VIEW v1 AS (SELECT 1 FROM dual WHERE f1() = 1);
+LOCK TABLE v1 READ;
+connect  con1, localhost, root;
+SET lock_wait_timeout=1;
+# With fix, con1 does not get lock on table "t1" so following insert
+# operation fails after waiting for "lock_wait_timeout" duration.
+INSERT INTO t1 VALUES (1);
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+connection default;
+UNLOCK TABLES;
+# V1 should be empty here.
+SELECT * FROM v1;
+1
+disconnect con1;
+SET @@global.concurrent_insert= @org_concurrent_insert;
+DROP TABLE t1;
+DROP VIEW v1;
+DROP FUNCTION f1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/mysql_config_editor.result percona-xtrabackup-2.3.7/mysql-test/r/mysql_config_editor.result
--- percona-xtrabackup-2.2.3/mysql-test/r/mysql_config_editor.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/mysql_config_editor.result	2017-02-27 07:47:02.000000000 +0000
@@ -100,7 +100,7 @@
 ##############################################
 # Tests for mysql_config_editor's help command
 ##############################################
-Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 
 Oracle is a registered trademark of Oracle Corporation and/or its
 affiliates. Other names may be trademarks of their respective
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/mysqld--help-notwin.result percona-xtrabackup-2.3.7/mysql-test/r/mysqld--help-notwin.result
--- percona-xtrabackup-2.2.3/mysql-test/r/mysqld--help-notwin.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/mysqld--help-notwin.result	2017-02-27 07:47:02.000000000 +0000
@@ -28,6 +28,12 @@
  --automatic-sp-privileges 
  Creating and dropping stored procedures alters ACLs
  (Defaults to on; use --skip-automatic-sp-privileges to disable.)
+ --avoid-temporal-upgrade 
+ When this option is enabled, the pre-5.6.4 temporal types
+ are not upgraded to the new format for ALTER TABLE
+ requests ADD/CHANGE/MODIFY COLUMN, ADD INDEX or FORCE
+ operation. This variable is deprecated and will be
+ removed in a future release.
  --back-log=#        The number of outstanding connection requests MySQL can
  have. This comes into play when the main MySQL thread
  gets very many connection requests in a very short time
@@ -56,6 +62,10 @@
  --binlog-do-db=name Tells the master it should log updates for the specified
  database, and exclude all others not explicitly
  mentioned.
+ --binlog-error-action=name 
+ When statements cannot be written to the binary log due
+ to a fatal error, the server can either ignore the error
+ and let the master continue, or abort.
  --binlog-format=name 
  What form of binary logging the master will use: either
  ROW for row-based binary logging, STATEMENT for
@@ -68,6 +78,19 @@
  binlog-format is MIXED, the format switches to row-based
  and back implicitly per each query accessing an
  NDBCLUSTER table
+ --binlog-gtid-simple-recovery 
+ If this option is enabled, the server does not scan more
+ than one binary log for every iteration when initializing
+ GTID sets on server restart. Enabling this option is very
+ useful when restarting a server which has already
+ generated lots of binary logs without GTID events. Note:
+ If this option is enabled, GLOBAL.GTID_EXECUTED and
+ GLOBAL.GTID_PURGED cannot be initialized correctly if
+ binary log(s) with GTID events were generated before
+ binary log(s) without GTID events, for example if
+ gtid_mode is disabled when the server has already
+ generated binary log(s) with GTID events and not purged
+ them.
  --binlog-ignore-db=name 
  Tells the master that updates to the given database
  should not be logged to the binary log.
@@ -103,6 +126,12 @@
  non-transactional engines for the binary log. If you
  often use statements updating a great number of rows, you
  can increase this to get more performance
+ --binlogging-impossible-mode=name 
+ On a fatal error when statements cannot be binlogged the
+ behaviour can be ignore the error and let the master
+ continue or abort the server. This variable is deprecated
+ and will be removed in a future release. Please use
+ binlog_error_action instead.
  --block-encryption-mode=name 
  mode for AES_ENCRYPT/AES_DECRYPT
  --bootstrap         Used by mysql installation scripts.
@@ -386,6 +415,8 @@
  INSERT DELAYED statements. If set to zero INSERT DELAYED
  will be not used.This variable is deprecated along with
  INSERT DELAYED.
+ --max-digest-length=# 
+ Maximum length considered for digest text.
  --max-error-count=# Max number of errors/warnings to store for a statement
  --max-heap-table-size=# 
  Don't allow creation of heap tables bigger than this
@@ -477,8 +508,8 @@
  If this is not 0, then mysqld will use this value to
  reserve file descriptors to use with setrlimit(). If this
  value is 0 then mysqld will reserve max_connections*5 or
- max_connections + table_cache*2 (whichever is larger)
- number of file descriptors
+ max_connections + table_open_cache*2 (whichever is
+ larger) number of file descriptors
  --optimizer-prune-level=# 
  Controls the heuristic(s) applied during query
  optimization to prune less-promising partial plans from
@@ -808,9 +839,17 @@
  --server-id=#       Uniquely identifies the server instance in the community
  of replication partners
  --server-id-bits=#  Set number of significant bits in server-id
+ --show-old-temporals 
+ When this option is enabled, the pre-5.6.4 temporal types
+ will be marked in the 'SHOW CREATE TABLE' and
+ 'INFORMATION_SCHEMA.COLUMNS' table as a comment in
+ COLUMN_TYPE field. This variable is deprecated and will
+ be removed in a future release.
  --show-slave-auth-info 
  Show user and password in SHOW SLAVE HOSTS on this
  master.
+ --simplified-binlog-gtid-recovery 
+ Alias for @@binlog_gtid_simple_recovery. Deprecated
  --skip-grant-tables Start without grant tables. This gives all users FULL
  ACCESS to all tables.
  --skip-host-cache   Don't cache host names.
@@ -950,8 +989,8 @@
  one-thread-per-connection, no-threads, loaded-dynamically
  --thread-stack=#    The stack size for each thread
  --time-format=name  The TIME format (ignored)
- --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
- currently supported)
+ --timed-mutexes     Specify whether to time mutexes. Deprecated, has no
+ effect.
  --tmp-table-size=#  If an internal in-memory temporary table exceeds this
  size, MySQL will automatically convert it to an on-disk
  MyISAM table
@@ -993,19 +1032,23 @@
 auto-increment-offset 1
 autocommit TRUE
 automatic-sp-privileges TRUE
+avoid-temporal-upgrade FALSE
 back-log 80
 big-tables FALSE
 bind-address *
 binlog-cache-size 32768
 binlog-checksum CRC32
 binlog-direct-non-transactional-updates FALSE
+binlog-error-action IGNORE_ERROR
 binlog-format STATEMENT
+binlog-gtid-simple-recovery FALSE
 binlog-max-flush-queue-time 0
 binlog-order-commits TRUE
 binlog-row-event-max-size 8192
 binlog-row-image FULL
 binlog-rows-query-log-events FALSE
 binlog-stmt-cache-size 32768
+binlogging-impossible-mode IGNORE_ERROR
 block-encryption-mode aes-128-ecb
 bulk-insert-buffer-size 8388608
 character-set-client-handshake TRUE
@@ -1101,6 +1144,7 @@
 max-connect-errors 100
 max-connections 151
 max-delayed-threads 20
+max-digest-length 1024
 max-error-count 64
 max-heap-table-size 16777216
 max-join-size 18446744073709551615
@@ -1221,7 +1265,9 @@
 secure-file-priv (No default value)
 server-id 0
 server-id-bits 32
+show-old-temporals FALSE
 show-slave-auth-info FALSE
+simplified-binlog-gtid-recovery FALSE
 skip-grant-tables TRUE
 skip-name-resolve FALSE
 skip-networking FALSE
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/mysqld--help-win.result percona-xtrabackup-2.3.7/mysql-test/r/mysqld--help-win.result
--- percona-xtrabackup-2.2.3/mysql-test/r/mysqld--help-win.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/mysqld--help-win.result	2017-02-27 07:47:02.000000000 +0000
@@ -28,6 +28,12 @@
  --automatic-sp-privileges 
  Creating and dropping stored procedures alters ACLs
  (Defaults to on; use --skip-automatic-sp-privileges to disable.)
+ --avoid-temporal-upgrade 
+ When this option is enabled, the pre-5.6.4 temporal types
+ are not upgraded to the new format for ALTER TABLE
+ requests ADD/CHANGE/MODIFY COLUMN, ADD INDEX or FORCE
+ operation. This variable is deprecated and will be
+ removed in a future release.
  --back-log=#        The number of outstanding connection requests MySQL can
  have. This comes into play when the main MySQL thread
  gets very many connection requests in a very short time
@@ -56,6 +62,10 @@
  --binlog-do-db=name Tells the master it should log updates for the specified
  database, and exclude all others not explicitly
  mentioned.
+ --binlog-error-action=name 
+ When statements cannot be written to the binary log due
+ to a fatal error, the server can either ignore the error
+ and let the master continue, or abort.
  --binlog-format=name 
  What form of binary logging the master will use: either
  ROW for row-based binary logging, STATEMENT for
@@ -68,6 +78,19 @@
  binlog-format is MIXED, the format switches to row-based
  and back implicitly per each query accessing an
  NDBCLUSTER table
+ --binlog-gtid-simple-recovery 
+ If this option is enabled, the server does not scan more
+ than one binary log for every iteration when initializing
+ GTID sets on server restart. Enabling this option is very
+ useful when restarting a server which has already
+ generated lots of binary logs without GTID events. Note:
+ If this option is enabled, GLOBAL.GTID_EXECUTED and
+ GLOBAL.GTID_PURGED cannot be initialized correctly if
+ binary log(s) with GTID events were generated before
+ binary log(s) without GTID events, for example if
+ gtid_mode is disabled when the server has already
+ generated binary log(s) with GTID events and not purged
+ them.
  --binlog-ignore-db=name 
  Tells the master that updates to the given database
  should not be logged to the binary log.
@@ -103,6 +126,12 @@
  non-transactional engines for the binary log. If you
  often use statements updating a great number of rows, you
  can increase this to get more performance
+ --binlogging-impossible-mode=name 
+ On a fatal error when statements cannot be binlogged the
+ behaviour can be ignore the error and let the master
+ continue or abort the server. This variable is deprecated
+ and will be removed in a future release. Please use
+ binlog_error_action instead.
  --block-encryption-mode=name 
  mode for AES_ENCRYPT/AES_DECRYPT
  --bootstrap         Used by mysql installation scripts.
@@ -385,6 +414,8 @@
  INSERT DELAYED statements. If set to zero INSERT DELAYED
  will be not used.This variable is deprecated along with
  INSERT DELAYED.
+ --max-digest-length=# 
+ Maximum length considered for digest text.
  --max-error-count=# Max number of errors/warnings to store for a statement
  --max-heap-table-size=# 
  Don't allow creation of heap tables bigger than this
@@ -477,8 +508,8 @@
  If this is not 0, then mysqld will use this value to
  reserve file descriptors to use with setrlimit(). If this
  value is 0 then mysqld will reserve max_connections*5 or
- max_connections + table_cache*2 (whichever is larger)
- number of file descriptors
+ max_connections + table_open_cache*2 (whichever is
+ larger) number of file descriptors
  --optimizer-prune-level=# 
  Controls the heuristic(s) applied during query
  optimization to prune less-promising partial plans from
@@ -811,9 +842,17 @@
  --shared-memory     Enable the shared memory
  --shared-memory-base-name=name 
  Base name of shared memory
+ --show-old-temporals 
+ When this option is enabled, the pre-5.6.4 temporal types
+ will be marked in the 'SHOW CREATE TABLE' and
+ 'INFORMATION_SCHEMA.COLUMNS' table as a comment in
+ COLUMN_TYPE field. This variable is deprecated and will
+ be removed in a future release.
  --show-slave-auth-info 
  Show user and password in SHOW SLAVE HOSTS on this
  master.
+ --simplified-binlog-gtid-recovery 
+ Alias for @@binlog_gtid_simple_recovery. Deprecated
  --skip-grant-tables Start without grant tables. This gives all users FULL
  ACCESS to all tables.
  --skip-host-cache   Don't cache host names.
@@ -958,8 +997,8 @@
  one-thread-per-connection, no-threads, loaded-dynamically
  --thread-stack=#    The stack size for each thread
  --time-format=name  The TIME format (ignored)
- --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
- currently supported)
+ --timed-mutexes     Specify whether to time mutexes. Deprecated, has no
+ effect.
  --tmp-table-size=#  If an internal in-memory temporary table exceeds this
  size, MySQL will automatically convert it to an on-disk
  MyISAM table
@@ -1001,19 +1040,23 @@
 auto-increment-offset 1
 autocommit TRUE
 automatic-sp-privileges TRUE
+avoid-temporal-upgrade FALSE
 back-log 80
 big-tables FALSE
 bind-address *
 binlog-cache-size 32768
 binlog-checksum CRC32
 binlog-direct-non-transactional-updates FALSE
+binlog-error-action IGNORE_ERROR
 binlog-format STATEMENT
+binlog-gtid-simple-recovery FALSE
 binlog-max-flush-queue-time 0
 binlog-order-commits TRUE
 binlog-row-event-max-size 8192
 binlog-row-image FULL
 binlog-rows-query-log-events FALSE
 binlog-stmt-cache-size 32768
+binlogging-impossible-mode IGNORE_ERROR
 block-encryption-mode aes-128-ecb
 bulk-insert-buffer-size 8388608
 character-set-client-handshake TRUE
@@ -1108,6 +1151,7 @@
 max-connect-errors 100
 max-connections 151
 max-delayed-threads 20
+max-digest-length 1024
 max-error-count 64
 max-heap-table-size 16777216
 max-join-size 18446744073709551615
@@ -1231,7 +1275,9 @@
 server-id-bits 32
 shared-memory FALSE
 shared-memory-base-name MYSQL
+show-old-temporals FALSE
 show-slave-auth-info FALSE
+simplified-binlog-gtid-recovery FALSE
 skip-grant-tables TRUE
 skip-name-resolve FALSE
 skip-networking FALSE
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/mysqldump.result percona-xtrabackup-2.3.7/mysql-test/r/mysqldump.result
--- percona-xtrabackup-2.2.3/mysql-test/r/mysqldump.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/mysqldump.result	2017-02-27 07:47:02.000000000 +0000
@@ -1987,11 +1987,9 @@
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v2` (
-  `a` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v2` AS SELECT 
+ 1 AS `a`*/;
 SET character_set_client = @saved_cs_client;
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -2081,11 +2079,9 @@
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v1` (
-  `a` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v1` AS SELECT 
+ 1 AS `a`*/;
 SET character_set_client = @saved_cs_client;
-/*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -2155,11 +2151,9 @@
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v2` (
-  `a` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v2` AS SELECT 
+ 1 AS `a`*/;
 SET character_set_client = @saved_cs_client;
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -2269,31 +2263,27 @@
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v1` (
-  `a` tinyint NOT NULL,
-  `b` tinyint NOT NULL,
-  `c` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v1` AS SELECT 
+ 1 AS `a`,
+ 1 AS `b`,
+ 1 AS `c`*/;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v2` (
-  `a` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v2` AS SELECT 
+ 1 AS `a`*/;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v3`;
 /*!50001 DROP VIEW IF EXISTS `v3`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v3` (
-  `a` tinyint NOT NULL,
-  `b` tinyint NOT NULL,
-  `c` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v3` AS SELECT 
+ 1 AS `a`,
+ 1 AS `b`,
+ 1 AS `c`*/;
 SET character_set_client = @saved_cs_client;
-/*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -2307,7 +2297,6 @@
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -2321,7 +2310,6 @@
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
-/*!50001 DROP TABLE IF EXISTS `v3`*/;
 /*!50001 DROP VIEW IF EXISTS `v3`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -3026,35 +3014,31 @@
 /*!50001 DROP VIEW IF EXISTS `v0`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v0` (
-  `a` tinyint NOT NULL,
-  `b` tinyint NOT NULL,
-  `c` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v0` AS SELECT 
+ 1 AS `a`,
+ 1 AS `b`,
+ 1 AS `c`*/;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v1` (
-  `a` tinyint NOT NULL,
-  `b` tinyint NOT NULL,
-  `c` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v1` AS SELECT 
+ 1 AS `a`,
+ 1 AS `b`,
+ 1 AS `c`*/;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v2` (
-  `a` tinyint NOT NULL,
-  `b` tinyint NOT NULL,
-  `c` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v2` AS SELECT 
+ 1 AS `a`,
+ 1 AS `b`,
+ 1 AS `c`*/;
 SET character_set_client = @saved_cs_client;
 
 USE `test`;
-/*!50001 DROP TABLE IF EXISTS `v0`*/;
 /*!50001 DROP VIEW IF EXISTS `v0`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -3068,7 +3052,6 @@
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
-/*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -3082,7 +3065,6 @@
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -3320,7 +3302,7 @@
 create view v1 as select qty, price, qty*price as value from t;
 create view v2 as select qty from v1;
 mysqldump {
-/*!50001 DROP TABLE IF EXISTS `v1`*/;
+/*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
 /*!50001 SET @saved_col_connection     = @@collation_connection */;
@@ -3335,7 +3317,7 @@
 /*!50001 SET collation_connection      = @saved_col_connection */;
 
 } mysqldump {
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
+/*!50001 DROP VIEW IF EXISTS `v2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
 /*!50001 SET @saved_col_connection     = @@collation_connection */;
@@ -3428,13 +3410,11 @@
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v1` (
-  `id` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v1` AS SELECT 
+ 1 AS `id`*/;
 SET character_set_client = @saved_cs_client;
 
 USE `mysqldump_test_db`;
-/*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -3488,15 +3468,14 @@
 USE `mysqldump_views`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `nasishnasifu` (
-  `id` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `nasishnasifu` AS SELECT 
+ 1 AS `id`*/;
 SET character_set_client = @saved_cs_client;
 
 USE `mysqldump_tables`;
 
 USE `mysqldump_views`;
-/*!50001 DROP TABLE IF EXISTS `nasishnasifu`*/;
+/*!50001 DROP VIEW IF EXISTS `nasishnasifu`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
 /*!50001 SET @saved_col_connection     = @@collation_connection */;
@@ -3881,11 +3860,9 @@
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v2` (
-  `c` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v2` AS SELECT 
+ 1 AS `c`*/;
 SET character_set_client = @saved_cs_client;
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -4298,13 +4275,11 @@
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE TABLE `v1` (
-  `id` tinyint NOT NULL
-) ENGINE=MyISAM */;
+/*!50001 CREATE VIEW `v1` AS SELECT 
+ 1 AS `id`*/;
 SET character_set_client = @saved_cs_client;
 
 USE `mysqldump_test_db`;
-/*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -5409,3 +5384,23 @@
 #
 # End of 5.1 tests
 #
+#
+#BUG#17477959 - VIEW COLUMNS EXCEED TABLE LIMITS
+#
+CREATE VIEW v1 AS SELECT 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit1, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit2, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit3, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit4, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit5, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit6, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit7, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit8, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit9, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit10, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit11, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit12, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit13, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit14, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit15, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit16, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit17, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit18, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit19, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit20, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit21, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit22, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit23, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit24, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit25, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit26, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit27, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit28, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit29, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit30, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit31, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit32, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit33, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit34, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit35, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit36, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit37, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit38, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit39, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit40, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit41, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit42, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit43, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit44, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit45, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit46, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit47, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit48, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit49, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit50, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit51, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit52, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit53, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit54, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit55, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit56, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit57, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit58, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit59, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit60, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit61, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit62, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit63, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit64, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit65, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit66, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit67, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit68, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit69, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit70, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit71, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit72, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit73, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit74, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit75, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit76, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit77, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit78, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit79, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit80, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit81, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit82, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit83, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit84, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit85, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit86, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit87, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit88, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit89, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit90, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit91, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit92, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit93, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit94, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit95, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit96, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit97, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit98, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit99, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit100, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit101, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit102, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit103, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit104, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit105, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit106, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit107, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit108, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit109, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit110, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit111, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit112, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit113, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit114, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit115, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit116, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit117, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit118, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit119, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit120, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit121, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit122, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit123, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit124, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit125, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit126, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit127, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit128, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit129, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit130, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit131, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit132, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit133, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit134, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit135, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit136, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit137, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit138, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit139, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit140, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit141, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit142, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit143, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit144, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit145, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit146, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit147, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit148, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit149, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit150, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit151, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit152, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit153, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit154, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit155, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit156, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit157, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit158, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit159, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit160, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit161, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit162, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit163, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit164, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit165, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit166, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit167, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit168, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit169, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit170, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit171, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit172, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit173, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit174, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit175, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit176, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit177, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit178, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit179, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit180, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit181, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit182, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit183, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit184, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit185, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit186, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit187, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit188, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit189, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit190, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit191, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit192, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit193, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit194, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit195, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit196, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit197, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit198, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit199, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit200, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit201, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit202, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit203, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit204, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit205, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit206, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit207, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit208, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit209, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit210, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit211, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit212, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit213, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit214, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit215, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit216, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit217, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit218, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit219, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit220, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit221, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit222, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit223, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit224, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit225, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit226, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit227, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit228, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit229, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit230, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit231, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit232, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit233, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit234, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit235, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit236, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit237, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit238, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit239, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit240, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit241, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit242, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit243, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit244, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit245, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit246, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit247, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit248, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit249, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit250, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit251, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit252, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit253, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit254, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit255, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit256, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit257, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit258, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit259, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit260, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit261, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit262, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit263, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit264, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit265, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit266, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit267, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit268, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit269, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit270, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit271, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit272, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit273, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit274, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit275, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit276, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit277, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit278, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit279, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit280, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit281, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit282, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit283, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit284, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit285, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit286, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit287, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit288, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit289, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit290, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit291, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit292, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit293, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit294, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit295, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit296, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit297, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit298, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit299, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit300, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit301, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit302, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit303, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit304, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit305, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit306, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit307, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit308, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit309, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit310, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit311, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit312, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit313, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit314, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit315, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit316, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit317, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit318, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit319, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit320, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit321, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit322, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit323, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit324, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit325, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit326, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit327, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit328, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit329, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit330, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit331, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit332, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit333, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit334, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit335, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit336, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit337, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit338, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit339, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit340, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit341, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit342, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit343, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit344, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit345, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit346, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit347, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit348, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit349, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit350, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit351, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit352, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit353, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit354, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit355, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit356, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit357, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit358, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit359, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit360, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit361, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit362, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit363, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit364, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit365, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit366, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit367, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit368, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit369, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit370, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit371, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit372, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit373, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit374, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit375, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit376, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit377, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit378, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit379, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit380, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit381, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit382, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit383, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit384, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit385, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit386, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit387, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit388, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit389, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit390, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit391, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit392, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit393, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit394, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit395, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit396, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit397, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit398, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit399, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit400, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit401, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit402, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit403, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit404, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit405, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit406, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit407, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit408, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit409, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit410, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit411, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit412, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit413, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit414, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit415, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit416, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit417, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit418, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit419, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit420, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit421, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit422, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit423, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit424, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit425, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit426, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit427, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit428, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit429, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit430, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit431, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit432, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit433, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit434, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit435, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit436, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit437, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit438, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit439, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit440, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit441, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit442, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit443, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit444, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit445, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit446, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit447, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit448, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit449, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit450, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit451, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit452, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit453, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit454, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit455, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit456, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit457, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit458, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit459, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit460, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit461, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit462, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit463, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit464, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit465, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit466, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit467, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit468, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit469, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit470, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit471, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit472, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit473, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit474, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit475, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit476, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit477, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit478, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit479, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit480, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit481, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit482, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit483, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit484, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit485, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit486, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit487, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit488, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit489, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit490, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit491, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit492, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit493, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit494, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit495, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit496, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit497, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit498, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit499, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit500, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit501, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit502, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit503, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit504, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit505, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit506, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit507, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit508, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit509, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit510, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit511, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit512, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit513, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit514, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit515, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit516, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit517, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit518, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit519, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit520, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit521, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit522, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit523, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit524, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit525, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit526, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit527, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit528, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit529, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit530, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit531, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit532, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit533, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit534, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit535, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit536, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit537, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit538, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit539, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit540, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit541, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit542, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit543, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit544, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit545, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit546, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit547, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit548, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit549, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit550, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit551, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit552, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit553, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit554, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit555, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit556, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit557, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit558, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit559, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit560, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit561, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit562, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit563, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit564, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit565, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit566, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit567, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit568, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit569, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit570, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit571, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit572, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit573, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit574, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit575, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit576, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit577, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit578, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit579, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit580, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit581, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit582, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit583, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit584, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit585, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit586, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit587, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit588, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit589, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit590, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit591, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit592, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit593, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit594, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit595, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit596, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit597, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit598, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit599, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit600, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit601, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit602, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit603, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit604, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit605, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit606, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit607, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit608, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit609, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit610, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit611, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit612, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit613, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit614, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit615, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit616, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit617, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit618, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit619, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit620, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit621, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit622, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit623, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit624, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit625, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit626, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit627, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit628, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit629, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit630, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit631, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit632, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit633, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit634, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit635, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit636, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit637, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit638, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit639, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit640, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit641, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit642, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit643, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit644, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit645, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit646, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit647, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit648, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit649, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit650, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit651, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit652, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit653, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit654, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit655, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit656, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit657, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit658, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit659, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit660, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit661, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit662, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit663, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit664, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit665, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit666, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit667, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit668, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit669, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit670, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit671, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit672, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit673, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit674, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit675, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit676, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit677, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit678, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit679, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit680, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit681, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit682, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit683, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit684, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit685, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit686, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit687, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit688, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit689, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit690, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit691, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit692, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit693, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit694, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit695, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit696, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit697, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit698, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit699, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit700, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit701, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit702, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit703, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit704, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit705, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit706, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit707, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit708, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit709, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit710, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit711, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit712, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit713, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit714, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit715, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit716, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit717, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit718, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit719, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit720, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit721, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit722, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit723, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit724, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit725, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit726, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit727, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit728, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit729, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit730, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit731, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit732, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit733, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit734, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit735, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit736, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit737, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit738, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit739, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit740, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit741, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit742, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit743, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit744, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit745, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit746, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit747, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit748, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit749, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit750, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit751, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit752, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit753, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit754, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit755, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit756, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit757, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit758, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit759, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit760, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit761, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit762, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit763, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit764, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit765, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit766, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit767, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit768, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit769, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit770, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit771, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit772, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit773, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit774, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit775, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit776, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit777, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit778, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit779, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit780, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit781, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit782, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit783, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit784, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit785, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit786, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit787, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit788, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit789, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit790, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit791, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit792, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit793, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit794, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit795, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit796, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit797, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit798, 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit;
+DROP VIEW v1;
+#
+# End of 5.6 tests
+#
+#
+# Bug #11752369 : MYSQLDUMP SHOULD CONVERT GEOMETRY COLUMNS TO HEX WITH
+#                 --HEX-BLOB OPTION
+CREATE DATABASE dump_gis;
+USE dump_gis;
+CREATE TABLE t1 (a GEOMETRY);
+INSERT INTO t1 VALUES(GeomFromText('LineString(1 1, 2 1, 2 2, 1 2, 1 1)'));
+SELECT HEX(a) FROM t1;
+HEX(a)
+00000000010200000005000000000000000000F03F000000000000F03F0000000000000040000000000000F03F00000000000000400000000000000040000000000000F03F0000000000000040000000000000F03F000000000000F03F
+INSERT INTO `t1` (`a`) VALUES (0x00000000010200000005000000000000000000F03F000000000000F03F0000000000000040000000000000F03F00000000000000400000000000000040000000000000F03F0000000000000040000000000000F03F000000000000F03F);
+DROP DATABASE dump_gis;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/mysql_upgrade.result percona-xtrabackup-2.3.7/mysql-test/r/mysql_upgrade.result
--- percona-xtrabackup-2.2.3/mysql-test/r/mysql_upgrade.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/mysql_upgrade.result	2017-02-27 07:47:02.000000000 +0000
@@ -365,6 +365,7 @@
 CREATE USER 'bug13586336'@'localhost' IDENTIFIED WITH 'mysql_old_password';
 SET PASSWORD FOR 'bug13586336'@'localhost' = OLD_PASSWORD('a');
 Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 Run mysql_upgrade with all privileges on a user
 Warning: Using a password on the command line interface can be insecure.
@@ -404,5 +405,102 @@
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 DROP USER 'bug13586336'@'localhost';
+#
+# Bug #20023823 BACKPORT THE FIX FOR MYSQL_INSTALL_DB/MYSQL_UPGRADE
+#               ON NON-EMPTY PLUGIN COLUMN
+#
+# Creating user with empty plugin and empty password
+# plugin should be changed to mysql_native_password after the update
+CREATE USER B20023823_empty@localhost;
+GRANT ALL PRIVILEGES on *.* TO B20023823_empty@localhost;
+update mysql.user set plugin='' WHERE user='B20023823_empty'
+                                and host='localhost';
+flush privileges;
+# Creating user with default plugin, i.e. mysql_native_password
+# this plugin should not be changed during the upgrade
+CREATE USER B20023823_def@localhost IDENTIFIED BY 'test';
+# Creating user with 41 bytes hash pass (default) and setting its plugin
+# to empty string. Plugin should be set to mysql_native_password
+# after the upgrade is finished
+CREATE USER B20023823_41hash@localhost IDENTIFIED WITH mysql_native_password;
+set session old_passwords=0;
+set password for B20023823_41hash@localhost = password('test');
+update mysql.user set plugin='' WHERE user='B20023823_41hash'
+                                      and host='localhost';
+flush privileges;
+# Creating user with 16 bytes hash pass and setting its plugin
+# to empty string. Plugin should be set to mysql_old_password
+# after the upgrade is finished
+CREATE USER B20023823_16hash@localhost identified with mysql_old_password;
+set session old_passwords=1;
+set password for B20023823_16hash@localhost = password('test');
+Warnings:
+Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
+update mysql.user set plugin='' WHERE user='B20023823_16hash'
+                                and host='localhost';
+flush privileges;
+SELECT user, plugin from mysql.user;
+user	plugin
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
+B20023823_empty	
+B20023823_def	mysql_native_password
+B20023823_41hash	
+B20023823_16hash	
+# repair the user's plugin
+Warning: Using a password on the command line interface can be insecure.
+Warning: Using a password on the command line interface can be insecure.
+mysql.columns_priv                                 OK
+mysql.db                                           OK
+mysql.event                                        OK
+mysql.func                                         OK
+mysql.general_log                                  OK
+mysql.help_category                                OK
+mysql.help_keyword                                 OK
+mysql.help_relation                                OK
+mysql.help_topic                                   OK
+mysql.innodb_index_stats                           OK
+mysql.innodb_table_stats                           OK
+mysql.ndb_binlog_index                             OK
+mysql.plugin                                       OK
+mysql.proc                                         OK
+mysql.procs_priv                                   OK
+mysql.proxies_priv                                 OK
+mysql.servers                                      OK
+mysql.slave_master_info                            OK
+mysql.slave_relay_log_info                         OK
+mysql.slave_worker_info                            OK
+mysql.slow_log                                     OK
+mysql.tables_priv                                  OK
+mysql.time_zone                                    OK
+mysql.time_zone_leap_second                        OK
+mysql.time_zone_name                               OK
+mysql.time_zone_transition                         OK
+mysql.time_zone_transition_type                    OK
+mysql.user                                         OK
+Warning: Using a password on the command line interface can be insecure.
+Warning	1642	Pre-4.1 password hash found. It is deprecated and will be removed in a future release. Please upgrade it to a new format.
+Warning: Using a password on the command line interface can be insecure.
+Warning: Using a password on the command line interface can be insecure.
+mtr.global_suppressions                            OK
+mtr.test_suppressions                              OK
+# expect non-empty
+SELECT user, plugin from mysql.user;
+user	plugin
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
+B20023823_empty	mysql_native_password
+B20023823_def	mysql_native_password
+B20023823_41hash	mysql_native_password
+B20023823_16hash	mysql_old_password
+# cleanup
+DROP USER B20023823_empty@localhost;
+DROP USER B20023823_def@localhost;
+DROP USER B20023823_41hash@localhost;
+DROP USER B20023823_16hash@localhost;
 
 End of tests
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/openssl_1.result percona-xtrabackup-2.3.7/mysql-test/r/openssl_1.result
--- percona-xtrabackup-2.2.3/mysql-test/r/openssl_1.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/openssl_1.result	2017-02-27 07:47:02.000000000 +0000
@@ -3,8 +3,8 @@
 insert into t1 values (5);
 grant select on test.* to ssl_user1@localhost require SSL;
 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client";
+grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client" ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
 flush privileges;
 connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/outfile_loaddata.result percona-xtrabackup-2.3.7/mysql-test/r/outfile_loaddata.result
--- percona-xtrabackup-2.2.3/mysql-test/r/outfile_loaddata.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/outfile_loaddata.result	2017-02-27 07:47:02.000000000 +0000
@@ -143,15 +143,16 @@
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ÑŠ';
 Warnings:
 Warning	1638	Non-ASCII separator arguments are not fully supported
-Warning	1265	Data truncated for column 'a' at row 1
-Warning	1261	Row 1 doesn't contain data for all columns
-Warning	1261	Row 1 doesn't contain data for all columns
-Warning	1265	Data truncated for column 'a' at row 2
-Warning	1261	Row 2 doesn't contain data for all columns
-Warning	1261	Row 2 doesn't contain data for all columns
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
 a	b	c
-1	NULL	NULL
+1	ABC-�БВ	DEF-ÂÃÄ
+2	NULL	NULL
+SELECT * FROM t1;
+a	b	c
+1	ABC-�БВ	DEF-ÂÃÄ
+2	NULL	NULL
+SELECT * FROM t2;
+a	b	c
 1	ABC-�БВ	DEF-ÂÃÄ
 2	NULL	NULL
 SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES STARTING BY 'ÑŠ';
@@ -181,7 +182,14 @@
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
 a	b	c
 1	ABC-�БВ	DEF-ÂÃÄ
-1	ABC-�БВ	DEF-ÂÃÄÑŠ2
+2	NULL	NULL
+SELECT * FROM t1;
+a	b	c
+1	ABC-�БВ	DEF-ÂÃÄ
+2	NULL	NULL
+SELECT * FROM t2;
+a	b	c
+1	ABC-�БВ	DEF-ÂÃÄ
 2	NULL	NULL
 # Default (binary) charset:
 SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FROM t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/partition_archive.result percona-xtrabackup-2.3.7/mysql-test/r/partition_archive.result
--- percona-xtrabackup-2.2.3/mysql-test/r/partition_archive.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/partition_archive.result	2017-02-27 07:47:02.000000000 +0000
@@ -126,3 +126,29 @@
 count(*)
 100
 drop table t1;
+#
+#BUG 18618561: FAILED ALTER TABLE ENGINE CHANGE WITH PARTITIONS
+#              CORRUPTS FRM
+CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
+PARTITIONS 5;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) NOT NULL,
+  PRIMARY KEY (`fld1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (fld1)
+PARTITIONS 5 */
+ALTER TABLE t1 ENGINE= ARCHIVE;
+ERROR HY000: Got error -1 from storage engine
+#After the patch, the ENGINE is correctly displayed as MyISAM
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) NOT NULL,
+  PRIMARY KEY (`fld1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (fld1)
+PARTITIONS 5 */
+#Cleanup.
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/partition_index_myisam.result percona-xtrabackup-2.3.7/mysql-test/r/partition_index_myisam.result
--- percona-xtrabackup-2.2.3/mysql-test/r/partition_index_myisam.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/partition_index_myisam.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,6 @@
+#
+# Bug#18167648: WRONG RESULTS WITH PARTITIONING, INDEX_MERGE AND NO PK
+#
 CREATE TABLE t1 (
 a smallint,
 b smallint,
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/partition_innodb.result percona-xtrabackup-2.3.7/mysql-test/r/partition_innodb.result
--- percona-xtrabackup-2.2.3/mysql-test/r/partition_innodb.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/partition_innodb.result	2017-02-27 07:47:02.000000000 +0000
@@ -612,3 +612,149 @@
 ERROR HY000: Table storage engine for 't1' doesn't have this option
 DROP TABLE t1;
 USE test;
+#
+# Bug#13737949: CRASH IN HA_PARTITION::INDEX_INIT
+# Bug#18694052: SERVER CRASH IN HA_PARTITION::INIT_RECORD_PRIORITY_QUEUE
+#
+CREATE TABLE t1
+(a INT,
+b INT,
+PRIMARY KEY (a))
+ENGINE = InnoDB
+PARTITION BY HASH (a) PARTITIONS 3;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+# con1
+ALTER TABLE t1 ADD INDEX idx1 (b);
+# con default
+SELECT b FROM t1 WHERE b = 0;
+ERROR HY000: Table definition has changed, please retry transaction
+SELECT b FROM t1 WHERE b = 0;
+ERROR HY000: Table definition has changed, please retry transaction
+DROP TABLE t1;
+# Same test without partitioning
+CREATE TABLE t1
+(a INT,
+b INT,
+PRIMARY KEY (a))
+ENGINE = InnoDB;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+# con1
+ALTER TABLE t1 ADD INDEX idx1 (b);
+# con default
+SELECT b FROM t1 WHERE b = 0;
+ERROR HY000: Table definition has changed, please retry transaction
+SELECT b FROM t1 WHERE b = 0;
+ERROR HY000: Table definition has changed, please retry transaction
+DROP TABLE t1;
+Bug 17896265	 PARTITIONED TABLE HAS MISPLACED ROWS, AFTER INPLACE ALTER
+CREATE TABLE t1 (
+f1 INT(11) NOT NULL,
+f2 INT(11) NOT NULL
+)
+ENGINE=InnoDB
+PARTITION BY KEY (f1,f2) PARTITIONS 2;
+INSERT INTO t1 VALUES (9585,5);
+ALTER TABLE t1 CHANGE f1 f1 INT AFTER f2, ALGORITHM=INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+CREATE TABLE t2 (
+f1 INT(11) NOT NULL,
+f2 INT(11) NOT NULL,
+f3 INT(11) NOT NULL,
+f4 INT(11) NOT NULL
+)
+ENGINE=InnoDB
+PARTITION BY KEY (f2,f3) PARTITIONS 2;
+INSERT INTO t2 VALUES (10,9585,5,20);
+ALTER TABLE t2 CHANGE f3 f3 INT AFTER f4, ALGORITHM=INPLACE;
+CHECK TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+ALTER TABLE t2 CHANGE f3 f3 INT AFTER f1, ALGORITHM=INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ALTER TABLE t2 CHANGE f4 f4 INT AFTER f3, ALGORITHM=INPLACE;
+CHECK TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+ALTER TABLE t2 CHANGE f1 f1 INT AFTER f4, ALGORITHM=INPLACE;
+CHECK TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+ALTER TABLE t2 CHANGE f1 f1 INT AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+ALTER TABLE t2 CHANGE f2 f2 INT AFTER f4, ALGORITHM=INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+CREATE TABLE t3 (f1 INT,f2 INT) ENGINE=INNODB
+PARTITION BY RANGE(f1) (
+PARTITION p0 VALUES LESS THAN (100),
+PARTITION p1 VALUES LESS THAN (200),
+PARTITION p2 VALUES LESS THAN (600),
+PARTITION p3 VALUES LESS THAN MAXVALUE
+);
+insert into t3 values (90,120);
+insert into t3 values (120,300);
+ALTER TABLE t3 CHANGE f1 f1 int AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t3;
+Table	Op	Msg_type	Msg_text
+test.t3	check	status	OK
+CREATE TABLE t4 (
+f1 INT(11) NOT NULL,
+f2 INT(11) NOT NULL
+)
+ENGINE=InnoDB
+PARTITION BY HASH (MOD(f1,f2)) PARTITIONS 2;
+INSERT INTO t4 VALUES (9585,5);
+ALTER TABLE t4 CHANGE f1 f1 INT AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t4;
+Table	Op	Msg_type	Msg_text
+test.t4	check	status	OK
+CREATE TABLE t5 (
+f1 INT,
+f2 INT
+)
+ENGINE=InnoDB
+PARTITION BY RANGE COLUMNS(f1,f2) (
+PARTITION p0 VALUES LESS THAN (10000,12),
+PARTITION p1 VALUES LESS THAN (MAXVALUE, MAXVALUE)
+);
+INSERT INTO t5 VALUES (1,20000);
+ALTER TABLE t5 CHANGE f1 f1 INT AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t5;
+Table	Op	Msg_type	Msg_text
+test.t5	check	status	OK
+CREATE TABLE t6 (
+a INT,
+b INT
+)
+ENGINE=InnoDB
+PARTITION BY RANGE COLUMNS(a,b)
+SUBPARTITION BY KEY(a,b)
+SUBPARTITIONS 2 (
+PARTITION p0 VALUES LESS THAN (10000,12),
+PARTITION p1 VALUES LESS THAN (MAXVALUE, MAXVALUE)
+);
+INSERT INTO t6 VALUES (9585,5);
+ALTER TABLE t6 CHANGE a a INT AFTER b, ALGORITHM=INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+CREATE TABLE t7 (
+f1 INT(11) NOT NULL,
+f2 INT(11) NOT NULL,
+f3 INT(11) NOT NULL,
+f4 INT(11) NOT NULL,
+f5 INT(11) NOT NULL
+)
+ENGINE=InnoDB
+PARTITION BY KEY (f1,f5) PARTITIONS 2;
+INSERT INTO t7 VALUES (9585,10,20,10,5);
+ALTER TABLE t7 CHANGE f5 f5 INT AFTER f3, ALGORITHM=INPLACE;
+CHECK TABLE t7;
+Table	Op	Msg_type	Msg_text
+test.t7	check	status	OK
+ALTER TABLE t7 CHANGE f5 f5 INT AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t7;
+Table	Op	Msg_type	Msg_text
+test.t7	check	status	OK
+ALTER TABLE t7 CHANGE f1 f1 INT AFTER f4, ALGORITHM=INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+DROP TABLE t1,t2,t3,t4,t5,t6,t7;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/partition_pruning.result percona-xtrabackup-2.3.7/mysql-test/r/partition_pruning.result
--- percona-xtrabackup-2.2.3/mysql-test/r/partition_pruning.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/partition_pruning.result	2017-02-27 07:47:02.000000000 +0000
@@ -3534,3 +3534,117 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0,p1,p2	ALL	NULL	NULL	NULL	NULL	100	Using where
 drop table t0, t1;
+#
+# Bug#71095: Wrong results with PARTITION BY LIST COLUMNS()
+#
+CREATE TABLE t1
+(c1 int,
+c2 int,
+c3 int,
+c4 int,
+PRIMARY KEY (c1,c2))
+PARTITION BY LIST COLUMNS (c2)
+(PARTITION p1 VALUES IN (1,2),
+PARTITION p2 VALUES IN (3,4));
+INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
+INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+c1	c2	c3	c4
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+c1	c2	c3	c4
+1	1	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+c1	c2	c3	c4
+1	1	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+c1	c2	c3	c4
+1	1	1	1
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+c1	c2	c3	c4
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+c1	c2	c3	c4
+1	1	1	1
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+c1	c2	c3	c4
+1	1	1	1
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+c1	c2	c3	c4
+2	3	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+c1	c2	c3	c4
+2	3	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+c1	c2	c3	c4
+2	3	1	1
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+c1	c2	c3	c4
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+c1	c2	c3	c4
+2	3	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+c1	c2	c3	c4
+2	3	1	1
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+c1	c2	c3	c4
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+c1	c2	c3	c4
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+c1	c2	c3	c4
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1	const	PRIMARY	PRIMARY	8	const,const	1	NULL
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	const	PRIMARY	PRIMARY	8	const,const	1	NULL
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	const	PRIMARY	PRIMARY	8	const,const	1	NULL
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_qa_3.result percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_qa_3.result
--- percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_qa_3.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_qa_3.result	2017-02-27 07:47:02.000000000 +0000
@@ -8,6 +8,6 @@
 qa_test_11_dest@%	qa_test_11_user@localhost	'qa_test_11_user'@'%'	'qa_test_11_user'@'%'
 exec MYSQL PLUGIN_AUTH_OPT --default_auth=qa_auth_client -h localhost -P MASTER_MYPORT -u qa_test_2_user --password=qa_test_11_dest test_user_db -e "SELECT current_user(),user(),@@local.proxy_user,@@local.external_user;" 2>&1
 Warning: Using a password on the command line interface can be insecure.
-ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: NO)
+ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: YES)
 DROP USER qa_test_11_user, qa_test_11_dest;
 DROP DATABASE test_user_db;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth.result percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth.result
--- percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth.result	2017-02-27 07:47:02.000000000 +0000
@@ -549,3 +549,25 @@
 DROP USER bug12818542@localhost;
 DROP USER bug12818542_dest@localhost;
 End of 5.5 tests
+#
+# Bug #18057562: PROXY USERS LOCKED OUT WHEN UNDERLYING PROXIED USER
+#                PASSWORD IS EXPIRED
+#
+# Restart server with disconnect_on_expired_password OFF;
+CREATE USER 'empl_external'@'localhost' IDENTIFIED WITH test_plugin_server AS 'employee';
+CREATE USER 'employee'@'localhost' IDENTIFIED BY 'passkey';
+GRANT PROXY ON 'employee'@'localhost' TO 'empl_external'@'localhost';
+# Expiring the proxied user's password
+ALTER USER employee@localhost PASSWORD EXPIRE;
+# Connecting with the proxied user and executing a query after the
+# proxied user's password is expired
+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
+# Connecting with the proxy user and executing a query after the proxied
+# user's password is expired. Here we are not supposed to get error.
+Warning: Using a password on the command line interface can be insecure.
+current_user()
+employee@localhost
+user()
+empl_external@localhost
+DROP USER 'empl_external'@'localhost', 'employee'@'localhost';
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256_2.result percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256_2.result
--- percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256_2.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256_2.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,10 +1,10 @@
 CREATE USER 'kristofer' IDENTIFIED BY 'secret';
 SELECT user, plugin FROM mysql.user;
 user	plugin
-root	
-root	
-root	
-root	
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
 kristofer	sha256_password
 user()	current_user()
 kristofer@localhost	kristofer@%
@@ -33,7 +33,7 @@
 kristofer@localhost	kristofer@localhost
 SHOW GRANTS FOR 'kristofer'@'localhost';
 Grants for kristofer@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
+GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost'
 DROP USER 'kristofer'@'localhost';
 GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33' IDENTIFIED BY '';
 Connection should fail for localhost
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256.result percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256.result
--- percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256.result	2017-02-27 07:47:02.000000000 +0000
@@ -4,10 +4,10 @@
 SET PASSWORD FOR 'kristofer'=PASSWORD('secret');
 SELECT user, plugin FROM mysql.user;
 user	plugin
-root	
-root	
-root	
-root	
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
 kristofer	sha256_password
 SELECT USER(),CURRENT_USER();
 USER()	CURRENT_USER()
@@ -47,7 +47,7 @@
 kristofer@localhost	kristofer@localhost
 SHOW GRANTS FOR 'kristofer'@'localhost';
 Grants for kristofer@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
+GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost'
 DROP USER 'kristofer'@'localhost';
 GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33' IDENTIFIED WITH 'sha256_password';
 SET PASSWORD FOR 'kristofer'@'33.33.33.33'=PASSWORD('');
@@ -79,10 +79,10 @@
 SET PASSWORD FOR 'kristofer'=PASSWORD('secret');
 SELECT user, plugin FROM mysql.user;
 user	plugin
-root	
-root	
-root	
-root	
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
 kristofer	sha256_password
 SELECT USER(),CURRENT_USER();
 USER()	CURRENT_USER()
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256_server_default.result percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256_server_default.result
--- percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256_server_default.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256_server_default.result	2017-02-27 07:47:02.000000000 +0000
@@ -3,10 +3,10 @@
 SET PASSWORD FOR 'kristofer'=PASSWORD('secret');
 SELECT user, plugin FROM mysql.user;
 user	plugin
-root	
-root	
-root	
-root	
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
 kristofer	sha256_password
 SELECT USER(),CURRENT_USER();
 USER()	CURRENT_USER()
@@ -44,7 +44,7 @@
 kristofer@localhost	kristofer@localhost
 SHOW GRANTS FOR 'kristofer'@'localhost';
 Grants for kristofer@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
+GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost'
 DROP USER 'kristofer'@'localhost';
 GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33';
 SET PASSWORD FOR 'kristofer'@'33.33.33.33'=PASSWORD('');
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256_server_default_tls.result percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256_server_default_tls.result
--- percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256_server_default_tls.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256_server_default_tls.result	2017-02-27 07:47:02.000000000 +0000
@@ -3,10 +3,10 @@
 SET PASSWORD FOR 'kristofer'=PASSWORD('secret');
 SELECT user, plugin FROM mysql.user;
 user	plugin
-root	
-root	
-root	
-root	
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
+root	mysql_native_password
 kristofer	sha256_password
 SELECT USER(),CURRENT_USER();
 USER()	CURRENT_USER()
@@ -44,7 +44,7 @@
 kristofer@localhost	kristofer@localhost
 SHOW GRANTS FOR 'kristofer'@'localhost';
 Grants for kristofer@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
+GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost'
 DROP USER 'kristofer'@'localhost';
 GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33';
 SET PASSWORD FOR 'kristofer'@'33.33.33.33'=PASSWORD('');
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256_tls.result percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256_tls.result
--- percona-xtrabackup-2.2.3/mysql-test/r/plugin_auth_sha256_tls.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/plugin_auth_sha256_tls.result	2017-02-27 07:47:02.000000000 +0000
@@ -22,7 +22,7 @@
 kristofer@localhost	kristofer@localhost
 SHOW GRANTS FOR 'kristofer'@'localhost';
 Grants for kristofer@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
+GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost'
 DROP USER 'kristofer'@'localhost';
 GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33' IDENTIFIED WITH 'sha256_password';
 SET PASSWORD FOR 'kristofer'@'33.33.33.33'=PASSWORD('');
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/plugin.result percona-xtrabackup-2.3.7/mysql-test/r/plugin.result
--- percona-xtrabackup-2.2.3/mysql-test/r/plugin.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/plugin.result	2017-02-27 07:47:02.000000000 +0000
@@ -162,3 +162,73 @@
 @@SESSION.example_double_thdvar
 1000.500000
 UNINSTALL PLUGIN example;
+#
+# BUG#18008907 - DEADLOCK BETWEEN MYSQL_CHANGE_USER(), SHOW VARIABLES AND INSTALL PLUGIN
+#
+CREATE PROCEDURE p_install()
+BEGIN
+INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
+END
+|
+CREATE PROCEDURE p_show_vars()
+BEGIN
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES;
+END|
+connect con1, localhost, root,,;
+# Case 18008907_1: Deadlock situation cause by
+#                  con1: has LOCK_system_variables_hash and waits on LOCK_plugin  AND
+#                  default: has LOCK_plugin and waits on LOCK_system_variables_hash.
+#
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
+call p_show_vars();;
+connection default;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
+call p_install();;
+connection con1;
+COUNT(*)
+#
+SET DEBUG_SYNC='RESET';
+connection default;
+ERROR HY000: Can't open shared library
+SET DEBUG_SYNC='RESET';
+# Case 18008907_2: Deadlock situation caused by
+#                  default: has LOCK_system_variables_hash and waits on LOCK_global_system_variables,
+#                  con1: has LOCK_plugin and waits on LOCK_system_variables_hash AND
+#                  con2: has LOCK_global_system_variables and waits on LOCK_plugin.
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
+call p_show_vars();;
+connection con1;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
+call p_install();;
+connect con2, localhost, root,,;
+SET DEBUG_SYNC='now WAIT_FOR create_connection';
+connection con1;
+ERROR HY000: Can't open shared library
+connection default;
+COUNT(*)
+#
+Warnings:
+#	1639	debug sync point wait timed out
+disconnect con2;
+# Case 18008907_3: Testing Concurrent "Show Variables" and "Plugin Uninstall" operations.
+INSTALL PLUGIN example SONAME 'ha_example.so';
+connection con1;
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
+call p_show_vars();;
+connect con2, localhost, root,,;
+SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
+UNINSTALL PLUGIN example;;
+connection default;
+SET DEBUG_SYNC='now SIGNAL go';
+connection con1;
+COUNT(*)
+#
+connection con2;
+connection default;
+DROP PROCEDURE p_show_vars;
+DROP PROCEDURE p_install;
+SET DEBUG_SYNC='RESET';
+disconnect con1;
+disconnect con2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ps_grant.result percona-xtrabackup-2.3.7/mysql-test/r/ps_grant.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ps_grant.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ps_grant.result	2017-02-27 07:47:02.000000000 +0000
@@ -18,7 +18,7 @@
 second_user@localhost
 show grants for current_user();
 Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
 prepare s_t9 from 'select c1 as my_col 
                                  from t9 where c1= 1' ;
@@ -42,7 +42,7 @@
 GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
 show grants for second_user@localhost ;
 Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
 GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
 prepare s_t1 from 'select a as my_col from t1' ;
@@ -62,7 +62,7 @@
 GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
 show grants for second_user@localhost ;
 Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
 execute s_t1 ;
 ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/query_cache.result percona-xtrabackup-2.3.7/mysql-test/r/query_cache.result
--- percona-xtrabackup-2.2.3/mysql-test/r/query_cache.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/query_cache.result	2017-02-27 07:47:02.000000000 +0000
@@ -1810,3 +1810,59 @@
 DROP TABLE t1;
 SET GLOBAL query_cache_size= @qc;
 #
+#BUG 18710853: QUERY CACHE NOT INVALIDATED ON CASCADE DELETE IF DB NAME HAS
+#              SPECIAL SYMBOLS
+SET @query_cache_size.saved = @@query_cache_size;
+SET GLOBAL query_cache_size = 1024*1024;
+CREATE DATABASE `db-db`;
+CREATE TABLE `db-db`.`t$1` (fld1 INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE `db-db`.`t$2` (fld1 INT PRIMARY KEY, fld2 INT,
+CONSTRAINT t2_fk FOREIGN KEY (fld2) REFERENCES `db-db`.`t$1` (fld1) ON
+DELETE CASCADE) ENGINE=InnoDB;
+CREATE TABLE `db-db`.`t$3` (fld1 INT PRIMARY KEY, fld2 INT,
+CONSTRAINT t3_fk FOREIGN KEY (fld2) REFERENCES `db-db`.`t$1` (fld1) ON
+UPDATE CASCADE) ENGINE=InnoDB;
+INSERT INTO `db-db`.`t$1` VALUES (100);
+INSERT INTO `db-db`.`t$1` VALUES (300);
+INSERT INTO `db-db`.`t$2` VALUES (1, 100);
+INSERT INTO `db-db`.`t$3` VALUES (2, 300);
+SELECT * FROM `db-db`.`t$2`;
+fld1	fld2
+1	100
+SELECT * FROM `db-db`.`t$3`;
+fld1	fld2
+2	300
+DELETE FROM `db-db`.`t$1` WHERE fld1= 100;
+UPDATE `db-db`.`t$1` SET fld1= 200 WHERE fld1= 300;
+#After fix the number of the records returned with the
+#query cache and without the query cache are the same.
+SELECT * FROM `db-db`.`t$2`;
+fld1	fld2
+SELECT SQL_NO_CACHE * FROM `db-db`.`t$2`;
+fld1	fld2
+SELECT * FROM `db-db`.`t$3`;
+fld1	fld2
+2	200
+SELECT SQL_NO_CACHE * FROM `db-db`.`t$3`;
+fld1	fld2
+2	200
+#Test case added for code coverage, invalidation
+#triggered at the SQL layer.
+CREATE TABLE `db-db`.`t$4` (fld1 INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO `db-db`.`t$4` VALUES (100);
+SELECT * FROM `db-db`.`t$4`;
+fld1
+100
+INSERT INTO `db-db`.`t$4` VALUES (200);
+SELECT * FROM `db-db`.`t$4`;
+fld1
+100
+200
+SELECT SQL_NO_CACHE * FROM `db-db`.`t$4`;
+fld1
+100
+200
+#cleanup
+DROP DATABASE `db-db`;
+SET GLOBAL query_cache_size = @query_cache_size.saved;
+#
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/rewrite_general_log.result percona-xtrabackup-2.3.7/mysql-test/r/rewrite_general_log.result
--- percona-xtrabackup-2.2.3/mysql-test/r/rewrite_general_log.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/rewrite_general_log.result	2017-02-27 07:47:02.000000000 +0000
@@ -101,8 +101,36 @@
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Note	1003	/* select#1 */ select ((@`a`) = 5) AS `@a=5`,(@b:=10) AS `@b:=10`,(@c:=20) AS `@c:=20`,(@d:=(40 + 5)) AS `@d:=40+5`,((@e:=80) + 5) AS `(@e:=80)+5`
+#
+# Bug#16953758: PREPARED STATEMENT IS WRITTEN TO GENERAL QUERY LOG AFTER ITS EXECUTION IS FINISH
+#
+TRUNCATE TABLE mysql.general_log;
+SET GLOBAL general_log='ON';
+SET @sql='SELECT command_type, argument FROM mysql.general_log WHERE argument LIKE "%Bug#16953758%"';
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+command_type	argument
+Query	SET @sql='SELECT command_type, argument FROM mysql.general_log WHERE argument LIKE "%Bug#16953758%"'
+Prepare	SELECT command_type, argument FROM mysql.general_log WHERE argument LIKE "%Bug#16953758%"
+Execute	SELECT command_type, argument FROM mysql.general_log WHERE argument LIKE "%Bug#16953758%"
+DEALLOCATE PREPARE stmt;
+#
+# Bug#18616826: PREPARED STATEMENTS WHOSE EXECUTION FAIL ARE NOT LOGGED TO THE GENERAL LOG
+#
+TRUNCATE TABLE mysql.general_log;
+SET @sql='DROP TABLE 18616826_does_not_exist';
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+ERROR 42S02: Unknown table 'test.18616826_does_not_exist'
+DEALLOCATE PREPARE stmt;
+SELECT command_type, argument FROM mysql.general_log WHERE argument LIKE "DROP TABLE 18616826_does_not_exist";
+command_type	argument
+Prepare	DROP TABLE 18616826_does_not_exist
+Execute	DROP TABLE 18616826_does_not_exist
 DROP TABLE test_log;
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+
 End of 5.6 tests!
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/show_processlist.result percona-xtrabackup-2.3.7/mysql-test/r/show_processlist.result
--- percona-xtrabackup-2.2.3/mysql-test/r/show_processlist.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/show_processlist.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,47 @@
+Bug#17283409  4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
+SHOW BINLOGS
+connect connection1,localhost,root,,test,$MASTER_MYPORT,;
+connection default;
+SET DEBUG_SYNC='before_copying_threads SIGNAL parked1 WAIT_FOR go';
+SHOW PROCESSLIST;
+connection connection1;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect connection2,localhost,root,,test,$MASTER_MYPORT,;
+connect connection3,localhost,root,,test,$MASTER_MYPORT,;
+SET DEBUG_SYNC='now SIGNAL go';
+connection default;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+SET DEBUG_SYNC='after_copying_threads SIGNAL parked1 WAIT_FOR go';
+SHOW PROCESSLIST;
+connection connection1;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect connection4,localhost,root,,test,$MASTER_MYPORT,;
+connect connection5,localhost,root,,test,$MASTER_MYPORT,;
+SET DEBUG_SYNC='now SIGNAL go';
+connection default;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+"Cleanup"
+SET DEBUG_SYNC='RESET';
+disconnect connection1;
+disconnect connection2;
+disconnect connection3;
+disconnect connection4;
+disconnect connection5;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/sp.result percona-xtrabackup-2.3.7/mysql-test/r/sp.result
--- percona-xtrabackup-2.2.3/mysql-test/r/sp.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/sp.result	2017-02-27 07:47:02.000000000 +0000
@@ -7759,4 +7759,104 @@
 SET @@default_storage_engine = @default_storage_engine_saved;
 DROP PROCEDURE p1;
 DROP TABLE t1;
+
+#
+# BUG 16041903: CONTINUE HANDLER NOT INVOKED
+# IN A STORED FUNCTION AFTER A LOCK WAIT TIMEOUT
+#
+
+# Save and set lock wait timeout
+SET @lock_wait_timeout_saved= @@lock_wait_timeout;
+SET @innodb_lock_wait_timeout_saved= @@innodb_lock_wait_timeout;
+SET @@lock_wait_timeout= 1;
+SET @@innodb_lock_wait_timeout= 1;
+
+# Create a function with exit handler:
+CREATE FUNCTION f1() RETURNS VARCHAR(20)
+BEGIN
+DECLARE EXIT HANDLER FOR SQLSTATE '42S02' RETURN 'No such table';
+INSERT INTO no_such_table VALUES (1);
+END//
+
+# Create a function calling f1():
+CREATE FUNCTION f2() RETURNS VARCHAR(20)
+BEGIN
+RETURN f1();
+END//
+
+# Create a function provoking deadlock:
+CREATE FUNCTION f3() RETURNS VARCHAR(20)
+BEGIN
+UPDATE t1 SET i= 1 WHERE i= 1;
+RETURN 'Will never get here';
+END//
+
+# Create a function calling f3, to create
+# a deadlock indirectly:
+CREATE FUNCTION f4() RETURNS VARCHAR(20)
+BEGIN
+RETURN f3();
+END//
+
+# Open another connection, create and initialize a table
+# to be used for provoking deadlock, put a lock on the table:
+CREATE TABLE t1 (i INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+SET AUTOCOMMIT= 0;
+UPDATE t1 SET i=1 WHERE i=1;
+
+# On the default connection, do an update to provoke a
+# deadlock, then call the function with handler. This case
+# fails without the patch (with error ER_NO_SUCH_TABLE):
+SET AUTOCOMMIT= 0;
+UPDATE t1 SET i=1 WHERE i=1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SELECT f1() AS 'f1():';
+f1():
+No such table
+
+# Provoke another deadlock, then call the function with
+# handler indirectly. This case fails without the patch
+# (with error ER_NO_SUCH_TABLE):
+UPDATE t1 SET i= 1 WHERE i= 1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SELECT f2() AS 'f2():';
+f2():
+No such table
+
+# Provoke yet another deadlock, but now from within a function,
+# then call the function with handler. This succeeds even
+# without the patch because is_fatal_sub_stmt_error is reset
+# in restore_sub_stmt after the failing function has been
+# executed. The test case is included anyway for better coverage:
+SELECT f3() AS 'f3():';
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SELECT f1() AS 'f1():';
+f1():
+No such table
+# Provoke yet another deadlock, but now from within a function,
+# calling another function, then call the function with handler.
+# This succeeds even without the patch because
+# is_fatal_sub_stmt_error is reset in restore_sub_stmt after
+# the failing function has been executed. The test case is
+# included anyway for better coverage:
+SELECT f4() AS 'f4():';
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SELECT f1() AS 'f1():';
+f1():
+No such table
+
+# Disconnect, drop functions and table:
+DROP FUNCTION f4;
+DROP FUNCTION f3;
+DROP FUNCTION f2;
+DROP FUNCTION f1;
+DROP TABLE t1;
+
+# Reset lock wait timeouts
+SET @@lock_wait_timeout= @lock_wait_timeout_saved;
+SET @@innodb_lock_wait_timeout= @innodb_lock_wait_timeout_saved;
+#
+# BUG 16041903: End of test case
+#
 # End of 5.6 tests
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/sp-threads.result percona-xtrabackup-2.3.7/mysql-test/r/sp-threads.result
--- percona-xtrabackup-2.2.3/mysql-test/r/sp-threads.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/sp-threads.result	2017-02-27 07:47:02.000000000 +0000
@@ -34,8 +34,8 @@
 call bug9486();
 show processlist;
 Id	User	Host	db	Command	Time	State	Info
+#	root	localhost	test	Query	#	STATE	show processlist
 #	root	localhost	test	Query	#	Waiting for table metadata lock	update t1, t2 set val= 1 where id1=id2
-#	root	localhost	test	Query	#	init	show processlist
 #	root	localhost	test	Sleep	#		NULL
 #	root	localhost	test	Sleep	#		NULL
 unlock tables;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/sp_validation.result percona-xtrabackup-2.3.7/mysql-test/r/sp_validation.result
--- percona-xtrabackup-2.2.3/mysql-test/r/sp_validation.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/sp_validation.result	2017-02-27 07:47:02.000000000 +0000
@@ -1373,7 +1373,6 @@
 2
 
 UPDATE t2 SET a = 30;
-ERROR 42S22: Unknown column 'a' in 'NEW'
 
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/ssl.result percona-xtrabackup-2.3.7/mysql-test/r/ssl.result
--- percona-xtrabackup-2.2.3/mysql-test/r/ssl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/ssl.result	2017-02-27 07:47:02.000000000 +0000
@@ -3,10 +3,10 @@
 Ssl_cipher	DHE-RSA-AES256-SHA
 SHOW STATUS LIKE 'Ssl_server_not_before';
 Variable_name	Value
-Ssl_server_not_before	Jan 29 11:56:49 2010 GMT
+Ssl_server_not_before	Dec  5 04:48:40 2014 GMT
 SHOW STATUS LIKE 'Ssl_server_not_after';
 Variable_name	Value
-Ssl_server_not_after	Jan 28 11:56:49 2015 GMT
+Ssl_server_not_after	Dec  1 04:48:40 2029 GMT
 drop table if exists t1,t2,t3,t4;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_mat_all.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_mat_all.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_mat_all.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_mat_all.result	2017-02-27 07:47:02.000000000 +0000
@@ -1876,6 +1876,59 @@
 AND o.c4=7 XOR o.pk=3 ORDER BY o.pk;
 x
 DROP TABLE t1,t2,t3;
+#
+# Bug#19297190 NOT IN DOESN'T RETURN EXPECTED RESULT
+#
+CREATE TABLE t1 (a VARCHAR(500) CHARACTER SET UTF8) ENGINE=INNODB;
+SET @str= repeat("a",450);
+SET @num=1000;
+INSERT INTO t1 VALUES (CONCAT((@num:=@num+1), @str));
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+32
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+set @save_heap_size= @@max_heap_table_size;
+set @@max_heap_table_size= 16384;
+EXPLAIN SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	Using where
+2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	32	Using where
+SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+COUNT(*)
+0
+ALTER TABLE t1 MODIFY a VARCHAR(332) CHARACTER SET UTF8;
+EXPLAIN SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	1	Using where
+2	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	1	NULL
+SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+COUNT(*)
+0
+DROP TABLE t1;
+set @@max_heap_table_size= @save_heap_size;
 # End of 5.6 tests
 set @@optimizer_switch=@old_opt_switch;
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_mat_none.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_mat_none.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_mat_none.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_mat_none.result	2017-02-27 07:47:02.000000000 +0000
@@ -1862,6 +1862,59 @@
 AND o.c4=7 XOR o.pk=3 ORDER BY o.pk;
 x
 DROP TABLE t1,t2,t3;
+#
+# Bug#19297190 NOT IN DOESN'T RETURN EXPECTED RESULT
+#
+CREATE TABLE t1 (a VARCHAR(500) CHARACTER SET UTF8) ENGINE=INNODB;
+SET @str= repeat("a",450);
+SET @num=1000;
+INSERT INTO t1 VALUES (CONCAT((@num:=@num+1), @str));
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+32
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+set @save_heap_size= @@max_heap_table_size;
+set @@max_heap_table_size= 16384;
+EXPLAIN SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	Using where
+2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	32	Using where
+SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+COUNT(*)
+0
+ALTER TABLE t1 MODIFY a VARCHAR(332) CHARACTER SET UTF8;
+EXPLAIN SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	1	Using where
+2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	1	Using where
+SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+COUNT(*)
+0
+DROP TABLE t1;
+set @@max_heap_table_size= @save_heap_size;
 # End of 5.6 tests
 set @@optimizer_switch=@old_opt_switch;
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_mat.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_mat.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_mat.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_mat.result	2017-02-27 07:47:02.000000000 +0000
@@ -1863,6 +1863,59 @@
 AND o.c4=7 XOR o.pk=3 ORDER BY o.pk;
 x
 DROP TABLE t1,t2,t3;
+#
+# Bug#19297190 NOT IN DOESN'T RETURN EXPECTED RESULT
+#
+CREATE TABLE t1 (a VARCHAR(500) CHARACTER SET UTF8) ENGINE=INNODB;
+SET @str= repeat("a",450);
+SET @num=1000;
+INSERT INTO t1 VALUES (CONCAT((@num:=@num+1), @str));
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+INSERT INTO t1 SELECT CONCAT((@num:=@num+1), @str) FROM t1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+32
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+set @save_heap_size= @@max_heap_table_size;
+set @@max_heap_table_size= 16384;
+EXPLAIN SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	Using where
+2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	32	Using where
+SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+COUNT(*)
+0
+ALTER TABLE t1 MODIFY a VARCHAR(332) CHARACTER SET UTF8;
+EXPLAIN SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	1	Using where
+2	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	1	NULL
+SELECT COUNT(*)
+FROM t1
+WHERE t1.a NOT IN (
+SELECT t2.a FROM t1 as t2
+);
+COUNT(*)
+0
+DROP TABLE t1;
+set @@max_heap_table_size= @save_heap_size;
 # End of 5.6 tests
 set @@optimizer_switch=@old_opt_switch;
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_all_bka_nixbnl.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_all_bka_nixbnl.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_all_bka_nixbnl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_all_bka_nixbnl.result	2017-02-27 07:47:02.000000000 +0000
@@ -10518,6 +10518,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_all_bka.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_all_bka.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_all_bka.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_all_bka.result	2017-02-27 07:47:02.000000000 +0000
@@ -10509,6 +10509,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_all_bkaunique.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_all_bkaunique.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_all_bkaunique.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_all_bkaunique.result	2017-02-27 07:47:02.000000000 +0000
@@ -10510,6 +10510,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_all.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_all.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_all.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_all.result	2017-02-27 07:47:02.000000000 +0000
@@ -10503,6 +10503,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result	2017-02-27 07:47:02.000000000 +0000
@@ -10390,6 +10390,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_dupsweed_bka.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_dupsweed_bka.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_dupsweed_bka.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_dupsweed_bka.result	2017-02-27 07:47:02.000000000 +0000
@@ -10390,6 +10390,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_dupsweed_bkaunique.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_dupsweed_bkaunique.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_dupsweed_bkaunique.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_dupsweed_bkaunique.result	2017-02-27 07:47:02.000000000 +0000
@@ -10391,6 +10391,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_dupsweed.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_dupsweed.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_dupsweed.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_dupsweed.result	2017-02-27 07:47:02.000000000 +0000
@@ -10385,6 +10385,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result	2017-02-27 07:47:02.000000000 +0000
@@ -10375,6 +10375,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_firstmatch_bka.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_firstmatch_bka.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_firstmatch_bka.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_firstmatch_bka.result	2017-02-27 07:47:02.000000000 +0000
@@ -10369,6 +10369,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_firstmatch_bkaunique.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_firstmatch_bkaunique.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_firstmatch_bkaunique.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_firstmatch_bkaunique.result	2017-02-27 07:47:02.000000000 +0000
@@ -10370,6 +10370,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_firstmatch.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_firstmatch.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_firstmatch.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_firstmatch.result	2017-02-27 07:47:02.000000000 +0000
@@ -10368,6 +10368,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result	2017-02-27 07:47:02.000000000 +0000
@@ -10391,6 +10391,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_loosescan_bka.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_loosescan_bka.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_loosescan_bka.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_loosescan_bka.result	2017-02-27 07:47:02.000000000 +0000
@@ -10391,6 +10391,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_loosescan_bkaunique.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_loosescan_bkaunique.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_loosescan_bkaunique.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_loosescan_bkaunique.result	2017-02-27 07:47:02.000000000 +0000
@@ -10392,6 +10392,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_loosescan.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_loosescan.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_loosescan.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_loosescan.result	2017-02-27 07:47:02.000000000 +0000
@@ -10386,6 +10386,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat_bka_nixbnl.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat_bka_nixbnl.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat_bka_nixbnl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat_bka_nixbnl.result	2017-02-27 07:47:02.000000000 +0000
@@ -10591,6 +10591,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat_bka.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat_bka.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat_bka.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat_bka.result	2017-02-27 07:47:02.000000000 +0000
@@ -10607,6 +10607,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat_bkaunique.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat_bkaunique.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat_bkaunique.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat_bkaunique.result	2017-02-27 07:47:02.000000000 +0000
@@ -10608,6 +10608,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat_nosj.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat_nosj.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat_nosj.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat_nosj.result	2017-02-27 07:47:02.000000000 +0000
@@ -10372,6 +10372,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_mat.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_mat.result	2017-02-27 07:47:02.000000000 +0000
@@ -10606,6 +10606,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_none_bka_nixbnl.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_none_bka_nixbnl.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_none_bka_nixbnl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_none_bka_nixbnl.result	2017-02-27 07:47:02.000000000 +0000
@@ -10377,6 +10377,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_none_bka.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_none_bka.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_none_bka.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_none_bka.result	2017-02-27 07:47:02.000000000 +0000
@@ -10382,6 +10382,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_none_bkaunique.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_none_bkaunique.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_none_bkaunique.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_none_bkaunique.result	2017-02-27 07:47:02.000000000 +0000
@@ -10383,6 +10383,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_none.result percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_none.result
--- percona-xtrabackup-2.2.3/mysql-test/r/subquery_sj_none.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/subquery_sj_none.result	2017-02-27 07:47:02.000000000 +0000
@@ -10381,6 +10381,85 @@
 2002-08-25 20:35:06
 DROP TABLE t1, t2;
 # End of test for bug#14064201.
+#
+# Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+#               && IDX < PARENT_JOIN->TABLES
+#
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+SELECT(SELECT  1
+FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+cc
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+(SELECT d FROM c)) as cc FROM  c;
+cc
+1
+1
+1
+DROP TABLE b,c;
+#
+# Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+#
+CREATE TABLE b (
+d INT(11)
+);
+CREATE TABLE c (
+d BLOB
+) ;
+CREATE TABLE d (
+b INT(11)
+);
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+1
+1
+1
+1
+DROP TABLE b,c,d;
+#
+# Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+#
+CREATE TABLE t1 (
+ID int(11) NOT NULL AUTO_INCREMENT,
+id2 int(11) DEFAULT NULL,
+id3 int(11) DEFAULT NULL,
+id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+id5 int(11) DEFAULT NULL,
+PRIMARY KEY (ID),
+KEY id2 (id2),
+KEY id3 (id3),
+KEY id5 (id5)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+CREATE TABLE t2 (
+id6 int(11) NOT NULL,
+id7 int(11) NOT NULL,
+PRIMARY KEY (id6,id7),
+KEY id7 (id7)
+) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+SELECT ID
+FROM t1 p0
+WHERE  p0.id3=1
+AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+ID
+126
+DROP TABLE t1,t2;
 set @@optimizer_switch=@old_opt_switch;
 # End of 5.6 tests
 set optimizer_switch=default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/system_mysql_db.result percona-xtrabackup-2.3.7/mysql-test/r/system_mysql_db.result
--- percona-xtrabackup-2.2.3/mysql-test/r/system_mysql_db.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/system_mysql_db.result	2017-02-27 07:47:02.000000000 +0000
@@ -99,7 +99,7 @@
   `max_updates` int(11) unsigned NOT NULL DEFAULT '0',
   `max_connections` int(11) unsigned NOT NULL DEFAULT '0',
   `max_user_connections` int(11) unsigned NOT NULL DEFAULT '0',
-  `plugin` char(64) COLLATE utf8_bin DEFAULT '',
+  `plugin` char(64) COLLATE utf8_bin DEFAULT 'mysql_native_password',
   `authentication_string` text COLLATE utf8_bin,
   `password_expired` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Host`,`User`)
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/temporal_literal.result percona-xtrabackup-2.3.7/mysql-test/r/temporal_literal.result
--- percona-xtrabackup-2.2.3/mysql-test/r/temporal_literal.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/temporal_literal.result	2017-02-27 07:47:02.000000000 +0000
@@ -357,3 +357,43 @@
 DATE'2001-01-01'
 2001-01-01
 DROP TABLE t1;
+#
+# BUG #16812821: INCONSISTANT RESULTS WHEN ODBC DATE FORMAT IS USED
+#
+CREATE TABLE t1(c1 INT, c2 DATE, c3 TIME, c4 TIMESTAMP);
+CREATE TABLE t2(c11 INT, C12 INT);
+INSERT INTO t1 VALUES (1, '2014-01-02', '01:01:01', '2014-01-02 01:01:01'),
+(2, '2014-01-04', '01:01:01', '2014-01-02 01:01:01');
+INSERT INTO t2 VALUES (3, 4), (5, 6);
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+WHERE c2 BETWEEN {d'2014-01-01'} AND {d'2014-01-05'};
+c1	c2	c3	c4	c11	C12
+1	2014-01-02	01:01:01	2014-01-02 01:01:01	NULL	NULL
+2	2014-01-04	01:01:01	2014-01-02 01:01:01	NULL	NULL
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+WHERE c3 BETWEEN {t'01:01:01'} AND {t'01:01:05'};
+c1	c2	c3	c4	c11	C12
+1	2014-01-02	01:01:01	2014-01-02 01:01:01	NULL	NULL
+2	2014-01-04	01:01:01	2014-01-02 01:01:01	NULL	NULL
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+WHERE c4 BETWEEN {ts'2014-01-01 01:01:01'} AND {ts'2014-01-05 01:01:01'};
+c1	c2	c3	c4	c11	C12
+1	2014-01-02	01:01:01	2014-01-02 01:01:01	NULL	NULL
+2	2014-01-04	01:01:01	2014-01-02 01:01:01	NULL	NULL
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+WHERE c2 BETWEEN DATE'2014-01-01' AND DATE'2014-01-05';
+c1	c2	c3	c4	c11	C12
+1	2014-01-02	01:01:01	2014-01-02 01:01:01	NULL	NULL
+2	2014-01-04	01:01:01	2014-01-02 01:01:01	NULL	NULL
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+WHERE c3 BETWEEN TIME'01:01:01' AND TIME'01:01:05';
+c1	c2	c3	c4	c11	C12
+1	2014-01-02	01:01:01	2014-01-02 01:01:01	NULL	NULL
+2	2014-01-04	01:01:01	2014-01-02 01:01:01	NULL	NULL
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+WHERE c4 BETWEEN TIMESTAMP'2014-01-01 01:01:01'
+               AND TIMESTAMP'2014-01-05 01:01:01';
+c1	c2	c3	c4	c11	C12
+1	2014-01-02	01:01:01	2014-01-02 01:01:01	NULL	NULL
+2	2014-01-04	01:01:01	2014-01-02 01:01:01	NULL	NULL
+DROP TABLE t1, t2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/temp_pool.result percona-xtrabackup-2.3.7/mysql-test/r/temp_pool.result
--- percona-xtrabackup-2.2.3/mysql-test/r/temp_pool.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/temp_pool.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+#
+# BUG#11747548:DETECT ORPHAN TEMP-POOL FILES, AND HANDLE GRACEFULLY.
+#
+#Set up.
+CREATE TABLE pid_table(pid_no INT);
+CREATE TABLE t1 (a BLOB);
+INSERT INTO t1 VALUES (1), (2);
+#Create MYD and MYI files for intrinsic temp table.
+LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
+#Reports an error since the temp file already exists.
+SELECT a FROM t1 ORDER BY rand(1);
+ERROR HY000: Can't create or write to file
+#With patch, the query executes successfully.
+SELECT a FROM t1 ORDER BY rand(1);
+a
+1
+2
+#cleanup
+DROP TABLE t1, pid_table;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/trigger.result percona-xtrabackup-2.3.7/mysql-test/r/trigger.result
--- percona-xtrabackup-2.2.3/mysql-test/r/trigger.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/trigger.result	2017-02-27 07:47:02.000000000 +0000
@@ -2257,4 +2257,21 @@
 INSERT INTO t2 VALUES ('Yes', 1, NULL, 'spamfilter','scan_incoming');
 DROP TRIGGER t2_ai;
 DROP TABLE t1, t2, t3;
+#
+# Bug#18596756 - FAILED PREPARING OF TRIGGER ON TRUNCATED TABLES CAUSE
+#                ERROR 1054.
+#
+CREATE TABLE t1(id INT);
+CREATE TABLE t2(id INT);
+CREATE TRIGGER trigger1 BEFORE INSERT ON t1 FOR EACH ROW
+SET NEW.id= (SELECT * FROM t2);
+INSERT INTO t2 VALUES(0);
+INSERT INTO t1 VALUES(0);
+TRUNCATE TABLE t2;
+INSERT INTO t2 VALUES(0);
+INSERT INTO t1 VALUES(0);
+DROP TABLE t2;
+INSERT INTO t1 VALUES(0);
+ERROR 42S02: Table 'test.t2' doesn't exist
+DROP TABLE t1;
 End of 6.0 tests.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/trigger-trans.result percona-xtrabackup-2.3.7/mysql-test/r/trigger-trans.result
--- percona-xtrabackup-2.2.3/mysql-test/r/trigger-trans.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/trigger-trans.result	2017-02-27 07:47:02.000000000 +0000
@@ -195,3 +195,28 @@
 14	g
 drop trigger t1_after_insert;
 drop table t1,t2;
+#
+#Bug#19683834 SOME INNODB ERRORS CAUSES STORED FUNCTION
+#             AND TRIGGER HANDLERS TO BE IGNORED
+#Code fixed in Bug#16041903
+CREATE TABLE t1 (id int unsigned PRIMARY KEY, val int DEFAULT 0)
+ENGINE=InnoDB;
+INSERT INTO t1 (id) VALUES (1), (2);
+CREATE TABLE t2 (id int PRIMARY KEY);
+CREATE TABLE t3 LIKE t2;
+CREATE TRIGGER bef_insert BEFORE INSERT ON t2 FOR EACH ROW
+BEGIN
+DECLARE CONTINUE HANDLER FOR 1062 BEGIN END;
+INSERT INTO t3 (id) VALUES (NEW.id);
+INSERT INTO t3 (id) VALUES (NEW.id);
+END//
+START TRANSACTION;
+UPDATE t1 SET val = val + 1;
+connect  con2,localhost,root,,test,,;
+SET SESSION innodb_lock_wait_timeout = 2;
+UPDATE t1 SET val = val + 1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+INSERT INTO t2 (id) VALUES (1);
+disconnect con2;
+connection default;
+DROP TABLE t3, t2, t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/union.result percona-xtrabackup-2.3.7/mysql-test/r/union.result
--- percona-xtrabackup-2.2.3/mysql-test/r/union.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/union.result	2017-02-27 07:47:02.000000000 +0000
@@ -1826,3 +1826,37 @@
 SELECT(SELECT 1 AS a FROM dual ORDER BY a DESC LIMIT 1) AS dev;
 dev
 1
+#
+# Bug #17059925 : UNIONS COMPUTES ROWS_EXAMINED INCORRECTLY
+#
+SET @old_slow_query_log= @@global.slow_query_log;
+SET @old_log_output= @@global.log_output;
+SET @old_long_query_time= @@long_query_time;
+SET GLOBAL log_output= "TABLE";
+SET GLOBAL slow_query_log= ON;
+SET SESSION long_query_time= 0;
+CREATE TABLE t17059925 (a INT);
+CREATE TABLE t2 (b INT);
+CREATE TABLE t3 (c INT);
+INSERT INTO t17059925 VALUES (1), (2), (3);
+INSERT INTO t2 VALUES (4), (5), (6);
+INSERT INTO t3 VALUES (7), (8), (9);
+TRUNCATE table mysql.slow_log;
+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3;
+a
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT sql_text, rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%t17059925%';
+sql_text	rows_examined
+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3	18
+DROP TABLE t17059925, t2, t3;
+SET @@long_query_time= @old_long_query_time;
+SET @@global.log_output= @old_log_output;
+SET @@global.slow_query_log= @old_slow_query_log;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/user_var.result percona-xtrabackup-2.3.7/mysql-test/r/user_var.result
--- percona-xtrabackup-2.2.3/mysql-test/r/user_var.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/user_var.result	2017-02-27 07:47:02.000000000 +0000
@@ -126,14 +126,14 @@
 set @a=0;
 select @a,@a:="hello",@a,@a:=3,@a,@a:="hello again" from t1 group by i;
 @a	@a:="hello"	@a	@a:=3	@a	@a:="hello again"
-0	hello	0	3	3	hello again
-0	hello	0	3	3	hello again
-0	hello	0	3	3	hello again
+0	hello	0	3	0	hello again
+0	hello	0	3	0	hello again
+0	hello	0	3	0	hello again
 select @a,@a:="hello",@a,@a:=3,@a,@a:="hello again" from t1 group by i;
 @a	@a:="hello"	@a	@a:=3	@a	@a:="hello again"
-hello again	hello	hello	3	3	hello again
-hello again	hello	hello	3	3	hello again
-hello again	hello	hello	3	3	hello again
+hello again	hello	hello again	3	hello again	hello again
+hello again	hello	hello again	3	hello again	hello again
+hello again	hello	hello again	3	hello again	hello again
 drop table t1;
 set @a=_latin2'test';
 select charset(@a),collation(@a),coercibility(@a);
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/variables.result percona-xtrabackup-2.3.7/mysql-test/r/variables.result
--- percona-xtrabackup-2.2.3/mysql-test/r/variables.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/variables.result	2017-02-27 07:47:02.000000000 +0000
@@ -196,6 +196,8 @@
 @@concurrent_insert
 AUTO
 set global timed_mutexes=ON;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 show variables like 'timed_mutexes';
 Variable_name	Value
 timed_mutexes	ON
@@ -203,6 +205,8 @@
 VARIABLE_NAME	VARIABLE_VALUE
 TIMED_MUTEXES	ON
 set global timed_mutexes=0;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 show variables like 'timed_mutexes';
 Variable_name	Value
 timed_mutexes	OFF
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/view.result percona-xtrabackup-2.3.7/mysql-test/r/view.result
--- percona-xtrabackup-2.2.3/mysql-test/r/view.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/view.result	2017-02-27 07:47:02.000000000 +0000
@@ -4211,3 +4211,40 @@
 pk
 DROP VIEW v_t1;
 DROP TABLE t1;
+#
+# BUG#14117018 - MYSQL SERVER CREATES INVALID VIEW DEFINITION
+# BUG#18405221 - SHOW CREATE VIEW OUTPUT INCORRECT
+#
+CREATE VIEW v1 AS (SELECT '' FROM DUAL);
+CREATE VIEW v2 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL);
+CREATE VIEW v3 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL);
+CREATE VIEW v4 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+(SELECT '' AS col2 FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL);
+# Name for the column in select1 is set properly with or
+# without this fix.
+SHOW CREATE VIEW v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS (select '' AS `Name_exp_1`)	latin1	latin1_swedish_ci
+# Name for the column in select2 is set with this fix.
+# Without this fix, name would not have set for the
+# columns in select2.
+SHOW CREATE VIEW v2;
+View	Create View	character_set_client	collation_connection
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `Name_exp_2`)	latin1	latin1_swedish_ci
+# Name for the field item in select2 & select3 is set with this fix.
+# Without this fix, name would not have set for the
+# columns in select2 & select3.
+SHOW CREATE VIEW v3;
+View	Create View	character_set_client	collation_connection
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `Name_exp_2`) union all (select '' AS `Name_exp_3`)	latin1	latin1_swedish_ci
+# Name for the field item in select3 is set with this fix.
+# Without this fix, name would not have set for the
+# columns in select3.
+SHOW CREATE VIEW v4;
+View	Create View	character_set_client	collation_connection
+v4	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `col2`) union all (select '' AS `Name_exp_3`)	latin1	latin1_swedish_ci
+DROP VIEW v1, v2, v3, v4;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/r/windows.result percona-xtrabackup-2.3.7/mysql-test/r/windows.result
--- percona-xtrabackup-2.2.3/mysql-test/r/windows.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/r/windows.result	2017-02-27 07:47:02.000000000 +0000
@@ -60,3 +60,8 @@
 WHERE VARIABLE_NAME = 'socket';
 VARIABLE_NAME
 SOCKET
+#
+# Bug#16581605: REPLACE.EXE UTILITY IS BROKEN IN 5.5
+#
+xyz
+def
Binary files /tmp/tmpDsbHOr/KYyEySuP7r/percona-xtrabackup-2.2.3/mysql-test/std_data/binlog_transaction_with_anonymous_GTID.000001 and /tmp/tmpDsbHOr/dNxW0q5roZ/percona-xtrabackup-2.3.7/mysql-test/std_data/binlog_transaction_with_anonymous_GTID.000001 differ
Binary files /tmp/tmpDsbHOr/KYyEySuP7r/percona-xtrabackup-2.2.3/mysql-test/std_data/binlog_transaction_with_GTID.000001 and /tmp/tmpDsbHOr/dNxW0q5roZ/percona-xtrabackup-2.3.7/mysql-test/std_data/binlog_transaction_with_GTID.000001 differ
Binary files /tmp/tmpDsbHOr/KYyEySuP7r/percona-xtrabackup-2.2.3/mysql-test/std_data/bug17532932.frm and /tmp/tmpDsbHOr/dNxW0q5roZ/percona-xtrabackup-2.3.7/mysql-test/std_data/bug17532932.frm differ
Binary files /tmp/tmpDsbHOr/KYyEySuP7r/percona-xtrabackup-2.2.3/mysql-test/std_data/bug17532932.MYI and /tmp/tmpDsbHOr/dNxW0q5roZ/percona-xtrabackup-2.3.7/mysql-test/std_data/bug17532932.MYI differ
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/cacert.pem percona-xtrabackup-2.3.7/mysql-test/std_data/cacert.pem
--- percona-xtrabackup-2.2.3/mysql-test/std_data/cacert.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/cacert.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,17 +1,79 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 16263805969935345171 (0xe1b4a55c3ddfa613)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
+        Validity
+            Not Before: Dec  5 04:48:11 2014 GMT
+            Not After : Dec  1 04:48:11 2030 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:b4:95:bd:24:92:73:06:22:01:13:28:0e:09:a3:
+                    94:05:96:54:9d:dc:8f:83:39:f3:64:7a:31:70:f6:
+                    d9:c4:14:19:75:87:a6:b1:ea:52:ed:40:54:5a:f6:
+                    9c:13:8e:d8:76:8f:5a:65:a5:20:19:19:bd:51:9d:
+                    ba:35:ce:9a:a9:58:0a:fc:11:6e:1d:cb:a8:f1:92:
+                    79:ee:aa:fc:e3:32:5e:aa:0d:0b:23:34:95:e9:d3:
+                    8e:3f:72:93:90:bc:2c:b0:04:75:4f:a4:4a:a0:32:
+                    db:ac:89:ac:34:9b:d0:07:e3:81:e9:ca:5b:26:f0:
+                    f5:de:fe:d5:5e:a0:54:26:dd:ec:58:07:6e:b9:e5:
+                    97:f6:20:6d:d8:4a:c0:50:cc:81:e6:d2:3f:c7:47:
+                    70:8b:15:89:65:71:2e:47:c3:42:76:b5:ee:16:0e:
+                    26:97:6a:a3:1c:ad:90:53:50:b0:b1:6d:1d:b0:b8:
+                    6d:df:3c:ee:bd:3b:87:e8:db:4d:3a:72:78:dd:db:
+                    40:3d:c9:20:46:b8:4e:33:bb:76:b7:4f:b2:79:da:
+                    03:cc:f9:75:c0:1d:4c:51:0a:b9:9b:25:34:50:11:
+                    97:df:82:46:02:a9:bc:98:51:3e:c3:df:57:ad:b7:
+                    28:be:de:65:ce:2b:f3:2c:22:f5:af:31:28:1c:ef:
+                    10:09
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
+            X509v3 Authority Key Identifier: 
+                keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         32:97:4c:af:bf:ca:e0:10:66:b7:cc:8b:0d:05:d1:d2:ca:b8:
+         0c:c2:78:57:1f:f6:55:9c:74:fc:bd:31:58:05:18:bc:6d:b5:
+         79:9a:22:8c:1f:da:33:ea:ef:db:e3:cb:46:bc:36:91:8b:d8:
+         36:8d:06:40:c2:e9:fe:79:1b:4a:c5:70:74:6d:9d:92:2c:90:
+         be:3c:a7:88:03:e4:b7:ef:f4:b0:00:34:ec:8f:d1:c3:23:2b:
+         ef:bc:ff:ab:a2:0e:bc:ba:11:a5:8e:44:80:fa:d6:f4:26:66:
+         84:64:2c:e3:23:62:0c:e2:ba:01:ab:5f:24:d6:9d:7e:9c:7b:
+         f4:5d:0e:ba:64:35:6e:a5:fa:98:0c:57:f3:72:e8:3e:2e:ce:
+         b3:f9:e3:fa:ee:aa:79:f9:06:01:19:b2:b3:28:ff:f4:d6:bb:
+         17:bb:a6:a0:e0:45:23:f3:61:40:31:5c:a3:ee:88:1c:00:31:
+         54:96:f9:71:37:b5:7f:66:6a:af:04:94:09:39:99:b3:88:86:
+         9e:bb:d6:36:24:24:f4:37:2c:a6:6c:0b:35:2e:bb:40:af:a7:
+         64:8a:7f:f2:74:e3:94:0c:32:bd:31:3d:d9:79:68:0f:1e:4b:
+         17:c0:4e:df:85:3c:f0:84:df:58:f1:d2:4d:2f:ad:ff:1b:d7:
+         c8:9b:fe:dc
 -----BEGIN CERTIFICATE-----
-MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
-BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
-VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx
-CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
-MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1
-yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq
-rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV
-HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME
-bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO
-BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM
-IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g
-JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj
-AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn
-7F4WeS07J8LKardSvM0+hOA=
+MIIDmTCCAoGgAwIBAgIJAOG0pVw936YTMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTQxMjA1MDQ0ODExWhcNMzAxMjAxMDQ0ODExWjBjMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxCzAJBgNVBAMMAkNBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtJW9JJJzBiIBEygOCaOUBZZUndyPgznzZHoxcPbZ
+xBQZdYemsepS7UBUWvacE47Ydo9aZaUgGRm9UZ26Nc6aqVgK/BFuHcuo8ZJ57qr8
+4zJeqg0LIzSV6dOOP3KTkLwssAR1T6RKoDLbrImsNJvQB+OB6cpbJvD13v7VXqBU
+Jt3sWAduueWX9iBt2ErAUMyB5tI/x0dwixWJZXEuR8NCdrXuFg4ml2qjHK2QU1Cw
+sW0dsLht3zzuvTuH6NtNOnJ43dtAPckgRrhOM7t2t0+yedoDzPl1wB1MUQq5myU0
+UBGX34JGAqm8mFE+w99Xrbcovt5lzivzLCL1rzEoHO8QCQIDAQABo1AwTjAdBgNV
+HQ4EFgQUlGWho4fPv8F0u9iEl7Zr7rKQc7IwHwYDVR0jBBgwFoAUlGWho4fPv8F0
+u9iEl7Zr7rKQc7IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAMpdM
+r7/K4BBmt8yLDQXR0sq4DMJ4Vx/2VZx0/L0xWAUYvG21eZoijB/aM+rv2+PLRrw2
+kYvYNo0GQMLp/nkbSsVwdG2dkiyQvjyniAPkt+/0sAA07I/RwyMr77z/q6IOvLoR
+pY5EgPrW9CZmhGQs4yNiDOK6AatfJNadfpx79F0OumQ1bqX6mAxX83LoPi7Os/nj
++u6qefkGARmysyj/9Na7F7umoOBFI/NhQDFco+6IHAAxVJb5cTe1f2ZqrwSUCTmZ
+s4iGnrvWNiQk9DcspmwLNS67QK+nZIp/8nTjlAwyvTE92XloDx5LF8BO34U88ITf
+WPHSTS+t/xvXyJv+3A==
 -----END CERTIFICATE-----
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/client-cert.pem percona-xtrabackup-2.3.7/mysql-test/std_data/client-cert.pem
--- percona-xtrabackup-2.2.3/mysql-test/std_data/client-cert.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/client-cert.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,46 +1,82 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
-        Serial Number: 1048577 (0x100001)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+        Version: 3 (0x2)
+        Serial Number: 16263805969935345173 (0xe1b4a55c3ddfa615)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
         Validity
-            Not Before: Jan 29 11:50:22 2010 GMT
-            Not After : Jan 28 11:50:22 2015 GMT
-        Subject: C=SE, ST=Uppsala, O=MySQL AB
+            Not Before: Dec  5 04:49:23 2014 GMT
+            Not After : Dec  1 04:49:23 2029 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed:
-                    78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8:
-                    a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4:
-                    9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be:
-                    15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7:
-                    87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16:
-                    8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48:
-                    a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f:
-                    fc:3d:78:9b:49:6e:86:83:77
+                    00:c8:d1:a1:fe:a4:8c:f3:1b:17:71:1b:74:35:11:
+                    e0:0e:6c:40:0a:fb:c0:f7:f0:eb:bb:c9:1d:a1:c7:
+                    d7:b0:8a:f6:f1:cf:fa:6b:d0:79:64:eb:bb:69:a5:
+                    0d:80:06:df:52:14:d2:85:32:cf:bf:ce:2a:47:28:
+                    5b:cd:0b:28:ab:bb:07:33:d5:8b:d3:b4:72:c4:a6:
+                    b5:cc:37:b9:03:a8:78:56:25:58:1f:17:30:7c:d1:
+                    0a:bb:ec:3c:a3:03:90:97:99:92:49:ae:b3:57:96:
+                    5c:1a:e9:e8:02:23:ae:c8:c9:05:50:63:e5:77:a1:
+                    9a:73:06:74:0e:46:50:28:d8:c9:4f:c4:1c:37:b8:
+                    52:18:0b:af:19:2b:d4:e5:66:74:a4:f3:f0:da:09:
+                    30:f7:bc:0c:c9:9b:ce:57:06:04:27:e5:a1:2f:2b:
+                    a0:ba:b7:99:69:9d:46:fc:21:b6:45:81:9d:b2:3d:
+                    2f:76:15:78:b5:33:62:ac:1e:6b:66:dd:27:61:0a:
+                    47:02:20:2b:57:bb:32:20:dd:06:4c:76:a4:9b:72:
+                    42:4c:9c:2c:76:72:12:1f:4b:df:1e:11:1f:a9:06:
+                    54:dc:88:12:b0:49:d5:40:83:ef:7e:48:43:86:7a:
+                    37:a6:c1:d7:9b:fe:08:34:98:e0:54:3c:30:4f:79:
+                    15:29
                 Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0:
-        34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81:
-        c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99:
-        01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b:
-        89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77:
-        02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee:
-        02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35:
-        32:0b
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                26:0C:90:BC:97:12:9E:43:BB:5E:FE:EB:A9:66:B3:C3:EE:B2:18:CB
+            X509v3 Authority Key Identifier: 
+                keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
+
+    Signature Algorithm: sha256WithRSAEncryption
+         3e:3c:1f:6c:5b:83:d1:71:15:f5:45:52:fc:7f:67:bc:af:c5:
+         92:f5:74:78:13:43:3c:fe:b5:61:bf:00:47:43:45:a0:b9:dd:
+         a1:10:0c:29:69:2a:6f:7d:67:3d:1e:09:b5:15:74:bf:73:11:
+         e6:e9:09:b6:6b:b5:cc:1e:06:fd:bd:3a:11:d3:44:bd:ca:7a:
+         a1:f1:09:43:fc:bf:83:89:3a:b1:18:40:f3:cf:6d:12:ef:6e:
+         0c:b7:a4:99:03:8a:4f:0c:3c:2c:23:78:35:2a:99:ea:de:9c:
+         1b:e8:8d:19:fb:44:80:13:89:81:c5:05:4b:a7:66:6b:c0:31:
+         41:f0:6c:60:aa:ec:d3:4c:ff:c1:3b:d5:bb:0d:42:7d:37:5e:
+         80:e7:9c:7e:60:90:0f:a4:4e:70:20:9c:b1:e4:1b:70:65:b0:
+         ef:bb:41:16:ed:ad:46:ce:34:d3:02:3d:dd:e2:50:fa:3c:5d:
+         f0:e2:71:f8:9a:ef:a3:32:25:c5:8e:64:f4:46:e1:f4:c0:69:
+         d2:34:56:8d:d9:c2:6e:b6:55:3b:6a:4d:b6:d2:84:ab:85:7b:
+         cb:fd:b4:73:40:ba:5d:49:e2:0d:39:77:17:01:49:bb:72:8b:
+         3a:c9:b1:e2:cd:13:d2:9c:ce:7d:6c:a8:f0:32:c9:a4:af:56:
+         6f:8a:e6:88
 -----BEGIN CERTIFICATE-----
-MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
-QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4
-oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2
-atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu
-hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ
-A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja
-dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY
-RrLFnG84kYo1Mgs=
+MIIDyDCCArCgAwIBAgIJAOG0pVw936YVMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTQxMjA1MDQ0OTIzWhcNMjkxMjAxMDQ0OTIzWjBnMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxDzANBgNVBAMMBkNsaWVudDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMjRof6kjPMbF3EbdDUR4A5sQAr7wPfw67vJ
+HaHH17CK9vHP+mvQeWTru2mlDYAG31IU0oUyz7/OKkcoW80LKKu7BzPVi9O0csSm
+tcw3uQOoeFYlWB8XMHzRCrvsPKMDkJeZkkmus1eWXBrp6AIjrsjJBVBj5XehmnMG
+dA5GUCjYyU/EHDe4UhgLrxkr1OVmdKTz8NoJMPe8DMmbzlcGBCfloS8roLq3mWmd
+RvwhtkWBnbI9L3YVeLUzYqwea2bdJ2EKRwIgK1e7MiDdBkx2pJtyQkycLHZyEh9L
+3x4RH6kGVNyIErBJ1UCD735IQ4Z6N6bB15v+CDSY4FQ8ME95FSkCAwEAAaN7MHkw
+CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+dGlmaWNhdGUwHQYDVR0OBBYEFCYMkLyXEp5Du17+66lms8PushjLMB8GA1UdIwQY
+MBaAFJRloaOHz7/BdLvYhJe2a+6ykHOyMA0GCSqGSIb3DQEBCwUAA4IBAQA+PB9s
+W4PRcRX1RVL8f2e8r8WS9XR4E0M8/rVhvwBHQ0Wgud2hEAwpaSpvfWc9Hgm1FXS/
+cxHm6Qm2a7XMHgb9vToR00S9ynqh8QlD/L+DiTqxGEDzz20S724Mt6SZA4pPDDws
+I3g1Kpnq3pwb6I0Z+0SAE4mBxQVLp2ZrwDFB8GxgquzTTP/BO9W7DUJ9N16A55x+
+YJAPpE5wIJyx5BtwZbDvu0EW7a1GzjTTAj3d4lD6PF3w4nH4mu+jMiXFjmT0RuH0
+wGnSNFaN2cJutlU7ak220oSrhXvL/bRzQLpdSeINOXcXAUm7cos6ybHizRPSnM59
+bKjwMsmkr1ZviuaI
 -----END CERTIFICATE-----
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/client-key.pem percona-xtrabackup-2.3.7/mysql-test/std_data/client-key.pem
--- percona-xtrabackup-2.2.3/mysql-test/std_data/client-key.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/client-key.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDMmjdJE2bcz+MLE6Ej7XjbTr0R9owNdvmjMlaa+KEhalVOTT/m
-Z50mmbLNpJrSK1lc14rTYGj4GL3FvhXhKjyj1GHL9RGUF4GB94eM9mrS7tjmd/Zi
-Zk0uFo0IgUrJxksx5bnHioSWSKdHjA0mkFZO5qVujLPyn/w9eJtJboaDdwIDAQAB
-AoGASqk/4We2En+93y3jkIO4pXafIe3w/3zZ7caRue1ehx4RUQh5d+95djuB9u7J
-HEZ7TpjM7QNyao5EueL6gvbxt0LXFvqAMni7yM9tt/HUYtHHPqYiRtUny9bKYFTm
-l8szCCMal/wD9GZU9ByHDNHm7tHUMyMhARNTYSgx+SERFmECQQD/6jJocC4SXf6f
-T3LqimWR02lbJ7qCoDgRglsUXh0zjrG+IIiAyE+QOCCx1GMe3Uw6bsIuYwdHT6as
-WcdPs04xAkEAzKulvEvLVvN5zfa/DTYRTV7jh6aDleOxjsD5oN/oJXoACnPzVuUL
-qQQMNtuAXm6Q1QItrRxpQsSKbY0UQka6JwJBAOSgoNoG5lIIYTKIMvzwGV+XBLeo
-HYsXgh+6Wo4uql3mLErUG78ZtWL9kc/tE4R+ZdyKGLaCR/1gXmH5bwN4B/ECQEBb
-uUH8k3REG4kojesZlVc+/00ojzgS4UKCa/yqa9VdB6ZBz8MDQydinnShkTwgiGpy
-xOoqhO753o2UT0qH8wECQQC99IEJWUnwvExVMkLaZH5NjAFJkb22sjkmuT11tAgU
-RQgOMoDOm6driojnOnDWOkx1r1Gy9NgMLooduja4v6cx
+MIIEowIBAAKCAQEAyNGh/qSM8xsXcRt0NRHgDmxACvvA9/Dru8kdocfXsIr28c/6
+a9B5ZOu7aaUNgAbfUhTShTLPv84qRyhbzQsoq7sHM9WL07RyxKa1zDe5A6h4ViVY
+HxcwfNEKu+w8owOQl5mSSa6zV5ZcGunoAiOuyMkFUGPld6GacwZ0DkZQKNjJT8Qc
+N7hSGAuvGSvU5WZ0pPPw2gkw97wMyZvOVwYEJ+WhLyugureZaZ1G/CG2RYGdsj0v
+dhV4tTNirB5rZt0nYQpHAiArV7syIN0GTHakm3JCTJwsdnISH0vfHhEfqQZU3IgS
+sEnVQIPvfkhDhno3psHXm/4INJjgVDwwT3kVKQIDAQABAoIBAFrliE2abbIcMSAh
+LRhYXvIoTVSrX0za39i/z4nKyvY98EjDurXSRyBHEy1eaB3q/mpIwoFH3oES8FAF
+FIha5K3Wmgv8PK42nzwjuWYWUsg1GULk5F4uQOQ+On2VEF0439m+yVhQmxyqEkac
+WUeenx6C3sTkcpkTrLUj1qQfb2kM6JmeGsXfJNFLP/U36x8Q6kp2089DxBFgVcFu
+W3ge24W08umDBKuZWIF5B9GX8JFzmbAwPT2KATppGeroX0+bo4KAts4F1dBKmbrm
+3815kqYnz+VqyWbw6AHUA7aw2TY6QIT1oHrm+EdfnOQZaf8d/2CHWlIZPmxB46Lz
+6zQTVgECgYEA/L9awju31alISm0WYOPZBBndIHsOve4iKcMmy85GTKSvV+cAvgAZ
+uQwabZi4ZYHYaa4LPF0hbTb5IdV6krQzGYXpAjlwaarW0Zx4VoQIErWyji79OnFD
+QpbzIPGQiUAc0D7Gk7kJpwNmpgjyYcSkjEibF4cFEhDpTVlccbgxboUCgYEAy2c0
+tIfKiu1hwo/8UdcO4LQ6LWJdbIDdNU45HCk/IhIe4FrB0pXnk1yIBBn0ezY7Mgzy
+USYlfPTjFmnQOFF/6bHyGmeB4YTYamlTDuHlUUdH76brCZ3ywUlqpToiAPJFjx36
+nTNjo8JLF7eyjMOy4uN6eJzzS7OP9GwsHllux1UCgYBeFLCo+me8va2uHpsk58th
+TmtUatoa8uh+mSj41kiuwOKQGunYz9rDWfEAeMey6TlwZRvDlXsa10q3QGrG7xLS
+XllUvaLNgo1CKzdUJQOIS2AysuUJ+x0pTV0lFyZRIK9ZCPUMCeXA6HAuP8hRgkwp
+9+DbSiQmDGt7olbZ8dFcrQKBgQCOFzzUWH//aTD/z8H+EfQMuRpjFfIZmDPvxwNS
+TuYRkQMMy5nW2G17ngpOgyss34eewTiNw84waoow4B5bGWP4Bx0PoPs0Za8hNw6U
+uO2PR/JS0hIjF7m7mOPtJJ0YeCZrgg/OvVV/0nzOxr7uYs+WfD7T/yBe48NOhjqT
+wPoIOQKBgGRLd3G8b0AbPTv4NVwzIl3xKHCKYd1EcBbfyPWjAZ8+BagEPK8mJfOt
+MXkMrSKOq6ShEfzRsdJna7eI0te3zNXXFu/G3IHQZUdC0RtksW5T9tXvASRN3wnX
++aaoIM1q/KUgfH0TF/1pQPHFSUfFrGyLDiCDUu1sJ2ijULr5rZES
 -----END RSA PRIVATE KEY-----
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/dtrace.d percona-xtrabackup-2.3.7/mysql-test/std_data/dtrace.d
--- percona-xtrabackup-2.2.3/mysql-test/std_data/dtrace.d	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/dtrace.d	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,119 @@
+/*
+  This Dtrace script is used by the test "dynamic_tracing.test" for
+  dynamic tracing. This script is executed in background by
+  "dynamic_tracing.test" and SQL queries are executed concurrently. When
+  any probe used in this script are hit then counter is incremented. After
+  hitting all the 8(exp_probe_hits) probes, summary containing probes enabled
+  and their hit state is printed.
+*/
+
+#pragma D option quiet
+
+short query_parse_start;
+short query_parse_done;
+short select_start;
+short select_done;
+short net_read_start;
+short net_read_done;
+short handler_rdlock_start;
+short handler_rdlock_done;
+
+short tot_probe_hits;
+short exp_probe_hits;
+
+BEGIN
+{
+  query_parse_start= 0;
+  query_parse_done= 0;
+  select_start= 0;
+  select_done= 0;
+  net_read_start= 0;
+  net_read_done= 0;
+  handler_rdlock_start= 0;
+  handler_rdlock_done= 0;
+  
+  tot_probe_hits= 0;
+  exp_probe_hits= 8;
+  printf("\n Dynamic tracing ...... started.\n");
+}
+
+mysql*:::query-parse-start
+/query_parse_start == 0/
+{
+  query_parse_start++;
+  tot_probe_hits++;
+}
+
+mysql*:::query-parse-done
+/query_parse_done == 0/
+{
+  query_parse_done++;
+  tot_probe_hits++;
+}
+
+mysql*:::select-start
+/select_start == 0/
+{
+  select_start++;
+  tot_probe_hits++;
+}
+
+mysql*:::select-done
+/select_done == 0/
+{
+  select_done++;
+  tot_probe_hits++;
+}
+
+mysql*:::net-read-start
+/net_read_start == 0/
+{
+  net_read_start++;
+  tot_probe_hits++;
+}
+
+mysql*:::net-read-done
+/net_read_done == 0/
+{
+  net_read_done++;
+  tot_probe_hits++;
+}
+
+mysql*:::handler-rdlock-start
+/handler_rdlock_start == 0/
+{
+  handler_rdlock_start++;
+  tot_probe_hits++;
+}
+
+mysql*:::handler-rdlock-done
+/handler_rdlock_done == 0/
+{
+  handler_rdlock_done++;
+  tot_probe_hits++;
+}
+
+mysql*:::query-parse-start,
+mysql*:::query-parse-done,
+mysql*:::select-start,
+mysql*:::select-done,
+mysql*:::net-read-start,
+mysql*:::net-read-done,
+mysql*:::handler-rdlock-start,
+mysql*:::handler-rdlock-done
+/tot_probe_hits >= exp_probe_hits/
+{
+  printf("\n query-parse-start    : %d", query_parse_start);
+  printf("\n query-parse-done     : %d", query_parse_done);
+  printf("\n select-start         : %d", select_start);
+  printf("\n select-done          : %d", select_done);
+  printf("\n net-read-start       : %d", net_read_start);
+  printf("\n net-read-done        : %d", net_read_done);
+  printf("\n handler_rdlock_start : %d", handler_rdlock_start);
+  printf("\n handler_rdlock_done  : %d", handler_rdlock_done);
+  printf("\n");
+  printf("\n Expected probe hits  : %d", exp_probe_hits);
+  printf("\n Actual probe hits    : %d\n", tot_probe_hits);
+  printf("\n Dynamic tracing ...... completed.\n");
+  exit(0);
+}
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/server8k-cert.pem percona-xtrabackup-2.3.7/mysql-test/std_data/server8k-cert.pem
--- percona-xtrabackup-2.2.3/mysql-test/std_data/server8k-cert.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/server8k-cert.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,51 +1,207 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 10754692786786449447 (0x9540581bd8dcb827)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
+        Validity
+            Not Before: Dec  5 04:50:48 2014 GMT
+            Not After : Dec  1 04:50:48 2029 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (8192 bit)
+                Modulus:
+                    00:d8:8f:9d:66:66:9c:12:ca:0a:ad:9e:9f:05:66:
+                    6c:6c:8a:db:19:9f:a2:d0:fa:38:dc:de:c5:a6:94:
+                    60:0d:4b:72:c9:85:e2:ff:27:c8:d4:ce:b1:29:66:
+                    31:e7:2b:4e:08:b3:a2:71:cf:1e:36:7c:8e:4d:08:
+                    6e:fd:7a:ea:c1:0d:5c:97:09:66:fa:ed:0b:36:64:
+                    8f:cc:39:35:a9:43:6c:a9:17:48:0f:2e:0a:4b:d3:
+                    94:bb:b0:5b:43:f1:4e:f7:e5:30:e1:ae:a2:a8:5d:
+                    3c:db:39:df:d6:4b:70:a6:c9:68:c3:f3:9d:19:d7:
+                    2f:2a:38:31:11:ab:f1:60:66:c3:38:4f:d9:6f:b5:
+                    49:df:ce:14:b5:fa:c8:95:04:50:69:90:9d:26:c2:
+                    e9:07:69:7b:a2:d8:91:e7:cd:de:c4:ed:9c:e4:c8:
+                    8c:e3:a0:cd:dd:2b:37:21:8f:ee:54:38:91:2b:2b:
+                    01:86:90:f0:2e:9a:06:8a:e1:f2:a2:3f:d1:d4:21:
+                    9f:b0:81:eb:d0:e9:d3:e9:a9:28:6e:c2:06:4b:94:
+                    6e:96:70:f5:31:33:dd:97:2f:cc:5d:80:c5:74:ce:
+                    c0:3d:b2:6a:81:b7:ce:65:4f:6a:49:3e:c9:5d:00:
+                    3c:06:4a:57:c9:a7:f9:bb:46:50:df:64:dc:13:1f:
+                    22:ad:21:0b:aa:4b:5d:94:60:9f:20:ff:28:aa:56:
+                    5f:f6:cd:23:34:fe:44:a2:d6:80:bd:a9:67:00:d6:
+                    a1:82:82:9f:c9:e8:0c:97:26:1e:a9:b1:e2:ee:01:
+                    ef:9d:c6:82:fc:72:33:02:40:35:cc:ae:51:23:f4:
+                    f8:92:29:d3:2f:5c:1f:03:c6:81:7d:fb:4f:e9:de:
+                    ed:68:3c:a1:be:7c:fa:11:96:2b:5a:10:c5:c5:cb:
+                    2e:7a:54:4c:7b:12:b8:07:01:d9:b5:38:0f:a6:43:
+                    70:28:81:8d:d7:95:ad:d6:e8:88:b4:19:62:05:7b:
+                    75:c0:2d:24:72:1c:4d:04:a3:f7:1d:6b:8b:fa:16:
+                    a3:5a:6c:51:ba:5c:62:fa:3e:82:7f:4e:10:db:d0:
+                    52:d4:81:df:0e:5b:33:7e:20:77:1d:51:ca:4e:13:
+                    ee:cd:72:36:28:b4:31:88:3d:61:0f:1a:80:19:f6:
+                    7d:71:5d:21:1f:dd:0b:d9:73:88:a9:72:4b:8d:a3:
+                    d6:f1:4f:5d:01:6e:9e:c2:28:97:80:de:5b:2d:ac:
+                    a3:c9:24:db:e9:0f:2b:36:ee:a7:f2:94:c1:41:7a:
+                    70:9f:fd:d0:31:a9:de:55:38:65:89:20:f4:02:f1:
+                    83:73:40:77:db:35:d2:66:ff:26:5f:f4:d2:e6:f9:
+                    ba:fc:6a:66:b1:02:24:04:a3:32:4b:21:85:83:b4:
+                    6a:97:3c:25:7f:65:cc:a6:dd:cc:ac:e5:22:09:58:
+                    dc:a1:0d:7d:b4:ac:98:98:81:1d:a7:83:d4:3a:e4:
+                    39:a7:04:6a:b6:b7:5d:a8:fe:0e:47:08:1d:95:61:
+                    eb:a8:97:53:91:1e:ca:1f:3f:19:5a:01:73:da:33:
+                    32:d7:33:ca:39:1e:00:37:6b:f8:18:47:30:3a:2e:
+                    99:39:d0:d0:49:6d:87:c1:98:59:d0:21:ca:12:6d:
+                    89:33:0f:f2:52:6e:d6:c5:78:dd:15:b6:11:d6:5e:
+                    72:e8:c7:12:00:c3:8d:57:34:e5:d8:6d:a2:e8:47:
+                    79:83:8c:49:17:3b:75:24:0d:de:e1:3b:dd:bc:b7:
+                    df:89:a6:31:e6:49:37:80:f8:8f:86:e3:42:f4:2e:
+                    dc:de:58:45:c4:41:a9:2d:a6:5d:f0:7d:81:3d:54:
+                    f4:8a:a3:5f:18:7c:02:c9:7f:1c:f5:9f:dd:0a:29:
+                    49:40:92:24:b3:b7:65:37:91:9a:a8:00:c4:4e:7f:
+                    7e:f7:97:de:24:2a:d7:3b:f2:a2:63:ec:38:b7:1f:
+                    9e:b5:72:99:bd:b1:c0:41:6a:57:97:e2:fb:11:32:
+                    ba:a3:5d:82:48:c5:0a:cc:2c:f5:21:7a:f1:99:56:
+                    1b:54:9d:c7:64:50:62:80:94:50:5a:40:32:61:f3:
+                    2c:f8:09:dc:f0:6d:2b:60:29:c2:86:70:5a:57:12:
+                    7d:09:73:ca:41:6d:22:61:18:1a:48:cb:80:95:be:
+                    08:e8:15:99:de:36:3a:bf:09:67:35:e8:53:d9:40:
+                    1b:27:e5:14:32:09:73:e0:f6:a9:19:ee:81:90:dc:
+                    b7:9d:b6:91:51:33:1e:1f:22:e0:bd:df:a8:d1:33:
+                    a7:ab:9b:9c:27:7a:3c:ef:aa:9e:4d:f8:a8:97:63:
+                    24:20:c8:36:ab:05:8a:c0:80:9b:64:0c:1f:ec:4f:
+                    de:ec:f0:9c:9c:54:db:02:ab:12:aa:ab:58:a3:49:
+                    25:bf:6a:0a:04:7f:2f:1d:41:11:23:4e:e2:83:51:
+                    e3:f5:12:95:22:72:13:f4:be:6f:e2:00:29:4f:fe:
+                    9b:ae:b9:e2:7d:72:d3:1b:e8:12:3b:6d:b6:d2:62:
+                    a4:91:31:46:e7:16:7f:9d:8d:74:5e:97:51:d1:cb:
+                    82:57:bb:bd:46:e4:9c:c5:bd:08:8b:68:20:f8:5e:
+                    d6:aa:ed:6e:4d:ba:a4:29:fd:ac:5c:2f:25:14:d3:
+                    19:63:0c:01:75:6c:87:a5:0b:29:09:7f:13:7f:00:
+                    d4:63:72:e2:a0:39:88:80:68:2c:3f:49:b1:9b:94:
+                    77:63:08:05:55
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                3E:96:BB:23:C2:FD:41:11:7F:EB:63:9B:39:5F:58:2D:92:A0:F0:9F
+            X509v3 Authority Key Identifier: 
+                keyid:60:57:8F:09:CF:83:86:4B:35:32:BF:73:EB:81:4C:DB:36:27:12:8F
+
+    Signature Algorithm: sha256WithRSAEncryption
+         19:b8:4d:94:a3:41:1b:78:e8:fa:da:7c:c3:0c:f5:42:6a:2e:
+         04:8c:f4:6e:90:e0:d1:55:28:7c:97:85:18:12:c4:ff:d3:ba:
+         74:f1:7f:af:b0:ab:4d:64:f4:45:58:6e:b1:2e:06:cc:a7:5b:
+         cd:25:8f:60:68:14:e1:f9:56:21:40:43:e4:c4:ee:91:72:01:
+         7d:86:41:2f:ac:6d:be:c6:1a:2a:ae:dd:13:ca:51:01:37:33:
+         7e:b9:1a:9a:28:16:8c:bc:d1:e7:d4:46:55:87:1f:05:93:4c:
+         b5:75:ff:ed:ca:29:b2:5d:15:05:4c:02:a9:53:3c:d9:11:01:
+         04:db:82:ad:01:ad:4e:d4:7d:9e:6a:00:5e:cc:88:83:42:98:
+         6e:4b:cd:7c:55:c6:4c:98:39:db:d1:e3:aa:f3:27:83:6a:3c:
+         01:ad:c5:ee:ef:01:aa:b7:4d:f7:a1:86:34:9d:61:20:7c:a0:
+         c0:75:26:24:6f:a3:68:0e:03:4d:cf:f3:bf:d9:40:4f:1a:04:
+         4d:9c:5e:62:49:37:5b:78:ee:c5:11:78:ee:e5:87:f7:f4:f1:
+         6d:0d:bd:a2:fb:a2:6c:27:91:d4:84:43:03:f5:9b:11:50:ab:
+         45:ca:7c:3d:fe:5c:6b:e1:03:20:c8:c9:ac:66:ff:74:6e:0d:
+         87:47:75:77:41:ca:5e:e9:77:5f:2b:09:bb:a5:7d:fc:cf:ed:
+         75:dd:b0:ee:b8:da:3e:59:d0:e2:7f:38:16:fe:04:c9:99:d1:
+         06:84:11:b1:07:8a:4d:59:d6:70:c3:9b:f7:f8:b9:ae:99:86:
+         b6:31:a4:13:de:7e:23:27:33:96:d1:9b:15:65:98:04:e5:f8:
+         73:3c:f3:72:ef:a1:28:06:1d:7e:88:52:c1:f7:eb:2a:e1:f7:
+         57:e5:ed:08:e9:ee:f8:95:3d:ec:4c:98:93:e7:e1:ea:a5:02:
+         37:c1:66:18:ba:01:78:05:6d:c4:6b:2c:61:ee:bf:a9:e1:4d:
+         bf:95:31:f5:28:2a:f8:c9:ce:72:a5:c7:a3:38:2c:f6:69:34:
+         eb:cb:e9:b3:4f:78:de:87:61:8a:34:bd:5a:64:27:f0:42:1a:
+         22:e9:2b:ac:97:f1:ed:7a:50:3b:3e:18:ae:b7:d9:20:9b:d6:
+         12:3b:18:b1:47:71:39:0a:31:54:9f:fe:f2:90:d7:b8:27:6b:
+         49:e5:82:cd:82:99:95:b1:ab:aa:1f:7a:e4:4e:6e:46:91:a7:
+         16:b8:09:a3:5b:ec:6f:57:ca:b4:4f:69:e7:f5:f3:b9:03:93:
+         08:90:9d:8d:57:82:77:bc:69:f8:e4:46:d9:4d:d1:25:ea:b8:
+         60:b0:e2:cd:0c:ff:c2:63:65:20:f4:2c:34:36:34:a3:cf:67:
+         6a:01:3e:51:5f:4a:49:26:9d:30:3f:03:05:70:22:b1:e3:46:
+         d1:ff:23:23:45:08:4b:0e:77:db:91:d9:a2:5c:15:48:49:ee:
+         08:48:90:c3:25:44:b7:7b:9f:82:96:7e:8e:91:91:e5:a0:4d:
+         af:04:b8:72:df:07:a0:4b:02:79:0e:38:05:47:61:c3:9e:b4:
+         bf:01:00:10:c3:12:44:64:12:7a:bc:e1:c8:41:e5:cb:0d:7c:
+         52:32:7f:71:c1:3f:6e:d3:81:d3:12:ec:85:4c:16:72:d2:79:
+         f8:bf:c0:fe:31:14:47:53:20:87:73:bb:34:8f:60:4a:9e:91:
+         35:6e:20:96:da:bd:4b:7e:bd:c7:c4:f9:25:54:40:2c:9d:b0:
+         8b:b5:fb:1e:74:59:a5:f7:b9:b7:23:56:3b:eb:2e:0a:eb:f5:
+         10:9b:88:5b:49:8e:0f:05:61:7b:e5:a9:a0:24:f2:16:3f:cb:
+         5b:06:d6:a5:bb:94:3a:46:2e:43:c5:02:67:b1:7d:5d:b6:c0:
+         f9:93:2a:d6:18:95:89:73:ff:3b:a1:f3:a6:bd:5b:6a:f0:e0:
+         11:e8:95:09:83:5d:69:c3:91:e8:88:ea:b2:7c:32:73:a8:b0:
+         a4:24:d8:e5:6f:c7:97:8b:3e:c7:1e:69:6a:2a:b7:db:d1:26:
+         7b:94:83:27:6d:d2:82:58:dd:a7:c2:74:0d:43:13:e2:c5:96:
+         9f:3c:00:40:1a:10:b1:da:62:23:2e:b7:5c:33:61:56:3b:8b:
+         b4:b9:01:64:71:67:82:7c:18:2c:e8:d9:cf:e7:da:4b:16:7a:
+         91:67:af:82:0e:ac:7a:c9:cc:47:9b:84:b9:49:e8:3d:33:a4:
+         66:3f:c3:c1:20:ba:d1:0e:1e:11:80:82:78:90:25:a4:bc:80:
+         a2:25:8a:5c:de:3c:59:52:2f:b3:50:bb:0b:5a:f1:96:8d:d2:
+         eb:b9:f1:e9:72:a8:ae:f2:15:fd:5a:9c:a3:e8:ca:26:e9:67:
+         80:13:38:1f:38:9f:85:8a:82:3c:4f:d3:04:ff:3a:13:f7:b5:
+         13:f7:e3:50:1d:d6:e1:e6:1e:d0:b4:c8:5e:21:d7:22:cc:01:
+         de:db:d1:c4:a2:5c:0b:dc:dc:2f:08:e4:2e:12:c5:4a:bc:a1:
+         b3:92:32:1e:05:5c:7e:ca:43:6e:2e:06:3f:27:fd:1b:75:f0:
+         01:42:8d:ff:aa:f8:f1:47:5b:56:67:74:66:1b:aa:b5:75:41:
+         69:ba:91:66:ce:c3:3a:00:7a:93:59:1c:0c:49:c2:d2:d8:8d:
+         7a:57:a4:7d:ba:61:26:1e:e9:aa:ab:e6:cb:2c:16:0a
 -----BEGIN CERTIFICATE-----
-MIIJFDCCBPwCAQEwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCU0UxEDAOBgNV
-BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMQ0wCwYDVQQLEwRUZXN0MQsw
-CQYDVQQDEwJDQTAeFw0xMDA3MjgxNDA3MjhaFw0xODEwMTQxNDA3MjhaMFIxCzAJ
-BgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQjEN
-MAsGA1UECxMEVGVzdDEPMA0GA1UEAxMGc2VydmVyMIIEIjANBgkqhkiG9w0BAQEF
-AAOCBA8AMIIECgKCBAEA6h3v1OWb9I9U/Z8diBu/xYGS8NCTD3ZESboHxVI2qSEC
-PgxNNcG8Lh0ktQdgYcOe64MnDTZX0Bibm47hoDldrAlTSffFxQhylqBBoXxDF+Lr
-hXIqCz7K0PsK+bYusL9ezJ7PETDnCT7oy95q4GXbKsutbNsm9if4ZE41gs2KnoU2
-DA7kvMmkKojrMIL4+BqTXA20LLo0iSbgvUTvpSJw4u96BeyzMNnxK2wP5vvTtUo5
-hACbfU87YjaSKs+q2VXCzfyYGZk1L1xk5GUI0bP+jutf1dDzNttW2/q2Nf5rxx09
-Gh/GwmOnEk1O7cOZ8VQCsOHirIM39NuSARsY6Y3G5XM4k2W4nxyR/RtdG9bvs/33
-aGsZ5V5yp7WSs8s9HHwaCPSsUiLKckQ7uA0TTRgbeweMrrLKovG57jsbBBB8pQD4
-PRd31qgxCdstWXHiWwRyI8vOLWENPXPFqA/rJwwqNdWTogy38aqVXxGYR8PIwjA2
-OaIwFjwGZcsPNLqw6bgAN8O2UBqZHWiMF8mi7brvioDvAIufZuqa2SqT/At45H83
-psQ6R4FsxZt6SAK7EsdPo8OYTrY1i4iPZd/eKhnEu2srEZgsKRwY5H1mvDH5fWCc
-HSFu07sWmlmK6Or65Fsa0IaKLJiQDVVETd6xrI0wkM4AOcbKDrS7aywJ426dopbs
-+LFdt4N0cdII4gBgJAfLuuA2yrDXRq4P6cgpVMy0R+0dEYE8zzm8zf1a+Ud273LS
-9+LB+LJKwqbW8nOPBoiekimIKfJYoOA4+C/mAjsYl1sVjjEhXJAs9S9L2UvnUk1P
-sZi4UKHI6eAIEl7VM1sQ4GbdZ0px2dF2Ax7pGkhD+DLpYyYkCprharKZdmuUNLUd
-NhXxi/HSEiE+Uy+o8RIzmH7LuROl/ZgnfHjJEiBLt2qPvwrwYd4c3XuXWs4YsWfV
-JTt8Mx2ihgVcdGy9//shCSmgJwR1oWrhgC10AEL2fKeRnYUal1i+IxFPp7nb8uwx
-UADgR0cY4A3qR/JP489QFIcxBTVs65De+Bq3ecnujk6yeGpD9iptonq4Y8uNZMc1
-kOE7GiFGwR4EufT5SEMh+tUkjth2r+842vmZZuxrVQaohDiATmIJA07W51zKH+nQ
-uw4qVKnAhPaDLCLc7YMIH9JcmkeQX0nf8/S2O2WYDH8glVDi5hfW08tCmV647vRY
-nTIywUTO0lFpz7M+VyMNaJ6yXU6biBV5hLAI8C5ldr/SWI789W2+ebBaJ9gfK+PT
-trohFSK37GcoSH4V6qSLJHCBASEsiddqHIHMLJZRYD+B6J3tLhjVUM43u+MEGbFT
-d33ZDke/WzLTExWkaOv36e67gDBmgDuj9yroq3wGfwIDAQABMA0GCSqGSIb3DQEB
-BAUAA4IEAQCc9RBhRbuWlmRZPZkqIdi5/+enyjoMmOa6ryJPxFSP8D2jrlHgQsk1
-+GsJmPFT3rwWfoGAQu/aeSX4sp8OhKVJtqNA6MJrGYnZIMolgYa1wZPbkjJsdEfi
-UsZdIB0n2+KA0xwEdGPdkGCfNPBtOg557DkcyEvsIZ9ELp4Pp2XzWRhyFGasJZc4
-YwgD/3K2rpOPZoMkBKeKqV19j41OfLKGBVyuaqzitbu9+KT4RU1ibr2a+UuFCwdT
-oqyN7bfWXjcjXOMkxCsOmLfKmqQxs7TEOVrYPTdYjamDxLy/e5g5FgoCxGY8iil0
-+YFLZyH6eEx/Os9DlG/M3O1MeRD9U97CdsphbDVZIDyWw5xeX8qQHJe0KSprAgiG
-TLhTZHeyrKujQCQS1oFFmNy4gSqXt0j1/6/9T80j6HeyjiiYEaEQK9YLTAjRoA7W
-VN8wtHI5F3RlNOVQEJks/bjdlpLL3VhaWtfewGh/mXRGcow84cgcsejMexmhreHm
-JfTUl9+X1IFFxGq2/606A9ROQ7kN/s4rXu7/TiMODXI/kZijoWd2SCc7Z0YWoNo7
-IRKkmZtrsflJbObEuK2Jk59uqzSxyQOBId8qtbPo8qJJyHGV5GCp34g4x67BxJBo
-h1iyVMamBAS5Ip1ejghuROrB8Hit8NhAZApXju62btJeXLX+mQayXb/wC/IXNJJD
-83tXiLfZgs6GzLAq7+KW/64sZSvj87CPiNtxkvjchAvyr+fhbBXCrf4rlOjJE6SH
-Je2/Jon7uqijncARGLBeYUT0Aa6k1slpXuSKxDNt7EIkP21kDZ5/OJ0Y1u587KVB
-dEhuDgNf2/8ij7gAQBwBoZMe1DrwddrxgLLBlyHpAZetNYFZNT+Cs/OlpqI0Jm59
-kK9pX0BY4AGOd23XM3K/uLawdmf67kkftim7aVaqXFHPiWsJVtlzmidKvNSmbmZe
-dOmMXp6PBoqcdusFVUS7vjd3KAes5wUX/CaTyOOPRu0LMSnpwEnaL76IC9x4Jd6d
-7QqY/OFTjpPH8nP57LwouiT6MgSUCWGaOkPuBJ9w9sENSbbINpgJJ42iAe2kE+R7
-qEIvf/2ETCTseeQUqm2nWiSPLkNagEh6kojmEoKrGyrv3YjrSXSOY1a70tDVy43+
-ueQDQzNZm3Q7inpke2ZKvWyY0LQmLzP2te+tnNBcdLyKJx7emPRTuMUlEdK7cLbt
-V3Sy9IKtyAXqqd66fPFj4NhJygyncj8M6CSqhG5L0GhDbkA8UJ8yK/gfKm3h5xe2
-utULK5VMtAhQt6cVahO59A9t/OI17y45bmlIgdlEQISzVFe9ZbIUJW44zBfPx74k
-/w8pMRr8gEuRqpL2WdJiKGG6lhMHLVFo
+MIIJyDCCBbCgAwIBAgIJAJVAWBvY3LgnMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTQxMjA1MDQ1MDQ4WhcNMjkxMjAxMDQ1MDQ4WjBnMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxDzANBgNVBAMMBlNlcnZlcjCCBCIwDQYJKoZI
+hvcNAQEBBQADggQPADCCBAoCggQBANiPnWZmnBLKCq2enwVmbGyK2xmfotD6ONze
+xaaUYA1LcsmF4v8nyNTOsSlmMecrTgizonHPHjZ8jk0Ibv166sENXJcJZvrtCzZk
+j8w5NalDbKkXSA8uCkvTlLuwW0PxTvflMOGuoqhdPNs539ZLcKbJaMPznRnXLyo4
+MRGr8WBmwzhP2W+1Sd/OFLX6yJUEUGmQnSbC6Qdpe6LYkefN3sTtnOTIjOOgzd0r
+NyGP7lQ4kSsrAYaQ8C6aBorh8qI/0dQhn7CB69Dp0+mpKG7CBkuUbpZw9TEz3Zcv
+zF2AxXTOwD2yaoG3zmVPakk+yV0APAZKV8mn+btGUN9k3BMfIq0hC6pLXZRgnyD/
+KKpWX/bNIzT+RKLWgL2pZwDWoYKCn8noDJcmHqmx4u4B753GgvxyMwJANcyuUSP0
++JIp0y9cHwPGgX37T+ne7Wg8ob58+hGWK1oQxcXLLnpUTHsSuAcB2bU4D6ZDcCiB
+jdeVrdboiLQZYgV7dcAtJHIcTQSj9x1ri/oWo1psUbpcYvo+gn9OENvQUtSB3w5b
+M34gdx1Ryk4T7s1yNii0MYg9YQ8agBn2fXFdIR/dC9lziKlyS42j1vFPXQFunsIo
+l4DeWy2so8kk2+kPKzbup/KUwUF6cJ/90DGp3lU4ZYkg9ALxg3NAd9s10mb/Jl/0
+0ub5uvxqZrECJASjMkshhYO0apc8JX9lzKbdzKzlIglY3KENfbSsmJiBHaeD1Drk
+OacEara3Xaj+DkcIHZVh66iXU5Eeyh8/GVoBc9ozMtczyjkeADdr+BhHMDoumTnQ
+0Elth8GYWdAhyhJtiTMP8lJu1sV43RW2EdZecujHEgDDjVc05dhtouhHeYOMSRc7
+dSQN3uE73by334mmMeZJN4D4j4bjQvQu3N5YRcRBqS2mXfB9gT1U9IqjXxh8Asl/
+HPWf3QopSUCSJLO3ZTeRmqgAxE5/fveX3iQq1zvyomPsOLcfnrVymb2xwEFqV5fi
++xEyuqNdgkjFCsws9SF68ZlWG1Sdx2RQYoCUUFpAMmHzLPgJ3PBtK2ApwoZwWlcS
+fQlzykFtImEYGkjLgJW+COgVmd42Or8JZzXoU9lAGyflFDIJc+D2qRnugZDct522
+kVEzHh8i4L3fqNEzp6ubnCd6PO+qnk34qJdjJCDINqsFisCAm2QMH+xP3uzwnJxU
+2wKrEqqrWKNJJb9qCgR/Lx1BESNO4oNR4/USlSJyE/S+b+IAKU/+m6654n1y0xvo
+EjttttJipJExRucWf52NdF6XUdHLgle7vUbknMW9CItoIPhe1qrtbk26pCn9rFwv
+JRTTGWMMAXVsh6ULKQl/E38A1GNy4qA5iIBoLD9JsZuUd2MIBVUCAwEAAaN7MHkw
+CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+dGlmaWNhdGUwHQYDVR0OBBYEFD6WuyPC/UERf+tjmzlfWC2SoPCfMB8GA1UdIwQY
+MBaAFGBXjwnPg4ZLNTK/c+uBTNs2JxKPMA0GCSqGSIb3DQEBCwUAA4IEAQAZuE2U
+o0EbeOj62nzDDPVCai4EjPRukODRVSh8l4UYEsT/07p08X+vsKtNZPRFWG6xLgbM
+p1vNJY9gaBTh+VYhQEPkxO6RcgF9hkEvrG2+xhoqrt0TylEBNzN+uRqaKBaMvNHn
+1EZVhx8Fk0y1df/tyimyXRUFTAKpUzzZEQEE24KtAa1O1H2eagBezIiDQphuS818
+VcZMmDnb0eOq8yeDajwBrcXu7wGqt033oYY0nWEgfKDAdSYkb6NoDgNNz/O/2UBP
+GgRNnF5iSTdbeO7FEXju5Yf39PFtDb2i+6JsJ5HUhEMD9ZsRUKtFynw9/lxr4QMg
+yMmsZv90bg2HR3V3Qcpe6XdfKwm7pX38z+113bDuuNo+WdDifzgW/gTJmdEGhBGx
+B4pNWdZww5v3+LmumYa2MaQT3n4jJzOW0ZsVZZgE5fhzPPNy76EoBh1+iFLB9+sq
+4fdX5e0I6e74lT3sTJiT5+HqpQI3wWYYugF4BW3Eayxh7r+p4U2/lTH1KCr4yc5y
+pcejOCz2aTTry+mzT3jeh2GKNL1aZCfwQhoi6Susl/HtelA7Phiut9kgm9YSOxix
+R3E5CjFUn/7ykNe4J2tJ5YLNgpmVsauqH3rkTm5GkacWuAmjW+xvV8q0T2nn9fO5
+A5MIkJ2NV4J3vGn45EbZTdEl6rhgsOLNDP/CY2Ug9Cw0NjSjz2dqAT5RX0pJJp0w
+PwMFcCKx40bR/yMjRQhLDnfbkdmiXBVISe4ISJDDJUS3e5+Cln6OkZHloE2vBLhy
+3wegSwJ5DjgFR2HDnrS/AQAQwxJEZBJ6vOHIQeXLDXxSMn9xwT9u04HTEuyFTBZy
+0nn4v8D+MRRHUyCHc7s0j2BKnpE1biCW2r1Lfr3HxPklVEAsnbCLtfsedFml97m3
+I1Y76y4K6/UQm4hbSY4PBWF75amgJPIWP8tbBtalu5Q6Ri5DxQJnsX1dtsD5kyrW
+GJWJc/87ofOmvVtq8OAR6JUJg11pw5HoiOqyfDJzqLCkJNjlb8eXiz7HHmlqKrfb
+0SZ7lIMnbdKCWN2nwnQNQxPixZafPABAGhCx2mIjLrdcM2FWO4u0uQFkcWeCfBgs
+6NnP59pLFnqRZ6+CDqx6ycxHm4S5Seg9M6RmP8PBILrRDh4RgIJ4kCWkvICiJYpc
+3jxZUi+zULsLWvGWjdLrufHpcqiu8hX9Wpyj6Mom6WeAEzgfOJ+FioI8T9ME/zoT
+97UT9+NQHdbh5h7QtMheIdcizAHe29HEolwL3NwvCOQuEsVKvKGzkjIeBVx+ykNu
+LgY/J/0bdfABQo3/qvjxR1tWZ3RmG6q1dUFpupFmzsM6AHqTWRwMScLS2I16V6R9
+umEmHumqq+bLLBYK
 -----END CERTIFICATE-----
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/server8k-key.pem percona-xtrabackup-2.3.7/mysql-test/std_data/server8k-key.pem
--- percona-xtrabackup-2.2.3/mysql-test/std_data/server8k-key.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/server8k-key.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,99 +1,99 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIISKQIBAAKCBAEA6h3v1OWb9I9U/Z8diBu/xYGS8NCTD3ZESboHxVI2qSECPgxN
-NcG8Lh0ktQdgYcOe64MnDTZX0Bibm47hoDldrAlTSffFxQhylqBBoXxDF+LrhXIq
-Cz7K0PsK+bYusL9ezJ7PETDnCT7oy95q4GXbKsutbNsm9if4ZE41gs2KnoU2DA7k
-vMmkKojrMIL4+BqTXA20LLo0iSbgvUTvpSJw4u96BeyzMNnxK2wP5vvTtUo5hACb
-fU87YjaSKs+q2VXCzfyYGZk1L1xk5GUI0bP+jutf1dDzNttW2/q2Nf5rxx09Gh/G
-wmOnEk1O7cOZ8VQCsOHirIM39NuSARsY6Y3G5XM4k2W4nxyR/RtdG9bvs/33aGsZ
-5V5yp7WSs8s9HHwaCPSsUiLKckQ7uA0TTRgbeweMrrLKovG57jsbBBB8pQD4PRd3
-1qgxCdstWXHiWwRyI8vOLWENPXPFqA/rJwwqNdWTogy38aqVXxGYR8PIwjA2OaIw
-FjwGZcsPNLqw6bgAN8O2UBqZHWiMF8mi7brvioDvAIufZuqa2SqT/At45H83psQ6
-R4FsxZt6SAK7EsdPo8OYTrY1i4iPZd/eKhnEu2srEZgsKRwY5H1mvDH5fWCcHSFu
-07sWmlmK6Or65Fsa0IaKLJiQDVVETd6xrI0wkM4AOcbKDrS7aywJ426dopbs+LFd
-t4N0cdII4gBgJAfLuuA2yrDXRq4P6cgpVMy0R+0dEYE8zzm8zf1a+Ud273LS9+LB
-+LJKwqbW8nOPBoiekimIKfJYoOA4+C/mAjsYl1sVjjEhXJAs9S9L2UvnUk1PsZi4
-UKHI6eAIEl7VM1sQ4GbdZ0px2dF2Ax7pGkhD+DLpYyYkCprharKZdmuUNLUdNhXx
-i/HSEiE+Uy+o8RIzmH7LuROl/ZgnfHjJEiBLt2qPvwrwYd4c3XuXWs4YsWfVJTt8
-Mx2ihgVcdGy9//shCSmgJwR1oWrhgC10AEL2fKeRnYUal1i+IxFPp7nb8uwxUADg
-R0cY4A3qR/JP489QFIcxBTVs65De+Bq3ecnujk6yeGpD9iptonq4Y8uNZMc1kOE7
-GiFGwR4EufT5SEMh+tUkjth2r+842vmZZuxrVQaohDiATmIJA07W51zKH+nQuw4q
-VKnAhPaDLCLc7YMIH9JcmkeQX0nf8/S2O2WYDH8glVDi5hfW08tCmV647vRYnTIy
-wUTO0lFpz7M+VyMNaJ6yXU6biBV5hLAI8C5ldr/SWI789W2+ebBaJ9gfK+PTtroh
-FSK37GcoSH4V6qSLJHCBASEsiddqHIHMLJZRYD+B6J3tLhjVUM43u+MEGbFTd33Z
-Dke/WzLTExWkaOv36e67gDBmgDuj9yroq3wGfwIDAQABAoIEAQCSt6YoZqigz/50
-XvYT6Uf6T6S1lBDFXNmY1qOuDkLBJTWRiwYMDViQEaWCaZgGTKDYeT3M8uR/Phyu
-lRFi5vCEMufmcAeZ3hxptw7KU+R8ILJ207/zgit6YglTys9h5txTIack39+6FJmx
-wbZ64HpETJZnpMO6+fuZaMXyLjuT8mmXjvHcOgXOvjWeFkZOveDhjJkAesUXuqyX
-EI+ajoXuQiPXeKonkD2qd7NTjzfy4gw/ZF4NXs0ZVJeviqtIPo2xp33udOw2vRFh
-bMvlF4cNLAbIKYVyOG0ruOfd2I7Unsc/CvD1u5vlRVuUd8OO0JZLIZR7hlRX+A58
-8O1g2H/wJZAsF1BnLnFzDGYCX2WjCCK3Zn85FkKGRa0lTdYDduad/C/N3Y2/pHFE
-e7U/2D7IkEei59tD2HcsDBB3MJnckkn/hyiL9qWcxqWZ61vurE+XjU6tc6fnfhk9
-pJQ6yU3epPU7Vfsk0UGA7bbgKpsyzyH8Zl76YC2mN2ZVJjZekfhY+ibT9odEPdOl
-yLB5iXA6/WhKkDWaOqZGOH+7MblWgT9wHINlcn+nKzOr00JHl26ac6aMlXXi9vbe
-4jgJbFK1HYlFIndyX/BdqRTsFemDoDrVqrEYsaONoVYDd9c5qrqYOeh34DhOksQW
-hNwWBfmMlfzgOGtCYhMeK+AajqTtUbMYQA6qp47KJd/Oa5Dvi3ZCpvZh3Ll5iIau
-rqCtmojsWCqmpWSu7P+Wu4+O3XkUMPdQUuQ5rJFESEBB3yEJcxqk/RItTcKNElNC
-PASrPrMD9cli7S/pJ+frbhu1Gna1ArXzXQE9pMozPaBpjCig7+15R0lL3pmOKO6e
-WK3dgSwrnW6TQdLPlSD4lbRoiIdTHVBczztDeUqVvFiV3/cuaEi1nvaVdAYLqjuL
-ogK4HwE/FQ54S0ijAsP52n25usoH6OTU3bSd/7NTp0vZCy3yf10x7HUdsh2DvhRO
-3+TSK5t0yz0Nt7hNwcI6pLmWUIYcZgpFc/WsiiGscTfhy8rh3kRHI8ylGq53KNF+
-yCVmjqnBRWs91ArxmeF1ctX2t3w5p7gf65hJWqoX/2DiSi5FBsr6HLxa5sUi4wRZ
-136aCNt5Wu7w+AzPDbQW6qKUGSyfHJAw4JZasZcaZLise5IWb1ks0DtFbWWdT3ux
-8r2AM7IO1WopnekrYCnx/aBvBAv4NjWozVA517ztVttPERt3AGb4nm387nYt5R2U
-NO2GBWcDyT8JQLKmffE1AkWolCR1GsvcNLQfLCbnNppgsnsLE/viTG4mq1wjnd8O
-2Q8nH1SVTuyGFREMp/zsiAEaGfdd0hI2r1J7OdNPBBCtmhITsy9ZYHqm5vrGvy3s
-vi2GuB2RAoICAQD/oWUsg4eTJxHifTJLz/tVSTXnw7DhfbFVa1K1rUV63/MRQAFW
-pabN4T6Yfp3CpdRkljCA8KPJZj7euwhm4OEg1ulpOouA+cfWlE9RFE8wyOK5SYwM
-k+nk31P9MUC866pZg/ghzBGDub91OW1+ZGEtqnLI/n/LhiAIWt0hJvgZclTc1cAL
-xffHVlFwoSyNl/nc3ueZCC95nOLst2XcuxZLLbOFtZCmDYsp49q/Jn6EFjn4Ge2o
-qp38z6eZgDMP1F4lb9nDqXPHfUSt2jxKlmpfXS+IPKdba67+EjhbtmUYzaR4EoPI
-zh+o6SrVWT6Yve7KGiYv06fuRz1m/lLQO/Arbd9ntSjgn+ZEXGOkbhnHUX3DJ4ny
-/6XEGB9NLQjern4uNTn0AaV+uvhncapFMaIBnVfq0Cw8eog0136PBYRaVX7T44j5
-HwIyGXWtYGA/SzDEQoksD0Y/T61BEGnLZaKeavNd82WwFvcYHZtE0J4aQGjCEE7N
-+nijzCy+j5ETmme9KJvQHpEyXP3N4RBko1eWvyTwFZDdIXtoa6TTEI51lm+FXJ/b
-Y+BzMr6KRo29FB+7//1ptUoMvn5hzL0PwOv2ZSTQuoG5hLDEbxWXLNhd1VHcfznF
-3EZHwfD2F8aGQ3kz+fkMTNfK955KorDrmLgvmV9eZZ5yQxGZrs5H5YfKpwKCAgEA
-6nSUbzfSdVFUH89NM5FmEJgkD06vqCgHl2mpyF+VmDGcay4K06eA4QbRO5kns13+
-n6PcBl/YVW/rNE8iFi+WxfqUpAjdR1HlShvTuTRVqtFTfuN8XhbYU6VMjKyuE0kd
-LKe3KRdwubjVNhXRZLBknU+3Y/4hnIR7mcE3/M5Zv5hjb7XnwWg/SzxV9WojCKiu
-vQ7cXhH5/o7EuKcl1d6vueGhWsRylCG9RimwgViR2H7zD9kpkOc0nNym9cSpb0Gv
-Lui4cf/fVwIt2HfNEGBjbM/83e2MH6b8Xp1fFAy0aXCdRtOo4LVOzJVAxn5dERMX
-4JJ4d5cSFbssDN1bITOKzuytfBqRIQGNkOfizgQNWUiaFI0MhEN/icymjm1ybOIh
-Gc9tzqKI4wP2X9g+u3+Oof1QaBcZ4UbZEU9ITN87Pa6XVJmpNx7A81BafWoEPFeE
-ahoO4XDwlHZazDuSlOseEShxXcVwaIiqySy7OBEPBVuYdEd2Qw/z3JTx9Kw8MKnf
-hu+ar5tz5dPnJIsvLeYCcJDe/K6loiZuHTtPbWEy9p6It7qubQNPBvTSBN5eVDKc
-Q2bTQNCx8SAAA9C5gJiwWoQKsXJzbRFRY77P9JjuGpua3YJ2nYBHEJmF+fp1R33c
-uHIyMphPMkKC4GC3/43kkMr6tck8kZbXGSYsLsBr2GkCggIBAJvvrjILQianzKcm
-zAmnI6AQ+ssYesvyyrxaraeZvSqJdlLtgmOCxVANuQt5IW9djUSWwZvGL4Np1aw0
-15k6UNqhftzsE7FnrVneOsww4WXXBUcV8FKz4Bf3i9qFswILmGzmrfSf8YczRfGS
-SJKzVPxwX3jwlrBmbx/pnb7dcLbFIbNcyLvl1ZJJu4BDMVRmgssTRp/5eExtQZg4
-//A4SA8wH7TO3yAMXvn8vrGgH8kfbdlEp88d1SYk3g4rP/rGB3A63NIYikIEzmJn
-ICQ3wUfPJnGq3kRMWgEuyCZaCy2oNE3yrWVPJ8z3/2MJ/79ZDVNHxEeki2o1FuW+
-+nGAPq+fZIp03iy4HdVRro7dgugtc9QaSHJtNId8V4vSjviX5Oz3FxUb9AJst58S
-nVV8Q2FMxBa/SlzSOkhRtCg2q1gXkzhaMnIVUleRZFGQ2uWBToxKMjcoUifIyN1J
-z999bkfI4hBLq5pRSAXz+YVu5SMKa10GaawIwJLat+i+1zboF6QyI2o/Wz8nrsNq
-KX/ajFGu5C94WFgsVoWKNI90KBLe48Ssje9c68waBlV/WHMg1YLvU3yqVDOV+K5c
-IHB9tPMnG+AgBYZPxSzuvnLrrkj/GeKx0WI7TrvzOLRGKJo6irMEJ8IzFegASRUq
-TVZKYQDYRG7m+lKlSxU+pyMAh2c9AoICAE4kavCip1eIssQjYLTGSkFPo/0iGbOv
-G9CgXAE3snFWX67tWphupKrbjdMSWcQTmPD2OTg6q6zWL4twsIi6dcMooHAHsFC7
-//LyUV/SDJdxSyXohiQJ8zH1zwy35RDydnHSuF5OvLh53T44iWDI1dAEqLgAFI3J
-LjTxzEpLMGiGTuYFt+ejai0WQAQayvBw4ESM9m+4CB2K0hBFTXv5y5HlnNTW0uWC
-VUZUUMrbjUieDz8B/zOXi9aYSGFzmZFGUDAPSqJcSMEELemPDF7f8WNr8vi42tIV
-4tlaFD1nep4F9bWMiCXU6B2RxVQi+7vcJEIqL1KUnGd3ydfD00K+ng4Xnj7Vz/cz
-QE7CqrpFaXmPlCMzW6+dm51/AyhHXDLkL2od05hiXcNkJ7KMLWRqwExHVIxM3shR
-x7lYNl3ArUsCrNd6m4aOjnrKFk7kjeLavHxskPccoGKrC9o0JMfTkWLgmuBJFQ0S
-N/HzIbcvIFWF0Ms4ojb50yp6ziXhXfJOO/0KUQEki71XIhvw89mVZszDzD5lqzjf
-HCZMBU4MbmL6NdEevFIDH0zPPkx3HPNtJt3kIJbit9wI8VhUMe+ldGnGxpWb8tKw
-SfM3vrHkYr+lizk26XfXMFhdAuVtT7dzQKSNEyP/1a2Hs307Xzgiv8JulJ8QIkrX
-/nsYWPOAGLG5AoICABmdW9Ppkvuhb1AEcjTWb+XCyopoBc6vit/uQWD9uO+CeX7a
-cfzq+iH01CAjyVMc4E1JDc5Lpi106U+GRGcAAaPJB2Sp5NznoxaOVrb71blu4Q4x
-bNjtKM/P/DXpO+yJYoOPdKtaSDhtnfNDM7H/jztJ3XIrOltKA7CcRDohbBWIx8Q0
-0uEpvfFpZZBco3yVmjP0RLgIVYn/ZDj9wGhSvFWIJ5vv6GXmtDrcHGMLxcfv7t76
-UVcMW/Yy4mYJRCzGOrWagyVijJ6MTVNciqadWcH1KcbB3EGoMFYMn61or2qJABPM
-xz89IlhnROU1Re3X/QRx5t86cw6oa+FqrWMOhSs31I0dNWSuS/xDympG27YIYSDd
-mv5seT78GjFmMJC5pPOLoXsbTPB0HpsX2/UL/w/eRAfilTOef/Cf9VE5MP/C2YR7
-NBxUU7/+21D6WvdtBTcZbrXWGroAo8zPP+PwX0+c6WoAvqDJvCPndp8xZhSgEJN/
-0kScptezi8n3ZHI95EA9U5mAHxHz0IhDDVzWw/z1f1SBPxKVX3+By3zaa3lrD2ch
-cHq7nBkX72veEevnHUY8Z2rHE2G2jdmRfOtwm4sjL0VBV9fRRoxzJWRduKyeOtDL
-EhhBhUoTrT48UnfW9hxnbNLB9P/hh+UJu9HrS2uAwHoGE1+8gcyundupGDBn
+MIISKQIBAAKCBAEA2I+dZmacEsoKrZ6fBWZsbIrbGZ+i0Po43N7FppRgDUtyyYXi
+/yfI1M6xKWYx5ytOCLOicc8eNnyOTQhu/XrqwQ1clwlm+u0LNmSPzDk1qUNsqRdI
+Dy4KS9OUu7BbQ/FO9+Uw4a6iqF082znf1ktwpslow/OdGdcvKjgxEavxYGbDOE/Z
+b7VJ384UtfrIlQRQaZCdJsLpB2l7otiR583exO2c5MiM46DN3Ss3IY/uVDiRKysB
+hpDwLpoGiuHyoj/R1CGfsIHr0OnT6akobsIGS5RulnD1MTPdly/MXYDFdM7APbJq
+gbfOZU9qST7JXQA8BkpXyaf5u0ZQ32TcEx8irSELqktdlGCfIP8oqlZf9s0jNP5E
+otaAvalnANahgoKfyegMlyYeqbHi7gHvncaC/HIzAkA1zK5RI/T4kinTL1wfA8aB
+fftP6d7taDyhvnz6EZYrWhDFxcsuelRMexK4BwHZtTgPpkNwKIGN15Wt1uiItBli
+BXt1wC0kchxNBKP3HWuL+hajWmxRulxi+j6Cf04Q29BS1IHfDlszfiB3HVHKThPu
+zXI2KLQxiD1hDxqAGfZ9cV0hH90L2XOIqXJLjaPW8U9dAW6ewiiXgN5bLayjySTb
+6Q8rNu6n8pTBQXpwn/3QManeVThliSD0AvGDc0B32zXSZv8mX/TS5vm6/GpmsQIk
+BKMySyGFg7Rqlzwlf2XMpt3MrOUiCVjcoQ19tKyYmIEdp4PUOuQ5pwRqtrddqP4O
+RwgdlWHrqJdTkR7KHz8ZWgFz2jMy1zPKOR4AN2v4GEcwOi6ZOdDQSW2HwZhZ0CHK
+Em2JMw/yUm7WxXjdFbYR1l5y6McSAMONVzTl2G2i6Ed5g4xJFzt1JA3e4TvdvLff
+iaYx5kk3gPiPhuNC9C7c3lhFxEGpLaZd8H2BPVT0iqNfGHwCyX8c9Z/dCilJQJIk
+s7dlN5GaqADETn9+95feJCrXO/KiY+w4tx+etXKZvbHAQWpXl+L7ETK6o12CSMUK
+zCz1IXrxmVYbVJ3HZFBigJRQWkAyYfMs+Anc8G0rYCnChnBaVxJ9CXPKQW0iYRga
+SMuAlb4I6BWZ3jY6vwlnNehT2UAbJ+UUMglz4PapGe6BkNy3nbaRUTMeHyLgvd+o
+0TOnq5ucJ3o876qeTfiol2MkIMg2qwWKwICbZAwf7E/e7PCcnFTbAqsSqqtYo0kl
+v2oKBH8vHUERI07ig1Hj9RKVInIT9L5v4gApT/6brrnifXLTG+gSO2220mKkkTFG
+5xZ/nY10XpdR0cuCV7u9RuScxb0Ii2gg+F7Wqu1uTbqkKf2sXC8lFNMZYwwBdWyH
+pQspCX8TfwDUY3LioDmIgGgsP0mxm5R3YwgFVQIDAQABAoIEAAYjvDClBBO8SqU1
+dAixKK3DGgcV8YW/MlGAt1XLqxV1aCGyfAcD17vAyGEGFrAZGDNC9H4Jgy/ERDyG
+2q6xB2rFuDRH/fVrNwApxbHihVTxJml80Xwsr/oKW5MeotfARZ7djo83ZkEjs4/7
+ig8HQIBaAXBcvb13zkyCH1IC7+rtvucfzGhQWXHQ4+Fs5Lbk0mrLwMjSicy9/tVV
+En3h5kjq+6G41dW2P1/f08ZN0FHu8J6qr3ZjMYwAreLOGRTkfkxnT6GvbUIU/v8G
+3rCVK5yE7sWxGiJ09/lLT53vAqoXGnglUMOwtFdG8xp0fzz1vr3m6ao76uaWTcCn
+mV2palBCOZRwYozMWHaVBVAe9sWGd1MPSl7befbmkJcDfry2e1U8EO9QE1p4QpjA
+0UxFznzdt/h+XYgaAQ7l6Q4rxWL4V6DBxfYOY+ubeFuWLHe8D1LkUQJSq2i6I+0v
+6qMqmrEIKmXq2va5vrpHQgA0rCMFoKqKda72GxaBsSDTEJPrGhxpaiSC88qie4av
+C9dQYl69ldjFhTOlIu/DQih3PylDolqoUgLdFA//W9Ai/VdyRuN1i4TlQQUoPSfD
+EMLNDLtNQ9C/kUFzI2kZwYHTy/31gQc41ks7NNxv068a7IewsvS2O2rNCBKecLJ8
+jq5urm1cDInYcsicvzfFNx15QwXY6QqJ7qIIsvx2yBdhmEgMBX+eImyic9o30kMr
+aYd0bKilOlV/Vi0nYq9ArT3Iwd2RsQHad2ujOTMZyxfHVFIyEgShpQM5XXTN9w8g
+QwVI/0ydYdLWktJdjexvJmtJBFeUiCTz5JqCCGz/7mUfJW9XnljVLEd4J53f1PtY
+fIgEGkiG1ekUejbPA+Zm1eq2oeOsTkBqqEI3e5hL+R8PL7GKWgaJEY1Io6kcbboX
+RPwZeRZo6EjIJPQET3ER5x3Fey0kupercmpKaJ2aN1aZuq2TNUNRFC6n6lPknclJ
+VwZsjKoazHdj6usiVNLxC5aI8MJRCuaLDgq+eLz2Au4A7a4MTtXiRG5CxtcYEOwe
++xp4Sov7+aLtn5ECdBvtQigl0E1Qew/xvQIjULSjRNnyPthX/m5FdVfD0Ni3IcT+
+nPnmDK2NYAY5PLGA7ykEMcqlAnjpRWwvsVMiC6zHCVPLhi6dYTyuK7MAvHqfEphJ
+OMzF5C9SmsMmZXp5/8lCF6/dIH5vjWphxo7M1Y+5S0cL/3qPqIetVWNJBgGgMec6
+SmNg6tpmeFdTbLDpixOWclGLIb5XUPsEGBy6mrM8rPnGHfCq2hWJTlUBPXGakZAd
+gQOURFJSWHa34B2PHaeJSIRWHJBy4aa2mQI8OkBsTLWh/i51gKQlWjeKNiHphsH3
+rGQMYoECggIBAOz+cYvL2uyJIZXQzzUgZAlCSbaQ/DEEiyji7L1hFGLSwy5wEO0S
+rC1oCkRbo2/Ios3QDK49JYCk+QvWzIqyFnasQnTj9XCktFSBcKYRPGJnvutkf1X/
+ysO0hHbACIClfUN+mwbDfgVHHswbjSwgHPOuNxljg1TAcRnxQG8lqj3njku0RwUU
+fFfTTDmMJawhAAxd7dUxgcb0zI7ge6430/TuTnc8J96Gg7ZsRoGMrFAYTVbtvkj/
+mryLK2aMz2P/cxejMOcSVMQVd5tOBLhsRhETtkjgMar1pT9z8I0E/4iEs6gqcIqr
+ll+L6lghBdL+1SwW7MEFekypllMwypzlRD5uws838akoY4Ko03jm0YbA9Zf1Zn2S
+gT/q+uhvhZ7IWy9OuMeBIVGhv4EltC7SWuAfHWf7SUyKcEA2yfktPlDSqeywvts6
+CxKCz9xL8P8XSsKz8jMkC7FS5Zs0rn8G3d2sPFjEY9uWABPw8jcMq/w0regwmwt8
+gkGbKnKWKmUMgGBWoQM2gjTAB0Ss1MsOJ1m260d5Wd8pNLzXjcCrHqNh6xQx8DoN
+nOTCPRQu9cke/wjzW23ez9Ks9fRa4s9zJMtzc+tq2JH7WHmnehuyPYUPa6ALAcsB
+5B5QMXKbTSv/hTGydeYfSBiP1yCG3DyN0miuPS1VREfzaJr6V2Fv/3DFAoICAQDp
+7a1eFQ0F8SdD/9I9x9GPMvbhEi2Yz0BHjLOsOEN98EG8c7aA+pYW5AZBj/6m1nFZ
+EpvGQkmPHb24v4vxK09kcACMpJC9vkFvrt0GLn4OkiGNouqe2ip6CN7VNJkpMpTs
+x3aQ0x6CIEALVukHuDpV6i4TpB9O7bdmrO7hf/2GgsSM8zDGpo6a0Xk/POUVf7l8
+ZY2ZPf/LJVpLEW1YQLljZRJDI62nwgA+dtWnkX92DVT0LuKkisozlyY3+E0sWULE
+tizfJdGOqzfnilZBcG5/dDrvaW/OVVQLUjRk6Hhkoudff+mJfNrdJD0t4X9lZxvf
+NShlos28HJPkrOeThNhy4za6neTpn7AK6M9YYTelPBI4WyhVZkpvy4ZYnCORRs81
++byb0l4C3oDxaKu2McTtMFVQ5z2reLNnvPip92zQcPHbmuO+NhP29Gk2sjPp24N5
+DM4c1KYPTz5k3S85V+m1DLyI+uTmh4lqL8Rdn556pKZncJfOFUp+7isauHJMrd5i
+ICBtaL+M/hTZlSxFLcxykblo3gqmumIOKzegYSNZ7v8JB/r7VeZ3bQXxGThfB9dw
+Tpmef8XKK+ye0Nm//P33C36s5BjukRLUg5xMOHNza74L1zR2ToJgw6nrBJjRNDSt
+7EONSp7l8tQotry7C2fVezfUBMcSTHo11qOL7fdrUQKCAgEA5fttWMo04wGYc/g0
+fEu4iDupqN89vJu6J60/K/A/hj8dZb0ez9ElANNL01ZSXjIHu05AX/26nQJ7JAAI
+cjesEPHNc/2buvo6fR83oBBt1tjyrx/RajVWIWDWgx6Lobv2uT7tVjzz2E9SFaRO
+9Rkcv2S614p4chBmMVSqwLF+aaCBt/l0Sfu9RsUn3VihXk6P63BjUlY+qEH7GFPD
+8ib/K1rvDkp0Lj+/JZIhQaqvtPJAazE/TTuuf3VWYqgWweWtXKzi0fo6BCcI8M9f
+SVDZFc1ZQZM+37aN6+uo7lCBYYvVhEXa/NbSkFoIygkRy9W8LJL6ob2dFzQjSwu4
+M1VRSnzV051oiE1HdA49WcA0aF5sdlCQax93Cf4QCuvecV3hDyGHsyMeoEckvkFG
+f4Fm6sOHF9cFJJ/bmpUQnxxGsswcVjKWo8vJ3ubOq+uOLR3/UL6rNPGv3x6g7mLL
+Sz3wpCN2VHYQqZEA9lkF1GIZrB+6++3fJ+BlzyCyqowLDBB7rAGlMqb86A/Jfd1y
+irJrgWY/IBclHaixIujTCLuGeeqV4/0qMEvxixTrjOCdZ9UKjTcL7K0iZEGwVLa2
+D7afaEfboAMJs3CERVo+5w2rIar7OE42KTjmlHwh4CPRWfcW3ElgnDaTEjLUAx6c
+Lq86FpevioSKRIBzbKGvlkDHVDkCggIAbNL9C/+PB2ygb6nbDJKgkpWK9DmYrLX9
+mUuDamLiQvw6GIlcJbRtjkiWAHoUZVjtchqODTVZMxMK5590YsVbMcZI+ySzkRGp
+L2ORvwZx7iVdJp7btvqXOB5YS6ckeV3mmiBQsB8G2lJWeO/9iHHT8ZP3y3tWdUlx
+QHrCxnTcZG8BMPERh9iEDtHULe8OQ2ofyBcWQGvvS3oc/z8kNyIlHHAwhrtaVeiS
+ZHyz+Dhfq3OYSeBl31YRqt5uESuZ+z+rKAf35/eX/V75quVYKyk6vmA76pSKRtq7
+NmkPpsHfADIooOzIoAVNbAMn0uhMc8f712LLYDzUqOZChudI8/+hEhFRrI83ptd6
+9hhIHT1cvamscDs4EEJ97nQoE6DPiw3954Y+j97VjVAlfCjNePy+N/l8Nx7cOaD1
+FRV8ONW58V4ZpafwutQ9hW0+ZQuRywErsGyclhz3A7hBtnqPNYYIWwmJy8+sHPKA
+or2GBGf1OejO4OAoPt74wQPbWZrk0XcxNUTs0Pkh411wJaiX57benY3dS0PAgL/E
+TgMc5adK4tOkIXds8u+LP5OgaADrkIn9V2m5XVrjkKHOejN+mSoAm6TlUVjroFAt
+CmAPngXE77T3vFppNYBgdtOPgJ2q2egHecGny1sjgKXuvOIF+p3buBySZDe0xHZ/
+g/xOKRKTP4ECggIBAJkMUEiE8iiHdfbB46mGob8sFTFIJitpGLzTXL0BmFBJauI7
+lcz+qKcAd2htF45c3M/IEyFEID4Qywze4qgimFi7pA5Ns9v1gDOZw2lui3vm58o8
+BgStk+MQBYK6/JloxU9FE6UfdZRh0mXf/BY+dAvIbs3ehpgxq7VxULjv7/P+5sOZ
+ObMGlE0widtniFv+Nx/L1xX6BSYnpjA4BZjLZzxhvBqQEPotSf0dj/7NGfRuj/r9
+HX5tpekG9vi3WBpWdiCBC+4MRbpXhIb9nhWJch4gjgOFQ15ySzUeBkbAdKhNWNLv
+RcF1GyaM2zEHE9XpbAoYBXyik5dsEQM1JVYJP09yXQ4VAB3qwHdWI9z/yrUu48qh
+JR+6PqBwVFpy9l7XJlbjPDo2mwiN4v35ngjhxyrYcJAvNe20gilAbTDCrDfFYAV6
+FS4oSDiRASVUcl+zeTcdNKrjVAtBE/qxkx3u9gJ/qowP6dvG+i42Bb4Cndv9sLEn
+EX/23kIIt+SIJizrwGpjHpVeWrCkFBB+1IdvbTl1C3DHRXf78XGUeS90EoL4XupP
+6fv45eHDMCccUoTj3r/eqFTxXrHl4LJ7Dj+H+kX6AJhr2eL78RiJIud0xOifPIOy
+/g2eOU1OXnlz7Y0X7Vw74ECqKGtB1Pg7kh7KbCGDHscC+fD8zhc/Pa3mxRh0
 -----END RSA PRIVATE KEY-----
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/server-cert.pem percona-xtrabackup-2.3.7/mysql-test/std_data/server-cert.pem
--- percona-xtrabackup-2.2.3/mysql-test/std_data/server-cert.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/server-cert.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,41 +1,82 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
-        Serial Number: 1048578 (0x100002)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+        Version: 3 (0x2)
+        Serial Number: 16263805969935345172 (0xe1b4a55c3ddfa614)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
         Validity
-            Not Before: Jan 29 11:56:49 2010 GMT
-            Not After : Jan 28 11:56:49 2015 GMT
-        Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost
+            Not Before: Dec  5 04:48:40 2014 GMT
+            Not After : Dec  1 04:48:40 2029 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (512 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:cd:e4:87:51:9d:72:11:a0:d1:fa:f3:92:8b:13:
-                    1c:eb:f7:e2:9a:2f:72:a8:d6:65:48:d1:69:af:1b:
-                    c0:4c:13:e5:60:60:51:41:e9:ab:a6:bc:13:bb:0c:
-                    5e:32:7c:d9:6c:9e:cd:05:24:84:78:db:80:91:2e:
-                    d8:88:2b:c2:ed
+                    00:e9:20:e7:05:51:07:3a:48:b9:e2:62:a2:24:45:
+                    1f:f1:54:34:22:5c:62:86:9b:01:e8:c2:45:90:00:
+                    8d:4e:e4:a2:ea:e9:d7:b5:95:25:ce:18:ac:1a:4f:
+                    b3:e6:30:46:af:20:13:40:84:df:21:dc:df:09:e5:
+                    a0:7f:81:12:6e:1e:84:58:5c:a1:11:db:aa:b6:04:
+                    e0:fc:1e:0c:11:2e:f3:30:62:1a:f9:ee:df:fe:a3:
+                    d3:d6:83:6e:ad:e8:8d:98:89:b1:69:63:b8:72:f4:
+                    5a:e6:22:5e:73:64:95:ef:56:92:92:0b:e1:93:a5:
+                    d7:4c:41:47:e7:31:ed:09:68:b3:c5:6e:c1:1b:01:
+                    39:bb:f1:8f:bf:ba:f4:02:e2:e5:e5:9e:b7:d6:9a:
+                    b2:94:76:9b:48:d8:27:18:0e:9f:30:98:f5:9a:3e:
+                    23:e6:3b:4a:48:ee:a5:26:e8:80:94:37:e4:4a:ba:
+                    ff:9f:42:b9:32:dd:7a:9d:63:11:a8:25:99:b1:1f:
+                    86:e5:7c:b1:31:e3:12:11:0c:eb:f6:1d:02:4b:1d:
+                    34:cb:74:1d:7f:2f:40:c0:81:e2:04:d4:8e:ea:96:
+                    f8:22:35:8e:ab:b6:99:33:36:ef:b5:83:11:88:6d:
+                    06:0f:76:4d:bf:db:a8:df:6c:3c:91:e2:ba:73:a0:
+                    73:45
                 Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        73:ce:9c:6e:39:46:b4:14:be:da:3f:f3:1b:ba:90:bc:23:43:
-        d7:82:2a:70:4e:a6:d9:5a:65:5c:b7:df:71:df:75:77:c5:80:
-        a4:af:fa:d2:59:e2:fd:c9:9c:f0:98:95:8e:69:a9:8c:7c:d8:
-        6f:48:d2:e3:36:e0:cd:ff:3f:d1:a5:e6:ab:75:09:c4:50:10:
-        c4:96:dd:bf:3b:de:32:46:da:ca:4a:f1:d6:52:8a:33:2f:ab:
-        f5:2e:70:3f:d4:9c:be:00:c8:03:f9:39:8a:df:5b:70:3c:40:
-        ef:03:be:7c:3d:1d:32:32:f3:51:81:e2:83:30:6e:3d:38:9b:
-        fb:3c
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                E4:31:D8:D5:06:EA:C6:B3:A2:F6:01:39:8F:58:08:36:2C:7B:3F:DB
+            X509v3 Authority Key Identifier: 
+                keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
+
+    Signature Algorithm: sha256WithRSAEncryption
+         46:ef:cd:bf:c1:ef:36:a9:cb:99:b5:be:e2:a7:ba:69:0d:f5:
+         9b:63:39:78:32:35:01:a8:b9:f1:70:0e:b5:d1:8f:94:2e:7a:
+         cb:65:d4:d0:b4:ad:52:b8:51:5f:64:2e:a8:08:a5:71:fe:c2:
+         35:8a:0d:28:26:e5:be:ca:d7:f4:79:54:e1:27:8f:87:92:d3:
+         04:72:1b:cc:c4:7f:8b:26:09:92:2d:c8:6f:27:da:97:31:80:
+         0f:83:84:9c:e0:a4:88:c9:e3:8f:35:e7:de:bd:31:e2:fa:52:
+         83:de:ee:5c:60:6e:8f:a5:8d:5e:53:41:18:42:f3:03:0b:05:
+         0b:59:09:42:2e:1b:0b:29:b3:fe:11:3b:d5:ad:3f:4d:24:e8:
+         c0:da:4c:0d:93:94:ec:cd:18:0f:66:cd:03:d3:ee:a0:b2:7f:
+         64:d7:39:66:19:72:9f:64:43:38:b4:b6:b3:ea:6f:39:e7:09:
+         98:90:9f:6c:f5:e8:b3:2e:09:8d:7b:76:65:30:f4:c4:9b:8e:
+         10:4e:9b:8c:93:63:44:9d:2b:8a:f3:f0:cf:f8:7b:65:95:38:
+         fb:b4:92:e8:6c:11:03:a2:a2:2f:ea:e0:22:b7:cd:cf:0d:a5:
+         91:23:14:47:0c:34:8f:f1:11:cc:e8:1e:37:53:ec:a1:01:81:
+         20:c0:2c:f5
 -----BEGIN CERTIFICATE-----
-MIIBtzCCASACAxAAAjANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
-QUIwHhcNMTAwMTI5MTE1NjQ5WhcNMTUwMTI4MTE1NjQ5WjBGMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNVBAMT
-CWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDN5IdRnXIRoNH685KL
-Exzr9+KaL3Ko1mVI0WmvG8BME+VgYFFB6aumvBO7DF4yfNlsns0FJIR424CRLtiI
-K8LtAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAc86cbjlGtBS+2j/zG7qQvCND14Iq
-cE6m2VplXLffcd91d8WApK/60lni/cmc8JiVjmmpjHzYb0jS4zbgzf8/0aXmq3UJ
-xFAQxJbdvzveMkbaykrx1lKKMy+r9S5wP9ScvgDIA/k5it9bcDxA7wO+fD0dMjLz
-UYHigzBuPTib+zw=
+MIIDyzCCArOgAwIBAgIJAOG0pVw936YUMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTQxMjA1MDQ0ODQwWhcNMjkxMjAxMDQ0ODQwWjBqMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOkg5wVRBzpIueJioiRFH/FUNCJcYoab
+AejCRZAAjU7kourp17WVJc4YrBpPs+YwRq8gE0CE3yHc3wnloH+BEm4ehFhcoRHb
+qrYE4PweDBEu8zBiGvnu3/6j09aDbq3ojZiJsWljuHL0WuYiXnNkle9WkpIL4ZOl
+10xBR+cx7Qlos8VuwRsBObvxj7+69ALi5eWet9aaspR2m0jYJxgOnzCY9Zo+I+Y7
+SkjupSbogJQ35Eq6/59CuTLdep1jEaglmbEfhuV8sTHjEhEM6/YdAksdNMt0HX8v
+QMCB4gTUjuqW+CI1jqu2mTM277WDEYhtBg92Tb/bqN9sPJHiunOgc0UCAwEAAaN7
+MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg
+Q2VydGlmaWNhdGUwHQYDVR0OBBYEFOQx2NUG6sazovYBOY9YCDYsez/bMB8GA1Ud
+IwQYMBaAFJRloaOHz7/BdLvYhJe2a+6ykHOyMA0GCSqGSIb3DQEBCwUAA4IBAQBG
+782/we82qcuZtb7ip7ppDfWbYzl4MjUBqLnxcA610Y+ULnrLZdTQtK1SuFFfZC6o
+CKVx/sI1ig0oJuW+ytf0eVThJ4+HktMEchvMxH+LJgmSLchvJ9qXMYAPg4Sc4KSI
+yeOPNefevTHi+lKD3u5cYG6PpY1eU0EYQvMDCwULWQlCLhsLKbP+ETvVrT9NJOjA
+2kwNk5TszRgPZs0D0+6gsn9k1zlmGXKfZEM4tLaz6m855wmYkJ9s9eizLgmNe3Zl
+MPTEm44QTpuMk2NEnSuK8/DP+HtllTj7tJLobBEDoqIv6uAit83PDaWRIxRHDDSP
+8RHM6B43U+yhAYEgwCz1
 -----END CERTIFICATE-----
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/server-key.pem percona-xtrabackup-2.3.7/mysql-test/std_data/server-key.pem
--- percona-xtrabackup-2.2.3/mysql-test/std_data/server-key.pem	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/server-key.pem	2017-02-27 07:47:02.000000000 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAM3kh1GdchGg0frzkosTHOv34povcqjWZUjRaa8bwEwT5WBgUUHp
-q6a8E7sMXjJ82WyezQUkhHjbgJEu2Igrwu0CAwEAAQJBAJuwhFbF3NzRpBbEmnqJ
-4GPa1UJMQMLFJF+04tqj/HxJcAIVhOJhGmmtYNw1yjz/ZsPnfJCMz4eFOtdjvGtf
-peECIQDmFFg2WLvYo+2m9w9V7z4ZIkg7ixYkI/ObUUctfZkPOQIhAOUWnrvjFrAX
-bIvYT/YR50+3ZDLEc51XxNgJnWqWYl1VAiEAnTOFWgyivFC1DgF8PvDp8u5TgCt2
-A1d1GMgd490O+TECIC/WMl0/hTxOF9930vKqOGf//o9PUGkZq8QE9fcM4gtlAiAE
-iOcFpnLjtWj57jrhuw214ucnB5rklkQQe+AtcARNkg==
+MIIEpQIBAAKCAQEA6SDnBVEHOki54mKiJEUf8VQ0IlxihpsB6MJFkACNTuSi6unX
+tZUlzhisGk+z5jBGryATQITfIdzfCeWgf4ESbh6EWFyhEduqtgTg/B4MES7zMGIa
++e7f/qPT1oNureiNmImxaWO4cvRa5iJec2SV71aSkgvhk6XXTEFH5zHtCWizxW7B
+GwE5u/GPv7r0AuLl5Z631pqylHabSNgnGA6fMJj1mj4j5jtKSO6lJuiAlDfkSrr/
+n0K5Mt16nWMRqCWZsR+G5XyxMeMSEQzr9h0CSx00y3Qdfy9AwIHiBNSO6pb4IjWO
+q7aZMzbvtYMRiG0GD3ZNv9uo32w8keK6c6BzRQIDAQABAoIBAQDUbdzVJV6Wp4pq
+VUI2Fp7iwr22ycQlr71voQbODxK0XvZtZKPgnIWUZTr9xr7A9CCUl3+zfN/t9Vtv
+o0Q6qxxmJ3ylH9LNeQL3VT7FvYN1bPjAj8TRFfAaEqKHh8AkzBGqe12kEPAUH8Fs
+jsjOEUvmiVaJqjXk2mty2tFwRDggJwCrN5bXkhkzwhDcMfH2Wgc4c4XkyUrciJQU
+ua4d0L354B3UmRYtrzwPr6WHLXCGPGhyWvXYpDjjdUGMVf2YcBSQdABF+mhCEb2b
+NP4dYUqKHjKn6p4B1/qfJtf0c9Lz229nz0WTzanmpXaNxQVce0sTbktp5A3itT+m
+NlQfDNoBAoGBAPvqSK7NqCrvFYEo+Cvl6fOhq9li2zAeaYO7D+AKiWSJzG9KK/Ts
+F+28nnWkBEdzAnmgWZ7UZlUwHqF6DNIGn+RLHDJ2MVRrZug2irCR8g2mxcHk2dss
+DcmUtsatjCbjLqVCcyuuQylP2GWK60JmRbdKEOfpHLntzGStpOhn5FPBAoGBAOzo
+okk2FWZlymJTkN2HYTqvUCYINDciTDm/ms7YGC6YKdDJ8PUVq6qJ2GO/M+zGPQtV
+A+qFWqx1kk3K5uLPnZLCPLORXPIm0X1ZGreG+rHsrJTnP6uh9OxrTyLNkvt6xcm7
+yA51QOWTuRbYhPwy05IqT3Z88HkHByMKr4xafPCFAoGADff1w8ufkZHkTV8qM7Tx
+/hJu5wT2RnrJOwa6YJ/08mA5t8oTGeelhAc7eiZ4HkYgUwIzNf1tFzgt2qJb56F6
+aDxJ+fpXzeiOsj2j/xp4o40l1hSMh/yvXwgiAm5JITbjtUI0BK4LB1VoGGlVlj75
+iqpOua1RbHXlKYf/Zuur24ECgYEAqXDFSWmGKsOY2XR9QwQltUxYHat2dQxxykfR
+GCmUOhcYqT0VuqSyL/oBK25AXBN465b1gxG3xWsdpcf+FLB7OdD0i1XnTUYYRPeq
+1SKUQRdOY/11G3Ntcn5ZjkHL41NvDRbiQfz42noqQj2/94T+rybVyKAZeeZd42Es
+J0082OUCgYEAnguGJxhfSryD3a2kAQ/6s+L303rgXkRt+/luoopdm7vu2AcnaP7L
+aK4dCDusp/DZyGn8/ebDCGNIaVEMJVHAPLFbhJA9E9HCjfC33RdklCO/aGDtXsiq
+kzg3mqPHTCPCpmpr5YAtuLONczP1qgB04/vqb2S5eANC+5k6mEifu2U=
 -----END RSA PRIVATE KEY-----
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/slave-relay-bin_linux.index percona-xtrabackup-2.3.7/mysql-test/std_data/slave-relay-bin_linux.index
--- percona-xtrabackup-2.2.3/mysql-test/std_data/slave-relay-bin_linux.index	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/slave-relay-bin_linux.index	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+./slave-relay-bin.000001
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/slave-relay-bin_win.index percona-xtrabackup-2.3.7/mysql-test/std_data/slave-relay-bin_win.index
--- percona-xtrabackup-2.2.3/mysql-test/std_data/slave-relay-bin_win.index	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/slave-relay-bin_win.index	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+.\slave-relay-bin.000001
diff -Nru percona-xtrabackup-2.2.3/mysql-test/std_data/system_tap.stp percona-xtrabackup-2.3.7/mysql-test/std_data/system_tap.stp
--- percona-xtrabackup-2.2.3/mysql-test/std_data/system_tap.stp	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/std_data/system_tap.stp	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,168 @@
+#  This systamtap script is used by the test "dynamic_tracing.test" for dynamic
+#  tracing. This script is executed in background by "dynamic_tracing.test" and
+#  SQL queries are executed concurrently. When any probe used in this script are
+#  hit then counter is incremented. After hitting all the 8(exp_probe_hits)
+#  probes, summary containing probes enabled and their hit state is printed.
+#
+#  For the dynamic tracing of MySQL code using systemtap on Linux, the dtrace
+#  probes defined in the code are converted to systemtap marks by the dtrace
+#  tool. This dtrace tool is not used for dynamic tracing like real dtrace tool
+#  supplied with Sun OS, Mac, FreeBSD and Oracle Linux.
+#  
+
+global query_parse_start
+global query_parse_done
+global select_start
+global select_done
+global net_read_start
+global net_read_done
+global handler_rdlock_start
+global handler_rdlock_done
+
+global tot_probe_hits
+global exp_probe_hits
+
+probe begin
+{
+  query_parse_start= 0
+  query_parse_done= 0
+  select_start= 0
+  select_done= 0
+  net_read_start= 0
+  net_read_done= 0
+  handler_rdlock_start= 0
+  handler_rdlock_done= 0
+  
+  tot_probe_hits= 0
+  exp_probe_hits= 8
+  printf("\n Dynamic tracing ...... started.\n")
+}
+
+probe process(@1).mark("query__parse__start")
+{
+  if (query_parse_start == 0)
+  {
+    query_parse_start++
+    tot_probe_hits++
+  }
+
+  if (tot_probe_hits >= exp_probe_hits)
+  {
+    print_summary_and_exit()
+  }
+}
+
+probe process(@1).mark("query__parse__done")
+{
+  if (query_parse_done == 0)
+  {
+    query_parse_done++
+    tot_probe_hits++
+  }
+
+  if (tot_probe_hits >= exp_probe_hits)
+  {
+    print_summary_and_exit()
+  }
+}
+
+probe process(@1).mark("select__start")
+{
+  if (select_start == 0)
+  {
+    select_start++
+    tot_probe_hits++
+  }
+
+  if (tot_probe_hits >= exp_probe_hits)
+  {
+    print_summary_and_exit()
+  }
+}
+
+probe process(@1).mark("select__done")
+{
+  if (select_done == 0)
+  {
+    select_done++
+    tot_probe_hits++
+  }
+
+  if (tot_probe_hits >= exp_probe_hits)
+  {
+    print_summary_and_exit()
+  }
+}
+
+probe process(@1).mark("net__read__start")
+{
+  if (net_read_start == 0)
+  {
+    net_read_start++
+    tot_probe_hits++
+  }
+
+  if (tot_probe_hits >= exp_probe_hits)
+  {
+    print_summary_and_exit()
+  }
+}
+
+probe process(@1).mark("net__read__done")
+{
+  if (net_read_done == 0)
+  {
+    net_read_done++
+    tot_probe_hits++
+  }
+
+  if (tot_probe_hits >= exp_probe_hits)
+  {
+    print_summary_and_exit()
+  }
+}
+
+probe process(@1).mark("handler__rdlock__start")
+{
+  if (handler_rdlock_start == 0)
+  {
+    handler_rdlock_start++
+    tot_probe_hits++
+  }
+
+  if (tot_probe_hits >= exp_probe_hits)
+  {
+    print_summary_and_exit()
+  }
+}
+
+probe process(@1).mark("handler__rdlock__done")
+{
+  if (handler_rdlock_done == 0)
+  {
+    handler_rdlock_done++
+    tot_probe_hits++
+  }
+
+  if (tot_probe_hits >= exp_probe_hits)
+  {
+    print_summary_and_exit()
+  }
+}
+
+function print_summary_and_exit()
+{
+  printf("\n query-parse-start    : %d", query_parse_start)
+  printf("\n query-parse-done     : %d", query_parse_done)
+  printf("\n select-start         : %d", select_start)
+  printf("\n select-done          : %d", select_done)
+  printf("\n net-read-start       : %d", net_read_start)
+  printf("\n net-read-done        : %d", net_read_done)
+  printf("\n handler_rdlock_start : %d", handler_rdlock_start)
+  printf("\n handler_rdlock_done  : %d", handler_rdlock_done)
+  printf("\n")
+  printf("\n Expected probe hits  : %d", exp_probe_hits)
+  printf("\n Actual probe hits    : %d\n", tot_probe_hits)
+  printf("\n Dynamic tracing ...... completed.\n\n")
+  exit()
+}
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/auth_sec/r/access_credential_control.result percona-xtrabackup-2.3.7/mysql-test/suite/auth_sec/r/access_credential_control.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/auth_sec/r/access_credential_control.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/auth_sec/r/access_credential_control.result	2017-02-27 07:47:02.000000000 +0000
@@ -436,9 +436,9 @@
 Drop user 'Tanjotuser2'@'localhost';
 Drop user 'Tanjotuser3'@'localhost';
 Now trying opening a new session for the above dropped user
-ERROR 28000: Access denied for user 'Tanjotuser1'@'localhost' (using password: NO)
-ERROR 28000: Access denied for user 'Tanjotuser2'@'localhost' (using password: NO)
-ERROR 28000: Access denied for user 'Tanjotuser3'@'localhost' (using password: NO)
+ERROR 28000: Access denied for user 'Tanjotuser1'@'localhost' (using password: YES)
+ERROR 28000: Access denied for user 'Tanjotuser2'@'localhost' (using password: YES)
+ERROR 28000: Access denied for user 'Tanjotuser3'@'localhost' (using password: YES)
 Accessing the open sessions for the above dropped user
 select user(), current_user();
 user()	current_user()
@@ -518,9 +518,9 @@
 select user(), current_user();
 user()	current_user()
 Tanjotuser3@localhost	Tanjotuser3@localhost
-ERROR 28000: Access denied for user 'Tanjotuser1'@'localhost' (using password: NO)
-ERROR 28000: Access denied for user 'Tanjotuser2'@'localhost' (using password: NO)
-ERROR 28000: Access denied for user 'Tanjotuser3'@'localhost' (using password: NO)
+ERROR 28000: Access denied for user 'Tanjotuser1'@'localhost' (using password: YES)
+ERROR 28000: Access denied for user 'Tanjotuser2'@'localhost' (using password: YES)
+ERROR 28000: Access denied for user 'Tanjotuser3'@'localhost' (using password: YES)
 select user(), current_user();
 user()	current_user()
 user1@localhost	user1@localhost
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/auth_sec/r/mysql_no_login.result percona-xtrabackup-2.3.7/mysql-test/suite/auth_sec/r/mysql_no_login.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/auth_sec/r/mysql_no_login.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/auth_sec/r/mysql_no_login.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,43 @@
+INSTALL PLUGIN mysql_no_login SONAME 'mysql_no_login.so';
+SELECT PLUGIN_NAME, PLUGIN_STATUS, PLUGIN_TYPE, PLUGIN_DESCRIPTION
+FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'mysql_no_login';
+PLUGIN_NAME	mysql_no_login
+PLUGIN_STATUS	ACTIVE
+PLUGIN_TYPE	AUTHENTICATION
+PLUGIN_DESCRIPTION	No login authentication plugin
+Creating users noauth, otheruser
+Creating view, procedure, function
+# Connect as otheruser - should succeed.
+user()	current_user()	@@proxy_user
+otheruser@localhost	otheruser@localhost	NULL
+a
+2
+noauthdb.f1()
+5
+# Attempt to access underlying tables directly using otheruser - should fail.
+# Connect as noauth - should fail.
+#try to set password of this plugin user with password function - should warn
+SET PASSWORD FOR noauth@localhost = password('');
+Warnings:
+Note	1699	SET PASSWORD has no significance for users authenticating via plugins
+#try to set password of this plugin user with password hash - should warn
+grant all on *.* to noauth@localhost identified by password '*94BDCEBE19083CE2A1F959FD02F964C7AF4CFC29';
+Warnings:
+Warning	1699	SET PASSWORD has no significance for users authenticating via plugins
+#try to expire password of this plugin user - should warn
+alter user noauth@localhost password expire;
+ERROR HY000: Operation ALTER USER failed for 'noauth'@'localhost'
+#uninstall plugin and try to login with this plugin user - should return error
+uninstall plugin mysql_no_login;
+# Connect as noauth - should fail.
+INSTALL PLUGIN mysql_no_login SONAME 'mysql_no_login.so';
+Creating users noauth, otheruser
+Creating view, procedure, function
+# Connect as otheruser - should succeed.
+user()	current_user()	@@proxy_user
+otheruser@localhost	otheruser@localhost	NULL
+a
+2
+noauthdb.f1()
+5
+# Attempt to access underlying tables directly using otheruser - should fail.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/auth_sec/t/mysql_no_login-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/auth_sec/t/mysql_no_login-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/auth_sec/t/mysql_no_login-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/auth_sec/t/mysql_no_login-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+$MYSQL_NO_LOGIN_OPT
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/auth_sec/t/mysql_no_login.test percona-xtrabackup-2.3.7/mysql-test/suite/auth_sec/t/mysql_no_login.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/auth_sec/t/mysql_no_login.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/auth_sec/t/mysql_no_login.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,128 @@
+#
+# Testing MYSQL_NO_LOGIN authentication plugin.
+#
+--source include/have_mysql_no_login_plugin.inc
+--source include/not_embedded.inc
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN mysql_no_login SONAME '$MYSQL_NO_LOGIN';
+
+query_vertical SELECT PLUGIN_NAME, PLUGIN_STATUS, PLUGIN_TYPE, PLUGIN_DESCRIPTION
+  FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'mysql_no_login';
+
+--disable_query_log
+CREATE DATABASE noauthdb;
+CREATE TABLE noauthdb.t1 (a INT);
+CREATE TABLE noauthdb.t2 (a INT);
+INSERT INTO noauthdb.t1 VALUES (1), (2);
+INSERT INTO noauthdb.t2 VALUES (3), (4);
+
+--echo Creating users noauth, otheruser
+CREATE USER noauth@localhost IDENTIFIED WITH 'mysql_no_login';
+CREATE USER otheruser@localhost;
+GRANT SELECT, UPDATE, INSERT ON noauthdb.* TO noauth@localhost;
+
+--echo Creating view, procedure, function
+CREATE DEFINER = noauth@localhost SQL SECURITY DEFINER VIEW noauthdb.v1 AS SELECT * FROM noauthdb.t1 WHERE a % 2 = 0;
+CREATE DEFINER = noauth@localhost PROCEDURE noauthdb.p1 () CONTAINS SQL SQL SECURITY DEFINER UPDATE noauthdb.t2 SET a = 5 WHERE a = 3;
+delimiter //;
+CREATE DEFINER = noauth@localhost FUNCTION noauthdb.f1() RETURNS INT CONTAINS SQL SQL SECURITY DEFINER
+BEGIN
+DECLARE outp INT DEFAULT NULL;
+SELECT MAX(a) INTO outp FROM noauthdb.t2;
+RETURN outp;
+END//
+delimiter ;//
+
+GRANT SELECT ON noauthdb.v1 TO otheruser@localhost;
+GRANT EXECUTE ON noauthdb.* TO otheruser@localhost;
+GRANT EXECUTE ON noauthdb.* TO noauth@localhost;
+
+--enable_query_log
+
+--echo # Connect as otheruser - should succeed.
+--exec $MYSQL --user=otheruser -e "select user(), current_user(), @@proxy_user; SELECT * FROM noauthdb.v1; CALL noauthdb.p1(); SELECT noauthdb.f1();"
+
+--echo # Attempt to access underlying tables directly using otheruser - should fail.
+--error 1, ER_TABLEACCESS_DENIED_ERROR
+--exec $MYSQL --user=otheruser   -e "SELECT * FROM noauthdb.t1;"
+
+--echo # Connect as noauth - should fail.
+--error 1, ER_ACCESS_DENIED_ERROR
+--exec $MYSQL --user=noauth   -e "select user(), current_user(), @@proxy_user"
+
+--echo #try to set password of this plugin user with password function - should warn
+SET PASSWORD FOR noauth@localhost = password('');
+
+--echo #try to set password of this plugin user with password hash - should warn
+grant all on *.* to noauth@localhost identified by password '*94BDCEBE19083CE2A1F959FD02F964C7AF4CFC29';
+
+--echo #try to expire password of this plugin user - should warn
+--error ER_CANNOT_USER
+alter user noauth@localhost password expire;
+
+--echo #uninstall plugin and try to login with this plugin user - should return error
+uninstall plugin mysql_no_login;
+--echo # Connect as noauth - should fail.
+--error 1, ER_PLUGIN_IS_NOT_LOADED
+--exec $MYSQL --user=noauth  -e "select user(), current_user(), @@proxy_user"
+
+# Cleanup
+--disable_query_log
+
+DROP DATABASE noauthdb;
+DROP USER noauth@localhost;
+DROP USER otheruser@localhost;
+
+--enable_query_log
+##proxy related scenario
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN mysql_no_login SONAME '$MYSQL_NO_LOGIN';
+--disable_query_log
+CREATE DATABASE noauthdb;
+CREATE TABLE noauthdb.t1 (a INT);
+CREATE TABLE noauthdb.t2 (a INT);
+INSERT INTO noauthdb.t1 VALUES (1), (2);
+INSERT INTO noauthdb.t2 VALUES (3), (4);
+
+--echo Creating users noauth, otheruser
+CREATE USER noauth@localhost IDENTIFIED WITH 'mysql_no_login';
+CREATE USER otheruser@localhost;
+GRANT PROXY ON 'noauth'@'localhost' TO 'otheruser'@'localhost';
+GRANT SELECT, UPDATE, INSERT ON noauthdb.* TO noauth@localhost;
+
+--echo Creating view, procedure, function
+CREATE DEFINER = noauth@localhost SQL SECURITY DEFINER VIEW noauthdb.v1 AS SELECT * FROM noauthdb.t1 WHERE a % 2 = 0;
+CREATE DEFINER = noauth@localhost PROCEDURE noauthdb.p1 () CONTAINS SQL SQL SECURITY DEFINER UPDATE noauthdb.t2 SET a = 5 WHERE a = 3;
+delimiter //;
+CREATE DEFINER = noauth@localhost FUNCTION noauthdb.f1() RETURNS INT CONTAINS SQL SQL SECURITY DEFINER
+BEGIN
+DECLARE outp INT DEFAULT NULL;
+SELECT MAX(a) INTO outp FROM noauthdb.t2;
+RETURN outp;
+END//
+delimiter ;//
+
+GRANT SELECT ON noauthdb.v1 TO otheruser@localhost;
+GRANT EXECUTE ON noauthdb.* TO otheruser@localhost;
+GRANT EXECUTE ON noauthdb.* TO noauth@localhost;
+
+--enable_query_log
+
+--echo # Connect as otheruser - should succeed.
+--exec $MYSQL --user=otheruser -e "select user(), current_user(), @@proxy_user; SELECT * FROM noauthdb.v1; CALL noauthdb.p1(); SELECT noauthdb.f1();"
+
+--echo # Attempt to access underlying tables directly using otheruser - should fail.
+--error 1, ER_TABLEACCESS_DENIED_ERROR
+--exec $MYSQL --user=otheruser   -e "SELECT * FROM noauthdb.t1;"
+
+# Cleanup
+ --disable_query_log
+
+ DROP DATABASE noauthdb;
+ DROP USER noauth@localhost;
+ DROP USER otheruser@localhost;
+
+ #UNINSTALL PLUGIN mysql_no_auth;
+ --enable_query_log
+--exit
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_error_action.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_error_action.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_error_action.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_error_action.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,62 @@
+call mtr.add_suppression("MYSQL_BIN_LOG::add_log_to_index failed to copy index file to crash safe index file.");
+call mtr.add_suppression("Disk is full writing *");
+call mtr.add_suppression("Retry in 60 secs. *");
+call mtr.add_suppression("Error writing file*");
+call mtr.add_suppression("Could not open .*");
+call mtr.add_suppression("Could not use .*");
+call mtr.add_suppression("Can't generate a unique log-filename master-bin");
+call mtr.add_suppression("The server was unable to create a new log file *");
+RESET MASTER;
+Test case1
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+flush logs;
+ERROR HY000: Binary logging not possible. Message: Either disk is full or file system is read only while rotating the binlog. Aborting the server
+Test case2
+SET SESSION debug="+d,fault_injection_updating_index";
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+flush logs;
+ERROR HY000: Binary logging not possible. Message: Either disk is full or file system is read only while opening the binlog. Aborting the server
+Test case3
+SET SESSION debug="+d,simulate_disk_full_on_open_binlog";
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+flush logs;
+ERROR HY000: Binary logging not possible. Message: Either disk is full or file system is read only while opening the binlog. Aborting the server
+Test case4
+SET SESSION debug="+d,fault_injection_init_name";
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+flush logs;
+ERROR HY000: Binary logging not possible. Message: Either disk is full or file system is read only while opening the binlog. Aborting the server
+Test case5
+flush logs;
+ERROR HY000: File 'master-bin.index' not found (Errcode: 13 - Permission denied)
+CREATE TABLE t1 ( f int );
+SHOW TABLES;
+Tables_in_test
+t1
+DROP TABLE t1;
+Test case6
+SET SESSION debug="+d,fault_injection_updating_index";
+flush logs;
+ERROR HY000: Can't open file: 'master-bin.000007' (errno: 1 - Operation not permitted)
+CREATE TABLE t2 (f int );
+SHOW TABLES;
+Tables_in_test
+t2
+DROP TABLE t2;
+SET SESSION debug="-d,fault_injection_updating_index";
+Test case7
+SET SESSION debug="+d,simulate_disk_full_on_open_binlog";
+flush logs;
+ERROR HY000: Error writing file 'master-bin.index_crash_safe' (Errcode: 28 - No space left on device)
+SET SESSION debug="-d,simulate_disk_full_on_open_binlog";
+Test case8
+SET SESSION debug="+d,fault_injection_init_name";
+flush logs;
+ERROR HY000: Can't open file: 'master-bin.000009' (errno: 1 - Operation not permitted)
+CREATE TABLE t2 (f int );
+SHOW TABLES;
+Tables_in_test
+t2
+DROP TABLE t2;
+SET SESSION debug="-d,fault_injection_init_name";
+SET SESSION debug="";
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result	2017-02-27 07:47:02.000000000 +0000
@@ -198,6 +198,7 @@
 SET TIMESTAMP=1956560400/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -229,6 +230,7 @@
 SET TIMESTAMP=1956560400/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -313,6 +315,7 @@
 SET TIMESTAMP=1925024400/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -344,6 +347,7 @@
 SET TIMESTAMP=1925024400/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -399,22 +403,11 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -484,22 +477,11 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -559,22 +541,11 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -645,28 +616,18 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -709,28 +670,18 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -783,22 +734,11 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -869,28 +809,18 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -943,28 +873,18 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -1155,6 +1075,7 @@
 SET TIMESTAMP=1956560400/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -1185,6 +1106,7 @@
 SET TIMESTAMP=1956560400/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -1269,6 +1191,7 @@
 SET TIMESTAMP=1925024400/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -1300,6 +1223,7 @@
 SET TIMESTAMP=1925024400/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -1355,22 +1279,11 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1440,22 +1353,11 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1514,22 +1416,11 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1600,28 +1491,18 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -1663,28 +1544,18 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -1737,22 +1608,11 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1823,28 +1683,18 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -1897,28 +1747,18 @@
 COMMIT
 /*!*/;
 SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 # UUID:#-#
 SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= 'GTID' /* added by mysqlbinlog *//*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_gtid_simple_recovery.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_gtid_simple_recovery.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_gtid_simple_recovery.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_gtid_simple_recovery.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,47 @@
+include/rpl_init.inc [topology=none]
+include/rpl_default_connections.inc
+CREATE TABLE t1 (
+c1 INT NOT NULL PRIMARY KEY
+);
+# Generate master-bin.000002
+FLUSH LOGS;
+INSERT INTO t1 VALUES (1);
+# Generate master-bin.000003
+FLUSH LOGS;
+INSERT INTO t1 VALUES (2);
+# Generate master-bin.000004
+FLUSH LOGS;
+INSERT INTO t1 VALUES (3);
+# Move master-bin.000002 to master-bin.000002.bkp and
+# master-bin.000003 to master-bin.000003.bkp
+#
+# Only master-bin.000001 and master-bin.000004 remain, others are moved
+# , restart the server with enabled binlog-gtid-simple-recovery
+# and gtid_mode on. If the server scans more than one binary log in
+# every iteration, it will cause read error on the 2nd and 3rd files.
+#
+include/rpl_restart_server.inc [server_number=1 parameters: --binlog-gtid-simple-recovery=on --gtid-mode=on --enforce-gtid-consistency --log-slave-updates]
+#
+# Verify that GLOBAL.GTID_EXECUTED and GLOBAL.GTID_PURGED are empty
+# after server restarts.
+#
+include/assert.inc [GLOBAL.GTID_EXECUTED must be empty.]
+include/assert.inc [GLOBAL.GTID_PURGED must be empty.]
+DROP TABLE t1;
+# Move master-bin.000004 to master-bin.000004.bkp
+#
+# Only master-bin.000001 and master-bin.000005 remain, others are moved
+# , restart the server with enabled binlog-gtid-simple-recovery
+# and gtid_mode on again. If the server scans more than one binary
+# log in every iteration, it will cause read error on the 2nd and
+# 4th files.
+#
+include/rpl_restart_server.inc [server_number=1 parameters: --binlog-gtid-simple-recovery=on --gtid-mode=on --enforce-gtid-consistency --log-slave-updates]
+#
+# Verify that GLOBAL.GTID_EXECUTED contains committed gtid MASTER_UUID:1
+# and GLOBAL.GTID_PURGED is empty after server restarts again.
+#
+include/assert.inc [committed gtid MASTER_UUID:1]
+include/assert.inc [GLOBAL.GTID_PURGED is empty]
+# Move binary logs back.
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_gtid_utils.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_gtid_utils.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_gtid_utils.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_gtid_utils.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,137 @@
+include/gtid_utils.inc
+SELECT GTID_IS_EQUAL('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:3:2:1', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1');
+GTID_IS_EQUAL('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:3:2:1', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1')
+1
+SELECT GTID_IS_EQUAL('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:3:2:1', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1:3,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1');
+GTID_IS_EQUAL('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:3:2:1', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1:3,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1')
+0
+SELECT GTID_IS_DISJOINT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:2,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3');
+GTID_IS_DISJOINT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:2,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3')
+1
+SELECT GTID_IS_DISJOINT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:2,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3');
+GTID_IS_DISJOINT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:2,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3')
+0
+SELECT GTID_IS_DISJOINT_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1');
+GTID_IS_DISJOINT_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1')
+1
+SELECT GTID_IS_DISJOINT_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1');
+GTID_IS_DISJOINT_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1')
+0
+SELECT GTID_IS_DISJOINT_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1');
+GTID_IS_DISJOINT_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1')
+0
+SELECT GTID_INTERSECTION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:5-7');
+GTID_INTERSECTION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:5-7')
+
+SELECT GTID_INTERSECTION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:5-7', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:3-5');
+GTID_INTERSECTION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:5-7', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:3-5')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:3:5
+SELECT GTID_INTERSECTION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:2:3');
+GTID_INTERSECTION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:2:3')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3
+SELECT GTID_INTERSECTION('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3');
+GTID_INTERSECTION('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3')
+
+SELECT GTID_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3');
+GTID_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3
+SELECT GTID_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3');
+GTID_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3
+SELECT GTID_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2:4');
+GTID_UNION('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2:4')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-4
+SELECT GTID_SYMMETRIC_DIFFERENCE('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:3-5');
+GTID_SYMMETRIC_DIFFERENCE('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:3-5')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-2:4-5
+SELECT GTID_SYMMETRIC_DIFFERENCE('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:4-5');
+GTID_SYMMETRIC_DIFFERENCE('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:4-5')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-5
+SELECT GTID_SYMMETRIC_DIFFERENCE('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3');
+GTID_SYMMETRIC_DIFFERENCE('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,
+bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3
+SELECT GTID_SUBTRACT_UUID('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3,cccccccc-cccc-cccc-cccc-cccccccccccc:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb');
+GTID_SUBTRACT_UUID('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3,cccccccc-cccc-cccc-cccc-cccccccccccc:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,
+cccccccc-cccc-cccc-cccc-cccccccccccc:1-3
+SELECT GTID_SUBTRACT_UUID('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,cccccccc-cccc-cccc-cccc-cccccccccccc:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb');
+GTID_SUBTRACT_UUID('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,cccccccc-cccc-cccc-cccc-cccccccccccc:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,
+cccccccc-cccc-cccc-cccc-cccccccccccc:1-3
+SELECT GTID_SUBTRACT_UUID('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb');
+GTID_SUBTRACT_UUID('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')
+
+SELECT GTID_SUBTRACT_UUID(CONCAT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-', 1 << 63 - 1), 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+GTID_SUBTRACT_UUID(CONCAT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-', 1 << 63 - 1), 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+
+SELECT GTID_INTERSECTION_WITH_UUID('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3,cccccccc-cccc-cccc-cccc-cccccccccccc:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb');
+GTID_INTERSECTION_WITH_UUID('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3,cccccccc-cccc-cccc-cccc-cccccccccccc:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')
+bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3
+SELECT GTID_INTERSECTION_WITH_UUID('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,cccccccc-cccc-cccc-cccc-cccccccccccc:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb');
+GTID_INTERSECTION_WITH_UUID('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,cccccccc-cccc-cccc-cccc-cccccccccccc:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')
+
+SELECT GTID_INTERSECTION_WITH_UUID('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb');
+GTID_INTERSECTION_WITH_UUID('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')
+bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1-3
+SELECT GTID_COUNT('');
+GTID_COUNT('')
+0
+SELECT GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1');
+GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1')
+1
+SELECT GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3');
+GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3')
+3
+SELECT GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:4-5');
+GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:4-5')
+5
+SELECT GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:5-5');
+GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:5-5')
+4
+SELECT GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:5-4');
+GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:5-4')
+3
+SELECT GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:5-4,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1:3,');
+GTID_COUNT('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3:5-4,bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1:3,')
+5
+SELECT GTID_NEXT_GENERATED('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+GTID_NEXT_GENERATED('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+1
+SELECT GTID_NEXT_GENERATED('', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+GTID_NEXT_GENERATED('', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+1
+SELECT GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+2
+SELECT GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+1
+SELECT GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+4
+SELECT GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:5:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:5:1-3', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+4
+SELECT GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,11111111-1111-1111-1111-111111111111:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-3,11111111-1111-1111-1111-111111111111:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+4
+SELECT GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2-3,11111111-1111-1111-1111-111111111111:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+GTID_NEXT_GENERATED('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2-3,11111111-1111-1111-1111-111111111111:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+1
+SELECT GTID_NEXT_GENERATED_SET('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 0);
+GTID_NEXT_GENERATED_SET('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 0)
+
+SELECT GTID_NEXT_GENERATED_SET('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 4);
+GTID_NEXT_GENERATED_SET('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 4)
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-4
+SELECT GTID_NEXT_GENERATED_SET('', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 4);
+GTID_NEXT_GENERATED_SET('', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 4)
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1-4
+SELECT GTID_NEXT_GENERATED_SET('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2:4:6:8:10-11', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 10);
+GTID_NEXT_GENERATED_SET('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2:4:6:8:10-11', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 10)
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3:5:7:9:12-16
+SELECT GTID_NEXT_GENERATED_SET('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3:5:7:9-11', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 10);
+GTID_NEXT_GENERATED_SET('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1:3:5:7:9-11', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 10)
+aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2:4:6:8:12-17
+include/gtid_utils_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_mysqlbinlog_concat.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_mysqlbinlog_concat.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_mysqlbinlog_concat.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_mysqlbinlog_concat.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+include/rpl_init.inc [topology=none]
+include/rpl_default_connections.inc
+CREATE TABLE t1(i INT);
+INSERT INTO t1 values (1);
+include/rpl_restart_server.inc [server_number=1 parameters: --gtid-mode=off]
+CREATE TABLE t2(i INT);
+INSERT INTO t2 values (2);
+include/rpl_restart_server.inc [server_number=1 parameters: --gtid-mode=on]
+CREATE TABLE t3(i INT);
+INSERT INTO t3 values (3);
+FLUSH LOGS;
+DROP TABLE t1,t2,t3;
+RESET MASTER;
+SELECT * FROM t1;
+i
+1
+SELECT * FROM t2;
+i
+2
+DROP TABLE t1,t2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result	2017-02-27 07:47:02.000000000 +0000
@@ -368,20 +368,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -442,20 +431,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -510,20 +488,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -587,20 +554,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -646,20 +602,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -714,20 +659,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -791,20 +725,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -859,20 +782,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1238,20 +1150,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1312,20 +1213,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1379,20 +1269,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1456,20 +1335,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1514,20 +1382,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1582,20 +1439,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1659,20 +1505,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
@@ -1727,20 +1562,9 @@
 SET TIMESTAMP=1988182800/*!*/;
 COMMIT
 /*!*/;
-DELIMITER ;
-DELIMITER /*!*/;
 SET TIMESTAMP=2019718800/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use `test`/*!*/;
 SET TIMESTAMP=2019718800/*!*/;
 INSERT INTO t1 VALUES(4)
 /*!*/;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop_slave_server_id.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop_slave_server_id.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop_slave_server_id.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop_slave_server_id.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,153 @@
+CREATE TABLE t1 (a INT);
+RESET MASTER;
+SET TIMESTAMP= UNIX_TIMESTAMP("2031-01-01 12:00:00");
+INSERT INTO t1 VALUES(1);
+SET TIMESTAMP= UNIX_TIMESTAMP("2032-01-01 12:00:00");
+INSERT INTO t1 VALUES(2);
+SET TIMESTAMP= UNIX_TIMESTAMP("2033-01-01 12:00:00");
+INSERT INTO t1 VALUES(3);
+FLUSH LOGS;
+SET TIMESTAMP= UNIX_TIMESTAMP("2034-01-01 12:00:00");
+INSERT INTO t1 VALUES(4);
+SET TIMESTAMP= UNIX_TIMESTAMP("2035-01-01 12:00:00");
+INSERT INTO t1 VALUES(5);
+FLUSH LOGS;
+
+==== Remote with to-last-log stop-never connection-server-id=0 ====
+
+---- to-last-log stop-never connection-server-id ----
+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
+DELIMITER /*!*/;
+ROLLBACK/*!*/;
+SET TIMESTAMP=1925024400/*!*/;
+SET @@session.pseudo_thread_id=999999999/*!*/;
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
+SET @@session.sql_mode=1073741824/*!*/;
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
+/*!\C latin1 *//*!*/;
+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
+SET @@session.lc_time_names=0/*!*/;
+SET @@session.collation_database=DEFAULT/*!*/;
+BEGIN
+/*!*/;
+use `test`/*!*/;
+SET TIMESTAMP=1925024400/*!*/;
+INSERT INTO t1 VALUES(1)
+/*!*/;
+SET TIMESTAMP=1925024400/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=1956560400/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=1956560400/*!*/;
+INSERT INTO t1 VALUES(2)
+/*!*/;
+SET TIMESTAMP=1956560400/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=1988182800/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=1988182800/*!*/;
+INSERT INTO t1 VALUES(3)
+/*!*/;
+SET TIMESTAMP=1988182800/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=2019718800/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=2019718800/*!*/;
+INSERT INTO t1 VALUES(4)
+/*!*/;
+SET TIMESTAMP=2019718800/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=2051254800/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=2051254800/*!*/;
+INSERT INTO t1 VALUES(5)
+/*!*/;
+SET TIMESTAMP=2051254800/*!*/;
+COMMIT
+/*!*/;
+DELIMITER ;
+# End of log file
+ROLLBACK /* added by mysqlbinlog */;
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
+
+==== Remote with connection-server-id= (value other than 0) ====
+
+---- to-last-log  connection-server-id ----
+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
+DELIMITER /*!*/;
+ROLLBACK/*!*/;
+SET TIMESTAMP=1925024400/*!*/;
+SET @@session.pseudo_thread_id=999999999/*!*/;
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
+SET @@session.sql_mode=1073741824/*!*/;
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
+/*!\C latin1 *//*!*/;
+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
+SET @@session.lc_time_names=0/*!*/;
+SET @@session.collation_database=DEFAULT/*!*/;
+BEGIN
+/*!*/;
+use `test`/*!*/;
+SET TIMESTAMP=1925024400/*!*/;
+INSERT INTO t1 VALUES(1)
+/*!*/;
+SET TIMESTAMP=1925024400/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=1956560400/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=1956560400/*!*/;
+INSERT INTO t1 VALUES(2)
+/*!*/;
+SET TIMESTAMP=1956560400/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=1988182800/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=1988182800/*!*/;
+INSERT INTO t1 VALUES(3)
+/*!*/;
+SET TIMESTAMP=1988182800/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=2019718800/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=2019718800/*!*/;
+INSERT INTO t1 VALUES(4)
+/*!*/;
+SET TIMESTAMP=2019718800/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=2051254800/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=2051254800/*!*/;
+INSERT INTO t1 VALUES(5)
+/*!*/;
+SET TIMESTAMP=2051254800/*!*/;
+COMMIT
+/*!*/;
+DELIMITER ;
+# End of log file
+ROLLBACK /* added by mysqlbinlog */;
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
+
+==== clean up ====
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result	2017-02-27 07:47:02.000000000 +0000
@@ -29,8 +29,7 @@
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; CREATE TABLE t(c1 int)
 master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp` /* generated by server */
 master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp1` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp1`,`drop-temp+table-test`.`tmp` /* generated by server */
 master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp3` /* generated by server */
 master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP TABLE IF EXISTS `t` /* generated by server */
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2017-02-27 07:47:02.000000000 +0000
@@ -295,7 +295,8 @@
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; create table t2 (n int) engine=innodb
-master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t1`,`ti`
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ti`
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t1`
 do release_lock("lock1");
 drop table t0,t2;
 set autocommit=0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result	2017-02-27 07:47:02.000000000 +0000
@@ -36,8 +36,7 @@
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; CREATE TABLE t(c1 int)
 master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp` /* generated by server */
 master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp1` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp1`,`drop-temp+table-test`.`tmp` /* generated by server */
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP TEMPORARY TABLE `tmp3` /* generated by server */
 master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP TABLE IF EXISTS `t` /* generated by server */
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2017-02-27 07:47:02.000000000 +0000
@@ -295,7 +295,8 @@
 master-bin.000001	#	Query	#	#	use `test`; insert into t0 select GET_LOCK("lock1",null)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; create table t2 (n int) engine=innodb
-master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t1`,`ti`
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ti`
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t1`
 do release_lock("lock1");
 drop table t0,t2;
 set autocommit=0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_switch_inside_trans.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_switch_inside_trans.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_switch_inside_trans.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_switch_inside_trans.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,5 @@
 set @save_binlog_format= @@global.binlog_format;
 set @save_binlog_dirct= @@global.binlog_direct_non_transactional_updates;
-set @save_sql_log_bin= @@global.sql_log_bin;
 create table t1 (a int) engine= myisam;
 create table t2 (a int) engine= innodb;
 SELECT @@session.binlog_format;
@@ -129,7 +128,7 @@
 begin;
 insert into t2 values (5);
 # Test that the global variable 'binlog_format' and
-# 'binlog_direct_non_transactional_updates' and 'sql_log_bin' are
+# 'binlog_direct_non_transactional_updates' are
 # writable inside a transaction.
 # Current session values are ROW, FALSE, TRUE respectively.
 SELECT @@global.binlog_format;
@@ -137,20 +136,15 @@
 ROW
 set @@global.binlog_format= statement;
 set @@global.binlog_direct_non_transactional_updates= TRUE;
-set @@global.sql_log_bin= FALSE;
 SELECT @@global.binlog_format;
 @@global.binlog_format
 STATEMENT
 SELECT @@global.binlog_direct_non_transactional_updates;
 @@global.binlog_direct_non_transactional_updates
 1
-SELECT @@global.sql_log_bin;
-@@global.sql_log_bin
-0
 commit;
 set @@global.binlog_format= @save_binlog_format;
 set @@global.binlog_direct_non_transactional_updates= @save_binlog_dirct;
-set @@global.sql_log_bin= @save_sql_log_bin;
 create table t3(a int, b int) engine= innodb;
 create table t4(a int) engine= innodb;
 create table t5(a int) engine= innodb;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_truncate_kill.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_truncate_kill.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_truncate_kill.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_truncate_kill.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,37 @@
+RESET MASTER;
+connection default;
+CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB;
+INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10);
+SET DEBUG_SYNC = "open_and_process_table signal truncate_before_lock wait_for forever";
+TRUNCATE t1;
+connect con1,localhost,root,,;
+SET DEBUG_SYNC = "now wait_for truncate_before_lock";
+SELECT ((@id := id) - id) FROM information_schema.processlist WHERE processlist.info LIKE '%TRUNCATE t1%' AND state LIKE '%open_and_process_table%';
+((@id := id) - id)
+0
+KILL QUERY @id;
+connection default;
+ERROR 70100: Query execution was interrupted
+connection con1;
+include/show_binlog_events.inc
+connection con1;
+connection con1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Intvar	#	#	INSERT_ID=1
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+connection con1;
+connection con1;
+disconnect con1;
+connection default;
+SELECT * FROM t1;
+id	a	b
+1	1	2
+2	2	4
+3	3	6
+4	4	8
+5	5	10
+DROP TABLE t1;
+SET DEBUG_SYNC= 'RESET';
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_xa_handling.result percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_xa_handling.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/r/binlog_xa_handling.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/r/binlog_xa_handling.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,10 @@
+CREATE TABLE t1(f1 int);
+XA START'','';
+INSERT INTO t1 VALUES(10);
+BINLOG '
+SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8=';
+XA END'';
+XA PREPARE'';
+XA COMMIT'';
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_error_action.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_error_action.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_error_action.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_error_action.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,139 @@
+###############################################################################
+# Bug#11758766:MYSQLD CONTINUES OPERATION WITHOUT LOGGING WHEN BINLOGS
+# CANNOT BE WRITTEN
+#
+# Problem:
+# ========
+# If an error occurs that prevents mysqld writing to the binary logs (disk
+# full, readonly filesystem, etc) then the logs are disabled and operations
+# continue. This can lead to out of sync slaves and improper backups.
+#
+# Test:
+# =====
+# A new option "binlog_error_action" has been introduced whose values
+# are "IGNORE" or "ABORT". When binlogging becomes impossible if user sets
+# the variable to "ABORT" server will stop if user sets it to "IGNORE" binlog
+# will be turned off and server will continue. 4 different test cases are
+# added to check both the behaviours.
+###############################################################################
+--source include/have_log_bin.inc
+--source include/not_embedded.inc
+--source include/have_binlog_format_statement.inc
+# Don't test this under valgrind, memory leaks will occur
+--source include/not_valgrind.inc
+--source include/have_debug.inc
+# Avoid CrashReporter popup on Mac
+--source include/not_crashrep.inc
+
+call mtr.add_suppression("MYSQL_BIN_LOG::add_log_to_index failed to copy index file to crash safe index file.");
+call mtr.add_suppression("Disk is full writing *");
+call mtr.add_suppression("Retry in 60 secs. *");
+call mtr.add_suppression("Error writing file*");
+call mtr.add_suppression("Could not open .*");
+call mtr.add_suppression("Could not use .*");
+call mtr.add_suppression("Can't generate a unique log-filename master-bin");
+call mtr.add_suppression("The server was unable to create a new log file *");
+
+let $old=`select @@debug`;
+
+RESET MASTER;
+
+--echo Test case1
+# Make binlog index readonly and check the behaviour with ABORT
+let $MYSQLD_DATADIR= `select @@datadir`;
+let $INDEX=$MYSQLD_DATADIR/master-bin.index;
+--chmod 0444 $INDEX
+
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--error ER_BINLOG_LOGGING_IMPOSSIBLE
+flush logs;
+--chmod 0666 $INDEX
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--echo Test case2
+# Make MYSQL_BIN_LOG::open_binlog fail with debug simulation and test
+# the behaviour in case of ABORT
+SET SESSION debug="+d,fault_injection_updating_index";
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--error ER_BINLOG_LOGGING_IMPOSSIBLE
+flush logs;
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--echo Test case3
+# Simulate diskfull during opening of binlog and check for diskfull error
+# behaviour where binlogging impossible error is to abort the server.
+SET SESSION debug="+d,simulate_disk_full_on_open_binlog";
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--error ER_BINLOG_LOGGING_IMPOSSIBLE
+flush logs;
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--echo Test case4
+SET SESSION debug="+d,fault_injection_init_name";
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--error ER_BINLOG_LOGGING_IMPOSSIBLE
+flush logs;
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--echo Test case5
+# Make binlog index readonly and check the behaviour with IGNORE
+--chmod 0444 $INDEX
+--replace_regex /\.[\\\/]master/master/ /errno: 13 - .*\)/errno: 13 - Permission denied)/
+--error 29
+flush logs;
+CREATE TABLE t1 ( f int );
+SHOW TABLES;
+DROP TABLE t1;
+--chmod 0666 $INDEX
+--source include/restart_mysqld.inc
+
+--echo Test case6
+# Make MYSQL_BIN_LOG::open_binlog fail with debug simulation and test
+# the behaviour in case of IGNORE
+SET SESSION debug="+d,fault_injection_updating_index";
+--replace_regex /\.[\\\/]master/master/ /errno: 1 - .*\)/errno: 1 - Operation not permitted)/
+--error ER_CANT_OPEN_FILE
+flush logs;
+CREATE TABLE t2 (f int );
+SHOW TABLES;
+DROP TABLE t2;
+SET SESSION debug="-d,fault_injection_updating_index";
+--source include/restart_mysqld.inc
+
+--echo Test case7
+# Simulate diskfull during opening of binlog and check for diskfull error
+# behaviour where binlogging impossible error is to continue the server
+# after the error.
+SET SESSION debug="+d,simulate_disk_full_on_open_binlog";
+--replace_regex /\.[\\\/]master/master/ /Errcode: 28 - .*\)/Errcode: 28 - No space left on device)/
+# error EE_WRITE with error code number 3 is expected.
+--error 3
+flush logs;
+SET SESSION debug="-d,simulate_disk_full_on_open_binlog";
+--source include/restart_mysqld.inc
+
+--echo Test case8
+SET SESSION debug="+d,fault_injection_init_name";
+--replace_regex /\.[\\\/]master/master/ /errno: 1 - .*\)/errno: 1 - Operation not permitted)/
+--error ER_CANT_OPEN_FILE
+flush logs;
+CREATE TABLE t2 (f int );
+SHOW TABLES;
+DROP TABLE t2;
+SET SESSION debug="-d,fault_injection_init_name";
+--source include/restart_mysqld.inc
+
+# Cleanup
+eval SET SESSION debug="$old";
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_grant.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_grant.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_grant.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_grant.test	2017-02-27 07:47:02.000000000 +0000
@@ -15,7 +15,7 @@
 connect (plain,localhost,mysqltest_1,,test);
 connect (root,localhost,root,,test);
 
-# Testing setting both session and global SQL_LOG_BIN variable both as
+# Testing setting session SQL_LOG_BIN variable both as
 # root and as plain user.
 
 --echo **** Variable SQL_LOG_BIN ****
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_gtid_simple_recovery.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_gtid_simple_recovery.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_gtid_simple_recovery.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_gtid_simple_recovery.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,120 @@
+# ==== Purpose ====
+#
+# BUG#16741603: MYSQLD SCANS ALL BINARY LOGS ON CRASH RECOVERY
+#
+# Verify that the server does not scan more than one binary log
+# in every iteration when initializing GTID sets on server start
+# if binlog-gtid-simple-recovery is enabled.
+#
+#
+# ==== Implementation ====
+#
+# 1) Start server and generate four binary logs with gtid_mode off.
+# 2) Move master-bin.000002 to master-bin.000002.bkp and
+#    master-bin.000003 to master-bin.000003.bkp
+# 3) Only master-bin.000001 and master-bin.000004 remain, others are moved
+#    , restart the server with enabled binlog-gtid-simple-recovery
+#    and gtid_mode on. If the server scans more than one binary log in
+#    every iteration, it will cause read error on the 2nd and 3rd files.
+# 4) Verify that GLOBAL.GTID_EXECUTED and GLOBAL.GTID_PURGED are empty
+#    after server restarts.
+# 5) Move master-bin.000004 to master-bin.000004.bkp
+# 6) Only master-bin.000001 and master-bin.000005 remain, others are moved
+#    , restart the server with enabled binlog-gtid-simple-recovery
+#    and gtid_mode on again. If the server scans more than one binary
+#    log in every iteration, it will cause read error on the 2nd and
+#    4th files.
+# 7) Verify that GLOBAL.GTID_EXECUTED contains committed gtid MASTER_UUID:1
+#    and GLOBAL.GTID_PURGED is empty after server restarts again.
+# 8) Move binary logs back.
+#
+
+--source include/not_gtid_enabled.inc
+
+# Invoke rpl_init.inc in order to set up the connections needed by
+# rpl_restart_server.inc
+--let $rpl_server_count= 1
+--let $rpl_topology= none
+--source include/rpl_init.inc
+--source include/rpl_default_connections.inc
+
+--let $MYSQLD_DATADIR= `select @@datadir`
+--let $master_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+CREATE TABLE t1 (
+  c1 INT NOT NULL PRIMARY KEY
+);
+
+--echo # Generate master-bin.000002
+FLUSH LOGS;
+INSERT INTO t1 VALUES (1);
+--let $binlog_file2= query_get_value(SHOW MASTER STATUS, File, 1)
+
+--echo # Generate master-bin.000003
+FLUSH LOGS;
+INSERT INTO t1 VALUES (2);
+--let $binlog_file3= query_get_value(SHOW MASTER STATUS, File, 1)
+
+--echo # Generate master-bin.000004
+FLUSH LOGS;
+INSERT INTO t1 VALUES (3);
+--let $binlog_file4= query_get_value(SHOW MASTER STATUS, File, 1)
+
+--echo # Move master-bin.000002 to master-bin.000002.bkp and
+--echo # master-bin.000003 to master-bin.000003.bkp
+--move_file $MYSQLD_DATADIR/$binlog_file2 $MYSQLD_DATADIR/$binlog_file2.bkp
+--move_file $MYSQLD_DATADIR/$binlog_file3 $MYSQLD_DATADIR/$binlog_file3.bkp
+
+--echo #
+--echo # Only master-bin.000001 and master-bin.000004 remain, others are moved
+--echo # , restart the server with enabled binlog-gtid-simple-recovery
+--echo # and gtid_mode on. If the server scans more than one binary log in
+--echo # every iteration, it will cause read error on the 2nd and 3rd files.
+--echo #
+--let $rpl_server_number= 1
+--let $rpl_server_parameters= --binlog-gtid-simple-recovery=on --gtid-mode=on --enforce-gtid-consistency --log-slave-updates
+--source include/rpl_restart_server.inc
+
+--echo #
+--echo # Verify that GLOBAL.GTID_EXECUTED and GLOBAL.GTID_PURGED are empty
+--echo # after server restarts.
+--echo #
+--let $assert_text= GLOBAL.GTID_EXECUTED must be empty.
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
+--source include/assert.inc
+--let $assert_text= GLOBAL.GTID_PURGED must be empty.
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_PURGED]" = ""
+--source include/assert.inc
+
+DROP TABLE t1;
+--echo # Move master-bin.000004 to master-bin.000004.bkp
+--move_file $MYSQLD_DATADIR/$binlog_file4 $MYSQLD_DATADIR/$binlog_file4.bkp
+
+--echo #
+--echo # Only master-bin.000001 and master-bin.000005 remain, others are moved
+--echo # , restart the server with enabled binlog-gtid-simple-recovery
+--echo # and gtid_mode on again. If the server scans more than one binary
+--echo # log in every iteration, it will cause read error on the 2nd and
+--echo # 4th files.
+--echo #
+--let $rpl_server_number= 1
+--let $rpl_server_parameters= --binlog-gtid-simple-recovery=on --gtid-mode=on --enforce-gtid-consistency --log-slave-updates
+--source include/rpl_restart_server.inc
+
+--echo #
+--echo # Verify that GLOBAL.GTID_EXECUTED contains committed gtid MASTER_UUID:1
+--echo # and GLOBAL.GTID_PURGED is empty after server restarts again.
+--echo #
+--let $assert_text= committed gtid MASTER_UUID:1
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:1"
+--source include/assert.inc
+--let $assert_text= GLOBAL.GTID_PURGED is empty
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_PURGED]" = ""
+--source include/assert.inc
+
+--echo # Move binary logs back.
+--move_file $MYSQLD_DATADIR/$binlog_file2.bkp $MYSQLD_DATADIR/$binlog_file2
+--move_file $MYSQLD_DATADIR/$binlog_file3.bkp $MYSQLD_DATADIR/$binlog_file3
+--move_file $MYSQLD_DATADIR/$binlog_file4.bkp $MYSQLD_DATADIR/$binlog_file4
+
+--source include/rpl_end.inc
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_gtid_utils.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_gtid_utils.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_gtid_utils.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_gtid_utils.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,71 @@
+# ==== Purpose ====
+#
+# Check all the GTID functions defined in the auxiliary test script
+# include/gtid_utils.inc.
+#
+# ==== Implementation ====
+#
+# For each function in gtid_utils.inc, test a few values, try to
+# include boundary conditions etc.
+
+--source include/have_gtid.inc
+# Only need to test under one binlog format
+--source include/have_binlog_format_row.inc
+--source include/gtid_utils.inc
+
+eval SELECT GTID_IS_EQUAL('$uuida:1,$uuidb:3:2:1', '$uuidb:1-3,$uuida:1');
+eval SELECT GTID_IS_EQUAL('$uuida:1,$uuidb:3:2:1', '$uuidb:1:3,$uuida:1');
+
+eval SELECT GTID_IS_DISJOINT('$uuida:2', '$uuidb:2,$uuida:1:3');
+eval SELECT GTID_IS_DISJOINT('$uuida:2', '$uuidb:2,$uuida:1-3');
+
+eval SELECT GTID_IS_DISJOINT_UNION('$uuida:2,$uuidb:1', '$uuida:1:3', '$uuida:1-3,$uuidb:1');
+eval SELECT GTID_IS_DISJOINT_UNION('$uuida:2,$uuidb:1', '$uuida:1-3', '$uuida:1-3,$uuidb:1');
+eval SELECT GTID_IS_DISJOINT_UNION('$uuida:2,$uuidb:1', '$uuida:1', '$uuida:1-3,$uuidb:1');
+
+eval SELECT GTID_INTERSECTION('$uuida:1-3', '$uuida:5-7');
+eval SELECT GTID_INTERSECTION('$uuida:1-3:5-7', '$uuida:3-5');
+eval SELECT GTID_INTERSECTION('$uuida:1-3', '$uuida:1:2:3');
+eval SELECT GTID_INTERSECTION('$uuidb:1-3', '$uuida:1-3');
+
+eval SELECT GTID_UNION('$uuida:1:3', '$uuida:1:3');
+eval SELECT GTID_UNION('$uuida:1-3', '$uuida:1:3');
+eval SELECT GTID_UNION('$uuida:1:3', '$uuida:2:4');
+
+eval SELECT GTID_SYMMETRIC_DIFFERENCE('$uuida:1-3', '$uuida:3-5');
+eval SELECT GTID_SYMMETRIC_DIFFERENCE('$uuida:1-3', '$uuida:4-5');
+eval SELECT GTID_SYMMETRIC_DIFFERENCE('$uuida:1-3', '$uuidb:1-3');
+
+eval SELECT GTID_SUBTRACT_UUID('$uuida:1-3,$uuidb:1-3,$uuidc:1-3', '$uuidb');
+eval SELECT GTID_SUBTRACT_UUID('$uuida:1-3,$uuidc:1-3', '$uuidb');
+eval SELECT GTID_SUBTRACT_UUID('$uuidb:1-3', '$uuidb');
+eval SELECT GTID_SUBTRACT_UUID(CONCAT('$uuida:1-', 1 << 63 - 1), '$uuida');
+
+eval SELECT GTID_INTERSECTION_WITH_UUID('$uuida:1-3,$uuidb:1-3,$uuidc:1-3', '$uuidb');
+eval SELECT GTID_INTERSECTION_WITH_UUID('$uuida:1-3,$uuidc:1-3', '$uuidb');
+eval SELECT GTID_INTERSECTION_WITH_UUID('$uuidb:1-3', '$uuidb');
+
+eval SELECT GTID_COUNT('');
+eval SELECT GTID_COUNT('$uuida:1');
+eval SELECT GTID_COUNT('$uuida:1-3');
+eval SELECT GTID_COUNT('$uuida:1-3:4-5');
+eval SELECT GTID_COUNT('$uuida:1-3:5-5');
+eval SELECT GTID_COUNT('$uuida:1-3:5-4');
+eval SELECT GTID_COUNT('$uuida:1-3:5-4,$uuidb:1:3,');
+
+eval SELECT GTID_NEXT_GENERATED('$uuidb:1', '$uuida');
+eval SELECT GTID_NEXT_GENERATED('', '$uuida');
+eval SELECT GTID_NEXT_GENERATED('$uuida:1', '$uuida');
+eval SELECT GTID_NEXT_GENERATED('$uuida:2', '$uuida');
+eval SELECT GTID_NEXT_GENERATED('$uuida:1-3', '$uuida');
+eval SELECT GTID_NEXT_GENERATED('$uuida:5:1-3', '$uuida');
+eval SELECT GTID_NEXT_GENERATED('$uuida:1-3,$uuid1:1', '$uuida');
+eval SELECT GTID_NEXT_GENERATED('$uuida:2-3,$uuid1:1', '$uuida');
+
+eval SELECT GTID_NEXT_GENERATED_SET('$uuida:1', '$uuida', 0);
+eval SELECT GTID_NEXT_GENERATED_SET('$uuidb:1', '$uuida', 4);
+eval SELECT GTID_NEXT_GENERATED_SET('', '$uuida', 4);
+eval SELECT GTID_NEXT_GENERATED_SET('$uuida:2:4:6:8:10-11', '$uuida', 10);
+eval SELECT GTID_NEXT_GENERATED_SET('$uuida:1:3:5:7:9-11', '$uuida', 10);
+
+--source include/gtid_utils_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_killed.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_killed.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_killed.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_killed.test	2017-02-27 07:47:02.000000000 +0000
@@ -387,6 +387,14 @@
 # common cleanup 
 #
 
+connection con1;
+disconnect con1;
+--source include/wait_until_disconnected.inc
+connection con2;
+disconnect con2;
+--source include/wait_until_disconnected.inc
+connection default;
+
 drop table t1,t2,t3;
 
 --echo end of the tests
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_mysqlbinlog_concat.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_mysqlbinlog_concat.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_mysqlbinlog_concat.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_mysqlbinlog_concat.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,103 @@
+#################################################################
+# Bug#18258933 CONCATENATION OF MYSQLBINLOG OUTPUT DOES NOT
+# WORK WITH GTID
+
+# Problem:  When mysqlbinlog processes and concatenates
+# multiple binary log files into one output file, this
+# output file is not in useful state. When it is later
+# used for point-in-time recovery, it is producing
+# ER_GTID_NEXT_TYPE_UNDEFINED_GROUP "ERROR 1837: When
+# @@SESSION.GTID_NEXT is set to a GTID, you must explicitly
+# set it to a different value after a COMMIT or ROLLBACK.
+# Please check GTID_NEXT variable manual page for detailed
+# explanation. Current @@SESSION.GTID_NEXT is 'xyz'"
+
+# Solution: When mysqlbinlog processes second binary log's
+#            start_log_event, it can output
+#            "SET GTID_NEXT=AUTOMATIC" if required i.e., if
+#            previous binary log is leaving the GTID_NEXT state
+#            in 'undefined' state.
+
+# Steps to verify the case:
+# 1) On a Gtid enabled server, generate some dummy statements
+#    in binary log ( to generate GTID_NEXT events in binary log 1)
+# 2) Restart server with gtid-mode OFF
+# 3) On a Gtid disabled sever, generate some dummy statements
+#     in binary log ( to generate anonymous events in binary log 2)
+# 4) Restart server again with gtid-mode ON.
+# 5) On a Gtid enabled server, generate some dummy statements
+#    in binary log ( to generate GTID_NEXT events in binary log 3)
+# 6) Concat all three binary logs 1,2 and 3 and apply the generated
+#    sql against mysql command line tool and it should not cause
+#    any error (i.e., no ER_GTID_NEXT_TYPE_UNDEFINED_GROUP error)
+#################################################################
+--source include/have_binlog_format_statement.inc
+--source include/have_gtid.inc
+
+# Use this so that we can use rpl_restart_server.inc later.
+--let $rpl_server_count= 1
+--let $rpl_topology= none
+--source include/rpl_init.inc
+--source include/rpl_default_connections.inc
+
+
+#Initial setup
+--let $datadir= `SELECT @@datadir`
+--let $binlog_file1= query_get_value(SHOW MASTER STATUS, File, 1)
+
+# Step 1 : Dummy statements to generate gtid transactions (gtid-mode is ON)
+# in binlog_file1
+CREATE TABLE t1(i INT);
+INSERT INTO t1 values (1);
+
+# Step 2: Restart server with gtid-mode off (binlog will be rotated)
+--let $rpl_server_number= 1
+--let $rpl_server_parameters= --gtid-mode=off
+--source include/rpl_restart_server.inc
+--let $binlog_file2= query_get_value(SHOW MASTER STATUS, File, 1)
+
+# Step 3: Dummy statements to generate anonymous transactions
+# (gtid-mode is OFF)
+CREATE TABLE t2(i INT);
+INSERT INTO t2 values (2);
+
+# Step 4: Restart server with gtid-mode ON (binlog will be rotated)
+--let $rpl_server_number= 1
+--let $rpl_server_parameters= --gtid-mode=on
+--source include/rpl_restart_server.inc
+--let $binlog_file3= query_get_value(SHOW MASTER STATUS, File, 1)
+
+# Step 5 : Dummy statements to generate gtid transactions (gtid-mode is ON)
+# in binlog_file3
+CREATE TABLE t3(i INT);
+INSERT INTO t3 values (3);
+
+# Clean up command (let DROP TABLE be in binary log 4, when we apply
+# all three binary logs, we can select the data and verify that the
+# data is there.
+FLUSH LOGS;
+DROP TABLE t1,t2,t3;
+
+# Step 6: Combine binlog_file1, binlog_file2, binlog_file3 and generate
+# a .sql file.
+--exec $MYSQL_BINLOG --force-if-open $datadir/$binlog_file1 $datadir/$binlog_file2  $datadir/$binlog_file3 > $MYSQLTEST_VARDIR/tmp/concat_three_files.sql
+
+# Execute reset master, so that when we are applying gtid transactions,
+# they should not skipped.
+RESET MASTER;
+
+# Step 7: Apply the generated .sql through mysql command line tool
+# and it should not cause any issues
+--exec $MYSQL --user=root --host=127.0.0.1 --port=$MASTER_MYPORT < $MYSQLTEST_VARDIR/tmp/concat_three_files.sql
+
+# Step 8: Verify the data in t1 and t2
+# [NOTE] there will not be table t3 created because CREATE TABLE t2, INSERT INTO t2
+# (originally anonymous transactions) now occupies gtid numbers 3 and 4,
+# hence CREATE TABLE t3, INSERT INTO t3(which has originally gtid numbers 3
+# and 4) will be skipped when we are reapplying them.
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+# Clean up
+DROP TABLE t1,t2;
+--remove_file $MYSQLTEST_VARDIR/tmp/concat_three_files.sql
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_mysqlbinlog_start_stop_slave_server_id.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_mysqlbinlog_start_stop_slave_server_id.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_mysqlbinlog_start_stop_slave_server_id.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_mysqlbinlog_start_stop_slave_server_id.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,54 @@
+# ==== Purpose ====
+#
+# When mysqlbinlog connects to a running server it uses the client command
+# COM_BINLOG_DUMP, and this command has a flag called BINLOG_DUMP_NON_BLOCK
+# which instructs the server to stop sending when it reaches the end of the
+# binary log.
+#
+#
+# There are two ways provided by the server to set the non-blocking behavior.
+# 1) Setting the connection-server-id=0. (this is the default value of
+#    connection-server-id)
+# 2) Setting BINLOG_DUMP_NON_BLOCK flag
+#  --To test this, we set connection-server-id to some value other then zero
+#    and not calling stop-never option in mysqlbinlog
+#
+# ==== Bug and Worklog references ====
+#
+# BUG##18000079 - binlog_dump_non_block disappeared in mysql 5.6
+# - Created the test to verify the bugfix.
+#
+# ==== Implementation ====
+
+--source include/not_gtid_enabled.inc
+# connection-server-id is a debug option. That's why we need include/have_debug.inc
+--source include/mysqlbinlog_have_debug.inc
+
+# As it is enough to test with one binlog format.
+--source include/have_binlog_format_statement.inc
+
+CREATE TABLE t1 (a INT);
+RESET MASTER;
+
+--source extra/binlog_tests/binlog_mysqlbinlog_fill.inc
+
+# Verify Non blocking behaviour with connection-server-id=0
+--echo
+--echo ==== Remote with to-last-log stop-never connection-server-id=0 ====
+--let $extra_options= --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT $file_1
+--let $options= --to-last-log --stop-never --connection-server-id=0
+--source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
+
+# Verify Non blocking behaviour for BINLOG_DUMP_NON_BLOCK by setting
+# connection-server-id=1 and not setting --stop-never
+--echo
+--echo ==== Remote with connection-server-id= (value other than 0) ====
+--let $extra_options= --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT $file_1
+--let $options= --to-last-log  --connection-server-id=1
+--source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
+
+--echo
+--echo ==== clean up ====
+DROP TABLE t1;
+
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_simplified_binlog_gtid_recovery-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_simplified_binlog_gtid_recovery-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_simplified_binlog_gtid_recovery-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_simplified_binlog_gtid_recovery-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--force-restart
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_switch_inside_trans.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_switch_inside_trans.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_switch_inside_trans.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_switch_inside_trans.test	2017-02-27 07:47:02.000000000 +0000
@@ -10,7 +10,6 @@
 
 set @save_binlog_format= @@global.binlog_format;
 set @save_binlog_dirct= @@global.binlog_direct_non_transactional_updates;
-set @save_sql_log_bin= @@global.sql_log_bin;
 create table t1 (a int) engine= myisam;
 create table t2 (a int) engine= innodb;
 
@@ -117,21 +116,18 @@
 begin;
   insert into t2 values (5);
 --echo # Test that the global variable 'binlog_format' and
---echo # 'binlog_direct_non_transactional_updates' and 'sql_log_bin' are
+--echo # 'binlog_direct_non_transactional_updates' are
 --echo # writable inside a transaction.
 --echo # Current session values are ROW, FALSE, TRUE respectively.
   SELECT @@global.binlog_format;
   set @@global.binlog_format= statement;
   set @@global.binlog_direct_non_transactional_updates= TRUE;
-  set @@global.sql_log_bin= FALSE;
   SELECT @@global.binlog_format;
   SELECT @@global.binlog_direct_non_transactional_updates;
-  SELECT @@global.sql_log_bin;
 commit;
 
 set @@global.binlog_format= @save_binlog_format;
 set @@global.binlog_direct_non_transactional_updates= @save_binlog_dirct;
-set @@global.sql_log_bin= @save_sql_log_bin;
 
 create table t3(a int, b int) engine= innodb;
 create table t4(a int) engine= innodb;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_truncate_kill.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_truncate_kill.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_truncate_kill.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_truncate_kill.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,56 @@
+###############################################################################
+# Bug#17942050:KILL OF TRUNCATE TABLE WILL LEAD TO BINARY LOG WRITTEN WHILE
+# ROWS REMAINS
+#
+# Problem:
+# ========
+# When truncate table fails while using transactional based engines even
+# though the operation errors out we still continue and log it to binlog.
+# Because of this master has data but the truncate will be written to binary
+# log which will cause inconsistency.
+#
+# Test:
+# =====
+# Make master to wait in "open_table" call during the execution of truncate
+# table command and kill the truncate table from other connection. This causes
+# open table to return an error saying truncate failed during open table. This
+# statement should not be binlogged.
+###############################################################################
+--source include/have_debug_sync.inc
+--source include/have_binlog_format_statement.inc
+RESET MASTER;
+--enable_connect_log
+--connection default
+CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB;
+INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10);
+SET DEBUG_SYNC = "open_and_process_table signal truncate_before_lock wait_for forever";
+--send TRUNCATE t1
+
+connect(con1,localhost,root,,);
+SET DEBUG_SYNC = "now wait_for truncate_before_lock";
+# Wait for one connection to reach open_and_process_table.
+--let $show_statement= SHOW PROCESSLIST
+--let $field= State
+--let $condition= 'debug sync point: open_and_process_table';
+--source include/wait_show_condition.inc
+
+SELECT ((@id := id) - id) FROM information_schema.processlist WHERE processlist.info LIKE '%TRUNCATE t1%' AND state LIKE '%open_and_process_table%';
+# Test killing from mysql server
+KILL QUERY @id;
+
+connection default;
+--ERROR ER_QUERY_INTERRUPTED
+--reap
+
+connection con1;
+--source include/show_binlog_events.inc
+
+disconnect con1;
+--source include/wait_until_disconnected.inc
+connection default;
+
+SELECT * FROM t1;
+
+DROP TABLE t1;
+SET DEBUG_SYNC= 'RESET';
+--disable_connect_log
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_xa_handling.test percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_xa_handling.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/binlog/t/binlog_xa_handling.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/binlog/t/binlog_xa_handling.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,22 @@
+###############################################################################
+# Bug#19928622: ASSERTION `! IS_SET()' FAILED. | ABORT IN
+# DIAGNOSTICS_AREA::SET_OK_STATUS
+#
+# Test:
+# =====
+# Begin an XA transaction and execte a DML statement so that XA state becomes
+# XA_ACTIVE. Execute the BINLOG command it should not cause any assert.
+# Execution should be successful.
+###############################################################################
+--source include/have_log_bin.inc
+
+CREATE TABLE t1(f1 int);
+XA START'','';
+INSERT INTO t1 VALUES(10);
+BINLOG '
+SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8=';
+XA END'';
+XA PREPARE'';
+XA COMMIT'';
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/datadict/processlist_priv.inc percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/datadict/processlist_priv.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/datadict/processlist_priv.inc	2017-02-27 07:47:02.000000000 +0000
@@ -137,10 +137,15 @@
 --source include/wait_condition.inc
 eval SHOW CREATE TABLE $table;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 eval SHOW $table;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
+--sorted_result
 eval SELECT * FROM $table $select_where ORDER BY id;
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
+--sorted_result
 --replace_column 1 ID 3 HOST_NAME 6 TIME
 eval SELECT $columns FROM $table $select_where ORDER BY id;
 --source suite/funcs_1/datadict/datadict_priv.inc
@@ -156,10 +161,16 @@
 # but "ddicttestuser1" must not see anything of the root session.
 eval SHOW CREATE TABLE $table;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
+--sorted_result
 eval SHOW $table;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
+--sorted_result
 eval SELECT * FROM $table $select_where ORDER BY id;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
+--sorted_result
 eval SELECT $columns FROM $table $select_where ORDER BY id;
 --source suite/funcs_1/datadict/datadict_priv.inc
 --real_sleep 0.3
@@ -182,9 +193,11 @@
 connection con100;
 SHOW GRANTS;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -196,9 +209,11 @@
 connect (con101,localhost,ddicttestuser1,ddictpass,information_schema);
 SHOW GRANTS;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -220,9 +235,11 @@
 connect (anonymous1,localhost,"''",,information_schema);
 SHOW GRANTS;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -244,9 +261,11 @@
 --echo ####################################################################################
 SHOW GRANTS;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -271,10 +290,12 @@
 {
 # Bug#30395 strange results after REVOKE PROCESS ON *.* FROM ...
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 }
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -295,9 +316,11 @@
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -319,9 +342,11 @@
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -368,9 +393,11 @@
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -391,9 +418,11 @@
 --echo ####################################################################################
 SHOW GRANTS;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -416,9 +445,11 @@
 --error ER_ACCESS_DENIED_ERROR
 GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
@@ -442,9 +473,11 @@
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW processlist;
 --replace_column 1 ID 3 HOST_NAME 6 TIME
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/datadict/processlist_val.inc percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/datadict/processlist_val.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/datadict/processlist_val.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/datadict/processlist_val.inc	2017-02-27 07:47:02.000000000 +0000
@@ -93,9 +93,11 @@
 #
 # 1. Just dump what we get
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
 #
@@ -168,9 +170,11 @@
 --source include/wait_condition.inc
 # 1. Just dump what we get
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
 #
@@ -215,9 +219,11 @@
 ;
 connection con1;
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
 
@@ -251,9 +257,11 @@
 connection con2;
 # Just dump what we get
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
 #
@@ -313,9 +321,11 @@
 --source include/wait_condition.inc
 # 1. Just dump what we get
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
 #
@@ -386,6 +396,7 @@
 # Expect to see the state 'Waiting for table metadata lock' for the third
 # connection because the SELECT collides with the WRITE TABLE LOCK.
 --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 UNLOCK TABLES;
@@ -446,12 +457,15 @@
 # SHOW PROCESSLIST                               statement truncated after 100 char
 ;
 --replace_column 1 <ID> 3 <HOST_NAME> 5 <COMMAND> 6 <TIME> 7 <STATE>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 --replace_column 1 <ID> 3 <HOST_NAME> 5 <COMMAND> 6 <TIME> 7 <STATE>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
 --replace_column 1 <ID> 3 <HOST_NAME> 5 <COMMAND> 6 <TIME> 7 <STATE>
+--replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW PROCESSLIST;
 UNLOCK TABLES;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/innodb_trig_03e.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2017-02-27 07:47:02.000000000 +0000
@@ -139,7 +139,7 @@
 test_yesprivs@localhost
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 drop trigger trg1_2;
 ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
@@ -387,7 +387,7 @@
 test_yesprivs@localhost
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 drop trigger trg1_2;
 select current_user;
@@ -1269,7 +1269,7 @@
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT TRIGGER ON `priv_db`.* TO 'test_yesprivs'@'localhost' WITH GRANT OPTION
 GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 create definer=not_ex_user@localhost trigger trg1_3
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/innodb_trig_03.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/innodb_trig_03.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/innodb_trig_03.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/innodb_trig_03.result	2017-02-27 07:47:02.000000000 +0000
@@ -189,7 +189,7 @@
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
@@ -220,7 +220,7 @@
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg4b_1 before UPDATE on t1 for each row
@@ -247,7 +247,7 @@
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
@@ -292,7 +292,7 @@
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg4c_1 before INSERT on t1 for each row
@@ -311,7 +311,7 @@
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
@@ -345,7 +345,7 @@
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg4d_1 before INSERT on t1 for each row
@@ -365,7 +365,7 @@
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
@@ -422,7 +422,7 @@
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
@@ -454,7 +454,7 @@
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg5b_1 before UPDATE on t1 for each row
@@ -472,7 +472,7 @@
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -507,7 +507,7 @@
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg5c_1 before INSERT on t1 for each row
@@ -521,7 +521,7 @@
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
@@ -551,7 +551,7 @@
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg5d_1 before INSERT on t1 for each row
@@ -565,7 +565,7 @@
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2017-02-27 07:47:02.000000000 +0000
@@ -249,7 +249,7 @@
 def	mysql	user	max_user_connections	40	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11) unsigned				
 def	mysql	user	Password	3		NO	char	41	41	NULL	NULL	NULL	latin1	latin1_bin	char(41)				
 def	mysql	user	password_expired	43	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
-def	mysql	user	plugin	41		YES	char	64	192	NULL	NULL	NULL	utf8	utf8_bin	char(64)				
+def	mysql	user	plugin	41	mysql_native_password	YES	char	64	192	NULL	NULL	NULL	utf8	utf8_bin	char(64)				
 def	mysql	user	Process_priv	12	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	user	References_priv	15	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	user	Reload_priv	10	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/is_columns_mysql.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/is_columns_mysql.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2017-02-27 07:47:02.000000000 +0000
@@ -249,7 +249,7 @@
 def	mysql	user	max_user_connections	40	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11) unsigned			select,insert,update,references	
 def	mysql	user	Password	3		NO	char	41	41	NULL	NULL	NULL	latin1	latin1_bin	char(41)			select,insert,update,references	
 def	mysql	user	password_expired	43	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-def	mysql	user	plugin	41		YES	char	64	192	NULL	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
+def	mysql	user	plugin	41	mysql_native_password	YES	char	64	192	NULL	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
 def	mysql	user	Process_priv	12	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 def	mysql	user	References_priv	15	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 def	mysql	user	Reload_priv	10	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/memory_trig_03e.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/memory_trig_03e.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2017-02-27 07:47:02.000000000 +0000
@@ -140,7 +140,7 @@
 test_yesprivs@localhost
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 drop trigger trg1_2;
 ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
@@ -388,7 +388,7 @@
 test_yesprivs@localhost
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 drop trigger trg1_2;
 select current_user;
@@ -1270,7 +1270,7 @@
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT TRIGGER ON `priv_db`.* TO 'test_yesprivs'@'localhost' WITH GRANT OPTION
 GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 create definer=not_ex_user@localhost trigger trg1_3
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/memory_trig_03.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/memory_trig_03.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/memory_trig_03.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/memory_trig_03.result	2017-02-27 07:47:02.000000000 +0000
@@ -190,7 +190,7 @@
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
@@ -221,7 +221,7 @@
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg4b_1 before UPDATE on t1 for each row
@@ -248,7 +248,7 @@
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
@@ -293,7 +293,7 @@
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg4c_1 before INSERT on t1 for each row
@@ -312,7 +312,7 @@
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
@@ -346,7 +346,7 @@
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg4d_1 before INSERT on t1 for each row
@@ -366,7 +366,7 @@
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
@@ -423,7 +423,7 @@
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
@@ -455,7 +455,7 @@
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg5b_1 before UPDATE on t1 for each row
@@ -473,7 +473,7 @@
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -508,7 +508,7 @@
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg5c_1 before INSERT on t1 for each row
@@ -522,7 +522,7 @@
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
@@ -552,7 +552,7 @@
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg5d_1 before INSERT on t1 for each row
@@ -566,7 +566,7 @@
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/myisam_trig_03e.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2017-02-27 07:47:02.000000000 +0000
@@ -140,7 +140,7 @@
 test_yesprivs@localhost
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 drop trigger trg1_2;
 ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
@@ -388,7 +388,7 @@
 test_yesprivs@localhost
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 drop trigger trg1_2;
 select current_user;
@@ -1270,7 +1270,7 @@
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT TRIGGER ON `priv_db`.* TO 'test_yesprivs'@'localhost' WITH GRANT OPTION
 GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 create definer=not_ex_user@localhost trigger trg1_3
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/myisam_trig_03.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/myisam_trig_03.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/myisam_trig_03.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/myisam_trig_03.result	2017-02-27 07:47:02.000000000 +0000
@@ -190,7 +190,7 @@
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
@@ -221,7 +221,7 @@
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg4b_1 before UPDATE on t1 for each row
@@ -248,7 +248,7 @@
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
@@ -293,7 +293,7 @@
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg4c_1 before INSERT on t1 for each row
@@ -312,7 +312,7 @@
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
@@ -346,7 +346,7 @@
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg4d_1 before INSERT on t1 for each row
@@ -366,7 +366,7 @@
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
@@ -423,7 +423,7 @@
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
@@ -455,7 +455,7 @@
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg5b_1 before UPDATE on t1 for each row
@@ -473,7 +473,7 @@
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -508,7 +508,7 @@
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg5c_1 before INSERT on t1 for each row
@@ -522,7 +522,7 @@
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
@@ -552,7 +552,7 @@
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 show grants;
 Grants for test_noprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 create trigger trg5d_1 before INSERT on t1 for each row
@@ -566,7 +566,7 @@
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2017-02-27 07:47:02.000000000 +0000
@@ -34,15 +34,15 @@
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	root	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	root	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	root	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	root	HOST_NAME	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -104,7 +104,7 @@
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
@@ -132,7 +132,7 @@
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 SHOW GRANTS;
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 CREATE INDEX i_processlist ON processlist (user);
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 DROP TABLE processlist;
@@ -166,10 +166,10 @@
 ####################################################################################
 SHOW GRANTS;
 Grants for ddicttestuser1@localhost
-GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -179,10 +179,10 @@
 ####################################################################################
 SHOW GRANTS;
 Grants for ddicttestuser1@localhost
-GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM information_schema.processlist;
@@ -205,7 +205,7 @@
 GRANT PROCESS ON *.* TO ''@'localhost'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID		HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID		HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -227,10 +227,10 @@
 ####################################################################################
 SHOW GRANTS;
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM information_schema.processlist;
@@ -269,7 +269,7 @@
 GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -291,10 +291,10 @@
 ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -339,7 +339,7 @@
 ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
 Grants for ddicttestuser2@localhost
-GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID		HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -351,7 +351,7 @@
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
@@ -377,10 +377,10 @@
 ####################################################################################
 SHOW GRANTS;
 Grants for ddicttestuser2@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
@@ -398,12 +398,12 @@
 ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
 ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -435,10 +435,10 @@
 ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/processlist_priv_ps.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2017-02-27 07:47:02.000000000 +0000
@@ -34,15 +34,15 @@
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	root	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	root	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	root	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	root	HOST_NAME	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -104,7 +104,7 @@
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
@@ -132,7 +132,7 @@
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 SHOW GRANTS;
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 CREATE INDEX i_processlist ON processlist (user);
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 DROP TABLE processlist;
@@ -166,10 +166,10 @@
 ####################################################################################
 SHOW GRANTS;
 Grants for ddicttestuser1@localhost
-GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -179,10 +179,10 @@
 ####################################################################################
 SHOW GRANTS;
 Grants for ddicttestuser1@localhost
-GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM information_schema.processlist;
@@ -205,7 +205,7 @@
 GRANT PROCESS ON *.* TO ''@'localhost'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID		HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID		HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -227,10 +227,10 @@
 ####################################################################################
 SHOW GRANTS;
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM information_schema.processlist;
@@ -269,7 +269,7 @@
 GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -291,10 +291,10 @@
 ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -339,7 +339,7 @@
 ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
 Grants for ddicttestuser2@localhost
-GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID		HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -351,7 +351,7 @@
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
@@ -377,10 +377,10 @@
 ####################################################################################
 SHOW GRANTS;
 Grants for ddicttestuser2@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
@@ -398,12 +398,12 @@
 ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
 ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
@@ -435,10 +435,10 @@
 ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 Grants for ddicttestuser1@localhost
-GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
+GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	STATE	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result	2017-02-27 07:47:02.000000000 +0000
@@ -29,7 +29,7 @@
 <ID>	root	<HOST_NAME>	test	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 SET @default_id = CONNECTION_ID();
 SELECT COUNT(*)  = 1 AS "Expect exact one connection with this id"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id;
@@ -77,7 +77,7 @@
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SELECT ID,TIME INTO @test_user_con1_id,@time FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE COMMAND = 'Sleep' AND USER = 'test_user';
@@ -110,7 +110,7 @@
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 # Ensure that the user test_user sees all connections with his username.
 #----------------------------------------------------------------------------
 
@@ -128,7 +128,7 @@
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 # ----- switch to connection default (user = root) -----
 
@@ -155,7 +155,7 @@
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	User sleep	SELECT sleep(10), 17
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SELECT STATE, TIME, INFO INTO @state, @time, @info
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/processlist_val_ps.result percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/processlist_val_ps.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/funcs_1/r/processlist_val_ps.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/funcs_1/r/processlist_val_ps.result	2017-02-27 07:47:02.000000000 +0000
@@ -29,7 +29,7 @@
 <ID>	root	<HOST_NAME>	test	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 SET @default_id = CONNECTION_ID();
 SELECT COUNT(*)  = 1 AS "Expect exact one connection with this id"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id;
@@ -77,7 +77,7 @@
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SELECT ID,TIME INTO @test_user_con1_id,@time FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE COMMAND = 'Sleep' AND USER = 'test_user';
@@ -110,7 +110,7 @@
 <ID>	test_user	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 # Ensure that the user test_user sees all connections with his username.
 #----------------------------------------------------------------------------
 
@@ -128,7 +128,7 @@
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 # ----- switch to connection default (user = root) -----
 
@@ -155,7 +155,7 @@
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	STATE	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	User sleep	SELECT sleep(10), 17
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SELECT STATE, TIME, INFO INTO @state, @time, @info
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/include/checksum_not_strict.inc percona-xtrabackup-2.3.7/mysql-test/suite/innodb/include/checksum_not_strict.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/include/checksum_not_strict.inc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/include/checksum_not_strict.inc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,5 @@
+if (`SELECT @@GLOBAL.innodb_checksum_algorithm like 'strict_%'`)
+{
+ --skip This test cannot be run when innodb_checksum_algorithm is in strict mode
+}
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/add_foreign_key.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/add_foreign_key.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/add_foreign_key.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/add_foreign_key.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,31 @@
+#
+# Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE ADD
+# FOREIGN KEY
+#
+CREATE TABLE `parent` (`parent_id` INT, PRIMARY KEY (`parent_id`));
+CREATE TABLE `child1` (`id` INT ,`child1_fk1` INT, `child1_fk2` INT,
+PRIMARY KEY (`id`));
+CREATE TABLE `child2` (`id` INT, `child2_fk1` INT, `child2_fk2` INT,
+PRIMARY KEY (`id`));
+CREATE TABLE `child3` (`id` INT , `child3_fk1` INT, PRIMARY KEY (`id`));
+ALTER TABLE `child1` ADD FOREIGN KEY (`child1_fk1`) REFERENCES `parent`
+(`parent_id`);
+ALTER TABLE `child1` ADD FOREIGN KEY (`child1_fk1`) REFERENCES
+`parent` (`parent_id`);
+ALTER TABLE `child1` ADD FOREIGN KEY (`child1_fk2`) REFERENCES `parent`
+(`parent_id`);
+ALTER TABLE `child2` ADD FOREIGN KEY (`child2_fk1`) REFERENCES `parent`
+(`parent_id`);
+ALTER TABLE `child2` ADD FOREIGN KEY (`child2_fk2`) REFERENCES `parent`
+(`parent_id`);
+ALTER TABLE `child3` ADD FOREIGN KEY (`child3_fk1`) REFERENCES `parent`
+(`parent_id`);
+ALTER TABLE `child1` ADD FOREIGN KEY (`child1_fk2`) REFERENCES
+`parent` (`parent_id`);
+ALTER TABLE `child2` ADD FOREIGN KEY (`child2_fk1`) REFERENCES
+`parent` (`parent_id`);
+ALTER TABLE `child2` ADD FOREIGN KEY (`child2_fk2`) REFERENCES
+`parent` (`parent_id`);
+ALTER TABLE `child3` ADD FOREIGN KEY (`child3_fk1`) REFERENCES
+`parent` (`parent_id`);
+drop table child3, child2, child1, parent;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/blob_redo.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/blob_redo.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/blob_redo.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/blob_redo.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,42 @@
+#
+# Bug #19498877 LIMITATION ON BLOB SIZE IS TOO STRICT, BLOB CAN
+# BE 10% OF TOTAL REDO LOG SIZE
+#
+call mtr.add_suppression("InnoDB: Resizing redo log from");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files.");
+call mtr.add_suppression("InnoDB: New log files created, LSN=");
+SET GLOBAL max_allowed_packet = 100*1024*1024;
+# Connection big_packets:
+CREATE TABLE t1 (a BIGINT PRIMARY KEY, b LONGBLOB) ENGINE=InnoDB;
+INSERT INTO t1 (a, b) VALUES (1, '1');
+INSERT INTO t1 (a, b) VALUES (2, '2');
+INSERT INTO t1 (a, b) VALUES (3, '3');
+INSERT INTO t1 (a, b) VALUES (4, '4');
+INSERT INTO t1 (a, b) VALUES (5, '5');
+start transaction;
+INSERT INTO t1 (a, b) VALUES (6, REPEAT('a', 6*1024*1024));
+# Connection default:
+# Quick shutdown and restart server
+# Connection default:
+SELECT a, b FROM t1;
+a	b
+1	1
+2	2
+3	3
+4	4
+5	5
+SET GLOBAL max_allowed_packet = 100*1024*1024;
+# Connection big_packets:
+start transaction;
+UPDATE t1 SET b = REPEAT('a', 6*1024*1024) WHERE a = 1;
+# Connection default:
+# Quick shutdown and restart server
+# Connection default:
+SELECT a, b FROM t1;
+a	b
+1	1
+2	2
+3	3
+4	4
+5	5
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/checksum.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/checksum.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/checksum.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/checksum.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,12 @@
+#
+# Bug#19500258 ZERO CAN BE A VALID INNODB CHECKSUM, 
+# BUT VALIDATION WILL FAIL LATER
+#
+SET GLOBAL innodb_checksum_algorithm = 'CRC32';
+CREATE TABLE t1 (a INT PRIMARY KEY, b VARBINARY(512)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1, X'666F72636520637263333220a0be0639');
+SELECT count(*) FROM t1;
+count(*)
+1
+SET GLOBAL innodb_checksum_algorithm = 'innodb';;
+drop table t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/foreign_key.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/foreign_key.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/foreign_key.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/foreign_key.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,126 @@
+#
+# Bug #19027905 ASSERT RET.SECOND DICT_CREATE_FOREIGN_CONSTRAINTS_LOW
+# DICT_CREATE_FOREIGN_CONSTR
+#
+create table t1 (f1 int primary key) engine=InnoDB;
+create table t2 (f1 int primary key,
+constraint c1 foreign key (f1) references t1(f1),
+constraint c1 foreign key (f1) references t1(f1)) engine=InnoDB;
+ERROR HY000: Cannot add foreign key constraint
+create table t2 (f1 int primary key,
+constraint c1 foreign key (f1) references t1(f1)) engine=innodb;
+alter table t2 add constraint c1 foreign key (f1) references t1(f1);
+ERROR 23000: Can't write; duplicate key in table '#sql-temporary'
+set foreign_key_checks = 0;
+alter table t2 add constraint c1 foreign key (f1) references t1(f1);
+ERROR HY000: Duplicate foreign key constraint name 'test/c1'
+drop table t2, t1;
+#
+# Bug #20031243 CREATE TABLE FAILS TO CHECK IF FOREIGN KEY COLUMN
+# NULL/NOT NULL MISMATCH
+#
+set foreign_key_checks = 1;
+show variables like 'foreign_key_checks';
+Variable_name	Value
+foreign_key_checks	ON
+CREATE TABLE t1
+(a INT NOT NULL,
+b INT NOT NULL,
+INDEX idx(a)) ENGINE=InnoDB;
+CREATE TABLE t2
+(a INT KEY,
+b INT,
+INDEX ind(b),
+FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE)
+ENGINE=InnoDB;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL,
+  `b` int(11) NOT NULL,
+  KEY `idx` (`a`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`),
+  KEY `ind` (`b`),
+  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`a`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+INSERT INTO t1 VALUES (1, 80);
+INSERT INTO t1 VALUES (2, 81);
+INSERT INTO t1 VALUES (3, 82);
+INSERT INTO t1 VALUES (4, 83);
+INSERT INTO t1 VALUES (5, 84);
+INSERT INTO t2 VALUES (51, 1);
+INSERT INTO t2 VALUES (52, 2);
+INSERT INTO t2 VALUES (53, 3);
+INSERT INTO t2 VALUES (54, 4);
+INSERT INTO t2 VALUES (55, 5);
+SELECT a, b FROM t1 ORDER BY a;
+a	b
+1	80
+2	81
+3	82
+4	83
+5	84
+SELECT a, b FROM t2 ORDER BY a;
+a	b
+51	1
+52	2
+53	3
+54	4
+55	5
+INSERT INTO t2 VALUES (56, 6);
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`a`) ON DELETE CASCADE ON UPDATE CASCADE)
+ALTER TABLE t1 CHANGE a id INT;
+SELECT id, b FROM t1 ORDER BY id;
+id	b
+1	80
+2	81
+3	82
+4	83
+5	84
+SELECT a, b FROM t2 ORDER BY a;
+a	b
+51	1
+52	2
+53	3
+54	4
+55	5
+# Operations on child table
+INSERT INTO t2 VALUES (56, 6);
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`id`) ON DELETE CASCADE ON UPDATE CASCADE)
+UPDATE t2 SET b = 99 WHERE a = 51;
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`id`) ON DELETE CASCADE ON UPDATE CASCADE)
+DELETE FROM t2 WHERE a = 53;
+SELECT id, b FROM t1 ORDER BY id;
+id	b
+1	80
+2	81
+3	82
+4	83
+5	84
+SELECT a, b FROM t2 ORDER BY a;
+a	b
+51	1
+52	2
+54	4
+55	5
+# Operations on parent table
+DELETE FROM t1 WHERE id = 1;
+UPDATE t1 SET id = 50 WHERE id = 5;
+SELECT id, b FROM t1 ORDER BY id;
+id	b
+2	81
+3	82
+4	83
+50	84
+SELECT a, b FROM t2 ORDER BY a;
+a	b
+52	2
+54	4
+55	50
+DROP TABLE t2, t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/index_tree_operation.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/index_tree_operation.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/index_tree_operation.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/index_tree_operation.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,55 @@
+#
+# Bug#15923864 (Bug#67718):
+#  INNODB DRASTICALLY UNDER-FILLS PAGES IN CERTAIN CONDITIONS
+#
+SET GLOBAL innodb_file_per_table=ON;
+CREATE TABLE t1 (a BIGINT PRIMARY KEY, b VARCHAR(4096)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (0, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (1000, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (1001, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (1002, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (1, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (2, REPEAT('a', 4096));
+SELECT page_number, number_records
+FROM information_schema.innodb_sys_tablespaces s1,
+information_schema.innodb_buffer_page s2
+WHERE s1.space = s2.space AND name = 'test/t1'
+AND page_type = "INDEX" ORDER BY page_number;
+page_number	number_records
+3	2
+4	3
+5	3
+INSERT INTO t1 VALUES (999, REPEAT('a', 4096));
+SELECT page_number, number_records
+FROM information_schema.innodb_sys_tablespaces s1,
+information_schema.innodb_buffer_page s2
+WHERE s1.space = s2.space AND name = 'test/t1'
+AND page_type = "INDEX" ORDER BY page_number;
+page_number	number_records
+3	3
+4	3
+5	3
+6	1
+INSERT INTO t1 VALUES (998, REPEAT('a', 4096));
+SELECT page_number, number_records
+FROM information_schema.innodb_sys_tablespaces s1,
+information_schema.innodb_buffer_page s2
+WHERE s1.space = s2.space AND name = 'test/t1'
+AND page_type = "INDEX" ORDER BY page_number;
+page_number	number_records
+3	3
+4	3
+5	3
+6	2
+INSERT INTO t1 VALUES (997, REPEAT('a', 4096));
+SELECT page_number, number_records
+FROM information_schema.innodb_sys_tablespaces s1,
+information_schema.innodb_buffer_page s2
+WHERE s1.space = s2.space AND name = 'test/t1'
+AND page_type = "INDEX" ORDER BY page_number;
+page_number	number_records
+3	3
+4	3
+5	3
+6	3
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-alter.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-alter.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-alter.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-alter.result	2017-02-27 07:47:02.000000000 +0000
@@ -679,3 +679,99 @@
 pos	NAME
 0	t
 DROP TABLE t;
+#
+# Bug #19465984 INNODB DATA DICTIONARY IS NOT UPDATED WHILE
+#		RENAMING THE COLUMN
+#
+CREATE TABLE t1(c1 INT NOT NULL, PRIMARY KEY(c1))ENGINE=INNODB;
+CREATE TABLE t2(c2 INT NOT NULL, FOREIGN KEY(c2) REFERENCES t1(c1))ENGINE=INNODB;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL,
+  PRIMARY KEY (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `c2` int(11) NOT NULL,
+  KEY `c2` (`c2`),
+  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c2`) REFERENCES `t1` (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t1 CHANGE COLUMN c1 C1 INT;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `C1` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`C1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `c2` int(11) NOT NULL,
+  KEY `c2` (`c2`),
+  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c2`) REFERENCES `t1` (`C1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t1 CHANGE COLUMN C1 c5 INT;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c5` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`c5`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `c2` int(11) NOT NULL,
+  KEY `c2` (`c2`),
+  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c2`) REFERENCES `t1` (`c5`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t2, t1;
+#
+# BUG 20029625 - HANDLE_FATAL_SIGNAL (SIG=11) IN
+#                DICT_MEM_TABLE_COL_RENAME_LOW
+#
+CREATE TABLE parent(a INT, b INT, KEY(a, b)) ENGINE = InnoDB;
+CREATE TABLE t1(a1 INT, a2 INT) ENGINE = InnoDB;
+set foreign_key_checks=0;
+ALTER TABLE t1 ADD CONSTRAINT fk_a FOREIGN KEY(a1, a2) REFERENCES parent(a, b) ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE t1 CHANGE a2 a3 INT,ADD CONSTRAINT fk_1 FOREIGN KEY(a1, a3) REFERENCES parent(a, b) ON DELETE SET NULL ON UPDATE CASCADE;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a1` int(11) DEFAULT NULL,
+  `a3` int(11) DEFAULT NULL,
+  KEY `fk_1` (`a1`,`a3`),
+  CONSTRAINT `fk_1` FOREIGN KEY (`a1`, `a3`) REFERENCES `parent` (`a`, `b`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `fk_a` FOREIGN KEY (`a1`, `a3`) REFERENCES `parent` (`a`, `b`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+ALTER TABLE t1 CHANGE a3 a4 INT;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a1` int(11) DEFAULT NULL,
+  `a4` int(11) DEFAULT NULL,
+  KEY `fk_1` (`a1`,`a4`),
+  CONSTRAINT `fk_1` FOREIGN KEY (`a1`, `a4`) REFERENCES `parent` (`a`, `b`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `fk_a` FOREIGN KEY (`a1`, `a4`) REFERENCES `parent` (`a`, `b`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+ALTER TABLE parent CHANGE b c INT;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a1` int(11) DEFAULT NULL,
+  `a4` int(11) DEFAULT NULL,
+  KEY `fk_1` (`a1`,`a4`),
+  CONSTRAINT `fk_1` FOREIGN KEY (`a1`, `a4`) REFERENCES `parent` (`a`, `c`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `fk_a` FOREIGN KEY (`a1`, `a4`) REFERENCES `parent` (`a`, `c`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+DROP TABLE t1, parent;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-alter-tempfile.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-alter-tempfile.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-alter-tempfile.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-alter-tempfile.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,38 @@
+#
+# Bug #18734396	INNODB IN-PLACE ALTER FAILURES BLOCK FUTURE ALTERS
+#
+# Temporary tablename will be unique. This makes sure that future
+# in-place ALTERs of the same table will not be blocked due to
+# temporary tablename.
+# Crash the server in ha_innobase::commit_inplace_alter_table()
+CREATE TABLE t1 (f1 INT NOT NULL, f2 INT NOT NULL) ENGINE=innodb;
+SET debug='d,innodb_alter_commit_crash_before_commit';
+# Write file to make mysql-test-run.pl expect crash
+# Execute the statement that causes the crash
+ALTER TABLE t1 ADD PRIMARY KEY (f2, f1);
+ERROR HY000: Lost connection to MySQL server during query
+# Startup the server after the crash
+# Read and remember the temporary table name
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) NOT NULL,
+  `f2` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+# Consecutive Alter table does not create same temporary file name
+ALTER TABLE t1 ADD PRIMARY KEY (f2, f1);
+# Shutdown the server to allow manual recovery
+# Manual recovery begin. The dictionary was not updated
+# and the files were not renamed. The rebuilt table
+# was left behind on purpose, to faciliate data recovery.
+# Manual recovery end
+# Startup the server after manual recovery
+# Drop the orphaned rebuilt table.
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) NOT NULL,
+  `f2` int(11) NOT NULL,
+  PRIMARY KEY (`f2`,`f1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+drop table t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_blob_unrecoverable_crash.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_blob_unrecoverable_crash.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_blob_unrecoverable_crash.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_blob_unrecoverable_crash.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,23 @@
+call mtr.add_suppression("InnoDB: The total blob data length");
+SET GLOBAL max_allowed_packet = 100*1024*1024;
+# Connection big_packets:
+CREATE TABLE t1 (a BIGINT PRIMARY KEY, b LONGBLOB) ENGINE=InnoDB;
+INSERT INTO t1 (a, b) VALUES (1, '1');
+INSERT INTO t1 (a, b) VALUES (2, '2');
+INSERT INTO t1 (a, b) VALUES (3, '3');
+INSERT INTO t1 (a, b) VALUES (4, '4');
+INSERT INTO t1 (a, b) VALUES (5, '5');
+start transaction;
+INSERT INTO t1 (a, b) VALUES (6, REPEAT('a', 20*1024*1024));
+ERROR 42000: The size of BLOB/TEXT data inserted in one transaction is greater than 10% of redo log size. Increase the redo log size using innodb_log_file_size.
+# Connection default:
+# Quick shutdown and restart server
+# Connection default:
+SELECT a FROM t1;
+a
+1
+2
+3
+4
+5
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_bug34300.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_bug34300.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_bug34300.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_bug34300.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,3 @@
+ERROR 42000: The size of BLOB/TEXT data inserted in one transaction is greater than 10% of redo log size. Increase the redo log size using innodb_log_file_size.
 f4	f8
-xxx	zzz
 f4	f8
-xxx	zzz
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_corrupt_bit.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_corrupt_bit.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_corrupt_bit.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_corrupt_bit.result	2017-02-27 07:47:02.000000000 +0000
@@ -78,4 +78,5 @@
 31
 32
 drop table corrupt_bit_test_�;
+DROP DATABASE pad;
 SET GLOBAL innodb_change_buffering_debug = 0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-double-write.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-double-write.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-double-write.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-double-write.result	2017-02-27 07:47:02.000000000 +0000
@@ -3,6 +3,7 @@
 # Bug #18144349 INNODB CANNOT USE THE DOUBLEWRITE BUFFER FOR THE FIRST
 # PAGE OF SYSTEM TABLESPACE
 #
+SET GLOBAL innodb_fast_shutdown = 0;
 show variables like 'innodb_doublewrite';
 Variable_name	Value
 innodb_doublewrite	ON
@@ -87,6 +88,9 @@
 # tablespace is full of zeroes.
 select space from information_schema.innodb_sys_tables
 where name = 'test/t1' into @space_id;
+# Ensure that dirty pages of table t1 is flushed.
+flush tables t1 for export;
+unlock tables;
 # Make the 2nd page dirty for table t1
 set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = @space_id;
@@ -114,6 +118,9 @@
 # tablespace is corrupted.
 select space from information_schema.innodb_sys_tables
 where name = 'test/t1' into @space_id;
+# Ensure that dirty pages of table t1 is flushed.
+flush tables t1 for export;
+unlock tables;
 # Make the 2nd page dirty for table t1
 set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = @space_id;
@@ -139,6 +146,8 @@
 # ---------------------------------------------------------------
 # Test Begin: Test if recovery works if first page of
 # system tablespace is full of zeroes.
+# Ensure that the dirty page of system tablespace is flushed.
+set global innodb_buf_flush_list_now = 1;
 # Make the first page dirty for system tablespace
 set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = 0;
@@ -164,6 +173,8 @@
 # ---------------------------------------------------------------
 # Test Begin: Test if recovery works if first page of
 # system tablespace is corrupted.
+# Ensure that the dirty page of system tablespace is flushed.
+set global innodb_buf_flush_list_now = 1;
 # Make the first page dirty for system tablespace
 set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = 0;
@@ -188,6 +199,8 @@
 # ---------------------------------------------------------------
 # Test Begin: Test if recovery works if 2nd page of
 # system tablespace is full of zeroes.
+# Ensure that the dirty page of system tablespace is flushed.
+set global innodb_buf_flush_list_now = 1;
 # Make the second page dirty for system tablespace
 set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = 0;
@@ -213,6 +226,8 @@
 # ---------------------------------------------------------------
 # Test Begin: Test if recovery works if 2nd page of
 # system tablespace is corrupted.
+# Ensure that the dirty page of system tablespace is flushed.
+set global innodb_buf_flush_list_now = 1;
 # Make the second page dirty for system tablespace
 set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = 0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-lock.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-lock.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-lock.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-lock.result	2017-02-27 07:47:02.000000000 +0000
@@ -106,3 +106,16 @@
 3	1
 COMMIT;
 DROP TABLE t1;
+Bug#19803418   ASSERTION: TABLE->QUIESCE == QUIESCE_NONE
+IN ROW0QUIESCE.CC LINE 683
+CREATE TABLE t1(C TEXT CHARACTER SET UJIS) ENGINE=INNODB;
+LOCK TABLES t1 WRITE,t1 AS t0 READ,t1 AS t2 READ;
+FLUSH TABLE t1;
+LOCK TABLES t1 READ,t1 AS t0 WRITE,t1 AS t2 READ;
+FLUSH TABLE t1;
+LOCK TABLES t1 READ,t1 AS t0 READ,t1 AS t2 READ;
+FLUSH TABLE t1;
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+UNLOCK TABLES;
+FLUSH TABLE t1;
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_monitor.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_monitor.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_monitor.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_monitor.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,549 +0,0 @@
-set global innodb_monitor_disable = All;
-select name, status from information_schema.innodb_metrics;
-name	status
-metadata_table_handles_opened	disabled
-metadata_table_handles_closed	disabled
-metadata_table_reference_count	disabled
-metadata_mem_pool_size	disabled
-lock_deadlocks	disabled
-lock_timeouts	disabled
-lock_rec_lock_waits	disabled
-lock_table_lock_waits	disabled
-lock_rec_lock_requests	disabled
-lock_rec_lock_created	disabled
-lock_rec_lock_removed	disabled
-lock_rec_locks	disabled
-lock_table_lock_created	disabled
-lock_table_lock_removed	disabled
-lock_table_locks	disabled
-lock_row_lock_current_waits	disabled
-lock_row_lock_time	disabled
-lock_row_lock_time_max	disabled
-lock_row_lock_waits	disabled
-lock_row_lock_time_avg	disabled
-buffer_pool_size	disabled
-buffer_pool_reads	disabled
-buffer_pool_read_requests	disabled
-buffer_pool_write_requests	disabled
-buffer_pool_wait_free	disabled
-buffer_pool_read_ahead	disabled
-buffer_pool_read_ahead_evicted	disabled
-buffer_pool_pages_total	disabled
-buffer_pool_pages_misc	disabled
-buffer_pool_pages_data	disabled
-buffer_pool_bytes_data	disabled
-buffer_pool_pages_dirty	disabled
-buffer_pool_bytes_dirty	disabled
-buffer_pool_pages_free	disabled
-buffer_pages_created	disabled
-buffer_pages_written	disabled
-buffer_pages_read	disabled
-buffer_data_reads	disabled
-buffer_data_written	disabled
-buffer_flush_batch_scanned	disabled
-buffer_flush_batch_num_scan	disabled
-buffer_flush_batch_scanned_per_call	disabled
-buffer_flush_batch_rescan	disabled
-buffer_flush_batch_total_pages	disabled
-buffer_flush_batches	disabled
-buffer_flush_batch_pages	disabled
-buffer_flush_neighbor_total_pages	disabled
-buffer_flush_neighbor	disabled
-buffer_flush_neighbor_pages	disabled
-buffer_flush_n_to_flush_requested	disabled
-buffer_flush_avg_page_rate	disabled
-buffer_flush_lsn_avg_rate	disabled
-buffer_flush_pct_for_dirty	disabled
-buffer_flush_pct_for_lsn	disabled
-buffer_flush_sync_waits	disabled
-buffer_flush_adaptive_total_pages	disabled
-buffer_flush_adaptive	disabled
-buffer_flush_adaptive_pages	disabled
-buffer_flush_sync_total_pages	disabled
-buffer_flush_sync	disabled
-buffer_flush_sync_pages	disabled
-buffer_flush_background_total_pages	disabled
-buffer_flush_background	disabled
-buffer_flush_background_pages	disabled
-buffer_LRU_batch_scanned	disabled
-buffer_LRU_batch_num_scan	disabled
-buffer_LRU_batch_scanned_per_call	disabled
-buffer_LRU_batch_total_pages	disabled
-buffer_LRU_batches	disabled
-buffer_LRU_batch_pages	disabled
-buffer_LRU_single_flush_scanned	disabled
-buffer_LRU_single_flush_num_scan	disabled
-buffer_LRU_single_flush_scanned_per_call	disabled
-buffer_LRU_single_flush_failure_count	disabled
-buffer_LRU_get_free_search	disabled
-buffer_LRU_search_scanned	disabled
-buffer_LRU_search_num_scan	disabled
-buffer_LRU_search_scanned_per_call	disabled
-buffer_LRU_unzip_search_scanned	disabled
-buffer_LRU_unzip_search_num_scan	disabled
-buffer_LRU_unzip_search_scanned_per_call	disabled
-buffer_page_read_index_leaf	disabled
-buffer_page_read_index_non_leaf	disabled
-buffer_page_read_index_ibuf_leaf	disabled
-buffer_page_read_index_ibuf_non_leaf	disabled
-buffer_page_read_undo_log	disabled
-buffer_page_read_index_inode	disabled
-buffer_page_read_ibuf_free_list	disabled
-buffer_page_read_ibuf_bitmap	disabled
-buffer_page_read_system_page	disabled
-buffer_page_read_trx_system	disabled
-buffer_page_read_fsp_hdr	disabled
-buffer_page_read_xdes	disabled
-buffer_page_read_blob	disabled
-buffer_page_read_zblob	disabled
-buffer_page_read_zblob2	disabled
-buffer_page_read_other	disabled
-buffer_page_written_index_leaf	disabled
-buffer_page_written_index_non_leaf	disabled
-buffer_page_written_index_ibuf_leaf	disabled
-buffer_page_written_index_ibuf_non_leaf	disabled
-buffer_page_written_undo_log	disabled
-buffer_page_written_index_inode	disabled
-buffer_page_written_ibuf_free_list	disabled
-buffer_page_written_ibuf_bitmap	disabled
-buffer_page_written_system_page	disabled
-buffer_page_written_trx_system	disabled
-buffer_page_written_fsp_hdr	disabled
-buffer_page_written_xdes	disabled
-buffer_page_written_blob	disabled
-buffer_page_written_zblob	disabled
-buffer_page_written_zblob2	disabled
-buffer_page_written_other	disabled
-os_data_reads	disabled
-os_data_writes	disabled
-os_data_fsyncs	disabled
-os_pending_reads	disabled
-os_pending_writes	disabled
-os_log_bytes_written	disabled
-os_log_fsyncs	disabled
-os_log_pending_fsyncs	disabled
-os_log_pending_writes	disabled
-trx_rw_commits	disabled
-trx_ro_commits	disabled
-trx_nl_ro_commits	disabled
-trx_commits_insert_update	disabled
-trx_rollbacks	disabled
-trx_rollbacks_savepoint	disabled
-trx_rollback_active	disabled
-trx_active_transactions	disabled
-trx_rseg_history_len	disabled
-trx_undo_slots_used	disabled
-trx_undo_slots_cached	disabled
-trx_rseg_current_size	disabled
-purge_del_mark_records	disabled
-purge_upd_exist_or_extern_records	disabled
-purge_invoked	disabled
-purge_undo_log_pages	disabled
-purge_dml_delay_usec	disabled
-purge_stop_count	disabled
-purge_resume_count	disabled
-log_checkpoints	disabled
-log_lsn_last_flush	disabled
-log_lsn_last_checkpoint	disabled
-log_lsn_current	disabled
-log_lsn_checkpoint_age	disabled
-log_lsn_buf_pool_oldest	disabled
-log_max_modified_age_async	disabled
-log_max_modified_age_sync	disabled
-log_pending_log_writes	disabled
-log_pending_checkpoint_writes	disabled
-log_num_log_io	disabled
-log_waits	disabled
-log_write_requests	disabled
-log_writes	disabled
-compress_pages_compressed	disabled
-compress_pages_decompressed	disabled
-compression_pad_increments	disabled
-compression_pad_decrements	disabled
-index_page_splits	disabled
-index_page_merge_attempts	disabled
-index_page_merge_successful	disabled
-index_page_reorg_attempts	disabled
-index_page_reorg_successful	disabled
-index_page_discards	disabled
-adaptive_hash_searches	disabled
-adaptive_hash_searches_btree	disabled
-adaptive_hash_pages_added	disabled
-adaptive_hash_pages_removed	disabled
-adaptive_hash_rows_added	disabled
-adaptive_hash_rows_removed	disabled
-adaptive_hash_rows_deleted_no_hash_entry	disabled
-adaptive_hash_rows_updated	disabled
-file_num_open_files	disabled
-ibuf_merges_insert	disabled
-ibuf_merges_delete_mark	disabled
-ibuf_merges_delete	disabled
-ibuf_merges_discard_insert	disabled
-ibuf_merges_discard_delete_mark	disabled
-ibuf_merges_discard_delete	disabled
-ibuf_merges	disabled
-ibuf_size	disabled
-innodb_master_thread_sleeps	disabled
-innodb_activity_count	disabled
-innodb_master_active_loops	disabled
-innodb_master_idle_loops	disabled
-innodb_background_drop_table_usec	disabled
-innodb_ibuf_merge_usec	disabled
-innodb_log_flush_usec	disabled
-innodb_mem_validate_usec	disabled
-innodb_master_purge_usec	disabled
-innodb_dict_lru_usec	disabled
-innodb_checkpoint_usec	disabled
-innodb_dblwr_writes	disabled
-innodb_dblwr_pages_written	disabled
-innodb_page_size	disabled
-innodb_rwlock_s_spin_waits	disabled
-innodb_rwlock_x_spin_waits	disabled
-innodb_rwlock_s_spin_rounds	disabled
-innodb_rwlock_x_spin_rounds	disabled
-innodb_rwlock_s_os_waits	disabled
-innodb_rwlock_x_os_waits	disabled
-dml_reads	disabled
-dml_inserts	disabled
-dml_deletes	disabled
-dml_updates	disabled
-ddl_background_drop_indexes	disabled
-ddl_background_drop_tables	disabled
-ddl_online_create_index	disabled
-ddl_pending_alter_table	disabled
-icp_attempts	disabled
-icp_no_match	disabled
-icp_out_of_range	disabled
-icp_match	disabled
-set global innodb_monitor_enable = all;
-select name from information_schema.innodb_metrics where status!='enabled';
-name
-set global innodb_monitor_enable = aaa;
-ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of 'aaa'
-set global innodb_monitor_disable = All;
-select name from information_schema.innodb_metrics where status!='disabled';
-name
-set global innodb_monitor_reset_all = all;
-select name from information_schema.innodb_metrics where count!=0;
-name
-set  global innodb_monitor_enable = "%lock%";
-select name from information_schema.innodb_metrics
-where status != IF(name like "%lock%", 'enabled', 'disabled');
-name
-set  global innodb_monitor_disable = "%lock%";
-select name, status from information_schema.innodb_metrics
-where name like "%lock%";
-name	status
-lock_deadlocks	disabled
-lock_timeouts	disabled
-lock_rec_lock_waits	disabled
-lock_table_lock_waits	disabled
-lock_rec_lock_requests	disabled
-lock_rec_lock_created	disabled
-lock_rec_lock_removed	disabled
-lock_rec_locks	disabled
-lock_table_lock_created	disabled
-lock_table_lock_removed	disabled
-lock_table_locks	disabled
-lock_row_lock_current_waits	disabled
-lock_row_lock_time	disabled
-lock_row_lock_time_max	disabled
-lock_row_lock_waits	disabled
-lock_row_lock_time_avg	disabled
-innodb_rwlock_s_spin_waits	disabled
-innodb_rwlock_x_spin_waits	disabled
-innodb_rwlock_s_spin_rounds	disabled
-innodb_rwlock_x_spin_rounds	disabled
-innodb_rwlock_s_os_waits	disabled
-innodb_rwlock_x_os_waits	disabled
-set global innodb_monitor_enable = "%lock*";
-ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of '%lock*'
-set global innodb_monitor_enable="%%%%%%%%%%%%%%%%%%%%%%%%%%%";
-select name from information_schema.innodb_metrics where status!='enabled';
-name
-set global innodb_monitor_disable="%%%%%";
-select name from information_schema.innodb_metrics where status!='disabled';
-name
-set global innodb_monitor_enable="%";
-select name from information_schema.innodb_metrics where status!='enabled';
-name
-set global innodb_monitor_disable="%_%";
-select name from information_schema.innodb_metrics where status!='disabled';
-name
-set global innodb_monitor_enable="log%%%%";
-select name from information_schema.innodb_metrics
-where status != IF(name like "log%", 'enabled', 'disabled');
-name
-set global innodb_monitor_enable="os_%a_fs_ncs";
-set global innodb_monitor_enable="os%pending%";
-select name, status from information_schema.innodb_metrics
-where name like "os%";
-name	status
-os_data_reads	disabled
-os_data_writes	disabled
-os_data_fsyncs	enabled
-os_pending_reads	enabled
-os_pending_writes	enabled
-os_log_bytes_written	disabled
-os_log_fsyncs	disabled
-os_log_pending_fsyncs	enabled
-os_log_pending_writes	enabled
-set global innodb_monitor_enable="";
-ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of ''
-set global innodb_monitor_enable="_";
-ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of '_'
-set global innodb_monitor_disable = module_metadata;
-set global innodb_monitor_reset_all = module_metadata;
-set global innodb_monitor_enable = metadata_table_handles_opened;
-create table monitor_test(col int) engine = innodb;
-select * from monitor_test;
-col
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	1	NULL	1	1	NULL	1	enabled
-set global innodb_monitor_reset = metadata_table_handles_opened;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	1	NULL	1	NULL	NULL	0	enabled
-drop table monitor_test;
-create table monitor_test(col int) engine = innodb;
-select * from monitor_test;
-col
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	2	NULL	2	1	NULL	1	enabled
-set global innodb_monitor_reset_all = metadata_table_handles_opened;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	2	NULL	2	1	NULL	1	enabled
-set global innodb_monitor_disable = metadata_table_handles_opened;
-set global innodb_monitor_reset = metadata_table_handles_opened;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	2	NULL	2	NULL	NULL	0	disabled
-drop table monitor_test;
-create table monitor_test(col int) engine = innodb;
-select * from monitor_test;
-col
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	2	NULL	2	NULL	NULL	0	disabled
-set global innodb_monitor_reset_all = metadata_table_handles_opened;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	NULL	NULL	0	NULL	NULL	0	disabled
-set global innodb_monitor_enable = metadata_table_handles_opened;
-drop table monitor_test;
-create table monitor_test(col int) engine = innodb stats_persistent=0;
-select * from monitor_test;
-col
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	1	NULL	1	1	NULL	1	enabled
-set global innodb_monitor_enable = metadata_table_handles_closed;
-create index idx on monitor_test(col);
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_closed";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_closed	1	NULL	1	1	NULL	1	enabled
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "metadata%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	2	NULL	2	2	NULL	2	enabled
-metadata_table_handles_closed	1	NULL	1	1	NULL	1	enabled
-metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
-metadata_mem_pool_size	NULL	NULL	0	NULL	NULL	0	disabled
-set global innodb_monitor_disable = module_metadata;
-set global innodb_monitor_reset = module_metadata;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "metadata%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	2	NULL	2	NULL	NULL	0	disabled
-metadata_table_handles_closed	1	NULL	1	NULL	NULL	0	disabled
-metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
-metadata_mem_pool_size	NULL	NULL	0	NULL	NULL	0	disabled
-set global innodb_monitor_reset_all = module_metadata;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "metadata%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	NULL	NULL	0	NULL	NULL	0	disabled
-metadata_table_handles_closed	NULL	NULL	0	NULL	NULL	0	disabled
-metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
-metadata_mem_pool_size	NULL	NULL	0	NULL	NULL	0	disabled
-set global innodb_monitor_enable = module_trx;
-begin;
-insert into monitor_test values(9);
-commit;
-begin;
-insert into monitor_test values(9);
-rollback;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "trx_rollbacks" or name like "trx_active_transactions";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-trx_rollbacks	1	NULL	1	1	NULL	1	enabled
-trx_active_transactions	1	0	0	1	0	0	enabled
-set global innodb_monitor_disable = module_trx;
-set global innodb_monitor_enable = module_dml;
-insert into monitor_test values(9);
-update monitor_test set col = 10 where col = 9;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-dml_reads	4	NULL	4	4	NULL	4	enabled
-dml_inserts	1	NULL	1	1	NULL	1	enabled
-dml_deletes	0	NULL	0	0	NULL	0	enabled
-dml_updates	2	NULL	2	2	NULL	2	enabled
-delete from monitor_test;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-dml_reads	6	NULL	6	6	NULL	6	enabled
-dml_inserts	1	NULL	1	1	NULL	1	enabled
-dml_deletes	2	NULL	2	2	NULL	2	enabled
-dml_updates	2	NULL	2	2	NULL	2	enabled
-set global innodb_monitor_reset =  module_dml;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-dml_reads	6	NULL	6	0	NULL	0	enabled
-dml_inserts	1	NULL	1	0	NULL	0	enabled
-dml_deletes	2	NULL	2	0	NULL	0	enabled
-dml_updates	2	NULL	2	0	NULL	0	enabled
-insert into monitor_test values(9);
-insert into monitor_test values(1);
-delete from monitor_test;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-dml_reads	8	NULL	8	2	NULL	2	enabled
-dml_inserts	3	NULL	3	2	NULL	2	enabled
-dml_deletes	4	NULL	4	2	NULL	2	enabled
-dml_updates	2	NULL	2	0	NULL	0	enabled
-set global innodb_monitor_reset_all  =  module_dml;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-dml_reads	8	NULL	8	2	NULL	2	enabled
-dml_inserts	3	NULL	3	2	NULL	2	enabled
-dml_deletes	4	NULL	4	2	NULL	2	enabled
-dml_updates	2	NULL	2	0	NULL	0	enabled
-set global innodb_monitor_disable = module_dml;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-dml_reads	8	NULL	8	2	NULL	2	disabled
-dml_inserts	3	NULL	3	2	NULL	2	disabled
-dml_deletes	4	NULL	4	2	NULL	2	disabled
-dml_updates	2	NULL	2	0	NULL	0	disabled
-set global innodb_monitor_reset_all  = module_dml;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-dml_reads	NULL	NULL	0	NULL	NULL	0	disabled
-dml_inserts	NULL	NULL	0	NULL	NULL	0	disabled
-dml_deletes	NULL	NULL	0	NULL	NULL	0	disabled
-dml_updates	NULL	NULL	0	NULL	NULL	0	disabled
-set global innodb_monitor_enable = dml_inserts;
-insert into monitor_test values(9);
-insert into monitor_test values(1);
-delete from monitor_test;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-dml_reads	NULL	NULL	0	NULL	NULL	0	disabled
-dml_inserts	2	NULL	2	2	NULL	2	enabled
-dml_deletes	NULL	NULL	0	NULL	NULL	0	disabled
-dml_updates	NULL	NULL	0	NULL	NULL	0	disabled
-set global innodb_monitor_disable = module_dml;
-drop table monitor_test;
-set global innodb_monitor_enable = file_num_open_files;
-select name, max_count, min_count, count,
-max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "file_num_open_files";
-name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-file_num_open_files	#	#	#	#	#	#	enabled
-set global innodb_monitor_disable = file_num_open_files;
-set global innodb_monitor_enable = "icp%";
-create table monitor_test(a char(3), b int, c char(2),
-primary key (a(1), c(1)), key(b)) engine = innodb;
-insert into monitor_test values("13", 2, "aa");
-select a from monitor_test where b < 1 for update;
-a
-select name, count from information_schema.innodb_metrics
-where name like "icp%";
-name	count
-icp_attempts	1
-icp_no_match	0
-icp_out_of_range	1
-icp_match	0
-select a from monitor_test where b < 3 for update;
-a
-13
-select name, count from information_schema.innodb_metrics
-where name like "icp%";
-name	count
-icp_attempts	2
-icp_no_match	0
-icp_out_of_range	1
-icp_match	1
-drop table monitor_test;
-set global innodb_monitor_disable = all;
-set global innodb_monitor_reset_all = all;
-select 1 from `information_schema`.`INNODB_METRICS`
-where case (1) when (1) then (AVG_COUNT_RESET) else (1) end;
-1
-set global innodb_monitor_enable = default;
-set global innodb_monitor_disable = default;
-set global innodb_monitor_reset = default;
-set global innodb_monitor_reset_all = default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_stats_external_pages.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_stats_external_pages.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb_stats_external_pages.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb_stats_external_pages.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+CREATE TABLE bug18384390 (
+id INT AUTO_INCREMENT PRIMARY KEY,
+txt VARCHAR(10000)
+) ENGINE=INNODB STATS_AUTO_RECALC=0;
+INSERT INTO bug18384390 (txt) VALUES (REPEAT('0', 10000));
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+ANALYZE TABLE bug18384390;
+Table	Op	Msg_type	Msg_text
+test.bug18384390	analyze	status	OK
+DROP TABLE bug18384390;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-wl5980-alter.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-wl5980-alter.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/innodb-wl5980-alter.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/innodb-wl5980-alter.result	2017-02-27 07:47:02.000000000 +0000
@@ -687,6 +687,12 @@
 Warnings:
 Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -755,11 +761,23 @@
 Warnings:
 Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -793,11 +811,23 @@
 ERROR 42S22: Unknown column 'FTS_DOC_ID' in 't1n'
 ALTER TABLE t1n CHANGE c1 FTS_DOC_ïD INT, ALGORITHM=INPLACE;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -825,11 +855,23 @@
 tt.ibd
 ALTER TABLE t1n CHANGE FTS_DOC_�D c1 INT, ALGORITHM=INPLACE;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -858,11 +900,23 @@
 ALTER TABLE t1n CHANGE c1 c2 INT, CHANGE c2 ct INT, CHANGE ct c1 TEXT,
 ALGORITHM=INPLACE;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -900,11 +954,23 @@
 ALTER TABLE t1n CHANGE c2 c1 INT, CHANGE ct c2 INT, CHANGE c1 ct TEXT,
 ALGORITHM=COPY;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -945,11 +1011,23 @@
 ERROR 42000: Key column 'c2' doesn't exist in table
 ALTER TABLE t1n ADD INDEX(c4), CHANGE c2 c4 INT, ALGORITHM=INPLACE;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -987,11 +1065,23 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE t1n DROP INDEX c4;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -1021,11 +1111,23 @@
 ERROR 42S21: Duplicate column name 'c1'
 ALTER TABLE t1n CHANGE c4 c11 INT, ADD INDEX(c11), ALGORITHM=INPLACE;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -1064,6 +1166,12 @@
 DROP TABLE t1n;
 ALTER TABLE t1o MODIFY c1 BIGINT UNSIGNED NOT NULL;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -1091,11 +1199,23 @@
 CHANGE c1 FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
 ALGORITHM=INPLACE;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -1140,6 +1260,12 @@
 ALTER TABLE t1o CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL,
 DROP INDEX ct, LOCK=NONE;
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -1194,6 +1320,12 @@
 ID	FOR_COL_NAME	REF_COL_NAME	POS
 ALTER TABLE t1o ADD UNIQUE INDEX FTS_DOC_ID_INDEX(foo_id);
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
@@ -1214,11 +1346,23 @@
 ALTER TABLE t1o CHANGE foo_id FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
 ADD FULLTEXT INDEX(ct);
 ### files in MYSQL_DATA_DIR/test
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+FTS_AUX_INDEX_1.ibd
+FTS_AUX_INDEX_2.ibd
+FTS_AUX_INDEX_3.ibd
+FTS_AUX_INDEX_4.ibd
+FTS_AUX_INDEX_5.ibd
+FTS_AUX_INDEX_6.ibd
 FTS_AUX_BEING_DELETED.ibd
 FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/insert_debug.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/insert_debug.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/insert_debug.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/insert_debug.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,11 @@
+#
+# Bug#19904003 INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=1
+# CAUSES INFINITE PAGE SPLIT
+#
+SET GLOBAL innodb_change_buffering_debug=1;
+SET GLOBAL innodb_limit_optimistic_insert_debug=1;
+CREATE TABLE t1(c1 INT PRIMARY KEY) ENGINE=InnoDB
+PARTITION BY HASH (c1) PARTITIONS 15;
+DROP TABLE t1;
+SET GLOBAL innodb_change_buffering_debug=0;
+SET GLOBAL innodb_limit_optimistic_insert_debug=0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/monitor_debug.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/monitor_debug.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/monitor_debug.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/monitor_debug.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+#
+# BUG#20080942 - ADAPTIVE_HASH_SEARCHES_BTREE NOT UPDATED
+#
+SET GLOBAL innodb_fast_shutdown=0;
+SET GLOBAL innodb_stats_persistent = OFF;
+SET GLOBAL innodb_stats_auto_recalc = OFF;
+SET GLOBAL innodb_purge_stop_now = ON;
+CREATE TABLE t1(a INT PRIMARY KEY, b BLOB) STATS_PERSISTENT=0;
+INSERT INTO t1 VALUES(1, 'abc');
+INSERT INTO t1 VALUES(2, 'def');
+INSERT INTO t1 VALUES(3, 'ghi');
+SELECT * FROM t1;
+a	b
+1	abc
+2	def
+3	ghi
+DROP TABLE t1;
+SET GLOBAL innodb_stats_persistent = default;
+SET GLOBAL innodb_stats_auto_recalc = default;
+SET GLOBAL innodb_purge_run_now = ON;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/monitor.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/monitor.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/monitor.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/monitor.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,549 @@
+set global innodb_monitor_disable = All;
+select name, status from information_schema.innodb_metrics;
+name	status
+metadata_table_handles_opened	disabled
+metadata_table_handles_closed	disabled
+metadata_table_reference_count	disabled
+metadata_mem_pool_size	disabled
+lock_deadlocks	disabled
+lock_timeouts	disabled
+lock_rec_lock_waits	disabled
+lock_table_lock_waits	disabled
+lock_rec_lock_requests	disabled
+lock_rec_lock_created	disabled
+lock_rec_lock_removed	disabled
+lock_rec_locks	disabled
+lock_table_lock_created	disabled
+lock_table_lock_removed	disabled
+lock_table_locks	disabled
+lock_row_lock_current_waits	disabled
+lock_row_lock_time	disabled
+lock_row_lock_time_max	disabled
+lock_row_lock_waits	disabled
+lock_row_lock_time_avg	disabled
+buffer_pool_size	disabled
+buffer_pool_reads	disabled
+buffer_pool_read_requests	disabled
+buffer_pool_write_requests	disabled
+buffer_pool_wait_free	disabled
+buffer_pool_read_ahead	disabled
+buffer_pool_read_ahead_evicted	disabled
+buffer_pool_pages_total	disabled
+buffer_pool_pages_misc	disabled
+buffer_pool_pages_data	disabled
+buffer_pool_bytes_data	disabled
+buffer_pool_pages_dirty	disabled
+buffer_pool_bytes_dirty	disabled
+buffer_pool_pages_free	disabled
+buffer_pages_created	disabled
+buffer_pages_written	disabled
+buffer_pages_read	disabled
+buffer_data_reads	disabled
+buffer_data_written	disabled
+buffer_flush_batch_scanned	disabled
+buffer_flush_batch_num_scan	disabled
+buffer_flush_batch_scanned_per_call	disabled
+buffer_flush_batch_rescan	disabled
+buffer_flush_batch_total_pages	disabled
+buffer_flush_batches	disabled
+buffer_flush_batch_pages	disabled
+buffer_flush_neighbor_total_pages	disabled
+buffer_flush_neighbor	disabled
+buffer_flush_neighbor_pages	disabled
+buffer_flush_n_to_flush_requested	disabled
+buffer_flush_avg_page_rate	disabled
+buffer_flush_lsn_avg_rate	disabled
+buffer_flush_pct_for_dirty	disabled
+buffer_flush_pct_for_lsn	disabled
+buffer_flush_sync_waits	disabled
+buffer_flush_adaptive_total_pages	disabled
+buffer_flush_adaptive	disabled
+buffer_flush_adaptive_pages	disabled
+buffer_flush_sync_total_pages	disabled
+buffer_flush_sync	disabled
+buffer_flush_sync_pages	disabled
+buffer_flush_background_total_pages	disabled
+buffer_flush_background	disabled
+buffer_flush_background_pages	disabled
+buffer_LRU_batch_scanned	disabled
+buffer_LRU_batch_num_scan	disabled
+buffer_LRU_batch_scanned_per_call	disabled
+buffer_LRU_batch_total_pages	disabled
+buffer_LRU_batches	disabled
+buffer_LRU_batch_pages	disabled
+buffer_LRU_single_flush_scanned	disabled
+buffer_LRU_single_flush_num_scan	disabled
+buffer_LRU_single_flush_scanned_per_call	disabled
+buffer_LRU_single_flush_failure_count	disabled
+buffer_LRU_get_free_search	disabled
+buffer_LRU_search_scanned	disabled
+buffer_LRU_search_num_scan	disabled
+buffer_LRU_search_scanned_per_call	disabled
+buffer_LRU_unzip_search_scanned	disabled
+buffer_LRU_unzip_search_num_scan	disabled
+buffer_LRU_unzip_search_scanned_per_call	disabled
+buffer_page_read_index_leaf	disabled
+buffer_page_read_index_non_leaf	disabled
+buffer_page_read_index_ibuf_leaf	disabled
+buffer_page_read_index_ibuf_non_leaf	disabled
+buffer_page_read_undo_log	disabled
+buffer_page_read_index_inode	disabled
+buffer_page_read_ibuf_free_list	disabled
+buffer_page_read_ibuf_bitmap	disabled
+buffer_page_read_system_page	disabled
+buffer_page_read_trx_system	disabled
+buffer_page_read_fsp_hdr	disabled
+buffer_page_read_xdes	disabled
+buffer_page_read_blob	disabled
+buffer_page_read_zblob	disabled
+buffer_page_read_zblob2	disabled
+buffer_page_read_other	disabled
+buffer_page_written_index_leaf	disabled
+buffer_page_written_index_non_leaf	disabled
+buffer_page_written_index_ibuf_leaf	disabled
+buffer_page_written_index_ibuf_non_leaf	disabled
+buffer_page_written_undo_log	disabled
+buffer_page_written_index_inode	disabled
+buffer_page_written_ibuf_free_list	disabled
+buffer_page_written_ibuf_bitmap	disabled
+buffer_page_written_system_page	disabled
+buffer_page_written_trx_system	disabled
+buffer_page_written_fsp_hdr	disabled
+buffer_page_written_xdes	disabled
+buffer_page_written_blob	disabled
+buffer_page_written_zblob	disabled
+buffer_page_written_zblob2	disabled
+buffer_page_written_other	disabled
+os_data_reads	disabled
+os_data_writes	disabled
+os_data_fsyncs	disabled
+os_pending_reads	disabled
+os_pending_writes	disabled
+os_log_bytes_written	disabled
+os_log_fsyncs	disabled
+os_log_pending_fsyncs	disabled
+os_log_pending_writes	disabled
+trx_rw_commits	disabled
+trx_ro_commits	disabled
+trx_nl_ro_commits	disabled
+trx_commits_insert_update	disabled
+trx_rollbacks	disabled
+trx_rollbacks_savepoint	disabled
+trx_rollback_active	disabled
+trx_active_transactions	disabled
+trx_rseg_history_len	disabled
+trx_undo_slots_used	disabled
+trx_undo_slots_cached	disabled
+trx_rseg_current_size	disabled
+purge_del_mark_records	disabled
+purge_upd_exist_or_extern_records	disabled
+purge_invoked	disabled
+purge_undo_log_pages	disabled
+purge_dml_delay_usec	disabled
+purge_stop_count	disabled
+purge_resume_count	disabled
+log_checkpoints	disabled
+log_lsn_last_flush	disabled
+log_lsn_last_checkpoint	disabled
+log_lsn_current	disabled
+log_lsn_checkpoint_age	disabled
+log_lsn_buf_pool_oldest	disabled
+log_max_modified_age_async	disabled
+log_max_modified_age_sync	disabled
+log_pending_log_writes	disabled
+log_pending_checkpoint_writes	disabled
+log_num_log_io	disabled
+log_waits	disabled
+log_write_requests	disabled
+log_writes	disabled
+compress_pages_compressed	disabled
+compress_pages_decompressed	disabled
+compression_pad_increments	disabled
+compression_pad_decrements	disabled
+index_page_splits	disabled
+index_page_merge_attempts	disabled
+index_page_merge_successful	disabled
+index_page_reorg_attempts	disabled
+index_page_reorg_successful	disabled
+index_page_discards	disabled
+adaptive_hash_searches	disabled
+adaptive_hash_searches_btree	disabled
+adaptive_hash_pages_added	disabled
+adaptive_hash_pages_removed	disabled
+adaptive_hash_rows_added	disabled
+adaptive_hash_rows_removed	disabled
+adaptive_hash_rows_deleted_no_hash_entry	disabled
+adaptive_hash_rows_updated	disabled
+file_num_open_files	disabled
+ibuf_merges_insert	disabled
+ibuf_merges_delete_mark	disabled
+ibuf_merges_delete	disabled
+ibuf_merges_discard_insert	disabled
+ibuf_merges_discard_delete_mark	disabled
+ibuf_merges_discard_delete	disabled
+ibuf_merges	disabled
+ibuf_size	disabled
+innodb_master_thread_sleeps	disabled
+innodb_activity_count	disabled
+innodb_master_active_loops	disabled
+innodb_master_idle_loops	disabled
+innodb_background_drop_table_usec	disabled
+innodb_ibuf_merge_usec	disabled
+innodb_log_flush_usec	disabled
+innodb_mem_validate_usec	disabled
+innodb_master_purge_usec	disabled
+innodb_dict_lru_usec	disabled
+innodb_checkpoint_usec	disabled
+innodb_dblwr_writes	disabled
+innodb_dblwr_pages_written	disabled
+innodb_page_size	disabled
+innodb_rwlock_s_spin_waits	disabled
+innodb_rwlock_x_spin_waits	disabled
+innodb_rwlock_s_spin_rounds	disabled
+innodb_rwlock_x_spin_rounds	disabled
+innodb_rwlock_s_os_waits	disabled
+innodb_rwlock_x_os_waits	disabled
+dml_reads	disabled
+dml_inserts	disabled
+dml_deletes	disabled
+dml_updates	disabled
+ddl_background_drop_indexes	disabled
+ddl_background_drop_tables	disabled
+ddl_online_create_index	disabled
+ddl_pending_alter_table	disabled
+icp_attempts	disabled
+icp_no_match	disabled
+icp_out_of_range	disabled
+icp_match	disabled
+set global innodb_monitor_enable = all;
+select name from information_schema.innodb_metrics where status!='enabled';
+name
+set global innodb_monitor_enable = aaa;
+ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of 'aaa'
+set global innodb_monitor_disable = All;
+select name from information_schema.innodb_metrics where status!='disabled';
+name
+set global innodb_monitor_reset_all = all;
+select name from information_schema.innodb_metrics where count!=0;
+name
+set  global innodb_monitor_enable = "%lock%";
+select name from information_schema.innodb_metrics
+where status != IF(name like "%lock%", 'enabled', 'disabled');
+name
+set  global innodb_monitor_disable = "%lock%";
+select name, status from information_schema.innodb_metrics
+where name like "%lock%";
+name	status
+lock_deadlocks	disabled
+lock_timeouts	disabled
+lock_rec_lock_waits	disabled
+lock_table_lock_waits	disabled
+lock_rec_lock_requests	disabled
+lock_rec_lock_created	disabled
+lock_rec_lock_removed	disabled
+lock_rec_locks	disabled
+lock_table_lock_created	disabled
+lock_table_lock_removed	disabled
+lock_table_locks	disabled
+lock_row_lock_current_waits	disabled
+lock_row_lock_time	disabled
+lock_row_lock_time_max	disabled
+lock_row_lock_waits	disabled
+lock_row_lock_time_avg	disabled
+innodb_rwlock_s_spin_waits	disabled
+innodb_rwlock_x_spin_waits	disabled
+innodb_rwlock_s_spin_rounds	disabled
+innodb_rwlock_x_spin_rounds	disabled
+innodb_rwlock_s_os_waits	disabled
+innodb_rwlock_x_os_waits	disabled
+set global innodb_monitor_enable = "%lock*";
+ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of '%lock*'
+set global innodb_monitor_enable="%%%%%%%%%%%%%%%%%%%%%%%%%%%";
+select name from information_schema.innodb_metrics where status!='enabled';
+name
+set global innodb_monitor_disable="%%%%%";
+select name from information_schema.innodb_metrics where status!='disabled';
+name
+set global innodb_monitor_enable="%";
+select name from information_schema.innodb_metrics where status!='enabled';
+name
+set global innodb_monitor_disable="%_%";
+select name from information_schema.innodb_metrics where status!='disabled';
+name
+set global innodb_monitor_enable="log%%%%";
+select name from information_schema.innodb_metrics
+where status != IF(name like "log%", 'enabled', 'disabled');
+name
+set global innodb_monitor_enable="os_%a_fs_ncs";
+set global innodb_monitor_enable="os%pending%";
+select name, status from information_schema.innodb_metrics
+where name like "os%";
+name	status
+os_data_reads	disabled
+os_data_writes	disabled
+os_data_fsyncs	enabled
+os_pending_reads	enabled
+os_pending_writes	enabled
+os_log_bytes_written	disabled
+os_log_fsyncs	disabled
+os_log_pending_fsyncs	enabled
+os_log_pending_writes	enabled
+set global innodb_monitor_enable="";
+ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of ''
+set global innodb_monitor_enable="_";
+ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of '_'
+set global innodb_monitor_disable = module_metadata;
+set global innodb_monitor_reset_all = module_metadata;
+set global innodb_monitor_enable = metadata_table_handles_opened;
+create table monitor_test(col int) engine = innodb;
+select * from monitor_test;
+col
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	1	NULL	1	1	NULL	1	enabled
+set global innodb_monitor_reset = metadata_table_handles_opened;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	1	NULL	1	NULL	NULL	0	enabled
+drop table monitor_test;
+create table monitor_test(col int) engine = innodb;
+select * from monitor_test;
+col
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	2	NULL	2	1	NULL	1	enabled
+set global innodb_monitor_reset_all = metadata_table_handles_opened;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	2	NULL	2	1	NULL	1	enabled
+set global innodb_monitor_disable = metadata_table_handles_opened;
+set global innodb_monitor_reset = metadata_table_handles_opened;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	2	NULL	2	NULL	NULL	0	disabled
+drop table monitor_test;
+create table monitor_test(col int) engine = innodb;
+select * from monitor_test;
+col
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	2	NULL	2	NULL	NULL	0	disabled
+set global innodb_monitor_reset_all = metadata_table_handles_opened;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	NULL	NULL	0	NULL	NULL	0	disabled
+set global innodb_monitor_enable = metadata_table_handles_opened;
+drop table monitor_test;
+create table monitor_test(col int) engine = innodb stats_persistent=0;
+select * from monitor_test;
+col
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	1	NULL	1	1	NULL	1	enabled
+set global innodb_monitor_enable = metadata_table_handles_closed;
+create index idx on monitor_test(col);
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_closed";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_closed	1	NULL	1	1	NULL	1	enabled
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "metadata%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	2	NULL	2	2	NULL	2	enabled
+metadata_table_handles_closed	1	NULL	1	1	NULL	1	enabled
+metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
+metadata_mem_pool_size	NULL	NULL	0	NULL	NULL	0	disabled
+set global innodb_monitor_disable = module_metadata;
+set global innodb_monitor_reset = module_metadata;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "metadata%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	2	NULL	2	NULL	NULL	0	disabled
+metadata_table_handles_closed	1	NULL	1	NULL	NULL	0	disabled
+metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
+metadata_mem_pool_size	NULL	NULL	0	NULL	NULL	0	disabled
+set global innodb_monitor_reset_all = module_metadata;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "metadata%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+metadata_table_handles_opened	NULL	NULL	0	NULL	NULL	0	disabled
+metadata_table_handles_closed	NULL	NULL	0	NULL	NULL	0	disabled
+metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
+metadata_mem_pool_size	NULL	NULL	0	NULL	NULL	0	disabled
+set global innodb_monitor_enable = module_trx;
+begin;
+insert into monitor_test values(9);
+commit;
+begin;
+insert into monitor_test values(9);
+rollback;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "trx_rollbacks" or name like "trx_active_transactions";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+trx_rollbacks	1	NULL	1	1	NULL	1	enabled
+trx_active_transactions	1	0	0	1	0	0	enabled
+set global innodb_monitor_disable = module_trx;
+set global innodb_monitor_enable = module_dml;
+insert into monitor_test values(9);
+update monitor_test set col = 10 where col = 9;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+dml_reads	4	NULL	4	4	NULL	4	enabled
+dml_inserts	1	NULL	1	1	NULL	1	enabled
+dml_deletes	0	NULL	0	0	NULL	0	enabled
+dml_updates	2	NULL	2	2	NULL	2	enabled
+delete from monitor_test;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+dml_reads	6	NULL	6	6	NULL	6	enabled
+dml_inserts	1	NULL	1	1	NULL	1	enabled
+dml_deletes	2	NULL	2	2	NULL	2	enabled
+dml_updates	2	NULL	2	2	NULL	2	enabled
+set global innodb_monitor_reset =  module_dml;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+dml_reads	6	NULL	6	0	NULL	0	enabled
+dml_inserts	1	NULL	1	0	NULL	0	enabled
+dml_deletes	2	NULL	2	0	NULL	0	enabled
+dml_updates	2	NULL	2	0	NULL	0	enabled
+insert into monitor_test values(9);
+insert into monitor_test values(1);
+delete from monitor_test;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+dml_reads	8	NULL	8	2	NULL	2	enabled
+dml_inserts	3	NULL	3	2	NULL	2	enabled
+dml_deletes	4	NULL	4	2	NULL	2	enabled
+dml_updates	2	NULL	2	0	NULL	0	enabled
+set global innodb_monitor_reset_all  =  module_dml;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+dml_reads	8	NULL	8	2	NULL	2	enabled
+dml_inserts	3	NULL	3	2	NULL	2	enabled
+dml_deletes	4	NULL	4	2	NULL	2	enabled
+dml_updates	2	NULL	2	0	NULL	0	enabled
+set global innodb_monitor_disable = module_dml;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+dml_reads	8	NULL	8	2	NULL	2	disabled
+dml_inserts	3	NULL	3	2	NULL	2	disabled
+dml_deletes	4	NULL	4	2	NULL	2	disabled
+dml_updates	2	NULL	2	0	NULL	0	disabled
+set global innodb_monitor_reset_all  = module_dml;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+dml_reads	NULL	NULL	0	NULL	NULL	0	disabled
+dml_inserts	NULL	NULL	0	NULL	NULL	0	disabled
+dml_deletes	NULL	NULL	0	NULL	NULL	0	disabled
+dml_updates	NULL	NULL	0	NULL	NULL	0	disabled
+set global innodb_monitor_enable = dml_inserts;
+insert into monitor_test values(9);
+insert into monitor_test values(1);
+delete from monitor_test;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+dml_reads	NULL	NULL	0	NULL	NULL	0	disabled
+dml_inserts	2	NULL	2	2	NULL	2	enabled
+dml_deletes	NULL	NULL	0	NULL	NULL	0	disabled
+dml_updates	NULL	NULL	0	NULL	NULL	0	disabled
+set global innodb_monitor_disable = module_dml;
+drop table monitor_test;
+set global innodb_monitor_enable = file_num_open_files;
+select name, max_count, min_count, count,
+max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "file_num_open_files";
+name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
+file_num_open_files	#	#	#	#	#	#	enabled
+set global innodb_monitor_disable = file_num_open_files;
+set global innodb_monitor_enable = "icp%";
+create table monitor_test(a char(3), b int, c char(2),
+primary key (a(1), c(1)), key(b)) engine = innodb;
+insert into monitor_test values("13", 2, "aa");
+select a from monitor_test where b < 1 for update;
+a
+select name, count from information_schema.innodb_metrics
+where name like "icp%";
+name	count
+icp_attempts	1
+icp_no_match	0
+icp_out_of_range	1
+icp_match	0
+select a from monitor_test where b < 3 for update;
+a
+13
+select name, count from information_schema.innodb_metrics
+where name like "icp%";
+name	count
+icp_attempts	2
+icp_no_match	0
+icp_out_of_range	1
+icp_match	1
+drop table monitor_test;
+set global innodb_monitor_disable = all;
+set global innodb_monitor_reset_all = all;
+select 1 from `information_schema`.`INNODB_METRICS`
+where case (1) when (1) then (AVG_COUNT_RESET) else (1) end;
+1
+set global innodb_monitor_enable = default;
+set global innodb_monitor_disable = default;
+set global innodb_monitor_reset = default;
+set global innodb_monitor_reset_all = default;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/sp_temp_table.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/sp_temp_table.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/sp_temp_table.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/sp_temp_table.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,253 @@
+#
+# Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE
+# CALLED FROM A FUNCTION
+#
+call mtr.add_suppression("MySQL is trying to drop table");
+CREATE PROCEDURE cachedata(
+IN obj_id BIGINT UNSIGNED,
+IN start  DATETIME,
+IN end    DATETIME
+)
+cachedata:BEGIN
+DECLARE cache_count BIGINT;
+SET @timestamp := NOW();
+CREATE TEMPORARY TABLE IF NOT EXISTS cachedata (
+timestamp    DATETIME,
+object_id    BIGINT UNSIGNED NOT NULL,
+start        DATETIME,
+end          DATETIME,
+seqno        BIGINT AUTO_INCREMENT,
+value        FLOAT,
+PRIMARY KEY (seqno),
+INDEX (timestamp),
+INDEX (object_id, start, end)
+) ENGINE=INNODB;
+DELETE FROM cachedata WHERE
+timestamp < DATE_SUB(@timestamp, INTERVAL 15 SECOND);
+SELECT count(*) INTO cache_count FROM cachedata WHERE
+object_id = obj_id
+AND start = start
+AND end = end;
+IF cache_count > 0 THEN LEAVE cachedata;
+END IF;
+INSERT INTO cachedata (timestamp, object_id, start, end, value) VALUES
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 2345),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 2345),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 2345);
+END$$
+CREATE FUNCTION get_cache(
+obj_id   BIGINT UNSIGNED,
+start    DATETIME,
+end      DATETIME
+)
+RETURNS FLOAT
+READS SQL DATA
+BEGIN
+DECLARE result FLOAT;
+CALL cachedata(obj_id, start, end);
+SELECT SUM(value) INTO result FROM cachedata WHERE
+object_id = obj_id
+AND start = start
+AND end = end;
+RETURN result;
+END$$
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+DROP FUNCTION get_cache;
+DROP PROCEDURE cachedata;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/strict_mode.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/strict_mode.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/r/strict_mode.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/r/strict_mode.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,242 @@
+#
+# Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN
+# INNODB_STRICT_MODE = 1
+#
+set innodb_strict_mode = 0;
+create table t1 (id int auto_increment primary key,
+v varchar(32),
+col1 text,
+col2 text,
+col3 text,
+col4 text,
+col5 text,
+col6 text,
+col7 text,
+col8 text,
+col9 text,
+col10 text,
+col11 text,
+col12 text,
+col13 text,
+col14 text,
+col15 text,
+col16 text,
+col17 text,
+col18 text,
+col19 text,
+col20 text,
+col21 text,
+col22 text,
+col23 text,
+col24 text,
+col25 text,
+col26 text,
+col27 text,
+col28 text,
+col29 text,
+col30 text,
+col31 text,
+col32 text,
+col33 text,
+col34 text,
+col35 text,
+col36 text,
+col37 text,
+col38 text,
+col39 text,
+col40 text,
+col41 text,
+col42 text,
+col43 text,
+col44 text,
+col45 text ,
+col46 text,
+col47 text,
+col48 text,
+col49 text,
+col50 text,
+col51 text,
+col52 text,
+col53 text,
+col54 text,
+col55 text,
+col56 text,
+col57 text,
+col58 text,
+col59 text,
+col60 text,
+col61 text,
+col62 text,
+col63 text,
+col64 text,
+col65 text,
+col66 text,
+col67 text,
+col68 text ,
+col69 text,
+col70 text,
+col71 text,
+col72 text,
+col73 text,
+col74 text,
+col75 text,
+col76 text,
+col77 text,
+col78 text,
+col79 text,
+col80 text,
+col81 text,
+col82 text,
+col83 text,
+col84 text,
+col85 text,
+col86 text,
+col87 text,
+col88 text,
+col89 text,
+col90 text,
+col91 text,
+col92 text,
+col93 text,
+col94 text,
+col95 text,
+col96 text,
+col97 text,
+col98 text,
+col99 text,
+col100 text,
+col101 text,
+col102 text,
+col103 text,
+col104 text,
+col105 text,
+col106 text,
+col107 text,
+col108 text,
+col109 text,
+col110 text,
+col111 text,
+col112 text,
+col113 text,
+col114 text,
+col115 text,
+col116 text,
+col117 text,
+col118 text,
+col119 text,
+col120 text,
+col121 text,
+col122 text,
+col123 text,
+col124 text,
+col125 text,
+col126 text ,
+col127 text,
+col128 text,
+col129 text,
+col130 text,
+col131 text,
+col132 text,
+col133 text,
+col134 text,
+col135 text,
+col136 text,
+col137 text,
+col138 text,
+col139 text,
+col140 text,
+col141 text,
+col142 text,
+col143 text,
+col144 text,
+col145 text,
+col146 text,
+col147 text ,
+col148 text,
+col149 text,
+col150 text,
+col151 text,
+col152 text,
+col153 text,
+col154 text,
+col155 text,
+col156 text,
+col157 text,
+col158 text,
+col159 text,
+col160 text,
+col161 text,
+col162 text,
+col163 text,
+col164 text,
+col165 text,
+col166 text,
+col167 text,
+col168 text,
+col169 text,
+col170 text,
+col171 text,
+col172 text ,
+col173 text,
+col174 text,
+col175 text,
+col176 text,
+col177 text,
+col178 text,
+col179 text,
+col180 text,
+col181 text,
+col182 text,
+col183 text,
+col184 text,
+col185 text,
+col186 text,
+col187 text,
+col188 text,
+col189 text,
+col190 text,
+col191 text,
+col192 text,
+col193 text,
+col194 text,
+col195 text,
+col196 text,
+col197 text,
+col198 text,
+col199 text,
+col200 text,
+col201 text,
+col202 text,
+col203 text,
+col204 text,
+col205 text,
+col206 text,
+col207 text,
+col208 text,
+col209 text,
+col210 text,
+col211 text,
+col212 text,
+col213 text,
+col214 text,
+col215 text,
+col216 text,
+col217 text,
+col218 text,
+col219 text,
+col220 text,
+col221 text,
+col222 text,
+col223 text,
+col224 text,
+col225 text,
+col226 text,
+col227 text,
+col228 text
+) ENGINE=InnoDB;
+Warnings:
+Warning	139	Row size too large (> NNNN). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+set innodb_strict_mode = 1;
+alter table t1 engine=InnoDB;
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is NNNN. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
+drop table t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/add_foreign_key.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/add_foreign_key.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/add_foreign_key.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/add_foreign_key.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,38 @@
+--source include/have_innodb.inc
+
+--echo #
+--echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE ADD
+--echo # FOREIGN KEY
+--echo #
+
+CREATE TABLE `parent` (`parent_id` INT, PRIMARY KEY (`parent_id`));
+CREATE TABLE `child1` (`id` INT ,`child1_fk1` INT, `child1_fk2` INT,
+PRIMARY KEY (`id`));
+CREATE TABLE `child2` (`id` INT, `child2_fk1` INT, `child2_fk2` INT,
+PRIMARY KEY (`id`));
+CREATE TABLE `child3` (`id` INT , `child3_fk1` INT, PRIMARY KEY (`id`));
+ALTER TABLE `child1` ADD FOREIGN KEY (`child1_fk1`) REFERENCES `parent`
+(`parent_id`);
+ALTER TABLE `child1` ADD FOREIGN KEY (`child1_fk1`) REFERENCES
+`parent` (`parent_id`);
+ALTER TABLE `child1` ADD FOREIGN KEY (`child1_fk2`) REFERENCES `parent`
+(`parent_id`);
+
+ALTER TABLE `child2` ADD FOREIGN KEY (`child2_fk1`) REFERENCES `parent`
+(`parent_id`);
+
+ALTER TABLE `child2` ADD FOREIGN KEY (`child2_fk2`) REFERENCES `parent`
+(`parent_id`);
+
+ALTER TABLE `child3` ADD FOREIGN KEY (`child3_fk1`) REFERENCES `parent`
+(`parent_id`);
+ALTER TABLE `child1` ADD FOREIGN KEY (`child1_fk2`) REFERENCES
+`parent` (`parent_id`);
+ALTER TABLE `child2` ADD FOREIGN KEY (`child2_fk1`) REFERENCES
+`parent` (`parent_id`);
+ALTER TABLE `child2` ADD FOREIGN KEY (`child2_fk2`) REFERENCES
+`parent` (`parent_id`);
+ALTER TABLE `child3` ADD FOREIGN KEY (`child3_fk1`) REFERENCES
+`parent` (`parent_id`);
+
+drop table child3, child2, child1, parent;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/blob_redo-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/blob_redo-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/blob_redo-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/blob_redo-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--innodb-log-files-in-group=12 --innodb-log-file-size=5M
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/blob_redo.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/blob_redo.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/blob_redo.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/blob_redo.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,92 @@
+--source include/not_embedded.inc
+--source include/not_crashrep.inc
+--source include/have_innodb.inc
+--source include/have_innodb_16k.inc
+
+--echo #
+--echo # Bug #19498877 LIMITATION ON BLOB SIZE IS TOO STRICT, BLOB CAN
+--echo # BE 10% OF TOTAL REDO LOG SIZE
+--echo #
+
+# Save the initial number of concurrent sessions.
+--source include/count_sessions.inc
+
+call mtr.add_suppression("InnoDB: Resizing redo log from");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files.");
+call mtr.add_suppression("InnoDB: New log files created, LSN=");
+
+SET GLOBAL max_allowed_packet = 100*1024*1024;
+
+--echo # Connection big_packets:
+connect(big_packets,localhost,root,,);
+connection big_packets;
+
+CREATE TABLE t1 (a BIGINT PRIMARY KEY, b LONGBLOB) ENGINE=InnoDB;
+
+# Insert a few rows (it doesn't really matter how many). These transactions
+# are committed once they are acked, so they should not be lost.
+INSERT INTO t1 (a, b) VALUES (1, '1');
+INSERT INTO t1 (a, b) VALUES (2, '2');
+INSERT INTO t1 (a, b) VALUES (3, '3');
+INSERT INTO t1 (a, b) VALUES (4, '4');
+INSERT INTO t1 (a, b) VALUES (5, '5');
+
+start transaction;
+INSERT INTO t1 (a, b) VALUES (6, REPEAT('a', 6*1024*1024));
+
+--echo # Connection default:
+connection default;
+
+# We expect a restart.
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+--echo # Quick shutdown and restart server
+--shutdown_server 0
+
+# Wait for the server to come back up, and reconnect.
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+
+--echo # Connection default:
+connection default;
+
+--disconnect big_packets
+
+# We should see (1,2,3,4,5) here.
+SELECT a, b FROM t1;
+
+SET GLOBAL max_allowed_packet = 100*1024*1024;
+
+--echo # Connection big_packets:
+connect(big_packets,localhost,root,,);
+
+start transaction;
+UPDATE t1 SET b = REPEAT('a', 6*1024*1024) WHERE a = 1;
+
+--echo # Connection default:
+connection default;
+
+# We expect a restart.
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+--echo # Quick shutdown and restart server
+--shutdown_server 0
+
+# Wait for the server to come back up, and reconnect.
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+
+--echo # Connection default:
+connection default;
+
+--disconnect big_packets
+
+# We should see (1,2,3,4,5) here.
+SELECT a, b FROM t1;
+
+# Clean up.
+DROP TABLE t1;
+
+--source include/wait_until_count_sessions.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/checksum.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/checksum.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/checksum.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/checksum.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,15 @@
+--source include/not_embedded.inc
+--source include/have_innodb.inc
+--source suite/innodb/include/checksum_not_strict.inc
+--echo #
+--echo # Bug#19500258 ZERO CAN BE A VALID INNODB CHECKSUM, 
+--echo # BUT VALIDATION WILL FAIL LATER
+--echo #
+--let $old_checksum_algorithm= `SELECT @@GLOBAL.innodb_checksum_algorithm`
+SET GLOBAL innodb_checksum_algorithm = 'CRC32';
+CREATE TABLE t1 (a INT PRIMARY KEY, b VARBINARY(512)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1, X'666F72636520637263333220a0be0639');
+--source include/restart_mysqld.inc
+SELECT count(*) FROM t1;
+--eval SET GLOBAL innodb_checksum_algorithm = '$old_checksum_algorithm';
+drop table t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/foreign_key.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/foreign_key.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/foreign_key.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/foreign_key.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,87 @@
+--source include/have_innodb.inc
+
+--echo #
+--echo # Bug #19027905 ASSERT RET.SECOND DICT_CREATE_FOREIGN_CONSTRAINTS_LOW
+--echo # DICT_CREATE_FOREIGN_CONSTR
+--echo #
+
+create table t1 (f1 int primary key) engine=InnoDB;
+--error ER_CANNOT_ADD_FOREIGN
+create table t2 (f1 int primary key,
+constraint c1 foreign key (f1) references t1(f1),
+constraint c1 foreign key (f1) references t1(f1)) engine=InnoDB; 
+create table t2 (f1 int primary key,
+   constraint c1 foreign key (f1) references t1(f1)) engine=innodb;
+
+--replace_regex /#sql-[0-9a-f_]*'/#sql-temporary'/
+--error ER_DUP_KEY
+alter table t2 add constraint c1 foreign key (f1) references t1(f1); 
+
+set foreign_key_checks = 0;
+--error ER_FK_DUP_NAME
+alter table t2 add constraint c1 foreign key (f1) references t1(f1); 
+
+drop table t2, t1;
+
+--echo #
+--echo # Bug #20031243 CREATE TABLE FAILS TO CHECK IF FOREIGN KEY COLUMN
+--echo # NULL/NOT NULL MISMATCH
+--echo #
+
+set foreign_key_checks = 1;
+show variables like 'foreign_key_checks';
+
+CREATE TABLE t1
+(a INT NOT NULL,
+ b INT NOT NULL,
+ INDEX idx(a)) ENGINE=InnoDB;
+
+CREATE TABLE t2
+(a INT KEY,
+ b INT,
+ INDEX ind(b),
+ FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE)
+ ENGINE=InnoDB;
+
+show create table t1;
+show create table t2;
+
+INSERT INTO t1 VALUES (1, 80);
+INSERT INTO t1 VALUES (2, 81);
+INSERT INTO t1 VALUES (3, 82);
+INSERT INTO t1 VALUES (4, 83);
+INSERT INTO t1 VALUES (5, 84);
+
+INSERT INTO t2 VALUES (51, 1);
+INSERT INTO t2 VALUES (52, 2);
+INSERT INTO t2 VALUES (53, 3);
+INSERT INTO t2 VALUES (54, 4);
+INSERT INTO t2 VALUES (55, 5);
+
+SELECT a, b FROM t1 ORDER BY a;
+SELECT a, b FROM t2 ORDER BY a;
+
+--error ER_NO_REFERENCED_ROW_2
+INSERT INTO t2 VALUES (56, 6);
+
+ALTER TABLE t1 CHANGE a id INT;
+
+SELECT id, b FROM t1 ORDER BY id;
+SELECT a, b FROM t2 ORDER BY a;
+
+--echo # Operations on child table
+--error ER_NO_REFERENCED_ROW_2
+INSERT INTO t2 VALUES (56, 6);
+--error ER_NO_REFERENCED_ROW_2
+UPDATE t2 SET b = 99 WHERE a = 51;
+DELETE FROM t2 WHERE a = 53;
+SELECT id, b FROM t1 ORDER BY id;
+SELECT a, b FROM t2 ORDER BY a;
+
+--echo # Operations on parent table
+DELETE FROM t1 WHERE id = 1;
+UPDATE t1 SET id = 50 WHERE id = 5;
+SELECT id, b FROM t1 ORDER BY id;
+SELECT a, b FROM t2 ORDER BY a;
+
+DROP TABLE t2, t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/index_tree_operation.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/index_tree_operation.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/index_tree_operation.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/index_tree_operation.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,74 @@
+-- source include/have_innodb.inc
+-- source include/have_innodb_16k.inc
+--echo #
+--echo # Bug#15923864 (Bug#67718):
+--echo #  INNODB DRASTICALLY UNDER-FILLS PAGES IN CERTAIN CONDITIONS
+--echo #
+# InnoDB should try to insert to the next page before split,
+# if the insert record for split_and_insert is last of the page.
+# Otherwise, the follwing records 999,998,997 cause each page per record.
+#
+
+--disable_query_log
+SET @old_innodb_file_per_table = @@innodb_file_per_table;
+--enable_query_log
+
+SET GLOBAL innodb_file_per_table=ON;
+
+CREATE TABLE t1 (a BIGINT PRIMARY KEY, b VARCHAR(4096)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (0, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (1000, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (1001, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (1002, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (1, REPEAT('a', 4096));
+INSERT INTO t1 VALUES (2, REPEAT('a', 4096));
+
+# | 0, 1, 2 | 1000, 1001, 1002|
+
+SELECT page_number, number_records
+FROM information_schema.innodb_sys_tablespaces s1,
+information_schema.innodb_buffer_page s2
+WHERE s1.space = s2.space AND name = 'test/t1'
+AND page_type = "INDEX" ORDER BY page_number;
+
+INSERT INTO t1 VALUES (999, REPEAT('a', 4096));
+
+# try to insert '999' to the end of '0,1,2' page, but no space
+# the next '1000,1001,1002' page has also no space.
+# | 0, 1, 2 | 999 | 1000, 1001, 1002|
+
+SELECT page_number, number_records
+FROM information_schema.innodb_sys_tablespaces s1,
+information_schema.innodb_buffer_page s2
+WHERE s1.space = s2.space AND name = 'test/t1'
+AND page_type = "INDEX" ORDER BY page_number;
+
+
+INSERT INTO t1 VALUES (998, REPEAT('a', 4096));
+
+# try to insert to the end of '0,1,2' page, but no space
+# the next '998' page has space.
+# | 0, 1, 2 | 998, 999 | 1000, 1001, 1002|
+
+SELECT page_number, number_records
+FROM information_schema.innodb_sys_tablespaces s1,
+information_schema.innodb_buffer_page s2
+WHERE s1.space = s2.space AND name = 'test/t1'
+AND page_type = "INDEX" ORDER BY page_number;
+
+INSERT INTO t1 VALUES (997, REPEAT('a', 4096));
+
+# same
+# | 0, 1, 2 | 997, 998, 999 | 1000, 1001, 1002|
+
+SELECT page_number, number_records
+FROM information_schema.innodb_sys_tablespaces s1,
+information_schema.innodb_buffer_page s2
+WHERE s1.space = s2.space AND name = 'test/t1'
+AND page_type = "INDEX" ORDER BY page_number;
+
+DROP TABLE t1;
+
+--disable_query_log
+SET GLOBAL innodb_file_per_table = @old_innodb_file_per_table;
+--enable_query_log
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-alter-tempfile.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-alter-tempfile.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-alter-tempfile.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-alter-tempfile.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,72 @@
+# Not supported in embedded
+--source include/not_embedded.inc
+
+# This test case needs to crash the server. Needs a debug server.
+--source include/have_debug.inc
+
+# Don't test this under valgrind, memory leaks will occur.
+--source include/not_valgrind.inc
+
+# Avoid CrashReporter popup on Mac
+--source include/not_crashrep.inc
+
+--echo #
+--echo # Bug #18734396	INNODB IN-PLACE ALTER FAILURES BLOCK FUTURE ALTERS
+--echo #
+--echo # Temporary tablename will be unique. This makes sure that future
+--echo # in-place ALTERs of the same table will not be blocked due to
+--echo # temporary tablename.
+
+let datadir= `select @@datadir`;
+
+--let $_server_id= `SELECT @@server_id`
+--let $_expect_file_name=$MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
+
+--echo # Crash the server in ha_innobase::commit_inplace_alter_table()
+CREATE TABLE t1 (f1 INT NOT NULL, f2 INT NOT NULL) ENGINE=innodb;
+SET debug='d,innodb_alter_commit_crash_before_commit';
+
+let $orig_table_id = `SELECT table_id
+	FROM information_schema.innodb_sys_tables
+	WHERE name = 'test/t1'`;
+
+--echo # Write file to make mysql-test-run.pl expect crash
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+--echo # Execute the statement that causes the crash
+--error 2013
+ALTER TABLE t1 ADD PRIMARY KEY (f2, f1);
+--echo # Startup the server after the crash
+--source include/start_mysqld.inc
+
+--echo # Read and remember the temporary table name
+let $temp_table_name = `SELECT SUBSTRING(name,6)
+	FROM information_schema.innodb_sys_tables
+	WHERE name LIKE "test/#sql-ib$orig_table_id%"`;
+# This second copy is an environment variable for the perl script below.
+let temp_table_name = $temp_table_name;
+show create table t1;
+--echo # Consecutive Alter table does not create same temporary file name
+ALTER TABLE t1 ADD PRIMARY KEY (f2, f1);
+--echo # Shutdown the server to allow manual recovery
+--source include/shutdown_mysqld.inc
+
+--echo # Manual recovery begin. The dictionary was not updated
+--echo # and the files were not renamed. The rebuilt table
+--echo # was left behind on purpose, to faciliate data recovery.
+
+perl;
+my @frm_file = glob "$ENV{'datadir'}/test/#sql-*.frm";
+my $target_frm = "$ENV{'datadir'}/test/$ENV{'temp_table_name'}.frm";
+rename($frm_file[0], $target_frm);
+EOF
+--echo # Manual recovery end
+--echo # Startup the server after manual recovery
+--source include/start_mysqld.inc
+
+--echo # Drop the orphaned rebuilt table.
+--disable_query_log
+eval DROP TABLE `#mysql50#$temp_table_name`;
+--enable_query_log
+show create table t1;
+drop table t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-alter.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-alter.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-alter.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-alter.test	2017-02-27 07:47:02.000000000 +0000
@@ -398,3 +398,43 @@
 --disable_query_log
 call mtr.add_suppression("deleting orphaned .ibd file");
 --enable_query_log
+
+--echo #
+--echo # Bug #19465984 INNODB DATA DICTIONARY IS NOT UPDATED WHILE
+--echo #		RENAMING THE COLUMN
+--echo #
+CREATE TABLE t1(c1 INT NOT NULL, PRIMARY KEY(c1))ENGINE=INNODB;
+CREATE TABLE t2(c2 INT NOT NULL, FOREIGN KEY(c2) REFERENCES t1(c1))ENGINE=INNODB;
+SHOW CREATE TABLE t1;
+SHOW CREATE TABLE t2;
+ALTER TABLE t1 CHANGE COLUMN c1 C1 INT;
+SHOW CREATE TABLE t1;
+SHOW CREATE TABLE t2;
+ALTER TABLE t1 CHANGE COLUMN C1 c5 INT;
+SHOW CREATE TABLE t1;
+SHOW CREATE TABLE t2;
+DROP TABLE t2, t1;
+
+--echo #
+--echo # BUG 20029625 - HANDLE_FATAL_SIGNAL (SIG=11) IN
+--echo #                DICT_MEM_TABLE_COL_RENAME_LOW
+--echo #
+CREATE TABLE parent(a INT, b INT, KEY(a, b)) ENGINE = InnoDB;
+CREATE TABLE t1(a1 INT, a2 INT) ENGINE = InnoDB;
+
+set foreign_key_checks=0;
+ALTER TABLE t1 ADD CONSTRAINT fk_a FOREIGN KEY(a1, a2) REFERENCES parent(a, b) ON DELETE SET NULL ON UPDATE CASCADE;
+
+ALTER TABLE t1 CHANGE a2 a3 INT,ADD CONSTRAINT fk_1 FOREIGN KEY(a1, a3) REFERENCES parent(a, b) ON DELETE SET NULL ON UPDATE CASCADE;
+SHOW CREATE TABLE t1;
+CHECK TABLE t1;
+
+ALTER TABLE t1 CHANGE a3 a4 INT;
+SHOW CREATE TABLE t1;
+CHECK TABLE t1;
+
+ALTER TABLE parent CHANGE b c INT;
+SHOW CREATE TABLE t1;
+CHECK TABLE t1;
+
+DROP TABLE t1, parent;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_blob_unrecoverable_crash.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_blob_unrecoverable_crash.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_blob_unrecoverable_crash.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_blob_unrecoverable_crash.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,55 @@
+--source include/not_embedded.inc
+--source include/not_crashrep.inc
+--source include/have_innodb.inc
+
+call mtr.add_suppression("InnoDB: The total blob data length");
+
+let $old_max_allowed_packet = `select @@max_allowed_packet`;
+SET GLOBAL max_allowed_packet = 100*1024*1024;
+
+--echo # Connection big_packets:
+connect(big_packets,localhost,root,,);
+connection big_packets;
+
+CREATE TABLE t1 (a BIGINT PRIMARY KEY, b LONGBLOB) ENGINE=InnoDB;
+
+# Insert a few rows (it doesn't really matter how many). These transactions
+# are committed once they are acked, so they should not be lost.
+INSERT INTO t1 (a, b) VALUES (1, '1');
+INSERT INTO t1 (a, b) VALUES (2, '2');
+INSERT INTO t1 (a, b) VALUES (3, '3');
+INSERT INTO t1 (a, b) VALUES (4, '4');
+INSERT INTO t1 (a, b) VALUES (5, '5');
+
+# The BLOB insert will fail, and should disappear. However all data committed
+# up to this point should not be lost.
+start transaction;
+--replace_regex /\(> [0-9]*\)/(> ####)/
+--error ER_TOO_BIG_ROWSIZE
+INSERT INTO t1 (a, b) VALUES (6, REPEAT('a', 20*1024*1024));
+
+--echo # Connection default:
+connection default;
+
+# We expect a restart.
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+--echo # Quick shutdown and restart server
+--shutdown_server 0
+
+# Wait for the server to come back up, and reconnect.
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--echo # Connection default:
+connection default;
+
+# We should see (1,2,3,4,5) here.
+SELECT a FROM t1;
+
+# Clean up.
+DROP TABLE t1;
+
+--disable_query_log
+eval set global max_allowed_packet = $old_max_allowed_packet;
+--enable_query_log
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_bug34300.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_bug34300.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_bug34300.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_bug34300.test	2017-02-27 07:47:02.000000000 +0000
@@ -8,25 +8,25 @@
 -- disable_query_log
 -- disable_result_log
 
-call mtr.add_suppression("InnoDB: Warning: a long semaphore wait:");
-call mtr.add_suppression("the age of the last checkpoint is");
+call mtr.add_suppression("InnoDB: The total blob data length");
 
 # set packet size and reconnect 
 let $max_packet=`select @@global.max_allowed_packet`;
 SET @@global.max_allowed_packet=16777216;
 --connect (newconn, localhost, root,,)
 
-DROP TABLE IF EXISTS bug34300;
+--enable_result_log
+
 CREATE TABLE bug34300 (
   f4 TINYTEXT,
   f6 MEDIUMTEXT,
   f8 TINYBLOB
 ) ENGINE=InnoDB;
 
+--replace_regex /\(> [0-9]*\)/(> ####)/
+--error ER_TOO_BIG_ROWSIZE
 INSERT INTO bug34300 VALUES ('xxx', repeat('a', 8459264), 'zzz');
 
--- enable_result_log
-
 SELECT f4, f8 FROM bug34300;
 
 ALTER TABLE bug34300 ADD COLUMN (f10 INT);
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_bug60196-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_bug60196-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_bug60196-master.opt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_bug60196-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -1 +1 @@
---lower-case-table-names=2
+--lower-case-table-names=2
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_corrupt_bit.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_corrupt_bit.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_corrupt_bit.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_corrupt_bit.test	2017-02-27 07:47:02.000000000 +0000
@@ -18,14 +18,20 @@
 # It instructs InnoDB to try to evict pages from the buffer pool when
 # change buffering is possible, so that the change buffer will be used
 # whenever possible.
--- error 0,ER_UNKNOWN_SYSTEM_VARIABLE
 SET @innodb_change_buffering_debug_orig = @@innodb_change_buffering_debug;
--- error 0,ER_UNKNOWN_SYSTEM_VARIABLE
 SET GLOBAL innodb_change_buffering_debug = 1;
 
 # Turn off Unique Check to create corrupted index with dup key
 SET UNIQUE_CHECKS=0;
 
+CREATE DATABASE pad;
+let $i=338;
+while ($i)
+{
+--eval CREATE TABLE pad.t$i(a INT PRIMARY KEY)ENGINE=InnoDB STATS_PERSISTENT=0;
+  dec $i;
+}
+
 -- enable_query_log
 
 set names utf8;
@@ -121,6 +127,6 @@
 
 # Drop table
 drop table corrupt_bit_test_�;
+DROP DATABASE pad;
 
--- error 0, ER_UNKNOWN_SYSTEM_VARIABLE
 SET GLOBAL innodb_change_buffering_debug = 0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-double-write.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-double-write.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-double-write.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-double-write.test	2017-02-27 07:47:02.000000000 +0000
@@ -9,6 +9,10 @@
 --source include/not_embedded.inc
 --source include/not_valgrind.inc
 
+# Slow shutdown and restart to make sure ibuf merge is finished
+SET GLOBAL innodb_fast_shutdown = 0;
+--source include/restart_mysqld.inc
+
 --disable_query_log
 call mtr.add_suppression("InnoDB: Database page .* contained only zeroes.");
 call mtr.add_suppression("Header page consists of zero bytes");
@@ -134,6 +138,10 @@
 select space from information_schema.innodb_sys_tables
 where name = 'test/t1' into @space_id;
 
+--echo # Ensure that dirty pages of table t1 is flushed.
+flush tables t1 for export;
+unlock tables;
+
 --echo # Make the 2nd page dirty for table t1
 set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = @space_id;
@@ -175,6 +183,10 @@
 select space from information_schema.innodb_sys_tables
 where name = 'test/t1' into @space_id;
 
+--echo # Ensure that dirty pages of table t1 is flushed.
+flush tables t1 for export;
+unlock tables;
+
 --echo # Make the 2nd page dirty for table t1
 set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = @space_id;
@@ -213,6 +225,9 @@
 --echo # Test Begin: Test if recovery works if first page of
 --echo # system tablespace is full of zeroes.
 
+--echo # Ensure that the dirty page of system tablespace is flushed.
+set global innodb_buf_flush_list_now = 1;
+
 --echo # Make the first page dirty for system tablespace
 set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = 0;
@@ -250,6 +265,9 @@
 --echo # Test Begin: Test if recovery works if first page of
 --echo # system tablespace is corrupted.
 
+--echo # Ensure that the dirty page of system tablespace is flushed.
+set global innodb_buf_flush_list_now = 1;
+
 --echo # Make the first page dirty for system tablespace
 set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = 0;
@@ -286,6 +304,9 @@
 --echo # Test Begin: Test if recovery works if 2nd page of
 --echo # system tablespace is full of zeroes.
 
+--echo # Ensure that the dirty page of system tablespace is flushed.
+set global innodb_buf_flush_list_now = 1;
+
 --echo # Make the second page dirty for system tablespace
 set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = 0;
@@ -324,6 +345,9 @@
 --echo # Test Begin: Test if recovery works if 2nd page of
 --echo # system tablespace is corrupted.
 
+--echo # Ensure that the dirty page of system tablespace is flushed.
+set global innodb_buf_flush_list_now = 1;
+
 --echo # Make the second page dirty for system tablespace
 set global innodb_saved_page_number_debug = 1;
 set global innodb_fil_make_page_dirty_debug = 0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-lock.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-lock.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-lock.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-lock.test	2017-02-27 07:47:02.000000000 +0000
@@ -168,3 +168,22 @@
 
 connection default;
 DROP TABLE t1;
+
+
+--echo Bug#19803418   ASSERTION: TABLE->QUIESCE == QUIESCE_NONE
+--echo		      IN ROW0QUIESCE.CC LINE 683
+
+CREATE TABLE t1(C TEXT CHARACTER SET UJIS) ENGINE=INNODB;
+LOCK TABLES t1 WRITE,t1 AS t0 READ,t1 AS t2 READ;
+FLUSH TABLE t1;
+
+LOCK TABLES t1 READ,t1 AS t0 WRITE,t1 AS t2 READ;
+FLUSH TABLE t1;
+
+LOCK TABLES t1 READ,t1 AS t0 READ,t1 AS t2 READ;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+FLUSH TABLE t1;
+UNLOCK TABLES;
+FLUSH TABLE t1;
+
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_monitor.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_monitor.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_monitor.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_monitor.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,387 +0,0 @@
-# This is the test for Metrics Monitor Table feature.
-# Test the metrics monitor system's control system
-# and counter accuracy.
-
---source include/have_innodb.inc
-
-set global innodb_monitor_disable = All;
-
-# Test turn on/off the monitor counter  with "all" option
-# By default, they will be off
-select name, status from information_schema.innodb_metrics;
-
-# Turn on all monitor counters
-set global innodb_monitor_enable = all;
-
-# status should all change to "enabled"
-select name from information_schema.innodb_metrics where status!='enabled';
-
-# Test wrong argument to the global configure option
---error ER_WRONG_VALUE_FOR_VAR
-set global innodb_monitor_enable = aaa;
-
-# We require a valid monitor counter/module name. There is no default
-# counter name or module. A warning will be printed asking user to
-# specify a valid counter name.
-#--disable_warnings
-#set global innodb_monitor_enable = default;
-#--enable_warnings
-
-# Turn off all monitor counters, option name should be case
-# insensitive
-set global innodb_monitor_disable = All;
-
-# status should all change to "disabled"
-select name from information_schema.innodb_metrics where status!='disabled';
-
-# Reset all counter values
-set global innodb_monitor_reset_all = all;
-
-# count should all change to 0
-select name from information_schema.innodb_metrics where count!=0;
-
-# Test wildcard match, turn on all counters contain string "lock"
-set  global innodb_monitor_enable = "%lock%";
-
-# All lock related counter should be enabled
-select name from information_schema.innodb_metrics
-where status != IF(name like "%lock%", 'enabled', 'disabled');
-
-# Disable them
-set  global innodb_monitor_disable = "%lock%";
-
-# All lock related counter should be disabled
-select name, status from information_schema.innodb_metrics
-where name like "%lock%";
-
-# No match for "%lock*"
---error ER_WRONG_VALUE_FOR_VAR
-set global innodb_monitor_enable = "%lock*";
-
-# All counters will be turned on with wildcard match string with all "%"
-set global innodb_monitor_enable="%%%%%%%%%%%%%%%%%%%%%%%%%%%";
-
-select name from information_schema.innodb_metrics where status!='enabled';
-
-# Turn off all counters
-set global innodb_monitor_disable="%%%%%";
-
-select name from information_schema.innodb_metrics where status!='disabled';
-
-# One more round testing. All counters will be turned on with
-# single wildcard character "%"
-set global innodb_monitor_enable="%";
-
-select name from information_schema.innodb_metrics where status!='enabled';
-
-# Turn off all the counters with "%_%"
-set global innodb_monitor_disable="%_%";
-
-select name from information_schema.innodb_metrics where status!='disabled';
-
-# Turn on all counters start with "log"
-set global innodb_monitor_enable="log%%%%";
-
-select name from information_schema.innodb_metrics
-where status != IF(name like "log%", 'enabled', 'disabled');
-
-# Turn on counters "os_data_fsync" with wildcard match "os_%a_fs_ncs", "_"
-# is single character wildcard match word
-set global innodb_monitor_enable="os_%a_fs_ncs";
-
-# Turn on counters whose name contains "os" and "pending" with
-# wildcard match "os%pending%"
-set global innodb_monitor_enable="os%pending%";
-
-select name, status from information_schema.innodb_metrics
-where name like "os%";
-
-# Empty string is an invalid option
---error ER_WRONG_VALUE_FOR_VAR
-set global innodb_monitor_enable="";
-
---error ER_WRONG_VALUE_FOR_VAR
-set global innodb_monitor_enable="_";
-
-# Reset counters only in "module_metadata" module
-set global innodb_monitor_disable = module_metadata;
-
-set global innodb_monitor_reset_all = module_metadata;
-
-# Only turn on "table_open" counter
-set global innodb_monitor_enable = metadata_table_handles_opened;
-
-# Create a new table to test "metadata_table_handles_opened" counter
-create table monitor_test(col int) engine = innodb;
-
-# This will open the monitor_test table
-select * from monitor_test;
-
-# "metadata_table_handles_opened" should increment by 1
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-
-# Reset the counter value while counter is still on (started)
-# This will reset value "count_reset" but not
-# "count"
-set global innodb_monitor_reset = metadata_table_handles_opened;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-
-# re-create table again to increment "metadata_table_handles_opened" again
-drop table monitor_test;
-
-# Create a new table to test "metadata_table_handles_opened" counter
-create table monitor_test(col int) engine = innodb;
-
-select * from monitor_test;
-
-# "metadata_table_handles_opened" should increment
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-
-# Cannot reset all monitor value while the counter is on
-set global innodb_monitor_reset_all = metadata_table_handles_opened;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-
-# Turn off the counter "metadata_table_handles_opened"
-set global innodb_monitor_disable = metadata_table_handles_opened;
-
-# Reset the counter value while counter is off (disabled)
-set global innodb_monitor_reset = metadata_table_handles_opened;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-
-# re-create table again. Since monitor is off, "metadata_table_handles_opened"
-# should not be incremented
-drop table monitor_test;
-
-# Create a new table to test "metadata_table_handles_opened" counter
-create table monitor_test(col int) engine = innodb;
-
-# "metadata_table_handles_opened" should increment
-select * from monitor_test;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-
-# Reset all the counters, include those counter *_since_start
-set global innodb_monitor_reset_all = metadata_table_handles_opened;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-
-# Turn on "table_open" counter again
-set global innodb_monitor_enable = metadata_table_handles_opened;
-
-# Test metadata_table_handles_opened again to see if it is working correctly
-# after above round of turning on/off/reset
-drop table monitor_test;
-
-# Create a new table to test "metadata_table_handles_opened" counter
-create table monitor_test(col int) engine = innodb stats_persistent=0;
-
-select * from monitor_test;
-
-# "metadata_table_handles_opened" should increment
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_opened";
-
-# Test counter "metadata_table_handles_closed",
-# create index will close the old handle
-set global innodb_monitor_enable = metadata_table_handles_closed;
-
-create index idx on monitor_test(col);
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name = "metadata_table_handles_closed";
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "metadata%";
-
-# Reset counters only in "module_metadata" module
-set global innodb_monitor_disable = module_metadata;
-
-set global innodb_monitor_reset = module_metadata;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "metadata%";
-
-set global innodb_monitor_reset_all = module_metadata;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "metadata%";
-
-# Test Transaction Module
-set global innodb_monitor_enable = module_trx;
-
-begin;
-insert into monitor_test values(9);
-commit;
-
-begin;
-insert into monitor_test values(9);
-rollback;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "trx_rollbacks" or name like "trx_active_transactions";
-
-set global innodb_monitor_disable = module_trx;
-
-# Test DML Module
-set global innodb_monitor_enable = module_dml;
-
-insert into monitor_test values(9);
-
-update monitor_test set col = 10 where col = 9;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-
-delete from monitor_test;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-	from information_schema.innodb_metrics
-	where name like "dml%";
-
-# test reset counter while the counter is on
-set global innodb_monitor_reset =  module_dml;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-
-# insert/delete some rows after the reset
-insert into monitor_test values(9);
-insert into monitor_test values(1);
-
-delete from monitor_test;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-
-# We do not allow reset_all while the counter is on, nothing
-# should be reset here
-set global innodb_monitor_reset_all  =  module_dml;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-
-# Turn off the counter
-set global innodb_monitor_disable = module_dml;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-
-# Reset all counter values
-set global innodb_monitor_reset_all  = module_dml;
-
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-
-# Open individual counter "dml_inserts"
-set global innodb_monitor_enable = dml_inserts;
-
-insert into monitor_test values(9);
-insert into monitor_test values(1);
-
-delete from monitor_test;
-
-# Only counter "dml_inserts" should be updated
-select name, max_count, min_count, count,
-	max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "dml%";
-
-set global innodb_monitor_disable = module_dml;
-
-drop table monitor_test;
-
-set global innodb_monitor_enable = file_num_open_files;
-
-# Counters are unpredictable when innodb-file-per-table is on
---replace_column 2 # 3 # 4 # 5 # 6 # 7 #
-select name, max_count, min_count, count,
-       max_count_reset, min_count_reset, count_reset, status
-from information_schema.innodb_metrics
-where name like "file_num_open_files";
-
-set global innodb_monitor_disable = file_num_open_files;
-
-# Test ICP module counters
-set global innodb_monitor_enable = "icp%";
-
-create table monitor_test(a char(3), b int, c char(2),
-primary key (a(1), c(1)), key(b)) engine = innodb;
-
-insert into monitor_test values("13", 2, "aa");
-
-select a from monitor_test where b < 1 for update;
-
-# should have icp_attempts = 1 and icp_out_of_range = 1
-select name, count from information_schema.innodb_metrics
-where name like "icp%";
-
-# should have icp_attempts = 2 and icp_match = 1
-select a from monitor_test where b < 3 for update;
-
-select name, count from information_schema.innodb_metrics
-where name like "icp%";
-
-drop table monitor_test;
-
-set global innodb_monitor_disable = all;
-set global innodb_monitor_reset_all = all;
-
-# Test for bug #13966091
-select 1 from `information_schema`.`INNODB_METRICS`
-where case (1) when (1) then (AVG_COUNT_RESET) else (1) end;
-
--- disable_warnings
-set global innodb_monitor_enable = default;
-set global innodb_monitor_disable = default;
-set global innodb_monitor_reset = default;
-set global innodb_monitor_reset_all = default;
--- enable_warnings
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_stats_external_pages.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_stats_external_pages.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb_stats_external_pages.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb_stats_external_pages.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,83 @@
+#
+# Bug#18384390 WRONG STATISTICS WITH BIG ROW LENGTH AND PERSISTENT STATS
+#
+
+-- source include/have_innodb.inc
+
+CREATE TABLE bug18384390 (
+	id INT AUTO_INCREMENT PRIMARY KEY,
+	txt VARCHAR(10000)
+) ENGINE=INNODB STATS_AUTO_RECALC=0;
+
+INSERT INTO bug18384390 (txt) VALUES (REPEAT('0', 10000));
+-- let $i = 0
+while ($i < 10) {
+	INSERT INTO bug18384390 (txt) SELECT txt FROM bug18384390;
+	-- inc $i
+}
+
+# Now we have 1024 rows in bug18384390
+
+-- let $count = `SELECT COUNT(*) FROM bug18384390`
+
+ANALYZE TABLE bug18384390;
+
+-- let $n_rows = `SELECT n_rows FROM mysql.innodb_table_stats WHERE table_name = 'bug18384390'`
+
+-- let $table_rows = `SELECT table_rows FROM information_schema.tables WHERE table_name = 'bug18384390'`
+
+-- let $n_diff = `SELECT stat_value FROM mysql.innodb_index_stats WHERE table_name = 'bug18384390' AND stat_name = 'n_diff_pfx01'`
+
+-- let $cardinality = `SELECT cardinality FROM information_schema.statistics WHERE table_name = 'bug18384390'`
+
+-- let $margin_of_err_pct = 30
+-- let $margin_of_err_rows = `SELECT ROUND($count * $margin_of_err_pct / 100)`
+
+-- let $min_allowed = `SELECT $count - $margin_of_err_rows`
+-- let $max_allowed = `SELECT $count + $margin_of_err_rows`
+
+-- let $dump_sql = SELECT COUNT(*) FROM bug18384390; SELECT * FROM mysql.innodb_table_stats; SELECT * FROM mysql.innodb_index_stats; SELECT * FROM information_schema.tables WHERE table_name = 'bug18384390'; SELECT * FROM information_schema.statistics WHERE table_name = 'bug18384390';
+
+-- vertical_results
+
+if ($n_rows < $min_allowed) {
+	-- echo mysql.innodb_table_stats.n_rows is too small ($n_rows < $min_allowed)
+	-- eval $dump_sql
+}
+
+if ($n_rows > $max_allowed) {
+	-- echo mysql.innodb_table_stats.n_rows is too big ($n_rows > $max_allowed)
+	-- eval $dump_sql
+}
+
+if ($table_rows < $min_allowed) {
+	-- echo information_schema.tables.table_rows is too small ($table_rows < $min_allowed)
+	-- eval $dump_sql
+}
+
+if ($table_rows > $max_allowed) {
+	-- echo information_schema.tables.table_rows is too big ($table_rows > $max_allowed)
+	-- eval $dump_sql
+}
+
+if ($n_diff < $min_allowed) {
+	-- echo mysql.innodb_index_stats.stat_value is too small ($n_diff < $min_allowed)
+	-- eval $dump_sql
+}
+
+if ($n_diff > $max_allowed) {
+	-- echo mysql.innodb_index_stats.stat_value is too big ($n_diff > $max_allowed)
+	-- eval $dump_sql
+}
+
+if ($cardinality < $min_allowed) {
+	-- echo information_schema.statistics.cardinality is too small ($cardinality < $min_allowed)
+	-- eval $dump_sql
+}
+
+if ($cardinality > $max_allowed) {
+	-- echo information_schema.statistics.cardinality is too big ($cardinality > $max_allowed)
+	-- eval $dump_sql
+}
+
+DROP TABLE bug18384390;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-wl5980-alter.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-wl5980-alter.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-wl5980-alter.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-wl5980-alter.test	2017-02-27 07:47:02.000000000 +0000
@@ -8,7 +8,7 @@
 --disable_query_log
 # These values can change during the test
 LET $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
-LET $regexp=/FTS_([0-9a-f_]+)([A-Z_]+)\.ibd/FTS_AUX_\2.ibd/;
+LET $regexp=/FTS_([0-9a-f_]+)([A-Z0-9_]+)\.ibd/FTS_AUX_\2.ibd/;
 
 # Set up some variables
 LET $MYSQL_DATA_DIR = `select @@datadir`;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-wl5980-linux.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-wl5980-linux.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/innodb-wl5980-linux.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/innodb-wl5980-linux.test	2017-02-27 07:47:02.000000000 +0000
@@ -13,7 +13,7 @@
 --source include/not_embedded.inc
 
 --echo # Skip this test other platfoms and run only on Linux.
-if (`select convert(@@version_compile_os using latin1) IN ("Linux", "solaris10", "osx10.6", "osx10.7") = 0`)
+if (`select convert(@@version_compile_os using latin1) IN ("Linux") = 0`)
 {
   skip Need Linux;
 }
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/insert_debug.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/insert_debug.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/insert_debug.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/insert_debug.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+--echo #
+--echo # Bug#19904003 INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=1
+--echo # CAUSES INFINITE PAGE SPLIT
+--echo #
+
+SET GLOBAL innodb_change_buffering_debug=1;
+SET GLOBAL innodb_limit_optimistic_insert_debug=1;
+CREATE TABLE t1(c1 INT PRIMARY KEY) ENGINE=InnoDB
+PARTITION BY HASH (c1) PARTITIONS 15;
+DROP TABLE t1;
+
+SET GLOBAL innodb_change_buffering_debug=0;
+SET GLOBAL innodb_limit_optimistic_insert_debug=0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/monitor_debug.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/monitor_debug.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/monitor_debug.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/monitor_debug.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,40 @@
+source include/have_innodb.inc;
+source include/have_debug.inc;
+source include/not_embedded.inc;
+
+--echo #
+--echo # BUG#20080942 - ADAPTIVE_HASH_SEARCHES_BTREE NOT UPDATED
+--echo #
+
+# To make sure that the change buffer is empty
+SET GLOBAL innodb_fast_shutdown=0;
+--source include/restart_mysqld.inc
+
+SET GLOBAL innodb_stats_persistent = OFF;
+SET GLOBAL innodb_stats_auto_recalc = OFF;
+SET GLOBAL innodb_purge_stop_now = ON;
+
+CREATE TABLE t1(a INT PRIMARY KEY, b BLOB) STATS_PERSISTENT=0;
+
+let $start=`SELECT COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME LIKE
+'adaptive_hash_searches_btree' ORDER BY NAME`;
+
+INSERT INTO t1 VALUES(1, 'abc');
+INSERT INTO t1 VALUES(2, 'def');
+INSERT INTO t1 VALUES(3, 'ghi');
+SELECT * FROM t1;
+
+let $end=`SELECT COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME LIKE
+'adaptive_hash_searches_btree' ORDER BY NAME`;
+
+let $diff=`SELECT $end-$start`;
+
+if ($diff != 3) {
+	echo "Unexpected count: $diff";
+}
+
+DROP TABLE t1;
+
+SET GLOBAL innodb_stats_persistent = default;
+SET GLOBAL innodb_stats_auto_recalc = default;
+SET GLOBAL innodb_purge_run_now = ON;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/monitor.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/monitor.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/monitor.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/monitor.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,387 @@
+# This is the test for Metrics Monitor Table feature.
+# Test the metrics monitor system's control system
+# and counter accuracy.
+
+--source include/have_innodb.inc
+
+set global innodb_monitor_disable = All;
+
+# Test turn on/off the monitor counter  with "all" option
+# By default, they will be off
+select name, status from information_schema.innodb_metrics;
+
+# Turn on all monitor counters
+set global innodb_monitor_enable = all;
+
+# status should all change to "enabled"
+select name from information_schema.innodb_metrics where status!='enabled';
+
+# Test wrong argument to the global configure option
+--error ER_WRONG_VALUE_FOR_VAR
+set global innodb_monitor_enable = aaa;
+
+# We require a valid monitor counter/module name. There is no default
+# counter name or module. A warning will be printed asking user to
+# specify a valid counter name.
+#--disable_warnings
+#set global innodb_monitor_enable = default;
+#--enable_warnings
+
+# Turn off all monitor counters, option name should be case
+# insensitive
+set global innodb_monitor_disable = All;
+
+# status should all change to "disabled"
+select name from information_schema.innodb_metrics where status!='disabled';
+
+# Reset all counter values
+set global innodb_monitor_reset_all = all;
+
+# count should all change to 0
+select name from information_schema.innodb_metrics where count!=0;
+
+# Test wildcard match, turn on all counters contain string "lock"
+set  global innodb_monitor_enable = "%lock%";
+
+# All lock related counter should be enabled
+select name from information_schema.innodb_metrics
+where status != IF(name like "%lock%", 'enabled', 'disabled');
+
+# Disable them
+set  global innodb_monitor_disable = "%lock%";
+
+# All lock related counter should be disabled
+select name, status from information_schema.innodb_metrics
+where name like "%lock%";
+
+# No match for "%lock*"
+--error ER_WRONG_VALUE_FOR_VAR
+set global innodb_monitor_enable = "%lock*";
+
+# All counters will be turned on with wildcard match string with all "%"
+set global innodb_monitor_enable="%%%%%%%%%%%%%%%%%%%%%%%%%%%";
+
+select name from information_schema.innodb_metrics where status!='enabled';
+
+# Turn off all counters
+set global innodb_monitor_disable="%%%%%";
+
+select name from information_schema.innodb_metrics where status!='disabled';
+
+# One more round testing. All counters will be turned on with
+# single wildcard character "%"
+set global innodb_monitor_enable="%";
+
+select name from information_schema.innodb_metrics where status!='enabled';
+
+# Turn off all the counters with "%_%"
+set global innodb_monitor_disable="%_%";
+
+select name from information_schema.innodb_metrics where status!='disabled';
+
+# Turn on all counters start with "log"
+set global innodb_monitor_enable="log%%%%";
+
+select name from information_schema.innodb_metrics
+where status != IF(name like "log%", 'enabled', 'disabled');
+
+# Turn on counters "os_data_fsync" with wildcard match "os_%a_fs_ncs", "_"
+# is single character wildcard match word
+set global innodb_monitor_enable="os_%a_fs_ncs";
+
+# Turn on counters whose name contains "os" and "pending" with
+# wildcard match "os%pending%"
+set global innodb_monitor_enable="os%pending%";
+
+select name, status from information_schema.innodb_metrics
+where name like "os%";
+
+# Empty string is an invalid option
+--error ER_WRONG_VALUE_FOR_VAR
+set global innodb_monitor_enable="";
+
+--error ER_WRONG_VALUE_FOR_VAR
+set global innodb_monitor_enable="_";
+
+# Reset counters only in "module_metadata" module
+set global innodb_monitor_disable = module_metadata;
+
+set global innodb_monitor_reset_all = module_metadata;
+
+# Only turn on "table_open" counter
+set global innodb_monitor_enable = metadata_table_handles_opened;
+
+# Create a new table to test "metadata_table_handles_opened" counter
+create table monitor_test(col int) engine = innodb;
+
+# This will open the monitor_test table
+select * from monitor_test;
+
+# "metadata_table_handles_opened" should increment by 1
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+
+# Reset the counter value while counter is still on (started)
+# This will reset value "count_reset" but not
+# "count"
+set global innodb_monitor_reset = metadata_table_handles_opened;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+
+# re-create table again to increment "metadata_table_handles_opened" again
+drop table monitor_test;
+
+# Create a new table to test "metadata_table_handles_opened" counter
+create table monitor_test(col int) engine = innodb;
+
+select * from monitor_test;
+
+# "metadata_table_handles_opened" should increment
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+
+# Cannot reset all monitor value while the counter is on
+set global innodb_monitor_reset_all = metadata_table_handles_opened;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+
+# Turn off the counter "metadata_table_handles_opened"
+set global innodb_monitor_disable = metadata_table_handles_opened;
+
+# Reset the counter value while counter is off (disabled)
+set global innodb_monitor_reset = metadata_table_handles_opened;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+
+# re-create table again. Since monitor is off, "metadata_table_handles_opened"
+# should not be incremented
+drop table monitor_test;
+
+# Create a new table to test "metadata_table_handles_opened" counter
+create table monitor_test(col int) engine = innodb;
+
+# "metadata_table_handles_opened" should increment
+select * from monitor_test;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+
+# Reset all the counters, include those counter *_since_start
+set global innodb_monitor_reset_all = metadata_table_handles_opened;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+
+# Turn on "table_open" counter again
+set global innodb_monitor_enable = metadata_table_handles_opened;
+
+# Test metadata_table_handles_opened again to see if it is working correctly
+# after above round of turning on/off/reset
+drop table monitor_test;
+
+# Create a new table to test "metadata_table_handles_opened" counter
+create table monitor_test(col int) engine = innodb stats_persistent=0;
+
+select * from monitor_test;
+
+# "metadata_table_handles_opened" should increment
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_opened";
+
+# Test counter "metadata_table_handles_closed",
+# create index will close the old handle
+set global innodb_monitor_enable = metadata_table_handles_closed;
+
+create index idx on monitor_test(col);
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name = "metadata_table_handles_closed";
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "metadata%";
+
+# Reset counters only in "module_metadata" module
+set global innodb_monitor_disable = module_metadata;
+
+set global innodb_monitor_reset = module_metadata;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "metadata%";
+
+set global innodb_monitor_reset_all = module_metadata;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "metadata%";
+
+# Test Transaction Module
+set global innodb_monitor_enable = module_trx;
+
+begin;
+insert into monitor_test values(9);
+commit;
+
+begin;
+insert into monitor_test values(9);
+rollback;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "trx_rollbacks" or name like "trx_active_transactions";
+
+set global innodb_monitor_disable = module_trx;
+
+# Test DML Module
+set global innodb_monitor_enable = module_dml;
+
+insert into monitor_test values(9);
+
+update monitor_test set col = 10 where col = 9;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+
+delete from monitor_test;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+	from information_schema.innodb_metrics
+	where name like "dml%";
+
+# test reset counter while the counter is on
+set global innodb_monitor_reset =  module_dml;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+
+# insert/delete some rows after the reset
+insert into monitor_test values(9);
+insert into monitor_test values(1);
+
+delete from monitor_test;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+
+# We do not allow reset_all while the counter is on, nothing
+# should be reset here
+set global innodb_monitor_reset_all  =  module_dml;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+
+# Turn off the counter
+set global innodb_monitor_disable = module_dml;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+
+# Reset all counter values
+set global innodb_monitor_reset_all  = module_dml;
+
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+
+# Open individual counter "dml_inserts"
+set global innodb_monitor_enable = dml_inserts;
+
+insert into monitor_test values(9);
+insert into monitor_test values(1);
+
+delete from monitor_test;
+
+# Only counter "dml_inserts" should be updated
+select name, max_count, min_count, count,
+	max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "dml%";
+
+set global innodb_monitor_disable = module_dml;
+
+drop table monitor_test;
+
+set global innodb_monitor_enable = file_num_open_files;
+
+# Counters are unpredictable when innodb-file-per-table is on
+--replace_column 2 # 3 # 4 # 5 # 6 # 7 #
+select name, max_count, min_count, count,
+       max_count_reset, min_count_reset, count_reset, status
+from information_schema.innodb_metrics
+where name like "file_num_open_files";
+
+set global innodb_monitor_disable = file_num_open_files;
+
+# Test ICP module counters
+set global innodb_monitor_enable = "icp%";
+
+create table monitor_test(a char(3), b int, c char(2),
+primary key (a(1), c(1)), key(b)) engine = innodb;
+
+insert into monitor_test values("13", 2, "aa");
+
+select a from monitor_test where b < 1 for update;
+
+# should have icp_attempts = 1 and icp_out_of_range = 1
+select name, count from information_schema.innodb_metrics
+where name like "icp%";
+
+# should have icp_attempts = 2 and icp_match = 1
+select a from monitor_test where b < 3 for update;
+
+select name, count from information_schema.innodb_metrics
+where name like "icp%";
+
+drop table monitor_test;
+
+set global innodb_monitor_disable = all;
+set global innodb_monitor_reset_all = all;
+
+# Test for bug #13966091
+select 1 from `information_schema`.`INNODB_METRICS`
+where case (1) when (1) then (AVG_COUNT_RESET) else (1) end;
+
+-- disable_warnings
+set global innodb_monitor_enable = default;
+set global innodb_monitor_disable = default;
+set global innodb_monitor_reset = default;
+set global innodb_monitor_reset_all = default;
+-- enable_warnings
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/sp_temp_table.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/sp_temp_table.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/sp_temp_table.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/sp_temp_table.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,103 @@
+--source include/have_innodb.inc
+--source include/big_test.inc
+
+--echo #
+--echo # Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE
+--echo # CALLED FROM A FUNCTION
+--echo #
+
+call mtr.add_suppression("MySQL is trying to drop table");
+
+DELIMITER $$;
+CREATE PROCEDURE cachedata(
+  IN obj_id BIGINT UNSIGNED,
+  IN start  DATETIME,
+  IN end    DATETIME
+)
+
+cachedata:BEGIN
+  DECLARE cache_count BIGINT;
+
+  SET @timestamp := NOW();
+
+  CREATE TEMPORARY TABLE IF NOT EXISTS cachedata (
+    timestamp    DATETIME,
+    object_id    BIGINT UNSIGNED NOT NULL,
+    start        DATETIME,
+    end          DATETIME,
+    seqno        BIGINT AUTO_INCREMENT,
+    value        FLOAT,
+    PRIMARY KEY (seqno),
+    INDEX (timestamp),
+    INDEX (object_id, start, end)
+  ) ENGINE=INNODB;
+
+  DELETE FROM cachedata WHERE
+    timestamp < DATE_SUB(@timestamp, INTERVAL 15 SECOND);
+
+  SELECT count(*) INTO cache_count FROM cachedata WHERE
+    object_id = obj_id
+    AND start = start
+    AND end = end;
+
+  IF cache_count > 0 THEN LEAVE cachedata;
+  END IF;
+
+  INSERT INTO cachedata (timestamp, object_id, start, end, value) VALUES
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 2345),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 2345),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 2345);
+
+END$$
+
+
+CREATE FUNCTION get_cache(
+  obj_id   BIGINT UNSIGNED,
+  start    DATETIME,
+  end      DATETIME
+)
+  RETURNS FLOAT
+  READS SQL DATA
+BEGIN
+  DECLARE result FLOAT;
+
+  CALL cachedata(obj_id, start, end);
+
+  SELECT SUM(value) INTO result FROM cachedata WHERE
+    object_id = obj_id
+    AND start = start
+    AND end = end;
+
+  RETURN result;
+END$$
+
+DELIMITER ;$$
+
+let $i = 30;
+while ($i)
+{
+ SELECT get_cache(1, '2014-01-01', '2014-02-01');
+ select sleep(1);
+ dec $i;
+}
+
+DROP FUNCTION get_cache;
+DROP PROCEDURE cachedata;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/strict_mode.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/strict_mode.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb/t/strict_mode.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb/t/strict_mode.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,249 @@
+--source include/have_innodb.inc
+
+--echo #
+--echo # Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN
+--echo # INNODB_STRICT_MODE = 1
+--echo #
+
+set innodb_strict_mode = 0;
+
+--replace_regex /> [0-9]+/> NNNN/
+create table t1 (id int auto_increment primary key,
+v varchar(32),
+col1 text,
+col2 text,
+col3 text,
+col4 text,
+col5 text,
+col6 text,
+col7 text,
+col8 text,
+col9 text,
+col10 text,
+col11 text,
+col12 text,
+col13 text,
+col14 text,
+col15 text,
+col16 text,
+col17 text,
+col18 text,
+col19 text,
+col20 text,
+col21 text,
+col22 text,
+col23 text,
+col24 text,
+col25 text,
+col26 text,
+col27 text,
+col28 text,
+col29 text,
+col30 text,
+col31 text,
+col32 text,
+col33 text,
+col34 text,
+col35 text,
+col36 text,
+col37 text,
+col38 text,
+col39 text,
+col40 text,
+col41 text,
+col42 text,
+col43 text,
+col44 text,
+col45 text ,
+col46 text,
+col47 text,
+col48 text,
+col49 text,
+col50 text,
+col51 text,
+col52 text,
+col53 text,
+col54 text,
+col55 text,
+col56 text,
+col57 text,
+col58 text,
+col59 text,
+col60 text,
+col61 text,
+col62 text,
+col63 text,
+col64 text,
+col65 text,
+col66 text,
+col67 text,
+col68 text ,
+col69 text,
+col70 text,
+col71 text,
+col72 text,
+col73 text,
+col74 text,
+col75 text,
+col76 text,
+col77 text,
+col78 text,
+col79 text,
+col80 text,
+col81 text,
+col82 text,
+col83 text,
+col84 text,
+col85 text,
+col86 text,
+col87 text,
+col88 text,
+col89 text,
+col90 text,
+col91 text,
+col92 text,
+col93 text,
+col94 text,
+col95 text,
+col96 text,
+col97 text,
+col98 text,
+col99 text,
+col100 text,
+col101 text,
+col102 text,
+col103 text,
+col104 text,
+col105 text,
+col106 text,
+col107 text,
+col108 text,
+col109 text,
+col110 text,
+col111 text,
+col112 text,
+col113 text,
+col114 text,
+col115 text,
+col116 text,
+col117 text,
+col118 text,
+col119 text,
+col120 text,
+col121 text,
+col122 text,
+col123 text,
+col124 text,
+col125 text,
+col126 text ,
+col127 text,
+col128 text,
+col129 text,
+col130 text,
+col131 text,
+col132 text,
+col133 text,
+col134 text,
+col135 text,
+col136 text,
+col137 text,
+col138 text,
+col139 text,
+col140 text,
+col141 text,
+col142 text,
+col143 text,
+col144 text,
+col145 text,
+col146 text,
+col147 text ,
+col148 text,
+col149 text,
+col150 text,
+col151 text,
+col152 text,
+col153 text,
+col154 text,
+col155 text,
+col156 text,
+col157 text,
+col158 text,
+col159 text,
+col160 text,
+col161 text,
+col162 text,
+col163 text,
+col164 text,
+col165 text,
+col166 text,
+col167 text,
+col168 text,
+col169 text,
+col170 text,
+col171 text,
+col172 text ,
+col173 text,
+col174 text,
+col175 text,
+col176 text,
+col177 text,
+col178 text,
+col179 text,
+col180 text,
+col181 text,
+col182 text,
+col183 text,
+col184 text,
+col185 text,
+col186 text,
+col187 text,
+col188 text,
+col189 text,
+col190 text,
+col191 text,
+col192 text,
+col193 text,
+col194 text,
+col195 text,
+col196 text,
+col197 text,
+col198 text,
+col199 text,
+col200 text,
+col201 text,
+col202 text,
+col203 text,
+col204 text,
+col205 text,
+col206 text,
+col207 text,
+col208 text,
+col209 text,
+col210 text,
+col211 text,
+col212 text,
+col213 text,
+col214 text,
+col215 text,
+col216 text,
+col217 text,
+col218 text,
+col219 text,
+col220 text,
+col221 text,
+col222 text,
+col223 text,
+col224 text,
+col225 text,
+col226 text,
+col227 text,
+col228 text
+) ENGINE=InnoDB;
+
+set innodb_strict_mode = 1;
+
+--replace_regex /is [0-9]+/is NNNN/
+--error ER_TOO_BIG_ROWSIZE
+alter table t1 engine=InnoDB;
+
+drop table t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/fts_compatibility.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/fts_compatibility.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/fts_compatibility.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/fts_compatibility.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,262 @@
+# Bug #18285007	COPY OF TABLES WITH INNODB FTS
+#	FROM WINDOWS TO LINUX CAUSES CRASH
+# Simulating old non-windows(< 5.6.16) data directory
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+DROP TABLE t1;
+# Simulating old windows (< 5.6.16) data directory
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+DROP TABLE t1;
+# Simulation current non windows data directory
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+DROP TABLE t1;
+# Non windows aux table flag failure and rebuild the corrupted index.
+call mtr.add_suppression("\\[Warning\\] InnoDB: Parent table of FTS auxiliary table .* not found.");
+call mtr.add_suppression("\\[ERROR] InnoDB: Flagged corruption of .* in table .* in DROP ORPHANED TABLE");
+call mtr.add_suppression("\\[Warning\\] InnoDB: Setting aux table .* to hex format failed.");
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT `AB` (a, b), FULLTEXT `C1` (c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+SET GLOBAL DEBUG='-d,innodb_test_wrong_fts_sys_table_name';
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+ALTER TABLE t1 ADD FULLTEXT(b);
+# Restart the server
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+# Drop the corrupted index.
+ALTER TABLE t1 DROP INDEX `AB`;
+ALTER TABLE t1 DROP INDEX `C1`;
+# Rebuild the index.
+ALTER TABLE t1 ADD FULLTEXT(a, b);
+ALTER TABLE t1 ADD FULLTEXT(c);
+# Read the record using fts index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+DROP TABLE t1;
+# Non windows parent table flag failure.
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT(a, b), FULLTEXT(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+SET GLOBAL DEBUG='-d,innodb_test_wrong_fts_sys_table_name';
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+DROP TABLE t1;
+# Drop FTS table and rename the common tables.
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT f1(a, b));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+alter table t1 drop index f1;
+SET SESSION debug='-d,innodb_test_wrong_fts_sys_table_name';
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT * FROM t1;
+a	b	c
+TEST1	TEST2	TEXT3
+TEXT1	TEXT2	TEXT5
+DROP TABLE t1;
+# Rename failure for old windows data directory and rebuild the
+# corrupted index
+call mtr.add_suppression("\\[Warning\\] InnoDB: Failed to rename one aux table .* will revert all successful rename operations.");
+call mtr.add_suppression("\\[Warning\\] InnoDB: Rollback operations on all aux tables of table .* All the fts index associated with the table are marked as corrupted. Please rebuild the index again.");
+call mtr.add_suppression("\\[ERROR\\] InnoDB: Flagged corruption of .* in table .* in DROP ORPHANED TABLE");
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT `AB`(a, b), FULLTEXT `C1`(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+SET SESSION debug='-d,innodb_test_wrong_fts_sys_table_name';
+# Restart server.
+ALTER TABLE t1 ADD FULLTEXT(b);
+ERROR HY000: Upgrade index name failed, please use create index(alter table) algorithm copy to rebuild index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+# Restart server.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+# Drop the corrupted index.
+ALTER TABLE t1 DROP INDEX `AB`;
+ALTER TABLE t1 DROP INDEX `C1`;
+# Rebuild the index.
+ALTER TABLE t1 ADD FULLTEXT(a, b);
+ALTER TABLE t1 ADD FULLTEXT(c);
+# Read the record using fts index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+TRUNCATE TABLE t1;
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/fts_compatibility_win.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/fts_compatibility_win.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/fts_compatibility_win.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/fts_compatibility_win.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,262 @@
+# Bug #18285007	COPY OF TABLES WITH INNODB FTS
+#	FROM WINDOWS TO LINUX CAUSES CRASH
+# Simulating old non-windows(< 5.6.16) data directory
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_non_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+DROP TABLE t1;
+# Simulating old windows (< 5.6.16) data directory
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+DROP TABLE t1;
+# Simulation current windows data directory
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b
+TEST1	TEST2
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_INDEX_1
+FTS_0	test/FTS_AUX_INDEX_2
+FTS_0	test/FTS_AUX_INDEX_3
+FTS_0	test/FTS_AUX_INDEX_4
+FTS_0	test/FTS_AUX_INDEX_5
+FTS_0	test/FTS_AUX_INDEX_6
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+DROP TABLE t1;
+# Non windows aux table flag failure and rebuild the corrupted index.
+call mtr.add_suppression("\\[Warning\\] InnoDB: Parent table of FTS auxiliary table .* not found.");
+call mtr.add_suppression("\\[ERROR] InnoDB: Flagged corruption of .* in table .* in DROP ORPHANED TABLE");
+call mtr.add_suppression("\\[Warning\\] InnoDB: Setting aux table .* to hex format failed.");
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_non_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT `AB` (a, b), FULLTEXT `C1`(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+SET GLOBAL DEBUG='-d,innodb_test_wrong_fts_sys_table_name';
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+ALTER TABLE t1 ADD FULLTEXT(b);
+# Restart the server
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+# Drop the corrupted index.
+ALTER TABLE t1 DROP INDEX `AB`;
+ALTER TABLE t1 DROP INDEX `C1`;
+# Rebuild the index.
+ALTER TABLE t1 ADD FULLTEXT(a, b);
+ALTER TABLE t1 ADD FULLTEXT(c);
+# Read the record using fts index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+DROP TABLE t1;
+# Non windows parent table flag failure.
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_non_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT(a, b), FULLTEXT(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+SET GLOBAL DEBUG='-d,innodb_test_wrong_fts_sys_table_name';
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+DROP TABLE t1;
+# Drop FTS table and rename the common tables.
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT f1(a, b));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+alter table t1 drop index f1;
+SET SESSION debug='-d,innodb_test_wrong_fts_sys_table_name';
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+prefix	name
+FTS_0	test/FTS_AUX_BEING_DELETED
+FTS_0	test/FTS_AUX_BEING_DELETED_CACHE
+FTS_0	test/FTS_AUX_CONFIG
+FTS_0	test/FTS_AUX_DELETED
+FTS_0	test/FTS_AUX_DELETED_CACHE
+SELECT * FROM t1;
+a	b	c
+TEST1	TEST2	TEXT3
+TEXT1	TEXT2	TEXT5
+DROP TABLE t1;
+# Rename failure for old windows data directory and rebuild the
+# corrupted index
+call mtr.add_suppression("\\[Warning\\] InnoDB: Failed to rename one aux table .* Will revert all successful rename operations.");
+call mtr.add_suppression("\\[Warning\\] InnoDB: Rollback operations on all aux tables of table .* All the fts index associated with the table are marked as corrupted. Please rebuild the index again.");
+call mtr.add_suppression("\\[ERROR\\] InnoDB: Flagged corruption of .* in table .* in DROP ORPHANED TABLE");
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT `AB`(a, b), FULLTEXT `C1`(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+SET SESSION debug='-d,innodb_test_wrong_fts_sys_table_name';
+# Restart server.
+ALTER TABLE t1 ADD FULLTEXT(b);
+ERROR HY000: Upgrade index name failed, please use create index(alter table) algorithm copy to rebuild index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+# Restart server.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+ERROR HY000: The table does not have FULLTEXT index to support this query
+# Drop the corrupted index.
+ALTER TABLE t1 DROP INDEX `AB`;
+ALTER TABLE t1 DROP INDEX `C1`;
+# Rebuild the index.
+ALTER TABLE t1 ADD FULLTEXT(a, b);
+ALTER TABLE t1 ADD FULLTEXT(c);
+# Read the record using fts index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+a	b	c
+TEST1	TEST2	TEXT3
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+a	b	c
+TEXT1	TEXT2	TEXT5
+TRUNCATE TABLE t1;
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result	2017-02-27 07:47:02.000000000 +0000
@@ -487,6 +487,9 @@
   PRIMARY KEY (`id`),
   FULLTEXT KEY `idx` (`a`,`b`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPRESSED
+SELECT count(*) FROM information_schema.innodb_sys_tables WHERE name LIKE "%FTS_%" AND space !=0;
+count(*)
+11
 INSERT INTO t1 (a,b) VALUES
 ('1001 MySQL Tricks','1. Never run mysqld as root. 2. ...'),
 ('MySQL vs. YourSQL','In the following database comparison ...'),
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result	2017-02-27 07:47:02.000000000 +0000
@@ -1426,3 +1426,440 @@
 id	a
 1	know mysql good database
 DROP TABLE t1;
+CREATE TABLE articles (
+id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+title VARCHAR(200),
+body TEXT,
+FULLTEXT (title,body)
+) ENGINE=InnoDB;
+INSERT INTO articles (title,body) VALUES ('Test Article','blah blah
+blah'),("Matt's Noise",'this is noisy'),('February Weather','It was terrible
+this year.'),('Peter Pan','Tis a kids story.'),('Test1','nada'),('Database
+database database','foo database database database'),('Database article
+title','body with lots of words.'),('myfulltext database', 'my test fulltext
+database');
+SELECT id, title, body FROM articles ORDER BY MATCH (title,body)  AGAINST ('database' IN BOOLEAN MODE) DESC;
+id	title	body
+6	Database
+database database	foo database database database
+8	myfulltext database	my test fulltext
+database
+7	Database article
+title	body with lots of words.
+1	Test Article	blah blah
+blah
+2	Matt's Noise	this is noisy
+3	February Weather	It was terrible
+this year.
+4	Peter Pan	Tis a kids story.
+5	Test1	nada
+DELETE from articles WHERE title like "myfulltext database";
+INSERT INTO articles (title,body) VALUES ('myfulltext database', 'my test fulltext database');
+SELECT id, title, body FROM articles ORDER BY MATCH (title,body)  AGAINST ('database' IN BOOLEAN MODE) DESC;
+id	title	body
+6	Database
+database database	foo database database database
+9	myfulltext database	my test fulltext database
+7	Database article
+title	body with lots of words.
+1	Test Article	blah blah
+blah
+2	Matt's Noise	this is noisy
+3	February Weather	It was terrible
+this year.
+4	Peter Pan	Tis a kids story.
+5	Test1	nada
+DELETE from articles WHERE title like "myfulltext database";
+INSERT INTO articles (title,body) VALUES ('myfulltext database', 'my test fulltext database');
+SELECT id, title, body FROM articles ORDER BY MATCH (title,body)  AGAINST ('database' IN BOOLEAN MODE) DESC;
+id	title	body
+6	Database
+database database	foo database database database
+10	myfulltext database	my test fulltext database
+7	Database article
+title	body with lots of words.
+1	Test Article	blah blah
+blah
+2	Matt's Noise	this is noisy
+3	February Weather	It was terrible
+this year.
+4	Peter Pan	Tis a kids story.
+5	Test1	nada
+DROP TABLE articles;
+CREATE TABLE t1(
+a TEXT CHARSET ujis COLLATE ujis_japanese_ci,
+b TEXT CHARSET utf8mb4 COLLATE utf8mb4_turkish_ci,
+c TEXT CHARSET eucjpms COLLATE eucjpms_bin,
+d TEXT CHARSET utf8mb4,
+FULLTEXT INDEX(a),
+FULLTEXT INDEX(b),
+FULLTEXT INDEX(c),
+FULLTEXT INDEX(d)
+) ENGINE = InnoDB;
+INSERT INTO t1 VALUES
+('myisam', 'myisam', 'myisam', 'myisam'),
+('innodb', 'innodb', 'innodb', 'innodb'),
+('innodb myisam', 'innodb myisam', 'innodb myisam', 'innodb myisam'),
+('memory', 'memory', 'memory', 'memory'),
+('archive', 'archive', 'archive', 'archive'),
+('federated', 'federated', 'federated', 'federated'),
+('storage engine innodb', 'storage engine innodb', 'storage engine innodb', 'storage engine innodb'),
+('storage engine myisam', 'storage engine myisam', 'storage engine myisam', 'storage engine myisam'),
+('innobase', 'innobase', 'innobase', 'innobase'),
+('myisam innodb', 'myisam innodb', 'myisam innodb', 'myisam innodb'),
+('innodb myisam engines', 'innodb myisam engines', 'innodb myisam engines', 'innodb myisam engines');
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', ' ', '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, '"', 0x00));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '&', 0x00, '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, '&', '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '%', '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+a
+innodb
+innodb myisam
+storage engine innodb
+myisam innodb
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+a
+innodb
+innodb myisam
+storage engine innodb
+myisam innodb
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+a
+innodb
+innodb myisam
+storage engine innodb
+myisam innodb
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
+a
+innodb myisam
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
+a
+innodb myisam
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 's', 't', 'o', 'r', 'a', 'g', 'e', '"','@', '4', 0x00) IN BOOLEAN MODE);
+ERROR 42000: syntax error, unexpected FTS_TERM, expecting FTS_NUMB
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"'));
+b
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00));
+b
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', '"'));
+b
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', ' ', '"'));
+b
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 0x00, '"'));
+b
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 0x00, '"', 0x00));
+b
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', '&', 0x00, '"'));
+b
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 0x00, '&', '"'));
+b
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', '%', '"'));
+b
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+b
+innodb
+innodb myisam
+storage engine innodb
+myisam innodb
+innodb myisam engines
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+b
+innodb
+innodb myisam
+storage engine innodb
+myisam innodb
+innodb myisam engines
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+b
+innodb
+innodb myisam
+storage engine innodb
+myisam innodb
+innodb myisam engines
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+b
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
+b
+innodb myisam
+myisam innodb
+innodb myisam engines
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
+b
+innodb myisam
+myisam innodb
+innodb myisam engines
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 's', 't', 'o', 'r', 'a', 'g', 'e', '"','@', '4', 0x00) IN BOOLEAN MODE);
+ERROR 42000: syntax error, unexpected FTS_TERM, expecting FTS_NUMB
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"'));
+c
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00));
+c
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', '"'));
+c
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', ' ', '"'));
+c
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, '"'));
+c
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 0x00, '"', 0x00));
+c
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', '&', 0x00, '"'));
+c
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, '&', '"'));
+c
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', '%', '"'));
+c
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+c
+innodb
+innodb myisam
+storage engine innodb
+myisam innodb
+innodb myisam engines
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+c
+innodb
+innodb myisam
+storage engine innodb
+myisam innodb
+innodb myisam engines
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+c
+innodb
+innodb myisam
+storage engine innodb
+myisam innodb
+innodb myisam engines
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+c
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+c
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
+c
+innodb myisam
+innodb myisam engines
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
+c
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
+c
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
+c
+innodb myisam
+innodb myisam engines
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
+c
+innodb myisam
+myisam innodb
+innodb myisam engines
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
+c
+innodb myisam
+myisam innodb
+innodb myisam engines
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 's', 't', 'o', 'r', 'a', 'g', 'e', '"','@', '4', 0x00) IN BOOLEAN MODE);
+ERROR 42000: syntax error, unexpected FTS_TERM, expecting FTS_NUMB
+ALTER TABLE t1 ENGINE = MyISAM;
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', ' ', '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, '"', 0x00));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '&', 0x00, '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, '&', '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '%', '"'));
+a
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+a
+innodb
+innodb myisam
+myisam innodb
+storage engine innodb
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+a
+innodb
+innodb myisam
+myisam innodb
+storage engine innodb
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+a
+innodb
+innodb myisam
+myisam innodb
+storage engine innodb
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
+a
+innodb myisam
+myisam innodb
+innodb myisam engines
+myisam
+innodb
+storage engine innodb
+storage engine myisam
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
+a
+innodb myisam
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
+a
+innodb myisam
+innodb myisam engines
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 's', 't', 'o', 'r', 'a', 'g', 'e', '"','@', '4', 0x00) IN BOOLEAN MODE);
+a
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/phrase.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/phrase.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/phrase.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/phrase.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,84 @@
+CREATE TABLE articles (
+id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+title VARCHAR(200),
+body TEXT,
+FULLTEXT (title,body)
+) ENGINE=InnoDB;
+INSERT INTO articles (title,body) VALUES
+(NULL, 'mysql good database'),
+(NULL, ' mysql good database'),
+('', 'mysql good database'),
+('', ' mysql good database'),
+(' ', 'mysql good database'),
+('mysql', 'good database'),
+('mysql ', 'good database'),
+('mysql', ' good database'),
+('mysql good database', ''),
+('mysql good database', NULL);
+SET GLOBAL innodb_ft_aux_table="test/articles";
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+database	1	10	10	1	11
+database	1	10	10	2	12
+database	1	10	10	3	11
+database	1	10	10	4	12
+database	1	10	10	5	13
+database	1	10	10	6	11
+database	1	10	10	7	12
+database	1	10	10	8	12
+database	1	10	10	9	11
+database	1	10	10	10	11
+good	1	10	10	1	6
+good	1	10	10	2	7
+good	1	10	10	3	6
+good	1	10	10	4	7
+good	1	10	10	5	8
+good	1	10	10	6	6
+good	1	10	10	7	7
+good	1	10	10	8	7
+good	1	10	10	9	6
+good	1	10	10	10	6
+mysql	1	10	10	1	0
+mysql	1	10	10	2	1
+mysql	1	10	10	3	0
+mysql	1	10	10	4	1
+mysql	1	10	10	5	2
+mysql	1	10	10	6	0
+mysql	1	10	10	7	0
+mysql	1	10	10	8	0
+mysql	1	10	10	9	0
+mysql	1	10	10	10	0
+SET GLOBAL innodb_ft_aux_table=default;
+SELECT * FROM articles;
+id	title	body
+1	NULL	mysql good database
+2	NULL	 mysql good database
+3		mysql good database
+4		 mysql good database
+5	 	mysql good database
+6	mysql	good database
+7	mysql 	good database
+8	mysql	 good database
+9	mysql good database	
+10	mysql good database	NULL
+SELECT * FROM articles WHERE MATCH(title, body)
+AGAINST('"mysql good database"' IN BOOLEAN MODE);
+id	title	body
+1	NULL	mysql good database
+2	NULL	 mysql good database
+3		mysql good database
+4		 mysql good database
+5	 	mysql good database
+9	mysql good database	
+10	mysql good database	NULL
+SELECT * FROM articles WHERE MATCH(title, body)
+AGAINST('("mysql good database")' IN BOOLEAN MODE);
+id	title	body
+1	NULL	mysql good database
+2	NULL	 mysql good database
+3		mysql good database
+4		 mysql good database
+5	 	mysql good database
+9	mysql good database	
+10	mysql good database	NULL
+DROP TABLE articles;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/subexpr.result percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/subexpr.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/r/subexpr.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/r/subexpr.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,105 @@
+#
+# Bug #20028323 INNODB FULLTEXT BOOLEAN SEARCH INCORRECTLY HANDLES
+# PARENTHESES
+#
+CREATE TABLE t1 (
+f1 INT NOT NULL AUTO_INCREMENT,
+f2 TEXT NOT NULL,
+PRIMARY KEY (f1),
+FULLTEXT (f2)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+INSERT INTO t1 (f2) VALUES
+('Pumpkin soup with cheese bread'),
+('Yellow chicken curry'),
+('Fresh green vegetables with garlic');
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+pumpkin' IN BOOLEAN MODE);
+f1	f2
+1	Pumpkin soup with cheese bread
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+cheese' IN BOOLEAN MODE);
+f1	f2
+1	Pumpkin soup with cheese bread
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+(pumpkin cheese)' IN BOOLEAN MODE);
+f1	f2
+1	Pumpkin soup with cheese bread
+SELECT * FROM t1 WHERE MATCH(f2)
+AGAINST('+pumpkin +(souffle)' IN BOOLEAN MODE);
+f1	f2
+SELECT * FROM t1 WHERE MATCH(f2)
+AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
+f1	f2
+SELECT * FROM t1 WHERE MATCH(f2)
+AGAINST('+pumpkin +(>souffle <tart)' IN BOOLEAN MODE);
+f1	f2
+SELECT * FROM t1 WHERE MATCH(f2)
+AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
+f1	f2
+INSERT INTO t1 (f2) VALUES
+('This row contains only souffle'),
+('This row contains only tart'),
+('This row contains only pumpkin'),
+('This row contains only cheese'),
+('This row contains pumpkin and souffle'),
+('This row contains pumpkin and tart'),
+('This row contains pumpkin and cheese'),
+('This row contains both souffle and tart'),
+('This row contains both souffle and cheese'),
+('This row contains both tart and cheese'),
+('This row contains all three souffle, pumpkin and  tart'),
+('This row contains all four cheese, souffle, pumpkin and  tart');
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+pumpkin' IN BOOLEAN MODE);
+f1	f2
+1	Pumpkin soup with cheese bread
+6	This row contains only pumpkin
+8	This row contains pumpkin and souffle
+9	This row contains pumpkin and tart
+10	This row contains pumpkin and cheese
+14	This row contains all three souffle, pumpkin and  tart
+15	This row contains all four cheese, souffle, pumpkin and  tart
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+cheese' IN BOOLEAN MODE);
+f1	f2
+1	Pumpkin soup with cheese bread
+7	This row contains only cheese
+10	This row contains pumpkin and cheese
+12	This row contains both souffle and cheese
+13	This row contains both tart and cheese
+15	This row contains all four cheese, souffle, pumpkin and  tart
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+(pumpkin cheese)' IN BOOLEAN MODE);
+f1	f2
+1	Pumpkin soup with cheese bread
+10	This row contains pumpkin and cheese
+15	This row contains all four cheese, souffle, pumpkin and  tart
+7	This row contains only cheese
+12	This row contains both souffle and cheese
+13	This row contains both tart and cheese
+6	This row contains only pumpkin
+8	This row contains pumpkin and souffle
+9	This row contains pumpkin and tart
+14	This row contains all three souffle, pumpkin and  tart
+SELECT * FROM t1 WHERE MATCH(f2)
+AGAINST('+pumpkin +(souffle)' IN BOOLEAN MODE);
+f1	f2
+8	This row contains pumpkin and souffle
+14	This row contains all three souffle, pumpkin and  tart
+15	This row contains all four cheese, souffle, pumpkin and  tart
+SELECT * FROM t1 WHERE MATCH(f2)
+AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
+f1	f2
+14	This row contains all three souffle, pumpkin and  tart
+15	This row contains all four cheese, souffle, pumpkin and  tart
+8	This row contains pumpkin and souffle
+9	This row contains pumpkin and tart
+SELECT * FROM t1 WHERE MATCH(f2)
+AGAINST('+pumpkin +(>souffle <tart)' IN BOOLEAN MODE);
+f1	f2
+8	This row contains pumpkin and souffle
+14	This row contains all three souffle, pumpkin and  tart
+15	This row contains all four cheese, souffle, pumpkin and  tart
+9	This row contains pumpkin and tart
+SELECT * FROM t1 WHERE MATCH(f2)
+AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
+f1	f2
+14	This row contains all three souffle, pumpkin and  tart
+15	This row contains all four cheese, souffle, pumpkin and  tart
+8	This row contains pumpkin and souffle
+9	This row contains pumpkin and tart
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/fts_compatibility.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/fts_compatibility.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/fts_compatibility.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/fts_compatibility.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,269 @@
+--source include/not_windows.inc
+--source include/not_embedded.inc
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/not_valgrind.inc
+
+--echo # Bug #18285007	COPY OF TABLES WITH INNODB FTS
+--echo #	FROM WINDOWS TO LINUX CAUSES CRASH
+
+LET $regexp=/FTS_([0-9a-f_]+)([A-Z_]+)/FTS_AUX_\2/;
+
+--echo # Simulating old non-windows(< 5.6.16) data directory
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+--source include/restart_mysqld.inc
+
+# Set flags2 for all the table.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+DROP TABLE t1;
+
+--echo # Simulating old windows (< 5.6.16) data directory
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+--source include/restart_mysqld.inc
+
+# Renaming the tables.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+DROP TABLE t1;
+
+--echo # Simulation current non windows data directory
+
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+--source include/restart_mysqld.inc
+
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+DROP TABLE t1;
+
+--echo # Non windows aux table flag failure and rebuild the corrupted index.
+
+# Remove the orphaned table
+-- source include/restart_mysqld.inc
+
+call mtr.add_suppression("\\[Warning\\] InnoDB: Parent table of FTS auxiliary table .* not found.");
+call mtr.add_suppression("\\[ERROR] InnoDB: Flagged corruption of .* in table .* in DROP ORPHANED TABLE");
+call mtr.add_suppression("\\[Warning\\] InnoDB: Setting aux table .* to hex format failed.");
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT `AB` (a, b), FULLTEXT `C1` (c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+SET GLOBAL DEBUG='-d,innodb_test_wrong_fts_sys_table_name';
+
+# Write file to make mysql-test-run.pl wait for the server to stop
+-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# Request shutdown
+-- send_shutdown
+# Call script that will poll the server waiting for it to disapear
+-- source include/wait_until_disconnected.inc
+
+# Write file to make mysql-test-run.pl start up the server again, ensure
+# that no background threads are started, so that we can check that it
+# shuts down properly.
+# Set the flag to force the aux table fail and restart the server
+
+--exec echo "restart:--debug=d,aux_table_flag_fail" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+ALTER TABLE t1 ADD FULLTEXT(b);
+
+--echo # Restart the server
+-- source include/restart_mysqld.inc
+
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+--echo # Drop the corrupted index.
+ALTER TABLE t1 DROP INDEX `AB`;
+ALTER TABLE t1 DROP INDEX `C1`;
+
+-- echo # Rebuild the index.
+ALTER TABLE t1 ADD FULLTEXT(a, b);
+ALTER TABLE t1 ADD FULLTEXT(c);
+
+--echo # Read the record using fts index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+DROP TABLE t1;
+
+--echo # Non windows parent table flag failure.
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT(a, b), FULLTEXT(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+SET GLOBAL DEBUG='-d,innodb_test_wrong_fts_sys_table_name';
+
+# Write file to make mysql-test-run.pl wait for the server to stop
+-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# Request shutdown
+-- send_shutdown
+# Call script that will poll the server waiting for it to disapear
+-- source include/wait_until_disconnected.inc
+
+# Write file to make mysql-test-run.pl start up the server again, ensure
+# that no background threads are started, so that we can check that it
+# shuts down properly.
+# Set the flag to force the parent table fail and restart the server
+
+-- disable_query_log
+--error 1
+--exec $MYSQLD_CMD --debug="d,parent_table_flag_fail"
+-- enable_query_log
+
+# Restart the server
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+DROP TABLE t1;
+
+--echo # Drop FTS table and rename the common tables.
+
+# Remove the orphaned table
+-- source include/restart_mysqld.inc
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT f1(a, b));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+alter table t1 drop index f1;
+SET SESSION debug='-d,innodb_test_wrong_fts_sys_table_name';
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+
+--source include/restart_mysqld.inc
+# Renaming the common tables.
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+SELECT * FROM t1;
+DROP TABLE t1;
+
+--echo # Rename failure for old windows data directory and rebuild the
+--echo # corrupted index
+
+call mtr.add_suppression("\\[Warning\\] InnoDB: Failed to rename one aux table .* will revert all successful rename operations.");
+
+call mtr.add_suppression("\\[Warning\\] InnoDB: Rollback operations on all aux tables of table .* All the fts index associated with the table are marked as corrupted. Please rebuild the index again.");
+
+call mtr.add_suppression("\\[ERROR\\] InnoDB: Flagged corruption of .* in table .* in DROP ORPHANED TABLE");
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT `AB`(a, b), FULLTEXT `C1`(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+SET SESSION debug='-d,innodb_test_wrong_fts_sys_table_name';
+
+# Write file to make mysql-test-run.pl wait for the server to stop
+-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# Request shutdown
+-- send_shutdown
+#Call script that will poll the server waiting for it to disapear
+-- source include/wait_until_disconnected.inc
+
+--echo # Restart server.
+
+# Write file to make mysql-test-run.pl start up the server again, ensure
+# that no background threads are started, so that we can check that it
+# shuts down properly.
+# Set the flag to force the rename fail and restart the server
+--exec echo "restart:--debug=d,rename_aux_table_fail" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+# Will fail to alter table
+--error ER_INNODB_FT_AUX_NOT_HEX_ID
+ALTER TABLE t1 ADD FULLTEXT(b);
+
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+
+--echo # Restart server.
+-- source include/restart_mysqld.inc
+
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+--echo # Drop the corrupted index.
+ALTER TABLE t1 DROP INDEX `AB`;
+ALTER TABLE t1 DROP INDEX `C1`;
+
+-- echo # Rebuild the index.
+ALTER TABLE t1 ADD FULLTEXT(a, b);
+ALTER TABLE t1 ADD FULLTEXT(c);
+
+--echo # Read the record using fts index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+TRUNCATE TABLE t1;
+DROP TABLE t1;
+-- source include/restart_mysqld.inc
+--list_files $MYSQLD_DATADIR/test
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/fts_compatibility_win.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/fts_compatibility_win.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/fts_compatibility_win.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/fts_compatibility_win.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,263 @@
+--source include/windows.inc
+--source include/not_embedded.inc
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+--echo # Bug #18285007	COPY OF TABLES WITH INNODB FTS
+--echo #	FROM WINDOWS TO LINUX CAUSES CRASH
+
+LET $regexp=/FTS_([0-9a-f_]+)([A-Z_]+)/FTS_AUX_\2/;
+
+--echo # Simulating old non-windows(< 5.6.16) data directory
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_non_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+--source include/restart_mysqld.inc
+
+# Set flags2 for all the table.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+DROP TABLE t1;
+
+--echo # Simulating old windows (< 5.6.16) data directory
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+--source include/restart_mysqld.inc
+
+# Renaming the tables.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+DROP TABLE t1;
+
+--echo # Simulation current windows data directory
+
+CREATE TABLE t1(a TEXT, b TEXT, FULLTEXT(a, b))engine=innodb;
+INSERT INTO t1 VALUES('TEST1', 'TEST2');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+--source include/restart_mysqld.inc
+
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+DROP TABLE t1;
+
+--echo # Non windows aux table flag failure and rebuild the corrupted index.
+
+call mtr.add_suppression("\\[Warning\\] InnoDB: Parent table of FTS auxiliary table .* not found.");
+call mtr.add_suppression("\\[ERROR] InnoDB: Flagged corruption of .* in table .* in DROP ORPHANED TABLE");
+call mtr.add_suppression("\\[Warning\\] InnoDB: Setting aux table .* to hex format failed.");
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_non_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT `AB` (a, b), FULLTEXT `C1`(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+SET GLOBAL DEBUG='-d,innodb_test_wrong_fts_sys_table_name';
+
+# Write file to make mysql-test-run.pl wait for the server to stop
+-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# Request shutdown
+-- send_shutdown
+# Call script that will poll the server waiting for it to disapear
+-- source include/wait_until_disconnected.inc
+
+# Write file to make mysql-test-run.pl start up the server again, ensure
+# that no background threads are started, so that we can check that it
+# shuts down properly.
+# Set the flag to force the aux table fail and restart the server
+
+--exec echo "restart:--debug=d,aux_table_flag_fail" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+ALTER TABLE t1 ADD FULLTEXT(b);
+
+--echo # Restart the server
+-- source include/restart_mysqld.inc
+
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+--echo # Drop the corrupted index.
+ALTER TABLE t1 DROP INDEX `AB`;
+ALTER TABLE t1 DROP INDEX `C1`;
+
+-- echo # Rebuild the index.
+ALTER TABLE t1 ADD FULLTEXT(a, b);
+ALTER TABLE t1 ADD FULLTEXT(c);
+
+--echo # Read the record using fts index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+DROP TABLE t1;
+
+--echo # Non windows parent table flag failure.
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+SET GLOBAL DEBUG='+d,innodb_test_wrong_non_windows_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT(a, b), FULLTEXT(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+SET GLOBAL DEBUG='-d,innodb_test_wrong_fts_sys_table_name';
+
+# Write file to make mysql-test-run.pl wait for the server to stop
+-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# Request shutdown
+-- send_shutdown
+# Call script that will poll the server waiting for it to disapear
+-- source include/wait_until_disconnected.inc
+
+# Write file to make mysql-test-run.pl start up the server again, ensure
+# that no background threads are started, so that we can check that it
+# shuts down properly.
+# Set the flag to force the parent table fail and restart the server
+
+-- disable_query_log
+--error 1
+--exec $MYSQLD_CMD --debug="d,parent_table_flag_fail"
+-- enable_query_log
+
+# Restart the server
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+DROP TABLE t1;
+
+--echo # Drop FTS table and rename the common tables.
+
+# Remove the orphaned table
+-- source include/restart_mysqld.inc
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT f1(a, b));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+alter table t1 drop index f1;
+SET SESSION debug='-d,innodb_test_wrong_fts_sys_table_name';
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+
+--source include/restart_mysqld.inc
+# Renaming the common tables.
+--replace_regex $regexp
+SELECT SUBSTRING(name, LOCATE('_', name) - 3, 5) AS prefix, name
+FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE name LIKE '%FTS_%' ORDER BY 1, 2;
+SELECT * FROM t1;
+DROP TABLE t1;
+
+--echo # Rename failure for old windows data directory and rebuild the
+--echo # corrupted index
+
+call mtr.add_suppression("\\[Warning\\] InnoDB: Failed to rename one aux table .* Will revert all successful rename operations.");
+
+call mtr.add_suppression("\\[Warning\\] InnoDB: Rollback operations on all aux tables of table .* All the fts index associated with the table are marked as corrupted. Please rebuild the index again.");
+
+call mtr.add_suppression("\\[ERROR\\] InnoDB: Flagged corruption of .* in table .* in DROP ORPHANED TABLE");
+
+SET GLOBAL DEBUG='+d,innodb_test_wrong_fts_aux_table_name';
+CREATE TABLE t1(a TEXT, b TEXT, c TEXT, FULLTEXT `AB`(a, b), FULLTEXT `C1`(c));
+INSERT INTO t1 VALUES('TEST1', 'TEST2', 'TEXT3');
+INSERT INTO t1 VALUES('TEXT1', 'TEXT2', 'TEXT5');
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+SET SESSION debug='-d,innodb_test_wrong_fts_sys_table_name';
+
+# Write file to make mysql-test-run.pl wait for the server to stop
+-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# Request shutdown
+-- send_shutdown
+#Call script that will poll the server waiting for it to disapear
+-- source include/wait_until_disconnected.inc
+
+--echo # Restart server.
+
+# Write file to make mysql-test-run.pl start up the server again, ensure
+# that no background threads are started, so that we can check that it
+# shuts down properly.
+# Set the flag to force the rename fail and restart the server
+--exec echo "restart:--debug=d,rename_aux_table_fail" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+# Will fail to alter table
+--error ER_INNODB_FT_AUX_NOT_HEX_ID
+ALTER TABLE t1 ADD FULLTEXT(b);
+
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+
+--echo # Restart server.
+-- source include/restart_mysqld.inc
+
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+--error ER_TABLE_HAS_NO_FT
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+--echo # Drop the corrupted index.
+ALTER TABLE t1 DROP INDEX `AB`;
+ALTER TABLE t1 DROP INDEX `C1`;
+
+-- echo # Rebuild the index.
+ALTER TABLE t1 ADD FULLTEXT(a, b);
+ALTER TABLE t1 ADD FULLTEXT(c);
+
+--echo # Read the record using fts index.
+SELECT * FROM t1 WHERE MATCH(a, b) AGAINST ('TEST2');
+SELECT * FROM t1 WHERE MATCH(c) AGAINST ('TEXT5');
+
+TRUNCATE TABLE t1;
+DROP TABLE t1;
+-- source include/restart_mysqld.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test	2017-02-27 07:47:02.000000000 +0000
@@ -458,6 +458,9 @@
 ALTER TABLE t1 ADD FULLTEXT INDEX idx (a,b);
 EVAL SHOW CREATE TABLE t1;
 
+# Check whether individual space id created for AUX tables
+SELECT count(*) FROM information_schema.innodb_sys_tables WHERE name LIKE "%FTS_%" AND space !=0;
+
 # Insert rows
 INSERT INTO t1 (a,b) VALUES
         ('1001 MySQL Tricks','1. Never run mysqld as root. 2. ...'),
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test	2017-02-27 07:47:02.000000000 +0000
@@ -1326,3 +1326,155 @@
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('+"good database"' IN BOOLEAN MODE);
 
 DROP TABLE t1;
+
+# Test single term ranking
+CREATE TABLE articles (
+       id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+       title VARCHAR(200),
+       body TEXT,
+       FULLTEXT (title,body)
+  ) ENGINE=InnoDB;
+
+# Repeatedly insert/delete records, the ranking should be the same for
+# each of them
+INSERT INTO articles (title,body) VALUES ('Test Article','blah blah
+blah'),("Matt's Noise",'this is noisy'),('February Weather','It was terrible
+this year.'),('Peter Pan','Tis a kids story.'),('Test1','nada'),('Database
+database database','foo database database database'),('Database article
+title','body with lots of words.'),('myfulltext database', 'my test fulltext
+database');
+
+SELECT id, title, body FROM articles ORDER BY MATCH (title,body)  AGAINST ('database' IN BOOLEAN MODE) DESC;
+DELETE from articles WHERE title like "myfulltext database";
+
+INSERT INTO articles (title,body) VALUES ('myfulltext database', 'my test fulltext database');
+
+SELECT id, title, body FROM articles ORDER BY MATCH (title,body)  AGAINST ('database' IN BOOLEAN MODE) DESC;
+DELETE from articles WHERE title like "myfulltext database";
+
+INSERT INTO articles (title,body) VALUES ('myfulltext database', 'my test fulltext database');
+
+SELECT id, title, body FROM articles ORDER BY MATCH (title,body)  AGAINST ('database' IN BOOLEAN MODE) DESC;
+
+DROP TABLE articles;
+
+# Test for BUG 18277305 - FTS: FAILING ASSERTION: PTR[1] == '\"'
+# IN FTS_AST_CREATE_NODE_TEXT
+CREATE TABLE t1(
+	a TEXT CHARSET ujis COLLATE ujis_japanese_ci,
+	b TEXT CHARSET utf8mb4 COLLATE utf8mb4_turkish_ci,
+	c TEXT CHARSET eucjpms COLLATE eucjpms_bin,
+	d TEXT CHARSET utf8mb4,
+	FULLTEXT INDEX(a),
+	FULLTEXT INDEX(b),
+	FULLTEXT INDEX(c),
+	FULLTEXT INDEX(d)
+) ENGINE = InnoDB;
+
+INSERT INTO t1 VALUES
+	('myisam', 'myisam', 'myisam', 'myisam'),
+	('innodb', 'innodb', 'innodb', 'innodb'),
+	('innodb myisam', 'innodb myisam', 'innodb myisam', 'innodb myisam'),
+	('memory', 'memory', 'memory', 'memory'),
+	('archive', 'archive', 'archive', 'archive'),
+	('federated', 'federated', 'federated', 'federated'),
+	('storage engine innodb', 'storage engine innodb', 'storage engine innodb', 'storage engine innodb'),
+	('storage engine myisam', 'storage engine myisam', 'storage engine myisam', 'storage engine myisam'),
+	('innobase', 'innobase', 'innobase', 'innobase'),
+	('myisam innodb', 'myisam innodb', 'myisam innodb', 'myisam innodb'),
+	('innodb myisam engines', 'innodb myisam engines', 'innodb myisam engines', 'innodb myisam engines');
+
+# Test the ujis_japanese_ci
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', ' ', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, '"', 0x00));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '&', 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, '&', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '%', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
+--error ER_PARSE_ERROR
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 's', 't', 'o', 'r', 'a', 'g', 'e', '"','@', '4', 0x00) IN BOOLEAN MODE);
+
+
+# Test the utf8mb4_turkish_ci
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', '"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', ' ', '"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 0x00, '"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 0x00, '"', 0x00));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', '&', 0x00, '"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 0x00, '&', '"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', '%', '"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
+--error ER_PARSE_ERROR
+SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 's', 't', 'o', 'r', 'a', 'g', 'e', '"','@', '4', 0x00) IN BOOLEAN MODE);
+
+# Test the eucjpms_bin
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', ' ', '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 0x00, '"', 0x00));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', '&', 0x00, '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, '&', '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', '%', '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
+--error ER_PARSE_ERROR
+SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 's', 't', 'o', 'r', 'a', 'g', 'e', '"','@', '4', 0x00) IN BOOLEAN MODE);
+
+ALTER TABLE t1 ENGINE = MyISAM;
+
+# Test the query against myisam to verify
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', ' ', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, '"', 0x00));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '&', 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, '&', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '%', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
+SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 's', 't', 'o', 'r', 'a', 'g', 'e', '"','@', '4', 0x00) IN BOOLEAN MODE);
+
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/phrase.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/phrase.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/phrase.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/phrase.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,39 @@
+-- source include/have_innodb.inc
+
+#
+# BUG#20465273 - FULLTEXT SEARCH BEHAVIOUR WITH MYISAM VS. INNODB (WRONG RESULT WITH INNODB)
+#
+
+CREATE TABLE articles (
+	id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+	title VARCHAR(200),
+	body TEXT,
+	FULLTEXT (title,body)
+) ENGINE=InnoDB;
+
+INSERT INTO articles (title,body) VALUES
+	(NULL, 'mysql good database'),
+	(NULL, ' mysql good database'),
+	('', 'mysql good database'),
+	('', ' mysql good database'),
+	(' ', 'mysql good database'),
+	('mysql', 'good database'),
+	('mysql ', 'good database'),
+	('mysql', ' good database'),
+	('mysql good database', ''),
+	('mysql good database', NULL);
+	
+
+SET GLOBAL innodb_ft_aux_table="test/articles";
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+SET GLOBAL innodb_ft_aux_table=default;
+
+SELECT * FROM articles;
+
+SELECT * FROM articles WHERE MATCH(title, body)
+	AGAINST('"mysql good database"' IN BOOLEAN MODE);
+
+SELECT * FROM articles WHERE MATCH(title, body)
+	AGAINST('("mysql good database")' IN BOOLEAN MODE);
+
+DROP TABLE articles;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/subexpr.test percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/subexpr.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/innodb_fts/t/subexpr.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/innodb_fts/t/subexpr.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,58 @@
+--source include/have_innodb.inc
+
+--echo #
+--echo # Bug #20028323 INNODB FULLTEXT BOOLEAN SEARCH INCORRECTLY HANDLES
+--echo # PARENTHESES
+--echo #
+
+CREATE TABLE t1 (
+    f1 INT NOT NULL AUTO_INCREMENT,
+    f2 TEXT NOT NULL,
+    PRIMARY KEY (f1),
+    FULLTEXT (f2)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO t1 (f2) VALUES
+('Pumpkin soup with cheese bread'),
+('Yellow chicken curry'),
+('Fresh green vegetables with garlic');
+
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+pumpkin' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+cheese' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+(pumpkin cheese)' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2)
+  AGAINST('+pumpkin +(souffle)' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2)
+  AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2)
+  AGAINST('+pumpkin +(>souffle <tart)' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2)
+  AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
+
+INSERT INTO t1 (f2) VALUES
+('This row contains only souffle'),
+('This row contains only tart'),
+('This row contains only pumpkin'),
+('This row contains only cheese'),
+('This row contains pumpkin and souffle'),
+('This row contains pumpkin and tart'),
+('This row contains pumpkin and cheese'),
+('This row contains both souffle and tart'),
+('This row contains both souffle and cheese'),
+('This row contains both tart and cheese'),
+('This row contains all three souffle, pumpkin and  tart'),
+('This row contains all four cheese, souffle, pumpkin and  tart');
+
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+pumpkin' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+cheese' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+(pumpkin cheese)' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2)
+  AGAINST('+pumpkin +(souffle)' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2)
+  AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2)
+  AGAINST('+pumpkin +(>souffle <tart)' IN BOOLEAN MODE);
+SELECT * FROM t1 WHERE MATCH(f2)
+  AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
+
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/large_tests/r/alter_table.result percona-xtrabackup-2.3.7/mysql-test/suite/large_tests/r/alter_table.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/large_tests/r/alter_table.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/large_tests/r/alter_table.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 drop table if exists t1;
-create table `t1` (`c1` tinyint unsigned not null, key `c1` (`c1`)) 
+create table `t1` (`c1` tinyint unsigned not null, key `c1` (`c1`))
 engine=myisam default charset=utf8;
 alter table `t1` disable keys;
 insert into t1 values (1),(2),(3),(4);
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/large_tests/t/alter_table.test percona-xtrabackup-2.3.7/mysql-test/suite/large_tests/t/alter_table.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/large_tests/t/alter_table.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/large_tests/t/alter_table.test	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,12 @@
-# The test for bug#27029 requires about 8 hours and 20 minutes on my
-# fastest machine.  This test requires at least 60 GB of disk space.
+# Warning: The current test has problematic properties at runtime
+# - non debug build ~ 3h
+# - debug build     ~ 8h
+# - space consumption in minimum 60 GB on disk
+#
+#   Therefore we skip in case '--big-test' is not assigned.
 --source include/big_test.inc
+#   Hence we skip on debug builds.
+--source include/have_nodebug.inc
 
 #
 # Bug#27029 alter table ... enable keys crashes mysqld on large table
@@ -9,7 +15,7 @@
 drop table if exists t1;
 --enable_warnings
 
-create table `t1` (`c1` tinyint unsigned not null, key `c1` (`c1`)) 
+create table `t1` (`c1` tinyint unsigned not null, key `c1` (`c1`))
 engine=myisam default charset=utf8;
 alter table `t1` disable keys;
 insert into t1 values (1),(2),(3),(4);
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/include/bugs.inc percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/include/bugs.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/include/bugs.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/include/bugs.inc	2017-02-27 07:47:02.000000000 +0000
@@ -264,3 +264,74 @@
  (SELECT a FROM t1 WHERE a = 1 ORDER BY c);
 SELECT * FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#18791851 CRASH IN ST_SELECT_LEX::PRINT WITH OPTIMIZER_TRACE ON SUBQUERY
+--echo #
+
+CREATE TABLE t1 (
+  pk INT NOT NULL,
+  col_int_nokey INT,
+  col_int_key INT,
+  col_time_key time,
+  col_varchar_key VARCHAR(1),
+  col_varchar_nokey VARCHAR(1),
+  PRIMARY KEY (pk),
+  KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+
+CREATE TABLE t2 (
+  pk INT NOT NULL,
+  col_int_nokey INT,
+  col_int_key INT,
+  col_varchar_key VARCHAR(1),
+  col_varchar_nokey VARCHAR(1),
+  PRIMARY KEY (pk),
+  KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+
+CREATE TABLE t3 (
+  pk INT NOT NULL,
+  col_int_nokey INT,
+  col_int_key INT,
+  col_varchar_key VARCHAR(1),
+  col_varchar_nokey VARCHAR(1),
+  PRIMARY KEY (pk),
+  KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+
+CREATE TABLE t4 (
+  pk INT NOT NULL,
+  col_int_nokey INT,
+  col_int_key INT,
+  col_time_key time,
+  col_varchar_key VARCHAR(1),
+  col_varchar_nokey VARCHAR(1),
+  PRIMARY KEY (pk),
+  KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+
+SELECT alias1.col_int_nokey AS field1,
+       alias2.col_varchar_key AS field2,
+       alias1.col_time_key AS field3,
+       MIN( alias1.col_int_nokey ) AS field4
+FROM (
+       (
+         SELECT SQ1_alias1.*
+         FROM ( t1 AS SQ1_alias1, t2 AS SQ1_alias2 )
+       ) AS alias1,
+       t4 AS alias2
+     )
+WHERE
+  EXISTS (
+         SELECT DISTINCT  SQ2_alias2.col_varchar_nokey AS SQ2_field1
+         FROM t2 AS SQ2_alias1
+              INNER JOIN (t4 AS SQ2_alias2
+              INNER JOIN t3 AS SQ2_alias3
+              ON SQ2_alias3.pk = SQ2_alias2.pk)
+              ON SQ2_alias3.col_varchar_key = SQ2_alias2.col_varchar_nokey
+         )
+  AND alias1.col_int_key = alias2.pk
+HAVING  alias1.col_int_nokey  IN ( SELECT 2 FROM DUAL ) ;
+
+DROP TABLE t1,t2,t3,t4;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result	2017-02-27 07:47:02.000000000 +0000
@@ -2370,3 +2370,68 @@
   ] /* steps */
 }	0	0
 DROP TABLE t1;
+#
+# Bug#18791851 CRASH IN ST_SELECT_LEX::PRINT WITH OPTIMIZER_TRACE ON SUBQUERY
+#
+CREATE TABLE t1 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_time_key time,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t2 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t3 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t4 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_time_key time,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+SELECT alias1.col_int_nokey AS field1,
+alias2.col_varchar_key AS field2,
+alias1.col_time_key AS field3,
+MIN( alias1.col_int_nokey ) AS field4
+FROM (
+(
+SELECT SQ1_alias1.*
+FROM ( t1 AS SQ1_alias1, t2 AS SQ1_alias2 )
+) AS alias1,
+t4 AS alias2
+)
+WHERE
+EXISTS (
+SELECT DISTINCT  SQ2_alias2.col_varchar_nokey AS SQ2_field1
+FROM t2 AS SQ2_alias1
+INNER JOIN (t4 AS SQ2_alias2
+INNER JOIN t3 AS SQ2_alias3
+ON SQ2_alias3.pk = SQ2_alias2.pk)
+ON SQ2_alias3.col_varchar_key = SQ2_alias2.col_varchar_nokey
+)
+AND alias1.col_int_key = alias2.pk
+HAVING  alias1.col_int_nokey  IN ( SELECT 2 FROM DUAL ) ;
+field1	field2	field3	field4
+DROP TABLE t1,t2,t3,t4;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result	2017-02-27 07:47:02.000000000 +0000
@@ -1830,3 +1830,68 @@
   ] /* steps */
 }	0	0
 DROP TABLE t1;
+#
+# Bug#18791851 CRASH IN ST_SELECT_LEX::PRINT WITH OPTIMIZER_TRACE ON SUBQUERY
+#
+CREATE TABLE t1 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_time_key time,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t2 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t3 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t4 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_time_key time,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+SELECT alias1.col_int_nokey AS field1,
+alias2.col_varchar_key AS field2,
+alias1.col_time_key AS field3,
+MIN( alias1.col_int_nokey ) AS field4
+FROM (
+(
+SELECT SQ1_alias1.*
+FROM ( t1 AS SQ1_alias1, t2 AS SQ1_alias2 )
+) AS alias1,
+t4 AS alias2
+)
+WHERE
+EXISTS (
+SELECT DISTINCT  SQ2_alias2.col_varchar_nokey AS SQ2_field1
+FROM t2 AS SQ2_alias1
+INNER JOIN (t4 AS SQ2_alias2
+INNER JOIN t3 AS SQ2_alias3
+ON SQ2_alias3.pk = SQ2_alias2.pk)
+ON SQ2_alias3.col_varchar_key = SQ2_alias2.col_varchar_nokey
+)
+AND alias1.col_int_key = alias2.pk
+HAVING  alias1.col_int_nokey  IN ( SELECT 2 FROM DUAL ) ;
+field1	field2	field3	field4
+DROP TABLE t1,t2,t3,t4;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result	2017-02-27 07:47:02.000000000 +0000
@@ -2370,3 +2370,68 @@
   ] /* steps */
 }	0	0
 DROP TABLE t1;
+#
+# Bug#18791851 CRASH IN ST_SELECT_LEX::PRINT WITH OPTIMIZER_TRACE ON SUBQUERY
+#
+CREATE TABLE t1 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_time_key time,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t2 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t3 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t4 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_time_key time,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+SELECT alias1.col_int_nokey AS field1,
+alias2.col_varchar_key AS field2,
+alias1.col_time_key AS field3,
+MIN( alias1.col_int_nokey ) AS field4
+FROM (
+(
+SELECT SQ1_alias1.*
+FROM ( t1 AS SQ1_alias1, t2 AS SQ1_alias2 )
+) AS alias1,
+t4 AS alias2
+)
+WHERE
+EXISTS (
+SELECT DISTINCT  SQ2_alias2.col_varchar_nokey AS SQ2_field1
+FROM t2 AS SQ2_alias1
+INNER JOIN (t4 AS SQ2_alias2
+INNER JOIN t3 AS SQ2_alias3
+ON SQ2_alias3.pk = SQ2_alias2.pk)
+ON SQ2_alias3.col_varchar_key = SQ2_alias2.col_varchar_nokey
+)
+AND alias1.col_int_key = alias2.pk
+HAVING  alias1.col_int_nokey  IN ( SELECT 2 FROM DUAL ) ;
+field1	field2	field3	field4
+DROP TABLE t1,t2,t3,t4;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result	2017-02-27 07:47:02.000000000 +0000
@@ -1794,3 +1794,68 @@
   ] /* steps */
 }	0	0
 DROP TABLE t1;
+#
+# Bug#18791851 CRASH IN ST_SELECT_LEX::PRINT WITH OPTIMIZER_TRACE ON SUBQUERY
+#
+CREATE TABLE t1 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_time_key time,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t2 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t3 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+CREATE TABLE t4 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_int_key INT,
+col_time_key time,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key,col_int_key)
+);
+SELECT alias1.col_int_nokey AS field1,
+alias2.col_varchar_key AS field2,
+alias1.col_time_key AS field3,
+MIN( alias1.col_int_nokey ) AS field4
+FROM (
+(
+SELECT SQ1_alias1.*
+FROM ( t1 AS SQ1_alias1, t2 AS SQ1_alias2 )
+) AS alias1,
+t4 AS alias2
+)
+WHERE
+EXISTS (
+SELECT DISTINCT  SQ2_alias2.col_varchar_nokey AS SQ2_field1
+FROM t2 AS SQ2_alias1
+INNER JOIN (t4 AS SQ2_alias2
+INNER JOIN t3 AS SQ2_alias3
+ON SQ2_alias3.pk = SQ2_alias2.pk)
+ON SQ2_alias3.col_varchar_key = SQ2_alias2.col_varchar_nokey
+)
+AND alias1.col_int_key = alias2.pk
+HAVING  alias1.col_int_nokey  IN ( SELECT 2 FROM DUAL ) ;
+field1	field2	field3	field4
+DROP TABLE t1,t2,t3,t4;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/subquery_no_prot.result percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/subquery_no_prot.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/subquery_no_prot.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/subquery_no_prot.result	2017-02-27 07:47:02.000000000 +0000
@@ -1698,11 +1698,11 @@
             "creating_tmp_table": {
               "tmp_table_info": {
                 "table": "intermediate_tmp_table",
-                "row_length": 23,
+                "row_length": 13,
                 "key_length": 12,
                 "unique_constraint": false,
                 "location": "memory (heap)",
-                "row_limit_estimate": 45590
+                "row_limit_estimate": 80659
               } /* tmp_table_info */
             } /* creating_tmp_table */
           },
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/subquery_ps_prot.result percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/subquery_ps_prot.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/opt_trace/r/subquery_ps_prot.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/opt_trace/r/subquery_ps_prot.result	2017-02-27 07:47:02.000000000 +0000
@@ -1676,11 +1676,11 @@
             "creating_tmp_table": {
               "tmp_table_info": {
                 "table": "intermediate_tmp_table",
-                "row_length": 23,
+                "row_length": 13,
                 "key_length": 12,
                 "unique_constraint": false,
                 "location": "memory (heap)",
-                "row_limit_estimate": 45590
+                "row_limit_estimate": 80659
               } /* tmp_table_info */
             } /* creating_tmp_table */
           },
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/parts/r/partition_debug.result percona-xtrabackup-2.3.7/mysql-test/suite/parts/r/partition_debug.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/parts/r/partition_debug.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/parts/r/partition_debug.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,21 @@
 DROP TABLE IF EXISTS t1;
 #
+# Bug#13737949: CRASH IN HA_PARTITION::INDEX_INIT
+# Bug#18694052: SERVER CRASH IN HA_PARTITION::INIT_RECORD_PRIORITY_QUEUE
+#
+CREATE TABLE t1 (a INT, b VARCHAR(64), KEY(b,a))
+PARTITION BY HASH (a) PARTITIONS 3;
+INSERT INTO t1 VALUES (1, "1"), (2, "2"), (3, "3"), (4, "Four"), (5, "Five"),
+(6, "Six"), (7, "Seven"), (8, "Eight"), (9, "Nine");
+SET SESSION debug="+d,ha_partition_fail_index_init";
+SELECT * FROM t1 WHERE b = "Seven";
+ERROR HY000: Table has no partition for value 0
+SET SESSION debug="-d,ha_partition_fail_index_init";
+SELECT * FROM t1 WHERE b = "Seven";
+a	b
+7	Seven
+DROP TABLE t1;
+#
 # WL#4445: EXCHANGE PARTITION WITH TABLE
 # Verify ddl_log in case of crashing.
 call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/parts/t/partition_debug.test percona-xtrabackup-2.3.7/mysql-test/suite/parts/t/partition_debug.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/parts/t/partition_debug.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/parts/t/partition_debug.test	2017-02-27 07:47:02.000000000 +0000
@@ -12,6 +12,24 @@
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
+# Partitioning test that require debug features
+
+--echo #
+--echo # Bug#13737949: CRASH IN HA_PARTITION::INDEX_INIT
+--echo # Bug#18694052: SERVER CRASH IN HA_PARTITION::INIT_RECORD_PRIORITY_QUEUE
+--echo #
+CREATE TABLE t1 (a INT, b VARCHAR(64), KEY(b,a))
+  PARTITION BY HASH (a) PARTITIONS 3;
+  INSERT INTO t1 VALUES (1, "1"), (2, "2"), (3, "3"), (4, "Four"), (5, "Five"),
+  (6, "Six"), (7, "Seven"), (8, "Eight"), (9, "Nine");
+SET SESSION debug="+d,ha_partition_fail_index_init";
+--error ER_NO_PARTITION_FOR_GIVEN_VALUE
+SELECT * FROM t1 WHERE b = "Seven";
+SET SESSION debug="-d,ha_partition_fail_index_init";
+SELECT * FROM t1 WHERE b = "Seven";
+DROP TABLE t1;
+
+
 --let $DATADIR= `SELECT @@datadir;`
 
 --echo #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/include/sizing_auto.inc percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/include/sizing_auto.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/include/sizing_auto.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/include/sizing_auto.inc	2017-02-27 07:47:02.000000000 +0000
@@ -4,13 +4,21 @@
 show variables like "max_connections";
 # open_files_limit depends on OS configuration (ulimit -n)
 #show variables like "open_files_limit";
-show variables like "%performance_schema%";
+show variables where
+    `Variable_name` != "performance_schema_max_statement_classes" and
+    `Variable_name` like "performance_schema%";
 show status like "%performance_schema%";
 
 # Each test script should provide a different test.cnf file,
 # with different settings.
 # This output will show the sizes computed automatically.
 # Note that this output is very dependent on the platform.
+# The output of SHOW ENGINE PERFORMANCE_SCHEMA STATUS
+# is very dependent on the platform,
+# so it is not printed here to ensure stability of the .results files.
+# To troubleshoot the performance schema memory consumption at different
+# configuration settings, comment the following line.
+# Debug only:
 
-show engine performance_schema status;
+# show engine performance_schema status;
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/include/socket_event.inc percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/include/socket_event.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/include/socket_event.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/include/socket_event.inc	2017-02-27 07:47:02.000000000 +0000
@@ -126,7 +126,7 @@
       # Connect is visible.
       # We hope that sleep 1 is long enough so that PERFORMANCE_SCHEMA
       # can remove this row before we collect the after action state.
-      let $wait_timeou= 5;
+      let $wait_timeout= 5;
       let $wait_condition=
       SELECT COUNT(*) = 0
       $part;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/include/start_server_common.inc percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/include/start_server_common.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/include/start_server_common.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/include/start_server_common.inc	2017-02-27 07:47:02.000000000 +0000
@@ -68,7 +68,9 @@
 --enable_result_log
 
 # This has a stable output, printing the result:
-show variables like "performance_schema%";
+show variables where
+    `Variable_name` != "performance_schema_max_statement_classes" and
+    `Variable_name` like "performance_schema%";
 
 # This has an unrepeatable output, it does depends too much on
 # - the platform hardware (sizeof structures, padding)
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/include/table_aggregate_load.inc percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/include/table_aggregate_load.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/include/table_aggregate_load.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/include/table_aggregate_load.inc	2017-02-27 07:47:02.000000000 +0000
@@ -29,7 +29,9 @@
 truncate performance_schema.events_waits_history_long;
 
 # Check the configuration is ok
-show variables like "performance_schema%";
+show variables where
+    `Variable_name` != "performance_schema_max_statement_classes" and
+    `Variable_name` like "performance_schema%";
 show status like "performance_schema%";
 
 echo "================== Step 1 ==================";
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/digest_null_literal.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/digest_null_literal.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/digest_null_literal.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/digest_null_literal.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,27 @@
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+NULL
+NULL
+NULL
+NULL
+NULL	NULL
+NULL	NULL
+NULL	NULL	NULL	1	2	3	NULL	NULL
+NULL	NULL	NULL	1	2	3	NULL	NULL
+1 IS NULL
+0
+2 IS NOT NULL
+1
+1 IS NULL	2 IS NULL	3 IS NOT NULL	4 IS NOT NULL
+0	0	1	1
+SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
+FROM performance_schema.events_statements_summary_by_digest;
+SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR
+test	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1
+test	SELECT ? 	1
+test	SELECT ? FROM DUAL 	1
+test	SELECT ?, ... 	2
+test	SELECT ? IS NULL 	1
+test	SELECT ? IS NOT NULL 	1
+test	SELECT ? IS NULL , ? IS NULL , ? IS NOT NULL , ? IS NOT NULL 	1
+test	CREATE TABLE foo ( a INTEGER DEFAULT ? , b INTEGER NOT NULL DEFAULT ? , c INTEGER NOT NULL ) 	1
+test	DROP TABLE foo 	1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/ortho_iter.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/ortho_iter.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/ortho_iter.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/ortho_iter.result	2017-02-27 07:47:02.000000000 +0000
@@ -92,7 +92,9 @@
 signal sqlstate '01000' set message_text='Done', mysql_errno=12000;
 end
 $
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -116,7 +118,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
@@ -125,31 +126,6 @@
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 call check_instrument("wait/synch/mutex/");
 instr_name	is_wait	is_stage	is_statement
 wait/synch/mutex/	1	0	0
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/privilege_table_io.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/privilege_table_io.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/privilege_table_io.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/privilege_table_io.result	2017-02-27 07:47:02.000000000 +0000
@@ -22,7 +22,9 @@
 insert into test.marker set a = 1;
 insert into test.marker set a = 1;
 insert into test.marker set a = 1;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -46,7 +48,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_default.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_default.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_default.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_default.result	2017-02-27 07:47:02.000000000 +0000
@@ -7,7 +7,9 @@
 show variables like "max_connections";
 Variable_name	Value
 max_connections	151
-show variables like "%performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -31,7 +33,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	322
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	4000
 performance_schema_max_table_instances	12500
 performance_schema_max_thread_classes	50
@@ -65,160 +66,3 @@
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-show engine performance_schema status;
-Type	Name	Status
-performance_schema	events_waits_current.row_size	184
-performance_schema	events_waits_current.row_count	2412
-performance_schema	events_waits_history.row_size	184
-performance_schema	events_waits_history.row_count	4020
-performance_schema	events_waits_history.memory	739680
-performance_schema	events_waits_history_long.row_size	184
-performance_schema	events_waits_history_long.row_count	10000
-performance_schema	events_waits_history_long.memory	1840000
-performance_schema	(pfs_mutex_class).row_size	256
-performance_schema	(pfs_mutex_class).row_count	200
-performance_schema	(pfs_mutex_class).memory	51200
-performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	40
-performance_schema	(pfs_rwlock_class).memory	12800
-performance_schema	(pfs_cond_class).row_size	256
-performance_schema	(pfs_cond_class).row_count	80
-performance_schema	(pfs_cond_class).memory	20480
-performance_schema	(pfs_thread_class).row_size	192
-performance_schema	(pfs_thread_class).row_count	50
-performance_schema	(pfs_thread_class).memory	9600
-performance_schema	(pfs_file_class).row_size	320
-performance_schema	(pfs_file_class).row_count	50
-performance_schema	(pfs_file_class).memory	16000
-performance_schema	mutex_instances.row_size	128
-performance_schema	mutex_instances.row_count	15906
-performance_schema	mutex_instances.memory	2035968
-performance_schema	rwlock_instances.row_size	192
-performance_schema	rwlock_instances.row_count	9102
-performance_schema	rwlock_instances.memory	1747584
-performance_schema	cond_instances.row_size	128
-performance_schema	cond_instances.row_count	3504
-performance_schema	cond_instances.memory	448512
-performance_schema	threads.row_size	2816
-performance_schema	threads.row_count	402
-performance_schema	threads.memory	1132032
-performance_schema	file_instances.row_size	704
-performance_schema	file_instances.row_count	7693
-performance_schema	file_instances.memory	5415872
-performance_schema	(pfs_file_handle).row_size	8
-performance_schema	(pfs_file_handle).row_count	32768
-performance_schema	(pfs_file_handle).memory	262144
-performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	153966
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	4926912
-performance_schema	(pfs_table_share).row_size	22208
-performance_schema	(pfs_table_share).row_count	12500
-performance_schema	(pfs_table_share).memory	277600000
-performance_schema	(pfs_table).row_size	9280
-performance_schema	(pfs_table).row_count	4000
-performance_schema	(pfs_table).memory	37120000
-performance_schema	setup_actors.row_size	256
-performance_schema	setup_actors.row_count	100
-performance_schema	setup_actors.memory	25600
-performance_schema	setup_objects.row_size	448
-performance_schema	setup_objects.row_count	100
-performance_schema	setup_objects.memory	44800
-performance_schema	(pfs_account).row_size	256
-performance_schema	(pfs_account).row_count	100
-performance_schema	(pfs_account).memory	25600
-performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_account_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_user_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_host_by_event_name.memory	1225600
-performance_schema	(pfs_user).row_size	128
-performance_schema	(pfs_user).row_count	100
-performance_schema	(pfs_user).memory	12800
-performance_schema	(pfs_host).row_size	128
-performance_schema	(pfs_host).row_count	100
-performance_schema	(pfs_host).memory	12800
-performance_schema	(pfs_stage_class).row_size	256
-performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	38400
-performance_schema	events_stages_history.row_size	88
-performance_schema	events_stages_history.row_count	4020
-performance_schema	events_stages_history.memory	353760
-performance_schema	events_stages_history_long.row_size	88
-performance_schema	events_stages_history_long.row_count	10000
-performance_schema	events_stages_history_long.memory	880000
-performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_thread_by_event_name.row_count	60300
-performance_schema	events_stages_summary_by_thread_by_event_name.memory	1929600
-performance_schema	events_stages_summary_global_by_event_name.row_size	32
-performance_schema	events_stages_summary_global_by_event_name.row_count	150
-performance_schema	events_stages_summary_global_by_event_name.memory	4800
-performance_schema	events_stages_summary_by_account_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_account_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_account_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_user_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_user_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_user_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_host_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_host_by_event_name.memory	480000
-performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	168
-performance_schema	(pfs_statement_class).memory	32256
-performance_schema	events_statements_history.row_size	3024
-performance_schema	events_statements_history.row_count	4020
-performance_schema	events_statements_history.memory	12156480
-performance_schema	events_statements_history_long.row_size	3024
-performance_schema	events_statements_history_long.row_count	10000
-performance_schema	events_statements_history_long.memory	30240000
-performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	67536
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	12426624
-performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	168
-performance_schema	events_statements_summary_global_by_event_name.memory	30912
-performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_account_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_user_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_host_by_event_name.memory	3091200
-performance_schema	events_statements_current.row_size	3024
-performance_schema	events_statements_current.row_count	402
-performance_schema	events_statements_current.memory	1215648
-performance_schema	(pfs_socket_class).row_size	320
-performance_schema	(pfs_socket_class).row_count	10
-performance_schema	(pfs_socket_class).memory	3200
-performance_schema	socket_instances.row_size	320
-performance_schema	socket_instances.row_count	322
-performance_schema	socket_instances.memory	103040
-performance_schema	events_statements_summary_by_digest.row_size	1472
-performance_schema	events_statements_summary_by_digest.row_count	10000
-performance_schema	events_statements_summary_by_digest.memory	14720000
-performance_schema	session_connect_attrs.row_size	402
-performance_schema	session_connect_attrs.row_count	512
-performance_schema	session_connect_attrs.memory	205824
-performance_schema	(account_hash).count	2
-performance_schema	(account_hash).size	100
-performance_schema	(digest_hash).count	0
-performance_schema	(digest_hash).size	10000
-performance_schema	(filename_hash).count	0
-performance_schema	(filename_hash).size	7693
-performance_schema	(host_hash).count	2
-performance_schema	(host_hash).size	100
-performance_schema	(setup_actor_hash).count	1
-performance_schema	(setup_actor_hash).size	100
-performance_schema	(setup_object_hash).count	4
-performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	80
-performance_schema	(table_share_hash).size	12500
-performance_schema	(user_hash).count	2
-performance_schema	(user_hash).size	100
-performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	422231328
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_high.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_high.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_high.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_high.result	2017-02-27 07:47:02.000000000 +0000
@@ -7,7 +7,9 @@
 show variables like "max_connections";
 Variable_name	Value
 max_connections	200
-show variables like "%performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -31,7 +33,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	420
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	800
 performance_schema_max_table_instances	12500
 performance_schema_max_thread_classes	50
@@ -65,160 +66,3 @@
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-show engine performance_schema status;
-Type	Name	Status
-performance_schema	events_waits_current.row_size	184
-performance_schema	events_waits_current.row_count	3000
-performance_schema	events_waits_history.row_size	184
-performance_schema	events_waits_history.row_count	5000
-performance_schema	events_waits_history.memory	920000
-performance_schema	events_waits_history_long.row_size	184
-performance_schema	events_waits_history_long.row_count	10000
-performance_schema	events_waits_history_long.memory	1840000
-performance_schema	(pfs_mutex_class).row_size	256
-performance_schema	(pfs_mutex_class).row_count	200
-performance_schema	(pfs_mutex_class).memory	51200
-performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	40
-performance_schema	(pfs_rwlock_class).memory	12800
-performance_schema	(pfs_cond_class).row_size	256
-performance_schema	(pfs_cond_class).row_count	80
-performance_schema	(pfs_cond_class).memory	20480
-performance_schema	(pfs_thread_class).row_size	192
-performance_schema	(pfs_thread_class).row_count	50
-performance_schema	(pfs_thread_class).memory	9600
-performance_schema	(pfs_file_class).row_size	320
-performance_schema	(pfs_file_class).row_count	50
-performance_schema	(pfs_file_class).memory	16000
-performance_schema	mutex_instances.row_size	128
-performance_schema	mutex_instances.row_count	52200
-performance_schema	mutex_instances.memory	6681600
-performance_schema	rwlock_instances.row_size	192
-performance_schema	rwlock_instances.row_count	30800
-performance_schema	rwlock_instances.memory	5913600
-performance_schema	cond_instances.row_size	128
-performance_schema	cond_instances.row_count	10900
-performance_schema	cond_instances.memory	1395200
-performance_schema	threads.row_size	2816
-performance_schema	threads.row_count	500
-performance_schema	threads.memory	1408000
-performance_schema	file_instances.row_size	704
-performance_schema	file_instances.row_count	23385
-performance_schema	file_instances.memory	16463040
-performance_schema	(pfs_file_handle).row_size	8
-performance_schema	(pfs_file_handle).row_count	32768
-performance_schema	(pfs_file_handle).memory	262144
-performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	191500
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	6128000
-performance_schema	(pfs_table_share).row_size	22208
-performance_schema	(pfs_table_share).row_count	12500
-performance_schema	(pfs_table_share).memory	277600000
-performance_schema	(pfs_table).row_size	9280
-performance_schema	(pfs_table).row_count	800
-performance_schema	(pfs_table).memory	7424000
-performance_schema	setup_actors.row_size	256
-performance_schema	setup_actors.row_count	100
-performance_schema	setup_actors.memory	25600
-performance_schema	setup_objects.row_size	448
-performance_schema	setup_objects.row_count	100
-performance_schema	setup_objects.memory	44800
-performance_schema	(pfs_account).row_size	256
-performance_schema	(pfs_account).row_count	100
-performance_schema	(pfs_account).memory	25600
-performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_account_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_user_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_host_by_event_name.memory	1225600
-performance_schema	(pfs_user).row_size	128
-performance_schema	(pfs_user).row_count	100
-performance_schema	(pfs_user).memory	12800
-performance_schema	(pfs_host).row_size	128
-performance_schema	(pfs_host).row_count	100
-performance_schema	(pfs_host).memory	12800
-performance_schema	(pfs_stage_class).row_size	256
-performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	38400
-performance_schema	events_stages_history.row_size	88
-performance_schema	events_stages_history.row_count	5000
-performance_schema	events_stages_history.memory	440000
-performance_schema	events_stages_history_long.row_size	88
-performance_schema	events_stages_history_long.row_count	10000
-performance_schema	events_stages_history_long.memory	880000
-performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_thread_by_event_name.row_count	75000
-performance_schema	events_stages_summary_by_thread_by_event_name.memory	2400000
-performance_schema	events_stages_summary_global_by_event_name.row_size	32
-performance_schema	events_stages_summary_global_by_event_name.row_count	150
-performance_schema	events_stages_summary_global_by_event_name.memory	4800
-performance_schema	events_stages_summary_by_account_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_account_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_account_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_user_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_user_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_user_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_host_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_host_by_event_name.memory	480000
-performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	168
-performance_schema	(pfs_statement_class).memory	32256
-performance_schema	events_statements_history.row_size	3024
-performance_schema	events_statements_history.row_count	5000
-performance_schema	events_statements_history.memory	15120000
-performance_schema	events_statements_history_long.row_size	3024
-performance_schema	events_statements_history_long.row_count	10000
-performance_schema	events_statements_history_long.memory	30240000
-performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	84000
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	15456000
-performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	168
-performance_schema	events_statements_summary_global_by_event_name.memory	30912
-performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_account_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_user_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_host_by_event_name.memory	3091200
-performance_schema	events_statements_current.row_size	3024
-performance_schema	events_statements_current.row_count	500
-performance_schema	events_statements_current.memory	1512000
-performance_schema	(pfs_socket_class).row_size	320
-performance_schema	(pfs_socket_class).row_count	10
-performance_schema	(pfs_socket_class).memory	3200
-performance_schema	socket_instances.row_size	320
-performance_schema	socket_instances.row_count	420
-performance_schema	socket_instances.memory	134400
-performance_schema	events_statements_summary_by_digest.row_size	1472
-performance_schema	events_statements_summary_by_digest.row_count	10000
-performance_schema	events_statements_summary_by_digest.memory	14720000
-performance_schema	session_connect_attrs.row_size	500
-performance_schema	session_connect_attrs.row_count	512
-performance_schema	session_connect_attrs.memory	256000
-performance_schema	(account_hash).count	2
-performance_schema	(account_hash).size	100
-performance_schema	(digest_hash).count	0
-performance_schema	(digest_hash).size	10000
-performance_schema	(filename_hash).count	0
-performance_schema	(filename_hash).size	23385
-performance_schema	(host_hash).count	2
-performance_schema	(host_hash).size	100
-performance_schema	(setup_actor_hash).count	1
-performance_schema	(setup_actor_hash).size	100
-performance_schema	(setup_object_hash).count	4
-performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	80
-performance_schema	(table_share_hash).size	12500
-performance_schema	(user_hash).count	2
-performance_schema	(user_hash).size	100
-performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	421925632
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_low.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_low.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_low.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_low.result	2017-02-27 07:47:02.000000000 +0000
@@ -7,7 +7,9 @@
 show variables like "max_connections";
 Variable_name	Value
 max_connections	50
-show variables like "%performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	10
@@ -31,7 +33,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	67
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	112
 performance_schema_max_table_instances	445
 performance_schema_max_thread_classes	50
@@ -65,160 +66,3 @@
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-show engine performance_schema status;
-Type	Name	Status
-performance_schema	events_waits_current.row_size	184
-performance_schema	events_waits_current.row_count	672
-performance_schema	events_waits_history.row_size	184
-performance_schema	events_waits_history.row_count	560
-performance_schema	events_waits_history.memory	103040
-performance_schema	events_waits_history_long.row_size	184
-performance_schema	events_waits_history_long.row_count	100
-performance_schema	events_waits_history_long.memory	18400
-performance_schema	(pfs_mutex_class).row_size	256
-performance_schema	(pfs_mutex_class).row_count	200
-performance_schema	(pfs_mutex_class).memory	51200
-performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	40
-performance_schema	(pfs_rwlock_class).memory	12800
-performance_schema	(pfs_cond_class).row_size	256
-performance_schema	(pfs_cond_class).row_count	80
-performance_schema	(pfs_cond_class).memory	20480
-performance_schema	(pfs_thread_class).row_size	192
-performance_schema	(pfs_thread_class).row_count	50
-performance_schema	(pfs_thread_class).memory	9600
-performance_schema	(pfs_file_class).row_size	320
-performance_schema	(pfs_file_class).row_count	50
-performance_schema	(pfs_file_class).memory	16000
-performance_schema	mutex_instances.row_size	128
-performance_schema	mutex_instances.row_count	2945
-performance_schema	mutex_instances.memory	376960
-performance_schema	rwlock_instances.row_size	192
-performance_schema	rwlock_instances.row_count	1612
-performance_schema	rwlock_instances.memory	309504
-performance_schema	cond_instances.row_size	128
-performance_schema	cond_instances.row_count	612
-performance_schema	cond_instances.memory	78336
-performance_schema	threads.row_size	2816
-performance_schema	threads.row_count	112
-performance_schema	threads.memory	315392
-performance_schema	file_instances.row_size	704
-performance_schema	file_instances.row_count	1556
-performance_schema	file_instances.memory	1095424
-performance_schema	(pfs_file_handle).row_size	8
-performance_schema	(pfs_file_handle).row_count	32768
-performance_schema	(pfs_file_handle).memory	262144
-performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	42896
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	1372672
-performance_schema	(pfs_table_share).row_size	22208
-performance_schema	(pfs_table_share).row_count	445
-performance_schema	(pfs_table_share).memory	9882560
-performance_schema	(pfs_table).row_size	9280
-performance_schema	(pfs_table).row_count	112
-performance_schema	(pfs_table).memory	1039360
-performance_schema	setup_actors.row_size	256
-performance_schema	setup_actors.row_count	100
-performance_schema	setup_actors.memory	25600
-performance_schema	setup_objects.row_size	448
-performance_schema	setup_objects.row_count	100
-performance_schema	setup_objects.memory	44800
-performance_schema	(pfs_account).row_size	256
-performance_schema	(pfs_account).row_count	10
-performance_schema	(pfs_account).memory	2560
-performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	3830
-performance_schema	events_waits_summary_by_account_by_event_name.memory	122560
-performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	1915
-performance_schema	events_waits_summary_by_user_by_event_name.memory	61280
-performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	7660
-performance_schema	events_waits_summary_by_host_by_event_name.memory	245120
-performance_schema	(pfs_user).row_size	128
-performance_schema	(pfs_user).row_count	5
-performance_schema	(pfs_user).memory	640
-performance_schema	(pfs_host).row_size	128
-performance_schema	(pfs_host).row_count	20
-performance_schema	(pfs_host).memory	2560
-performance_schema	(pfs_stage_class).row_size	256
-performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	38400
-performance_schema	events_stages_history.row_size	88
-performance_schema	events_stages_history.row_count	560
-performance_schema	events_stages_history.memory	49280
-performance_schema	events_stages_history_long.row_size	88
-performance_schema	events_stages_history_long.row_count	100
-performance_schema	events_stages_history_long.memory	8800
-performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_thread_by_event_name.row_count	16800
-performance_schema	events_stages_summary_by_thread_by_event_name.memory	537600
-performance_schema	events_stages_summary_global_by_event_name.row_size	32
-performance_schema	events_stages_summary_global_by_event_name.row_count	150
-performance_schema	events_stages_summary_global_by_event_name.memory	4800
-performance_schema	events_stages_summary_by_account_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_account_by_event_name.row_count	1500
-performance_schema	events_stages_summary_by_account_by_event_name.memory	48000
-performance_schema	events_stages_summary_by_user_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_user_by_event_name.row_count	750
-performance_schema	events_stages_summary_by_user_by_event_name.memory	24000
-performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_host_by_event_name.row_count	3000
-performance_schema	events_stages_summary_by_host_by_event_name.memory	96000
-performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	168
-performance_schema	(pfs_statement_class).memory	32256
-performance_schema	events_statements_history.row_size	3024
-performance_schema	events_statements_history.row_count	560
-performance_schema	events_statements_history.memory	1693440
-performance_schema	events_statements_history_long.row_size	3024
-performance_schema	events_statements_history_long.row_count	100
-performance_schema	events_statements_history_long.memory	302400
-performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	18816
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	3462144
-performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	168
-performance_schema	events_statements_summary_global_by_event_name.memory	30912
-performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	1680
-performance_schema	events_statements_summary_by_account_by_event_name.memory	309120
-performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	840
-performance_schema	events_statements_summary_by_user_by_event_name.memory	154560
-performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	3360
-performance_schema	events_statements_summary_by_host_by_event_name.memory	618240
-performance_schema	events_statements_current.row_size	3024
-performance_schema	events_statements_current.row_count	112
-performance_schema	events_statements_current.memory	338688
-performance_schema	(pfs_socket_class).row_size	320
-performance_schema	(pfs_socket_class).row_count	10
-performance_schema	(pfs_socket_class).memory	3200
-performance_schema	socket_instances.row_size	320
-performance_schema	socket_instances.row_count	67
-performance_schema	socket_instances.memory	21440
-performance_schema	events_statements_summary_by_digest.row_size	1472
-performance_schema	events_statements_summary_by_digest.row_count	1000
-performance_schema	events_statements_summary_by_digest.memory	1472000
-performance_schema	session_connect_attrs.row_size	112
-performance_schema	session_connect_attrs.row_count	512
-performance_schema	session_connect_attrs.memory	57344
-performance_schema	(account_hash).count	2
-performance_schema	(account_hash).size	10
-performance_schema	(digest_hash).count	0
-performance_schema	(digest_hash).size	1000
-performance_schema	(filename_hash).count	0
-performance_schema	(filename_hash).size	1556
-performance_schema	(host_hash).count	2
-performance_schema	(host_hash).size	20
-performance_schema	(setup_actor_hash).count	1
-performance_schema	(setup_actor_hash).size	100
-performance_schema	(setup_object_hash).count	4
-performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	80
-performance_schema	(table_share_hash).size	445
-performance_schema	(user_hash).count	2
-performance_schema	(user_hash).size	5
-performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	24771616
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_med.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_med.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_med.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_med.result	2017-02-27 07:47:02.000000000 +0000
@@ -7,7 +7,9 @@
 show variables like "max_connections";
 Variable_name	Value
 max_connections	152
-show variables like "%performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -31,7 +33,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	232
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	573
 performance_schema_max_table_instances	556
 performance_schema_max_thread_classes	50
@@ -65,160 +66,3 @@
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-show engine performance_schema status;
-Type	Name	Status
-performance_schema	events_waits_current.row_size	184
-performance_schema	events_waits_current.row_count	1734
-performance_schema	events_waits_history.row_size	184
-performance_schema	events_waits_history.row_count	2890
-performance_schema	events_waits_history.memory	531760
-performance_schema	events_waits_history_long.row_size	184
-performance_schema	events_waits_history_long.row_count	1000
-performance_schema	events_waits_history_long.memory	184000
-performance_schema	(pfs_mutex_class).row_size	256
-performance_schema	(pfs_mutex_class).row_count	200
-performance_schema	(pfs_mutex_class).memory	51200
-performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	40
-performance_schema	(pfs_rwlock_class).memory	12800
-performance_schema	(pfs_cond_class).row_size	256
-performance_schema	(pfs_cond_class).row_count	80
-performance_schema	(pfs_cond_class).memory	20480
-performance_schema	(pfs_thread_class).row_size	192
-performance_schema	(pfs_thread_class).row_count	50
-performance_schema	(pfs_thread_class).memory	9600
-performance_schema	(pfs_file_class).row_size	320
-performance_schema	(pfs_file_class).row_count	50
-performance_schema	(pfs_file_class).memory	16000
-performance_schema	mutex_instances.row_size	128
-performance_schema	mutex_instances.row_count	4230
-performance_schema	mutex_instances.memory	541440
-performance_schema	rwlock_instances.row_size	192
-performance_schema	rwlock_instances.row_count	2222
-performance_schema	rwlock_instances.memory	426624
-performance_schema	cond_instances.row_size	128
-performance_schema	cond_instances.row_count	1079
-performance_schema	cond_instances.memory	138112
-performance_schema	threads.row_size	2816
-performance_schema	threads.row_count	289
-performance_schema	threads.memory	813824
-performance_schema	file_instances.row_size	704
-performance_schema	file_instances.row_count	1754
-performance_schema	file_instances.memory	1234816
-performance_schema	(pfs_file_handle).row_size	8
-performance_schema	(pfs_file_handle).row_count	32768
-performance_schema	(pfs_file_handle).memory	262144
-performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	110687
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	3541984
-performance_schema	(pfs_table_share).row_size	22208
-performance_schema	(pfs_table_share).row_count	556
-performance_schema	(pfs_table_share).memory	12347648
-performance_schema	(pfs_table).row_size	9280
-performance_schema	(pfs_table).row_count	573
-performance_schema	(pfs_table).memory	5317440
-performance_schema	setup_actors.row_size	256
-performance_schema	setup_actors.row_count	100
-performance_schema	setup_actors.memory	25600
-performance_schema	setup_objects.row_size	448
-performance_schema	setup_objects.row_count	100
-performance_schema	setup_objects.memory	44800
-performance_schema	(pfs_account).row_size	256
-performance_schema	(pfs_account).row_count	100
-performance_schema	(pfs_account).memory	25600
-performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_account_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_user_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_host_by_event_name.memory	1225600
-performance_schema	(pfs_user).row_size	128
-performance_schema	(pfs_user).row_count	100
-performance_schema	(pfs_user).memory	12800
-performance_schema	(pfs_host).row_size	128
-performance_schema	(pfs_host).row_count	100
-performance_schema	(pfs_host).memory	12800
-performance_schema	(pfs_stage_class).row_size	256
-performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	38400
-performance_schema	events_stages_history.row_size	88
-performance_schema	events_stages_history.row_count	2890
-performance_schema	events_stages_history.memory	254320
-performance_schema	events_stages_history_long.row_size	88
-performance_schema	events_stages_history_long.row_count	1000
-performance_schema	events_stages_history_long.memory	88000
-performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_thread_by_event_name.row_count	43350
-performance_schema	events_stages_summary_by_thread_by_event_name.memory	1387200
-performance_schema	events_stages_summary_global_by_event_name.row_size	32
-performance_schema	events_stages_summary_global_by_event_name.row_count	150
-performance_schema	events_stages_summary_global_by_event_name.memory	4800
-performance_schema	events_stages_summary_by_account_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_account_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_account_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_user_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_user_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_user_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_host_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_host_by_event_name.memory	480000
-performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	168
-performance_schema	(pfs_statement_class).memory	32256
-performance_schema	events_statements_history.row_size	3024
-performance_schema	events_statements_history.row_count	2890
-performance_schema	events_statements_history.memory	8739360
-performance_schema	events_statements_history_long.row_size	3024
-performance_schema	events_statements_history_long.row_count	1000
-performance_schema	events_statements_history_long.memory	3024000
-performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	48552
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	8933568
-performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	168
-performance_schema	events_statements_summary_global_by_event_name.memory	30912
-performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_account_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_user_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_host_by_event_name.memory	3091200
-performance_schema	events_statements_current.row_size	3024
-performance_schema	events_statements_current.row_count	289
-performance_schema	events_statements_current.memory	873936
-performance_schema	(pfs_socket_class).row_size	320
-performance_schema	(pfs_socket_class).row_count	10
-performance_schema	(pfs_socket_class).memory	3200
-performance_schema	socket_instances.row_size	320
-performance_schema	socket_instances.row_count	232
-performance_schema	socket_instances.memory	74240
-performance_schema	events_statements_summary_by_digest.row_size	1472
-performance_schema	events_statements_summary_by_digest.row_count	5000
-performance_schema	events_statements_summary_by_digest.memory	7360000
-performance_schema	session_connect_attrs.row_size	289
-performance_schema	session_connect_attrs.row_count	512
-performance_schema	session_connect_attrs.memory	147968
-performance_schema	(account_hash).count	2
-performance_schema	(account_hash).size	100
-performance_schema	(digest_hash).count	0
-performance_schema	(digest_hash).size	5000
-performance_schema	(filename_hash).count	0
-performance_schema	(filename_hash).size	1754
-performance_schema	(host_hash).count	2
-performance_schema	(host_hash).size	100
-performance_schema	(setup_actor_hash).count	1
-performance_schema	(setup_actor_hash).size	100
-performance_schema	(setup_object_hash).count	4
-performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	80
-performance_schema	(table_share_hash).size	556
-performance_schema	(user_hash).count	2
-performance_schema	(user_hash).size	100
-performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	70954032
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_off.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_off.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/sizing_off.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/sizing_off.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,6 @@
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	OFF
 performance_schema_accounts_size	-1
@@ -22,7 +24,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	-1
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	-1
 performance_schema_max_table_instances	-1
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_disable_idle.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_disable_idle.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_disable_idle.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_disable_idle.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_disable_stages.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_disable_stages.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_disable_stages.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_disable_stages.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_disable_statements.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_disable_statements.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_disable_statements.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_disable_statements.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_disable_waits.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_disable_waits.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_disable_waits.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_disable_waits.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_innodb.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_innodb.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_innodb.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_innodb.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_low_digest.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_low_digest.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_low_digest.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_low_digest.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,12 @@
+USE performance_schema;
+truncate table events_statements_history_long;
+SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1;
+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
+74
+####################################
+# QUERYING PS STATEMENT DIGEST
+####################################
+SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
+event_name	digest	digest_text	sql_text
+statement/sql/truncate	23e0e19c4baa66c6be30e70f75e52178	TRUNCATE TABLE 	truncate table events_statements_history_long
+statement/sql/select	6695eca04b8387c092d89fa88d767328	SELECT ? + ? + 	SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_account.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_account.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_account.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_account.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	0
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_cond_class.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_file_class.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_file_class.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_file_inst.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_host.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_host.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_host.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_host.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_socket_class.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_socket_class.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_socket_class.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	0
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	0
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_stage_class.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_stage_class.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_stage_class.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	0
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_stages_history.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_stages_history.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_stages_history.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_statement_class.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_statement_class.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_statement_class.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	0
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_statements_history.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_statements_history.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_statements_history.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_table_inst.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_table_inst.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_table_inst.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_nothing.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_nothing.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_nothing.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_nothing.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	0
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	0
 performance_schema_max_socket_instances	0
 performance_schema_max_stage_classes	0
-performance_schema_max_statement_classes	0
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	0
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_thread_class.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_thread_class.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_thread_class.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	0
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_user.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_user.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_user.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_user.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_waits_history.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_no_waits_history.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_no_waits_history.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_off.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_off.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_off.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_off.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	OFF
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_on.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_on.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/start_server_on.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/start_server_on.result	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,9 @@
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/statement_digest_consumers.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/statement_digest_consumers.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/statement_digest_consumers.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/statement_digest_consumers.result	2017-02-27 07:47:02.000000000 +0000
@@ -131,7 +131,7 @@
 statements_digest	6ff375c6f4b283de91711a78bd91b953	SELECT ?, ... FROM t1 	2
 statements_digest	4879fbad051c94ff76e6ad29effa4903	SELECT ? FROM t2 	1
 statements_digest	b1ea4bca7c91ebd647b6b81e80a2ef94	SELECT ?, ... FROM t2 	2
-statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	1
+statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	2
 statements_digest	ff2d8aa1fd516f5e25b0faf7b1c80b04	INSERT INTO t2 VALUES (?) 	1
 statements_digest	430116339c3a5bf0a1aa9a96e9cfd354	INSERT INTO t3 VALUES (...) 	4
 statements_digest	01467137a1045e85119538ea248d52dd	INSERT INTO t4 VALUES (...) 	1
@@ -139,7 +139,6 @@
 statements_digest	b1a5f24770580f243ad6704590165d90	INSERT INTO t1 VALUES (?) /* , ... */ 	2
 statements_digest	bbbf619ec8ca4ec4a4da28a71eb12a2f	INSERT INTO t3 VALUES (...) /* , ... */ 	1
 statements_digest	de7bdb298875f4ef826383e3fce53ef9	INSERT INTO t5 VALUES (...) /* , ... */ 	1
-statements_digest	f79cdc2ddca01e9ea89782b3548b01e3	INSERT INTO t1 VALUES ( NULL ) 	1
 statements_digest	cd4a3e419e2eaed79f66a705ff002910	INSERT INTO t6 VALUES (...) 	5
 statements_digest	f2d57cea9e78e7b37c4509c0564dd1cc	SELECT ? + ? 	3
 statements_digest	02396199eed2345830efcf00e51107ee	SELECT ? 	1
@@ -159,7 +158,7 @@
 statements_digest	8eaf9e776b79f24f2b8fae8efb92d8a4	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1
 statements_digest	b364c71d8c904eb9e95df4d0ca258c00	SELECT func (...) 	2
 statements_digest	88e7ac9784e4561d12fadccde6ea704a	DROP FUNCTION func 	1
-statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 	1
+statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 	1
 statements_digest	074e38814943a6dce874784d21fea89d	INSERT INTO t12 VALUES (?) 	2
 statements_digest	2b5b02ba54b27638d5d8dbe917ff432d	DROP TRIGGER trg 	1
 SELECT digest, digest_text FROM performance_schema.events_statements_current;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/statement_digest_long_query.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/statement_digest_long_query.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/statement_digest_long_query.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/statement_digest_long_query.result	2017-02-27 07:47:02.000000000 +0000
@@ -9,4 +9,4 @@
 SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest;
 schema_name	digest	digest_text	count_star
 performance_schema	e8d937c7ecf79e105de0f9e364fa5edb	TRUNCATE TABLE events_statements_summary_by_digest 	1
-performance_schema	5d9a2f95653d8ca9d9cea3eefff7e361	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ...	1
+performance_schema	5d9a2f95653d8ca9d9cea3eefff7e361	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 	1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/statement_digest.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/statement_digest.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/statement_digest.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/statement_digest.result	2017-02-27 07:47:02.000000000 +0000
@@ -118,7 +118,7 @@
 statements_digest	6ff375c6f4b283de91711a78bd91b953	SELECT ?, ... FROM t1 	2	0	0	0
 statements_digest	4879fbad051c94ff76e6ad29effa4903	SELECT ? FROM t2 	1	0	0	0
 statements_digest	b1ea4bca7c91ebd647b6b81e80a2ef94	SELECT ?, ... FROM t2 	2	0	0	0
-statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	1	1	0	0
+statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	2	2	0	0
 statements_digest	ff2d8aa1fd516f5e25b0faf7b1c80b04	INSERT INTO t2 VALUES (?) 	1	1	0	0
 statements_digest	430116339c3a5bf0a1aa9a96e9cfd354	INSERT INTO t3 VALUES (...) 	4	4	0	0
 statements_digest	01467137a1045e85119538ea248d52dd	INSERT INTO t4 VALUES (...) 	1	1	0	0
@@ -126,7 +126,6 @@
 statements_digest	b1a5f24770580f243ad6704590165d90	INSERT INTO t1 VALUES (?) /* , ... */ 	2	7	0	0
 statements_digest	bbbf619ec8ca4ec4a4da28a71eb12a2f	INSERT INTO t3 VALUES (...) /* , ... */ 	1	3	0	0
 statements_digest	de7bdb298875f4ef826383e3fce53ef9	INSERT INTO t5 VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	f79cdc2ddca01e9ea89782b3548b01e3	INSERT INTO t1 VALUES ( NULL ) 	1	1	0	0
 statements_digest	cd4a3e419e2eaed79f66a705ff002910	INSERT INTO t6 VALUES (...) 	5	5	0	0
 statements_digest	f2d57cea9e78e7b37c4509c0564dd1cc	SELECT ? + ? 	3	0	0	0
 statements_digest	02396199eed2345830efcf00e51107ee	SELECT ? 	1	0	0	0
@@ -146,7 +145,7 @@
 statements_digest	8eaf9e776b79f24f2b8fae8efb92d8a4	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1	0	0	0
 statements_digest	b364c71d8c904eb9e95df4d0ca258c00	SELECT func (...) 	2	0	0	0
 statements_digest	88e7ac9784e4561d12fadccde6ea704a	DROP FUNCTION func 	1	0	0	0
-statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 	1	0	0	0
+statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 	1	0	0	0
 statements_digest	074e38814943a6dce874784d21fea89d	INSERT INTO t12 VALUES (?) 	2	2	0	0
 statements_digest	2b5b02ba54b27638d5d8dbe917ff432d	DROP TRIGGER trg 	1	0	0	0
 ####################################
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -39,7 +39,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,7 +38,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -39,7 +39,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,7 +38,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -37,7 +37,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -61,7 +63,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -36,7 +36,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -60,7 +62,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -37,7 +37,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -61,7 +63,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -36,7 +36,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -60,7 +62,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_off.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_off.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_off.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_off.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,7 +38,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -39,7 +39,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,7 +38,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -39,7 +39,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,7 +38,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -41,7 +41,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -40,7 +40,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -41,7 +41,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -40,7 +40,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -39,7 +39,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,7 +38,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -39,7 +39,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,7 +38,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -41,7 +41,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -40,7 +40,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -41,7 +41,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -40,7 +40,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -41,7 +41,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -40,7 +40,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -41,7 +41,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -40,7 +40,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -39,7 +39,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,7 +38,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -39,7 +39,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,7 +38,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -41,7 +41,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -40,7 +40,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2017-02-27 07:47:02.000000000 +0000
@@ -41,7 +41,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2017-02-27 07:47:02.000000000 +0000
@@ -40,7 +40,9 @@
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/unary_digest.result percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/unary_digest.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/r/unary_digest.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/r/unary_digest.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,47 @@
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+ERROR 42S02: Table 'test.expect_unary' doesn't exist
+ERROR 42S02: Table 'test.expect_unary' doesn't exist
+ERROR 42S02: Table 'test.expect_unary' doesn't exist
+ERROR 42S02: Table 'test.expect_unary' doesn't exist
+ERROR 42S02: Table 'test.expect_unary' doesn't exist
+ERROR 42S02: Table 'test.expect_binary' doesn't exist
+ERROR 42S02: Table 'test.expect_binary' doesn't exist
+ERROR 42S02: Table 'test.expect_binary' doesn't exist
+ERROR 42S02: Table 'test.expect_binary' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
+ERROR 42S02: Table 'test.expect_unchanged' doesn't exist
+SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
+FROM performance_schema.events_statements_summary_by_digest;
+SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR
+test	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1
+test	SELECT ? FROM expect_unary 	5
+test	SELECT ? + ? FROM expect_binary 	2
+test	SELECT ? - ? FROM expect_binary 	2
+test	INSERT INTO expect_full_reduce VALUES (...) 	27
+test	SELECT a - b , a + b , - a , - b , + a , + b FROM expect_unchanged 	1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/digest_null_literal.test percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/digest_null_literal.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/digest_null_literal.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/digest_null_literal.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,32 @@
+# ----------------------------------------------------
+# Tests for the performance schema statement Digests.
+# ----------------------------------------------------
+
+# Test case to show behavior of statements digest when
+# parsing a NULL literal
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source ../include/no_protocol.inc
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+
+--disable_query_log
+
+select NULL;
+select NULL FROM DUAL;
+select NULL, NULL;
+select NULL, NULL, NULL, 1, 2, 3, NULL, NULL;
+
+select 1 IS NULL;
+select 2 IS NOT NULL;
+select 1 IS NULL, 2 IS NULL, 3 IS NOT NULL, 4 IS NOT NULL;
+
+create table foo (a int DEFAULT NULL, b int NOT NULL DEFAULT 1, c int NOT NULL);
+drop table foo;
+
+--enable_query_log
+
+SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
+  FROM performance_schema.events_statements_summary_by_digest;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/ortho_iter.test percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/ortho_iter.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/ortho_iter.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/ortho_iter.test	2017-02-27 07:47:02.000000000 +0000
@@ -122,8 +122,9 @@
 delimiter ;$
 
 # Check the configuration is ok
-show variables like "performance_schema%";
-show status like "performance_schema%";
+show variables where
+    `Variable_name` != "performance_schema_max_statement_classes" and
+    `Variable_name` like "performance_schema%";
 
 call check_instrument("wait/synch/mutex/");
 call check_instrument("wait/synch/rwlock/");
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/privilege_table_io.test percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/privilege_table_io.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/privilege_table_io.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/privilege_table_io.test	2017-02-27 07:47:02.000000000 +0000
@@ -36,7 +36,9 @@
 # This will not, the ACL cache is already loaded
 insert into test.marker set a = 1;
 insert into test.marker set a = 1;
-show variables like "performance_schema%";
+show variables where
+    `Variable_name` != "performance_schema_max_statement_classes" and
+    `Variable_name` like "performance_schema%";
 show status like "performance_schema%";
 # Stop recording events + pull results
 let $schema_to_dump= "test", "mysql";
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/sizing_off.test percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/sizing_off.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/sizing_off.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/sizing_off.test	2017-02-27 07:47:02.000000000 +0000
@@ -2,5 +2,7 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 
-show variables like "performance_schema%";
+show variables where
+    `Variable_name` != "performance_schema_max_statement_classes" and
+    `Variable_name` like "performance_schema%";
 show status like "performance_schema%";
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--max_digest_length=10
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/start_server_low_digest.test percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/start_server_low_digest.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/start_server_low_digest.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/start_server_low_digest.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# -----------------------------------------------------------------------
+# Tests for the performance schema statement Digests.
+# -----------------------------------------------------------------------
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source ../include/no_protocol.inc
+
+USE performance_schema;
+truncate table events_statements_history_long;
+
+# -----------------------------------------------------------------------
+# Test to show how the digest behaves with low value of 
+#  - performance_schema_max_digest_length
+# -----------------------------------------------------------------------
+SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1;
+
+--echo ####################################
+--echo # QUERYING PS STATEMENT DIGEST
+--echo ####################################
+SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/unary_digest.test percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/unary_digest.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/perfschema/t/unary_digest.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/perfschema/t/unary_digest.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,98 @@
+# ----------------------------------------------------
+# Tests for the performance schema statement Digests.
+# ----------------------------------------------------
+
+# Test case to show behavior of statements digest when
+# statement-digest-size is 0
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source ../include/no_protocol.inc
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+
+--disable_query_log
+
+--error ER_NO_SUCH_TABLE
+select 1 from expect_unary;
+--error ER_NO_SUCH_TABLE
+select +1 from expect_unary;
+--error ER_NO_SUCH_TABLE
+select -1 from expect_unary;
+--error ER_NO_SUCH_TABLE
+select ++++++++++++++++++++++++++++++++++++++++++++++++1 from expect_unary;
+--error ER_NO_SUCH_TABLE
+select ------------------------------------------------1 from expect_unary;
+
+--error ER_NO_SUCH_TABLE
+select 0+1 from expect_binary;
+--error ER_NO_SUCH_TABLE
+select 0-1 from expect_binary;
+--error ER_NO_SUCH_TABLE
+select 0 ++++++++++++++++++++++++++++++++++++++++++++++++1 from expect_binary;
+--error ER_NO_SUCH_TABLE
+select 0 ------------------------------------------------1 from expect_binary;
+
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (0, 0, 0);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (0, 0, -1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (0, 0, +1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (0, -1, 0);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (0, -1, -1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (0, -1, +1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (0, +1, 0);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (0, +1, -1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (0, +1, +1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (-1, 0, 0);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (-1, 0, -1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (-1, 0, +1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (-1, -1, 0);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (-1, -1, -1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (-1, -1, +1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (-1, +1, 0);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (-1, +1, -1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (-1, +1, +1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (+1, 0, 0);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (+1, 0, -1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (+1, 0, +1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (+1, -1, 0);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (+1, -1, -1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (+1, -1, +1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (+1, +1, 0);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (+1, +1, -1);
+--error ER_NO_SUCH_TABLE
+insert into expect_full_reduce values (+1, +1, +1);
+
+--error ER_NO_SUCH_TABLE
+select a-b, a+b, -a, -b, +a, +b from expect_unchanged;
+
+--enable_query_log
+
+SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
+  FROM performance_schema.events_statements_summary_by_digest;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_4threads_deadlock.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_4threads_deadlock.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_4threads_deadlock.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_4threads_deadlock.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,54 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+FLUSH LOGS;
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='+d,before_dump_thread_acquires_current_mutex,processlist_acquiring_dump_threads_LOCK_thd_data';
+include/stop_slave.inc
+include/start_slave.inc
+"Wait_for dump_thread_signal"
+SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
+SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go_parked1';
+SHOW BINARY LOGS;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go_parked2';
+PURGE BINARY LOGS BEFORE '9999-12-31';
+"Wait_for parked2"
+SET DEBUG_SYNC='now WAIT_FOR parked2';
+SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go_parked3';
+SELECT * FROM information_schema.processlist;
+"Wait_for parked3"
+SET DEBUG_SYNC='now WAIT_FOR parked3';
+"now signal go to all 4 waiting threads"
+SET DEBUG_SYNC='now SIGNAL go_dump_thread';
+SET DEBUG_SYNC='now SIGNAL go_parked1';
+SET DEBUG_SYNC='now SIGNAL go_parked2';
+SET DEBUG_SYNC='now SIGNAL go_parked3';
+include/stop_slave.inc
+include/start_slave.inc
+"Wait_for dump_thread_signal"
+SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
+SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go_parked1';
+SHOW BINARY LOGS;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go_parked2';
+PURGE BINARY LOGS BEFORE '9999-12-31';
+"Wait_for parked2"
+SET DEBUG_SYNC='now WAIT_FOR parked2';
+SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go_parked3';
+SHOW PROCESSLIST;
+"Wait_for parked3"
+SET DEBUG_SYNC='now WAIT_FOR parked3';
+"now signal go to all 4 waiting threads"
+SET DEBUG_SYNC='now SIGNAL go_dump_thread';
+SET DEBUG_SYNC='now SIGNAL go_parked1';
+SET DEBUG_SYNC='now SIGNAL go_parked2';
+SET DEBUG_SYNC='now SIGNAL go_parked3';
+"Cleanup"
+SET DEBUG_SYNC='RESET';
+SET GLOBAL DEBUG=@save_debug;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,30 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+#
+# Stop slave threads and clear slave datadir.
+#
+include/stop_slave.inc
+RESET SLAVE;
+[connection master]
+CREATE TABLE t1 (c1 INT);
+[connection slave]
+#
+# Copy the binlog with Anonymous_GTID log events and
+# relay log index to slave datadir.
+#
+include/start_slave.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+#
+# Make sure that the binlog with Anonymous_GTID log events
+# is applied completely.
+#
+include/assert.inc [Table t2 must contain 1]
+DROP TABLE t2;
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,30 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+#
+# Stop slave threads and clear slave datadir.
+#
+include/stop_slave.inc
+RESET SLAVE;
+#
+# Copy the binlog with Anonymous_GTID log events and
+# relay log index to slave datadir.
+#
+#
+# Process the binlog with Anonymous_GTID log events.
+#
+START SLAVE;
+#
+# Wait for SQL thread error.
+#
+call mtr.add_suppression("Slave.* @@SESSION.GTID_NEXT cannot be set to ANONYMOUS when @@GLOBAL.GTID_MODE = ON.");
+include/wait_for_slave_sql_error.inc [errno=1782]
+include/stop_slave.inc
+RESET MASTER;
+RESET SLAVE;
+include/start_slave.inc
+[connection master]
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,30 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+#
+# Stop slave threads and clear slave datadir.
+#
+include/stop_slave.inc
+RESET SLAVE;
+#
+# Copy the binlog with Anonymous_GTID log events and
+# relay log index to slave datadir.
+#
+#
+# Process the binlog with Anonymous_GTID log events.
+#
+START SLAVE;
+#
+# Wait for SQL thread error.
+#
+call mtr.add_suppression("Slave.* @@SESSION.GTID_NEXT cannot be set to UUID:NUMBER when @@GLOBAL.GTID_MODE = OFF.");
+include/wait_for_slave_sql_error.inc [errno=1781]
+include/stop_slave.inc
+RESET MASTER;
+RESET SLAVE;
+include/start_slave.inc
+[connection master]
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_avoid_temporal_upgrade.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_avoid_temporal_upgrade.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_avoid_temporal_upgrade.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_avoid_temporal_upgrade.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,170 @@
+#
+# BUG#18985760 - "FAST" ALTER TABLE CHANGE ON ENUM COLUMN
+#                 TRIGGERS FULL TABLE REBUILD.
+# Test case below ensures that the columns with old temporal
+# format are not upgraded on the slave since the global variable
+# 'avoid_temporal_upgrade' is enabled on the slave.
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+# Copy the table containing the old Mysql-5.5 temporal format
+# to the master and slave.
+# Enable the 'avoid_temporal_column' global variable on slave.
+STOP SLAVE;
+SET @@global.avoid_temporal_upgrade= ON;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+START SLAVE;
+# ALTER TABLE on the master.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+10:10:10	2010-10-10 10:10:10	2031-11-21 17:11:01	818A92	0000124821911312	7468F975
+00:00:00	2000-01-01 01:01:01	2001-01-21 18:11:01	800000	00001230A2EA8AB5	3A6AFC05
+01:01:10	2020-01-01 01:01:01	1980-11-21 18:06:01	80277E	0000125F33D85AB5	147BF1D9
+NULL	2000-01-01 01:01:01	2015-11-21 17:11:01	NULL	00001230A2EA8AB5	56507B75
+00:00:00	NULL	2011-11-21 17:11:01	800000	NULL	4ECA5BF5
+ALTER TABLE t1 ADD COLUMN fld1 INT;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+INSERT INTO t1 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22', 0);
+# Since the global variable 'avoid_temporal_upgrade' is disabled on 
+# the master, the temporal columns of old format are upgraded to the
+# new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+10:10:10	2010-10-10 10:10:10	2031-11-21 17:11:01	80A28A	998714A28A	7468F975
+00:00:00	2000-01-01 01:01:01	2001-01-21 18:11:01	800000	9964421041	3A6AFC05
+01:01:10	2020-01-01 01:01:01	1980-11-21 18:06:01	80104A	99A5421041	147BF1D9
+NULL	2000-01-01 01:01:01	2015-11-21 17:11:01	NULL	9964421041	56507B75
+00:00:00	NULL	2011-11-21 17:11:01	800000	NULL	4ECA5BF5
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+include/sync_slave_sql_with_master.inc
+# Since 'avoid_temporal_upgrade' is enabled on the slave,
+# the old temporal will not be upgraded on the slave.
+SET @saved_show_old_temporals= @@session.show_old_temporals;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+10:10:10	2010-10-10 10:10:10	2031-11-21 17:11:01	818A92	0000124821911312	7468F975
+00:00:00	2000-01-01 01:01:01	2001-01-21 18:11:01	800000	00001230A2EA8AB5	3A6AFC05
+01:01:10	2020-01-01 01:01:01	1980-11-21 18:06:01	80277E	0000125F33D85AB5	147BF1D9
+NULL	2000-01-01 01:01:01	2015-11-21 17:11:01	NULL	00001230A2EA8AB5	56507B75
+00:00:00	NULL	2011-11-21 17:11:01	800000	NULL	4ECA5BF5
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	83640E	0000124A7C3C8A4E	4ECAA4EE
+SET SESSION show_old_temporals= ON;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f_time` time /* 5.5 binary format */ DEFAULT NULL,
+  `f_timestamp` timestamp /* 5.5 binary format */ NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `f_datetime` datetime /* 5.5 binary format */ DEFAULT NULL,
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+COLUMN_TYPE
+time /* 5.5 binary format */
+timestamp /* 5.5 binary format */
+datetime /* 5.5 binary format */
+int(11)
+SET @@session.show_old_temporals= @saved_show_old_temporals;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+#Cleanup
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+# Testcase to ensure that the temporal columns of old format
+# are upgraded on the slave since 'avoid_temporal_column'
+# global variable is not enabled on the slave.
+# Copy the table containing the old Mysql-5.5 temporal format
+# to the master and slave.
+# Disable the 'avoid_temporal_column' global variable on slave.
+STOP SLAVE;
+SET @@global.avoid_temporal_upgrade= 0;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+START SLAVE;
+# ALTER TABLE on the master.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+10:10:10	2010-10-10 10:10:10	2031-11-21 17:11:01	818A92	0000124821911312	7468F975
+00:00:00	2000-01-01 01:01:01	2001-01-21 18:11:01	800000	00001230A2EA8AB5	3A6AFC05
+01:01:10	2020-01-01 01:01:01	1980-11-21 18:06:01	80277E	0000125F33D85AB5	147BF1D9
+NULL	2000-01-01 01:01:01	2015-11-21 17:11:01	NULL	00001230A2EA8AB5	56507B75
+00:00:00	NULL	2011-11-21 17:11:01	800000	NULL	4ECA5BF5
+ALTER TABLE t1 ADD COLUMN fld1 INT;
+Warnings:
+Note	1880	TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format.
+INSERT INTO t1 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22', 0);
+# Since the default value of 'avoid_temporal_upgrade' is FALSE,
+# the old temporal will be upgraded on the master.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+10:10:10	2010-10-10 10:10:10	2031-11-21 17:11:01	80A28A	998714A28A	7468F975
+00:00:00	2000-01-01 01:01:01	2001-01-21 18:11:01	800000	9964421041	3A6AFC05
+01:01:10	2020-01-01 01:01:01	1980-11-21 18:06:01	80104A	99A5421041	147BF1D9
+NULL	2000-01-01 01:01:01	2015-11-21 17:11:01	NULL	9964421041	56507B75
+00:00:00	NULL	2011-11-21 17:11:01	800000	NULL	4ECA5BF5
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f_time` time DEFAULT NULL,
+  `f_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `f_datetime` datetime DEFAULT NULL,
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+COLUMN_TYPE
+time
+timestamp
+datetime
+int(11)
+include/sync_slave_sql_with_master.inc
+# Since the default value of 'avoid_temporal_upgrade' is FALSE,
+# the old temporal will be upgraded on the slave.
+SET @saved_show_old_temporals= @@session.show_old_temporals;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET SESSION show_old_temporals= ON;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+f_time	f_datetime	f_timestamp	HEX(WEIGHT_STRING(f_time))	HEX(WEIGHT_STRING(f_datetime))	HEX(WEIGHT_STRING(f_timestamp))
+10:10:10	2010-10-10 10:10:10	2031-11-21 17:11:01	80A28A	998714A28A	7468F975
+00:00:00	2000-01-01 01:01:01	2001-01-21 18:11:01	800000	9964421041	3A6AFC05
+01:01:10	2020-01-01 01:01:01	1980-11-21 18:06:01	80104A	99A5421041	147BF1D9
+NULL	2000-01-01 01:01:01	2015-11-21 17:11:01	NULL	9964421041	56507B75
+00:00:00	NULL	2011-11-21 17:11:01	800000	NULL	4ECA5BF5
+22:22:22	2011-11-21 22:22:22	2011-11-21 22:22:22	816596	998AAB6596	4ECAA4EE
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f_time` time DEFAULT NULL,
+  `f_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `f_datetime` datetime DEFAULT NULL,
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+COLUMN_TYPE
+time
+timestamp
+datetime
+int(11)
+SET @@session.show_old_temporals= @saved_show_old_temporals;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+# cleanup
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_check_gtid.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_check_gtid.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_check_gtid.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_check_gtid.result	2017-02-27 07:47:02.000000000 +0000
@@ -229,6 +229,7 @@
 include/stop_slave.inc
 RESET SLAVE;
 RESET MASTER;
+RESET MASTER;
 include/start_slave.inc
 BEGIN;
 INSERT INTO t1 VALUES(1);
@@ -246,6 +247,7 @@
 include/stop_slave.inc
 RESET SLAVE;
 RESET MASTER;
+RESET MASTER;
 include/start_slave.inc
 BEGIN;
 INSERT INTO t1 VALUES(1);
@@ -263,6 +265,7 @@
 include/stop_slave.inc
 RESET SLAVE;
 RESET MASTER;
+RESET MASTER;
 include/start_slave.inc
 BEGIN;
 INSERT INTO t1 VALUES(1);
@@ -280,6 +283,7 @@
 include/stop_slave.inc
 RESET SLAVE;
 RESET MASTER;
+RESET MASTER;
 include/start_slave.inc
 BEGIN;
 INSERT INTO t1 VALUES(1);
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_colSize.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_colSize.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_colSize.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_colSize.result	2017-02-27 07:47:02.000000000 +0000
@@ -185,8 +185,22 @@
   `d` bit(25) DEFAULT NULL,
   `e` bit(13) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
+CREATE TABLE t2(i INTEGER);
+CREATE TRIGGER t1_tr BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+INSERT INTO t2 VALUES(1);
+END $$
+INSERT INTO t1 VALUES (
+b'1010101',
+b'10101011',
+b'101010110101010101111',
+b'10101010101',
+b'10101011111'
+  );
+include/sync_slave_sql_with_master.inc
 *** Cleanup  ***
 DROP TABLE t1;
+DROP TABLE t2;
 include/sync_slave_sql_with_master.inc
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_create_drop_temp_table.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_create_drop_temp_table.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_create_drop_temp_table.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_create_drop_temp_table.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TEMPORARY TABLE temp (i INT);
+include/stop_slave_io.inc
+include/rpl_stop_server.inc [server_number=1]
+include/rpl_start_server.inc [server_number=1]
+include/start_slave_io.inc
+include/sync_slave_io_with_master.inc
+include/assert.inc [Slave_open_temp_tables should be 0]
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2017-02-27 07:47:02.000000000 +0000
@@ -133,17 +133,6 @@
 START SLAVE;
 *** Now the slave must be stopped due to timeout ***
 include/wait_for_slave_sql_error.inc [errno=1205]
-==== BEGIN include/wait_for_slave_sql_error.inc [errno=1205] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/wait_for_slave_param.inc [Slave_SQL_Running] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-Waiting until 'Slave_SQL_Running' = 'No' [timeout='300', $slave_error_param='1']
-[connection slave]
-.==== END include/wait_for_slave_param.inc [Slave_SQL_Running] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/wait_for_slave_sql_error.inc [errno=1205] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 rollback;
 set @@global.slave_transaction_retries= @save.slave_transaction_retries;
 include/start_slave.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_drop_db_fail.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_drop_db_fail.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_drop_db_fail.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_drop_db_fail.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE DATABASE IF NOT EXISTS db1;
+CREATE DATABASE IF NOT EXISTS db2;
+use db1;
+CREATE TABLE a(id INT);
+CREATE VIEW v AS SELECT * FROM a;
+CREATE TABLE table_father(id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(20)) ENGINE=INNODB;
+include/sync_slave_sql_with_master.inc
+use db2;
+CREATE TABLE table_child(id INT PRIMARY KEY, info VARCHAR(20), father_id INT) ENGINE=INNODB;
+ALTER TABLE table_child ADD CONSTRAINT aaa FOREIGN KEY (father_id) REFERENCES db1.table_father(id);
+DROP DATABASE db1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
+DROP DATABASE db2;
+include/sync_slave_sql_with_master.inc
+DROP DATABASE db1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_drop_temp_gtid.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_drop_temp_gtid.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_drop_temp_gtid.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_drop_temp_gtid.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,35 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+# Initial setup
+[connection master]
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_t1 (c1 INT) ENGINE=InnoDB;
+# Insert the data in the master
+BEGIN;
+INSERT INTO temp_t1 VALUES (1);
+COMMIT;
+BEGIN;
+INSERT INTO t1 VALUES ((SELECT COUNT(*) FROM temp_t1));
+COMMIT;
+include/sync_slave_sql_with_master.inc
+[connection slave]
+# Stop the IO thread
+include/stop_slave_io.inc
+# Restart IO thread
+include/start_slave_io.inc
+# Do one more insert on master and then sync slave with master
+[connection master]
+BEGIN;
+INSERT INTO t1 VALUES ((SELECT COUNT(*) FROM temp_t1));
+COMMIT;
+include/sync_slave_sql_with_master.inc
+# Now compare master and slave's t1 table data
+[connection master]
+include/diff_tables.inc [master:t1, slave:t1]
+# Cleanup
+[connection master]
+DROP TABLE t1, temp_t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_filter_warnings.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_filter_warnings.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_filter_warnings.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_filter_warnings.result	2017-02-27 07:47:02.000000000 +0000
@@ -5,11 +5,16 @@
 [connection master]
 CREATE TABLE t2 (c1 INT) ENGINE=InnoDB;
 include/sync_slave_sql_with_master.inc
+[connection master]
 INSERT INTO test.t2 VALUES (100);
 INSERT INTO test.t2 VALUES (200);
 INSERT INTO test.t2 VALUES (300);
+include/sync_slave_sql_with_master.inc
+SET @@GLOBAL.DEBUG= '+d,simulate_error_throttle_expiry';
+[connection master]
 DROP TABLE t2;
 include/sync_slave_sql_with_master.inc
+SET @@GLOBAL.DEBUG= '$debug_saved';
 Matching lines are:
 --TIME-- [Warning] Slave SQL: Could not execute Query event. Detailed error: Slave SQL thread ignored the query because of replicate-*-table rules; Error log throttle is enabled. This error will not be displayed for next 60 secs. It will be suppressed, Error_code: 1237
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_binary_log_as_relay_log.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_binary_log_as_relay_log.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_binary_log_as_relay_log.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_binary_log_as_relay_log.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,23 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+include/stop_slave_sql.inc
+CREATE TABLE t1(i INT);
+INSERT INTO t1 values (1);
+INSERT INTO t1 values (2);
+include/sync_slave_io_with_master.inc
+SET @save.slave_parallel_workers=@@global.slave_parallel_workers;
+SET @@global.slave_parallel_workers=1;
+SET @save.slave_transaction_retries=@@global.slave_transaction_retries;
+SET @@global.slave_transaction_retries=0;
+include/start_slave_sql.inc
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1,slave:t1]
+DROP TABLE t1;
+include/stop_slave_sql.inc
+SET @@global.slave_parallel_workers=@save.slave_parallel_workers;
+SET @@global.slave_transaction_retries=@save.slave_transaction_retries;
+include/start_slave_sql.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_drop_table.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_drop_table.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_drop_table.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_drop_table.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,204 @@
+include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/rpl_default_connections.inc
+#
+# First part
+#
+[connection master]
+CREATE TABLE trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TABLE non_trans_t1 (c1 INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+# Error cases ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, non_trans_t1, temp_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, non_trans_t1, temp_trans_t1, temp_non_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, non_trans_t1, temp_trans_t1, temp_non_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, non_trans_t1, temp_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, non_trans_t1, temp_non_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, non_trans_t1, temp_non_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, temp_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, temp_trans_t1, temp_non_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, temp_trans_t1, temp_non_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, temp_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, temp_non_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE trans_t1, temp_non_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE non_trans_t1, temp_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE non_trans_t1, temp_trans_t1, temp_non_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE non_trans_t1, temp_trans_t1, temp_non_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE non_trans_t1, temp_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE non_trans_t1, temp_non_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE non_trans_t1, temp_non_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE temp_trans_t1, temp_non_trans_t1;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE temp_trans_t1, temp_non_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE temp_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP after the statement
+DROP TABLE temp_non_trans_t1, non_existent;
+ERROR HY000: Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'.
+ROLLBACK;
+# Error cases ER_BAD_TABLE_ERROR
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:1';
+## Expecting error ER_BAD_TABLE_ERROR after the statement
+DROP TABLE trans_t1, non_trans_t1, non_existent;
+ERROR 42S02: Unknown table 'test.non_existent'
+ROLLBACK;
+SET GTID_NEXT= AUTOMATIC;
+CREATE TABLE trans_t1 (c1 INT) ENGINE=InnoDB;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:2';
+## Expecting error ER_BAD_TABLE_ERROR after the statement
+DROP TABLE trans_t1, non_existent;
+ERROR 42S02: Unknown table 'test.non_existent'
+ROLLBACK;
+SET GTID_NEXT= AUTOMATIC;
+CREATE TABLE non_trans_t1 (c1 INT) ENGINE=MyISAM;
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:3';
+## Expecting error ER_BAD_TABLE_ERROR after the statement
+DROP TABLE non_trans_t1, non_existent;
+ERROR 42S02: Unknown table 'test.non_existent'
+ROLLBACK;
+SET GTID_NEXT= AUTOMATIC;
+CREATE TABLE trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TABLE non_trans_t1 (c1 INT) ENGINE=MyISAM;
+# Non-error cases
+SET GTID_NEXT= '11111111-1111-1111-1111-111111111111:4';
+DROP TABLE trans_t1, non_trans_t1;
+SET GTID_NEXT= AUTOMATIC;
+CREATE TABLE trans_t1 (c1 INT) ENGINE=InnoDB;
+#
+# Second part
+#
+CREATE TEMPORARY TABLE temp_ignore (c1 INT) ENGINE=MyISAM;
+DROP TEMPORARY TABLE IF EXISTS temp_ignore, temp_non_trans_t1;
+include/sync_slave_sql_with_master.inc
+[connection master]
+CREATE TEMPORARY TABLE temp_ignore (c1 INT) ENGINE=InnoDB;
+DROP TEMPORARY TABLE IF EXISTS temp_ignore, temp_trans_t1;
+include/sync_slave_sql_with_master.inc
+#
+# Third part
+#
+[connection master]
+call mtr.add_suppression("InnoDB: Error: table .* does not exist in the InnoDB internal");
+CREATE DATABASE test2;
+CREATE DATABASE test3;
+use test;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+USE test2;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+USE test3;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_trans_t2 (c1 INT) ENGINE=InnoDB;
+[connection master1]
+use test;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+USE test2;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+USE test3;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE temp_non_trans_t2 (c1 INT) ENGINE=MyISAM;
+include/sync_slave_sql_with_master.inc
+include/stop_slave_io.inc
+include/rpl_stop_server.inc [server_number=1]
+include/rpl_start_server.inc [server_number=1]
+[connection slave]
+include/start_slave_io.inc
+[connection master]
+include/sync_slave_io_with_master.inc
+include/assert.inc [Slave_open_temp_tables should be 0]
+[connection master]
+USE test;
+DROP TABLE trans_t1;
+DROP DATABASE test2;
+DROP DATABASE test3;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_empty_group.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_empty_group.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_empty_group.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_empty_group.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
-[connection master]
-SET @save.binlog_format= @@global.binlog_format;
-SET @@global.binlog_format= row;
-include/restart_slave.inc
-SET @save.binlog_format= @@session.binlog_format;
-SET @@session.binlog_format= statement;
-CREATE TABLE t1(id INTEGER) ENGINE= Innodb /* group one */;
-UPDATE t1 SET id= 1 WHERE id = 0          /* group two */;
-CREATE TABLE t_ignore(id INTEGER) ENGINE= Innodb /* group three */;
-include/sync_slave_sql_with_master.inc
-must be *three* groups logged, where the two last empty:
-include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Previous_gtids	#	#	
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'Gtid_set'
-slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(id INTEGER) ENGINE= Innodb /* group one */
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'Gtid_set'
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'Gtid_set'
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Query	#	#	COMMIT
-FLUSH LOGS;
-DROP TABLE t2;
-ERROR 42S02: Unknown table 'test.t2'
-INSERT INTO t1 VALUES (1, 1);
-ERROR 21S01: Column count doesn't match value count at row 1
-BEGIN;
-INSERT INTO t1 VALUES (2);
-ROLLBACK;
-*** must be empty log ***
-include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	#	Previous_gtids	#	#	Gtid_set
-DROP TABLE t1;
-DROP TABLE t_ignore;
-include/sync_slave_sql_with_master.inc
-SET @@global.binlog_format= @save.binlog_format;
-include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_empty_transaction.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_empty_transaction.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_empty_transaction.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_empty_transaction.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,111 @@
+include/rpl_init.inc [topology=1->2->3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/rpl_default_connections.inc
+include/rpl_reset.inc
+==== Case 1A: Transaction filtered out ====
+include/gtid_step_reset.inc
+CREATE TABLE t_ignore(id INT);
+INSERT INTO t_ignore VALUES (1);
+DROP TABLE t_ignore;
+CREATE TABLE t_ignore_wild(id INT);
+INSERT INTO t_ignore_wild VALUES (1);
+DROP TABLE t_ignore_wild;
+include/gtid_step_assert.inc [count=6, only_count=0]
+include/rpl_sync.inc
+==== Case 1B: CREATE/ALTER/DROP TEMPORARY filtered out ====
+CREATE TEMPORARY TABLE t_ignore(a INT);
+ALTER TABLE t_ignore ADD COLUMN b INT;
+INSERT INTO t_ignore VALUES (1, 2);
+DROP TEMPORARY TABLE t_ignore;
+CREATE TEMPORARY TABLE t_ignore_wild(a INT);
+ALTER TABLE t_ignore_wild ADD COLUMN b INT;
+INSERT INTO t_ignore_wild VALUES (1, 2);
+DROP TEMPORARY TABLE t_ignore_wild;
+include/gtid_step_assert.inc [count=8, only_count=0]
+include/rpl_sync.inc
+==== Case 1C: database filters on slave applier ====
+include/gtid_step_reset.inc
+CREATE DATABASE db_ignore;
+USE db_ignore;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+USE test;
+include/gtid_step_assert.inc [count=3, only_count=0]
+include/rpl_sync.inc
+include/assert.inc [db_ignore should not be created on slave]
+include/assert.inc [db_ignore should not be created on second slave]
+DROP DATABASE db_ignore;
+include/rpl_sync.inc
+==== Case 1D: database filters on slave binary log ====
+include/gtid_step_reset.inc
+CREATE DATABASE db_binlog_ignore;
+USE db_binlog_ignore;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+USE test;
+include/gtid_step_assert.inc [count=3, only_count=0]
+include/rpl_sync.inc
+include/assert.inc [db_binlog_ignore should not be created on slave]
+include/assert.inc [db_binlog_ignore should not be created on second slave]
+DROP DATABASE db_binlog_ignore;
+include/rpl_sync.inc
+==== Case 2A: temp table transaction not logged in row format ====
+---- Initialize ----
+SET @save.binlog_format= @@global.binlog_format;
+SET @@global.binlog_format= row;
+include/restart_slave.inc
+---- Test ----
+include/gtid_step_reset.inc
+CREATE TEMPORARY TABLE t2 (a INT);
+ALTER TABLE t2 ADD COLUMN b INT;
+INSERT INTO t2 VALUES (1, 2);
+include/gtid_step_assert.inc [count=3, only_count=0]
+include/rpl_sync.inc
+---- Clean up ----
+DROP TEMPORARY TABLE t2;
+include/rpl_sync.inc
+SET @@global.binlog_format= @save.binlog_format;
+==== Case 2B: transaction with no effect not logged in row format ====
+---- Initialize ----
+SET @save.binlog_format= @@global.binlog_format;
+SET @@global.binlog_format= row;
+include/restart_slave.inc
+SET @@session.binlog_format= statement;
+CREATE TABLE t1(id INT) ENGINE = InnoDB;
+include/rpl_sync.inc
+INSERT INTO t1 VALUES (0);
+---- Test ----
+UPDATE t1 SET id= 1 WHERE id = 0;
+include/rpl_sync.inc
+---- Clean up ----
+DROP TABLE t1;
+include/rpl_sync.inc
+SET @@global.binlog_format= @save.binlog_format;
+==== Case 3: explicit empty transaction on master ====
+include/gtid_step_reset.inc
+SET @@SESSION.GTID_NEXT = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+COMMIT;
+SET @@SESSION.GTID_NEXT = 'AUTOMATIC';
+include/gtid_step_assert.inc [count=1, only_count=1]
+include/rpl_sync.inc
+==== Case 4: Nothing logged for ROLLBACK transactions ====
+---- Initialize ----
+CREATE TABLE t1 (a INT) ENGINE = InnoDB;
+---- Test ----
+include/gtid_step_reset.inc
+DROP TABLE t2;
+ERROR 42S02: Unknown table 'test.t2'
+INSERT INTO t1 VALUES (1, 1);
+ERROR 21S01: Column count doesn't match value count at row 1
+BEGIN;
+INSERT INTO t1 VALUES (2);
+ROLLBACK;
+include/gtid_step_assert.inc [count=0, only_count=0]
+---- Clean Up ----
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_execution.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_execution.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_execution.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_execution.result	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,6 @@
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 #### Initialize ####
-include/gtid_utils.inc
 CREATE table t (a INT PRIMARY KEY) ENGINE = InnoDB;
 INSERT INTO t VALUES (1);
 #### Specify test cases ####
@@ -1439,5 +1438,4 @@
  DROP TABLE t_1021; DROP TABLE t_1023;;
 DROP TABLE stmts;
 DROP TABLE t;
-include/gtid_utils_end.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,6 @@
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 call mtr.add_suppression("Got fatal error 1236 from master when reading data from binary log: 'The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires.");
-include/gtid_utils.inc
 ######## Initialize ########
 CREATE TABLE t1 (a INT) ENGINE = InnoDB;
 include/sync_slave_sql_with_master.inc
@@ -35,5 +34,4 @@
 === Sync slave with master (connection master/slave) ====
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
-include/gtid_utils_end.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_purged_maintained.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_purged_maintained.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_purged_maintained.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_purged_maintained.result	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,6 @@
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 include/rpl_set_gtid_mode.inc
-include/gtid_utils.inc
 ######## Initialize ########
 CREATE TABLE t1 (a INT) ENGINE = InnoDB;
 include/sync_slave_sql_with_master.inc
@@ -196,5 +195,4 @@
 include/assert.inc [lost gtids from 1 to 6 on master]
 ######## Clean up ########
 DROP TABLE t1;
-include/gtid_utils_end.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_server_sighup.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_server_sighup.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_server_sighup.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_server_sighup.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,41 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE pid_table(pid_no INT);
+[connection server_1]
+LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
+DELETE FROM pid_table;
+include/sync_slave_sql_with_master.inc
+[connection server_1]
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000002	#	Previous_gtids	#	#	Gtid_set
+master-bin.000002	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'Gtid_set'
+master-bin.000002	#	Query	#	#	BEGIN
+master-bin.000002	#	Query	#	#	use `test`; DELETE FROM pid_table
+master-bin.000002	#	Query	#	#	COMMIT
+include/rpl_stop_server.inc [server_number=1]
+include/rpl_start_server.inc [server_number=1 gtids=on]
+include/sync_slave_sql_with_master.inc
+[connection server_2]
+LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
+[connection server_1]
+DELETE FROM pid_table;
+include/sync_slave_sql_with_master.inc
+include/show_relaylog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000006	#	Previous_gtids	#	#	Gtid_set
+slave-relay-bin.000006	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
+slave-relay-bin.000006	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'Gtid_set'
+slave-relay-bin.000006	#	Query	#	#	BEGIN
+slave-relay-bin.000006	#	Query	#	#	use `test`; DELETE FROM pid_table
+slave-relay-bin.000006	#	Query	#	#	COMMIT
+include/rpl_stop_server.inc [server_number=2]
+include/rpl_start_server.inc [server_number=2 gtids=on]
+include/rpl_start_slaves.inc
+[connection server_1]
+DROP TABLE pid_table;
+include/sync_slave_sql_with_master.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtids_restart_slave_io_lost_trx.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtids_restart_slave_io_lost_trx.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtids_restart_slave_io_lost_trx.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtids_restart_slave_io_lost_trx.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,74 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE t1(i INT) ENGINE=InnoDB;
+FLUSH LOGS;
+include/sync_slave_sql_with_master.inc
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,stop_io_after_reading_gtid_log_event';
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET @v= 1 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+INSERT INTO t1 VALUES (1);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+SET GLOBAL DEBUG='d,stop_io_after_reading_query_log_event';
+BEGIN;
+INSERT INTO t1 VALUES (2);
+SET @v= 2 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+INSERT INTO t1 VALUES (2);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+include/stop_slave_sql.inc
+SET GLOBAL DEBUG='d,stop_io_after_reading_xid_log_event';
+BEGIN;
+INSERT INTO t1 VALUES (3);
+SET @v= 3 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+include/start_slave_sql.inc
+INSERT INTO t1 VALUES (3);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+BEGIN;
+INSERT INTO t1 VALUES (4);
+SET @v= 4 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/sync_slave_sql_with_master.inc
+include/stop_slave_io.inc
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+INSERT INTO t1 VALUES (4);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+SET GLOBAL DEBUG='d,stop_io_after_reading_user_var_log_event';
+BEGIN;
+INSERT INTO t1 VALUES (5);
+SET @v= 5 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+INSERT INTO t1 VALUES (5);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result	2017-02-27 07:47:02.000000000 +0000
@@ -15,4 +15,5 @@
 Check that database state is equal on all servers.
 include/diff_servers.inc [servers=1 2 3 4 5 ]
 ==== Clean up ====
+include/rpl_sync.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,28 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+SET GLOBAL GTID_PURGED= "master_uuid:1-2";
+CREATE TABLE t1(i INT);
+DROP TABLE t1;
+START SLAVE IO_THREAD;
+include/wait_for_slave_io_error.inc [errno=1236]
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires.''
+SET GLOBAL GTID_PURGED= "master_uuid:1-2";
+include/start_slave.inc
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Slave should be able to get GTID-3 and 4 now.]
+call mtr.add_suppression(".*Master has purged binary logs containing GTIDs that the slave requires.*");
+include/rpl_reset.inc
+CREATE TABLE t1(i INT);
+DROP TABLE t1;
+include/stop_slave.inc
+include/rpl_restart_server.inc [server_number=1]
+START SLAVE IO_THREAD;
+include/wait_for_slave_io_error.inc [errno=1236]
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Slave has more GTIDs than the master has, using the master's SERVER_UUID. This may indicate that the end of the binary log was truncated or that the last binary log file was lost, e.g., after a power or disk failure when sync_binlog != 1. The master may or may not have rolled back transactions that were already replica''
+call mtr.add_suppression(".*Slave has more GTIDs than the master has.*");
+SET GLOBAL GTID_PURGED= "master_uuid:1-2";
+include/start_slave.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_insert_on_update.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_insert_on_update.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_insert_on_update.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_insert_on_update.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,12 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE t(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,k INT,UNIQUE KEY(k)) ENGINE=InnoDB;
+INSERT INTO t(k) VALUES (1), (2), (3);
+INSERT INTO t(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE id=10;
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t,slave:t]
+DROP TABLE t;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_kill_query.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_kill_query.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_kill_query.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_kill_query.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,124 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+==== Case 1: Killed query on master -> error on slave ====
+include/assert.inc [Test only works if binlog_format is statement]
+[connection master]
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1 (a INT) ENGINE = MyISAM;
+CREATE TABLE trigger_table (a INT) ENGINE = MyISAM;
+SET SQL_LOG_BIN=0;
+CREATE TRIGGER trig1 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+IF NEW.a != 0 THEN
+SET @@GLOBAL.BINLOG_FORMAT = 'row';
+DO SLEEP(1000000);
+END IF;
+INSERT INTO trigger_table VALUES (1);
+END|
+SET SQL_LOG_BIN=1;
+INSERT INTO t1 VALUES (0), (1);
+[connection master1]
+KILL QUERY <CONNECTION_ID>;
+[connection master]
+ERROR 70100: Query execution was interrupted
+SET @@GLOBAL.BINLOG_FORMAT = 'STATEMENT';
+include/assert.inc [At most one row should be inserted in db1.t1]
+include/assert.inc [At least one row should be inserted in db1.trigger_table]
+SET SQL_LOG_BIN=0;
+DROP TRIGGER trig1;
+SET SQL_LOG_BIN=1;
+DROP TABLE trigger_table;
+DROP TABLE t1;
+DROP DATABASE db1;
+USE test;
+---- Verify there is an error on slave ----
+include/sync_slave_io_with_master.inc
+include/wait_for_slave_sql_error.inc [errno=1317 # ER_QUERY_INTERRUPTED]
+---- Verify that nothing was inserted on slave -----
+include/assert.inc [Nothing should be inserted on slave]
+---- Clean up ----
+include/stop_slave_io.inc
+RESET SLAVE;
+RESET MASTER;
+DROP DATABASE db1;
+[connection master]
+RESET MASTER;
+[connection slave]
+include/start_slave.inc
+[connection master]
+==== Case 2: Master kills query -> no error if slave filters by db ====
+include/assert.inc [Test only works if binlog_format is statement]
+[connection master]
+CREATE DATABASE ignored_db;
+USE ignored_db;
+CREATE TABLE t1 (a INT) ENGINE = MyISAM;
+CREATE TABLE trigger_table (a INT) ENGINE = MyISAM;
+SET SQL_LOG_BIN=0;
+CREATE TRIGGER trig1 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+IF NEW.a != 0 THEN
+SET @@GLOBAL.BINLOG_FORMAT = 'row';
+DO SLEEP(1000000);
+END IF;
+INSERT INTO trigger_table VALUES (1);
+END|
+SET SQL_LOG_BIN=1;
+INSERT INTO t1 VALUES (0), (1);
+[connection master1]
+KILL QUERY <CONNECTION_ID>;
+[connection master]
+ERROR 70100: Query execution was interrupted
+SET @@GLOBAL.BINLOG_FORMAT = 'STATEMENT';
+include/assert.inc [At most one row should be inserted in ignored_db.t1]
+include/assert.inc [At least one row should be inserted in ignored_db.trigger_table]
+SET SQL_LOG_BIN=0;
+DROP TRIGGER trig1;
+SET SQL_LOG_BIN=1;
+DROP TABLE trigger_table;
+DROP TABLE t1;
+DROP DATABASE ignored_db;
+USE test;
+---- Verify all was replicated ok ----
+include/sync_slave_sql_with_master.inc
+[connection master]
+==== Case 3: Master kills query -> no error if slave filters by table ====
+include/assert.inc [Test only works if binlog_format is statement]
+[connection master]
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE ignored_table (a INT) ENGINE = MyISAM;
+CREATE TABLE trigger_table (a INT) ENGINE = MyISAM;
+SET SQL_LOG_BIN=0;
+CREATE TRIGGER trig1 BEFORE INSERT ON ignored_table FOR EACH ROW
+BEGIN
+IF NEW.a != 0 THEN
+SET @@GLOBAL.BINLOG_FORMAT = 'row';
+DO SLEEP(1000000);
+END IF;
+INSERT INTO trigger_table VALUES (1);
+END|
+SET SQL_LOG_BIN=1;
+INSERT INTO ignored_table VALUES (0), (1);
+[connection master1]
+KILL QUERY <CONNECTION_ID>;
+[connection master]
+ERROR 70100: Query execution was interrupted
+SET @@GLOBAL.BINLOG_FORMAT = 'STATEMENT';
+include/assert.inc [At most one row should be inserted in db1.ignored_table]
+include/assert.inc [At least one row should be inserted in db1.trigger_table]
+SET SQL_LOG_BIN=0;
+DROP TRIGGER trig1;
+SET SQL_LOG_BIN=1;
+DROP TABLE trigger_table;
+DROP TABLE ignored_table;
+DROP DATABASE db1;
+USE test;
+---- Verify all was replicated ok ----
+include/sync_slave_sql_with_master.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_low_slave_net_time_out.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_low_slave_net_time_out.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_low_slave_net_time_out.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_low_slave_net_time_out.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,28 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CHANGE MASTER TO MASTER_HEARTBEAT_PERIOD=5;
+SET @save_old_slave_net_timeout=@@global.slave_net_timeout;
+SET @@global.slave_net_timeout=10;
+include/start_slave.inc
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='+d,inject_2sec_sleep_when_skipping_an_event';
+CREATE TABLE t1(i INT) engine=innodb;
+INSERT INTO t1 VALUES (1);
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+include/stop_dump_threads.inc
+SET GLOBAL DEBUG='+d,hold_dump_thread_inside_inner_loop';
+DROP TABLE t1;
+include/start_slave.inc
+SET DEBUG_SYNC='now WAIT_FOR signal_inside_inner_loop';
+include/stop_slave.inc
+SET GLOBAL DEBUG='-d,hold_dump_thread_inside_inner_loop';
+include/start_slave.inc
+SET DEBUG_SYNC='now signal signal_continue';
+include/sync_slave_sql_with_master.inc
+SET GLOBAL DEBUG=@save_debug;
+SET @@global.slave_net_timeout=@save_old_slave_net_timeout;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2017-02-27 07:47:02.000000000 +0000
@@ -129,8 +129,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-If-NXe-Temp << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-If-NXe-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-TN-Temp';
@@ -441,11 +440,10 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -464,18 +462,16 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -960,12 +956,8 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp R';
@@ -986,19 +978,14 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'B T Drop-Temp-TN-Temp R';
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+include/stop_slave.inc
+change master to master_auto_position=0;
+include/start_slave.inc
+[connection master]
+CREATE TABLE t1(i INT) ENGINE=InnoDB;
+FLUSH LOGS;
+include/sync_slave_sql_with_master.inc
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,stop_io_after_reading_table_map_event';
+[connection master]
+INSERT INTO t1 VALUES (1);
+[connection slave]
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+include/stop_slave.inc
+change master to master_auto_position=1;
+include/start_slave.inc
+[connection master]
+CREATE TABLE t1(i INT) ENGINE=InnoDB;
+FLUSH LOGS;
+include/sync_slave_sql_with_master.inc
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,stop_io_after_reading_table_map_event';
+[connection master]
+INSERT INTO t1 VALUES (1);
+[connection slave]
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,74 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE t1(i INT) ENGINE=InnoDB;
+FLUSH LOGS;
+include/sync_slave_sql_with_master.inc
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,stop_io_after_reading_gtid_log_event';
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET @v= 1 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+INSERT INTO t1 VALUES (1);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+SET GLOBAL DEBUG='d,stop_io_after_reading_query_log_event';
+BEGIN;
+INSERT INTO t1 VALUES (2);
+SET @v= 2 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+INSERT INTO t1 VALUES (2);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+include/stop_slave_sql.inc
+SET GLOBAL DEBUG='d,stop_io_after_reading_xid_log_event';
+BEGIN;
+INSERT INTO t1 VALUES (3);
+SET @v= 3 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+include/start_slave_sql.inc
+INSERT INTO t1 VALUES (3);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+BEGIN;
+INSERT INTO t1 VALUES (4);
+SET @v= 4 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/sync_slave_sql_with_master.inc
+include/stop_slave_io.inc
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+INSERT INTO t1 VALUES (4);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+SET GLOBAL DEBUG='d,stop_io_after_reading_user_var_log_event';
+BEGIN;
+INSERT INTO t1 VALUES (5);
+SET @v= 5 * 100;
+INSERT INTO t1 VALUES (@v);
+COMMIT;
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+INSERT INTO t1 VALUES (5);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,28 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG= "d,stop_io_after_reading_write_rows_log_event";
+[connection master]
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+BEGIN;
+INSERT INTO t1 (c1) VALUES (1);
+COMMIT;
+BEGIN;
+INSERT INTO t1 (c1) VALUES (2);
+COMMIT;
+[connection slave]
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave_io.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_packet.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_packet.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_packet.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_packet.result	2017-02-27 07:47:02.000000000 +0000
@@ -50,6 +50,7 @@
 STOP SLAVE;
 RESET SLAVE;
 RESET MASTER;
+RESET MASTER;
 SET @max_allowed_packet_0= @@session.max_allowed_packet;
 SHOW BINLOG EVENTS;
 SET @max_allowed_packet_1= @@session.max_allowed_packet;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result	2017-02-27 07:47:02.000000000 +0000
@@ -9,10 +9,11 @@
 set @save.slave_checkpoint_period= @@global.slave_checkpoint_period;
 set @@global.slave_checkpoint_period= 500;
 set @save.slave_transaction_retries= @@global.slave_transaction_retries;
-start slave io_thread;
-include/wait_for_slave_io_to_start.inc
+include/start_slave.inc
 create table t1 (f1 int) engine=innodb;
 create table t2 (f1 int) engine=innodb;
+include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
 begin;
 insert into t1 values (sleep(3) + 1);
 Warnings:
@@ -21,9 +22,9 @@
 begin;
 insert into t2 values (1);
 commit;
-include/start_slave.inc
 include/sync_slave_io_with_master.inc
 lock table t2 write;
+include/start_slave_sql.inc
 First transaction is done, now get Seconds_Behind_Master after it...
 include/wait_for_slave_param.inc [Seconds_Behind_Master]
 Seconds_Behind_Master after first transaction is as expected.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_parallel_worker_error.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_parallel_worker_error.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_parallel_worker_error.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_parallel_worker_error.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+call mtr.add_suppression("Slave SQL: Worker.*failed executing transaction");
+call mtr.add_suppression("Slave SQL:.*The slave coordinator and worker threads are stopped");
+CREATE TABLE t (a TEXT) select "a" as a;
+CREATE TABLE t (a TEXT) select "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" as a;
+include/wait_for_slave_sql_error.inc [errno=1050]
+DROP TABLE t;
+include/start_slave_sql.inc
+include/sync_slave_sql_with_master.inc
+DROP TABLE t;
+include/sync_slave_sql_with_master.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,25 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+call mtr.add_suppression("Recovery from master pos .*");
+[connection slave]
+include/stop_slave.inc
+[connection master]
+CREATE DATABASE test_jfg;
+[connection slave]
+CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_PORT,master_user='root';
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+START SLAVE IO_THREAD;
+include/wait_for_slave_io_to_start.inc
+[connection master]
+include/sync_slave_io_with_master.inc
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start=FALSE --master-info-repository=TABLE --relay-log-info-repository=TABLE --relay-log-recovery=1]
+include/wait_for_slave_sql_to_start.inc
+[connection master]
+DROP DATABASE test_jfg;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+call mtr.add_suppression("Failed to initialize the master info structure");
+call mtr.add_suppression("Error during --relay-log-recovery *");
+CREATE TABLE t1 ( n INT);
+RESET MASTER;
+include/stop_slave.inc
+include/wait_for_slave_to_stop.inc
+CHANGE MASTER TO MASTER_PORT=SLAVE_PORT;
+START SLAVE IO_THREAD;
+include/wait_for_slave_io_to_start.inc
+include/rpl_stop_server.inc [server_number=2]
+include/rpl_start_server.inc [server_number=2 parameters: --skip_slave_start=FALSE --master-info-repository=TABLE --relay-log-info-repository=TABLE --relay-log-recovery=1]
+Matching lines are:
+--TIME-- [ERROR] Error during --relay-log-recovery: replicate_same_server_id is in use and sql thread's positions are not initialized, hence relay log recovery cannot happen.
+
+Occurrences of the Error during --relay-log-recovery in the input file : 1
+include/rpl_restart_server.inc [server_number=2 parameters: --master-info-repository=TABLE --relay-log-info-repository=TABLE --relay-log-recovery=0]
+DROP TABLE t1;
+change master to master_port=MASTER_PORT;
+include/start_slave.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_rotate_gtid.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_rotate_gtid.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_rotate_gtid.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_rotate_gtid.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,39 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+# Preparing the relaylog
+[connection slave]
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_AUTO_POSITION=0;
+include/start_slave_io.inc
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,stop_io_after_reading_gtid_log_event';
+# Create a transaction on the master
+# that will have it's GTID and other events in separated relay log files
+[connection master]
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+[connection slave]
+include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG=@save_debug;
+include/start_slave_io.inc
+# Create other transaction on the master
+[connection master]
+CREATE TABLE t2 (c1 INT) ENGINE=InnoDB;
+include/sync_slave_io_with_master.inc
+# Restart the SQL thread until the beginning of the last relay log file
+[connection slave]
+START SLAVE SQL_THREAD UNTIL
+RELAY_LOG_FILE= 'slave-relay-bin.000003',
+RELAY_LOG_POS= 4;
+include/wait_for_slave_sql_to_stop.inc
+# Restart the SQL thread
+include/start_slave_sql.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [t1 should be replicated]
+# Cleanup
+[connection master]
+DROP TABLE t1, t2;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_rotate_row_trans.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_rotate_row_trans.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_rotate_row_trans.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_rotate_row_trans.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,39 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+# Initial setup
+[connection master]
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+# Sync slave with master and setup debug sync point
+include/sync_slave_sql_with_master.inc
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,stop_io_after_reading_write_rows_log_event';
+# Insert the data in the master
+[connection master]
+BEGIN;
+INSERT INTO t1 (c1) VALUES (0);
+INSERT INTO t1 (c1) VALUES (1);
+COMMIT;
+# Restart the IO thread keeping SQL thread running until last relay log split
+[connection slave]
+include/wait_for_slave_io_to_stop.inc
+START SLAVE IO_THREAD;
+include/wait_for_slave_io_to_stop.inc
+# Stop the SQL thread (it should be in the middle of the transaction/group)
+include/stop_slave_sql.inc
+# Remove the debug point and restart the both threads
+SET GLOBAL DEBUG= @save_debug;
+include/start_slave.inc
+# Do one more insert on master and then sync slave with master
+[connection master]
+INSERT INTO t1 (c1) VALUES (2);
+include/sync_slave_sql_with_master.inc
+# Now compare master and slave's t1 table data
+[connection master]
+include/diff_tables.inc [master:t1, slave:t1]
+# Cleanup
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_blob_innodb.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_blob_innodb.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_blob_innodb.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_blob_innodb.result	2017-02-27 07:47:02.000000000 +0000
@@ -27,6 +27,7 @@
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 3;
 LENGTH(data)
 16384
+include/sync_slave_sql_with_master.inc
 
 **** Data Insert Validation Slave Section test.t1 ****
 
@@ -53,6 +54,7 @@
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 2;
 LENGTH(data)
 17408
+include/sync_slave_sql_with_master.inc
 
 **** Data Update Validation Slave Section test.t1 ****
 
@@ -112,6 +114,7 @@
 FROM test.t2 WHERE c1=2;
 c1	LENGTH(c2)	SUBSTR(c2,1+2*900,2)	LENGTH(c4)	SUBSTR(c4,1+3*900,3)
 2	20000	b2	30000	dd2
+include/sync_slave_sql_with_master.inc
 
 **** Data Insert Validation Slave Section test.t2 ****
 
@@ -139,6 +142,7 @@
 FROM test.t2 WHERE c1=2;
 c1	LENGTH(c2)	SUBSTR(c2,1+2*900,2)	LENGTH(c4)	SUBSTR(c4,1+3*900,3)
 2	2256	b1	3000	dd1
+include/sync_slave_sql_with_master.inc
 
 **** Data Update Validation Slave Section test.t2 ****
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_blob_myisam.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_blob_myisam.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_blob_myisam.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_blob_myisam.result	2017-02-27 07:47:02.000000000 +0000
@@ -27,6 +27,7 @@
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 3;
 LENGTH(data)
 16384
+include/sync_slave_sql_with_master.inc
 
 **** Data Insert Validation Slave Section test.t1 ****
 
@@ -53,6 +54,7 @@
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 2;
 LENGTH(data)
 17408
+include/sync_slave_sql_with_master.inc
 
 **** Data Update Validation Slave Section test.t1 ****
 
@@ -112,6 +114,7 @@
 FROM test.t2 WHERE c1=2;
 c1	LENGTH(c2)	SUBSTR(c2,1+2*900,2)	LENGTH(c4)	SUBSTR(c4,1+3*900,3)
 2	20000	b2	30000	dd2
+include/sync_slave_sql_with_master.inc
 
 **** Data Insert Validation Slave Section test.t2 ****
 
@@ -139,6 +142,7 @@
 FROM test.t2 WHERE c1=2;
 c1	LENGTH(c2)	SUBSTR(c2,1+2*900,2)	LENGTH(c4)	SUBSTR(c4,1+3*900,3)
 2	2256	b1	3000	dd1
+include/sync_slave_sql_with_master.inc
 
 **** Data Update Validation Slave Section test.t2 ****
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_corrupt.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_corrupt.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_corrupt.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_corrupt.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,14 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+DROP TABLE IF EXISTS t1;
+Warnings:
+Note	1051	Unknown table 'test.t1'
+CREATE TABLE t1(a varchar(40000))ENGINE=INNODB;
+INSERT INTO t1 VALUES (REPEAT('a',37000));
+INSERT INTO t1 VALUES (REPEAT('b',32552));
+include/diff_tables.inc [master:t1,slave:t1]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_crash_safe.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_crash_safe.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_crash_safe.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_crash_safe.result	2017-02-27 07:47:02.000000000 +0000
@@ -1584,6 +1584,474 @@
 include/rpl_reconnect.inc
 START SLAVE;
 include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=T]
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (37, 1);
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=T-trig]
+-b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_5(trans_id, stmt_id) VALUES (38, 1);
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=T-func]
+-b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
+SELECT fc_i_tt_5_suc (39, 1);
+fc_i_tt_5_suc (39, 1)
+fc_i_tt_5_suc
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=T-proc]
+-b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
+CALL pc_i_tt_5_suc (40, 1);
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T T-trig C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (41, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_5(trans_id, stmt_id) VALUES (41, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T T-trig C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T T-func C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (42, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
+SELECT fc_i_tt_5_suc (42, 4);
+fc_i_tt_5_suc (42, 4)
+fc_i_tt_5_suc
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T T-func C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T T-proc C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (43, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
+CALL pc_i_tt_5_suc (43, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T T-proc C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T-trig T C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_5(trans_id, stmt_id) VALUES (44, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (44, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T-trig T C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T-func T C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
+SELECT fc_i_tt_5_suc (45, 2);
+fc_i_tt_5_suc (45, 2)
+fc_i_tt_5_suc
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (45, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T-func T C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T-proc T C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
+CALL pc_i_tt_5_suc (46, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (46, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T-proc T C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
 ###################################################################################
 #                      EXECUTE CASES CRASHING THE BEGIN/COMMIT
 ###################################################################################
@@ -1596,7 +2064,7 @@
 FAILURE d,crash_after_commit_and_update_pos and OUTCOME O2
 rpl_mixing_engines.inc [commands=N]
 -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
-INSERT INTO nt_1(trans_id, stmt_id) VALUES (37, 1);
+INSERT INTO nt_1(trans_id, stmt_id) VALUES (47, 1);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1625,7 +2093,7 @@
 FAILURE d,crash_after_commit_and_update_pos and OUTCOME O2
 rpl_mixing_engines.inc [commands=N-trig]
 -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
-INSERT INTO nt_5(trans_id, stmt_id) VALUES (38, 1);
+INSERT INTO nt_5(trans_id, stmt_id) VALUES (48, 1);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1658,8 +2126,8 @@
 FAILURE d,crash_after_commit_and_update_pos and OUTCOME O2
 rpl_mixing_engines.inc [commands=N-func]
 -b-b-b-b-b-b-b-b-b-b-b- >> N-func << -b-b-b-b-b-b-b-b-b-b-b-
-SELECT fc_i_nt_5_suc (39, 1);
-fc_i_nt_5_suc (39, 1)
+SELECT fc_i_nt_5_suc (49, 1);
+fc_i_nt_5_suc (49, 1)
 fc_i_nt_5_suc
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_create_select.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_create_select.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_create_select.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_create_select.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,31 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# BUG#17994219: CREATE TABLE .. SELECT PRODUCES INVALID STRUCTURE, 
+#               BREAKS RBR 
+#
+#After the patch, the display width is set to a default
+#value of 21.
+CREATE TABLE t1 AS SELECT REPEAT('A', 1000) DIV 1 AS a;
+Warnings:
+Warning	1366	Incorrect decimal value: '' for column '' at row -1
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` bigint(21) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+CREATE TABLE t2 AS SELECT CONVERT(REPEAT('A', 255) USING UCS2) DIV 1 AS a;
+Warnings:
+Warning	1366	Incorrect decimal value: '' for column '' at row -1
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` bigint(21) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+#After the patch, no error is reported.
+DROP TABLE t1;
+DROP TABLE t2;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result	2017-02-27 07:47:02.000000000 +0000
@@ -129,8 +129,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-If-NXe-Temp << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-If-NXe-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-TN-Temp';
@@ -462,12 +461,11 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_xx_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -486,20 +484,18 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_xx_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_xx_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1016,13 +1012,8 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_xx_1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp R';
@@ -1043,21 +1034,15 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_xx_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_xx_1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'B T Drop-Temp-TN-Temp R';
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_hash_scan_sanity.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_hash_scan_sanity.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_hash_scan_sanity.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_hash_scan_sanity.result	2017-02-27 07:47:02.000000000 +0000
@@ -43,6 +43,27 @@
 UPDATE t2 SET c1= 7;
 UPDATE t3 SET c1= 7;
 UPDATE t4 SET c1= 7;
+SET @@global.slave_rows_search_algorithms= 'HASH_SCAN';
+CREATE TABLE t5(c1 INT, c2 INT, KEY(c2));
+INSERT INTO t5 VALUES (1,1),(2,2),(3,1),(4,NULL),(5,2),(6,3);
+DELETE FROM t5 ORDER BY c1;
+DROP TABLE t5;
+include/sync_slave_sql_with_master.inc
+CREATE TABLE t5(c1 BIGINT, c2 BIGINT, KEY(c2));
+INSERT INTO t5 VALUES (1,1),(2,2),(3,1),(4,NULL),(5,2),(6,3);
+DELETE FROM t5 ORDER BY c1;
+DROP TABLE t5;
+include/sync_slave_sql_with_master.inc
+CREATE TABLE t5(c1 INT, c2 VARCHAR(20), KEY(c2));
+INSERT INTO t5 VALUES (1,"value1"),(2,"value2"),(3,"value1"),(4,NULL),(5,"value2"),(6,"value3");
+DELETE FROM t5 ORDER BY c1;
+DROP TABLE t5;
+include/sync_slave_sql_with_master.inc
+CREATE TABLE t5(c1 INT, c2 INT, c3 VARCHAR(20), KEY(c2,c3));
+INSERT INTO t5 VALUES (1,1,"ab"),(2,2,"cde"),(3,1,"12345"),(4,4,"random"),(5,NULL,NULL),(6,5,NULL),(7,NULL,"lmnopqr");
+DELETE FROM t5 ORDER BY c1;
+DROP TABLE t5;
+include/sync_slave_sql_with_master.inc
 SET @@global.slave_rows_search_algorithms= @saved_slave_rows_search_algorithms;
 DROP TABLE IF EXISTS t1, t2, t3, t4;
 include/sync_slave_sql_with_master.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result	2017-02-27 07:47:02.000000000 +0000
@@ -473,69 +473,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -586,69 +529,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -718,69 +604,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -812,69 +641,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -925,69 +697,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1057,69 +772,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1170,69 +828,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1321,69 +922,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1510,69 +1054,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1623,69 +1110,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1774,69 +1204,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1963,69 +1336,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2095,69 +1411,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2284,69 +1543,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2530,69 +1732,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2662,69 +1807,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2851,69 +1939,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3097,69 +2128,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3210,69 +2184,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3342,69 +2259,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3455,69 +2315,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3587,69 +2390,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3700,69 +2446,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3832,69 +2521,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3983,69 +2615,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4172,69 +2747,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4323,69 +2841,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4512,69 +2973,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4663,69 +3067,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4852,69 +3199,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5041,69 +3331,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5287,69 +3520,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5476,69 +3652,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5722,69 +3841,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5911,69 +3973,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6157,69 +4162,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6289,69 +4237,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6421,69 +4312,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6553,69 +4387,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6685,69 +4462,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6874,69 +4594,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7063,69 +4726,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7252,69 +4858,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7441,69 +4990,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7687,69 +5179,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7933,69 +5368,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -8179,69 +5557,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -8425,69 +5746,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result	2017-02-27 07:47:02.000000000 +0000
@@ -473,69 +473,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -586,69 +529,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -718,69 +604,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -812,69 +641,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -925,69 +697,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1057,69 +772,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1170,69 +828,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1321,69 +922,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1510,69 +1054,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1623,69 +1110,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1774,69 +1204,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1963,69 +1336,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2095,69 +1411,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2284,69 +1543,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2530,69 +1732,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2662,69 +1807,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2851,69 +1939,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3097,69 +2128,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3210,69 +2184,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3342,69 +2259,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3455,69 +2315,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3587,69 +2390,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3700,69 +2446,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3832,69 +2521,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3983,69 +2615,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4172,69 +2747,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4323,69 +2841,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4512,69 +2973,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4663,69 +3067,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4852,69 +3199,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5041,69 +3331,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5287,69 +3520,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5476,69 +3652,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5722,69 +3841,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5911,69 +3973,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6157,69 +4162,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6289,69 +4237,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6421,69 +4312,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6553,69 +4387,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6685,69 +4462,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6874,69 +4594,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7063,69 +4726,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7252,69 +4858,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7441,69 +4990,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7687,69 +5179,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7933,69 +5368,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -8179,69 +5557,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -8425,69 +5746,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_USER.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_USER.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_row_USER.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_row_USER.result	2017-02-27 07:47:02.000000000 +0000
@@ -12,11 +12,11 @@
 CREATE TABLE mysqltest1.t1 (a INT, users VARCHAR(255), PRIMARY KEY(a));
 INSERT INTO mysqltest1.t1 VALUES(1,USER());
 INSERT INTO mysqltest1.t1 VALUES(2,CURRENT_USER());
-create procedure mysqltest1.p1()
-begin
+CREATE PROCEDURE mysqltest1.p1()
+BEGIN
 INSERT INTO mysqltest1.t1 VALUES(3,USER());
 INSERT INTO mysqltest1.t1 VALUES(4,CURRENT_USER());
-end|
+END|
 CALL mysqltest1.p1();
 SELECT * FROM mysqltest1.t1 ORDER BY a;
 a	users
@@ -37,4 +37,35 @@
 DROP USER tester@'%';
 DROP USER ''@'localhost%';
 include/sync_slave_sql_with_master.inc
+DROP DATABASE IF EXISTS mysqltest1;
+CREATE DATABASE mysqltest1;
+CREATE USER 'tester1'@'' IDENTIFIED BY 'test';
+GRANT ALL ON mysqltest1.* TO 'tester1'@'' IDENTIFIED BY 'test';
+FLUSH PRIVILEGES;
+CREATE TABLE mysqltest1.t1 (a INT, users VARCHAR(255), PRIMARY KEY(a));
+INSERT INTO mysqltest1.t1 VALUES(1,USER());
+INSERT INTO mysqltest1.t1 VALUES(2,CURRENT_USER());
+CREATE PROCEDURE mysqltest1.p1()
+BEGIN
+INSERT INTO mysqltest1.t1 VALUES(3,USER());
+INSERT INTO mysqltest1.t1 VALUES(4,CURRENT_USER());
+END|
+CALL mysqltest1.p1();
+SELECT * FROM mysqltest1.t1 ORDER BY a;
+a	users
+1	tester1@localhost
+2	tester1@
+3	tester1@localhost
+4	tester1@
+include/sync_slave_sql_with_master.inc
+SELECT * FROM mysqltest1.t1 ORDER BY a;
+a	users
+1	tester1@localhost
+2	tester1@
+3	tester1@localhost
+4	tester1@
+DROP DATABASE mysqltest1;
+REVOKE ALL ON mysqltest1.* FROM 'tester1'@'';
+DROP USER tester1@'';
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_sbm_previous_gtid_event.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_sbm_previous_gtid_event.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_sbm_previous_gtid_event.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_sbm_previous_gtid_event.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,61 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+SET @save_global_debug=@@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,dbug.calculate_sbm_after_previous_gtid_log_event';
+SET @saved_slave_transaction_retries=@@global.slave_transaction_retries;
+SET @@global.slave_transaction_retries=0;
+include/start_slave_io.inc
+include/stop_slave_io.inc
+include/start_slave_io.inc
+CREATE TABLE t1(i INT);
+INSERT INTO t1 VALUES (20);
+INSERT INTO t1 VALUES (19);
+INSERT INTO t1 VALUES (18);
+INSERT INTO t1 VALUES (17);
+INSERT INTO t1 VALUES (16);
+INSERT INTO t1 VALUES (15);
+INSERT INTO t1 VALUES (14);
+INSERT INTO t1 VALUES (13);
+INSERT INTO t1 VALUES (12);
+INSERT INTO t1 VALUES (11);
+INSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (9);
+INSERT INTO t1 VALUES (8);
+INSERT INTO t1 VALUES (7);
+INSERT INTO t1 VALUES (6);
+INSERT INTO t1 VALUES (5);
+INSERT INTO t1 VALUES (4);
+INSERT INTO t1 VALUES (3);
+INSERT INTO t1 VALUES (2);
+DROP TABLE t1;
+FLUSH LOGS;
+FLUSH LOGS;
+include/sync_slave_io_with_master.inc
+include/start_slave_sql.inc
+SET DEBUG_SYNC="now wait_for signal.reached";
+include/assert.inc [Seconds Behind Master should be less than 180 seconds.]
+SET DEBUG_SYNC="now signal signal.done_sbm_calculation";
+SET DEBUG_SYNC="now wait_for signal.reached";
+include/assert.inc [Seconds Behind Master should be less than 180 seconds.]
+SET DEBUG_SYNC="now signal signal.done_sbm_calculation";
+SET DEBUG_SYNC="now wait_for signal.reached";
+include/assert.inc [Seconds Behind Master should be less than 180 seconds.]
+SET DEBUG_SYNC="now signal signal.done_sbm_calculation";
+SET DEBUG_SYNC="now wait_for signal.reached";
+include/assert.inc [Seconds Behind Master should be less than 180 seconds.]
+SET DEBUG_SYNC="now signal signal.done_sbm_calculation";
+SET DEBUG_SYNC="now wait_for signal.reached";
+include/assert.inc [Seconds Behind Master should be less than 180 seconds.]
+SET DEBUG_SYNC="now signal signal.done_sbm_calculation";
+SET DEBUG_SYNC="now wait_for signal.reached";
+include/assert.inc [Seconds Behind Master should be less than 180 seconds.]
+SET DEBUG_SYNC="now signal signal.done_sbm_calculation";
+SET DEBUG_SYNC="now wait_for signal.reached";
+include/assert.inc [Seconds Behind Master should be less than 180 seconds.]
+SET DEBUG_SYNC="now signal signal.done_sbm_calculation";
+SET @@GLOBAL.DEBUG=@save_global_debug;
+SET @@global.slave_transaction_retries=@saved_slave_transaction_retries;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync_deadlock.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync_deadlock.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync_deadlock.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync_deadlock.result	2017-02-27 07:47:02.000000000 +0000
@@ -8,7 +8,7 @@
 SET GLOBAL rpl_semi_sync_master_timeout= 600000;
 include/sync_slave_sql_with_master.inc
 SET GLOBAL debug= 'd,semi_sync_3-way_deadlock';
-SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished";
+SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished no_clear_event";
 # Build 10 connections to master server
 # Execute INSERT statement on these 10 connections in parallel
 SET DEBUG_SYNC= "before_rotate_binlog SIGNAL signal.rotate_finished";
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync_future_logpos.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync_future_logpos.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync_future_logpos.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync_future_logpos.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,32 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+include/install_semisync.inc
+call mtr.add_suppression("Timeout waiting for reply of binlog*");
+call mtr.add_suppression("Read semi-sync reply network error");
+[connection master]
+CREATE TABLE t1 (a INT);
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+[connection master]
+INSERT INTO t1 VALUES(0);
+[connection master1]
+[connection slave]
+CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000002', MASTER_LOG_POS=4, MASTER_AUTO_POSITION=0;
+START SLAVE;
+include/wait_for_slave_io_error.inc [errno=1236]
+[connection master]
+INSERT INTO t1 VALUES (20);
+[connection master]
+include/assert.inc [semi sync master clients should be 0.]
+[connection slave]
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_LOG_FILE=FILE,  MASTER_LOG_POS= POS, MASTER_AUTO_POSITION=0;
+include/start_slave.inc
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+include/uninstall_semisync.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync.result	2017-02-27 07:47:02.000000000 +0000
@@ -403,6 +403,7 @@
 Rpl_semi_sync_slave_status	ON
 include/stop_slave.inc
 [ on master ]
+include/stop_dump_threads.inc
 UNINSTALL PLUGIN rpl_semi_sync_master;
 SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
 Variable_name	Value
@@ -454,9 +455,8 @@
 #
 # Clean up
 #
+include/uninstall_semisync.inc
 include/stop_slave.inc
-UNINSTALL PLUGIN rpl_semi_sync_slave;
-UNINSTALL PLUGIN rpl_semi_sync_master;
 change master to master_user='root',master_password='';
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync_shutdown_hang.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync_shutdown_hang.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync_shutdown_hang.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync_shutdown_hang.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,24 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+include/install_semisync.inc
+call mtr.add_suppression("Read semi-sync reply network error");
+call mtr.add_suppression("SEMISYNC: Forced shutdown. Some updates might not be replicated.");
+[connection master]
+SET GLOBAL rpl_semi_sync_master_timeout = 10000000;
+[connection slave]
+include/stop_slave_io.inc
+[connection master]
+CREATE TABLE t(f INT) ENGINE=INNODB;;
+[connection master1]
+[connection master]
+include/rpl_start_server.inc [server_number=1]
+[connection slave]
+include/start_slave_io.inc
+[connection master]
+DROP TABLE t;
+include/sync_slave_sql_with_master.inc
+include/uninstall_semisync.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,39 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_PLUGIN';
+INSTALL PLUGIN rpl_semi_sync_slave SONAME 'SEMISYNC_SLAVE_PLUGIN';
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+UNINSTALL PLUGIN rpl_semi_sync_master;
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (1);
+DROP TABLE t1;
+include/install_semisync.inc
+call mtr.add_suppression("Plugin 'rpl_semi_sync_slave' cannot be uninstalled now");
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+ERROR HY000: Plugin 'rpl_semi_sync_slave' cannot be uninstalled now. Stop any active semisynchronous I/O threads on this slave first.
+call mtr.add_suppression("Plugin 'rpl_semi_sync_master' cannot be uninstalled now");
+UNINSTALL PLUGIN rpl_semi_sync_master;
+ERROR HY000: Plugin 'rpl_semi_sync_master' cannot be uninstalled now. Stop any active semisynchronous slaves of this master first.
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (2);
+DROP TABLE t1;
+include/assert.inc [semi sync slave status should be ON.]
+include/assert.inc [semi sync master status should be ON.]
+include/assert.inc [semi sync master clients should be 1.]
+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
+include/assert.inc [semi sync master clients should be 1.]
+UNINSTALL PLUGIN rpl_semi_sync_master;
+ERROR HY000: Plugin 'rpl_semi_sync_master' cannot be uninstalled now. Stop any active semisynchronous slaves of this master first.
+include/stop_slave.inc
+SET GLOBAL rpl_semi_sync_slave_enabled = OFF;
+include/start_slave.inc
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+include/assert.inc [semi sync master clients should be 0.]
+UNINSTALL PLUGIN rpl_semi_sync_master;
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (3);
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_server_uuid.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_server_uuid.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_server_uuid.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_server_uuid.result	2017-02-27 07:47:02.000000000 +0000
@@ -6,7 +6,7 @@
 call mtr.add_suppression("Slave I/O thread .* register on master");
 call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: .*");
 CALL mtr.add_suppression(".*master and slave have equal MySQL server UUIDs.*");
-CALL mtr.add_suppression("Master's UUID has changed, its old UUID is.*");
+CALL mtr.add_suppression("Master's UUID has changed, although this should not happen unless you have changed it manually");
 CALL mtr.add_suppression("Slave I/O: SET @master_heartbeat_period to master failed with error: Lost connection to MySQL server during query");
 CALL mtr.add_suppression("Notifying master by SET @master_binlog_checksum= @@global.binlog_checksum failed with error");
 include/sync_slave_sql_with_master.inc
@@ -117,4 +117,25 @@
 CHANGE MASTER TO 
 MASTER_LOG_FILE= 'MASTER_LOG_FILE', MASTER_LOG_POS= MASTER_POS;
 include/start_slave.inc
+
+# Case 6:
+# In an existing master-slave replication forum (M->S1), if another
+# slave (S2) with the same UUID as S1 joins the forum and connects
+# to Master(M), then there will be ping-pong reconnections happens
+# between M->S2, M->S1, M->S2, M->S1,.... And both slave1 and slave2
+# will be informed about this UUID misconfiguration in their error
+# log file. And Master log will be populated with information that
+# it found a zombie dump thread and it is killing it(only when
+# log_warnings is greater than 1)
+-----------------------------------------------------------------------------
+include/rpl_restart_server.inc [server_number=3]
+CREATE TABLE t1(i int);
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+Pattern "found a zombie dump thread with the same UUID" found
+Pattern "master receives a binlog send request from a duplicate server UUID" found
+Pattern "master receives a binlog send request from a duplicate server UUID" found
+include/rpl_restart_server.inc [server_number=3]
+include/stop_slave.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+# Let master and slave synced with t1 table created
+CREATE TABLE t1 (f INT) ENGINE= INNODB;
+include/sync_slave_sql_with_master.inc
+# Setup GLOBAL.DEBUG at slave to reach commit
+[connection slave]
+SET @@GLOBAL.DEBUG= '+d,dbug.reached_commit';
+# Do some DML operation on master so that it will be blocked on
+# slave as global read lock is in place.
+[connection master]
+INSERT INTO t1 VALUES (10);
+# Issue FLUSH TABLES WITH READ LOCK after Reached is signaled
+[connection slave]
+SET DEBUG_SYNC='now WAIT_FOR Reached';
+FLUSH TABLES WITH READ LOCK;
+# Let sql thread continue to try to obtain commit lock
+SET DEBUG_SYNC= 'now SIGNAL signal.commit_continue';
+# Wait until sql thread enters "Waiting for commit lock" state
+[connection slave]
+SHOW SLAVE STATUS;
+UNLOCK TABLES;
+SET @@GLOBAL.DEBUG= '$debug_saved';
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_special_charset.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_special_charset.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_special_charset.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_special_charset.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,10 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE t1(i VARCHAR(20));
+INSERT INTO t1 VALUES (0xFFFF);
+include/diff_tables.inc [master:t1, slave:t1]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_sp_privileges.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_sp_privileges.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_sp_privileges.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_sp_privileges.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,65 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection master]
+CREATE TABLE t1 (f INT);
+INSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (20);
+include/sync_slave_sql_with_master.inc
+[connection master]
+CREATE USER 'testuser'@'localhost';
+GRANT CREATE ROUTINE ON test.* TO 'testuser'@'localhost';
+GRANT REPLICATION CLIENT ON *.* TO 'testuser'@'localhost';
+FLUSH PRIVILEGES;
+CREATE DEFINER='testuser'@'localhost' PROCEDURE row_cnt()
+BEGIN
+SELECT COUNT(*) as total_rows FROM test.t1;
+END|
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert.inc [Assert that mysql.procs_priv table is empty]
+[connection slave]
+include/assert.inc [Assert that mysql.procs_priv table is empty]
+[connection master]
+DROP PROCEDURE row_cnt;
+include/sync_slave_sql_with_master.inc
+[connection master]
+CREATE  PROCEDURE row_cnt()
+BEGIN
+SELECT COUNT(*) as total_rows FROM test.t1;
+END|
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert.inc [Assert that mysql.procs_priv table is empty]
+[connection slave]
+include/assert.inc [Assert that mysql.procs_priv table is empty]
+[connection master]
+DROP PROCEDURE row_cnt;
+include/sync_slave_sql_with_master.inc
+CREATE DEFINER='testuser'@'localhost' PROCEDURE row_cnt()
+BEGIN
+SELECT COUNT(*) as total_rows FROM test.t1;
+END|
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert.inc [Assert that mysql.procs_priv table has one row for testuser]
+[connection slave]
+include/assert.inc [Assert that mysql.procs_priv table has one row for testuser]
+DROP PROCEDURE row_cnt;
+include/sync_slave_sql_with_master.inc
+CREATE PROCEDURE row_cnt()
+BEGIN
+SELECT COUNT(*) as total_rows FROM test.t1;
+END|
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert.inc [Assert that mysql.procs_priv table has one row for testuser]
+[connection slave]
+include/assert.inc [Assert that mysql.procs_priv table has one row for testuser]
+[connection master]
+DROP TABLE t1;
+DROP PROCEDURE row_cnt;
+DROP USER 'testuser'@'localhost';
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_sql_thread_killed_waiting_commit_lock.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_sql_thread_killed_waiting_commit_lock.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_sql_thread_killed_waiting_commit_lock.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_sql_thread_killed_waiting_commit_lock.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,38 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+call mtr.add_suppression("Query execution was interrupted.");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+# Let master and slave synced with t1 table created
+CREATE TABLE t1 (f INT) ENGINE= INNODB;
+include/sync_slave_sql_with_master.inc
+# Setup GLOBAL.DEBUG at slave to reach commit
+[connection slave]
+SET @@GLOBAL.DEBUG= '+d,dbug.reached_commit';
+# Do some DML operation on master so that it will be blocked on
+# slave as global read lock is in place.
+[connection master]
+INSERT INTO t1 VALUES (10);
+# Issue FLUSH TABLES WITH READ LOCK after Reached is signaled
+[connection slave]
+SET DEBUG_SYNC='now WAIT_FOR Reached';
+FLUSH TABLES WITH READ LOCK;
+# Let sql thread continue to try to obtain commit lock
+SET DEBUG_SYNC= 'now SIGNAL signal.commit_continue';
+# Wait until sql thread enters "Waiting for commit lock" state
+# Kill sql thread
+include/wait_for_slave_sql_error.inc [errno=1317, 1756]
+# Restart sql thread to let it finish the replication
+SET @@GLOBAL.DEBUG= '-d,dbug.reached_commit';
+UNLOCK TABLES;
+include/assert.inc [Exec_Master_Log_Pos in SHOW SLAVE STATUS must be equal to mater_log_pos in slave's repository]
+include/start_slave_sql.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+SET @@GLOBAL.DEBUG= '$debug_saved';
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result	2017-02-27 07:47:02.000000000 +0000
@@ -129,8 +129,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-If-NXe-Temp << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-If-NXe-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-TN-Temp';
@@ -441,11 +440,10 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -464,18 +462,16 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -960,12 +956,8 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp R';
@@ -986,19 +978,14 @@
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`tt_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_1` /* generated by server */
-master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'B T Drop-Temp-TN-Temp R';
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2017-02-27 07:47:02.000000000 +0000
@@ -1290,6 +1290,376 @@
 include/rpl_reconnect.inc
 START SLAVE;
 include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=T]
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (37, 1);
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (37, 1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (37, 1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=T-trig]
+-b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_5(trans_id, stmt_id) VALUES (38, 1);
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES (38, 1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES (38, 1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=T-func]
+-b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
+SELECT fc_i_tt_5_suc (39, 1);
+fc_i_tt_5_suc (39, 1)
+fc_i_tt_5_suc
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(39,1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(39,1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=T-proc]
+-b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
+CALL pc_i_tt_5_suc (40, 1);
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',40),  NAME_CONST('in_stmt_id',1))
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',40),  NAME_CONST('in_stmt_id',1) + 1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',40),  NAME_CONST('in_stmt_id',1))
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',40),  NAME_CONST('in_stmt_id',1) + 1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T T-trig C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (41, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_5(trans_id, stmt_id) VALUES (41, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (41, 2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES (41, 4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T T-trig C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (41, 2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES (41, 4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T T-func C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (42, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
+SELECT fc_i_tt_5_suc (42, 4);
+fc_i_tt_5_suc (42, 4)
+fc_i_tt_5_suc
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (42, 2)
+master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(42,4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T T-func C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (42, 2)
+master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(42,4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T T-proc C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (43, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
+CALL pc_i_tt_5_suc (43, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (43, 2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',43),  NAME_CONST('in_stmt_id',1))
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',43),  NAME_CONST('in_stmt_id',1) + 1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T T-proc C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (43, 2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',43),  NAME_CONST('in_stmt_id',1))
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',43),  NAME_CONST('in_stmt_id',1) + 1)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T-trig T C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_5(trans_id, stmt_id) VALUES (44, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (44, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES (44, 2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (44, 4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T-trig T C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES (44, 2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (44, 4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T-func T C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
+SELECT fc_i_tt_5_suc (45, 2);
+fc_i_tt_5_suc (45, 2)
+fc_i_tt_5_suc
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (45, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(45,2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (45, 4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T-func T C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(45,2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (45, 4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
+
+
+
+STOP SLAVE SQL_THREAD;
+include/wait_for_slave_sql_to_stop.inc
+SET GLOBAL debug="d,crash_after_commit_before_update_pos";;
+FAILURE d,crash_after_commit_before_update_pos and OUTCOME O2
+rpl_mixing_engines.inc [commands=B T-proc T C]
+-b-b-b-b-b-b-b-b-b-b-b- >> B << -b-b-b-b-b-b-b-b-b-b-b-
+BEGIN;
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> B << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
+CALL pc_i_tt_5_suc (46, 2);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
+INSERT INTO tt_1(trans_id, stmt_id) VALUES (46, 4);
+include/show_binlog_events.inc
+-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
+COMMIT;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',46),  NAME_CONST('in_stmt_id',1))
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',46),  NAME_CONST('in_stmt_id',1) + 1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (46, 4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
+-b-b-b-b-b-b-b-b-b-b-b- >> B T-proc T C << -b-b-b-b-b-b-b-b-b-b-b-
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',46),  NAME_CONST('in_stmt_id',1))
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES ( NAME_CONST('p_trans_id',46),  NAME_CONST('in_stmt_id',1) + 1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (46, 4)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
+
+include/rpl_reconnect.inc
+START SLAVE;
+include/wait_for_slave_to_start.inc
 ###################################################################################
 #                      EXECUTE CASES CRASHING THE BEGIN/COMMIT
 ###################################################################################
@@ -1302,18 +1672,18 @@
 FAILURE d,crash_after_commit_and_update_pos and OUTCOME O2
 rpl_mixing_engines.inc [commands=N]
 -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
-INSERT INTO nt_1(trans_id, stmt_id) VALUES (37, 1);
+INSERT INTO nt_1(trans_id, stmt_id) VALUES (47, 1);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES (37, 1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES (47, 1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES (37, 1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES (47, 1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1329,18 +1699,18 @@
 FAILURE d,crash_after_commit_and_update_pos and OUTCOME O2
 rpl_mixing_engines.inc [commands=N-trig]
 -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
-INSERT INTO nt_5(trans_id, stmt_id) VALUES (38, 1);
+INSERT INTO nt_5(trans_id, stmt_id) VALUES (48, 1);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES (38, 1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES (48, 1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES (38, 1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES (48, 1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1356,20 +1726,20 @@
 FAILURE d,crash_after_commit_and_update_pos and OUTCOME O2
 rpl_mixing_engines.inc [commands=N-func]
 -b-b-b-b-b-b-b-b-b-b-b- >> N-func << -b-b-b-b-b-b-b-b-b-b-b-
-SELECT fc_i_nt_5_suc (39, 1);
-fc_i_nt_5_suc (39, 1)
+SELECT fc_i_nt_5_suc (49, 1);
+fc_i_nt_5_suc (49, 1)
 fc_i_nt_5_suc
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(39,1)
+master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(49,1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> N-func << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(39,1)
+master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(49,1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -e-e-e-e-e-e-e-e-e-e-e-
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result	2017-02-27 07:47:02.000000000 +0000
@@ -471,69 +471,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -580,69 +523,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -706,69 +592,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -798,69 +627,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -907,69 +679,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1033,69 +748,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1142,69 +800,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1285,69 +886,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1462,69 +1006,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1571,69 +1058,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1714,69 +1144,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1891,69 +1264,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2017,69 +1333,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2194,69 +1453,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2422,69 +1624,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2548,69 +1693,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2725,69 +1813,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2953,69 +1984,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3062,69 +2036,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3188,69 +2105,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3297,69 +2157,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3423,69 +2226,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3532,69 +2278,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3658,69 +2347,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3801,69 +2433,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3978,69 +2553,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4121,69 +2639,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4298,69 +2759,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4441,69 +2845,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4618,69 +2965,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4795,69 +3085,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5023,69 +3256,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5200,69 +3376,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5428,69 +3547,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5605,69 +3667,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5833,69 +3838,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5959,69 +3907,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6085,69 +3976,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6211,69 +4045,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6337,69 +4114,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6514,69 +4234,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6691,69 +4354,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6868,69 +4474,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7045,69 +4594,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7273,69 +4765,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7501,69 +4936,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7729,69 +5107,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7957,69 +5278,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result	2017-02-27 07:47:02.000000000 +0000
@@ -471,69 +471,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -580,69 +523,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -706,69 +592,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -798,69 +627,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -907,69 +679,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1033,69 +748,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1142,69 +800,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1285,69 +886,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1462,69 +1006,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1571,69 +1058,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1714,69 +1144,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1891,69 +1264,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2017,69 +1333,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2194,69 +1453,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2422,69 +1624,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2548,69 +1693,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2725,69 +1813,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2953,69 +1984,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3062,69 +2036,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3188,69 +2105,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3297,69 +2157,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3423,69 +2226,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3532,69 +2278,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3658,69 +2347,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3801,69 +2433,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3978,69 +2553,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4121,69 +2639,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4298,69 +2759,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4441,69 +2845,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4618,69 +2965,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4795,69 +3085,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5023,69 +3256,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5200,69 +3376,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5428,69 +3547,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5605,69 +3667,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5833,69 +3838,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5959,69 +3907,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6085,69 +3976,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6211,69 +4045,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6337,69 +4114,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6514,69 +4234,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6691,69 +4354,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6868,69 +4474,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7045,69 +4594,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7273,69 +4765,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7501,69 +4936,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7729,69 +5107,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7957,69 +5278,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result	2017-02-27 07:47:02.000000000 +0000
@@ -471,69 +471,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -580,69 +523,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -706,69 +592,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -798,69 +627,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -907,69 +679,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1033,69 +748,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1142,69 +800,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1285,69 +886,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1462,69 +1006,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1571,69 +1058,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1714,69 +1144,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1891,69 +1264,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2017,69 +1333,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2194,69 +1453,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2422,69 +1624,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2548,69 +1693,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2725,69 +1813,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -2953,69 +1984,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3062,69 +2036,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3188,69 +2105,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3297,69 +2157,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3423,69 +2226,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3532,69 +2278,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3658,69 +2347,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3801,69 +2433,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -3978,69 +2553,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4121,69 +2639,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4298,69 +2759,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4441,69 +2845,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4618,69 +2965,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -4795,69 +3085,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5023,69 +3256,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5200,69 +3376,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5428,69 +3547,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5605,69 +3667,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5833,69 +3838,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -5959,69 +3907,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6085,69 +3976,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6211,69 +4045,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6337,69 +4114,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6514,69 +4234,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6691,69 +4354,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -6868,69 +4474,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7045,69 +4594,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7273,69 +4765,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7501,69 +4936,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7729,69 +5107,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -7957,69 +5278,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result	2017-02-27 07:47:02.000000000 +0000
@@ -367,69 +367,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -476,69 +419,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -568,69 +454,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -677,69 +506,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -786,69 +558,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -929,69 +644,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1038,69 +696,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1181,69 +782,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1290,69 +834,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1399,69 +886,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1508,69 +938,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1651,69 +1024,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1794,69 +1110,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
@@ -1937,69 +1196,12 @@
 ==== begin rpl_mts_crash_safe.inc:recovery ====
 include/start_slave_io.inc
 ** fixing gaps **
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
 include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0]
-==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0'
-.==== BEGIN include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-.==== END include/rpl_reconnect.inc ====
-. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
 include/wait_for_slave_param.inc [Until_Condition]
 include/wait_for_slave_sql_to_stop.inc
 ** regular restart **
 include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1]
-==== BEGIN include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-.==== BEGIN include/rpl_stop_server.inc ====
-[connection server_2]
-[connection slave]
-.==== END include/rpl_stop_server.inc [server_number=2] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-# debug: rpl_server_number='2' rpl_start_with_gtids='' rpl_server_parameters='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1' _RPL_START_SERVER_PARAMETERS='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-.==== BEGIN include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection server_2]
-# debug: params='--skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1'
-..==== BEGIN include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
----- Enable reconnect ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
----- Wait for reconnect and disable reconnect on all connections ----
-[connection slave]
-[connection slave1]
-[connection server_2]
-[connection server_2_1]
-[connection server_2]
-..==== END include/rpl_reconnect.inc ====
-.. con='server_2' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-.==== END include/rpl_start_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
-. con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
-[connection slave]
-==== END include/rpl_restart_server.inc [server_number=2 parameters: --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1] ====
- con='slave' warn='1' qlog='1' rlog='1' aborterr='1'
 include/start_slave_io.inc
 include/start_slave_sql.inc
 include/stop_slave.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_until_pos_middle_gtid.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_until_pos_middle_gtid.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stm_until_pos_middle_gtid.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stm_until_pos_middle_gtid.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,27 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+include/stop_slave_sql.inc
+# Saving master position to use on UNTIL clause of START SLAVE
+[connection master]
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+BEGIN;
+INSERT INTO t1 VALUES (1);
+COMMIT;
+include/sync_slave_io_with_master.inc
+# Start SQL thread until it executed the CREATE TABLE
+START SLAVE SQL_THREAD UNTIL MASTER_LOG_FILE = "MASTER_FILE", MASTER_LOG_POS = MASTER_POS;
+# Wait until SQL thread reaches last master binlog file
+include/wait_for_slave_param.inc [Relay_Master_Log_File]
+# Wait until SQL thread reaches desired master binlog position
+include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
+# If the desired position was reached, SQL thread should stop.
+include/wait_for_slave_sql_to_stop.inc
+include/assert.inc [t1 should be replicated]
+include/start_slave_sql.inc
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stop_slave.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stop_slave.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_stop_slave.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_stop_slave.result	2017-02-27 07:47:02.000000000 +0000
@@ -99,10 +99,12 @@
 CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES(1, 1);
 include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
 [connection master]
+include/stop_dump_threads.inc
 SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
 [connection slave]
-include/restart_slave.inc
+include/start_slave.inc
 BEGIN;
 UPDATE t1 SET c2 = 2 WHERE c1 = 1;
 [connection master]
@@ -121,8 +123,11 @@
 [connection slave]
 include/wait_for_slave_to_stop.inc
 [connection slave1]
+[connection master]
+SET GLOBAL debug= '$debug_save';
+include/stop_dump_threads.inc
+[connection slave1]
 include/start_slave.inc
 [connection master]
 DROP TABLE t1, t2;
-SET GLOBAL debug= $debug_save;
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_timestamp_upgrage_55.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_timestamp_upgrage_55.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_timestamp_upgrage_55.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_timestamp_upgrage_55.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+include/stop_slave.inc
+include/start_slave.inc
+[connection master]
+CREATE TABLE bug17532932(a TIMESTAMP,
+b DATETIME,
+c TIME)ENGINE=MYISAM;
+include/sync_slave_sql_with_master.inc
+DROP TABLE bug17532932;
+include/rpl_stop_server.inc [server_number=2]
+include/rpl_start_server.inc [server_number=2]
+include/rpl_start_slaves.inc
+[connection master]
+INSERT INTO bug17532932 VALUES ("2014-04-16 12:35:51",
+"2010-08-26 12:15:52",
+"-38:59:59");
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:bug17532932, slave:bug17532932]
+[connection master]
+DROP TABLE bug17532932;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,28 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+include/sync_slave_sql_with_master.inc
+# Set a debug point on slave to simulate unknown ignorable log events.
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,simulate_unknown_ignorable_log_event';
+[connection master]
+# Write a previous_gtids log event to binlog
+# on master if gtid mode is on.
+FLUSH LOGS;
+# Write a write_rows log event to binlog on master.
+INSERT INTO t1 VALUES (1);
+# The slave receiver thread simulates an unknown ignorable
+# log event by rewriting the write_rows log event and
+# previous_gtids log event if gtid mode is on before
+# writing it(them) in relay log.
+include/sync_slave_sql_with_master.inc
+# Verify that the slave applier thread skips these unknown ignorable
+# log event.
+include/assert.inc [Table t1 must not contain 1]
+SET GLOBAL DEBUG= @save_debug;
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_4threads_deadlock.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_4threads_deadlock.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_4threads_deadlock.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_4threads_deadlock.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,120 @@
+###############################################################################
+# Bug#17283409  4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
+#                        SHOW BINLOGS
+# Problem:  A deadlock was occuring when 4 threads were involved in acquiring
+#                locks
+#     Thread 1: Dump thread ( Slave is reconnecting, so on Master, a new dump
+#                    thread is trying kill zombie dump threads. It acquired
+#                    thread's LOCK_thd_data and it is about to acquire
+#                    mysys_var->current_mutex ( which LOCK_log)
+#     Thread 2: Application thread is executing show binlogs and acquired
+#                    LOCK_log and it is about to acquire LOCK_index.
+#     Thread 3: Applicaiton thread is executing Purge binary logs and acquired
+#                    LOCK_index and it is about to acquire LOCK_thread_count.
+#     Thread 4: Application thread is executing show processlist and acquired
+#                    LOCK_thread_count and it is about to acquire zombie dump
+#                    thread's LOCK_thd_data.
+#     Deadlock : Thread 1 -> Thread 2 -> Thread 3-> Thread 4 -> Thread 1
+# The same above deadlock was observed when thread 4 is replaced with another
+# thread which is executing 'SELECT * FROM information_schema.processlist'
+# command and acquired LOCK_thread_count and it is about to acquire zombie
+# dump thread's LOCK_thd_data.
+# Fix: Introuced a new lock (Lock_thread_remove) which will guard the thread
+# deletion (exit process) and the same lock is used in show processlist
+# execution instead of LOCK_thread_count. i.e., After the patch, Server allows
+# new threads to join the system but it will not allow any threads to execute
+# its 'cleanup' process.  Now the new lock order is: LOCK_thread_remove ->
+# LOCK_thd_data -> LOCK_log -> LOCK_index -> LOCK_thread_count Both the above
+# scenarios are tested with the below test code and it proves that there is no
+# deadlock after the fix.
+###############################################################################
+--source include/have_debug_sync.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+connect(master2,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect(master3,127.0.0.1,root,,test,$MASTER_MYPORT,);
+--connection master
+# Create atleast one binary log, otherwise purge logs command, show binary
+# logs command do not hit the DEBUG_SYNC points.
+FLUSH LOGS;
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='+d,before_dump_thread_acquires_current_mutex,processlist_acquiring_dump_threads_LOCK_thd_data';
+
+# Iteration 1 with "SHOW PROCESSLIST command"
+# Iteration 2 with "SELECT * FROM information_schema.processlist"
+--let $iter=2
+while ($iter)
+{
+  --connection slave
+  --source include/stop_slave.inc
+  --source include/start_slave.inc
+  # Thread 1
+  --connection master
+  --echo "Wait_for dump_thread_signal"
+  SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
+
+  # Thread 2
+  --connection master1
+  SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go_parked1';
+  --send SHOW BINARY LOGS
+
+  --connection master
+  echo "Wait_for parked1";
+  SET DEBUG_SYNC='now WAIT_FOR parked1';
+
+  # Thread 3
+  --connection master2
+  SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go_parked2';
+  --send PURGE BINARY LOGS BEFORE '9999-12-31'
+
+  --connection master
+  echo "Wait_for parked2";
+  SET DEBUG_SYNC='now WAIT_FOR parked2';
+
+  # Thread 4
+  --connection master3
+  SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go_parked3';
+  if ($iter == 1)
+  {
+    --let $query=SHOW PROCESSLIST
+  }
+  if ($iter == 2)
+  {
+    --let $query=SELECT * FROM information_schema.processlist
+  }
+  --send_eval $query
+
+  --connection master
+  echo "Wait_for parked3";
+  SET DEBUG_SYNC='now WAIT_FOR parked3';
+
+  echo "now signal go to all 4 waiting threads";
+  SET DEBUG_SYNC='now SIGNAL go_dump_thread';
+  SET DEBUG_SYNC='now SIGNAL go_parked1';
+  SET DEBUG_SYNC='now SIGNAL go_parked2';
+  SET DEBUG_SYNC='now SIGNAL go_parked3';
+
+  # Output of each command vary depends on other tests ran in suite(output vary
+  # in Pb2 runs), so lets ignore output. Anyways, we are interested in seeing
+  # that there is no deadlock.
+  --disable_result_log
+  --connection master1
+  --reap
+  --connection master2
+  --reap
+  --connection master3
+  --reap
+  --enable_result_log
+
+  --dec $iter
+}
+
+--echo "Cleanup"
+--disconnect master2
+--disconnect master3
+
+--connection master
+SET DEBUG_SYNC='RESET';
+SET GLOBAL DEBUG=@save_debug;
+source include/rpl_end.inc;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,72 @@
+###############################################################################
+# Bug #20436436  NEW->OLD ASSERT FAILURE `GTID_MODE > 0' IN 5.6.24 AT LOG_EVENT.CC:13555
+#
+# The problem is caused when slave sql thread is applying an
+# anonymous_gtid log events on mysql 5.6, since the
+# anonymous_gtid log event can be generated on mysql 5.7 after
+# wl#7592 when gtid_mode is OFF or OFF_PERMISSVE. So the
+# NEW->OLD replication is broken.
+#
+# On mysql 5.6, the slave sql thread should manage to apply the
+# anonymous_gtid log event successfully if gtid_mode is OFF;
+#
+# Steps to Reproduce:
+#  1) Stop slave threads and clear slave datadir.
+#  2) Copy the binlog with Anonymous_GTID log events and
+#     relay log index to slave datadir.
+#  3) Make sure that the binlog with Anonymous_GTID log events
+#     is applied completely.
+###############################################################################
+
+--source include/not_gtid_enabled.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+# Initial setup
+--source include/rpl_connection_slave.inc
+--let $MYSQLD_SLAVE_DATADIR= `select @@datadir`
+
+--echo #
+--echo # Stop slave threads and clear slave datadir.
+--echo #
+--source include/stop_slave.inc
+RESET SLAVE;
+--remove_file $MYSQLD_SLAVE_DATADIR/slave-relay-bin.000001
+--remove_file $MYSQLD_SLAVE_DATADIR/slave-relay-bin.index
+
+--source include/rpl_connection_master.inc
+CREATE TABLE t1 (c1 INT);
+
+--source include/rpl_connection_slave.inc
+--echo #
+--echo # Copy the binlog with Anonymous_GTID log events and
+--echo # relay log index to slave datadir.
+--echo #
+# On Win* platforms path separator is backslash.
+if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) IN ('Win32', 'Win64', 'Windows')`)
+{
+  --copy_file std_data/slave-relay-bin_win.index $MYSQLD_SLAVE_DATADIR/slave-relay-bin.index
+}
+if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) NOT IN ('Win32', 'Win64', 'Windows')`)
+{
+  --copy_file std_data/slave-relay-bin_linux.index $MYSQLD_SLAVE_DATADIR/slave-relay-bin.index
+}
+--copy_file std_data/binlog_transaction_with_anonymous_GTID.000001 $MYSQLD_SLAVE_DATADIR/slave-relay-bin.000001
+
+--source include/start_slave.inc
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # Make sure that the binlog with Anonymous_GTID log events
+--echo # is applied completely.
+--echo #
+--let $assert_text= Table t2 must contain 1
+--let $assert_cond= "[SELECT c1 FROM t2]" = "1"
+--source include/assert.inc
+DROP TABLE t2;
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,74 @@
+###############################################################################
+# Bug #20436436  NEW->OLD ASSERT FAILURE `GTID_MODE > 0' IN 5.6.24 AT LOG_EVENT.CC:13555
+#
+# The problem is caused when slave sql thread is applying an
+# anonymous_gtid log events on mysql 5.6, since the
+# anonymous_gtid log event can be generated on mysql 5.7 after
+# wl#7592 when gtid_mode is OFF or OFF_PERMISSVE. So the
+# NEW->OLD replication is broken.
+#
+# On mysql 5.6, the slave sql thread should report an error and abort
+# when applying the anonymous_gtid log event if gtid_mode is ON.
+#
+# Steps to Reproduce:
+#  1) Stop slave threads and clear slave datadir.
+#  2) Copy the binlog with Anonymous_GTID log events and
+#     relay log index to slave datadir.
+#  3) Process the binlog with Anonymous_GTID log events
+#     and wait for SQL thread error.
+###############################################################################
+
+--source include/have_gtid.inc
+# We did not run the test with MTS, since the slave sql error
+# 'ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF' is
+# overwritten by 'ER_MTS_INCONSISTENT_DATA' in MTS.
+--source include/not_mts_slave_parallel_workers.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+--let $MYSQLD_SLAVE_DATADIR= `select @@datadir`
+
+--echo #
+--echo # Stop slave threads and clear slave datadir.
+--echo #
+--source include/stop_slave.inc
+RESET SLAVE;
+--remove_file $MYSQLD_SLAVE_DATADIR/slave-relay-bin.000001
+--remove_file $MYSQLD_SLAVE_DATADIR/slave-relay-bin.index
+
+--echo #
+--echo # Copy the binlog with Anonymous_GTID log events and
+--echo # relay log index to slave datadir.
+--echo #
+# On Win* platforms path separator is backslash.
+if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) IN ('Win32', 'Win64', 'Windows')`)
+{
+  --copy_file std_data/slave-relay-bin_win.index $MYSQLD_SLAVE_DATADIR/slave-relay-bin.index
+}
+if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) NOT IN ('Win32', 'Win64', 'Windows')`)
+{
+  --copy_file std_data/slave-relay-bin_linux.index $MYSQLD_SLAVE_DATADIR/slave-relay-bin.index
+}
+--copy_file std_data/binlog_transaction_with_anonymous_GTID.000001 $MYSQLD_SLAVE_DATADIR/slave-relay-bin.000001
+
+--echo #
+--echo # Process the binlog with Anonymous_GTID log events.
+--echo #
+START SLAVE;
+--echo #
+--echo # Wait for SQL thread error.
+--echo #
+call mtr.add_suppression("Slave.* @@SESSION.GTID_NEXT cannot be set to ANONYMOUS when @@GLOBAL.GTID_MODE = ON.");
+--let $slave_sql_errno= convert_error(ER_CANT_SET_GTID_NEXT_TO_ANONYMOUS_WHEN_GTID_MODE_IS_ON)
+--source include/wait_for_slave_sql_error.inc
+
+# Reset slave.
+--source include/stop_slave.inc
+RESET MASTER;
+RESET SLAVE;
+--source include/start_slave.inc
+
+# Cleanup
+--source include/rpl_connection_master.inc
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,68 @@
+###############################################################################
+# Bug #20436436  NEW->OLD ASSERT FAILURE `GTID_MODE > 0' IN 5.6.24 AT LOG_EVENT.CC:13555
+#
+# Verify that the slave sql thread should report an error and abort
+# when applying a gtid log event if gtid_mode is OFF on mysql 5.6.
+#
+# Steps to Reproduce:
+#  1) Stop slave threads and clear slave datadir.
+#  2) Copy the binlog with GTID log events and
+#     relay log index to slave datadir.
+#  3) Process the binlog with GTID log events
+#     and wait for SQL thread error.
+###############################################################################
+
+--source include/not_gtid_enabled.inc
+# We did not run the test with MTS, since the slave sql error
+# 'ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF' is
+# overwritten by 'ER_MTS_INCONSISTENT_DATA' in MTS.
+--source include/not_mts_slave_parallel_workers.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+--let $MYSQLD_SLAVE_DATADIR= `select @@datadir`
+
+--echo #
+--echo # Stop slave threads and clear slave datadir.
+--echo #
+--source include/stop_slave.inc
+RESET SLAVE;
+--remove_file $MYSQLD_SLAVE_DATADIR/slave-relay-bin.000001
+--remove_file $MYSQLD_SLAVE_DATADIR/slave-relay-bin.index
+
+--echo #
+--echo # Copy the binlog with Anonymous_GTID log events and
+--echo # relay log index to slave datadir.
+--echo #
+# On Win* platforms path separator is backslash.
+if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) IN ('Win32', 'Win64', 'Windows')`)
+{
+  --copy_file std_data/slave-relay-bin_win.index $MYSQLD_SLAVE_DATADIR/slave-relay-bin.index
+}
+if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) NOT IN ('Win32', 'Win64', 'Windows')`)
+{
+  --copy_file std_data/slave-relay-bin_linux.index $MYSQLD_SLAVE_DATADIR/slave-relay-bin.index
+}
+--copy_file std_data/binlog_transaction_with_GTID.000001 $MYSQLD_SLAVE_DATADIR/slave-relay-bin.000001
+
+--echo #
+--echo # Process the binlog with Anonymous_GTID log events.
+--echo #
+START SLAVE;
+--echo #
+--echo # Wait for SQL thread error.
+--echo #
+call mtr.add_suppression("Slave.* @@SESSION.GTID_NEXT cannot be set to UUID:NUMBER when @@GLOBAL.GTID_MODE = OFF.");
+--let $slave_sql_errno= convert_error(ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF)
+--source include/wait_for_slave_sql_error.inc
+
+# Reset slave.
+--source include/stop_slave.inc
+RESET MASTER;
+RESET SLAVE;
+--source include/start_slave.inc
+
+# Cleanup
+--source include/rpl_connection_master.inc
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_avoid_temporal_upgrade.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_avoid_temporal_upgrade.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_avoid_temporal_upgrade.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_avoid_temporal_upgrade.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,116 @@
+--echo #
+--echo # BUG#18985760 - "FAST" ALTER TABLE CHANGE ON ENUM COLUMN
+--echo #                 TRIGGERS FULL TABLE REBUILD.
+
+--echo # Test case below ensures that the columns with old temporal
+--echo # format are not upgraded on the slave since the global variable
+--echo # 'avoid_temporal_upgrade' is enabled on the slave.
+
+--source include/master-slave.inc
+
+--connection master
+--let MASTER_DATADIR=`select @@datadir`
+--connection slave
+--let SLAVE_DATADIR=`select @@datadir`
+
+--echo # Copy the table containing the old Mysql-5.5 temporal format
+--echo # to the master and slave.
+
+--copy_file std_data/55_temporal.frm $MASTER_DATADIR/test/t1.frm
+--copy_file std_data/55_temporal.MYD $MASTER_DATADIR/test/t1.MYD
+--copy_file std_data/55_temporal.MYI $MASTER_DATADIR/test/t1.MYI
+
+--copy_file std_data/55_temporal.frm $SLAVE_DATADIR/test/t1.frm
+--copy_file std_data/55_temporal.MYD $SLAVE_DATADIR/test/t1.MYD
+--copy_file std_data/55_temporal.MYI $SLAVE_DATADIR/test/t1.MYI
+
+--echo # Enable the 'avoid_temporal_column' global variable on slave.
+--connection slave
+STOP SLAVE;
+SET @@global.avoid_temporal_upgrade= ON;
+START SLAVE;
+
+--echo # ALTER TABLE on the master.
+--connection master
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+ALTER TABLE t1 ADD COLUMN fld1 INT;
+INSERT INTO t1 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22', 0);
+--echo # Since the global variable 'avoid_temporal_upgrade' is disabled on 
+--echo # the master, the temporal columns of old format are upgraded to the
+--echo # new format.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+--source include/sync_slave_sql_with_master.inc
+
+--echo # Since 'avoid_temporal_upgrade' is enabled on the slave,
+--echo # the old temporal will not be upgraded on the slave.
+--connection slave
+SET @saved_show_old_temporals= @@session.show_old_temporals;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+SET SESSION show_old_temporals= ON;
+SHOW CREATE TABLE t1;
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+SET @@session.show_old_temporals= @saved_show_old_temporals;
+
+--echo #Cleanup
+--connection master
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+
+--echo # Testcase to ensure that the temporal columns of old format
+--echo # are upgraded on the slave since 'avoid_temporal_column'
+--echo # global variable is not enabled on the slave.
+
+--echo # Copy the table containing the old Mysql-5.5 temporal format
+--echo # to the master and slave.
+
+--copy_file std_data/55_temporal.frm $MASTER_DATADIR/test/t1.frm
+--copy_file std_data/55_temporal.MYD $MASTER_DATADIR/test/t1.MYD
+--copy_file std_data/55_temporal.MYI $MASTER_DATADIR/test/t1.MYI
+
+--copy_file std_data/55_temporal.frm $SLAVE_DATADIR/test/t1.frm
+--copy_file std_data/55_temporal.MYD $SLAVE_DATADIR/test/t1.MYD
+--copy_file std_data/55_temporal.MYI $SLAVE_DATADIR/test/t1.MYI
+
+--echo # Disable the 'avoid_temporal_column' global variable on slave.
+--connection slave
+STOP SLAVE;
+SET @@global.avoid_temporal_upgrade= 0;
+START SLAVE;
+
+--echo # ALTER TABLE on the master.
+--connection master
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+ALTER TABLE t1 ADD COLUMN fld1 INT;
+INSERT INTO t1 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22', 0);
+
+--echo # Since the default value of 'avoid_temporal_upgrade' is FALSE,
+--echo # the old temporal will be upgraded on the master.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+SHOW CREATE TABLE t1;
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+
+--source include/sync_slave_sql_with_master.inc
+
+--echo # Since the default value of 'avoid_temporal_upgrade' is FALSE,
+--echo # the old temporal will be upgraded on the slave.
+--connection slave
+SET @saved_show_old_temporals= @@session.show_old_temporals;
+SET SESSION show_old_temporals= ON;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+SHOW CREATE TABLE t1;
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+SET @@session.show_old_temporals= @saved_show_old_temporals;
+
+--echo # cleanup
+--connection master
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_check_gtid.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_check_gtid.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_check_gtid.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_check_gtid.test	2017-02-27 07:47:02.000000000 +0000
@@ -504,6 +504,7 @@
   --connection slave
   --source include/stop_slave.inc
   RESET SLAVE;
+  RESET MASTER;
   --connection master
   RESET MASTER;
   --connection slave
@@ -525,14 +526,13 @@
 
   #  5.3 - Makes the slave to retrieve and apply these transactions.
   --source include/sync_slave_sql_with_master.inc
-
   # Check property 1.2, 2.1, 3.1 and 3.2
   --let $binlog= binlog
   --let $server_uuid= $master_uuid
-  --let $gtid_set_ini= 1
-  --let $gtid_set_end= 4
-  --let $gtid_ini=
-  --let $gtid_end=
+  --let $gtid_set_ini=
+  --let $gtid_set_end=
+  --let $gtid_ini= 1
+  --let $gtid_end= 2
   --source extra/rpl_tests/rpl_check_gtid.inc
 
   #  5.4 - Rotates both the binary logs on the slave and master.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_colSize.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_colSize.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_colSize.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_colSize.test	2017-02-27 07:47:02.000000000 +0000
@@ -215,16 +215,63 @@
 --let $sync_slave_connection= slave
 --source include/sync_slave_sql_with_master.inc
 
-
-
 --echo Insert some values and select them on master
 SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1;
 --replace_result default DEFAULT
 SHOW CREATE TABLE t1;
 
+###############################################################################
+# Bug#19704825 TEMPORARY SLAVE TYPE CONVERSION TABLES RELEASED TO EARLY
+# Problem: Memory used in preparing slave type conversion
+# temporary table is getting released early and causing unexpected results
+# in case of nested events.
+# Eg: If a insert statement is calling a trigger which contains another
+# insert statement.
+# Steps to reproduce:
+#  1) Create a table t1
+#  2) Change it's definition on slave, so that insert will create conversion
+#     temporary table on slave (set SLAVE_TYPE_CONVERSIONS appropriately to
+#     allow the scenario)
+#  3) Create a table t2
+#  4) Create a trigger on top of table t1. Inside the trigger, insert a tuple
+#      into table t2
+#  5) Insert a tuple into table t1 on Master
+#  6) Make sure this insert is replicated without any issues.
+###############################################################################
+
+# Step 1, 2 are already done by above test code.
+
+# Step 3: Create a table t2
+connection master;
+CREATE TABLE t2(i INTEGER);
+
+# Step 4: Create a trigger on top of table t1. Inside the trigger, insert a
+#          tuple into table t2
+--delimiter $$
+CREATE TRIGGER t1_tr BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+INSERT INTO t2 VALUES(1);
+END $$
+--delimiter ;
+
+# Step 5: Insert a tuple into table t1 on Master
+INSERT INTO t1 VALUES (
+  b'1010101',
+  b'10101011',
+  b'101010110101010101111',
+  b'10101010101',
+  b'10101011111'
+  );
+
+# Step 6) Make sure this insert is replicated without any issues.
+--source include/sync_slave_sql_with_master.inc
+
+# End of test for Bug#19704825
+
 --echo *** Cleanup  ***
 connection master;
 DROP TABLE t1;
+DROP TABLE t2;
 --source include/sync_slave_sql_with_master.inc
 
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_create_drop_temp_table.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_create_drop_temp_table.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_create_drop_temp_table.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_create_drop_temp_table.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,74 @@
+###############################################################################
+# Bug#18364070  BACKPORT BUG#18236612 TO MYSQL-5.6
+# Problem & Analysis : When Slave SQL thread detects that Master was restarted
+#  with the help of information sent by Master through 'FormatDescription'
+#  event, slave SQL drops all the opened temporary tables in order to have
+#  proper cleanup. While slave SQL thread is dropping the temporary tables, it
+#  is not decrementing Slave_open_temp_tables count.
+#  Fix: Decrement Slave_open_temp_tables count in this case.
+# Steps to test:
+#  1) Create a temporary table
+#  2) Sync it with slave
+#  3) Stop slave io thread
+#  4) Kill Master which generates Format Description event
+#  5) Restart Master again
+#  6) Start slave io thread
+#  7) Wait till SQL thread applies all events
+#     (which includes newly generated Format Description event)
+#  8) Now verify that Slave_open_temp_tables has '0' value
+
+# This same test steps with gtid enabled mode, works to test the following
+# bug as well.
+# Bug#18069107 SLAVE CRASHES WITH GTIDS,TEMP TABLE, STOP IO_THREAD, START SLAVE
+# Problem & Analysis : When Slave SQL thread detects that Master was restarted
+#  with the help of information sent by Master through 'FormatDescription'
+#  event, slave SQL drops all the opened temporary tables in order to have
+#  proper cleanup. When Gtid mode is on and while slave SQL thread is
+#  generating DROP TEMPORARY statement for all these temporary tables,
+#  server is hitting an assert DEBUG_ASSERT(gtid.spec_type != UNDEF_GROUP)
+###############################################################################
+
+# Statement mode is enough (row based temporary
+# tables are not replicated)
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+# 1. Create a temporary table
+CREATE TEMPORARY TABLE temp (i INT);
+
+# 2. Sync it with slave
+--sync_slave_with_master
+
+# 3. Stop slave io thread
+--source include/stop_slave_io.inc
+
+# 4. Kill Master so that it does not go through THD::cleanup logic. Hence it does
+# not generate "drop temporary" query for 'temp' table.
+--let $rpl_server_number= 1
+--let $rpl_force_stop=1
+--source include/rpl_stop_server.inc
+
+# 5. Restart Master (generates Format Description event which tells slave to
+# drop all temporary tables)
+--source include/rpl_start_server.inc
+
+# 6. Start slave io_thread
+--connection slave
+--source include/start_slave_io.inc
+--connection master
+--source include/sync_slave_io_with_master.inc
+
+# 7. Wait for slave thread to apply all events (including the newly generated
+# FormatDescription event which tells slave SQL thread to drop all temporary
+--let $show_statement= SHOW PROCESSLIST
+--let $field= State
+--let $condition= = 'Slave has read all relay log; waiting for the slave I/O thread to update it';
+--source include/wait_show_condition.inc
+
+# 8.Now if we verify slave_open_temp_tables, it should be '0'
+--let $var_value= query_get_value(SHOW STATUS LIKE 'Slave_open_temp_tables', Value, 1)
+--let $assert_text= Slave_open_temp_tables should be 0
+--let $assert_cond= $var_value = 0
+--source include/assert.inc
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_drop_db_fail.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_drop_db_fail.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_drop_db_fail.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_drop_db_fail.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+###############################################################################
+# Bug#20041860: SLAVE ERROR WHEN DROP DATABASE
+#
+# Test:
+# =====
+# Create two databases such that one database has a dependency over the other
+# database and try to drop the database which has a dependency. This should
+# not cause slave to break.
+###############################################################################
+--source include/master-slave.inc
+
+connection master;
+CREATE DATABASE IF NOT EXISTS db1;
+CREATE DATABASE IF NOT EXISTS db2;
+
+use db1;
+CREATE TABLE a(id INT);
+CREATE VIEW v AS SELECT * FROM a;
+CREATE TABLE table_father(id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(20)) ENGINE=INNODB;
+--source include/sync_slave_sql_with_master.inc
+
+connection master;
+use db2;
+CREATE TABLE table_child(id INT PRIMARY KEY, info VARCHAR(20), father_id INT) ENGINE=INNODB;
+ALTER TABLE table_child ADD CONSTRAINT aaa FOREIGN KEY (father_id) REFERENCES db1.table_father(id);
+
+--error ER_ROW_IS_REFERENCED
+DROP DATABASE db1;
+DROP DATABASE db2;
+--source include/sync_slave_sql_with_master.inc
+--connection master
+DROP DATABASE db1;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_drop_temp_gtid.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_drop_temp_gtid.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_drop_temp_gtid.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_drop_temp_gtid.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,53 @@
+# ==== Purpose ====
+#
+# Verify if the temporary tables will still be present on the slave after
+# restarting only the IO thread when using the GTID AUTO_POSITION protocol.
+#
+# ==== Related Bugs and Worklogs ====
+#
+# Bug#18472603 SQL THREAD COMMITS PARTIAL TRANSACTION WITH GTID AND AUTO
+#              POSITIONING ENABLED
+#
+--source include/have_binlog_format_statement.inc
+--source include/have_innodb.inc
+--source include/have_gtid.inc
+--let $use_gtids= 1
+--source include/master-slave.inc
+
+--echo # Initial setup
+--source include/rpl_connection_master.inc
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_t1 (c1 INT) ENGINE=InnoDB;
+
+--echo # Insert the data in the master
+BEGIN;
+INSERT INTO temp_t1 VALUES (1);
+COMMIT;
+
+BEGIN;
+INSERT INTO t1 VALUES ((SELECT COUNT(*) FROM temp_t1));
+COMMIT;
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_slave.inc
+--echo # Stop the IO thread
+--source include/stop_slave_io.inc
+--echo # Restart IO thread
+--source include/start_slave_io.inc
+
+--echo # Do one more insert on master and then sync slave with master
+--source include/rpl_connection_master.inc
+BEGIN;
+INSERT INTO t1 VALUES ((SELECT COUNT(*) FROM temp_t1));
+COMMIT;
+--source include/sync_slave_sql_with_master.inc
+
+--echo # Now compare master and slave's t1 table data
+--source include/rpl_connection_master.inc
+--let diff_tables= master:t1, slave:t1
+--source include/diff_tables.inc
+
+--echo # Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1, temp_t1;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_filter_warnings.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_filter_warnings.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_filter_warnings.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_filter_warnings.test	2017-02-27 07:47:02.000000000 +0000
@@ -13,34 +13,40 @@
 #
 # Test:
 # =====
-# Set replicate-do-table=test.t1. Execute  statements on ignored tables.
+# Set replicate-do-table=test.t1. Execute statements on ignored tables.
 # During the execution of the first such statement the actual warning will be
-# printed and the remaining such errors will be suppressed. Script sleeps for
-# a minute and executes another statment on the ignored table so that
-# "error throttle" becomes active and checks if 1 minute has elapsed and
-# prints the acutal error message and along with that it also prints the number
-# of errors that were suppressed. With fix less warnings should be printed.
-# With bug we get 5 warnings.
+# printed and the remaining such errors will be suppressed. The test script
+# uses debug simulation to make the error throttle to expire. Execute another
+# statement on the ignored table so that "error throttle" becomes active and
+# checks if 1 minute has elapsed and prints the actual error message and along
+# with that it also prints the number of errors that were suppressed. With fix
+# less warnings should be printed. With bug we get 5 warnings.
 ###############################################################################
 --source include/have_binlog_format_statement.inc
 # Inorder to grep a specific error pattern in error log a fresh error log
 # needs to be generated.
 --source include/force_restart.inc
 --source include/master-slave.inc
+--source include/have_debug.inc
 
 CREATE TABLE t2 (c1 INT) ENGINE=InnoDB;
 --source include/sync_slave_sql_with_master.inc
 
---connection master
+--source include/rpl_connection_master.inc
 INSERT INTO test.t2 VALUES (100);
 INSERT INTO test.t2 VALUES (200);
 INSERT INTO test.t2 VALUES (300);
-# Error log throttle is checked once per minute hence the sleep has been
-# added.
-SLEEP 60;
+--source include/sync_slave_sql_with_master.inc
+
+--let $debug_saved= `SELECT @@GLOBAL.DEBUG`
+SET @@GLOBAL.DEBUG= '+d,simulate_error_throttle_expiry';
+
+--source include/rpl_connection_master.inc
 DROP TABLE t2;
 --source include/sync_slave_sql_with_master.inc
 
+SET @@GLOBAL.DEBUG= '$debug_saved';
+
 --replace_regex /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]+/--TIME--/ s/Worker .* end_log_pos [0-9]*; //
 --let GREP_FILE=$MYSQLTEST_VARDIR/tmp/slave.err
 --let GREP_PATTERN=Slave SQL thread ignored the query because of replicate
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_binary_log_as_relay_log.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_binary_log_as_relay_log.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_binary_log_as_relay_log.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_binary_log_as_relay_log.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,57 @@
+###############################################################################
+# Bug#17812024  MTS IS NOT ABLE TO REPRODUCE BINLOGS AS RELAY LOGS
+# Problem: When a binarylog is used as a relaylog (transfer binarylogs to
+# Slave machine to avoid I/O thread reading delay), MTS is unable to operate
+# on that kind of relaylog.
+
+# Steps to Reproduce:
+#  1) Prepare a binary log with some 3 sample GTIDs
+#  2) Make that binary log as relay log
+#  3) Set slave_parallel_workers to 1 and start worker thread
+#  4) Make sure everything is replicated
+###############################################################################
+
+--source include/have_gtid.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+# Initial setup
+--let $MYSQLD_MASTER_DATADIR= `select @@datadir`
+--connection slave
+--let $MYSQLD_SLAVE_DATADIR= `select @@datadir`
+--source include/stop_slave_sql.inc
+
+# Step-1: Prepare a binary log with 3 sample GTIDs
+--connection master
+CREATE TABLE t1(i INT);
+INSERT INTO t1 values (1);
+INSERT INTO t1 values (2);
+--source include/sync_slave_io_with_master.inc
+
+# Step-2: Make that binary log as relay log
+--remove_file $MYSQLD_SLAVE_DATADIR/slave-relay-bin.000001
+--copy_file $MYSQLD_MASTER_DATADIR/master-bin.000001 $MYSQLD_SLAVE_DATADIR/slave-relay-bin.000001
+
+# Step-3: Now start worker thread with that relay log(binary log as relay log)
+# and see that worker thread does not have issues in completing it.
+SET @save.slave_parallel_workers=@@global.slave_parallel_workers;
+SET @@global.slave_parallel_workers=1;
+
+SET @save.slave_transaction_retries=@@global.slave_transaction_retries;
+SET @@global.slave_transaction_retries=0;
+--source include/start_slave_sql.inc
+
+# Step-4: Make sure everything is replicated
+--connection master
+--source include/sync_slave_sql_with_master.inc
+--let diff_tables=master:t1,slave:t1
+--source include/diff_tables.inc
+
+# Cleanup
+--connection master
+DROP TABLE t1;
+--connection slave
+--source include/stop_slave_sql.inc
+SET @@global.slave_parallel_workers=@save.slave_parallel_workers;
+SET @@global.slave_transaction_retries=@save.slave_transaction_retries;
+--source include/start_slave_sql.inc
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_drop_table.cnf percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_drop_table.cnf
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_drop_table.cnf	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_drop_table.cnf	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,11 @@
+!include ../my.cnf
+
+[mysqld.2]
+
+replicate-ignore-table=test.temp_ignore
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_drop_table.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_drop_table.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_drop_table.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_drop_table.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,338 @@
+# ==== Purpose ====
+#
+# In order to avoid problems with GTIDs, MySQL server should refuse to execute
+# any statements that will be split before sending to binlog if
+# @@SESSION.GTID_NEXT is set to 'UUID:NUMBER'.
+#
+# In MySQL server, DROP TABLE statements can be split into up to three
+# distinct binlog events: one containing the regular tables, one containing
+# transactional temporary tables and one containing non-transactional
+# temporary tables.
+#
+# In the first part, this test will verify if a splittable DROP TABLE
+# statement is being refused to execute throwing the correct error to the
+# client session.
+#
+# In the second part, this test will verify an issue with inexistent temporary
+# tables being assumed as transactional on the slave side. This was making
+# the slave to split a DROP statement that the master logged as a single DROP
+# statement.
+#
+# In the third part, this test will verify that a slave having to drop
+# temporary tables because of the master have restarted will split the DROP
+# TABLE statement also based on table types (transactional or not).
+#
+# The details about the implementation of this test is in the beginning of
+# each part.
+#
+# ==== Related Bugs and Worklogs ====
+#
+# BUG#17620053: SET GTID_NEXT AND DROP TABLE WITH BOTH REGULAR AND TEMPORARY
+#               TABLES
+#
+--let $rpl_topology= 1->2->3
+--source include/have_gtid.inc
+--source include/rpl_init.inc
+--source include/rpl_default_connections.inc
+--source include/have_innodb.inc
+
+--echo #
+--echo # First part
+--echo #
+#
+# This part verifies the splittable DROP TABLE behavior in client sessions by
+# creating three tables (one regular and two temporary), setting session
+# GTID_NEXT to an specific GTID and then trying to issue an DROP TABLE
+# statement containing the combinations of at least two tables.
+#
+# As DROP statements with both regular and temporary tables or with
+# transactional and non transactional temporary tables are split before
+# sending to binlog, the following DROP statements must return an error to the
+# client session because of being considered unsafe for GTID enforcement as it
+# would be split into two (or three) statements to be sent to binlog.
+#
+# In order to improve the test coverage, we will verify DROP TABLE statements
+# with all combinations of the following:
+# 1) Regular transactional table;
+# 2) Regular non-transactional table;
+# 3) Temporary transactional table;
+# 4) Temporary non-transactional table;
+# 5) Nonexistent table.
+#
+# With the above set we could make up to 32 possibilities (including none of
+# above). But we will test the behavior only for the following combinations:
+# - 18 error cases (ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP):
+#   (1 | 2 | 1+2) + (3 | 4 | 3+4) + (nothing | 5)
+#   (3+4) | (3+4+5)
+#   (3 | 4) + 5  /* as this it not DROP TEMPORARY, nonexistent tables will be
+#                   assumed as regular tables, so the DROP will be split */
+# - 3 error cases (ER_BAD_TABLE_ERROR):
+#   (1 | 2 | 1+2) + 5
+# - 1 non-error case:
+#   1+2
+# Note: for ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP cases, the
+# statement will not be executed and no DROP will be performed. For
+# ER_BAD_TABLE_ERROR cases, the existent tables will be dropped regardless the
+# error.
+
+# Create two regular tables and two temporary tables with distinct storage engines
+--source include/rpl_connection_master.inc
+CREATE TABLE trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TABLE non_trans_t1 (c1 INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+
+--echo # Error cases ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP
+--let $next_gtid= '11111111-1111-1111-1111-111111111111:1'
+--let $expected_error= ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP
+
+# reg trans + reg non trans + temp trans
+--let $statement= DROP TABLE trans_t1, non_trans_t1, temp_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + reg non trans + temp trans + temp non trans
+--let $statement= DROP TABLE trans_t1, non_trans_t1, temp_trans_t1, temp_non_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + reg non trans + temp trans + temp non trans + inexistent
+--let $statement= DROP TABLE trans_t1, non_trans_t1, temp_trans_t1, temp_non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + reg non trans + temp trans + inexistent
+--let $statement= DROP TABLE trans_t1, non_trans_t1, temp_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + reg non trans + temp non trans
+--let $statement= DROP TABLE trans_t1, non_trans_t1, temp_non_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + reg non trans + temp non trans + inexistent
+--let $statement= DROP TABLE trans_t1, non_trans_t1, temp_non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + temp trans
+--let $statement= DROP TABLE trans_t1, temp_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + temp trans + temp non trans
+--let $statement= DROP TABLE trans_t1, temp_trans_t1, temp_non_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + temp trans + temp non trans + inexistent
+--let $statement= DROP TABLE trans_t1, temp_trans_t1, temp_non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + temp trans + inexistent
+--let $statement= DROP TABLE trans_t1, temp_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + temp non trans
+--let $statement= DROP TABLE trans_t1, temp_non_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg trans + temp non trans + inexistent
+--let $statement= DROP TABLE trans_t1, temp_non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg non trans + temp trans
+--let $statement= DROP TABLE non_trans_t1, temp_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg non trans + temp trans + temp non trans
+--let $statement= DROP TABLE non_trans_t1, temp_trans_t1, temp_non_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg non trans + temp trans + temp non trans + inexistent
+--let $statement= DROP TABLE non_trans_t1, temp_trans_t1, temp_non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg non trans + temp trans + inexistent
+--let $statement= DROP TABLE non_trans_t1, temp_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg non trans + temp non trans
+--let $statement= DROP TABLE non_trans_t1, temp_non_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# reg non trans + temp non trans + inexistent
+--let $statement= DROP TABLE non_trans_t1, temp_non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# temp trans + temp non trans
+--let $statement= DROP TABLE temp_trans_t1, temp_non_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# temp trans + temp non trans + inexistent
+--let $statement= DROP TABLE temp_trans_t1, temp_non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# temp trans + inexistent
+--let $statement= DROP TABLE temp_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# temp non trans + inexistent
+--let $statement= DROP TABLE temp_non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+
+--echo # Error cases ER_BAD_TABLE_ERROR
+--let $expected_error= ER_BAD_TABLE_ERROR
+
+# reg trans + reg non trans + inexistent
+--let $next_gtid= '11111111-1111-1111-1111-111111111111:1'
+--let $statement= DROP TABLE trans_t1, non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# recreate the trans table
+SET GTID_NEXT= AUTOMATIC;
+CREATE TABLE trans_t1 (c1 INT) ENGINE=InnoDB;
+# reg trans + inexistent
+--let $next_gtid= '11111111-1111-1111-1111-111111111111:2'
+--let $statement= DROP TABLE trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+# recreate the non trans table
+SET GTID_NEXT= AUTOMATIC;
+CREATE TABLE non_trans_t1 (c1 INT) ENGINE=MyISAM;
+# reg non trans + inexistent
+--let $next_gtid= '11111111-1111-1111-1111-111111111111:3'
+--let $statement= DROP TABLE non_trans_t1, non_existent
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+
+SET GTID_NEXT= AUTOMATIC;
+CREATE TABLE trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TABLE non_trans_t1 (c1 INT) ENGINE=MyISAM;
+
+--echo # Non-error cases
+--let $expected_error=
+
+# reg trans + reg non trans
+--let $next_gtid= '11111111-1111-1111-1111-111111111111:4'
+--let $statement= DROP TABLE trans_t1, non_trans_t1
+--source extra/rpl_tests/rpl_gtid_drop_table.inc
+
+SET GTID_NEXT= AUTOMATIC;
+CREATE TABLE trans_t1 (c1 INT) ENGINE=InnoDB;
+
+
+--echo #
+--echo # Second part
+--echo #
+#
+# The MySQL server cannot evaluate if an inexistent temporary table is
+# transactional or not. Before the fix for BUG#17620053, the inexistent
+# temporary tables were assumed to be transactional.
+#
+# This assumption could lead to a split if, for example, you issue a DROP
+# TEMPORARY TABLE for two existent non-transactional temporary tables in the
+# master (will binlog only one statement) but a filter made one of the
+# temporary tables inexistent on the slave side (will binlog two statements:
+# one with the existent non-transactional table and other with the inexistent
+# table assumed to be transactional).
+#
+# As this test has a filter in its slave configuration like this:
+# '--replicate-ignore-table=test.temp_ignore', all statements containing the
+# 'test.temp_ignore' temporary table alone wont be executed by the SQL slave
+# thread. So, the CREATE TABLE statements for 'temp_ignore' table will be
+# executed only on the master.
+#
+# Issuing a DROP TEMPORARY TABLE statement in the master containing the two
+# non-transaction temporary tables would result in a single binlog statement,
+# as the two tables are non-transactional ones.
+#
+# In the slave, because of the filter, the non-replicated table will be
+# assumed unknown. With the fix for BUG#17620053, the unknown tables will
+# be assumed as transactional only if at least one transactional table is
+# dropped. If the DROP recognizes only non-transactional tables, the unknown
+# temporary tables will be assumed non-transactional, avoiding splitting the
+# statement.
+
+# Create an additional non-transactional temporary table that will not be
+# replicated due to the replication filter, only t1 will be replicated.
+CREATE TEMPORARY TABLE temp_ignore (c1 INT) ENGINE=MyISAM;
+# Drop the two non-transactional temp tables
+DROP TEMPORARY TABLE IF EXISTS temp_ignore, temp_non_trans_t1;
+# Sync to know that everything was replicated
+--source include/sync_slave_sql_with_master.inc
+# Back to the 'master' connection
+--source include/rpl_connection_master.inc
+# Create temp_ignore table again, but with InnoDB storage engine
+CREATE TEMPORARY TABLE temp_ignore (c1 INT) ENGINE=InnoDB;
+# Drop the two transactional temp tables
+DROP TEMPORARY TABLE IF EXISTS temp_ignore, temp_trans_t1;
+# Sync to know that everything was replicated
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # Third part
+--echo #
+#
+# This part was adapted from rpl_create_drop_temp_table.test
+#
+# As we use three server topology, when the slave (mysqld 2) detects the
+# master (mysqld 1) has restarted it will drop the temporary tables and
+# will binlog the DROP TABLE statements that will be replicated to
+# the third server (mysqld 3).
+#
+# As the DROP of temporary table in the slave side groups the tables
+# by pseudo-threadid and by database, we will use two sessions on master,
+# creating three sets of temporary tables, each set on a distinct database.
+#
+# The first set contains two tables with distinct storage engines, the
+# second set contains a single table and the third set contains two tables
+# with the same storage engine.
+#
+--source include/rpl_connection_master.inc
+call mtr.add_suppression("InnoDB: Error: table .* does not exist in the InnoDB internal");
+CREATE DATABASE test2;
+CREATE DATABASE test3;
+
+# Create two temporary tables with distinct storage engines in 'test'
+# This should generate two DROP statements
+use test;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+# Create one temporary table with transactional storage engine in 'test2'
+# This should generate only one DROP statement
+USE test2;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+# Create two temporary tables with transactional storage engine in 'test3'
+# This should generate only one DROP statement with the two tables
+USE test3;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_trans_t2 (c1 INT) ENGINE=InnoDB;
+
+# Create two temporary tables with distinct storage engines in 'test'
+# in another client session. This should generate two DROP statements
+--source include/rpl_connection_master1.inc
+use test;
+CREATE TEMPORARY TABLE temp_trans_t1 (c1 INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+# Create one temporary table with non-transactional storage engine in 'test2'
+# This should generate only one DROP statement
+USE test2;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+# Create two temporary tables with non-transactional storage engine in 'test3'
+# This should generate only one DROP statement with the two tables
+USE test3;
+CREATE TEMPORARY TABLE temp_non_trans_t1 (c1 INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE temp_non_trans_t2 (c1 INT) ENGINE=MyISAM;
+
+# Sync to know that everything was replicated
+--source include/sync_slave_sql_with_master.inc
+
+# Stop slave io thread
+--source include/stop_slave_io.inc
+
+# Kill Master so that it does not go through THD::cleanup logic. Hence it does
+# not generate "drop temporary" query for 'temp' tables.
+--let $rpl_server_number= 1
+--let $rpl_force_stop=1
+--source include/rpl_stop_server.inc
+
+# Restart Master (generates Format Description event which tells slave to
+# drop all temporary tables)
+--source include/rpl_start_server.inc
+
+# Start and sync slave IO thread
+--source include/rpl_connection_slave.inc
+--source include/start_slave_io.inc
+--source include/rpl_connection_master.inc
+--source include/sync_slave_io_with_master.inc
+
+# Wait for slave thread to apply all events (including the newly generated
+# FormatDescription event which tells slave SQL thread to drop all temporary
+--let $show_statement= SHOW PROCESSLIST
+--let $field= State
+--let $condition= 'Slave has read all relay log; waiting for the slave I/O thread to update it';
+--source include/wait_show_condition.inc
+
+# Now we verify slave_open_temp_tables, it should be '0'
+--let $var_value= query_get_value(SHOW STATUS LIKE 'Slave_open_temp_tables', Value, 1)
+--let $assert_text= Slave_open_temp_tables should be 0
+--let $assert_cond= $var_value = 0
+--source include/assert.inc
+
+# Cleanup replication
+--source include/rpl_connection_master.inc
+USE test;
+DROP TABLE trans_t1;
+DROP DATABASE test2;
+DROP DATABASE test3;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_group-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_group-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_group-master.opt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_group-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---binlog-ignore-db=db_ignore_master
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_group-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_group-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_group-slave.opt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_group-slave.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---replicate-ignore-table=test.t_ignore
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_group.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_group.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_group.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_group.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-################################################################################
-# This test case checks that empty groups appearing on slave preserve GTID
-# properties. 
-# Such group can appear on slave as a result of
-#
-# a. ineffective binary logging (no events in row format)
-# b. filtered out query
-# c. processing of a master's empty group 
-#
-################################################################################
---source include/master-slave.inc
---source include/not_embedded.inc
---source include/have_binlog_format_mixed.inc
---source include/have_gtid.inc
-
-# prepare for a.
---connection slave
-SET @save.binlog_format= @@global.binlog_format;
-SET @@global.binlog_format= row;
-source include/restart_slave_sql.inc;
-
---connection master
-SET @save.binlog_format= @@session.binlog_format;
-SET @@session.binlog_format= statement;
-CREATE TABLE t1(id INTEGER) ENGINE= Innodb /* group one */;
-UPDATE t1 SET id= 1 WHERE id = 0          /* group two */;
-
-# load for b.
-CREATE TABLE t_ignore(id INTEGER) ENGINE= Innodb /* group three */;
-
---source include/sync_slave_sql_with_master.inc
-
---echo must be *three* groups logged, where the two last empty:
---let $keep_gtid_events= 1
-source include/show_binlog_events.inc;
-
-# todo: add c.
-# --connection slave
-# set @@session.gtid_next='`last_master s_id: last_master seqno + 1`;
-# begin;
-# commit;
-
-
-#
-# Testing of ROLLBACK as explicit so due to an error does 
-# not log anything.
-#
-
---connection master
-FLUSH LOGS;
---error ER_BAD_TABLE_ERROR
-DROP TABLE t2;
---error ER_WRONG_VALUE_COUNT_ON_ROW
-INSERT INTO t1 VALUES (1, 1); 
-BEGIN;
-INSERT INTO t1 VALUES (2);
-ROLLBACK;
-
---echo *** must be empty log ***
-
-let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
-source include/show_binlog_events.inc;
-
-# cleanup
-
---connection master
-DROP TABLE t1;
-DROP TABLE t_ignore;
-
---source include/sync_slave_sql_with_master.inc
-SET @@global.binlog_format= @save.binlog_format;
-
---source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.cnf percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.cnf
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.cnf	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.cnf	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,25 @@
+!include ../my.cnf
+
+[mysqld.1]
+gtid-mode=on
+log-slave-updates=on
+enforce-gtid-consistency=on
+
+[mysqld.2]
+gtid-mode=on
+log-slave-updates=on
+enforce-gtid-consistency=on
+
+replicate-ignore-table=test.t_ignore
+replicate-wild-ignore-table=test.t_wild_ignore
+replicate-ignore-db=db_ignore
+binlog-ignore-db=db_binlog_ignore
+
+[mysqld.3]
+gtid-mode=on
+log-slave-updates=on
+enforce-gtid-consistency=on
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,301 @@
+# ==== Purpose ====
+#
+# Verifies that empty transactions are generated when they are
+# supposed to. There are three cases:
+#
+#  1. Transaction is filtered out on slave
+#
+#  2. Transaction does not have any effect, gets logged and assigned a
+#     GTID on master because master uses binlog_format=statement, but
+#     does not get logged on slave because slave uses binlog_format=row.
+#
+#  3. Transaction is explicitly made empty on master by setting
+#     gtid_next and executing a COMMIT.
+#
+# Moreover, verify that no empty transaction is generated for rolled
+# back transactions.
+#
+# ==== Implementation ====
+#
+# For case 1, we use a filter (specified in the .cnf file) to filter
+# out table t_ignore, and verify that empty transaction is generated
+# on slave.  Do this both for (1A) base tables and for (1B) temporary
+# tables.
+#
+# For case 2, we use binlog_format=statement on master and
+# binlog_format=row on the first slave.  We test two cases of
+# transactions that are not logged in row format: (2A) temporary table
+# DDL and DML and (2B) an UPDATE statement that matches no row.  We
+# use a second slave where the effect of the statement would be seen,
+# if it was not logged as an empty statement.  In case (2A) we check
+# that slave_open_temp_tables is still 0 on the second slave. In case
+# (2B) we do an UPDATE on master that matches no rows on master, but
+# that would match a row on the second slave.
+#
+# For case 3, we just execute an explicit empty transaction on master
+# and verify that it gets assigned a GTID and gets replicated to the
+# slaves.
+#
+# To verify nothing is logged for rollback transactions, we execute a
+# DDL statement that generates an error, a DML statement that
+# generates an error, and an explicit ROLLBACK transaction, and verify
+# that nothing got logged for the three statements.
+#
+# ==== References ====
+#
+# WL#3584 - Global Transaction Identifiers (GTIDs)
+# - The base worklog implementing empty transactions.
+# BUG#18145032 - NO EMPTY TRANSACTION IS CREATED FOR A FILTERED CREATE TEMPORARY TABLE WITH GTIDS
+# - Addressing the special cases for CREATE/ALTER/DROP TEMPORARY.
+# BUG#18095502 - RESTART OF SLAVE INSTANCE FAIL IN GTID REPLICATION IF WE USE REPLICATE-IGNORE-DB
+# - Addressing database filters in the applier thread.
+
+--let $rpl_topology= 1->2->3
+--let $rpl_gtid_utils= 1
+--source include/rpl_init.inc
+--source include/rpl_default_connections.inc
+--source include/not_embedded.inc
+--source include/have_binlog_format_mixed.inc
+--source include/have_gtid.inc
+
+--source include/rpl_reset.inc
+
+--echo ==== Case 1A: Transaction filtered out ====
+
+--source include/gtid_step_reset.inc
+
+CREATE TABLE t_ignore(id INT);
+INSERT INTO t_ignore VALUES (1);
+DROP TABLE t_ignore;
+
+CREATE TABLE t_ignore_wild(id INT);
+INSERT INTO t_ignore_wild VALUES (1);
+DROP TABLE t_ignore_wild;
+
+# Verify that 6 GTIDs were generated.
+--let $gtid_step_count= 6
+--source include/gtid_step_assert.inc
+
+# Verify that the GTIDs make it to every slave
+--source include/rpl_sync.inc
+
+--echo ==== Case 1B: CREATE/ALTER/DROP TEMPORARY filtered out ====
+
+CREATE TEMPORARY TABLE t_ignore(a INT);
+ALTER TABLE t_ignore ADD COLUMN b INT;
+INSERT INTO t_ignore VALUES (1, 2);
+DROP TEMPORARY TABLE t_ignore;
+
+CREATE TEMPORARY TABLE t_ignore_wild(a INT);
+ALTER TABLE t_ignore_wild ADD COLUMN b INT;
+INSERT INTO t_ignore_wild VALUES (1, 2);
+DROP TEMPORARY TABLE t_ignore_wild;
+
+# Verify that 8 GTIDs were generated.
+--let $gtid_step_count= 8
+--source include/gtid_step_assert.inc
+
+# Verify that the GTIDs make it to every slave.
+--source include/rpl_sync.inc
+
+--echo ==== Case 1C: database filters on slave applier ====
+
+--source include/gtid_step_reset.inc
+
+# These two will be ignored on first slave.
+CREATE DATABASE db_ignore;
+USE db_ignore;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+USE test;
+
+# Verify 2 GTIDs were generated
+--let $gtid_step_count= 3
+--source include/gtid_step_assert.inc
+
+--source include/rpl_sync.inc
+
+--let $assert_text= db_ignore should not be created on slave
+--let $assert_cond= "[slave:SHOW DATABASES LIKE "db_ignore"]" = ""
+--source include/assert.inc
+
+--let $assert_text= db_ignore should not be created on second slave
+--let $assert_cond= "[server_3:SHOW DATABASES LIKE "db_ignore"]" = ""
+--source include/assert.inc
+
+DROP DATABASE db_ignore;
+--source include/rpl_sync.inc
+
+--echo ==== Case 1D: database filters on slave binary log ====
+
+--source include/gtid_step_reset.inc
+
+# These two will be ignored on first slave.
+CREATE DATABASE db_binlog_ignore;
+USE db_binlog_ignore;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+USE test;
+
+# Verify 2 GTIDs were generated
+--let $gtid_step_count= 3
+--source include/gtid_step_assert.inc
+
+--source include/rpl_sync.inc
+
+--let $assert_text= db_binlog_ignore should not be created on slave
+--let $assert_cond= "[slave:SHOW DATABASES LIKE "db_binlog_ignore"]" = "db_binlog_ignore"
+--source include/assert.inc
+
+--let $assert_text= db_binlog_ignore should not be created on second slave
+--let $assert_cond= "[server_3:SHOW DATABASES LIKE "db_binlog_ignore"]" = ""
+--source include/assert.inc
+
+DROP DATABASE db_binlog_ignore;
+--source include/rpl_sync.inc
+
+--echo ==== Case 2A: temp table transaction not logged in row format ====
+
+--echo ---- Initialize ----
+
+--connection slave
+SET @save.binlog_format= @@global.binlog_format;
+SET @@global.binlog_format= row;
+source include/restart_slave_sql.inc;
+
+--echo ---- Test ----
+
+--source include/gtid_step_reset.inc
+
+
+# - Master will log these statements and assign them GTIDs, since
+#   master uses binlog_format=statement.
+#
+# - First slave will not log any change since it uses row format, but
+#   it should log empty transactions with GTIDs.
+#
+# - Second slave should also not log any change, since it receives an
+#   empty transaction from the first slave.  Thus
+#   Slave_open_temp_tables should remain 0 on the second slave.
+CREATE TEMPORARY TABLE t2 (a INT);
+ALTER TABLE t2 ADD COLUMN b INT;
+INSERT INTO t2 VALUES (1, 2);
+
+# assert exactly 3 GTIDs were generated
+--let $gtid_step_count= 3
+--source include/gtid_step_assert.inc
+
+# Verify that the GTID gets replicated everywhere.
+--let $use_gtids= 1
+--source include/rpl_sync.inc
+
+# Verify temp tables on first slave but not on second slave
+--let $assert_text= First slave should not have created any temp table
+--let $assert_cond= [slave:SHOW GLOBAL STATUS LIKE 'Slave_open_temp_tables'] = 1
+
+--let $assert_text= Second slave should not have created any temp table
+--let $assert_cond= [server_3:SHOW GLOBAL STATUS LIKE 'Slave_open_temp_tables'] = 0
+
+--echo ---- Clean up ----
+
+DROP TEMPORARY TABLE t2;
+--source include/rpl_sync.inc
+
+--connection slave
+SET @@global.binlog_format= @save.binlog_format;
+--connection master
+
+--echo ==== Case 2B: transaction with no effect not logged in row format ====
+
+--echo ---- Initialize ----
+
+--connection slave
+SET @save.binlog_format= @@global.binlog_format;
+SET @@global.binlog_format= row;
+source include/restart_slave_sql.inc;
+
+--connection master
+SET @@session.binlog_format= statement;
+CREATE TABLE t1(id INT) ENGINE = InnoDB;
+--source include/rpl_sync.inc
+--connection server_3
+INSERT INTO t1 VALUES (0);
+--connection master
+
+--echo ---- Test ----
+
+# - Master will log this and assign it a GTID despite it has no
+#   effect, since master uses binlog_format=statement.
+#
+# - First slave will not log any change since it uses row format, but
+#   it should log an empty transaction with a GTID.
+#
+# - Second slave should also not log any change, since it receives an
+#   empty transaction from the first slave.  It should also not update
+#   the table despite the original SQL statement would match a row on
+#   the second slave, since it only receives the empty transaction
+#   from the first slave.
+UPDATE t1 SET id= 1 WHERE id = 0;
+
+# Verify that the GTID gets replicated everywhere.
+--let $use_gtids= 1
+--source include/rpl_sync.inc
+
+--let $assert_text= Second slave should not have done any update
+--let $assert_cond= [server_3:SELECT * FROM t1] = 0
+
+-- echo ---- Clean up ----
+
+DROP TABLE t1;
+--source include/rpl_sync.inc
+
+--connection slave
+SET @@global.binlog_format= @save.binlog_format;
+--connection master
+
+--echo ==== Case 3: explicit empty transaction on master ====
+
+--source include/gtid_step_reset.inc
+eval SET @@SESSION.GTID_NEXT = '$uuida:1';
+COMMIT;
+SET @@SESSION.GTID_NEXT = 'AUTOMATIC';
+
+# Verify exactly one GTID was generated
+--let $gtid_step_count= 1
+--let $gtid_step_only_count= 1
+--source include/gtid_step_assert.inc
+--let $gtid_step_only_count= 0
+
+# Verify the GTID makes it to every slave.
+--source include/rpl_sync.inc
+
+--echo ==== Case 4: Nothing logged for ROLLBACK transactions ====
+
+# Test that ROLLBACK does not generate any GTID
+
+--echo ---- Initialize ----
+
+CREATE TABLE t1 (a INT) ENGINE = InnoDB;
+
+--echo ---- Test ----
+
+--source include/gtid_step_reset.inc
+
+--error ER_BAD_TABLE_ERROR
+DROP TABLE t2;
+
+--error ER_WRONG_VALUE_COUNT_ON_ROW
+INSERT INTO t1 VALUES (1, 1);
+
+BEGIN;
+INSERT INTO t1 VALUES (2);
+ROLLBACK;
+
+--let $gtid_step_count= 0
+--source include/gtid_step_assert.inc
+
+--echo ---- Clean Up ----
+
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_execution.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_execution.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_execution.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_execution.test	2017-02-27 07:47:02.000000000 +0000
@@ -50,13 +50,12 @@
 --source include/have_gtid.inc
 --source include/not_valgrind.inc
 --let $rpl_extra_connections_per_server= 3
+--let $rpl_gtid_utils= 1
 --source include/master-slave.inc
 --source include/have_debug.inc
 
 --echo #### Initialize ####
 
---source include/gtid_utils.inc
-
 CREATE table t (a INT PRIMARY KEY) ENGINE = InnoDB;
 INSERT INTO t VALUES (1);
 
@@ -636,6 +635,4 @@
 DROP TABLE stmts;
 DROP TABLE t;
 
---source include/gtid_utils_end.inc
-
 --source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test	2017-02-27 07:47:02.000000000 +0000
@@ -18,10 +18,10 @@
 
 --source include/have_debug.inc
 --source include/have_gtid.inc
+--let $rpl_gtid_utils= 1
 --source include/master-slave.inc
 
 call mtr.add_suppression("Got fatal error 1236 from master when reading data from binary log: 'The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires.");
---source include/gtid_utils.inc
 
 --echo ######## Initialize ########
 
@@ -93,5 +93,4 @@
 --source include/sync_slave_sql_with_master.inc
 
 --connection master
---source include/gtid_utils_end.inc
 --source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_purged_maintained.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_purged_maintained.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_purged_maintained.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_purged_maintained.test	2017-02-27 07:47:02.000000000 +0000
@@ -45,9 +45,9 @@
 #
 # Added in WL#3584 - Global Transaction Identifiers
 
+--let $rpl_gtid_utils= 1
 --source include/master-slave.inc
 --source include/rpl_set_gtid_mode.inc
---source include/gtid_utils.inc
 --source include/have_debug.inc
 
 --echo ######## Initialize ########
@@ -196,5 +196,4 @@
 --echo ######## Clean up ########
 --connection master
 DROP TABLE t1;
---source include/gtid_utils_end.inc
 --source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_server_sighup.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_server_sighup.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_server_sighup.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_server_sighup.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,135 @@
+###############################################################################
+# Bug #17026898 PREVIOUS GTID EVENT IS NOT WRITTEN WHEN BINLOG IS ROTATED VIA
+# SIGHUP
+
+# Problem: When Bin(Relay)log is rotated via SIGHUP signal, the newly generated
+# binlog does not contain previous gtid event which is very important
+# for processing that bin(relay)log's gtid events later.
+
+# Fix: If reload_acl_and_cache() (which does rotation of Bin(Relay) log)
+# is called from SIGHUP handler, then allocate temporary THD for
+# execution of rotate bin(relay)log.
+
+# Steps to reproduce the issue:
+# 1) Get the server pid
+# 2) Send Kill -1 signal (SIGHUP) signal to server pid
+# 3) Wait until rotation is done
+# 4) Verify the newly generated log contains prev_gtid_event
+# 5) Restart the server to see the processing of the new log is not an issue.
+# 6) Verify that Replication works fine at the end of the scenario
+
+# Execute the same steps on both Master and Slave do prove that
+#   a) no problem in binary log rotation (i.e., prev_gtids_event exists)
+#   b) no problem in relay log rotation (i.e., prev_gtids event exists)
+#   c) no problem in restarting master
+#   d) no problem in restarting slave
+#   e) Replication works fine after receiving SIGHUP.
+###############################################################################
+
+# Test involves sending SIGHUP signal using kill linux cmd
+--source include/linux.inc
+
+# Problem appears only with gtid
+--source include/have_gtid.inc
+
+# Testing SIGHUP behaviour with one mode is enough
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+CREATE TABLE pid_table(pid_no INT);
+
+
+# Execute above mentioned steps in two iterations
+# Iteration 1 : Master and Iteration 2: Slave
+--let $_rpl_server= 1
+while ($_rpl_server <= 2)
+{
+  --let $rpl_connection_name= server_$_rpl_server
+  --source include/rpl_connection.inc
+  --let $pid_file=`SELECT @@pid_file`
+  --replace_result $pid_file pid_file
+  --eval LOAD DATA LOCAL INFILE '$pid_file' INTO TABLE pid_table
+  # Step1: Get server pid
+  --let $server_pid=`SELECT pid_no FROM pid_table`
+
+  # Get current master binlog name
+  if ($_rpl_server == 1)
+  {
+    --let $before_sighup_log_name=query_get_value(SHOW MASTER STATUS, File, 1)
+  }
+  if ($_rpl_server == 2)
+  {
+    --let $before_sighup_log_name=query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1)
+  }
+
+  # Step2: send SIGHUP(signal 1) to server which will rotate bin(relay)log
+  --exec kill -1 $server_pid
+
+  # Step3: Wait until signal handler does required work
+  # (i.e., completes rotation of binary/relay log) after receiving SIGHUP signal.
+  if ($_rpl_server == 1)
+  {
+    --let $show_statement=SHOW MASTER STATUS
+    --let $field=File
+  }
+  if ($_rpl_server == 2)
+  {
+    --let $show_statement=SHOW SLAVE STATUS
+    --let $field=Relay_Log_File
+  }
+  --let $condition= <> '$before_sighup_log_name'
+  --source include/wait_show_condition.inc
+
+  # Write something to newly generated binary log/relay log
+  if ($_rpl_server == 2)
+  {
+    --let $rpl_connection_name= server_1
+    --source include/rpl_connection.inc
+  }
+  DELETE FROM pid_table;
+  --source include/sync_slave_sql_with_master.inc
+  if ($_rpl_server == 1)
+  {
+    --let $rpl_connection_name= server_1
+    --source include/rpl_connection.inc
+  }
+  # Step 4:Show that newly generated binary/relaylog has previous gtid event as well
+  --let $keep_gtid_events= 1
+  --let $binlog_file= LAST
+  if ($_rpl_server == 1)
+  {
+    --source include/show_binlog_events.inc
+  }
+  if ($_rpl_server == 2)
+  {
+    --source include/show_relaylog_events.inc
+  }
+  # Step5: Restart server to make sure that
+  # newly generated binary log/relay log does not cause any issues
+  --let $rpl_server_number= $_rpl_server
+  --source include/rpl_stop_server.inc
+  --let $rpl_start_with_gtids= 1
+  --source include/rpl_start_server.inc
+  if ($_rpl_server == 2)
+  {
+    --source include/rpl_start_slaves.inc
+  }
+  if ($_rpl_server == 1)
+  {
+    # We must be sure that the IO thread has connected again with the master
+    # that has just restarted, or else the results of the test case may vary.
+    # As no new GTID was generated since last sync, we will force the use of
+    # positions on the sync.
+    --let $ignore_gtids_on_sync= 1
+    --source include/sync_slave_sql_with_master.inc
+    --let $ignore_gtids_on_sync= 0
+  }
+  --inc $_rpl_server
+}
+
+# Now just make sure replication works fine
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+DROP TABLE pid_table;
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtids_restart_slave_io_lost_trx.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtids_restart_slave_io_lost_trx.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtids_restart_slave_io_lost_trx.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtids_restart_slave_io_lost_trx.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,12 @@
+###############################################################################
+#
+# Bug#17280176 TRANSACTIONS SKIPPED ON SLAVE AFTER "STOP/START SLAVE" USING
+#              GTID REPLICATION
+#
+###############################################################################
+#
+# This test will verify if the slave SQL thread and the slave IO thread behave
+# correctly when the IO thread is restarted in the middle of a transaction.
+#
+
+--source extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,3 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
 # ==== Purpose ====
 #
 # Test that it is possible to change the topology completely randomly,
@@ -79,8 +77,13 @@
 #
 # ==== References ====
 #
-# Created as part of WL#3584: Global Transaction Identifiers
+# WL#3584: Global Transaction Identifiers
+# - Created as part of this worklog
+# BUG#18385953: RPL_GTID_STRESS_FAILOVER FAILS WITH "ERROR IN SYNC_WITH_MASTER.INC"
+# - fixed bug in cleanup code
 
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
 --source include/big_test.inc
 --source include/have_gtid.inc
 
@@ -97,7 +100,10 @@
 
 --echo ==== Configure ====
 
---let $max_seconds= 300
+if ($max_seconds == '')
+{
+  --let $max_seconds= 300
+}
 if ($max_iterations == '')
 {
   --let $max_iterations= 10000
@@ -394,7 +400,7 @@
     {
       --source include/show_rpl_debug_info.inc
       --echo ERROR: GTID_EXECUTED differs between server 1 and server $server
-      --echo ERROR: GTID_EXECUTED on server 1: '$saved_gtid_executed'
+      --echo ERROR: GTID_EXECUTED on server 1: '$last_gtid_executed'
       --echo ERROR: GTID_EXECUTED on server $server: '$gtid_executed'
       --die GTID_EXECUTED differs between two servers
     }
@@ -410,15 +416,22 @@
 
 --echo ==== Clean up ====
 
+# drop database
 --connection default
 --let $server= 1
 while ($server <= $n_servers)
 {
-  --connection default
   eval DROP DATABASE db_$server;
+  --inc $server
+}
+--source include/rpl_sync.inc
 
-  # restoring the AUTO_POSITION 
+# restore AUTO_POSITION
+--let $server= 1
+while ($server <= $n_servers)
+{
   --connection server_$server
+
   --let $include_silent=1
   --source include/stop_slave.inc
   CHANGE MASTER TO MASTER_AUTO_POSITION=0;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,128 @@
+###############################################################################
+#Bug#19012085 SETTING GTID_PURGED MAY BREAK AUTO_POSITION AND THUS SLAVES
+# Problem:
+#  When slave asks for GTIDs which were purged by Master, Master is silently
+#  ignoring it and sending the GTIDs whatever is available.
+# Fix:
+#  Slave's I/O thread, when connecting to Master, should be aborted with an
+#  error "Master has purged binary logs containing GTIDs that the slave
+#  requires."
+# Steps to reproduce:
+#  1) Set GTID_PURGED=UUID:1-2 on Master
+#  2) Execute some dummy transactions (GTID:3-4)
+#  3) A new slave request Master to send GTIDs
+#  4) Master should throw error instead of silently sending GTIDs 3 and 4.
+###############################################################################
+
+--source include/have_gtid.inc
+--source include/have_binlog_format_statement.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+# Step-1) Master wants to set 1 and 2 GTIDs in GTID_PURGED
+--let $master_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+--replace_result $master_uuid master_uuid
+--eval SET GLOBAL GTID_PURGED= "$master_uuid:1-2"
+
+# Step-2) Do some dummy transactions
+CREATE TABLE t1(i INT);  # GTID-3
+DROP TABLE t1;           # GTID-4
+
+# Step-3) Start Slave IO thread which will request Master to send all
+# transactions.
+--connection slave
+START SLAVE IO_THREAD;
+
+# Step-4)since Master has already purged binary logs  containing GTID 1 and 2,
+# it should throw error and I/O thread should not be started.
+#1236 = ER_MASTER_FATAL_ERROR_READING_BINLOG
+--let $slave_io_errno= 1236
+--let $show_slave_io_error= 1
+--source include/wait_for_slave_io_error.inc
+
+# Fix the problem by setting GTID_PURGED on Slave as well.
+--replace_result $master_uuid master_uuid
+--eval SET GLOBAL GTID_PURGED= "$master_uuid:1-2"
+
+# Now start slave threads. Slave will ask Master to send all GTIDs
+# except GTID:1-2 which should not be a problem and should not throw
+# any errors.
+--source include/start_slave.inc
+--connection master
+--source include/sync_slave_sql_with_master.inc
+
+--let $assert_text= Slave should be able to get GTID-3 and 4 now.
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:1-4"
+--source include/assert.inc
+
+call mtr.add_suppression(".*Master has purged binary logs containing GTIDs that the slave requires.*");
+
+###############################################################################
+#Bug #18789758  DATA INCONSISTENCIES WHEN MASTER HAS TRUNCATED BINARY LOG WITH
+# GTID AFTER CRASH
+# Problem:
+#   Master's dump thread is not detecting the case where Slave's gtid executed
+#   set is having more gtids than Master's gtid executed set with respective
+#   to Master's UUID.
+# Fix:
+#   If it happens, dump thread will be stopped during the handshake
+#   with Slave(thus the Slave's I/O thread will be stopped with the
+#   error). Otherwise, it can lead to data inconsistency
+#   between Master and Slave.
+#
+# Steps to reproduce:
+#  1) Execute some sample gtid transactions on Master
+#  2) Let it reach Slave
+#  3) Fake raid failure( by manually deleting binary log file)
+#  4) Restart Master, thus removing those gtids from executed gtid set.
+#  5) Restart slave's I/O thread, Slave sends its gtids which are purged on
+#      Master
+#  6) Make sure I/O thread gets error and informs the situation to the Slave.
+#  7) Verify that situation is recovered back normal after setting GTID_PURGED
+#      value to those purged gtids.
+###############################################################################
+
+# Cleanup from the next test script
+--connection master
+--source include/rpl_reset.inc
+
+# Step-1) Execute some sample gtid transactions on Master
+CREATE TABLE t1(i INT);
+DROP TABLE t1;
+
+# Step-2) Let it reach Slave.
+--sync_slave_with_master
+--source include/stop_slave.inc
+
+# Step-3) Fake raid failure( by manually deleting binary log file)
+--connection master
+--let $master_datadir= `SELECT @@datadir;`
+--remove_file $master_datadir/master-bin.000001
+--remove_file $master_datadir/master-bin.index
+
+# Step-4) Restart Master, thus removing those gtids from executed gtid set.
+--let $rpl_server_number= 1
+--source include/rpl_restart_server.inc
+
+# Step-5) Restart slave's I/O thread, Slave sends its gtids which are purged on Master
+--connection slave
+START SLAVE IO_THREAD;
+
+# Step-6) Make sure I/O thread gets error and informs the situation to the Slave.
+--let $slave_io_errno= convert_error(ER_MASTER_FATAL_ERROR_READING_BINLOG)
+--let $show_slave_io_error= 1
+--source include/wait_for_slave_io_error.inc
+call mtr.add_suppression(".*Slave has more GTIDs than the master has.*");
+
+# Step-7) Verify that situation is recovered back normal after setting GTID_PURGED
+#          value to those purged gtids.
+--connection master
+--let $master_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+--replace_result $master_uuid master_uuid
+--eval SET GLOBAL GTID_PURGED= "$master_uuid:1-2"
+
+--connection slave
+--source include/start_slave.inc
+
+# Cleanup
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_insert_on_update.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_insert_on_update.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_insert_on_update.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_insert_on_update.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,40 @@
+###############################################################################
+# Bug#17588419: INSERT ON DUPLICATE KEY UPDATE FAILING AFTER MYSQL 5.6
+# UPGRADE.
+#
+# Problem:
+# ========
+# After upgrading a MySQL 5.5.23 slave to 5.6.14 (the master still runs 5.5.23)
+# on executing INSERT ON DUPLICATE KEY following error is reported in SBR.
+#
+# [ERROR] Slave SQL: Error 'Auto-increment value in UPDATE conflicts with
+# internally generated values' on query.
+#
+# Test:
+# =====
+# Execute INSERT ON DUPLICATE KEY UPDATE statements on master and try to sync
+# master with slave. With the bug sync operation will fail with
+# ER_AUTO_INCREMENT_CONFLICT. Post fix sync operation should succeed.
+# Note:
+# As part of the bug fix the issue is fixed only with innodb storage engine.
+###############################################################################
+--source include/master-slave.inc
+
+--disable_query_log
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format*");
+--enable_query_log
+
+--connection master
+CREATE TABLE t(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,k INT,UNIQUE KEY(k)) ENGINE=InnoDB;
+--disable_warnings
+INSERT INTO t(k) VALUES (1), (2), (3);
+INSERT INTO t(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE id=10;
+--enable_warnings
+--source include/sync_slave_sql_with_master.inc
+
+--connection master
+-- let $diff_tables=master:t,slave:t
+-- source include/diff_tables.inc
+
+DROP TABLE t;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_kill_query-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_kill_query-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_kill_query-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_kill_query-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2 @@
+--replicate-ignore-db=ignored_db
+--replicate-ignore-table=db1.ignored_table
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_kill_query.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_kill_query.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_kill_query.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_kill_query.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,93 @@
+# ==== Purpose ====
+#
+# Test the behavior of slave when binlog_format=statement and a query
+# that updates a non-transactional table is killed on the master,
+# after being only half-way completed.
+#
+# The following should hold:
+# - The statement should be logged with error code ER_QUERY_INTERRUPTED.
+# - The slave should normally stop with an error.
+# - If the table or database is filtered out, the slave should not stop.
+#
+# To test this, we test three cases:
+#  1. Killed query on master generates error on slave.
+#  2. Killed query on master, on a filtered-out table, does not
+#     generate error on slave.
+#  3. Killed query on master, on a table in a filtered-out database,
+#     does not generate error on slave.
+#
+# ==== Implemenation ====
+#
+# For case 1, we extecute a statement and kill it in the middle, then
+# verify that the slave stops with the correct error.
+#
+# For cases 2 and 3, we execute a statement and kill it in the middle,
+# then verify that the slave replicates without problems.  In case 2,
+# the statement is executed when the current database is filtered-out.
+# In case 3, the statement modifies a table that is filtered-out.
+#
+# Slave filters are specified in rpl_kill_query.cnf
+#
+# The procedure to generate a killed statement is similar in all three
+# cases.  See extra/rpl_tests/rpl_kill_query.inc for details.
+#
+# ==== References ====
+#
+# BUG#18145032: NO EMPTY TRANSACTION IS CREATED FOR A FILTERED CREATE TEMPORARY TABLE WITH GTIDS
+# - Test created as part of this fix, since it touches the code for
+#   filtering.
+
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+--sync_slave_with_master
+--connection master
+
+--echo ==== Case 1: Killed query on master -> error on slave ====
+
+--let $database= db1
+--let $table= t1
+--source extra/rpl_tests/rpl_kill_query.inc
+
+--echo ---- Verify there is an error on slave ----
+--source include/sync_slave_io_with_master.inc
+--let $slave_sql_errno= 1317 # ER_QUERY_INTERRUPTED
+--source include/wait_for_slave_sql_error.inc
+
+--echo ---- Verify that nothing was inserted on slave -----
+--let $assert_text= Nothing should be inserted on slave
+--let $assert_cond= [slave:SELECT COUNT(*) FROM $database.t1] = 0
+--source include/assert.inc
+
+--echo ---- Clean up ----
+--source include/stop_slave_io.inc
+RESET SLAVE;
+RESET MASTER;
+DROP DATABASE db1;
+--source include/rpl_connection_master.inc
+RESET MASTER;
+--source include/rpl_connection_slave.inc
+--source include/start_slave.inc
+--source include/rpl_connection_master.inc
+
+--echo ==== Case 2: Master kills query -> no error if slave filters by db ====
+
+--let $database= ignored_db
+--let $table= t1
+--source extra/rpl_tests/rpl_kill_query.inc
+
+--echo ---- Verify all was replicated ok ----
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
+
+--echo ==== Case 3: Master kills query -> no error if slave filters by table ====
+
+--let $database= db1
+--let $table= ignored_table
+--source extra/rpl_tests/rpl_kill_query.inc
+
+--echo ---- Verify all was replicated ok ----
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,2 +1,4 @@
+#! /bin/bash
+#
 rm -f $MYSQLTEST_VARDIR/std_data_master_link
 ln -s $MYSQLTEST_VARDIR/std_data $MYSQLTEST_VARDIR/std_data_master_link
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,2 +1,4 @@
+#! /bin/bash
+#
 rm -f $MYSQLTEST_VARDIR/std_data_slave_link
 ln -s $MYSQLTEST_VARDIR/std_data $MYSQLTEST_VARDIR/std_data_slave_link
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_low_slave_net_time_out.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_low_slave_net_time_out.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_low_slave_net_time_out.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_low_slave_net_time_out.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,106 @@
+###############################################################################
+# Bug #19975697 SLAVE IO_THREAD MAY GET STUCK WHEN USING GTID AND LOW
+# SLAVE_NET_TIMEOUTS
+#
+# Problem: Dump thread is not checking the necessity of heartbeat event
+#  while it is scanning through the binary log files and skipping some groups
+#  which were already present at Slave.
+# Fix: Dump thread will check whether it is time to send an heartbeat event or
+#  not before skipping an event. If so, it will send one to Slave.
+###############################################################################
+
+--source include/have_binlog_format_statement.inc
+--source include/have_gtid.inc
+--source include/have_debug_sync.inc
+--source include/force_restart.inc
+# Problem is reproduced only with gtid auto position protocol
+--let $use_gtids=1
+--let $rpl_skip_start_slave=1;
+--source include/master-slave.inc
+
+# set slave_net_timeout to 10 seconds and then start slave threads
+--connection slave
+CHANGE MASTER TO MASTER_HEARTBEAT_PERIOD=5;
+SET @save_old_slave_net_timeout=@@global.slave_net_timeout;
+SET @@global.slave_net_timeout=10;
+--source include/start_slave.inc
+# In order to reproduce the bug with a smaller test data,
+# inject 2 seconds delay after an skipped event.
+--connection master
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='+d,inject_2sec_sleep_when_skipping_an_event';
+
+# Have some gtid transactions in binary log
+# Below create and two insert statements would have created '6' sub events
+#  # GTID 1
+#  # CREATE
+#  # GTID 2
+#  # BEGIN
+#  # INSERT
+#  # COMMIT
+#
+CREATE TABLE t1(i INT) engine=innodb;
+INSERT INTO t1 VALUES (1);
+
+# Sync it with Slave
+--source include/sync_slave_sql_with_master.inc
+
+# Stop the Replication
+--source include/stop_slave.inc
+
+# Create another gtid transaction at Master
+--connection master
+# Also, we introduce 'hold_dump_thread_inside_inner_loop' debug simulation now
+# to see what happens if dump thread is killed when the logic is
+# in inner while loop. The server code resets this debug point
+# after it is trigged once. So the sync of the following 'drop table'
+# statement will happen with the second dump thread that will be created
+# after slave triggers for another dump request after slave_net_timeout(10)
+# seconds.
+--source include/stop_dump_threads.inc
+SET GLOBAL DEBUG='+d,hold_dump_thread_inside_inner_loop';
+DROP TABLE t1;
+# Start the Replication
+# This will create a dump thread on Master and because of
+# debug point, it will wait in inner loop.
+--connection slave
+--source include/start_slave.inc
+
+--connection master
+SET DEBUG_SYNC='now WAIT_FOR signal_inside_inner_loop';
+
+# When a dump thread is waiting inside inner loop,
+# restart slave threads which will kill the existing
+# dump thread and will recreate it.
+--connection slave
+--source include/stop_slave.inc
+
+# Reset debug point for the next dump thread to ignore it
+--connection master
+SET GLOBAL DEBUG='-d,hold_dump_thread_inside_inner_loop';
+
+# Start slave thread
+--connection slave
+--source include/start_slave.inc
+
+# Signal the zombie dump thread to go ahead.
+--connection master
+SET DEBUG_SYNC='now signal signal_continue';
+
+# Now Dump thread-I/O thread communitcation protocol will detect that
+# it does not have recent gtid transaction(drop table) and Master
+# should send that transaction to Slave. This detection will take
+# 12 seconds because of the injected 2 seconds delay after every skipped
+# event (Please see above) which is more than the slave_net_timeout.
+# But now, after the fix, the server will check for necessity of sending an
+# heartbeat event even while it is skipping the events, the below
+# sync should not be timed out after the fix.
+--connection master
+--source include/sync_slave_sql_with_master.inc
+
+# Cleanup
+--connection master
+SET GLOBAL DEBUG=@save_debug;
+--connection slave
+SET @@global.slave_net_timeout=@save_old_slave_net_timeout;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1 +1,3 @@
+#! /bin/bash
+#
 rm -f $MYSQLTEST_VARDIR/master-data/test/rpl_misc_functions.outfile
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--slave-transaction-retries=0
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# ==== Purpose ====
+#
+# Bug#19545298 REPLICATION FAILS WITH ERRNO 1755
+#
+# Verify that the replication does not fail with MTS enabled even if
+# slave IO thread left a partial group in relay log, when auto position
+# is disabled and GTID mode is enabled.
+#
+
+--source include/have_gtid.inc
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+
+--source include/rpl_connection_slave.inc
+--source include/stop_slave.inc
+change master to master_auto_position=0;
+--source include/start_slave.inc
+
+--source extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--slave-transaction-retries=0
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# ==== Purpose ====
+#
+# Bug#19545298 REPLICATION FAILS WITH ERRNO 1755
+#
+# Verify that the replication does not fail with MTS enabled even if
+# slave IO thread left a partial group in relay log, when both auto
+# position and GTID mode are enabled.
+#
+
+--source include/have_gtid.inc
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+
+--source include/rpl_connection_slave.inc
+--source include/stop_slave.inc
+change master to master_auto_position=1;
+--source include/start_slave.inc
+
+--source extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--slave-parallel-workers=2 --slave-transaction-retries=0
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+###############################################################################
+#
+# BUG#17326020 ASSERTION ON SLAVE AFTER STOP/START SLAVE USING MTS+GTID
+#              REPLICATION
+#
+###############################################################################
+#
+# This test will verify if the slave SQL thread and the slave IO thread behave
+# correctly when the IO thread is restarted in the middle of a transaction
+# using MTS slave configuration.
+#
+
+--source extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--slave-parallel-workers=2 --slave-transaction-retries=0
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,77 @@
+# ==== Purpose ====
+#
+# Verify if the MTS SQL thread will became unresponsive after the slave
+# applied a partial transaction (without the XID event) followed by a
+# ROTATE event caused by IO thread reconnection when GTIDs and auto
+# positioning are enabled.
+#
+# ==== Related Bugs and Worklogs ====
+#
+# BUG#17326020 ASSERTION ON SLAVE AFTER STOP/START SLAVE USING MTS+GTID
+#              REPLICATION
+# BUG#18885916 RELAY LOG WITHOUT XID_LOG_EVENT MAY CASE PARALLEL
+#              REPLICATION HANG
+#
+# ==== Implementation ====
+#
+# This test uses debug points on the slave to make the
+# IO thread to stop right after queuing a WRITE_ROWS log event.
+#
+# By doing this, the relay log file with the partial transaction
+# will contain: [GTID,] QUERY(BEGIN), TABLE_MAP and WRITE_ROWS, but
+# won't have the XID for the transaction.
+#
+# After reconnecting to the master, if the slave is configured with
+# GTID and auto positioning, the IO thread will request the whole
+# transaction again.
+#
+# The test case will then sync the slave with the master and verify
+# that all data was correctly applied on slave.
+#
+
+# This test case uses a debug point based on RBR
+--source include/have_binlog_format_row.inc
+--source include/have_debug.inc
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+# Prepare the slave IO thread to stop after queuing a WRITE_ROWS event
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG= "d,stop_io_after_reading_write_rows_log_event";
+
+# Put some data in to the master
+--source include/rpl_connection_master.inc
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+# This transaction will be split
+BEGIN;
+INSERT INTO t1 (c1) VALUES (1);
+COMMIT;
+# This transaction will not be split
+BEGIN;
+INSERT INTO t1 (c1) VALUES (2);
+COMMIT;
+
+# Wait the slave IO thread to reach the debug point
+--source include/rpl_connection_slave.inc
+--source include/wait_for_slave_io_to_stop.inc
+# Remove the debug point, so the IO thread will not stop after
+# queuing a WRITE_ROWS event anymore
+SET GLOBAL DEBUG= @save_debug;
+
+# Restart slave I/O thread
+--source include/start_slave_io.inc
+
+# Sync the slave with the master
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+
+# Final data verification
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+--let diff_tables= master:t1, slave:t1
+--source include/diff_tables.inc
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_packet.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_packet.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_packet.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_packet.test	2017-02-27 07:47:02.000000000 +0000
@@ -151,6 +151,7 @@
 # Remove the bad binlog and clear error status on slave.
 STOP SLAVE;
 RESET SLAVE;
+RESET MASTER;
 --connection master
 RESET MASTER;
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test	2017-02-27 07:47:02.000000000 +0000
@@ -40,9 +40,7 @@
 # Resetting of SBM is a possibility whenever Coordinator
 # notices no more groups left neither to read nor to process (demo 2).
 #
-
-start slave io_thread;
-source include/wait_for_slave_io_to_start.inc;
+--source include/start_slave.inc
 
 connection master;
 
@@ -53,10 +51,12 @@
 
 create table t1 (f1 int) engine=innodb;
 create table t2 (f1 int) engine=innodb;
-save_master_pos;
+--source include/sync_slave_sql_with_master.inc
 
+--source include/stop_slave_sql.inc
 # 1st transaction that will be used to compute SBM.
 # It will hang $idle time at least in processing to get min estimate for SBM
+connection master;
 let $idle= 3;
 
 begin;
@@ -68,25 +68,16 @@
   insert into t2 values (1);
 commit;
 
-connection slave;
-source include/start_slave.inc;
-
 #
 # all events are in relay-log
 #
-connection master;
-
 source include/sync_slave_io_with_master.inc;
 
-# tables are created on slave
-connection slave;
-sync_with_master;
-
 connection slave1;
 lock table t2 write;  # to block 2nd trans
 
 connection slave;
-
+--source include/start_slave_sql.inc
 let $count= 1;
 let $table= t1;
 source include/wait_until_rows_count.inc;
@@ -102,16 +93,6 @@
 let $slave_param_value= $idle;
 source include/wait_for_slave_param.inc;
 
-# checking sanity of SBM value
-let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
-let $lower_bound= $idle;
-if (`SELECT $sbm < $idle`)
-{
-  -- echo *** Seconds behind master is $sbm less than minimum expected $idle ***
-  -- source include/show_rpl_debug_info.inc
-  -- die
-}
-
 --echo Seconds_Behind_Master after first transaction is as expected.
 
 connection slave1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_parallel_worker_error.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_parallel_worker_error.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_parallel_worker_error.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_parallel_worker_error.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,58 @@
+--source include/master-slave.inc
+--source include/have_binlog_format_statement.inc
+--source include/only_mts_slave_parallel_workers.inc
+
+#
+# Proving correct error reporting by Worker in condition of the failing query
+# size is close to that of internal buffer MAX_SLAVE_ERRMSG.
+# bug#18563480 MTS: CRASH WHEN SLAVE WORKER TRY TO EXECUTE A BIG STATEMENT doomed to fail
+#
+
+# Create a table on the slave to set up future error on its creation
+# via replication
+
+--connection slave
+call mtr.add_suppression("Slave SQL: Worker.*failed executing transaction");
+call mtr.add_suppression("Slave SQL:.*The slave coordinator and worker threads are stopped");
+
+--eval CREATE TABLE t (a TEXT) select "a" as a
+
+# Create a query size of over MAX_SLAVE_ERRMSG = 1024
+
+--connection master
+
+--let i=0
+--let select_arg=a
+
+while ($i < 1024)
+{
+    --inc $i
+    --let $select_arg=a$select_arg
+}
+
+--eval CREATE TABLE t (a TEXT) select "$select_arg" as a
+
+--connection slave
+
+# Error is found as expected.
+--let $slave_sql_errno= convert_error(ER_TABLE_EXISTS_ERROR)
+--source include/wait_for_slave_sql_error.inc
+
+# Remove slave side table, recover slave to catch up
+DROP TABLE t;
+--source include/start_slave_sql.inc
+
+--connection master
+--source include/sync_slave_sql_with_master.inc
+
+
+#
+# Cleanup
+#
+
+--connection master
+DROP TABLE t;
+--source include/sync_slave_sql_with_master.inc
+
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--master-info-repository=TABLE --relay-log-info-repository=TABLE --relay-log-recovery=1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,64 @@
+###############################################################################
+# Bug#19021091: RELAY_LOG_RECOVERY KO WHEN CHANGE MASTER WITHOUT FILE AND
+# SQL_THREAD NOT STARTED
+#
+# Problem:
+# ========
+# If, on an empty database:
+# - CHANGE MASTER TO without a MASTER_FILE and MASTER_POS is used,
+# - the IO_THREAD is started WITHOUT starting the SQL_THREAD,
+# - MySQL crashed,
+# - MySQL is restarted with relay_log_recovery = 1.
+#
+# Crash recovery will not work as expected:
+# - The IO_THREAD position will NOT be initialized to the SQL_THREAD position,
+# - SQL_THREAD position will NOT be initialized to the new relay log.
+#
+# It looks like, when the SQL_THREAD does not have a Relay_Master_Log_File,
+# relay_log_recovery does not work.
+#
+# Test:
+# =====
+# Use master and slave info repositories to be tables and set
+# relay-log-recovery=1. Stop the slave, execute a CREATE DATABASE statement on
+# the master. Execute a CHANGE MASTER statement on slave without a MASTER_FILE
+# and MASTER_POS. Start IO thread alone. Crash the slave and restart it. When
+# slave is restarted with bug, sql thread will not be able to start. It will fail
+# with an error saying the database already exists. Post fix sql thread will
+# read positions from the first rotate event that is received from the master.
+# Sql thread will start without any error.
+###############################################################################
+--source include/master-slave.inc
+--source include/force_restart.inc
+--source include/rpl_connection_slave.inc
+call mtr.add_suppression("Recovery from master pos .*");
+
+--source include/rpl_connection_slave.inc
+--source include/stop_slave.inc
+
+--source include/rpl_connection_master.inc
+CREATE DATABASE test_jfg;
+
+--source include/rpl_connection_slave.inc
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 2 ####
+--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$MASTER_MYPORT,master_user='root'
+START SLAVE IO_THREAD;
+source include/wait_for_slave_io_to_start.inc;
+
+--source include/rpl_connection_master.inc
+source include/sync_slave_io_with_master.inc;
+
+# Restart the slave server
+--let $rpl_server_number= 2
+--let $rpl_force_stop= 1
+--let $rpl_server_parameters=--skip_slave_start=FALSE --master-info-repository=TABLE --relay-log-info-repository=TABLE --relay-log-recovery=1
+--source include/rpl_restart_server.inc
+
+# With bug sql thread will not be able to start it will fail with error 1007
+# Slave: Can't create database 'test_jfg'; database exists Error_code: 1007
+source include/wait_for_slave_sql_to_start.inc;
+
+--source include/rpl_connection_master.inc
+DROP DATABASE test_jfg;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--no-console --disable-log-slave-updates --replicate-same-server-id --gtid-mode=off --master-info-repository=TABLE --relay-log-info-repository=TABLE --relay-log-recovery=1 --log_error=$MYSQLTEST_VARDIR/tmp/slave.err
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,84 @@
+###############################################################################
+# Bug#19021091: RELAY_LOG_RECOVERY KO WHEN CHANGE MASTER WITHOUT FILE AND
+# SQL_THREAD NOT STARTED
+#
+# Problem:
+# ========
+# If, on an empty database:
+# - CHANGE MASTER TO without a MASTER_FILE and MASTER_POS is used,
+# - the IO_THREAD is started WITHOUT starting the SQL_THREAD,
+# - MySQL crashed,
+# - MySQL is restarted with relay_log_recovery = 1.
+#
+# Crash recovery will not work as expected:
+# - The IO_THREAD position will NOT be initialized to the SQL_THREAD position,
+# - SQL_THREAD position will NOT be initialized to the new relay log.
+#
+# It looks like, when the SQL_THREAD does not have a Relay_Master_Log_File,
+# relay_log_recovery does not work.
+#
+# Test:
+# =====
+# If SQL_THREAD does not have a Relay_Master_Log_File set recovery process
+# will try to extract the first rotate event from the master and try to
+# extract master_log_file and master_log_pos from the rotate event. But when
+# replicate-same-server-id is set master and slave will have same server_id
+# and it will not be possible to identify the rotate event from master. Hence
+# if recovery is happening with empty Relay_Master_Log_File and
+# replicate-same-server-id is set we generate an error saying recovery is not
+# possible.
+#
+# Enable replicate-same-server-id. Set slave's info repository to be tables
+# and set relay-log-recovery=1. Start slave io_thread to ensure that
+# Relay_Master_Log_File is not initialized. Stop and restart the slave server.
+# Relay log recovery will not happen slave will generate an error in error log
+# as shown below.
+#
+# Error during --relay-log-recovery, replicate_same_server_id is in use and
+# sql thread's positions are not initialized, hence relay log recovery cannot
+# happen.
+###############################################################################
+# If replicate-same-serverid is used log-slave-updates cannot be set and gtid
+# mode will not work. Hence disabling the test script in gtid mode.
+--source include/not_gtid_enabled.inc
+--source include/force_restart.inc
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+call mtr.add_suppression("Failed to initialize the master info structure");
+call mtr.add_suppression("Error during --relay-log-recovery *");
+CREATE TABLE t1 ( n INT);
+RESET MASTER;
+
+# replicate ourselves
+--source include/stop_slave.inc
+--source include/wait_for_slave_to_stop.inc
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval CHANGE MASTER TO MASTER_PORT=$SLAVE_MYPORT;
+START SLAVE IO_THREAD;
+--source include/wait_for_slave_io_to_start.inc
+
+# Restart the slave server
+--let $rpl_server_number= 2
+--source include/rpl_stop_server.inc
+
+--let $rpl_server_number= 2
+--let $rpl_server_parameters=--skip_slave_start=FALSE --master-info-repository=TABLE --relay-log-info-repository=TABLE --relay-log-recovery=1
+--source include/rpl_start_server.inc
+
+--replace_regex /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]+/--TIME--/
+--let GREP_FILE=$MYSQLTEST_VARDIR/tmp/slave.err
+--let GREP_PATTERN=Error during --relay-log-recovery
+--source extra/rpl_tests/grep_pattern.inc
+
+# Clean up Server needs to be restarted with relay-log-recovery=0
+--let $rpl_server_number= 2
+--let $rpl_server_parameters=--master-info-repository=TABLE --relay-log-info-repository=TABLE --relay-log-recovery=0
+--source include/rpl_restart_server.inc
+
+DROP TABLE t1;
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval change master to master_port=$MASTER_MYPORT;
+--source include/start_slave.inc
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_rotate_gtid.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_rotate_gtid.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_rotate_gtid.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_rotate_gtid.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,95 @@
+# ==== Purpose ====
+#
+# When the slave SQL thread processes transactions, it internally keeps
+# track of the starting position of the current transaction. This position
+# is used to rewind the position in case the SQL thread is stopped in the
+# middle of a transaction, or in case the transaction is re-executed due to
+# slave_transaction_retries > 0.
+#
+# This test verifies that the start of the transaction is correctly updated
+# even if the transaction spans multiple relay logs, such that a Gtid_log_event
+# is immediately followed by a Rotate_log_event.
+#
+# ==== Related Bugs and Worklogs ====
+#
+# Bug #18652178 STOP SQL_THREAD, START SQL_THREAD
+#               CAUSES A TRX TO LOG WITH A DIFFERENT GTID
+#
+--source include/have_binlog_format_statement.inc
+--source include/have_innodb.inc
+--source include/have_gtid.inc
+--source include/master-slave.inc
+# Test should run only on debug build
+source include/have_debug.inc;
+source include/have_debug_sync.inc;
+
+
+--echo # Preparing the relaylog
+#
+# Create a relaylog on slave containing a relaylog file that finishes with
+# an Gtig_log_event and the rest of the group (transaction) is in the
+# next relaylog file.
+#
+# The better way of doing this is disabling slave's auto positioning
+# and using a debug point to stop the IO thread right after queuing
+# the Gtid_log_event. Because auto positioning is disabled, the IO thread
+# will not ask the Gtid_log_event again.
+#
+--source include/rpl_connection_slave.inc
+--source include/stop_slave.inc
+# Disabling auto positioning
+CHANGE MASTER TO MASTER_AUTO_POSITION=0;
+# Make sync includes to rely on position instead of GTIDs
+--let $use_gtids= 0
+--source include/start_slave_io.inc
+
+# Setting the debug point to stop IO thread after queuing Gtid_log_event
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,stop_io_after_reading_gtid_log_event';
+
+--echo # Create a transaction on the master
+--echo # that will have it's GTID and other events in separated relay log files
+--source include/rpl_connection_master.inc
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+
+# Wait for IO thread to stop and restarts it to get the rest of the transaction
+--source include/rpl_connection_slave.inc
+--source include/wait_for_slave_io_to_stop.inc
+SET GLOBAL DEBUG=@save_debug;
+--source include/start_slave_io.inc
+
+--echo # Create other transaction on the master
+--source include/rpl_connection_master.inc
+CREATE TABLE t2 (c1 INT) ENGINE=InnoDB;
+
+--source include/sync_slave_io_with_master.inc
+
+--echo # Restart the SQL thread until the beginning of the last relay log file
+--source include/rpl_connection_slave.inc
+# Disable warnings to avoid logging "UNTIL condtion is not supported ..." on MTS
+--disable_warnings
+START SLAVE SQL_THREAD UNTIL
+  RELAY_LOG_FILE= 'slave-relay-bin.000003',
+  RELAY_LOG_POS= 4;
+--enable_warnings
+--source include/wait_for_slave_sql_to_stop.inc
+
+--echo # Restart the SQL thread
+--source include/start_slave_sql.inc
+
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+# If t1 was replicated to the slave and it's original GTID was skipped
+# this test will fail in the rpl_end.inc because the GTID_EXECUTED of the
+# master contains a GTID that was sent to the slave (it is in
+# Retrieved_Gtid_Set), but wasn't applied by the SQL thread.
+--let $assert_cond= "[SHOW TABLES LIKE "t1"]" = "t1"
+--let $assert_text= t1 should be replicated
+--source include/assert.inc
+
+--echo # Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1, t2;
+# Make rpl_end.inc to verify GTID_EXECUTED
+--let $use_gtids= 1
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test	2017-02-27 07:47:02.000000000 +0000
@@ -40,6 +40,8 @@
 source include/show_binary_logs.inc;
 
 SET DEBUG_SYNC = 'now SIGNAL rotated';
+--let $wait_condition= SELECT COUNT(*)=0 FROM information_schema.processlist WHERE state LIKE 'debug sync point: at_purge_logs_before_date%'
+--source include/wait_condition.inc
 SET DEBUG_SYNC = 'RESET';
 
 # the first connection finally completes its INSERT
@@ -82,6 +84,8 @@
 --source include/wait_condition.inc
 
 SET DEBUG_SYNC = 'now SIGNAL rotated';
+--let $wait_condition= SELECT COUNT(*)=0 FROM information_schema.processlist WHERE state LIKE 'debug sync point: at_purge_logs_before_date%'
+--source include/wait_condition.inc
 SET DEBUG_SYNC = 'RESET';
 
 connection master;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_rotate_row_trans.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_rotate_row_trans.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_rotate_row_trans.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_rotate_row_trans.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,94 @@
+# ==== Purpose ====
+#
+# Verify if the slave SQL thread is avoiding to update position when a Rotate
+# event is applied in the middle of a group.
+#
+# This test will execute two INSERT statements in the master and will use
+# a debug sync point in the slave to rotate the relay log (restarting the IO
+# thread) after each Write_rows event be queued into the relay log.
+#
+# The slave SQL thread should not update its position while in the middle of
+# the transaction.
+#
+# After the last stop of the IO thread, the SQL thread will also be stopped.
+#
+# Both threads will be started to finish the test.
+#
+# A problematic SQL thread will restart in the middle of the transaction and
+# will skip the first INSERT statement.
+#
+# ==== Related Bugs and Worklogs ====
+#
+# Bug #18482854 RPL : ROTATE_LOG_EVENT INCORRECTLY ADVANCES GROUP_RELAY_LOG_POS
+#               IN A GROUP
+#
+--source include/have_binlog_format_row.inc
+--source include/have_innodb.inc
+--source include/not_gtid_enabled.inc
+--source include/master-slave.inc
+# Test should run only on debug build
+source include/have_debug.inc;
+source include/have_debug_sync.inc;
+
+--disable_query_log
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+--enable_query_log
+
+--echo # Initial setup
+--source include/rpl_connection_master.inc
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+
+--echo # Sync slave with master and setup debug sync point
+--source include/sync_slave_sql_with_master.inc
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,stop_io_after_reading_write_rows_log_event';
+
+--echo # Insert the data in the master
+--source include/rpl_connection_master.inc
+
+--let iterations= 2
+--let $inserts= 0
+BEGIN;
+while ($inserts < $iterations)
+{
+  --eval INSERT INTO t1 (c1) VALUES ($inserts)
+  --inc $inserts
+}
+COMMIT;
+
+--echo # Restart the IO thread keeping SQL thread running until last relay log split
+
+--source include/rpl_connection_slave.inc
+--let $restarts= $iterations
+
+while ($restarts)
+{
+  --source include/wait_for_slave_io_to_stop.inc
+  --dec $restarts
+  if ($restarts)
+  {
+    START SLAVE IO_THREAD;
+  }
+}
+
+--echo # Stop the SQL thread (it should be in the middle of the transaction/group)
+--source include/stop_slave_sql.inc
+
+--echo # Remove the debug point and restart the both threads
+SET GLOBAL DEBUG= @save_debug;
+--source include/start_slave.inc
+
+--echo # Do one more insert on master and then sync slave with master
+--source include/rpl_connection_master.inc
+--eval INSERT INTO t1 (c1) VALUES ($inserts)
+--source include/sync_slave_sql_with_master.inc
+
+--echo # Now compare master and slave's t1 table data
+--source include/rpl_connection_master.inc
+--let diff_tables= master:t1, slave:t1
+--source include/diff_tables.inc
+
+--echo # Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_corrupt-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_corrupt-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_corrupt-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_corrupt-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--log-slave-updates --enforce-gtid-consistency=true --gtid-mode=on
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_corrupt-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_corrupt-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_corrupt-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_corrupt-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--log-slave-updates --enforce-gtid-consistency=true --gtid-mode=on
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_corrupt.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_corrupt.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_corrupt.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_corrupt.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,36 @@
+###############################################################################
+# Bug#18542111:ADD A TEST CASE TO TEST THE BINLOG TRANSACTION CACHE SIZE TO
+# 32768 
+#
+# Problem:
+# ========
+# When the binlog's IO_CACHE grows up to exact 32768 bytes it
+# causes binlog events to get corrupt, if this transaction
+# precedes with a transaction whose IO_CACHE size is >32768.
+#
+# Test:
+# =====
+# Create a transaction whose size is 37000 so that the event's size exceeds
+# 32768 and its contents are flushed to a file. Following this transaction
+# add a second transaction whose cache size is exactly 32768.
+#
+# During execution of third replace statement no assert should be caused.
+# Slave should be in sync with master.
+###############################################################################
+--source include/have_binlog_format_row.inc
+--source include/have_innodb.inc
+--source include/master-slave.inc
+
+--connection master
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1(a varchar(40000))ENGINE=INNODB;
+INSERT INTO t1 VALUES (REPEAT('a',37000));
+INSERT INTO t1 VALUES (REPEAT('b',32552));
+--sync_slave_with_master
+
+--connection master
+--let $diff_tables=master:t1,slave:t1
+--source include/diff_tables.inc
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_create_select.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_create_select.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_create_select.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_create_select.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,29 @@
+# Testing table creations for row-based replication.
+
+--source include/have_binlog_format_row.inc
+--source include/not_gtid_enabled.inc 
+--source include/master-slave.inc
+
+--echo #
+--echo # BUG#17994219: CREATE TABLE .. SELECT PRODUCES INVALID STRUCTURE, 
+--echo #               BREAKS RBR 
+--echo #
+
+connection master;
+--echo #After the patch, the display width is set to a default
+--echo #value of 21.
+CREATE TABLE t1 AS SELECT REPEAT('A', 1000) DIV 1 AS a;
+SHOW CREATE TABLE t1;
+
+CREATE TABLE t2 AS SELECT CONVERT(REPEAT('A', 255) USING UCS2) DIV 1 AS a;
+SHOW CREATE TABLE t2;
+
+--echo #After the patch, no error is reported.
+sync_slave_with_master;
+
+connection master;
+DROP TABLE t1;
+DROP TABLE t2;
+
+--source include/rpl_end.inc
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_hash_scan_sanity.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_hash_scan_sanity.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_hash_scan_sanity.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_hash_scan_sanity.test	2017-02-27 07:47:02.000000000 +0000
@@ -163,6 +163,44 @@
 -- let $expected_alg= 'INDEX_SCAN'
 -- source include/rpl_hash_scan_assertion.inc
 
+# Begin of Test cases for Bug#18860225
+# HASH_SCAN SEEMS BROKEN: CAN'T FIND RECORD IN 'T1' ERROR_CODE: 1032
+# Test Case 1: Key type is <Int>
+--connection slave
+SET @@global.slave_rows_search_algorithms= 'HASH_SCAN';
+--connection master
+CREATE TABLE t5(c1 INT, c2 INT, KEY(c2));
+INSERT INTO t5 VALUES (1,1),(2,2),(3,1),(4,NULL),(5,2),(6,3);
+DELETE FROM t5 ORDER BY c1;
+DROP TABLE t5;
+--source include/sync_slave_sql_with_master.inc
+
+# Test Case 2: Key type is <BigInt>
+--connection master
+CREATE TABLE t5(c1 BIGINT, c2 BIGINT, KEY(c2));
+INSERT INTO t5 VALUES (1,1),(2,2),(3,1),(4,NULL),(5,2),(6,3);
+DELETE FROM t5 ORDER BY c1;
+DROP TABLE t5;
+--source include/sync_slave_sql_with_master.inc
+
+# Test Case 3: Key type is <Varchar>
+--connection master
+CREATE TABLE t5(c1 INT, c2 VARCHAR(20), KEY(c2));
+INSERT INTO t5 VALUES (1,"value1"),(2,"value2"),(3,"value1"),(4,NULL),(5,"value2"),(6,"value3");
+DELETE FROM t5 ORDER BY c1;
+DROP TABLE t5;
+--source include/sync_slave_sql_with_master.inc
+
+# Test Case 4: Key is composite key and type is <Int,Varchar>
+#  and Varchar key having different length values
+--connection master
+CREATE TABLE t5(c1 INT, c2 INT, c3 VARCHAR(20), KEY(c2,c3));
+INSERT INTO t5 VALUES (1,1,"ab"),(2,2,"cde"),(3,1,"12345"),(4,4,"random"),(5,NULL,NULL),(6,5,NULL),(7,NULL,"lmnopqr");
+DELETE FROM t5 ORDER BY c1;
+DROP TABLE t5;
+--source include/sync_slave_sql_with_master.inc
+# End of Test cases for Bug#18860225
+
 -- connection slave
 
 SET @@global.slave_rows_search_algorithms= @saved_slave_rows_search_algorithms;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test	2017-02-27 07:47:02.000000000 +0000
@@ -32,8 +32,10 @@
 
 -- disable_warnings
 DROP TABLE IF EXISTS `t1`;
--- enable_warnings
 
+# This CREATE TABLE statement issues the warning "Row size too large" when
+# the InnoDB page size is 4K.  No such warning will come for InnoDB page size
+# 16K.  Hence disabling the warning for this CREATE TABLE statement.
 -- echo ### TABLE with field_metadata_size == 290
 CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
@@ -185,6 +187,8 @@
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB;
 
+-- enable_warnings
+
 LOCK TABLES `t1` WRITE;
 INSERT INTO `t1`(c2) VALUES ('1');
 FLUSH LOGS;
@@ -298,9 +302,17 @@
 ## we don't need this in the result file
 ## however, for debugging purposes you 
 ## may want to reactivate query logging
+
+# The CREATE TABLE statements in 'generated_sql' issues the warning "Row size
+# too large" when the InnoDB page size is 4K.  No such warning will come for
+# InnoDB page size 16K.  Hence disabling the warning while executing these
+# statement.
+
+-- disable_warnings
 -- disable_query_log 
 -- source $generated_sql
 -- enable_query_log
+-- enable_warnings
 
 --source include/sync_slave_sql_with_master.inc
 -- connection master
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_USER.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_USER.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_row_USER.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_row_USER.test	2017-02-27 07:47:02.000000000 +0000
@@ -20,7 +20,7 @@
 CREATE DATABASE mysqltest1;
 --enable_warnings
 
-# Section 1 test 
+# Section 1 test anonymous user
 CREATE USER tester IDENTIFIED BY 'test';
 GRANT ALL ON mysqltest1.* TO 'tester'@'%' IDENTIFIED BY 'test';
 GRANT ALL ON mysqltest1.* TO ''@'localhost%';
@@ -31,13 +31,13 @@
 CREATE TABLE mysqltest1.t1 (a INT, users VARCHAR(255), PRIMARY KEY(a));
 INSERT INTO mysqltest1.t1 VALUES(1,USER());
 INSERT INTO mysqltest1.t1 VALUES(2,CURRENT_USER());
-delimiter |;
-create procedure mysqltest1.p1()
-begin
+DELIMITER |;
+CREATE PROCEDURE mysqltest1.p1()
+BEGIN
  INSERT INTO mysqltest1.t1 VALUES(3,USER());
  INSERT INTO mysqltest1.t1 VALUES(4,CURRENT_USER());
-end|
-delimiter ;|
+END|
+DELIMITER ;|
 
 CALL mysqltest1.p1();
 connection master;
@@ -49,6 +49,7 @@
 # Lets cleanup
 #show binlog events;
 
+disconnect m_1;
 DROP DATABASE mysqltest1;
 REVOKE ALL ON mysqltest1.* FROM 'tester'@'%';
 REVOKE ALL ON mysqltest1.* FROM ''@'localhost%';
@@ -57,5 +58,46 @@
 
 --source include/sync_slave_sql_with_master.inc
 
+# Begin clean up test section
+connection master;
+--disable_warnings
+DROP DATABASE IF EXISTS mysqltest1;
+CREATE DATABASE mysqltest1;
+--enable_warnings
+
+# Section 2 test anonymous host
+CREATE USER 'tester1'@'' IDENTIFIED BY 'test';
+GRANT ALL ON mysqltest1.* TO 'tester1'@'' IDENTIFIED BY 'test';
+FLUSH PRIVILEGES;
+connect (m_2,localhost,tester1,test,mysqltest1);
+
+connection m_2;
+CREATE TABLE mysqltest1.t1 (a INT, users VARCHAR(255), PRIMARY KEY(a));
+INSERT INTO mysqltest1.t1 VALUES(1,USER());
+INSERT INTO mysqltest1.t1 VALUES(2,CURRENT_USER());
+DELIMITER |;
+CREATE PROCEDURE mysqltest1.p1()
+BEGIN
+ INSERT INTO mysqltest1.t1 VALUES(3,USER());
+ INSERT INTO mysqltest1.t1 VALUES(4,CURRENT_USER());
+END|
+DELIMITER ;|
+
+CALL mysqltest1.p1();
+connection master;
+SELECT * FROM mysqltest1.t1 ORDER BY a;
+--source include/sync_slave_sql_with_master.inc
+SELECT * FROM mysqltest1.t1 ORDER BY a;
+
+connection master;
+# Lets cleanup
+
+disconnect m_2;
+DROP DATABASE mysqltest1;
+REVOKE ALL ON mysqltest1.* FROM 'tester1'@'';
+DROP USER tester1@'';
+
+--source include/sync_slave_sql_with_master.inc
+
 # End of 5.0 test case
 --source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--max_relay_log_size=4096
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,111 @@
+###############################################################################
+# Bug #18622657 SECONDS_BEHIND_MASTER DISTORTED BECAUSE OF
+# PREVIOUS_GTID EVENT
+# Problem: Previous gtid log event in relay log should not be contributed to
+#  seconds behind master calculation.
+# Steps to reproduce:
+#  1) Try all 6 different possible rotations (new relay log files)
+#  2) Execute SBM after every previous_gtid_log_event execution from each
+#     log file and make sure that timestamp is not considered for SBM
+#     calculation.
+###############################################################################
+--source include/have_debug_sync.inc
+--source include/have_gtid.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+--source include/have_binlog_format_statement.inc
+
+# Set sync debug point to calculate sbm exactly after every
+#  previous_gtid_log_event.
+--connection slave
+SET @save_global_debug=@@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,dbug.calculate_sbm_after_previous_gtid_log_event';
+
+# To avoid warning MTS
+SET @saved_slave_transaction_retries=@@global.slave_transaction_retries;
+SET @@global.slave_transaction_retries=0;
+# Previous gtid log events are generated at the time of
+#  relay log is rotated and will be written at the top
+#  of the relay log. There are few ways in which
+#  relay log gets rotated. Lets find out SBM after
+#  Previous_gtid_log_event execution in all those
+#  of relay logs
+
+# Case-1 :At the time of server started, a new relaylog
+#  slave-relay-bin.000001
+--connection slave
+--let $slave_datadir=`select @@datadir`
+
+# Case-2 : Start IO thread , relay log will be rotated to
+#  slave-relay-bin.000002
+--source include/start_slave_io.inc
+
+# Case-3 : Restart IO thread, relay log will be rotated to
+#  slave-relay-bin.000003
+--source include/stop_slave_io.inc
+--source include/start_slave_io.inc
+
+# Case-4 Lets put (more than) 4096 data in binary log and when it
+#  reaches slave, relaylog will be rotated (please relay-log-file-size
+#  is set to in .opt file) to slave-relay-bin.000004/
+--connection master
+CREATE TABLE t1(i INT);
+--let $i=20
+while ($i > 1)
+{
+eval INSERT INTO t1 VALUES ($i);
+dec $i;
+}
+DROP TABLE t1;
+
+# Case-5 (FLUSH LOGS on slave will rotate to relaylog
+#  slave-relay-bin.000005)
+--connection slave
+FLUSH LOGS;
+
+# Case-6 (FLUSH LOGS on master will reach slave and relaylog will be rotated
+# at slave, generating two new slave bins slave-relay-bin.000006,
+# slave-relay-bin.000007)
+--connection master
+FLUSH LOGS;
+--source include/sync_slave_io_with_master.inc
+
+#####################################
+#                                   #
+#    Actual testing starts here.    #
+#                                   #
+#####################################
+
+# Let SQL thread read and execute all 7 slave-relay-bin's
+#  previous_gtid_log_events and SBM cannot be greater or equal to
+#  $idle seconds.
+--source include/start_slave_sql.inc
+
+# Just to fake that I/O thread started 3 mints ago,
+#  the server changes the I/O thread start time to
+#  now() - 180 seconds (3 mints ago) instead of now()
+#  using debug point 'calculate_sbm_after_previous_gtid_log_event'.
+#  But that 3 mints delay should not be seen when
+#  some one asks for SBM after Previous_gtid_log_event and
+#  this test script try to test that below.
+--let $idle=180
+
+--let $i=0
+while ($i < 7)
+{
+SET DEBUG_SYNC="now wait_for signal.reached";
+
+# Calcualte SBM
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+--let $assert_text= Seconds Behind Master should be less than $idle seconds.
+--let $assert_cond= $sbm < $idle
+--source include/assert.inc
+
+SET DEBUG_SYNC="now signal signal.done_sbm_calculation";
+--inc $i
+}
+
+# Cleanup
+SET @@GLOBAL.DEBUG=@save_global_debug;
+SET @@global.slave_transaction_retries=@saved_slave_transaction_retries;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_deadlock.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_deadlock.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_deadlock.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_deadlock.test	2017-02-27 07:47:02.000000000 +0000
@@ -27,7 +27,7 @@
 
 --connection master
 SET GLOBAL debug= 'd,semi_sync_3-way_deadlock';
-SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished";
+SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished no_clear_event";
 
 --echo # Build 10 connections to master server
 --disable_query_log
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,66 @@
+###############################################################################
+# Bug#17453826:ASSERSION ERROR WHEN SETTING FUTURE BINLOG FILE/POS WITH
+# SEMISYNC
+#
+# Problem:
+# ========
+# When DMLs are in progress on the master, stopping a slave and setting ahead
+# binlog name/pos will cause an asssert on the master.
+#
+# Test:
+# =====
+# Do DMLs on the master and on the slave do a stop slave. Execute change master
+# to a future binlog file name and position which doesn't exist. Master should
+# not assert.
+###############################################################################
+--source include/have_semisync_plugin.inc
+--source include/master-slave.inc
+--source include/install_semisync.inc
+
+call mtr.add_suppression("Timeout waiting for reply of binlog*");
+call mtr.add_suppression("Read semi-sync reply network error");
+
+--source include/rpl_connection_master.inc
+CREATE TABLE t1 (a INT);
+--let $binlog_pos= query_get_value("SHOW MASTER STATUS", Position, 1)
+--let $master_binlog= query_get_value(SHOW MASTER STATUS, File, 1)
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+
+--source include/rpl_connection_master.inc
+--send INSERT INTO t1 VALUES(0)
+
+--source include/rpl_connection_master1.inc
+--let $status_var= rpl_semi_sync_master_wait_sessions
+--let $status_var_value= 1
+--source include/wait_for_status_var.inc
+
+--source include/rpl_connection_slave.inc
+CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000002', MASTER_LOG_POS=4, MASTER_AUTO_POSITION=0;
+START SLAVE;
+--let $slave_io_errno=1236
+--source include/wait_for_slave_io_error.inc
+
+--source include/rpl_connection_master.inc
+--reap
+INSERT INTO t1 VALUES (20);
+
+# Since dump thread has exited and no slaves are connected, master_clients
+# must be zero.
+--source include/rpl_connection_master.inc
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 0
+--let assert_text= semi sync master clients should be 0.
+--source include/assert.inc
+
+--source include/rpl_connection_slave.inc
+--source include/stop_slave.inc
+--replace_regex /MASTER_LOG_FILE=[^,]+/MASTER_LOG_FILE=FILE/ /MASTER_LOG_POS=[0-9]+/ MASTER_LOG_POS= POS/
+eval CHANGE MASTER TO MASTER_LOG_FILE='$master_binlog', MASTER_LOG_POS=$binlog_pos, MASTER_AUTO_POSITION=0;
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+--source include/uninstall_semisync.inc
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,64 @@
+###############################################################################
+# Bug#17879675:SHUTDOWN HANG IF SEMISYNC IS ENABLED AND SLAVE ABORT
+#
+# Problem:
+# ========
+# Step 1. enable semisync and set a big value for
+# rpl_semi_sync_master_timeout.
+#
+# Step 2. kill io thread of slave, so the threads on master will keep on
+# WAITING ACK FROM SLAVE.
+#
+# Step 3.shutdown the master ---hang
+#
+# Test:
+# =====
+# Stop IO thread and execute a transaction on master. The transaction thread
+# will wait for an ack as IO thread is stopped.  Now shutdown the master the
+# shutdown should not hang.  Shutdown should stop the dump thread and the
+# dump thread should wakeup the waiting transaction thread and switch off
+# semisync as there are no active slaves connected to the server.
+###############################################################################
+--source include/have_semisync_plugin.inc
+--source include/master-slave.inc
+--source include/install_semisync.inc
+# Test script is independent of binlog format.
+--source include/have_binlog_format_mixed.inc
+
+call mtr.add_suppression("Read semi-sync reply network error");
+call mtr.add_suppression("SEMISYNC: Forced shutdown. Some updates might not be replicated.");
+
+--source include/rpl_connection_master.inc
+SET GLOBAL rpl_semi_sync_master_timeout = 10000000;
+
+--source include/rpl_connection_slave.inc
+--source include/stop_slave_io.inc
+
+--source include/rpl_connection_master.inc
+--send CREATE TABLE t(f INT) ENGINE=INNODB;
+
+--source include/rpl_connection_master1.inc
+--let $status_var= rpl_semi_sync_master_wait_sessions
+--let $status_var_value= 1
+--source include/wait_for_status_var.inc
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--disable_result_log
+--replace_regex /.*mysqladmin.*: /mysqladmin: /
+--exec $MYSQLADMIN -uroot -S $MASTER_MYSOCK -P $MASTER_MYPORT shutdown 2>&1
+--enable_result_log
+
+--source include/rpl_connection_master.inc
+--reap
+--let $rpl_server_number=1
+--source include/rpl_start_server.inc
+
+--source include/rpl_connection_slave.inc
+--source include/start_slave_io.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t;
+--source include/sync_slave_sql_with_master.inc
+
+--source include/uninstall_semisync.inc
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync.test	2017-02-27 07:47:02.000000000 +0000
@@ -577,6 +577,7 @@
 source include/stop_slave.inc;
 connection master;
 echo [ on master ];
+--source include/stop_dump_threads.inc
 UNINSTALL PLUGIN rpl_semi_sync_master;
 enable_query_log;
 SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
@@ -627,19 +628,10 @@
 --echo #
 --echo # Clean up
 --echo #
+--source include/uninstall_semisync.inc
 
 connection slave;
-source include/stop_slave.inc;
-UNINSTALL PLUGIN rpl_semi_sync_slave;
-
-connection master;
-# The dump thread may still be running on the master, and so the following
-# UNINSTALL could generate a warning about the plugin is busy.
-disable_warnings;
-UNINSTALL PLUGIN rpl_semi_sync_master;
-enable_warnings;
-
-connection slave;
+--source include/stop_slave.inc
 --replace_column 2 ####
 change master to master_user='root',master_password='';
 source include/start_slave.inc;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,145 @@
+###############################################################################
+# Bug#17638477 UNINSTALL AND INSTALL SEMI-SYNC PLUGIN CAUSES SLAVES TO BREAK
+#  Problem: Uninstallation of Semi sync plugin should be blocked when it is
+#  in use.
+#  Test case: Uninstallation of semi sync should be allowed
+#   On Master:
+#     1) When there is no dump thread
+#     2) When there are no semi sync slaves (i.e., async replication).
+#   On Slave:
+#     1) When there is no I/O thread
+#     2) When there are no semi sync enabled I/O thread (i.e.,async replication).
+###############################################################################
+
+--source include/have_semisync_plugin.inc
+--source include/not_embedded.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+###############################################################################
+# Case 1: Uninstallation of semi sync plugins should be allowed when it is
+#  not in use i.e., when asynchronous replication is active.
+###############################################################################
+# Step 1.1: Install semi sync master plugin on master
+--replace_result $SEMISYNC_MASTER_PLUGIN SEMISYNC_MASTER_PLUGIN
+eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+
+# Step 1.2: Install semi sync slave plugin on slave
+--connection slave
+--replace_result $SEMISYNC_SLAVE_PLUGIN SEMISYNC_SLAVE_PLUGIN
+eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+
+# Step 1.3: Uninstallation of semisync plugin on master and slave should be
+#  allowed at this state as there is no semi sync replication enabled between
+#  master and slave.
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+--connection master
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+# Step 1.4: Check that replication is working fine at the end of the test case.
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (1);
+DROP TABLE t1;
+--sync_slave_with_master
+
+###############################################################################
+# Case 2: Uninstallation of semi sync plugins should be disallowed
+#  when it is in use i.e., when semi sync replication is active
+###############################################################################
+# Step 2.1: Install and enable semi sync replication between master and slave
+--source include/install_semisync.inc
+
+# Step 2.2: Check that rpl_semi_sync_slave uninstallation on Slave is not
+#  possible at this state
+--connection slave
+call mtr.add_suppression("Plugin 'rpl_semi_sync_slave' cannot be uninstalled now");
+--error ER_PLUGIN_CANNOT_BE_UNINSTALLED
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+
+# Step 2.3: Check that rpl_semi_sync_master uninstallation on Master is not
+#  possible at this state
+--connection master
+call mtr.add_suppression("Plugin 'rpl_semi_sync_master' cannot be uninstalled now");
+--error ER_PLUGIN_CANNOT_BE_UNINSTALLED
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+# Step 2.4: Check that replication is working fine at the end of the test case.
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (2);
+DROP TABLE t1;
+--sync_slave_with_master
+
+# Step 2.5: Make sure rpl_semi_sync_master_status on Master and
+# rpl_semi_sync_slave_staus on Slave are ON
+--let $slave_status=[show status like "Rpl_semi_sync_slave_status", Value, 1]
+--let assert_cond= "$slave_status" = "ON"
+--let assert_text= semi sync slave status should be ON.
+--source include/assert.inc
+
+--connection master
+--let $master_status=[show status like "Rpl_semi_sync_master_status", Value, 1]
+--let assert_cond= "$master_status" = "ON"
+--let assert_text= semi sync master status should be ON.
+--source include/assert.inc
+
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 1
+--let assert_text= semi sync master clients should be 1.
+--source include/assert.inc
+
+###############################################################################
+# Case 3: Uninstallation of semi sync plugin should be disallowed when there
+#  are semi sync slaves even though rpl_semi_sync_master_enabled= OFF;.
+###############################################################################
+# Step 3.1: Disable semi sync on master
+--connection master
+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
+
+# Step 3.2: Check that still Rpl_semi_sync_master_clients is 1
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 1
+--let assert_text= semi sync master clients should be 1.
+--source include/assert.inc
+
+# Step 3.3: Since Rpl_semi_sync_master_clients is 1, uninstallation of
+#  rpl_semi_sync_master should be disallowed.
+--error ER_PLUGIN_CANNOT_BE_UNINSTALLED
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+###############################################################################
+# Case 4: Uninstallation of semi sync plugin should be allowed when it is not
+#  in use. Same as Case 1 but this case is to check the case after enabling and
+#  disabling semi sync replication.
+###############################################################################
+
+# Step 4.1: Stop IO thread on slave.
+--connection slave
+--source include/stop_slave.inc
+
+# Step 4.2: Disable semi sync on slave.
+SET GLOBAL rpl_semi_sync_slave_enabled = OFF;
+
+# Step 4.3: Start IO thread on slave.
+--source include/start_slave.inc
+
+# Step 4.4: Uninstall semi sync plugin, it should be successful now.
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+
+# Step 4.5: On Master, check that semi sync slaves are now '0'.
+--connection master
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 0
+--let assert_text= semi sync master clients should be 0.
+--source include/assert.inc
+
+# Step 4.6: So uninstalling semi sync plugin should be allowed
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+# Step 4.7: Check that replication is working fine at the end of the test case
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (3);
+DROP TABLE t1;
+--sync_slave_with_master
+
+# Cleanup
+source include/rpl_end.inc;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_server_uuid.cnf percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_server_uuid.cnf
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_server_uuid.cnf	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_server_uuid.cnf	2017-02-27 07:47:02.000000000 +0000
@@ -1,8 +1,16 @@
 !include ../my.cnf
 
+[mysqld.1]
+log-warnings=2
+log-error=../../tmp/rpl_server_uuid_test.mysqld.1.err
+
+[mysqld.2]
+log-error=../../tmp/rpl_server_uuid_test.mysqld.2.err
+
 [mysqld.3]
 replicate-same-server-id=1
 gtid-mode=off
+log-error=../../tmp/rpl_server_uuid_test.mysqld.3.err
 
 [ENV]
 SERVER_MYPORT_3=		@mysqld.3.port
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_server_uuid.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_server_uuid.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_server_uuid.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_server_uuid.test	2017-02-27 07:47:02.000000000 +0000
@@ -18,7 +18,7 @@
 call mtr.add_suppression("Slave I/O thread .* register on master");
 call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: .*");
 CALL mtr.add_suppression(".*master and slave have equal MySQL server UUIDs.*");
-CALL mtr.add_suppression("Master's UUID has changed, its old UUID is.*");
+CALL mtr.add_suppression("Master's UUID has changed, although this should not happen unless you have changed it manually");
 CALL mtr.add_suppression("Slave I/O: SET @master_heartbeat_period to master failed with error: Lost connection to MySQL server during query");
 CALL mtr.add_suppression("Notifying master by SET @master_binlog_checksum= @@global.binlog_checksum failed with error");
 
@@ -236,4 +236,66 @@
 eval CHANGE MASTER TO 
        MASTER_LOG_FILE= '$old_master_log_file', MASTER_LOG_POS= $old_master_log_pos;
 --source include/start_slave.inc
+
+--echo
+--echo # Case 6:
+--echo # In an existing master-slave replication forum (M->S1), if another
+--echo # slave (S2) with the same UUID as S1 joins the forum and connects
+--echo # to Master(M), then there will be ping-pong reconnections happens
+--echo # between M->S2, M->S1, M->S2, M->S1,.... And both slave1 and slave2
+--echo # will be informed about this UUID misconfiguration in their error
+--echo # log file. And Master log will be populated with information that
+--echo # it found a zombie dump thread and it is killing it(only when
+--echo # log_warnings is greater than 1)
+--echo -----------------------------------------------------------------------------
+
+# Step-1: Copy server 2(S1)'s auto.cnf into server 3 (S2)'s data directory.
+--connection server_2
+--let $datadir2=`select @@datadir`
+-- connection server_3
+--let $datadir3=`select @@datadir`
+--copy_file $datadir3/auto.cnf $datadir3/auto_backup.cnf
+--remove_file $datadir3/auto.cnf
+--copy_file $datadir2/auto.cnf $datadir3/auto.cnf
+
+# Step-2: Restart the server(two servers with the same UUID)
+--let $rpl_server_number= 3
+--source include/rpl_restart_server.inc
+
+# Step-3: Just do some command on server_1
+--connection server_1
+CREATE TABLE t1(i int);
+DROP TABLE t1;
+
+# Step-4: Sync the data on both the slaves and observe that
+# sync will be success at both slaves.
+--let $sync_slave_connection= server_2
+--source include/sync_slave_sql_with_master.inc
+
+--connection server_1
+--let $sync_slave_connection= server_3
+--source include/sync_slave_sql_with_master.inc
+
+# Step-5: Observe that misconfiguration messages are in their respective
+# error log files.
+
+--let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/rpl_server_uuid_test.mysqld.1.err
+--let SEARCH_PATTERN=found a zombie dump thread with the same UUID
+--source include/search_pattern.inc
+
+--let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/rpl_server_uuid_test.mysqld.2.err
+--let SEARCH_PATTERN=master receives a binlog send request from a duplicate server UUID
+--source include/search_pattern.inc
+
+--let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/rpl_server_uuid_test.mysqld.3.err
+--let SEARCH_PATTERN=master receives a binlog send request from a duplicate server UUID
+--source include/search_pattern.inc
+
+# Cleanup (restore the server 3's auto.cnf back to proper one and restart)
+--remove_file $datadir3/auto.cnf
+--copy_file $datadir3/auto_backup.cnf $datadir3/auto.cnf
+--remove_file $datadir3/auto_backup.cnf
+--let $rpl_server_number= 3
+--source include/rpl_restart_server.inc
+--source include/stop_slave.inc
 --source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,69 @@
+###############################################################################
+# Bug#19843808: DEADLOCK ON FLUSH TABLES WITH READ LOCK + SHOW
+# SLAVE STATUS
+#
+# Problem:
+# ========
+# If a client thread on an slave does FLUSH TABLES WITH READ
+# LOCK; then master does some updates, SHOW SLAVE STATUS in
+# the same client will be blocked.
+#
+# Test:
+# =====
+# Execute a DML on master and make it blocked on slave after entering commit.
+# Execute FLUSH TABLES WITH READ LOCK on slave. Allow the blocked DML to
+# continue. The sql thread will be blocked in a state where it has acquired
+# rli->data_lock and it is waiting for MDL COMMIT lock. Now execute show slave
+# status command from the same client where FLUSH TABLES WITH READ LOCK was
+# issued. The show slave status command should not be blocked.
+###############################################################################
+--source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
+--source include/have_debug.inc
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+
+--echo # Let master and slave synced with t1 table created
+CREATE TABLE t1 (f INT) ENGINE= INNODB;
+--source include/sync_slave_sql_with_master.inc
+
+--echo # Setup GLOBAL.DEBUG at slave to reach commit
+--source include/rpl_connection_slave.inc
+--let $debug_saved= `SELECT @@GLOBAL.DEBUG`
+SET @@GLOBAL.DEBUG= '+d,dbug.reached_commit';
+
+--echo # Do some DML operation on master so that it will be blocked on
+--echo # slave as global read lock is in place.
+--source include/rpl_connection_master.inc
+INSERT INTO t1 VALUES (10);
+
+--echo # Issue FLUSH TABLES WITH READ LOCK after Reached is signaled
+--source include/rpl_connection_slave.inc
+SET DEBUG_SYNC='now WAIT_FOR Reached';
+FLUSH TABLES WITH READ LOCK;
+--echo # Let sql thread continue to try to obtain commit lock
+SET DEBUG_SYNC= 'now SIGNAL signal.commit_continue';
+
+--echo # Wait until sql thread enters "Waiting for commit lock" state
+let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist
+                     WHERE state = "Waiting for commit lock";
+--source include/wait_condition.inc
+
+--source include/rpl_connection_slave.inc
+--disable_result_log
+query_vertical SHOW SLAVE STATUS;
+--enable_result_log
+UNLOCK TABLES;
+SET @@GLOBAL.DEBUG= '$debug_saved';
+
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+
+let $diff_tables= master:t1, slave:t1;
+source include/diff_tables.inc;
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_special_charset-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_special_charset-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_special_charset-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_special_charset-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--character-set-server=utf16
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--character-set-server=utf16
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_special_charset.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_special_charset.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_special_charset.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_special_charset.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,25 @@
+################################################################################
+# Bug#19855907 IO THREAD AUTHENTICATION ISSUE WITH SOME CHARACTER SETS
+# Problem: IO thread fails to connect to master if servers are configured with
+#  special character sets like utf16, utf32, ucs2.
+#
+# Analysis: MySQL server does not support few special character sets like
+#  utf16,utf32 and ucs2 as "client's character set"(eg: utf16,utf32, ucs2).
+#  When IO thread is trying to connect to Master, it sets server's character
+#  set as client's character set. When Slave server is started with these
+#  special character sets, IO thread (a connection to Master) fails because
+#  of the above said reason.
+#
+# Fix: If server's character set is not supported as client's character set,
+#  then set default's client character set(latin1) as client's character set.
+###############################################################################
+--source include/master-slave.inc
+CREATE TABLE t1(i VARCHAR(20));
+INSERT INTO t1 VALUES (0xFFFF);
+--sync_slave_with_master
+--let diff_tables=master:t1, slave:t1
+--source include/diff_tables.inc
+# Cleanup
+--connection master
+DROP TABLE t1;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sp_privileges.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sp_privileges.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sp_privileges.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sp_privileges.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,134 @@
+###############################################################################
+# Bug#20049894: AUTOMATIC_SP_PRIVILEGES ARE NOT CORRECTLY REPLICATED WHEN
+# SETTING DEFINER
+#
+# Problem:
+# ========
+# Privileges created by automatic_sp_privileges are not correctly replicated
+# when the procedure is created by a super user using DEFINER.
+#
+# Test:
+# =====
+# Have a privileged user who already has EXECUTE and ALTER ROUTINE privileges
+# and execute CREATE PROCEDURE command with and without DEFINER class.
+# mysq.procs_priv table should not be updated. Take a non privileged user and
+# execute CREATE PROCEDURE command with and without DEFINER class.
+# mysql.procs_priv table should be updated.
+###############################################################################
+--source include/master-slave.inc
+--source include/rpl_connection_master.inc
+
+CREATE TABLE t1 (f INT);
+INSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (20);
+--source include/sync_slave_sql_with_master.inc
+
+# Case 1: Privileged user root creating procedure with
+# Definer. Procs_priv table should be empty
+--source include/rpl_connection_master.inc
+CREATE USER 'testuser'@'localhost';
+GRANT CREATE ROUTINE ON test.* TO 'testuser'@'localhost';
+GRANT REPLICATION CLIENT ON *.* TO 'testuser'@'localhost';
+FLUSH PRIVILEGES;
+
+DELIMITER |;
+CREATE DEFINER='testuser'@'localhost' PROCEDURE row_cnt()
+BEGIN
+SELECT COUNT(*) as total_rows FROM test.t1;
+END|
+DELIMITER ;|
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+--let $assert_text= Assert that mysql.procs_priv table is empty
+--let $assert_cond= [SELECT COUNT(*) FROM mysql.procs_priv] = 0
+--source include/assert.inc
+
+--source include/rpl_connection_slave.inc
+--let $assert_text= Assert that mysql.procs_priv table is empty
+--let $assert_cond= [SELECT COUNT(*) FROM mysql.procs_priv] = 0
+--source include/assert.inc
+
+--source include/rpl_connection_master.inc
+DROP PROCEDURE row_cnt;
+--source include/sync_slave_sql_with_master.inc
+
+# Case 2: Privileged user root creating procedure without
+# Definer. Procs_priv table should be empty
+--source include/rpl_connection_master.inc
+DELIMITER |;
+CREATE  PROCEDURE row_cnt()
+BEGIN
+SELECT COUNT(*) as total_rows FROM test.t1;
+END|
+DELIMITER ;|
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+--let $assert_text= Assert that mysql.procs_priv table is empty
+--let $assert_cond= [SELECT COUNT(*) FROM mysql.procs_priv] = 0
+--source include/assert.inc
+
+--source include/rpl_connection_slave.inc
+--let $assert_text= Assert that mysql.procs_priv table is empty
+--let $assert_cond= [SELECT COUNT(*) FROM mysql.procs_priv] = 0
+--source include/assert.inc
+
+--source include/rpl_connection_master.inc
+DROP PROCEDURE row_cnt;
+--source include/sync_slave_sql_with_master.inc
+
+# Case 3: Non Privileged user testuser creating procedure with
+# Definer. Procs_priv table should be updated
+--connect(con1,localhost,testuser,,)
+--connection con1
+DELIMITER |;
+CREATE DEFINER='testuser'@'localhost' PROCEDURE row_cnt()
+BEGIN
+SELECT COUNT(*) as total_rows FROM test.t1;
+END|
+DELIMITER ;|
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+--let $assert_text= Assert that mysql.procs_priv table has one row for testuser
+--let $assert_cond= [SELECT COUNT(*) FROM mysql.procs_priv WHERE User="testuser"] = 1
+--source include/assert.inc
+
+--source include/rpl_connection_slave.inc
+--let $assert_text= Assert that mysql.procs_priv table has one row for testuser
+--let $assert_cond= [SELECT COUNT(*) FROM mysql.procs_priv WHERE User="testuser"] = 1
+--source include/assert.inc
+
+--connection con1
+DROP PROCEDURE row_cnt;
+--source include/sync_slave_sql_with_master.inc
+
+# Case 4: Non Privileged user testuser creating procedure with
+# Definer. Procs_priv table should be updated
+--connection con1
+DELIMITER |;
+CREATE PROCEDURE row_cnt()
+BEGIN
+SELECT COUNT(*) as total_rows FROM test.t1;
+END|
+DELIMITER ;|
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+--let $assert_text= Assert that mysql.procs_priv table has one row for testuser
+--let $assert_cond= [SELECT COUNT(*) FROM mysql.procs_priv WHERE User="testuser"] = 1
+--source include/assert.inc
+
+--source include/rpl_connection_slave.inc
+--let $assert_text= Assert that mysql.procs_priv table has one row for testuser
+--let $assert_cond= [SELECT COUNT(*) FROM mysql.procs_priv WHERE User="testuser"] = 1
+--source include/assert.inc
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+DROP PROCEDURE row_cnt;
+DROP USER 'testuser'@'localhost';
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock-slave.opt percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock-slave.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock-slave.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--sync-relay-log-info=1
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,122 @@
+# ==== Purpose ====
+#
+# Test if sql thread doesn't assert when it is killed at
+# 'Waiting for commit lock' state.
+#
+# Test if killing sql thread which is waiting for commit lock and restarting
+# it doesn't cause a transaction to be skipped on slave.
+#
+# ==== Related Bugs and Worklogs ====
+#
+# BUG#16861624: KILLING WAITING SLAVE SQL THREAD:
+#               M_STATUS == DA_ERROR || M_STATUS == DA_OK
+#
+# ==== Implementation ====
+#
+# In order to get the sql thread in the 'Waiting for commit lock' state
+# we have to put some data into the master and, then, while replication
+# is happening, lock the slave with 'FLUSH TABLES WITH READ LOCK'.
+#
+# Debug sync points were created to allow us to precisely put the
+# sql thread in the desired state.
+#
+# After having the sql thread waiting for the commit lock, the test kills
+# it identifying its ID by querying information_schema.processlist table.
+#
+# Bug#17450876: REPLICATION STOP WITH "ERROR IN XID_LOG_EVENT: COMMIT COULD
+# NOT BE COMPLETED"
+#
+# Killing the sql thread that is waiting for a commit lock and restarting it
+# will cause one transaction to be skipped on the slave. When sql thread is
+# killed at this state its positions are updated in rli object but the
+# transaction is yet to be committed. At the time of restart the rli object is
+# read back causing a transaction to be missed. Post fix the positions in rli
+# object will be rolled back. Test script ensures that rli's memory contents
+# are in sync with the positions in rli repository.
+
+--source include/not_gtid_enabled.inc
+--source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
+--source include/have_debug.inc
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+
+call mtr.add_suppression("Query execution was interrupted.");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+
+--echo # Let master and slave synced with t1 table created
+CREATE TABLE t1 (f INT) ENGINE= INNODB;
+--source include/sync_slave_sql_with_master.inc
+
+--echo # Setup GLOBAL.DEBUG at slave to reach commit
+--source include/rpl_connection_slave.inc
+--let $debug_saved= `SELECT @@GLOBAL.DEBUG`
+SET @@GLOBAL.DEBUG= '+d,dbug.reached_commit';
+
+--echo # Do some DML operation on master so that it will be blocked on
+--echo # slave as global read lock is in place.
+--source include/rpl_connection_master.inc
+INSERT INTO t1 VALUES (10);
+
+--echo # Issue FLUSH TABLES WITH READ LOCK after Reached is signaled
+--source include/rpl_connection_slave.inc
+SET DEBUG_SYNC='now WAIT_FOR Reached';
+FLUSH TABLES WITH READ LOCK;
+--echo # Let sql thread continue to try to obtain commit lock
+SET DEBUG_SYNC= 'now SIGNAL signal.commit_continue';
+
+--echo # Wait until sql thread enters "Waiting for commit lock" state
+let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist
+                     WHERE state = "Waiting for commit lock";
+--source include/wait_condition.inc
+
+--echo # Kill sql thread
+let $sql_thread_id= `SELECT ID FROM information_schema.processlist
+                     WHERE state= "Waiting for commit lock"`;
+--disable_query_log
+--eval KILL $sql_thread_id
+--enable_query_log
+--let $er_query_interrupted= convert_error(ER_QUERY_INTERRUPTED)
+--let $er_mts_inconsistent_data= convert_error(ER_MTS_INCONSISTENT_DATA)
+--let $slave_sql_errno= $er_query_interrupted, $er_mts_inconsistent_data
+--source include/wait_for_slave_sql_error.inc
+
+--echo # Restart sql thread to let it finish the replication
+SET @@GLOBAL.DEBUG= '-d,dbug.reached_commit';
+UNLOCK TABLES;
+# Check to ensure that in memory rli positions are equal to the positions in
+# slave's repository table.
+if (`SELECT @@GLOBAL.relay_log_info_repository = 'TABLE'`)
+{
+  --let $slave_master_log_pos_in_repo= `SELECT Master_log_pos FROM mysql.slave_relay_log_info LIMIT 1`
+}
+if (`SELECT @@GLOBAL.relay_log_info_repository = 'FILE'`)
+{
+  --disable_query_log
+  CREATE TABLE rli_table(rli_info VARCHAR(100));
+  --let $MYSQLD_DATADIR= `select @@datadir`
+  --let $rli_file=$MYSQLD_DATADIR/relay-log.info
+  --replace_result $rli_file rli_file
+  --eval LOAD DATA LOCAL INFILE '$rli_file' INTO TABLE rli_table
+  --let $slave_master_log_pos_in_repo= `SELECT * FROM rli_table LIMIT 4,1`
+  DROP TABLE rli_table;
+  --enable_query_log
+}
+
+--let $slave_master_log_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1)
+--let $assert_text= Exec_Master_Log_Pos in SHOW SLAVE STATUS must be equal to mater_log_pos in slave's repository
+--let $assert_cond= $slave_master_log_pos = $slave_master_log_pos_in_repo
+--source include/assert.inc
+--source include/start_slave_sql.inc
+
+# Check consistency
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+--let $diff_tables= master:t1, slave:t1
+--source include/diff_tables.inc
+
+# Cleanup
+SET @@GLOBAL.DEBUG= '$debug_saved';
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_stm_until_pos_middle_gtid.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_stm_until_pos_middle_gtid.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_stm_until_pos_middle_gtid.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_stm_until_pos_middle_gtid.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,91 @@
+# ==== Purpose ====
+#
+# This test verifies correctness and effectiveness of the
+# until-stopping when the position used is inside the Gtid_log_event
+# of a group (transaction) in the relaylog.
+#
+# ==== Method ====
+#
+# The test will create a two events transaction (GTID + QUERY), and will start
+# the SQL thread using the UNTIL MASTER_LOG_FILE/POS clause, pointing to the
+# first byte of the created transaction (inside of the Gtid_log_event).
+#
+# The test expects that, after issuing the START SLAVE SQL_THREAD with the
+# UNTIL clause, the SQL thread will apply the created transaction (both
+# GTID and QUERY events) even though pointing to stop after the GTID.
+# The test also expects that the SQL thread will update its position
+# before stopping.
+#
+# The test will then verify SQL thread's binlog file, position, and
+# finally will wait for the SQL thread to stop.
+#
+# When the SQL thread stops, the test verifies if the second event of
+# the transaction (QUERY) was successfully applied.
+#
+# ==== Related bugs ====
+#
+# Bug #18306199 START SLAVE UNTIL MASTER_LOG_POS=MIDDLE-OF-GTID-EVENT
+#               STOPS BEFORE TRANSACTION
+
+--source include/have_binlog_format_statement.inc
+--source include/have_gtid.inc
+--source include/master-slave.inc
+
+# Stop the SQL thread
+--source include/rpl_connection_slave.inc
+--source include/stop_slave_sql.inc
+
+--echo # Saving master position to use on UNTIL clause of START SLAVE
+--source include/rpl_connection_master.inc
+--let $master_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $master_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
+--inc $master_pos
+
+# Create a table in the master (one event without GTIDS, two with GTIDS)
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+
+# Insert some data
+BEGIN;
+INSERT INTO t1 VALUES (1);
+COMMIT;
+
+# Sync the IO thread with the master
+--source include/sync_slave_io_with_master.inc
+
+# Check if SQL thread stops correctly
+# after executing the next event of the master binlog
+# based on master binlog file and position
+
+--echo # Start SQL thread until it executed the CREATE TABLE
+--replace_result $master_file MASTER_FILE $master_pos MASTER_POS
+# Disable warnings to avoid logging "UNTIL condtion is not supported ..." on MTS
+--disable_warnings
+eval START SLAVE SQL_THREAD UNTIL MASTER_LOG_FILE = "$master_file", MASTER_LOG_POS = $master_pos;
+--enable_warnings
+
+--echo # Wait until SQL thread reaches last master binlog file
+--let $slave_param= Relay_Master_Log_File
+--let $slave_param_value= $master_file
+--let $slave_param_comparison= =
+--source include/wait_for_slave_param.inc
+
+--echo # Wait until SQL thread reaches desired master binlog position
+--let $slave_param= Exec_Master_Log_Pos
+--let $slave_param_value= $master_pos
+--let $slave_param_comparison= >=
+--source include/wait_for_slave_param.inc
+
+--echo # If the desired position was reached, SQL thread should stop.
+--source include/wait_for_slave_sql_to_stop.inc
+
+--let $assert_cond= "[SHOW TABLES LIKE "t1"]" = "t1"
+--let $assert_text= t1 should be replicated
+--source include/assert.inc
+
+# Cleanup
+--source include/start_slave_sql.inc
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+
+# End of tests
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_stop_slave.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_stop_slave.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_stop_slave.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_stop_slave.test	2017-02-27 07:47:02.000000000 +0000
@@ -77,14 +77,17 @@
 INSERT INTO t1 VALUES(1, 1);
 
 --source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
 
 --source include/rpl_connection_master.inc
+# make sure that there are no zombie threads
+--source include/stop_dump_threads.inc
 
 let $debug_save= `SELECT @@GLOBAL.debug`;
 SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
 
 --source include/rpl_connection_slave.inc
-source include/restart_slave_sql.inc;
+--source include/start_slave.inc
 
 BEGIN;
 UPDATE t1 SET c2 = 2 WHERE c1 = 1;
@@ -96,6 +99,10 @@
 UPDATE t1 SET c2 = 3 WHERE c1 = 1;
 COMMIT;
 
+# wait for the dump thread reach the sync point
+--let $wait_condition= select count(*)=1 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
+--source include/wait_condition.inc
+
 --source include/rpl_connection_slave1.inc
 let $show_statement= SHOW PROCESSLIST;
 let $field= Info;
@@ -108,7 +115,12 @@
 ROLLBACK;
 
 --source include/rpl_connection_master.inc
+
 SET DEBUG_SYNC= 'now SIGNAL signal.continue';
+# wait for the dump thread to come out of the
+# waiting phase before resetting the signals
+--let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
+--source include/wait_condition.inc
 SET DEBUG_SYNC= 'RESET';
 
 --source include/rpl_connection_slave.inc
@@ -116,9 +128,22 @@
 
 --source include/rpl_connection_slave1.inc
 reap;
+
+# Slave has stopped, thence lets make sure that
+# we kill the zombie dump threads. Also, make
+# sure that we disable the DBUG_EXECUTE_IF
+# that would set the dump thread to wait
+--source include/rpl_connection_master.inc
+SET GLOBAL debug= '$debug_save';
+# make sure that there are no zombie threads
+--source include/stop_dump_threads.inc
+
+--source include/rpl_connection_slave1.inc
+# now the dump thread on the master will start
+# from a clean slate, i.e. without the
+# DBUG_EXECUTE_IF set
 source include/start_slave.inc;
 
 --source include/rpl_connection_master.inc
 DROP TABLE t1, t2;
-SET GLOBAL debug= $debug_save;
 --source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_timestamp_upgrage_55.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_timestamp_upgrage_55.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_timestamp_upgrage_55.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_timestamp_upgrage_55.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,75 @@
+# ==== Purpose ====
+#
+#  To check, when we have master with table having
+#  TIMESTAMP(0), DATETIME(0) or TIME(0), slave
+#  having same table but we have created them in 5.5
+#  and upgraded it.
+#  If we try to do replication, we will not get an assert.
+#
+# ==== Implementation ====
+#
+# In Master-->
+# create a table in master having TIMESTAMP(0),
+# DATETIME(0) or TIME(0).
+# In Slave-->
+# copy the frm of the table created in 5.5 and upgraded.
+# Insert value in master with row base replication on.
+#
+# ==== Related Bugs ====
+#
+#  Bug#17532932 TIMESTAMP AND DATETIMES SELF-INCOMPATIBLE
+#               DURING REPLICATION
+
+--source include/have_binlog_format_row.inc
+--source include/have_innodb.inc
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+--source include/stop_slave.inc
+
+--source include/start_slave.inc
+--let $SLAVE_DATADIR=`SELECT @@DATADIR`
+
+--source include/rpl_connection_master.inc
+#
+# Creating table a MYISAM Engine, As if we create a table in INNODB, we have
+# to skip some test cases. As certain INNODB tables like
+# mysql/slave_master_info, mysql/slave_relay_log_info, mysql/slave_master_info
+# are not be there in upgraded 5.5 tables.
+#
+CREATE TABLE bug17532932(a TIMESTAMP,
+                         b DATETIME,
+                         c TIME)ENGINE=MYISAM;
+--source include/sync_slave_sql_with_master.inc
+DROP TABLE bug17532932;
+#
+# Copy 5.5 bug17532932-ibdata1 and bug17532932.frm in slave's data dir.
+# These files are created using "CREATE TABLE bug17532932(a TIMESTAMP,
+# b DATETIME, c TIME);"
+#
+# To do that, stop slave, copy .frm, .MYD, .MYI file and then start server.
+--let $rpl_server_number= 2
+--source include/rpl_stop_server.inc
+--copy_file ./std_data/bug17532932.frm $slave_datadir/test/bug17532932.frm
+--copy_file ./std_data/bug17532932.MYD $slave_datadir/test/bug17532932.MYD
+--copy_file ./std_data/bug17532932.MYI $slave_datadir/test/bug17532932.MYI
+--source include/rpl_start_server.inc
+--source include/rpl_start_slaves.inc
+
+
+--source include/rpl_connection_master.inc
+INSERT INTO bug17532932 VALUES ("2014-04-16 12:35:51",
+                                "2010-08-26 12:15:52",
+                                "-38:59:59");
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $diff_tables= master:bug17532932, slave:bug17532932
+--source include/diff_tables.inc
+
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE bug17532932;
+
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,69 @@
+# ==== Purpose ====
+#
+# Bug#19949915  IGNORABLE EVENTS DO NOT WORK AND ARE NOT TESTED
+#
+# Problem:
+#  In 5.6, Ignorable log events were introduced. These events have
+#  the flag LOG_EVENT_IGNORABLE_F flag (0x80) set in the flags field.
+#  When the server (specifically, the replication receiver and applier
+#  threads) sees an event with a type code it does not recognize, the
+#  server is supposed to check if this flag is set. If the flag is not
+#  set, the server generates an error and stops; if the flag is set,
+#  the server ignores the event. The purpose is to allow future server
+#  versions to introduce new event types that the slave can ignore
+#  (such as informational event types). However, this does not work,
+#  since the slave applier thread explicitly checks if the type code
+#  is in the range of known event types, and reports an error, before
+#  it goes further and checks if the event is ignorable.
+# Fix:
+#  The slave applier thread does not check if this is a known event
+#  type any more.
+#
+# Steps to reproduce:
+#  1) Set a debug point on slave to simulate unknown ignorable log events.
+#  2) Write a write_rows log event and a previous gtids log event
+#     if gtid mode is on to binlog on master.
+#  3) The slave receiver thread simulates an unknown ignorable
+#     log event by rewriting the write rows log event and
+#     previous gtids log event if gtid mode is on before
+#     writing it(them) in relay log.
+#  4) Verify that the slave applier thread skips the unknown ignorable
+#     log event.
+#
+
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+
+CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
+--source include/sync_slave_sql_with_master.inc
+--echo # Set a debug point on slave to simulate unknown ignorable log events.
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='d,simulate_unknown_ignorable_log_event';
+
+--source include/rpl_connection_master.inc
+
+--echo # Write a previous_gtids log event to binlog
+--echo # on master if gtid mode is on.
+FLUSH LOGS;
+--echo # Write a write_rows log event to binlog on master.
+INSERT INTO t1 VALUES (1);
+
+--echo # The slave receiver thread simulates an unknown ignorable
+--echo # log event by rewriting the write_rows log event and
+--echo # previous_gtids log event if gtid mode is on before
+--echo # writing it(them) in relay log.
+--source include/sync_slave_sql_with_master.inc
+
+--echo # Verify that the slave applier thread skips these unknown ignorable
+--echo # log event.
+--let $assert_text= Table t1 must not contain 1
+--let $assert_cond= [SELECT count(*) FROM t1 WHERE c1=1] = 0
+--source include/assert.inc
+SET GLOBAL DEBUG= @save_debug;
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result	2017-02-27 07:47:02.000000000 +0000
@@ -24,6 +24,7 @@
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 3;
 LENGTH(data)
 16384
+include/sync_slave_sql_with_master.inc
 
 **** Data Insert Validation Slave Section test.t1 ****
 
@@ -50,6 +51,7 @@
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 2;
 LENGTH(data)
 17408
+include/sync_slave_sql_with_master.inc
 
 **** Data Update Validation Slave Section test.t1 ****
 
@@ -109,6 +111,7 @@
 FROM test.t2 WHERE c1=2;
 c1	LENGTH(c2)	SUBSTR(c2,1+2*900,2)	LENGTH(c4)	SUBSTR(c4,1+3*900,3)
 2	20000	b2	30000	dd2
+include/sync_slave_sql_with_master.inc
 
 **** Data Insert Validation Slave Section test.t2 ****
 
@@ -136,6 +139,7 @@
 FROM test.t2 WHERE c1=2;
 c1	LENGTH(c2)	SUBSTR(c2,1+2*900,2)	LENGTH(c4)	SUBSTR(c4,1+3*900,3)
 2	2256	b1	3000	dd1
+include/sync_slave_sql_with_master.inc
 
 **** Data Update Validation Slave Section test.t2 ****
 
@@ -150,4 +154,5 @@
 
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result	2017-02-27 07:47:02.000000000 +0000
@@ -2,11 +2,14 @@
 [connection master]
 create table t1 (a int, b int) engine=NDB;
 insert into t1 values(1,1);
+include/sync_slave_sql_with_master.inc
 select * from t1;
 a	b
 1	1
 delete from t1;
+include/sync_slave_sql_with_master.inc
 select * from t1;
 a	b
 drop table t1;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result	2017-02-27 07:47:02.000000000 +0000
@@ -22,6 +22,7 @@
 INSERT INTO test.t1 VALUES (null,test.f1());
 ROLLBACK;
 SET AUTOCOMMIT=1;
+include/sync_slave_sql_with_master.inc
 DROP FUNCTION test.f1;
 DROP TABLE test.t1;
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result	2017-02-27 07:47:02.000000000 +0000
@@ -21,9 +21,11 @@
 INSERT INTO t2 VALUES (6, 6);
 INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
 include/assert.inc [Count of elements in t1 should be 6.]
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:test.t1 , slave:test.t1]
 INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
 include/assert.inc [Count of elements in t1 should be 6.]
 include/assert.inc [In SBR or MIXED modes, the event in the binlog should be the same that was executed. In RBR mode, binlog position should stay unchanged.]
 drop table t1, t2;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result	2017-02-27 07:47:02.000000000 +0000
@@ -38,15 +38,19 @@
 1	0
 2	1
 drop table t1,t2;
+include/sync_slave_sql_with_master.inc
 reset master;
+RESET MASTER;
 CREATE TABLE t1 ( a INT );
 INSERT INTO t1 VALUES (0);
 UPDATE t1, (SELECT 3 as b) AS x SET t1.a = x.b;
 select * from t1;
 a
 3
+include/sync_slave_sql_with_master.inc
 select * from t1;
 a
 3
 drop table t1;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result	2017-02-27 07:47:02.000000000 +0000
@@ -30,6 +30,7 @@
 a	b
 1	6
 2	6
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	0
@@ -65,6 +66,7 @@
 AND a.a3 IS NULL 
 AND a.a4 = 'foo' 
 AND a.a5 = 'bar';
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t1;
 a1	a2	a3	a4	a5
 No	1	NULL	foo	bar
@@ -114,6 +116,7 @@
 WHERE   y = 34 
 ) 
 WHERE       b.x = 23;
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t1;
 i	j	x	y	z
 1	2	23	24	71
@@ -174,6 +177,7 @@
 1	1.0000	3
 2	1.0000	2
 3	2.0000	1
+include/sync_slave_sql_with_master.inc
 select "-- SLAVE AFTER JOIN --" as "";
 
 -- SLAVE AFTER JOIN --
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,6 @@
 include/master-slave.inc
 [connection master]
+include/sync_slave_sql_with_master.inc
 stop slave;
 create table t1 (a int) engine=NDB;
 reset slave;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result	2017-02-27 07:47:02.000000000 +0000
@@ -36,6 +36,7 @@
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 5000
+RESET MASTER;
 LOCK TABLES t1 READ;
 START SLAVE;
 UNLOCK TABLES;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -3,6 +3,7 @@
 CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'NDB'  ;
 SELECT * FROM t1;
 C1	C2
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t1;
 C1	C2
 INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X');
@@ -15,6 +16,7 @@
 X	X
 X	Y
 X	Z
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY C1,C2;
 C1	C2
 A	A
@@ -30,6 +32,7 @@
 A	C
 X	Y
 X	Z
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY C1,C2;
 C1	C2
 A	B
@@ -43,6 +46,7 @@
 A	I
 X	Y
 X	Z
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY C1,C2;
 C1	C2
 A	B
@@ -56,6 +60,7 @@
 A	I
 X	Y
 X	Z
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY c1,c2;
 C1	C2
 A	B
@@ -84,6 +89,7 @@
 5	A	25
 8	A	64
 9	A	81
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t2 ORDER BY c1,c2;
 c1	c12	c2
 1	A	2
@@ -114,6 +120,7 @@
 7	A	49
 8	A	64
 9	A	81
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
 c1	c12	c2
 1	A	1
@@ -137,6 +144,7 @@
 7	A	49
 8	A	64
 9	A	81
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t2 ORDER BY c1,c2;
 c1	c12	c2
 1	A	1
@@ -158,6 +166,7 @@
 6	A	36
 7	A	49
 9	A	81
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t2 ORDER BY c1,c2;
 c1	c12	c2
 1	A	1
@@ -179,6 +188,7 @@
 X	X	3	B	1
 X	Y	2	B	1
 X	Z	2	B	2
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t3 ORDER BY C1,C2;
 C1	C2	pk1	C3	pk2
 A	A	3	B	2
@@ -194,6 +204,7 @@
 A	C	1	B	2
 X	Y	2	B	1
 X	Z	2	B	2
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t3 ORDER BY C1,C2;
 C1	C2	pk1	C3	pk2
 A	B	1	B	1
@@ -207,6 +218,7 @@
 A	I	1	B	2
 X	Y	2	B	1
 X	Z	2	B	2
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t3 ORDER BY C1,C2;
 C1	C2	pk1	C3	pk2
 A	B	1	B	1
@@ -224,6 +236,7 @@
 A	C	4
 X	Z	5
 A	A	6
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t6 ORDER BY C3;
 C1	C2	C3
 A	B	1
@@ -239,6 +252,7 @@
 X	Y	2
 A	C	4
 X	Z	5
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t6 ORDER BY C3;
 C1	C2	C3
 A	B	1
@@ -252,6 +266,7 @@
 X	Y	2
 A	I	4
 X	Z	5
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t6 ORDER BY C3;
 C1	C2	C3
 A	B	1
@@ -306,6 +321,7 @@
 X	Q	5	7	R	49	X	Z	2	S	2
 X	Q	5	9	R	81	X	Y	2	S	1
 X	Q	5	9	R	81	X	Z	2	S	2
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t5,t2,t3 WHERE t5.C2='Q' AND t2.c12='R' AND t3.C3 ='S' ORDER BY t5.C3,t2.c1,t3.pk1,t3.pk2;
 C1	C2	C3	c1	c12	c2	C1	C2	pk1	C3	pk2
 X	Q	2	1	R	1	X	Y	2	S	1
@@ -355,10 +371,12 @@
 SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 C1	HEX(B1)	HEX(B2)
 1	NULL	0
+include/sync_slave_sql_with_master.inc
 SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 C1	HEX(B1)	HEX(B2)
 1	NULL	0
 CREATE TABLE t7 (C1 INT PRIMARY KEY, C2 INT) ENGINE = 'NDB'  ;
+include/sync_slave_sql_with_master.inc
 --- on slave: original values ---
 INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
 SELECT * FROM t7 ORDER BY C1;
@@ -374,6 +392,7 @@
 1	2
 2	4
 3	6
+include/sync_slave_sql_with_master.inc
 set @@global.slave_exec_mode= default;
 --- on slave: old values should be overwritten by replicated values ---
 SELECT * FROM t7 ORDER BY C1;
@@ -393,6 +412,7 @@
 SELECT * FROM t8 ORDER BY a;
 a	b	c
 99	99	99
+include/sync_slave_sql_with_master.inc
 --- on slave ---
 SELECT * FROM t8 ORDER BY a;
 a	b	c
@@ -407,6 +427,7 @@
 set @@global.slave_exec_mode= 'IDEMPOTENT';
 --- on master ---
 INSERT INTO t8 VALUES (2,4,8);
+include/sync_slave_sql_with_master.inc
 set @@global.slave_exec_mode= default;
 --- on slave ---
 SELECT * FROM t8 ORDER BY a;
@@ -418,15 +439,18 @@
 **** Test for BUG#31552 ****
 **** On Master ****
 DELETE FROM t1;
+include/sync_slave_sql_with_master.inc
 include/rpl_reset.inc
 **** On Master ****
 INSERT INTO t1 VALUES ('K','K'), ('L','L'), ('M','M');
 **** On Master ****
+include/sync_slave_sql_with_master.inc
 set @@global.slave_exec_mode= 'IDEMPOTENT';
 DELETE FROM t1 WHERE C1 = 'L';
 DELETE FROM t1;
 SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
 COUNT(*)	0
+include/sync_slave_sql_with_master.inc
 set @@global.slave_exec_mode= default;
 include/check_slave_is_running.inc
 SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
@@ -438,20 +462,24 @@
 INSERT INTO t1 VALUES(
 '2005-11-14 01:01:01', '2005-11-14 01:01:02', '2005-11-14');
 **** On Slave ****
+include/sync_slave_sql_with_master.inc
 SELECT * FROM t1;
 a	b	c
 2005-11-14 01:01:01	2005-11-14 01:01:02	2005-11-14
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
+include/sync_slave_sql_with_master.inc
 CREATE TABLE t1 (i INT NOT NULL,
 c CHAR(16) CHARACTER SET utf8 NOT NULL,
 j INT NOT NULL) ENGINE = 'NDB'  ;
 CREATE TABLE t2 (i INT NOT NULL,
 c CHAR(16) CHARACTER SET utf8 NOT NULL,
 j INT NOT NULL) ENGINE = 'NDB'  ;
+include/sync_slave_sql_with_master.inc
 ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t3 (i INT NOT NULL,
 c CHAR(128) CHARACTER SET utf8 NOT NULL,
 j INT NOT NULL) ENGINE = 'NDB'  ;
+include/sync_slave_sql_with_master.inc
 ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t4 (i INT NOT NULL,
 c CHAR(128) CHARACTER SET utf8 NOT NULL,
@@ -459,10 +487,12 @@
 CREATE TABLE t5 (i INT NOT NULL,
 c CHAR(255) CHARACTER SET utf8 NOT NULL,
 j INT NOT NULL) ENGINE = 'NDB'  ;
+include/sync_slave_sql_with_master.inc
 ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t6 (i INT NOT NULL,
 c CHAR(255) CHARACTER SET utf8 NOT NULL,
 j INT NOT NULL) ENGINE = 'NDB'  ;
+include/sync_slave_sql_with_master.inc
 ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 CREATE TABLE t7 (i INT NOT NULL,
 c CHAR(255) CHARACTER SET utf8 NOT NULL,
@@ -472,10 +502,12 @@
 [expecting slave to replicate correctly]
 INSERT INTO t1 VALUES (1, "", 1);
 INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:t1, slave:t1]
 [expecting slave to replicate correctly]
 INSERT INTO t2 VALUES (1, "", 1);
 INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:t2, slave:t2]
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
@@ -486,6 +518,7 @@
 [expecting slave to replicate correctly]
 INSERT INTO t4 VALUES (1, "", 1);
 INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:t4, slave:t4]
 [expecting slave to stop]
 INSERT INTO t5 VALUES (1, "", 1);
@@ -502,15 +535,19 @@
 [expecting slave to replicate correctly]
 INSERT INTO t7 VALUES (1, "", 1);
 INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:t7, slave:t7]
 drop table t1, t2, t3, t4, t5, t6, t7;
+include/sync_slave_sql_with_master.inc
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE='NDB' ;
 INSERT INTO t1 VALUES (1), (2), (3);
 UPDATE t1 SET a = 10;
 ERROR 23000: Duplicate entry '10' for key 'PRIMARY'
 INSERT INTO t1 VALUES (4);
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:t1, slave:t1]
 drop table t1;
+include/sync_slave_sql_with_master.inc
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (
 `pk` int(11) NOT NULL AUTO_INCREMENT,
@@ -579,8 +616,10 @@
 INSERT INTO t1 ( a ) VALUES ( 3 );
 UPDATE t1 SET a = 0 WHERE a < 4;
 UPDATE t1 SET a = 8 WHERE a < 5;
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:t1, slave:t1]
 drop table t1;
+include/sync_slave_sql_with_master.inc
 CREATE TABLE t1 (a bit) ENGINE='NDB' ;
 INSERT IGNORE INTO t1 VALUES (NULL);
 INSERT INTO t1 ( a ) VALUES ( 0 );
@@ -621,6 +660,8 @@
 UPDATE t1 SET a = 8 WHERE a = 5 LIMIT 2;
 INSERT INTO t1 ( a ) VALUES ( 1 );
 UPDATE t1 SET a = 9 WHERE a < 5 LIMIT 3;
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:t1, slave:t1]
 drop table t1;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result	2017-02-27 07:47:02.000000000 +0000
@@ -30,6 +30,7 @@
 SELECT * FROM test.t1;
 a
 5
+include/sync_slave_sql_with_master.inc
 SELECT * FROM test.t1;
 a
 5
@@ -45,10 +46,12 @@
 SELECT * FROM test.t1;
 a
 8
+include/sync_slave_sql_with_master.inc
 SELECT * FROM test.t1;
 a
 8
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP TABLE IF EXISTS test.t1;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result	2017-02-27 07:47:02.000000000 +0000
@@ -33,9 +33,12 @@
 INSERT INTO t1 VALUES ('MySQL','1993-02-04'),('ROCKS', '1990-08-27'),('Texas', '1999-03-30'),('kyle','2005-1-1');
 END|
 CALL p2();
+include/sync_slave_sql_with_master.inc
 CALL p1();
+include/sync_slave_sql_with_master.inc
 DROP TABLE t1;
 DROP TABLE t2;
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result	2017-02-27 07:47:02.000000000 +0000
@@ -15,6 +15,7 @@
 select * from test.t2;
 n	f
 1	0
+include/sync_slave_sql_with_master.inc
 select * from test.t1;
 n	d
 1	1.234
@@ -24,4 +25,5 @@
 DROP TRIGGER test.t1_bi_t2;
 DROP TABLE test.t1;
 DROP TABLE test.t2;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result	2017-02-27 07:47:02.000000000 +0000
@@ -22,6 +22,7 @@
 0
 create table t2 (a int) engine=NDB;
 insert into t2 values(fn1(2));
+include/sync_slave_sql_with_master.inc
 SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-############## mysql-test\t\transaction_alloc_block_size_basic.test ###########
-#                                                                             #
-# Variable Name: transaction_alloc_block_size                                 #
-# Scope: GLOBAL | SESSION                                                     #
-# Access Type: Dynamic                                                        #
-# Data Type: numeric                                                          #
-# Default Value: 8192                                                         #
-# Range: 1024-4294967295                                                      #
-#                                                                             #
-#                                                                             #
-# Creation Date: 2008-02-14                                                   #
-# Author:  Salman                                                             #
-#                                                                             #
-# Description: Test Cases of Dynamic System Variable                          #
-#              transaction_alloc_block_size                                   #
-#              that checks the behavior of this variable in the following ways#
-#              * Default Value                                                #
-#              * Valid & Invalid values                                       #
-#              * Scope & Access method                                        #
-#              * Data Integrity                                               #
-#                                                                             #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
-#  server-system-variables.html                                               #
-#                                                                             #
-###############################################################################
-
---source include/load_sysvars.inc
-
-########################################################################
-#           START OF transaction_alloc_block_size TESTS                #
-########################################################################
-
-
-#############################################################
-#                 Save initial value                        #
-#############################################################
-
-SET @start_global_value = @@global.transaction_alloc_block_size;
-SELECT @start_global_value;
-SET @start_session_value = @@session.transaction_alloc_block_size;
-SELECT @start_session_value;
-
-
---echo '#--------------------FN_DYNVARS_005_01-------------------------#'
-########################################################################
-#     Display the DEFAULT value of transaction_alloc_block_size        #
-########################################################################
-
-SET @@global.transaction_alloc_block_size = 100;
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size;
-
-
-SET @@session.transaction_alloc_block_size = 200;
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size;
-
-
-
---echo '#--------------------FN_DYNVARS_005_02-------------------------#'
-########################################################################
-#     Check the DEFAULT value of transaction_alloc_block_size          #
-########################################################################
-
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size = 8192;
-
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size = 8192;
-
-
---echo '#--------------------FN_DYNVARS_005_03-------------------------#'
-##################################################################
-# Change the value of variable to a valid value for GLOBAL Scope #
-##################################################################
-
-SET @@global.transaction_alloc_block_size = 1024;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@global.transaction_alloc_block_size = 60020;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@global.transaction_alloc_block_size = 4294967295;
-SELECT @@global.transaction_alloc_block_size;
-
---echo '#--------------------FN_DYNVARS_005_04-------------------------#'
-###################################################################
-# Change the value of variable to a valid value for SESSION Scope #
-###################################################################
- 
-SET @@session.transaction_alloc_block_size = 1024;
-SELECT @@session.transaction_alloc_block_size;
-
-SET @@session.transaction_alloc_block_size =4294967295;
-SELECT @@session.transaction_alloc_block_size;
-
-SET @@session.transaction_alloc_block_size = 65535;
-SELECT @@session.transaction_alloc_block_size;
-
-
---echo '#------------------FN_DYNVARS_005_05-----------------------#'
-########################################################################
-# Change the value of transaction_alloc_block_size to an invalid value #
-########################################################################
-
-SET @@global.transaction_alloc_block_size = 0;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@global.transaction_alloc_block_size = -1024;
-SELECT @@global.transaction_alloc_block_size;
-
-
-SET @@global.transaction_alloc_block_size = 123456789201;
-SELECT @@global.transaction_alloc_block_size;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_alloc_block_size = ON;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_alloc_block_size = OFF;
-
-
-SET @@global.transaction_alloc_block_size = True;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@global.transaction_alloc_block_size = False;
-SELECT @@global.transaction_alloc_block_size;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_alloc_block_size = 65530.34;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_alloc_block_size ="Test";
-
-SET @@global.transaction_alloc_block_size = 1000;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@session.transaction_alloc_block_size = 12345678901;
-SELECT @@session.transaction_alloc_block_size;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_alloc_block_size = ON;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_alloc_block_size = OFF;
-
-SET @@session.transaction_alloc_block_size = True;
-SELECT @@session.transaction_alloc_block_size;
-
-SET @@session.transaction_alloc_block_size = False;
-SELECT @@session.transaction_alloc_block_size;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_alloc_block_size = "Test";
-
-
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_alloc_block_size = 'test';
-
---echo '#------------------FN_DYNVARS_005_06-----------------------#'
-####################################################################
-#   Check if the value in GLOBAL Table matches value in variable   #
-####################################################################
-
-
-SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-
---echo '#------------------FN_DYNVARS_005_07-----------------------#'
-####################################################################
-#  Check if the value in SESSION Table matches value in variable   #
-####################################################################
-
-SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-
-
---echo '#---------------------FN_DYNVARS_001_08----------------------#'
-###########################################################################
-#  Check if global and session variable are independent of each other     #
-###########################################################################
-
-SET @@transaction_alloc_block_size = 1024;
-SET @@global.transaction_alloc_block_size = 4294967295;
-SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
- 
-
---echo '#---------------------FN_DYNVARS_001_09----------------------#'
-########################################################################
-#    Check if accessing variable with SESSION,LOCAL and without SCOPE  #
-#    points to same session variable                                   #
-########################################################################
-
-SET @@transaction_alloc_block_size = 100;
-SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
-SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-
-
---echo '#---------------------FN_DYNVARS_001_10----------------------#'
-################################################################
-#   Check if variable can be accessed with and without @@ sign #
-################################################################
-
-SET transaction_alloc_block_size = 1027;
-SELECT @@transaction_alloc_block_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT local.transaction_alloc_block_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT session.transaction_alloc_block_size;
-
---Error ER_BAD_FIELD_ERROR
-SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-
-
-####################################
-#     Restore initial value        #
-####################################
-
-SET @@global.transaction_alloc_block_size = @start_global_value;
-SELECT @@global.transaction_alloc_block_size;
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.transaction_alloc_block_size;
-
-
-#############################################################
-#             END OF transaction_alloc_block_size TESTS     #
-#############################################################
-
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,225 +0,0 @@
-############## mysql-test\t\transaction_prealloc_size_basic.test ##############
-#                                                                             #
-# Variable Name: transaction_prealloc_size                                    #
-# Scope: GLOBAL | SESSION                                                     #
-# Access Type: Dynamic                                                        #
-# Data Type: numeric                                                          #
-# Default Value: 4096                                                         #
-# Range:                                                                      #
-#                                                                             #
-#                                                                             #
-# Creation Date: 2008-02-14                                                   #
-# Author: Sharique Abdullah                                                       #
-#                                                                             #
-# Description: Test Cases of Dynamic System Variable transaction_prealloc_size#
-#              that checks the behavior of this variable in the following ways#
-#              * Default Value                                                #
-#              * Valid & Invalid values                                       #
-#              * Scope & Access method                                        #
-#              * Data Integrity                                               #
-#                                                                             #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
-#  server-system-variables.html#option_mysqld_transaction_prealloc_size       #
-#                                                                             #
-###############################################################################
-
---source include/load_sysvars.inc
-
-########################################################################
-#           START OF transaction_prealloc_size TESTS                   #
-########################################################################
-
-
-#############################################################
-#                 Save initial value                        #
-#############################################################
-
-SET @start_global_value = @@global.transaction_prealloc_size;
-SELECT @start_global_value;
-SET @start_session_value = @@session.transaction_prealloc_size;
-SELECT @start_session_value;
-
---echo '#--------------------FN_DYNVARS_005_01-------------------------#'
-########################################################################
-#     Display the DEFAULT value of transaction_prealloc_size           #
-########################################################################
-
-SET @@global.transaction_prealloc_size = 100;
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size;
-
-
-SET @@session.transaction_prealloc_size = 200;
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size;
-
---echo '#--------------------FN_DYNVARS_005_02-------------------------#'
-########################################################################
-#     Check the DEFAULT value of transaction_prealloc_size             #
-########################################################################
-
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size = 4096;
-
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size = 4096;
-
---echo '#--------------------FN_DYNVARS_005_03-------------------------#'
-##################################################################
-# Change the value of variable to a valid value for GLOBAL Scope #
-##################################################################
-
-SET @@global.transaction_prealloc_size = 1024;
-SELECT @@global.transaction_prealloc_size;
-
-SET @@global.transaction_prealloc_size = 60020;
-SELECT @@global.transaction_prealloc_size;
-
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-
-
---echo '#--------------------FN_DYNVARS_005_04-------------------------#'
-###################################################################
-# Change the value of variable to a valid value for SESSION Scope #
-###################################################################
- 
-SET @@session.transaction_prealloc_size = 1024;
-SELECT @@session.transaction_prealloc_size;
-
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-SET @@session.transaction_prealloc_size = 65535;
-SELECT @@session.transaction_prealloc_size;
-
-
---echo '#------------------FN_DYNVARS_005_05-----------------------#'
-#####################################################################
-# Change the value of transaction_prealloc_size to an invalid value #
-#####################################################################
-
-SET @@global.transaction_prealloc_size = 0;
-SELECT @@global.transaction_prealloc_size;
-
-SET @@global.transaction_prealloc_size = -1024;
-SELECT @@global.transaction_prealloc_size;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_prealloc_size = ON;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_prealloc_size = OFF;
-
-
-SET @@global.transaction_prealloc_size = True;
-SELECT @@global.transaction_prealloc_size;
-
-SET @@global.transaction_prealloc_size = False;
-SELECT @@global.transaction_prealloc_size;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_prealloc_size = 65530.34;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_prealloc_size ="Test";
-
-SET @@global.transaction_prealloc_size = 1000;
-SELECT @@global.transaction_prealloc_size;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_prealloc_size = ON;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_prealloc_size = OFF;
-
-SET @@session.transaction_prealloc_size = True;
-SELECT @@session.transaction_prealloc_size;
-
-SET @@session.transaction_prealloc_size = False;
-SELECT @@session.transaction_prealloc_size;
-
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_prealloc_size = "Test";
-
-SET @@session.transaction_prealloc_size = 123456789031;
-SELECT @@session.transaction_prealloc_size;
-
-
---echo '#------------------FN_DYNVARS_005_06-----------------------#'
-####################################################################
-#   Check if the value in GLOBAL Table matches value in variable   #
-####################################################################
-
-
-SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-
---echo '#------------------FN_DYNVARS_005_07-----------------------#'
-####################################################################
-#  Check if the value in SESSION Table matches value in variable   #
-####################################################################
-
-SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-
-
-
-
---echo '#---------------------FN_DYNVARS_001_09----------------------#'
-###########################################################################
-#  Check if global and session variable are independent of each other     #
-###########################################################################
-
-SET @@global.transaction_prealloc_size = 1024;
-SET @@global.transaction_prealloc_size = 10;
-
-SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
- 
-
---echo '#---------------------FN_DYNVARS_001_10----------------------#'
-########################################################################
-#    Check if accessing variable with SESSION,LOCAL and without SCOPE  #
-#    points to same session variable                                   #
-########################################################################
-
-SET @@transaction_prealloc_size = 100;
-SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
-SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
-
-
---echo '#---------------------FN_DYNVARS_001_11----------------------#'
-###############################################################################
-# Check if transaction_prealloc_size can be accessed with and without @@ sign #
-###############################################################################
-
-SET transaction_prealloc_size = 1027;
-SELECT @@transaction_prealloc_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT local.transaction_prealloc_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT session.transaction_prealloc_size;
-
---Error ER_BAD_FIELD_ERROR
-SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
-
-####################################
-#     Restore initial value        #
-####################################
-
-SET @@global.transaction_prealloc_size = @start_global_value;
-SELECT @@global.transaction_prealloc_size;
-SET @@session.transaction_prealloc_size = @start_session_value;
-SELECT @@session.transaction_prealloc_size;
-
-
-#############################################################
-#                 END OF transaction_prealloc_size TESTS     #
-#############################################################
-
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/avoid_temporal_upgrade_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/avoid_temporal_upgrade_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/avoid_temporal_upgrade_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/avoid_temporal_upgrade_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,78 @@
+SELECT @@global.avoid_temporal_upgrade;
+@@global.avoid_temporal_upgrade
+0
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SHOW GLOBAL VARIABLES LIKE 'avoid_temporal_upgrade';
+Variable_name	Value
+avoid_temporal_upgrade	OFF
+SELECT * FROM information_schema.global_variables WHERE variable_name='avoid_temporal_upgrade';
+VARIABLE_NAME	VARIABLE_VALUE
+AVOID_TEMPORAL_UPGRADE	OFF
+#It is not a session variable.
+SELECT @@session.avoid_temporal_upgrade;
+ERROR HY000: Variable 'avoid_temporal_upgrade' is a GLOBAL variable
+SHOW SESSION VARIABLES LIKE 'avoid_temporal_upgrade';
+Variable_name	Value
+avoid_temporal_upgrade	OFF
+SELECT * FROM information_schema.session_variables WHERE variable_name='avoid_temporal_upgrade';
+VARIABLE_NAME	VARIABLE_VALUE
+AVOID_TEMPORAL_UPGRADE	OFF
+SET SESSION avoid_temporal_upgrade= ON;
+ERROR HY000: Variable 'avoid_temporal_upgrade' is a GLOBAL variable and should be set with SET GLOBAL
+#Test setting the variable to various values.
+#Boolean values.
+SET GLOBAL avoid_temporal_upgrade= ON;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SELECT @@global.avoid_temporal_upgrade;
+@@global.avoid_temporal_upgrade
+1
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SET GLOBAL avoid_temporal_upgrade= OFF;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SELECT @@global.avoid_temporal_upgrade;
+@@global.avoid_temporal_upgrade
+0
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SET GLOBAL avoid_temporal_upgrade= 1;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SELECT @@global.avoid_temporal_upgrade;
+@@global.avoid_temporal_upgrade
+1
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SET GLOBAL avoid_temporal_upgrade= 0;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SELECT @@global.avoid_temporal_upgrade;
+@@global.avoid_temporal_upgrade
+0
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+#Test for DEFAULT value.
+SET GLOBAL avoid_temporal_upgrade= DEFAULT;
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+SELECT @@global.avoid_temporal_upgrade;
+@@global.avoid_temporal_upgrade
+0
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
+#Test for invalid value.
+SET GLOBAL avoid_temporal_upgrade= 2;
+ERROR 42000: Variable 'avoid_temporal_upgrade' can't be set to the value of '2'
+#Test for invalid statement for setting the 
+#global variable.
+SET avoid_temporal_upgrade= 1;
+ERROR HY000: Variable 'avoid_temporal_upgrade' is a GLOBAL variable and should be set with SET GLOBAL
+#Fetches the current global value for the variable.
+SELECT @@avoid_temporal_upgrade;
+@@avoid_temporal_upgrade
+0
+Warnings:
+Warning	1287	'@@avoid_temporal_upgrade' is deprecated and will be removed in a future release.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/binlog_error_action_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/binlog_error_action_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/binlog_error_action_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/binlog_error_action_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,45 @@
+SELECT @@GLOBAL.binlog_error_action;
+@@GLOBAL.binlog_error_action
+IGNORE_ERROR
+IGNORE_ERROR Expected
+SELECT @@SESSION.binlog_error_action;
+ERROR HY000: Variable 'binlog_error_action' is a GLOBAL variable
+SET @start_value= @@global.binlog_error_action;
+SHOW GLOBAL VARIABLES LIKE 'binlog_error_action';
+Variable_name	Value
+binlog_error_action	IGNORE_ERROR
+SET @@GLOBAL.binlog_error_action=IGNORE_ERROR;
+SELECT @@GLOBAL.binlog_error_action;
+@@GLOBAL.binlog_error_action
+IGNORE_ERROR
+IGNORE_ERROR Expected
+SET @@GLOBAL.binlog_error_action=ABORT_SERVER;
+SELECT @@GLOBAL.binlog_error_action;
+@@GLOBAL.binlog_error_action
+ABORT_SERVER
+ABORT_SERVER Expected
+SELECT @@GLOBAL.binlog_error_action = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='binlog_error_action';
+@@GLOBAL.binlog_error_action = VARIABLE_VALUE
+1
+1 Expected
+SELECT COUNT(@@GLOBAL.binlog_error_action);
+COUNT(@@GLOBAL.binlog_error_action)
+1
+1 Expected
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='binlog_error_action';
+COUNT(VARIABLE_VALUE)
+1
+1 Expected
+SELECT COUNT(@@binlog_error_action);
+COUNT(@@binlog_error_action)
+1
+1 Expected
+SELECT COUNT(@@GLOBAL.binlog_error_action);
+COUNT(@@GLOBAL.binlog_error_action)
+1
+1 Expected
+SET @@global.binlog_error_action= @start_value;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/binlogging_impossible_mode_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/binlogging_impossible_mode_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/binlogging_impossible_mode_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/binlogging_impossible_mode_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,67 @@
+SELECT @@GLOBAL.binlogging_impossible_mode;
+@@GLOBAL.binlogging_impossible_mode
+IGNORE_ERROR
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+IGNORE_ERROR Expected
+SELECT @@SESSION.binlogging_impossible_mode;
+ERROR HY000: Variable 'binlogging_impossible_mode' is a GLOBAL variable
+SET @start_value= @@global.binlogging_impossible_mode;
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+SHOW GLOBAL VARIABLES LIKE 'binlogging_impossible_mode';
+Variable_name	Value
+binlogging_impossible_mode	IGNORE_ERROR
+SET @@GLOBAL.binlogging_impossible_mode=IGNORE_ERROR;
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+SELECT @@GLOBAL.binlogging_impossible_mode;
+@@GLOBAL.binlogging_impossible_mode
+IGNORE_ERROR
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+IGNORE_ERROR Expected
+SET @@GLOBAL.binlogging_impossible_mode=ABORT_SERVER;
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+SELECT @@GLOBAL.binlogging_impossible_mode;
+@@GLOBAL.binlogging_impossible_mode
+ABORT_SERVER
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+ABORT_SERVER Expected
+SELECT @@GLOBAL.binlogging_impossible_mode = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='binlogging_impossible_mode';
+@@GLOBAL.binlogging_impossible_mode = VARIABLE_VALUE
+1
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+1 Expected
+SELECT COUNT(@@GLOBAL.binlogging_impossible_mode);
+COUNT(@@GLOBAL.binlogging_impossible_mode)
+1
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+1 Expected
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='binlogging_impossible_mode';
+COUNT(VARIABLE_VALUE)
+1
+1 Expected
+SELECT COUNT(@@binlogging_impossible_mode);
+COUNT(@@binlogging_impossible_mode)
+1
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+1 Expected
+SELECT COUNT(@@GLOBAL.binlogging_impossible_mode);
+COUNT(@@GLOBAL.binlogging_impossible_mode)
+1
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
+1 Expected
+SET @@global.binlogging_impossible_mode= @start_value;
+Warnings:
+Warning	1287	'@@binlogging_impossible_mode' is deprecated and will be removed in a future release. Please use '@@binlog_error_action' instead
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/binlog_gtid_simple_recovery_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/binlog_gtid_simple_recovery_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/binlog_gtid_simple_recovery_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/binlog_gtid_simple_recovery_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,27 @@
+SELECT @@GLOBAL.binlog_gtid_simple_recovery;
+@@GLOBAL.binlog_gtid_simple_recovery
+0
+SELECT COUNT(@@GLOBAL.binlog_gtid_simple_recovery);
+COUNT(@@GLOBAL.binlog_gtid_simple_recovery)
+1
+SELECT COUNT(@@binlog_gtid_simple_recovery);
+COUNT(@@binlog_gtid_simple_recovery)
+1
+SELECT @@SESSION.binlog_gtid_simple_recovery;
+ERROR HY000: Variable 'binlog_gtid_simple_recovery' is a GLOBAL variable
+SHOW GLOBAL VARIABLES LIKE 'binlog_gtid_simple_recovery';
+Variable_name	Value
+binlog_gtid_simple_recovery	OFF
+SHOW SESSION VARIABLES LIKE 'binlog_gtid_simple_recovery';
+Variable_name	Value
+binlog_gtid_simple_recovery	OFF
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='binlog_gtid_simple_recovery';
+VARIABLE_NAME	VARIABLE_VALUE
+BINLOG_GTID_SIMPLE_RECOVERY	OFF
+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='binlog_gtid_simple_recovery';
+VARIABLE_NAME	VARIABLE_VALUE
+BINLOG_GTID_SIMPLE_RECOVERY	OFF
+SET GLOBAL binlog_gtid_simple_recovery=1;
+ERROR HY000: Variable 'binlog_gtid_simple_recovery' is a read only variable
+SET SESSION binlog_gtid_simple_recovery=1;
+ERROR HY000: Variable 'binlog_gtid_simple_recovery' is a read only variable
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/debug_sync_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/debug_sync_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/debug_sync_basic.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/debug_sync_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -2,17 +2,17 @@
 ERROR HY000: Variable 'debug_sync' is a SESSION variable
 select @@session.debug_sync;
 @@session.debug_sync
-ON - current signal: ''
+ON - signals: ''
 show global variables like "debug_sync";
 Variable_name	Value
 show session variables like "debug_sync";
 Variable_name	Value
-debug_sync	ON - current signal: ''
+debug_sync	ON - signals: ''
 select * from information_schema.global_variables where variable_name="debug_sync";
 VARIABLE_NAME	VARIABLE_VALUE
 select * from information_schema.session_variables where variable_name="debug_sync";
 VARIABLE_NAME	VARIABLE_VALUE
-DEBUG_SYNC	ON - current signal: ''
+DEBUG_SYNC	ON - signals: ''
 set @@session.debug_sync=1;
 ERROR 42000: Incorrect argument type to variable 'debug_sync'
 set @@session.debug_sync=1.1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result	2017-02-27 07:47:02.000000000 +0000
@@ -4,31 +4,43 @@
 SET @old_log_slow_admin_statements= @@global.log_slow_admin_statements;
 USE test;
 CREATE TABLE log_slow_admin_statements (
-i INT PRIMARY KEY,
-j INT
-);
+i INT PRIMARY KEY AUTO_INCREMENT,
+j VARCHAR(255)
+) ENGINE=InnoDB;
 SET GLOBAL log_output = 'file,table';
 SET GLOBAL slow_query_log = on;
 SET SESSION long_query_time = 0;
 SET GLOBAL log_slow_admin_statements = on;
-ALTER TABLE log_slow_admin_statements ADD COLUMN k INT;
-INSERT INTO log_slow_admin_statements VALUES (1,2,3), (4,5,6);
+ALTER TABLE log_slow_admin_statements ADD COLUMN k INT DEFAULT 17;
+CREATE PROCEDURE add_rows()
+BEGIN
+DECLARE count INT;
+SET count = 1;
+INSERT INTO log_slow_admin_statements(j) values (REPEAT('A', 255));
+WHILE count <= 15 DO
+INSERT INTO log_slow_admin_statements(j) SELECT j FROM log_slow_admin_statements;
+SET count = count + 1;
+END WHILE;
+END
+$
+CALL add_rows();
 OPTIMIZE TABLE log_slow_admin_statements;
 Table	Op	Msg_type	Msg_text
+test.log_slow_admin_statements	optimize	note	Table does not support optimize, doing recreate + analyze instead
 test.log_slow_admin_statements	optimize	status	OK
-INSERT INTO log_slow_admin_statements VALUES (7,8,9), (10,11,12);
-ANALYZE TABLE log_slow_admin_statements;
+CHECK TABLE log_slow_admin_statements EXTENDED;
 Table	Op	Msg_type	Msg_text
-test.log_slow_admin_statements	analyze	status	OK
+test.log_slow_admin_statements	check	status	OK
 DROP TABLE log_slow_admin_statements;
 SELECT sql_text FROM mysql.slow_log WHERE sql_text LIKE '%TABLE log_slow_admin_statements%';
 sql_text
-ALTER TABLE log_slow_admin_statements ADD COLUMN k INT
+ALTER TABLE log_slow_admin_statements ADD COLUMN k INT DEFAULT 17
 OPTIMIZE TABLE log_slow_admin_statements
-ANALYZE TABLE log_slow_admin_statements
+CHECK TABLE log_slow_admin_statements EXTENDED
 DROP TABLE log_slow_admin_statements
 SET @@global.log_output=                @old_log_output;
 SET @@global.slow_query_log=            @old_slow_query_log;
 SET @@session.long_query_time=          @old_long_query_time;
 SET @@global.log_slow_admin_statements= @old_log_slow_admin_statements;
+DROP PROCEDURE add_rows;
 TRUNCATE TABLE mysql.slow_log;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/max_digest_length_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/max_digest_length_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/max_digest_length_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/max_digest_length_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,23 @@
+select @@global.max_digest_length;
+@@global.max_digest_length
+123
+select @@session.max_digest_length;
+ERROR HY000: Variable 'max_digest_length' is a GLOBAL variable
+show global variables like 'max_digest_length';
+Variable_name	Value
+max_digest_length	123
+show session variables like 'max_digest_length';
+Variable_name	Value
+max_digest_length	123
+select * from information_schema.global_variables
+where variable_name='max_digest_length';
+VARIABLE_NAME	VARIABLE_VALUE
+MAX_DIGEST_LENGTH	123
+select * from information_schema.session_variables
+where variable_name='max_digest_length';
+VARIABLE_NAME	VARIABLE_VALUE
+MAX_DIGEST_LENGTH	123
+set global max_digest_length=1;
+ERROR HY000: Variable 'max_digest_length' is a read only variable
+set session max_digest_length=1;
+ERROR HY000: Variable 'max_digest_length' is a read only variable
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/secure_auth_func.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/secure_auth_func.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/secure_auth_func.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/secure_auth_func.result	2017-02-27 07:47:02.000000000 +0000
@@ -19,6 +19,7 @@
 CREATE USER 'testUser'@'localhost' identified with 'mysql_old_password';
 SET PASSWORD FOR 'testUser'@'localhost'= OLD_PASSWORD('newpass');
 Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 ** Connecting con_user2 using testUser **
 ** Connection default**
@@ -35,6 +36,7 @@
 FLUSH PRIVILEGES;
 SET PASSWORD FOR 'testUser'@'localhost' = OLD_PASSWORD('newpass');
 Warnings:
+Warning	1287	'OLD_PASSWORD' is deprecated and will be removed in a future release. Please use PASSWORD instead
 Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 ** Connecting con_user4 using testUser **
 ERROR HY000: Server is running in --secure-auth mode, but 'testUser'@'localhost' has a password in the old format; please change the password to the new format
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,130 @@
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SHOW SESSION VARIABLES LIKE 'show_old_temporals';
+Variable_name	Value
+show_old_temporals	OFF
+SELECT * FROM information_schema.session_variables WHERE variable_name='show_old_temporals';
+VARIABLE_NAME	VARIABLE_VALUE
+SHOW_OLD_TEMPORALS	OFF
+#Also can be set as a global variable.
+SELECT @@global.show_old_temporals;
+@@global.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SHOW GLOBAL VARIABLES LIKE 'show_old_temporals';
+Variable_name	Value
+show_old_temporals	OFF
+SELECT * FROM information_schema.global_variables WHERE variable_name='show_old_temporals';
+VARIABLE_NAME	VARIABLE_VALUE
+SHOW_OLD_TEMPORALS	OFF
+#Test setting the variable to various values.
+#Boolean values.
+SET SESSION show_old_temporals= ON;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+1
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET SESSION show_old_temporals= OFF;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET SESSION show_old_temporals= 1;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+1
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET SESSION show_old_temporals= 0;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+#Test for DEFAULT value.
+SET SESSION show_old_temporals= DEFAULT;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+#Test for invalid value.
+SET SESSION show_old_temporals= 2;
+ERROR 42000: Variable 'show_old_temporals' can't be set to the value of '2'
+#Test for setting the session variable
+#using different syntax.
+SET show_old_temporals= 1;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+#Fetches the current session value for the variable.
+SELECT @@show_old_temporals;
+@@show_old_temporals
+1
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+#cleanup
+SET SESSION show_old_temporals= DEFAULT;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+#Test setting the global value of the variable.
+#Boolean values.
+SET GLOBAL show_old_temporals= ON;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@global.show_old_temporals;
+@@global.show_old_temporals
+1
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET GLOBAL show_old_temporals= OFF;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@global.show_old_temporals;
+@@global.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET GLOBAL show_old_temporals= 1;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@global.show_old_temporals;
+@@global.show_old_temporals
+1
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET GLOBAL show_old_temporals= 0;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+#Test for DEFAULT value.
+SET GLOBAL show_old_temporals= DEFAULT;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@global.show_old_temporals;
+@@global.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+#Test for invalid value.
+SET GLOBAL show_old_temporals= 2;
+ERROR 42000: Variable 'show_old_temporals' can't be set to the value of '2'
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/simplified_binlog_gtid_recovery_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/simplified_binlog_gtid_recovery_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/simplified_binlog_gtid_recovery_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/simplified_binlog_gtid_recovery_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+SELECT @@GLOBAL.simplified_binlog_gtid_recovery;
+@@GLOBAL.simplified_binlog_gtid_recovery
+0
+Warnings:
+Warning	1287	'@@simplified_binlog_gtid_recovery' is deprecated and will be removed in a future release. Please use '@@binlog_gtid_simple_recovery' instead
+SELECT COUNT(@@GLOBAL.simplified_binlog_gtid_recovery);
+COUNT(@@GLOBAL.simplified_binlog_gtid_recovery)
+1
+Warnings:
+Warning	1287	'@@simplified_binlog_gtid_recovery' is deprecated and will be removed in a future release. Please use '@@binlog_gtid_simple_recovery' instead
+SELECT COUNT(@@simplified_binlog_gtid_recovery);
+COUNT(@@simplified_binlog_gtid_recovery)
+1
+Warnings:
+Warning	1287	'@@simplified_binlog_gtid_recovery' is deprecated and will be removed in a future release. Please use '@@binlog_gtid_simple_recovery' instead
+SELECT @@SESSION.simplified_binlog_gtid_recovery;
+ERROR HY000: Variable 'simplified_binlog_gtid_recovery' is a GLOBAL variable
+SHOW GLOBAL VARIABLES LIKE 'simplified_binlog_gtid_recovery';
+Variable_name	Value
+simplified_binlog_gtid_recovery	OFF
+SHOW SESSION VARIABLES LIKE 'simplified_binlog_gtid_recovery';
+Variable_name	Value
+simplified_binlog_gtid_recovery	OFF
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='simplified_binlog_gtid_recovery';
+VARIABLE_NAME	VARIABLE_VALUE
+SIMPLIFIED_BINLOG_GTID_RECOVERY	OFF
+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='simplified_binlog_gtid_recovery';
+VARIABLE_NAME	VARIABLE_VALUE
+SIMPLIFIED_BINLOG_GTID_RECOVERY	OFF
+SET GLOBAL simplified_binlog_gtid_recovery=1;
+ERROR HY000: Variable 'simplified_binlog_gtid_recovery' is a read only variable
+SET SESSION simplified_binlog_gtid_recovery=1;
+ERROR HY000: Variable 'simplified_binlog_gtid_recovery' is a read only variable
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -57,11 +57,16 @@
 SET @@session.sql_log_bin = NO;
 ERROR 42000: Variable 'sql_log_bin' can't be set to the value of 'NO'
 '#-------------------FN_DYNVARS_156_05----------------------------#'
+SELECT @@global.sql_log_bin;
+@@global.sql_log_bin
+1
 SET @@global.sql_log_bin = 0;
+ERROR 42000: Variable 'sql_log_bin' can't be set to the value of '0'
 SELECT @@global.sql_log_bin;
 @@global.sql_log_bin
-0
+1
 SET @@global.sql_log_bin = 1;
+ERROR 42000: Variable 'sql_log_bin' can't be set to the value of '1'
 '#----------------------FN_DYNVARS_156_06------------------------#'
 SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sql_log_bin';
 count(VARIABLE_VALUE)
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -1,34 +1,56 @@
 SET @global_start_value = @@global.timed_mutexes;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @global_start_value;
 @global_start_value
 0
 '#--------------------FN_DYNVARS_177_01------------------------#'
 SET @@global.timed_mutexes = 1;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SET @@global.timed_mutexes = DEFAULT;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 '#---------------------FN_DYNVARS_177_02-------------------------#'
 SET timed_mutexes = 1;
 ERROR HY000: Variable 'timed_mutexes' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT @@timed_mutexes;
 @@timed_mutexes
 0
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT global.timed_mutexes;
 ERROR 42S02: Unknown table 'global' in field list
 SET global timed_mutexes = 1;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 '#--------------------FN_DYNVARS_177_03------------------------#'
 SET @@global.timed_mutexes = 0;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SET @@global.timed_mutexes = 1;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 '#--------------------FN_DYNVARS_177_04-------------------------#'
 SET @@global.timed_mutexes = -1;
 ERROR 42000: Variable 'timed_mutexes' can't be set to the value of '-1'
@@ -72,9 +94,13 @@
 WHERE VARIABLE_NAME='timed_mutexes';
 IF(@@global.timed_mutexes, "ON", "OFF") = VARIABLE_VALUE
 1
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
 WHERE VARIABLE_NAME='timed_mutexes';
@@ -82,23 +108,43 @@
 ON
 '#---------------------FN_DYNVARS_177_08-------------------------#'
 SET @@global.timed_mutexes = OFF;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SET @@global.timed_mutexes = ON;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 '#---------------------FN_DYNVARS_177_09----------------------#'
 SET @@global.timed_mutexes = TRUE;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SET @@global.timed_mutexes = FALSE;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SET @@global.timed_mutexes = @global_start_value;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-SET @start_global_value = @@global.transaction_alloc_block_size;
-SELECT @start_global_value;
-@start_global_value
-8192
-SET @start_session_value = @@session.transaction_alloc_block_size;
-SELECT @start_session_value;
-@start_session_value
-8192
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.transaction_alloc_block_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '200'
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-8192
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size = 8192;
-@@global.transaction_alloc_block_size = 8192
-1
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size = 8192;
-@@session.transaction_alloc_block_size = 8192
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_alloc_block_size = 1024;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 60020;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '60020'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-59392
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-4294966272
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_alloc_block_size = 1024;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size =4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-4294966272
-SET @@session.transaction_alloc_block_size = 65535;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '65535'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_alloc_block_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '-1024'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 123456789201;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '123456789201'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-4294966272
-SET @@global.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1000'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = 12345678901;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '12345678901'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-4294966272
-SET @@session.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@global.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@session.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_08----------------------#'
-SET @@transaction_alloc_block_size = 1024;
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@global.transaction_alloc_block_size
-0
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@local.transaction_alloc_block_size
-1
-SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-@@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET transaction_alloc_block_size = 1027;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1027'
-SELECT @@transaction_alloc_block_size;
-@@transaction_alloc_block_size
-1024
-SELECT local.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-ERROR 42S22: Unknown column 'transaction_alloc_block_size' in 'field list'
-SET @@global.transaction_alloc_block_size = @start_global_value;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-SET @start_global_value = @@global.transaction_alloc_block_size;
-SELECT @start_global_value;
-@start_global_value
-8192
-SET @start_session_value = @@session.transaction_alloc_block_size;
-SELECT @start_session_value;
-@start_session_value
-8192
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.transaction_alloc_block_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '200'
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-8192
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size = 8192;
-@@global.transaction_alloc_block_size = 8192
-1
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size = 8192;
-@@session.transaction_alloc_block_size = 8192
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_alloc_block_size = 1024;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 60020;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '60020'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-59392
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-4294966272
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_alloc_block_size = 1024;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size =4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-4294966272
-SET @@session.transaction_alloc_block_size = 65535;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '65535'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_alloc_block_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '-1024'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 123456789201;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '123456789201'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-123456788480
-SET @@global.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1000'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = 12345678901;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '12345678901'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-12345678848
-SET @@session.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@global.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@session.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_08----------------------#'
-SET @@transaction_alloc_block_size = 1024;
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@global.transaction_alloc_block_size
-0
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@local.transaction_alloc_block_size
-1
-SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-@@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET transaction_alloc_block_size = 1027;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1027'
-SELECT @@transaction_alloc_block_size;
-@@transaction_alloc_block_size
-1024
-SELECT local.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-ERROR 42S22: Unknown column 'transaction_alloc_block_size' in 'field list'
-SET @@global.transaction_alloc_block_size = @start_global_value;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,174 @@
+SET @start_global_value = @@global.transaction_alloc_block_size;
+SELECT @start_global_value;
+@start_global_value
+8192
+SET @start_session_value = @@session.transaction_alloc_block_size;
+SELECT @start_session_value;
+@start_session_value
+8192
+'#--------------------FN_DYNVARS_005_01-------------------------#'
+SET @@global.transaction_alloc_block_size = 100;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
+SET @@global.transaction_alloc_block_size = DEFAULT;
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+8192
+SET @@session.transaction_alloc_block_size = 200;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '200'
+SET @@session.transaction_alloc_block_size = DEFAULT;
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+8192
+'#--------------------FN_DYNVARS_005_02-------------------------#'
+SET @@global.transaction_alloc_block_size = DEFAULT;
+SELECT @@global.transaction_alloc_block_size = 8192;
+@@global.transaction_alloc_block_size = 8192
+1
+SET @@session.transaction_alloc_block_size = DEFAULT;
+SELECT @@session.transaction_alloc_block_size = 8192;
+@@session.transaction_alloc_block_size = 8192
+1
+'#--------------------FN_DYNVARS_005_03-------------------------#'
+SET @@global.transaction_alloc_block_size = 1024;
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = 60020;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '60020'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+59392
+'#--------------------FN_DYNVARS_005_04-------------------------#'
+SET @@session.transaction_alloc_block_size = 1024;
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+1024
+SET @@session.transaction_alloc_block_size = 65535;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '65535'
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+64512
+'#------------------FN_DYNVARS_005_05-----------------------#'
+SET @@global.transaction_alloc_block_size = 0;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = -1024;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '-1024'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = 135217728;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '135217728'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+134217728
+SET @@global.transaction_alloc_block_size = ON;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@global.transaction_alloc_block_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@global.transaction_alloc_block_size = True;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = False;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@global.transaction_alloc_block_size ="Test";
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@global.transaction_alloc_block_size = 1000;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1000'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@session.transaction_alloc_block_size = 135217728;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '135217728'
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+134217728
+SET @@session.transaction_alloc_block_size = ON;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@session.transaction_alloc_block_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@session.transaction_alloc_block_size = True;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+1024
+SET @@session.transaction_alloc_block_size = False;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+1024
+SET @@session.transaction_alloc_block_size = "Test";
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@session.transaction_alloc_block_size = 'test';
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+'#------------------FN_DYNVARS_005_06-----------------------#'
+SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='transaction_alloc_block_size';
+@@global.transaction_alloc_block_size = VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_005_07-----------------------#'
+SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='transaction_alloc_block_size';
+@@session.transaction_alloc_block_size = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_001_08----------------------#'
+SET @@transaction_alloc_block_size = 1024;
+SET @@global.transaction_alloc_block_size = 134217728;
+SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
+@@transaction_alloc_block_size = @@global.transaction_alloc_block_size
+0
+'#---------------------FN_DYNVARS_001_09----------------------#'
+SET @@transaction_alloc_block_size = 100;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
+SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
+@@transaction_alloc_block_size = @@local.transaction_alloc_block_size
+1
+SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
+@@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size
+1
+'#---------------------FN_DYNVARS_001_10----------------------#'
+SET transaction_alloc_block_size = 1027;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1027'
+SELECT @@transaction_alloc_block_size;
+@@transaction_alloc_block_size
+1024
+SELECT local.transaction_alloc_block_size;
+ERROR 42S02: Unknown table 'local' in field list
+SELECT session.transaction_alloc_block_size;
+ERROR 42S02: Unknown table 'session' in field list
+SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
+ERROR 42S22: Unknown column 'transaction_alloc_block_size' in 'field list'
+SET @@global.transaction_alloc_block_size = @start_global_value;
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+8192
+SET @@session.tmp_table_size = @start_session_value;
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+1024
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-SET @start_global_value = @@global.transaction_prealloc_size;
-SELECT @start_global_value;
-@start_global_value
-4096
-SET @start_session_value = @@session.transaction_prealloc_size;
-SELECT @start_session_value;
-@start_session_value
-4096
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '200'
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size = 4096;
-@@global.transaction_prealloc_size = 4096
-1
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size = 4096;
-@@session.transaction_prealloc_size = 4096
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 60020;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-59392
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4294966272
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_prealloc_size = 1024;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
-SET @@session.transaction_prealloc_size = 65535;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_prealloc_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '-1024'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@global.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1000'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = 123456789031;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '123456789031'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@global.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@session.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SET @@global.transaction_prealloc_size = 10;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '10'
-SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
-@@transaction_prealloc_size = @@global.transaction_prealloc_size
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
-@@transaction_prealloc_size = @@local.transaction_prealloc_size
-1
-SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
-@@local.transaction_prealloc_size = @@session.transaction_prealloc_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET transaction_prealloc_size = 1027;
-SELECT @@transaction_prealloc_size;
-@@transaction_prealloc_size
-1024
-SELECT local.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
-ERROR 42S22: Unknown column 'transaction_prealloc_size' in 'field list'
-SET @@global.transaction_prealloc_size = @start_global_value;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = @start_session_value;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,170 +0,0 @@
-SET @start_global_value = @@global.transaction_prealloc_size;
-SELECT @start_global_value;
-@start_global_value
-4096
-SET @start_session_value = @@session.transaction_prealloc_size;
-SELECT @start_session_value;
-@start_session_value
-4096
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '200'
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size = 4096;
-@@global.transaction_prealloc_size = 4096
-1
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size = 4096;
-@@session.transaction_prealloc_size = 4096
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 60020;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-59392
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4294966272
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_prealloc_size = 1024;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
-SET @@session.transaction_prealloc_size = 65535;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_prealloc_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '-1024'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@global.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1000'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = 123456789031;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-123456788480
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@global.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@session.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SET @@global.transaction_prealloc_size = 10;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '10'
-SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
-@@transaction_prealloc_size = @@global.transaction_prealloc_size
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
-@@transaction_prealloc_size = @@local.transaction_prealloc_size
-1
-SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
-@@local.transaction_prealloc_size = @@session.transaction_prealloc_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET transaction_prealloc_size = 1027;
-SELECT @@transaction_prealloc_size;
-@@transaction_prealloc_size
-1024
-SELECT local.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
-ERROR 42S22: Unknown column 'transaction_prealloc_size' in 'field list'
-SET @@global.transaction_prealloc_size = @start_global_value;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = @start_session_value;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,168 @@
+SET @start_global_value = @@global.transaction_prealloc_size;
+SELECT @start_global_value;
+@start_global_value
+4096
+SET @start_session_value = @@session.transaction_prealloc_size;
+SELECT @start_session_value;
+@start_session_value
+4096
+'#--------------------FN_DYNVARS_005_01-------------------------#'
+SET @@global.transaction_prealloc_size = 100;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
+SET @@global.transaction_prealloc_size = DEFAULT;
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+4096
+SET @@session.transaction_prealloc_size = 200;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '200'
+SET @@session.transaction_prealloc_size = DEFAULT;
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+4096
+'#--------------------FN_DYNVARS_005_02-------------------------#'
+SET @@global.transaction_prealloc_size = DEFAULT;
+SELECT @@global.transaction_prealloc_size = 4096;
+@@global.transaction_prealloc_size = 4096
+1
+SET @@session.transaction_prealloc_size = DEFAULT;
+SELECT @@session.transaction_prealloc_size = 4096;
+@@session.transaction_prealloc_size = 4096
+1
+'#--------------------FN_DYNVARS_005_03-------------------------#'
+SET @@global.transaction_prealloc_size = 1024;
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = 60020;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '60020'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+59392
+'#--------------------FN_DYNVARS_005_04-------------------------#'
+SET @@session.transaction_prealloc_size = 1024;
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+1024
+SET @@session.transaction_prealloc_size = 65535;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '65535'
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+64512
+'#------------------FN_DYNVARS_005_05-----------------------#'
+SET @@global.transaction_prealloc_size = 0;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = -1024;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '-1024'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = ON;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@global.transaction_prealloc_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@global.transaction_prealloc_size = True;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = False;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@global.transaction_prealloc_size ="Test";
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@global.transaction_prealloc_size = 1000;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '1000'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@session.transaction_prealloc_size = ON;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@session.transaction_prealloc_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@session.transaction_prealloc_size = True;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+1024
+SET @@session.transaction_prealloc_size = False;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+1024
+SET @@session.transaction_prealloc_size = "Test";
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@session.transaction_prealloc_size = 135217728;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '135217728'
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+134217728
+'#------------------FN_DYNVARS_005_06-----------------------#'
+SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='transaction_prealloc_size';
+@@global.transaction_prealloc_size = VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_005_07-----------------------#'
+SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='transaction_prealloc_size';
+@@session.transaction_prealloc_size = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_001_09----------------------#'
+SET @@global.transaction_prealloc_size = 1024;
+SET @@global.transaction_prealloc_size = 10;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '10'
+SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
+@@transaction_prealloc_size = @@global.transaction_prealloc_size
+0
+'#---------------------FN_DYNVARS_001_10----------------------#'
+SET @@transaction_prealloc_size = 100;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
+SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
+@@transaction_prealloc_size = @@local.transaction_prealloc_size
+1
+SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
+@@local.transaction_prealloc_size = @@session.transaction_prealloc_size
+1
+'#---------------------FN_DYNVARS_001_11----------------------#'
+SET transaction_prealloc_size = 1027;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '1027'
+SELECT @@transaction_prealloc_size;
+@@transaction_prealloc_size
+1024
+SELECT local.transaction_prealloc_size;
+ERROR 42S02: Unknown table 'local' in field list
+SELECT session.transaction_prealloc_size;
+ERROR 42S02: Unknown table 'session' in field list
+SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
+ERROR 42S22: Unknown column 'transaction_prealloc_size' in 'field list'
+SET @@global.transaction_prealloc_size = @start_global_value;
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+4096
+SET @@session.transaction_prealloc_size = @start_session_value;
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+4096
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/avoid_temporal_upgrade_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/avoid_temporal_upgrade_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/avoid_temporal_upgrade_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/avoid_temporal_upgrade_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,45 @@
+#
+# Show the global value;
+#
+SELECT @@global.avoid_temporal_upgrade;
+SHOW GLOBAL VARIABLES LIKE 'avoid_temporal_upgrade';
+SELECT * FROM information_schema.global_variables WHERE variable_name='avoid_temporal_upgrade';
+
+--echo #It is not a session variable.
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@session.avoid_temporal_upgrade;
+SHOW SESSION VARIABLES LIKE 'avoid_temporal_upgrade';
+SELECT * FROM information_schema.session_variables WHERE variable_name='avoid_temporal_upgrade';
+--error ER_GLOBAL_VARIABLE
+SET SESSION avoid_temporal_upgrade= ON;
+
+--echo #Test setting the variable to various values.
+
+--echo #Boolean values.
+SET GLOBAL avoid_temporal_upgrade= ON;
+SELECT @@global.avoid_temporal_upgrade;
+
+SET GLOBAL avoid_temporal_upgrade= OFF;
+SELECT @@global.avoid_temporal_upgrade;
+
+SET GLOBAL avoid_temporal_upgrade= 1;
+SELECT @@global.avoid_temporal_upgrade;
+
+SET GLOBAL avoid_temporal_upgrade= 0;
+SELECT @@global.avoid_temporal_upgrade;
+
+--echo #Test for DEFAULT value.
+SET GLOBAL avoid_temporal_upgrade= DEFAULT;
+SELECT @@global.avoid_temporal_upgrade;
+
+--echo #Test for invalid value.
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL avoid_temporal_upgrade= 2;
+
+--echo #Test for invalid statement for setting the 
+--echo #global variable.
+--error ER_GLOBAL_VARIABLE
+SET avoid_temporal_upgrade= 1;
+
+--echo #Fetches the current global value for the variable.
+SELECT @@avoid_temporal_upgrade;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/binlog_error_action_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/binlog_error_action_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/binlog_error_action_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/binlog_error_action_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,69 @@
+################## mysql-test\t\binlog_error_action_basic.test ################
+#                                                                             #
+# Variable Name: binlog_error_action                                          #
+# Scope: Global                                                               #
+# Data Type: enumeration                                                      #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2014-09-11                                                   #
+# Author : Sujatha Sivakumar                                                  #
+#                                                                             #
+#                                                                             #
+# Description:Test Cases of Dynamic System Variable binlog_error_action       #
+#             that checks the behavior of this variable in the following ways #
+#              * Value Check                                                  #
+#              * Scope Check                                                  #
+###############################################################################
+
+
+SELECT @@GLOBAL.binlog_error_action;
+--echo IGNORE_ERROR Expected
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@SESSION.binlog_error_action;
+
+SET @start_value= @@global.binlog_error_action;
+####################################################################
+#   Displaying default value                                       #
+####################################################################
+SHOW GLOBAL VARIABLES LIKE 'binlog_error_action';
+
+####################################################################
+#   Check if Value can set                                         #
+####################################################################
+SET @@GLOBAL.binlog_error_action=IGNORE_ERROR;
+SELECT @@GLOBAL.binlog_error_action;
+--echo IGNORE_ERROR Expected
+
+SET @@GLOBAL.binlog_error_action=ABORT_SERVER;
+SELECT @@GLOBAL.binlog_error_action;
+--echo ABORT_SERVER Expected
+
+#################################################################
+# Check if the value in GLOBAL Table matches value in variable  #
+#################################################################
+
+SELECT @@GLOBAL.binlog_error_action = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='binlog_error_action';
+--echo 1 Expected
+
+SELECT COUNT(@@GLOBAL.binlog_error_action);
+--echo 1 Expected
+
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='binlog_error_action';
+--echo 1 Expected
+
+
+################################################################################
+#   Check if binlog_error_action can be accessed with @@ sign           #
+################################################################################
+
+SELECT COUNT(@@binlog_error_action);
+--echo 1 Expected
+SELECT COUNT(@@GLOBAL.binlog_error_action);
+--echo 1 Expected
+
+SET @@global.binlog_error_action= @start_value;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/binlogging_impossible_mode_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/binlogging_impossible_mode_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/binlogging_impossible_mode_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/binlogging_impossible_mode_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,69 @@
+################## mysql-test\t\binlogging_impossible_mode_basic.test #########
+#                                                                             #
+# Variable Name: binlogging_impossible_mode                                   #
+# Scope: Global                                                               #
+# Data Type: enumeration                                                      #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2014-04-21                                                   #
+# Author : Sujatha Sivakumar                                                  #
+#                                                                             #
+#                                                                             #
+# Description:Test Cases of Dynamic System Variable binlogging_impossible_mode#
+#             that checks the behavior of this variable in the following ways #
+#              * Value Check                                                  #
+#              * Scope Check                                                  #
+###############################################################################
+
+
+SELECT @@GLOBAL.binlogging_impossible_mode;
+--echo IGNORE_ERROR Expected
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@SESSION.binlogging_impossible_mode;
+
+SET @start_value= @@global.binlogging_impossible_mode;
+####################################################################
+#   Displaying default value                                       #
+####################################################################
+SHOW GLOBAL VARIABLES LIKE 'binlogging_impossible_mode';
+
+####################################################################
+#   Check if Value can set                                         #
+####################################################################
+SET @@GLOBAL.binlogging_impossible_mode=IGNORE_ERROR;
+SELECT @@GLOBAL.binlogging_impossible_mode;
+--echo IGNORE_ERROR Expected
+
+SET @@GLOBAL.binlogging_impossible_mode=ABORT_SERVER;
+SELECT @@GLOBAL.binlogging_impossible_mode;
+--echo ABORT_SERVER Expected
+
+#################################################################
+# Check if the value in GLOBAL Table matches value in variable  #
+#################################################################
+
+SELECT @@GLOBAL.binlogging_impossible_mode = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='binlogging_impossible_mode';
+--echo 1 Expected
+
+SELECT COUNT(@@GLOBAL.binlogging_impossible_mode);
+--echo 1 Expected
+
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='binlogging_impossible_mode';
+--echo 1 Expected
+
+
+################################################################################
+#   Check if binlogging_impossible_mode can be accessed with @@ sign           #
+################################################################################
+
+SELECT COUNT(@@binlogging_impossible_mode);
+--echo 1 Expected
+SELECT COUNT(@@GLOBAL.binlogging_impossible_mode);
+--echo 1 Expected
+
+SET @@global.binlogging_impossible_mode= @start_value;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/binlog_gtid_simple_recovery_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/binlog_gtid_simple_recovery_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/binlog_gtid_simple_recovery_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/binlog_gtid_simple_recovery_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+#
+# only GLOBAL
+#
+SELECT @@GLOBAL.binlog_gtid_simple_recovery;
+SELECT COUNT(@@GLOBAL.binlog_gtid_simple_recovery);
+SELECT COUNT(@@binlog_gtid_simple_recovery);
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@SESSION.binlog_gtid_simple_recovery;
+SHOW GLOBAL VARIABLES LIKE 'binlog_gtid_simple_recovery';
+SHOW SESSION VARIABLES LIKE 'binlog_gtid_simple_recovery';
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='binlog_gtid_simple_recovery';
+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='binlog_gtid_simple_recovery';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET GLOBAL binlog_gtid_simple_recovery=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET SESSION binlog_gtid_simple_recovery=1;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/disabled.def percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/disabled.def
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/disabled.def	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/disabled.def	2017-02-27 07:47:02.000000000 +0000
@@ -9,8 +9,6 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-transaction_prealloc_size_basic_32  : Bug#11748572
-transaction_prealloc_size_basic_64  : Bug#11748572
 query_cache_size_basic_32           : Bug#13535584
 query_cache_size_basic_64           : Bug#11748572
 #thread_cache_size_func             : Bug#11750172: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test	2017-02-27 07:47:02.000000000 +0000
@@ -8,9 +8,9 @@
 
 USE test;
 CREATE TABLE log_slow_admin_statements (
-	i INT PRIMARY KEY,
-	j INT
-);
+	i INT PRIMARY KEY AUTO_INCREMENT,
+	j VARCHAR(255)
+) ENGINE=InnoDB;
 
 # enable slow logging to table
 SET GLOBAL log_output = 'file,table';
@@ -18,19 +18,38 @@
 SET SESSION long_query_time = 0;
 SET GLOBAL log_slow_admin_statements = on;
 
-# test ALTER, OPTIMIZE and ANALYZE against the table show up
-ALTER TABLE log_slow_admin_statements ADD COLUMN k INT;
+# test ALTER, OPTIMIZE and CHECK against the table shown up
+ALTER TABLE log_slow_admin_statements ADD COLUMN k INT DEFAULT 17;
 
-# add some rows so OPTIMIZE runs
-INSERT INTO log_slow_admin_statements VALUES (1,2,3), (4,5,6);
+# add rows so OPTIMIZE and CHECK runs
+DELIMITER $;
+
+CREATE PROCEDURE add_rows()
+BEGIN
+  DECLARE count INT;
+  SET count = 1;
+  INSERT INTO log_slow_admin_statements(j) values (REPEAT('A', 255));
+  WHILE count <= 15 DO
+    INSERT INTO log_slow_admin_statements(j) SELECT j FROM log_slow_admin_statements;
+    SET count = count + 1;
+  END WHILE;
+END
+$
+
+DELIMITER ;$
+
+CALL add_rows();
+
+# OPTIMIZE TABLE
 OPTIMIZE TABLE log_slow_admin_statements;
 
-# and again so ANALYZE runs
-INSERT INTO log_slow_admin_statements VALUES (7,8,9), (10,11,12);
-ANALYZE TABLE log_slow_admin_statements;
+# CHECK TABLE
+CHECK TABLE log_slow_admin_statements EXTENDED;
 
+# DROP TABLE
 DROP TABLE log_slow_admin_statements;
 
+# ALTER, OPTIMIZE, CHECK and DROP operations should be logged in slow query log.
 SELECT sql_text FROM mysql.slow_log WHERE sql_text LIKE '%TABLE log_slow_admin_statements%';
 
 SET @@global.log_output=                @old_log_output;
@@ -38,4 +57,5 @@
 SET @@session.long_query_time=          @old_long_query_time;
 SET @@global.log_slow_admin_statements= @old_log_slow_admin_statements;
 
+DROP PROCEDURE add_rows;
 TRUNCATE TABLE mysql.slow_log;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/max_digest_length_basic-master.opt percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/max_digest_length_basic-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/max_digest_length_basic-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/max_digest_length_basic-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--max-digest-length=123
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/max_digest_length_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/max_digest_length_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/max_digest_length_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/max_digest_length_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,32 @@
+
+#
+# Only global
+#
+
+select @@global.max_digest_length;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.max_digest_length;
+
+show global variables like 'max_digest_length';
+
+show session variables like 'max_digest_length';
+
+--disable_warnings
+select * from information_schema.global_variables
+  where variable_name='max_digest_length';
+
+select * from information_schema.session_variables
+  where variable_name='max_digest_length';
+--enable_warnings
+
+#
+# Read-only
+#
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global max_digest_length=1;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session max_digest_length=1;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,65 @@
+#
+# Show the session value;
+#
+SELECT @@session.show_old_temporals;
+SHOW SESSION VARIABLES LIKE 'show_old_temporals';
+SELECT * FROM information_schema.session_variables WHERE variable_name='show_old_temporals';
+
+--echo #Also can be set as a global variable.
+SELECT @@global.show_old_temporals;
+SHOW GLOBAL VARIABLES LIKE 'show_old_temporals';
+SELECT * FROM information_schema.global_variables WHERE variable_name='show_old_temporals';
+
+--echo #Test setting the variable to various values.
+--echo #Boolean values.
+SET SESSION show_old_temporals= ON;
+SELECT @@session.show_old_temporals;
+
+SET SESSION show_old_temporals= OFF;
+SELECT @@session.show_old_temporals;
+
+SET SESSION show_old_temporals= 1;
+SELECT @@session.show_old_temporals;
+
+SET SESSION show_old_temporals= 0;
+SELECT @@session.show_old_temporals;
+
+--echo #Test for DEFAULT value.
+SET SESSION show_old_temporals= DEFAULT;
+SELECT @@session.show_old_temporals;
+
+--echo #Test for invalid value.
+--error ER_WRONG_VALUE_FOR_VAR
+SET SESSION show_old_temporals= 2;
+
+--echo #Test for setting the session variable
+--echo #using different syntax.
+SET show_old_temporals= 1;
+
+--echo #Fetches the current session value for the variable.
+SELECT @@show_old_temporals;
+
+--echo #cleanup
+SET SESSION show_old_temporals= DEFAULT;
+
+--echo #Test setting the global value of the variable.
+--echo #Boolean values.
+SET GLOBAL show_old_temporals= ON;
+SELECT @@global.show_old_temporals;
+
+SET GLOBAL show_old_temporals= OFF;
+SELECT @@global.show_old_temporals;
+
+SET GLOBAL show_old_temporals= 1;
+SELECT @@global.show_old_temporals;
+
+SET GLOBAL show_old_temporals= 0;
+SELECT @@session.show_old_temporals;
+
+--echo #Test for DEFAULT value.
+SET GLOBAL show_old_temporals= DEFAULT;
+SELECT @@global.show_old_temporals;
+
+--echo #Test for invalid value.
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL show_old_temporals= 2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/simplified_binlog_gtid_recovery_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/simplified_binlog_gtid_recovery_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/simplified_binlog_gtid_recovery_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/simplified_binlog_gtid_recovery_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+#
+# only GLOBAL
+#
+SELECT @@GLOBAL.simplified_binlog_gtid_recovery;
+SELECT COUNT(@@GLOBAL.simplified_binlog_gtid_recovery);
+SELECT COUNT(@@simplified_binlog_gtid_recovery);
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@SESSION.simplified_binlog_gtid_recovery;
+SHOW GLOBAL VARIABLES LIKE 'simplified_binlog_gtid_recovery';
+SHOW SESSION VARIABLES LIKE 'simplified_binlog_gtid_recovery';
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='simplified_binlog_gtid_recovery';
+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='simplified_binlog_gtid_recovery';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET GLOBAL simplified_binlog_gtid_recovery=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET SESSION simplified_binlog_gtid_recovery=1;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -109,11 +109,15 @@
 
 --echo '#-------------------FN_DYNVARS_156_05----------------------------#'
 ########################################################################### 
-#       Test if accessing global sql_log_bin gives error                  #
+#       Test if setting global sql_log_bin gives error,                   #
+#       and there is no error on reading it.                              #
 ########################################################################### 
 
+SELECT @@global.sql_log_bin;
+--Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.sql_log_bin = 0;
 SELECT @@global.sql_log_bin;
+--Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.sql_log_bin = 1;
 
 --echo '#----------------------FN_DYNVARS_156_06------------------------#'
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit.inc
---source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit.inc
---source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,228 @@
+############## mysql-test\t\transaction_alloc_block_size_basic.test ###########
+#                                                                             #
+# Variable Name: transaction_alloc_block_size                                 #
+# Scope: GLOBAL | SESSION                                                     #
+# Access Type: Dynamic                                                        #
+# Data Type: numeric                                                          #
+# Default Value: 8192                                                         #
+# Range: 1024-134217728                                                       #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2008-02-14                                                   #
+# Author:  Salman                                                             #
+#                                                                             #
+# Description: Test Cases of Dynamic System Variable                          #
+#              transaction_alloc_block_size                                   #
+#              that checks the behavior of this variable in the following ways#
+#              * Default Value                                                #
+#              * Valid & Invalid values                                       #
+#              * Scope & Access method                                        #
+#              * Data Integrity                                               #
+#                                                                             #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
+#  server-system-variables.html                                               #
+#                                                                             #
+###############################################################################
+
+--source include/load_sysvars.inc
+
+########################################################################
+#           START OF transaction_alloc_block_size TESTS                #
+########################################################################
+
+
+#############################################################
+#                 Save initial value                        #
+#############################################################
+
+SET @start_global_value = @@global.transaction_alloc_block_size;
+SELECT @start_global_value;
+SET @start_session_value = @@session.transaction_alloc_block_size;
+SELECT @start_session_value;
+
+
+--echo '#--------------------FN_DYNVARS_005_01-------------------------#'
+########################################################################
+#     Display the DEFAULT value of transaction_alloc_block_size        #
+########################################################################
+
+SET @@global.transaction_alloc_block_size = 100;
+SET @@global.transaction_alloc_block_size = DEFAULT;
+SELECT @@global.transaction_alloc_block_size;
+
+
+SET @@session.transaction_alloc_block_size = 200;
+SET @@session.transaction_alloc_block_size = DEFAULT;
+SELECT @@session.transaction_alloc_block_size;
+
+
+
+--echo '#--------------------FN_DYNVARS_005_02-------------------------#'
+########################################################################
+#     Check the DEFAULT value of transaction_alloc_block_size          #
+########################################################################
+
+SET @@global.transaction_alloc_block_size = DEFAULT;
+SELECT @@global.transaction_alloc_block_size = 8192;
+
+SET @@session.transaction_alloc_block_size = DEFAULT;
+SELECT @@session.transaction_alloc_block_size = 8192;
+
+
+--echo '#--------------------FN_DYNVARS_005_03-------------------------#'
+##################################################################
+# Change the value of variable to a valid value for GLOBAL Scope #
+##################################################################
+
+SET @@global.transaction_alloc_block_size = 1024;
+SELECT @@global.transaction_alloc_block_size;
+
+SET @@global.transaction_alloc_block_size = 60020;
+SELECT @@global.transaction_alloc_block_size;
+
+--echo '#--------------------FN_DYNVARS_005_04-------------------------#'
+###################################################################
+# Change the value of variable to a valid value for SESSION Scope #
+###################################################################
+ 
+SET @@session.transaction_alloc_block_size = 1024;
+SELECT @@session.transaction_alloc_block_size;
+
+SET @@session.transaction_alloc_block_size = 65535;
+SELECT @@session.transaction_alloc_block_size;
+
+
+--echo '#------------------FN_DYNVARS_005_05-----------------------#'
+########################################################################
+# Change the value of transaction_alloc_block_size to an invalid value #
+########################################################################
+
+SET @@global.transaction_alloc_block_size = 0;
+SELECT @@global.transaction_alloc_block_size;
+
+SET @@global.transaction_alloc_block_size = -1024;
+SELECT @@global.transaction_alloc_block_size;
+
+
+SET @@global.transaction_alloc_block_size = 135217728;
+SELECT @@global.transaction_alloc_block_size;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_alloc_block_size = ON;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_alloc_block_size = OFF;
+
+
+SET @@global.transaction_alloc_block_size = True;
+SELECT @@global.transaction_alloc_block_size;
+
+SET @@global.transaction_alloc_block_size = False;
+SELECT @@global.transaction_alloc_block_size;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_alloc_block_size = 65530.34;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_alloc_block_size ="Test";
+
+SET @@global.transaction_alloc_block_size = 1000;
+SELECT @@global.transaction_alloc_block_size;
+
+SET @@session.transaction_alloc_block_size = 135217728;
+SELECT @@session.transaction_alloc_block_size;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_alloc_block_size = ON;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_alloc_block_size = OFF;
+
+SET @@session.transaction_alloc_block_size = True;
+SELECT @@session.transaction_alloc_block_size;
+
+SET @@session.transaction_alloc_block_size = False;
+SELECT @@session.transaction_alloc_block_size;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_alloc_block_size = "Test";
+
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_alloc_block_size = 'test';
+
+--echo '#------------------FN_DYNVARS_005_06-----------------------#'
+####################################################################
+#   Check if the value in GLOBAL Table matches value in variable   #
+####################################################################
+
+
+SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='transaction_alloc_block_size';
+
+--echo '#------------------FN_DYNVARS_005_07-----------------------#'
+####################################################################
+#  Check if the value in SESSION Table matches value in variable   #
+####################################################################
+
+SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='transaction_alloc_block_size';
+
+
+--echo '#---------------------FN_DYNVARS_001_08----------------------#'
+###########################################################################
+#  Check if global and session variable are independent of each other     #
+###########################################################################
+
+SET @@transaction_alloc_block_size = 1024;
+SET @@global.transaction_alloc_block_size = 134217728;
+SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
+ 
+
+--echo '#---------------------FN_DYNVARS_001_09----------------------#'
+########################################################################
+#    Check if accessing variable with SESSION,LOCAL and without SCOPE  #
+#    points to same session variable                                   #
+########################################################################
+
+SET @@transaction_alloc_block_size = 100;
+SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
+SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
+
+
+--echo '#---------------------FN_DYNVARS_001_10----------------------#'
+################################################################
+#   Check if variable can be accessed with and without @@ sign #
+################################################################
+
+SET transaction_alloc_block_size = 1027;
+SELECT @@transaction_alloc_block_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT local.transaction_alloc_block_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT session.transaction_alloc_block_size;
+
+--Error ER_BAD_FIELD_ERROR
+SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
+
+
+####################################
+#     Restore initial value        #
+####################################
+
+SET @@global.transaction_alloc_block_size = @start_global_value;
+SELECT @@global.transaction_alloc_block_size;
+SET @@session.tmp_table_size = @start_session_value;
+SELECT @@session.transaction_alloc_block_size;
+
+
+#############################################################
+#             END OF transaction_alloc_block_size TESTS     #
+#############################################################
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit.inc
---source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
-
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit.inc
---source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
-
diff -Nru percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
--- percona-xtrabackup-2.2.3/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,219 @@
+############## mysql-test\t\transaction_prealloc_size_basic.test ##############
+#                                                                             #
+# Variable Name: transaction_prealloc_size                                    #
+# Scope: GLOBAL | SESSION                                                     #
+# Access Type: Dynamic                                                        #
+# Data Type: numeric                                                          #
+# Default Value: 4096                                                         #
+# Range: 1024-134217728                                                       #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2008-02-14                                                   #
+# Author: Sharique Abdullah                                                       #
+#                                                                             #
+# Description: Test Cases of Dynamic System Variable transaction_prealloc_size#
+#              that checks the behavior of this variable in the following ways#
+#              * Default Value                                                #
+#              * Valid & Invalid values                                       #
+#              * Scope & Access method                                        #
+#              * Data Integrity                                               #
+#                                                                             #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
+#  server-system-variables.html#option_mysqld_transaction_prealloc_size       #
+#                                                                             #
+###############################################################################
+
+--source include/load_sysvars.inc
+
+########################################################################
+#           START OF transaction_prealloc_size TESTS                   #
+########################################################################
+
+
+#############################################################
+#                 Save initial value                        #
+#############################################################
+
+SET @start_global_value = @@global.transaction_prealloc_size;
+SELECT @start_global_value;
+SET @start_session_value = @@session.transaction_prealloc_size;
+SELECT @start_session_value;
+
+--echo '#--------------------FN_DYNVARS_005_01-------------------------#'
+########################################################################
+#     Display the DEFAULT value of transaction_prealloc_size           #
+########################################################################
+
+SET @@global.transaction_prealloc_size = 100;
+SET @@global.transaction_prealloc_size = DEFAULT;
+SELECT @@global.transaction_prealloc_size;
+
+
+SET @@session.transaction_prealloc_size = 200;
+SET @@session.transaction_prealloc_size = DEFAULT;
+SELECT @@session.transaction_prealloc_size;
+
+--echo '#--------------------FN_DYNVARS_005_02-------------------------#'
+########################################################################
+#     Check the DEFAULT value of transaction_prealloc_size             #
+########################################################################
+
+SET @@global.transaction_prealloc_size = DEFAULT;
+SELECT @@global.transaction_prealloc_size = 4096;
+
+SET @@session.transaction_prealloc_size = DEFAULT;
+SELECT @@session.transaction_prealloc_size = 4096;
+
+--echo '#--------------------FN_DYNVARS_005_03-------------------------#'
+##################################################################
+# Change the value of variable to a valid value for GLOBAL Scope #
+##################################################################
+
+SET @@global.transaction_prealloc_size = 1024;
+SELECT @@global.transaction_prealloc_size;
+
+SET @@global.transaction_prealloc_size = 60020;
+SELECT @@global.transaction_prealloc_size;
+
+--echo '#--------------------FN_DYNVARS_005_04-------------------------#'
+###################################################################
+# Change the value of variable to a valid value for SESSION Scope #
+###################################################################
+ 
+SET @@session.transaction_prealloc_size = 1024;
+SELECT @@session.transaction_prealloc_size;
+
+SET @@session.transaction_prealloc_size = 65535;
+SELECT @@session.transaction_prealloc_size;
+
+
+--echo '#------------------FN_DYNVARS_005_05-----------------------#'
+#####################################################################
+# Change the value of transaction_prealloc_size to an invalid value #
+#####################################################################
+
+SET @@global.transaction_prealloc_size = 0;
+SELECT @@global.transaction_prealloc_size;
+
+SET @@global.transaction_prealloc_size = -1024;
+SELECT @@global.transaction_prealloc_size;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_prealloc_size = ON;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_prealloc_size = OFF;
+
+
+SET @@global.transaction_prealloc_size = True;
+SELECT @@global.transaction_prealloc_size;
+
+SET @@global.transaction_prealloc_size = False;
+SELECT @@global.transaction_prealloc_size;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_prealloc_size = 65530.34;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_prealloc_size ="Test";
+
+SET @@global.transaction_prealloc_size = 1000;
+SELECT @@global.transaction_prealloc_size;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_prealloc_size = ON;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_prealloc_size = OFF;
+
+SET @@session.transaction_prealloc_size = True;
+SELECT @@session.transaction_prealloc_size;
+
+SET @@session.transaction_prealloc_size = False;
+SELECT @@session.transaction_prealloc_size;
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_prealloc_size = "Test";
+
+SET @@session.transaction_prealloc_size = 135217728;
+SELECT @@session.transaction_prealloc_size;
+
+
+--echo '#------------------FN_DYNVARS_005_06-----------------------#'
+####################################################################
+#   Check if the value in GLOBAL Table matches value in variable   #
+####################################################################
+
+
+SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='transaction_prealloc_size';
+
+--echo '#------------------FN_DYNVARS_005_07-----------------------#'
+####################################################################
+#  Check if the value in SESSION Table matches value in variable   #
+####################################################################
+
+SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='transaction_prealloc_size';
+
+
+
+
+--echo '#---------------------FN_DYNVARS_001_09----------------------#'
+###########################################################################
+#  Check if global and session variable are independent of each other     #
+###########################################################################
+
+SET @@global.transaction_prealloc_size = 1024;
+SET @@global.transaction_prealloc_size = 10;
+
+SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
+ 
+
+--echo '#---------------------FN_DYNVARS_001_10----------------------#'
+########################################################################
+#    Check if accessing variable with SESSION,LOCAL and without SCOPE  #
+#    points to same session variable                                   #
+########################################################################
+
+SET @@transaction_prealloc_size = 100;
+SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
+SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
+
+
+--echo '#---------------------FN_DYNVARS_001_11----------------------#'
+###############################################################################
+# Check if transaction_prealloc_size can be accessed with and without @@ sign #
+###############################################################################
+
+SET transaction_prealloc_size = 1027;
+SELECT @@transaction_prealloc_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT local.transaction_prealloc_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT session.transaction_prealloc_size;
+
+--Error ER_BAD_FIELD_ERROR
+SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
+
+####################################
+#     Restore initial value        #
+####################################
+
+SET @@global.transaction_prealloc_size = @start_global_value;
+SELECT @@global.transaction_prealloc_size;
+SET @@session.transaction_prealloc_size = @start_session_value;
+SELECT @@session.transaction_prealloc_size;
+
+
+#############################################################
+#                 END OF transaction_prealloc_size TESTS     #
+#############################################################
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/alter_table.test percona-xtrabackup-2.3.7/mysql-test/t/alter_table.test
--- percona-xtrabackup-2.2.3/mysql-test/t/alter_table.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/alter_table.test	2017-02-27 07:47:02.000000000 +0000
@@ -1617,3 +1617,455 @@
 CREATE TABLE help_topic (dummy int) ENGINE=innodb;
 use test;
 --echo # End of Bug#11815557
+
+
+--echo #
+--echo # BUG#17246318 - ALTER TABLE SHOULD NOT ALLOW CREATION OF TABLES
+--echo #                WITH BOTH 5.5 AND 5.6 TEMPORALS
+--echo #
+
+--echo # BUG 18985760 -"FAST" ALTER TABLE CHANGE ON ENUM COLUMN 
+--echo #                TRIGGERS FULL TABLE REBUILD.
+--echo # Test for the case where 'avoid_temporal_upgrade' is set
+--echo # to the DEFAULT value(OFF).
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+--copy_file std_data/55_temporal.frm $MYSQLD_DATADIR/test/t1.frm
+--copy_file std_data/55_temporal.MYD $MYSQLD_DATADIR/test/t1.MYD
+--copy_file std_data/55_temporal.MYI $MYSQLD_DATADIR/test/t1.MYI
+
+ALTER TABLE t1 ENGINE= INNODB;
+
+--echo #ALTER operations using INPLACE algorithm is disallowed
+--echo #since the table contains old temporal type.
+
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+ALTER TABLE t1 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= INPLACE;
+
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+ALTER TABLE t1 ADD COLUMN fld4 TIMESTAMP FIRST, ALGORITHM= INPLACE;
+
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+ALTER TABLE t1 ADD COLUMN fld4 TIMESTAMP AFTER f_timestamp, ALGORITHM= INPLACE;
+
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+ALTER TABLE t1 CHANGE COLUMN f_time fld4 TIMESTAMP, ALGORITHM= INPLACE;
+
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+ALTER TABLE t1 MODIFY f_datetime TIME, ALGORITHM= INPLACE;
+
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+ALTER TABLE t1 ADD INDEX index1(f_datetime), ALGORITHM= INPLACE;
+
+--echo #ALTER operations using COPY algorithm is allowed
+--echo #when the table contains old temporal type.
+
+--echo #Note: Timestamp encoding remains the same for the non-fractional part
+--echo #even in the 5.6 format. Hence there is no change in the display before
+--echo #and after upgrade.
+
+--echo #ADD COLUMN upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ADD COLUMN FIRST upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP FIRST, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ADD COLUMN AFTER upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP AFTER f_timestamp, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #CHANGE COLUMN upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 CHANGE COLUMN f_timestamp fld4 TIMESTAMP, ALGORITHM= COPY;
+SELECT f_time, f_datetime, fld4, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(fld4)) FROM t2;
+DROP TABLE t2;
+
+--echo #MODIFY COLUMN upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 MODIFY f_timestamp TIME, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ADD INDEX upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD INDEX index1(f_timestamp), ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ALTER operations using DEFAULT algorithm is allowed
+--echo #when the table contains old temporal type.
+
+--echo #ADD COLUMN upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ADD COLUMN FIRST upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP FIRST, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ADD COLUMN AFTER upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP AFTER f_timestamp, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #CHANGE COLUMN upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 CHANGE COLUMN f_timestamp fld4 DATETIME, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, fld4, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(fld4)) FROM t2;
+DROP TABLE t2;
+
+--echo #MODIFY COLUMN upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 MODIFY f_timestamp TIME, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ADD INDEX upgrades the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD INDEX index1(f_timestamp), ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ALTER TABLE FORCE upgrades the old temporal types.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+              HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 FORCE;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+              HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #Examples where the NOT NULL/NULL FLAG and DEFAULT values are retained
+--echo #after upgrade.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+--echo #Before upgrade.
+SHOW CREATE TABLE t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= COPY;
+--echo #After upgrade.
+SHOW CREATE TABLE t2;
+
+--echo #Examples of the Alter operation which does not upgrade
+--echo #the temporal formats. 
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t1;
+
+ALTER TABLE t1 DROP COLUMN f_timestamp;
+SELECT f_time, f_datetime, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)) FROM t1;
+
+RENAME TABLE t1 to t3;
+SELECT f_time, f_datetime, HEX(WEIGHT_STRING(f_time)),
+              HEX(WEIGHT_STRING(f_datetime)) FROM t3;
+
+--echo #Once the old temporal type is upgraded to new temporal type,
+--echo #ADD/CHANGE COLUMN, ADD INDEX operations succeed using INPLACE
+--echo #ALGORITHM.
+
+ALTER TABLE t2 ADD COLUMN fld5 INT, ALGORITHM= INPLACE;
+
+ALTER TABLE t2 ADD INDEX index2(fld5), ALGORITHM= INPLACE;
+
+ALTER TABLE t2 CHANGE fld5 fld6 INT, ALGORITHM= INPLACE;
+
+ALTER TABLE t2 MODIFY fld6 INT, ALGORITHM= INPLACE;
+
+--echo #Cleanup
+DROP TABLE t2, t3;
+
+
+--echo #
+--echo # BUG 18985760 -"FAST" ALTER TABLE CHANGE ON ENUM COLUMN 
+--echo #                TRIGGERS FULL TABLE REBUILD.
+--echo #   
+
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+--copy_file std_data/55_temporal.frm $MYSQLD_DATADIR/test/t1.frm
+--copy_file std_data/55_temporal.MYD $MYSQLD_DATADIR/test/t1.MYD
+--copy_file std_data/55_temporal.MYI $MYSQLD_DATADIR/test/t1.MYI
+
+--echo # To support INPLACE ALTER table operations later in the test.
+ALTER TABLE t1 ENGINE= INNODB;
+
+--echo #Test cases with the global variable 'avoid_temporal_upgrade'
+--echo #enabled.
+
+SET @save_avoid_temporal_upgrade= @@global.avoid_temporal_upgrade;
+SET GLOBAL avoid_temporal_upgrade= ON;
+
+--echo #ALTER operations using INPLACE algorithm are allowed
+--echo #when the table contains old temporal type since
+--echo #the global variable 'avoid_temporal_upgrade' is
+--echo #enabled. The old temporal types are not upgraded. 
+
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= INPLACE;
+SELECT f_time, f_datetime, f_timestamp, fld4, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)),
+       HEX(WEIGHT_STRING(fld4)) FROM t2;
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld5 TIME DEFAULT '101010' FIRST, ALGORITHM= INPLACE;
+SELECT f_time, f_datetime, f_timestamp, fld5, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)),
+       HEX(WEIGHT_STRING(fld5)) FROM t2;
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld6 TIMESTAMP AFTER f_timestamp, ALGORITHM= INPLACE;
+SELECT f_time, f_datetime, f_timestamp, fld6, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)),
+       HEX(WEIGHT_STRING(fld6)) FROM t2;
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD INDEX index1(f_datetime), ALGORITHM= INPLACE;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ALTER operations using COPY algorithm are allowed
+--echo #when the table contains old temporal type and 
+--echo #does not upgrade the old temporal types.
+
+--echo #ADD COLUMN does not upgrade the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #ADD COLUMN FIRST does not upgrade the old temporal type.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld5 TIMESTAMP FIRST, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #ADD COLUMN AFTER does not upgrade the old temporal type.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld6 TIMESTAMP AFTER f_timestamp, ALGORITHM= COPY;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #CHANGE COLUMN upgrades the old temporal type only for the column which
+--echo #is changed.
+#Setup table having old temporal type.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 CHANGE COLUMN f_datetime fld7 DATETIME, ALGORITHM= COPY;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+              HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #MODIFY COLUMN upgrades the old temporal type only for the column
+--echo #modified.
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 MODIFY f_timestamp DATETIME, ALGORITHM= COPY;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #ADD INDEX does not upgrade the old temporal type.
+#Setup table having old temporal type.
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD INDEX index1(f_time), ALGORITHM= COPY;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ALTER operations using DEFAULT algorithm are allowed
+--echo #when the table contains old temporal type and does not
+--echo #upgrade the old temporal types.
+
+--echo #ADD COLUMN does not upgrade the old temporal type.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld4 TIMESTAMP, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #ADD COLUMN FIRST does not upgrade the old temporal type.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld5 TIMESTAMP FIRST, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #ADD COLUMN AFTER does not upgrade the old temporal type.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD COLUMN fld6 TIMESTAMP AFTER f_timestamp, ALGORITHM= DEFAULT;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #CHANGE COLUMN upgrades the old temporal type only for the column which
+--echo #is changed.
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 CHANGE COLUMN f_datetime fld7 DATETIME, ALGORITHM= DEFAULT;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #MODIFY COLUMN upgrades the old temporal type only for the column
+--echo #modified.
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 MODIFY f_timestamp DATETIME, ALGORITHM= DEFAULT;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+
+--echo #ADD INDEX does not upgrade the old temporal type.
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 ADD INDEX index1(f_time), ALGORITHM= DEFAULT;
+SELECT f_time, fld7, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(fld7)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+--echo #ALTER TABLE FORCE does not upgrade the old temporal types.
+#Setup table having old temporal type.
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES ('22:22:22','2011-11-21 22:22:22','2011-11-21 22:22:22');
+
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+ALTER TABLE t2 FORCE;
+SELECT f_time, f_datetime, f_timestamp, HEX(WEIGHT_STRING(f_time)),
+       HEX(WEIGHT_STRING(f_datetime)), HEX(WEIGHT_STRING(f_timestamp)) FROM t2;
+DROP TABLE t2;
+
+SET @@global.avoid_temporal_upgrade= @save_avoid_temporal_upgrade;
+
+--echo #Test cases with the session variable 'show_old_temporals'
+--echo #enabled.
+
+--echo #Setup
+CREATE TABLE t2(fld1 time, fld2 datetime, fld3 timestamp);
+SET @save_show_old_temporals= @@session.show_old_temporals;
+SET SESSION show_old_temporals= ON;
+
+--echo #Displays a comment to indicate that the columns are of 5.5
+--echo #binary format
+SHOW CREATE TABLE t1;
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+
+--echo #Since the temporal types are in new format, no comment is 
+--echo #displayed
+SHOW CREATE TABLE t2;
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t2';
+
+--echo #Does not display the comment for table with old temporal types 
+--echo #since the session variable 'show_old_temporals' is OFF.
+SET SESSION show_old_temporals= OFF;
+SHOW CREATE TABLE t1;
+SELECT COLUMN_TYPE FROM information_schema.columns WHERE table_name='t1';
+
+--echo #Cleanup
+SET @@session.show_old_temporals= @save_show_old_temporals;
+DROP TABLE t1, t2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/audit_plugin.test percona-xtrabackup-2.3.7/mysql-test/t/audit_plugin.test
--- percona-xtrabackup-2.2.3/mysql-test/t/audit_plugin.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/audit_plugin.test	2017-02-27 07:47:02.000000000 +0000
@@ -18,7 +18,7 @@
 let $expected_calls= 21;
 if(`SELECT $PS_PROTOCOL > 0`)
 {
-   let $expected_calls= 46;
+   let $expected_calls= 47;
 }
 if(`SELECT $SP_PROTOCOL > 0`)
 {
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/bug17076131-master.opt percona-xtrabackup-2.3.7/mysql-test/t/bug17076131-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/t/bug17076131-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/bug17076131-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2 @@
+--no-console
+--log-error=$MYSQLTEST_VARDIR/tmp/mysql.err
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/bug17076131.test percona-xtrabackup-2.3.7/mysql-test/t/bug17076131.test
--- percona-xtrabackup-2.2.3/mysql-test/t/bug17076131.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/bug17076131.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,28 @@
+--echo #
+--echo # Bug#17076131 MYSQLDUMP FAILS WHEN ERR LOG ON RUNNING SERVER IS
+--echo #              DELETED ON WINDOWS
+--echo #
+
+--source include/not_embedded.inc
+
+--echo # Creating file aliases.
+let $dump_with_err_log=$MYSQLTEST_VARDIR/tmp/bug17076131_with_err_log.sql;
+let $dump_without_err_log=$MYSQLTEST_VARDIR/tmp/bug17076131_without_err_log.sql;
+
+--echo # Executing mysqldump normally.
+--exec $MYSQL_DUMP --extended-insert --flush-logs --add-drop-database --add-drop-table  --force --databases --skip-dump-date mysql  > $dump_with_err_log
+
+--echo # Removing Error_log file.
+--remove_file $MYSQLTEST_VARDIR/tmp/mysql.err
+
+--echo # Executing mysqldump after deleting error_log file.
+--exec $MYSQL_DUMP --extended-insert --flush-logs --add-drop-database --add-drop-table  --force --databases --skip-dump-date mysql  > $dump_without_err_log
+
+--echo # Checking diff of the 2 dumps.
+--diff_files $dump_with_err_log $dump_without_err_log
+--echo # No Difference found.
+
+--echo # Clean Up.
+--remove_file $dump_with_err_log
+--remove_file $dump_without_err_log
+--echo # End of Test.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/check_auto_permission.test percona-xtrabackup-2.3.7/mysql-test/t/check_auto_permission.test
--- percona-xtrabackup-2.2.3/mysql-test/t/check_auto_permission.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/check_auto_permission.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,60 @@
+#############################################################################
+# Bug#17786581:SERVER WRITES INTO WORLD-WRITEABLE FILE EVEN AFTER WARNING ABOUT
+# IT.
+#
+# Problem:
+# ========
+# UUID exists in a file named "auto.cnf", make this auto.cnf  file as world
+# writable. The server starts, and it sees the auto.cnf is world writable and
+# writes a following warning:
+#
+# Warning: World-writable con-fig file './auto.cnf' is ignored
+#
+# A new UUID is generated and the new UUID is once again  written to the same
+# world writable file which is not safe.
+#
+# Test:
+# =====
+# During the execution of the script change file permissions of 'auto.cnf' to
+# 777. Restart the server and check that the newly generated 'auto.cnf' file
+# has valid 660 file permissions.
+###############################################################################
+# Run only on Linux:Since file permissions vary from one os to the other
+# we execute this script only on linux to avoid test failures.
+--source include/linux.inc
+# include/restart_mysqld.inc does not work in embedded mode
+--source include/not_embedded.inc
+
+CALL mtr.add_suppression("World-writable config file './auto.cnf' is ignored");
+CALL mtr.add_suppression("World-writable config file './auto.cnf' has been removed.");
+
+# Change file permissions to world writable
+--let $MYSQL_DATA_DIR=`select @@datadir`
+--let _INPUT_FILE_=$MYSQL_DATA_DIR/auto.cnf
+--let _FILE_PERMS_=0777
+--source include/change_file_perms.inc
+
+# Restart the server
+--source include/restart_mysqld.inc
+
+# Check that it has 660 valid permissions.
+--perl
+ use strict;
+ my $input_file= $ENV{'_INPUT_FILE_'};
+ my $mode = (stat($input_file))[2];
+ open(FILE, ">", "$ENV{MYSQL_TMP_DIR}/permissions.inc") or die;
+ my $perm= $mode & 07777;
+ print FILE "let \$FILE_PERMISSIONS= $perm;\n";
+ close FILE;
+EOF
+
+--source $MYSQL_TMP_DIR/permissions.inc
+--remove_file $MYSQL_TMP_DIR/permissions.inc
+
+--let $assert_cond= $FILE_PERMISSIONS= 432
+--let $assert_text= File permissions should be equl to decimal 432(i.e octal 660).
+--source include/assert.inc
+
+# Clear
+--let _FILE_PERMS_=
+--let _INPUT_FILE_=
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/count_distinct.test percona-xtrabackup-2.3.7/mysql-test/t/count_distinct.test
--- percona-xtrabackup-2.2.3/mysql-test/t/count_distinct.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/count_distinct.test	2017-02-27 07:47:02.000000000 +0000
@@ -107,3 +107,143 @@
 select count(distinct i) from v1;
 drop table t1;
 drop view v1;
+
+--echo #
+--echo # Bug#11760197: INCORRECT RESULTS WITH COUNT DISTINCT AND BIG_TABLES
+--echo #
+
+CREATE TABLE t1 (a INT PRIMARY KEY);
+INSERT INTO t1 VALUES (1),(2);
+SET @big_tables_save= @@big_tables;
+SET SESSION big_tables=0;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+SET SESSION big_tables=1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+DROP TABLE  t1;
+
+CREATE TABLE t1 (a BLOB ,PRIMARY KEY(a(10)));
+INSERT INTO t1 VALUES (1),(2);
+SET SESSION big_tables=0;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = '1';
+SET SESSION big_tables=1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = '1';
+DROP TABLE  t1;
+
+CREATE TABLE t1 (a CHAR PRIMARY KEY);
+INSERT INTO t1 VALUES (1),(2);
+SET SESSION big_tables=0;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = '1';
+SET SESSION big_tables=1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = 1;
+SELECT COUNT(DISTINCT t1.a) FROM t1,t1 t2 WHERE t1.a = '1';
+SET SESSION big_tables= @big_tables_save;
+DROP TABLE  t1;
+
+--echo #
+--echo # BUG#17607155: ASSERTION FAILED: 
+--echo #               ((ITEM_RESULT_FIELD*)ITEM)->RESULT_FIELD
+--echo #
+
+CREATE TABLE t (a INT)ENGINE=INNODB;
+INSERT t VALUES(1);
+SELECT '' FROM t GROUP BY 1 WITH ROLLUP HAVING GROUP_CONCAT('');
+DROP TABLE t;
+
+--echo #
+--echo # BUG#17957913: ASSERTION `((ITEM_RESULT_FIELD*)ITEM)->RESULT_FIELD'
+--echo #               FAILS IN CREATE_TMP_FIELD
+--echo #
+
+CREATE TABLE t1 ( i INT );
+INSERT INTO t1 VALUES (1),(2);
+SELECT GROUP_CONCAT(i,'foo') AS f1 FROM t1 GROUP BY 'a' WITH ROLLUP;
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #17555462: SELECT DISTINCT OF VIEW WITH CONSTANT STRING
+--echo #                RETURNS WRONG RESULT
+--echo #
+
+CREATE TABLE t (x char(3));
+INSERT INTO t VALUES ('foo'), ('bar'); 
+CREATE VIEW v AS SELECT 'x' AS x FROM t;
+SELECT DISTINCT x FROM v;
+
+DROP TABLE t;
+DROP VIEW v;
+
+--echo #
+--echo # Bug #17634335 SELECT DISTINCT...GROUP BY RETURNS WRONG
+--echo #               RESULTS IN SOME CASES
+--echo #
+
+CREATE TABLE t1 (
+a int(11) DEFAULT NULL,
+b int(11) DEFAULT NULL,
+c int(11) DEFAULT NULL
+) ENGINE=InnoDB;
+
+INSERT INTO t1
+VALUES (1,1,1),(1,2,1),(1,3,0),
+       (1,4,0),(2,1,1),(2,2,1),(2,3,0),(2,4,0);
+SELECT DISTINCT a, b
+FROM (SELECT * FROM t1 ORDER BY a, b) AS f
+GROUP BY a,c;
+SELECT DISTINCT a, b, 0
+FROM (SELECT * FROM t1 ORDER BY a, b) AS f
+GROUP BY a,c;
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #18853696 WRONG RESULT FOR COUNT DISTINCT OF RESULT 
+--echo #               OF JOINED DERIVED TABLE
+--echo #
+
+CREATE TABLE t1 (
+pk INT NOT NULL,
+col_varchar_key VARCHAR(1),
+col_varchar_nokey VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key)
+);
+
+INSERT INTO t1 VALUES (10,'x','x');
+INSERT INTO t1 VALUES (11,'d','d');
+INSERT INTO t1 VALUES (12,'r','r');
+INSERT INTO t1 VALUES (13,'f','f');
+INSERT INTO t1 VALUES (14,'y','y');
+
+CREATE TABLE t2 (
+pk INT NOT NULL,
+col_int_nokey INT,
+col_varchar_key VARCHAR(1),
+PRIMARY KEY (pk),
+KEY col_varchar_key (col_varchar_key)
+);
+
+INSERT INTO t2 VALUES (1,7,'x');
+
+SELECT COUNT( DISTINCT table1.col_varchar_key )
+FROM t2 AS table1
+JOIN (SELECT * FROM t1) AS table2
+ON ( table2.pk = table1.col_int_nokey )
+WHERE table1.pk = 1;
+
+SELECT COUNT( DISTINCT table1.col_varchar_key )
+FROM t2 AS table1
+JOIN t1 AS table2
+ON ( table2.pk = table1.col_int_nokey )
+WHERE table1.pk = 1;
+
+SELECT COUNT( table1.col_varchar_key )
+FROM t2 AS table1
+JOIN (SELECT * FROM t1) AS table2
+ON ( table2.pk = table1.col_int_nokey )
+WHERE table1.pk = 1;
+
+DROP TABLE t1,t2;
+
+--echo # End of test for Bug#18853696
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/ctype_cp932.test percona-xtrabackup-2.3.7/mysql-test/t/ctype_cp932.test
--- percona-xtrabackup-2.2.3/mysql-test/t/ctype_cp932.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/ctype_cp932.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,29 @@
+-- source include/have_cp932.inc
+--echo #
+--echo # Bug #11755818 LIKE DOESN'T MATCH WHEN CP932_BIN/SJIS_BIN COLLATIONS ARE 
+--echo #               USED.
+--echo #
+
+SET @old_character_set_client= @@character_set_client;
+SET @old_character_set_connection= @@character_set_connection;
+SET @old_character_set_results= @@character_set_results;
+SET character_set_client= 'utf8';
+SET character_set_connection= 'utf8';
+SET character_set_results= 'utf8';
+
+CREATE TABLE t1 (a VARCHAR(10) COLLATE cp932_bin);
+INSERT INTO t1 VALUES('ｶｶ');
+SELECT * FROM t1 WHERE a LIKE '%ｶ';
+SELECT * FROM t1 WHERE a LIKE '_ｶ';
+SELECT * FROM t1 WHERE a LIKE '%_ｶ';
+
+ALTER TABLE t1 MODIFY a VARCHAR(100) COLLATE sjis_bin;
+SELECT * FROM t1 WHERE a LIKE '%ｶ';
+SELECT * FROM t1 WHERE a LIKE '_ｶ';
+SELECT * FROM t1 WHERE a LIKE '%_ｶ';
+DROP TABLE t1;
+
+## Reset to initial values
+SET @@character_set_client= @old_character_set_client;
+SET @@character_set_connection= @old_character_set_connection;
+SET @@character_set_results= @old_character_set_results;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/derived.test percona-xtrabackup-2.3.7/mysql-test/t/derived.test
--- percona-xtrabackup-2.2.3/mysql-test/t/derived.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/derived.test	2017-02-27 07:47:02.000000000 +0000
@@ -1370,3 +1370,134 @@
 DROP TABLE t2, t1;
 
 --echo # End of test for Bug #17814492
+
+
+--echo #
+--echo # Bug #18607971 : 5.5 TO 5.6 REGRESSION WITH A SUBQUERY IN THE FROM
+--echo #                 CLAUSE.
+--echo #
+
+CREATE TABLE t(id INT PRIMARY KEY,
+               c1 INT, c2 INT, key(c2)) engine=InnoDB;
+INSERT INTO t(id, c1, c2) VALUES(1, 2, 3), (2, 3, 4), (3, 3, 4), (4, 3, 4);
+
+ANALYZE TABLE t;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.c1
+              FROM t t1 INNER JOIN t t2 ON t1.c1= 3
+              GROUP BY t1.c1) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.id
+              FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.id
+              GROUP BY t1.id, t2.c2) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.c1
+              FROM t t1 INNER JOIN t t2 ON t1.c1= 3 AND t2.c2= 3
+              GROUP BY t1.c1) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.c1
+              FROM t t1 INNER JOIN t t2 ON t1.c1= 3 AND t2.c2= 3
+              GROUP BY t1.c1, t2.c2) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.c1
+              FROM t t1 INNER JOIN t t2 ON t1.c1= 3 AND t2.c2= 3
+              GROUP BY t1.c1, t1.id) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.id
+              FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.c1
+              GROUP BY t2.c1, t1.id) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.id
+              FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.id
+              GROUP BY t2.c1, t1.id) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.id
+              FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.id
+              GROUP BY t2.c2, t1.id) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.id
+              FROM t t1 INNER JOIN t t2 ON t1.id=1 AND t1.c1=t2.id
+              GROUP BY t1.id, t2.c2) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.id
+              FROM t t1 INNER JOIN t t2 INNER JOIN t t3 ON t1.id=1 AND t1.c1=t2.id AND t2.c1=t3.id
+              GROUP BY t1.id, t2.c2, t3.c2) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+#distinct
+EXPLAIN SELECT * FROM
+             (SELECT DISTINCT t1.id
+              FROM t t1
+              WHERE t1.id= 1) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+#group by with expression.
+EXPLAIN SELECT * FROM
+             (SELECT t1.id + 1
+              FROM t t1 INNER JOIN t t2 ON t1.id= 1
+              GROUP BY t1.id + 1) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.c1
+              FROM t t1 INNER JOIN t t2 ON t1.c1= 3
+              GROUP BY 1.5) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.id
+              FROM t t1 INNER JOIN t t2 ON mod(t1.id,1000)= 1
+              GROUP BY t1.id) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM
+             (SELECT t1.id + 1
+              FROM t t1 INNER JOIN t t2 ON t1.id + 1= 2
+              GROUP BY t1.id + 1) a, t b
+             WHERE b.id BETWEEN 1 AND 10;
+
+#Test view ref in group by.
+
+CREATE VIEW v1 AS SELECT c1 a FROM t WHERE c1 = 3;
+CREATE VIEW v2 AS SELECT c2 b FROM t WHERE c2 > 3;
+EXPLAIN SELECT * FROM (SELECT v1.a
+               FROM v1 LEFT OUTER JOIN v2 ON v1.a = v2.b
+               GROUP BY v1.a) p, t q
+               WHERE q.id BETWEEN 1 AND 10;
+
+DROP VIEW v1;
+CREATE VIEW v1 AS SELECT c1 a FROM t;
+
+EXPLAIN SELECT * FROM (SELECT v1.a
+               FROM v1 LEFT OUTER JOIN v2 ON v1.a = v2.b AND v1.a = 10
+               GROUP BY v1.a) p, t q
+               WHERE q.id BETWEEN 1 AND 10;
+
+EXPLAIN SELECT * FROM (SELECT v1.a
+               FROM v1 LEFT OUTER JOIN v2 ON v1.a = v2.b
+               WHERE v1.a = 3
+               GROUP BY v1.a) p, t q
+               WHERE q.id BETWEEN 1 AND 10;
+
+DROP VIEW v1, v2;
+DROP TABLE t;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/dynamic_tracing.test percona-xtrabackup-2.3.7/mysql-test/t/dynamic_tracing.test
--- percona-xtrabackup-2.2.3/mysql-test/t/dynamic_tracing.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/dynamic_tracing.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,152 @@
+# This scripts checks dtrace probes provided by mysqld using real dtrace tool
+# and systemtap.
+--source include/not_windows.inc
+
+--let OUTPUT_FILENAME= $MYSQLTEST_VARDIR/tmp/output.txt
+--let MYSQLD_PIDFILE= `SELECT @@pid_file`
+--let MYSQLD= $MYSQLD
+--let SCRIPT_OUTPUT_FILE= $MYSQLTEST_VARDIR/tmp/script_output.txt
+
+--perl
+  my $pid_filename = $ENV{'MYSQLD_PIDFILE'};
+  my $output_filename = $ENV{'OUTPUT_FILENAME'};
+  my $mysqld = $ENV{'MYSQLD'};
+
+  my $mysqld_pid = 0;
+  my $dyn_trace_tool_available = 0;
+  my $user_has_permissions = 0;
+  my $mysqld_has_dtrace_probes = 0;
+  my $command = "";
+  my $ret;
+
+# Check whether Dtrace tool exists or not. If exists then capture its output.
+  $ret = `dtrace -V 2>&1`;
+  if ($? == 0)
+  {
+    if (($ret =~ m/Sun D/) || ($ret =~ m/Oracle D/))
+    {
+      $dyn_trace_tool_available = 1;
+
+      # Check whether user has Dtrace tool execution permission or not	
+      $ret = `dtrace -v 2>&1`;
+      if (!($ret =~ m/DTrace requires additional privileges/))		
+      {
+        $user_has_permissions = 1;
+
+        $mysqld_pid= `cat $pid_filename`; 
+        chomp($mysqld_pid); 		
+
+        # Check whether MySQL Dtrace providers exists or not.
+        $ret=`dtrace -l -p $mysqld_pid |
+          egrep -ci \"net-read-done|connection-start|query-parse-start\"`;
+        if ($ret != 0)
+        {
+          $mysqld_has_dtrace_probes = 1;
+          $command = "dtrace -s \$MYSQL_TEST_DIR/std_data/dtrace.d ";
+        }
+      }
+    }
+  }
+  else
+  {
+    # check whether stap tool exists or not.
+    $ret= `stap 2>&1`;
+    if ($ret == 0)
+    {
+      $dyn_trace_tool_available= 1;
+
+      # Check whether user has permission to run stap.
+      $ret= `stap -e 'probe process("ls").function("main") { exit() }'
+             -c ls 2>&1|egrep -ic "You should be part of the group \"stapusr"`; 
+
+      # Check whether user has permission to run staprun or not. 
+      if ($ret == 0)
+      {
+        $ret= `staprun 2>&1|egrep -ic "Permission denied"`;
+      }
+      if ($ret == 0)
+      {
+        $user_has_permissions= 1;
+
+        # Check whether MySQL stap markers are available or not.
+        $ret= `stap -L 'process("$mysqld").mark("*")'|
+          egrep -ci \"net__read__done|connection__start|query__parse__start\"`; 
+          if ($ret != 0)
+          {
+            $mysqld_has_dtrace_probes = 1;
+            $command= "stap \$MYSQL_TEST_DIR/std_data/system_tap.stp $mysqld ";
+          }
+      }
+    }
+  }
+
+  # Write output to file.
+  open(FILE, ">> $output_filename");
+  print FILE "--let \$DYN_TRACE_TOOL_AVAILABLE= $dyn_trace_tool_available\n";
+  print FILE "--let \$USER_HAS_PERMISSIONS= $user_has_permissions\n";
+  print FILE "--let \$MYSQLD_HAS_DTRACE_PROBES= $mysqld_has_dtrace_probes\n";
+  print FILE "--let COMMAND= $command\n";
+  close(FILE);
+EOF
+
+source $OUTPUT_FILENAME;
+
+if (!$DYN_TRACE_TOOL_AVAILABLE)
+{
+  --skip Real DTrace or System tap tool is required to run this test.
+}
+
+if (!$USER_HAS_PERMISSIONS)
+{
+  --skip dtrace/stap tool requires additional privileges to run this test.
+}
+
+if (!$MYSQLD_HAS_DTRACE_PROBES)
+{
+  --skip MySQLD does not have MySQL probes.
+}
+
+--disable_result_log
+DELIMITER $;
+
+CREATE PROCEDURE create_table_and_insert_rows()
+BEGIN
+  DECLARE count INT;
+  SET count = 1;
+
+  SELECT SLEEP(10);
+  CREATE TABLE t1 (f1 INT);
+  INSERT INTO t1 VALUES (7894);
+  WHILE count <= 5 DO
+    INSERT INTO t1 SELECT * FROM t1;
+    SET count = count + 1;
+  END WHILE;
+
+  SET count = 1;
+  WHILE count <= 10000 DO
+    SELECT SQL_NO_CACHE count(*) from t1;
+    SET count = count + 1;
+  END WHILE;
+END
+$
+
+DELIMITER ;$
+
+# Running Dtrace script in background.
+--perl
+   system("$ENV{'COMMAND'} >$ENV{'SCRIPT_OUTPUT_FILE'} 2>&1 &"); 
+EOF
+
+CALL create_table_and_insert_rows();
+# Waiting for few secs to allow Dtrace to write all trace output to file.
+SELECT SLEEP(4);
+--enable_result_log
+
+# Dtrace output
+--exec cat $SCRIPT_OUTPUT_FILE
+
+# Cleanup
+--remove_file $OUTPUT_FILENAME
+--remove_file $SCRIPT_OUTPUT_FILE
+DROP TABLE t1;
+DROP PROCEDURE create_table_and_insert_rows;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/file_contents.test percona-xtrabackup-2.3.7/mysql-test/t/file_contents.test
--- percona-xtrabackup-2.2.3/mysql-test/t/file_contents.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/file_contents.test	2017-02-27 07:47:02.000000000 +0000
@@ -17,13 +17,17 @@
   $dir_docs =~ s|/lib|/share/doc|;
   if(-d "$dir_docs/packages") {
     # SuSE: "packages/" in the documentation path
-    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
+    $dir_docs = glob "$dir_docs/packages/*-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";
     if (! -d "$dir_docs") {
       # If not it might be ULN so try that
-      $dir_docs = glob "$dir_bin/share/doc/mysql-community-server*";
+      $dir_docs = glob "$dir_bin/share/doc/mysql-*-server*";
+      if (! -f "$dir_docs/INFO_BIN") {
+        # Debian/ Ubuntu
+        $dir_docs = glob "$dir_bin/share/mysql/docs";
+      }
     }
   }
 } elsif ($dir_bin =~ m|/usr$|) {
@@ -31,17 +35,21 @@
   $dir_docs = "$dir_bin/share/doc";
   if(-d "$dir_docs/packages") {
     # SuSE: "packages/" in the documentation path
-    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
+    $dir_docs = glob "$dir_docs/packages/*-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";
     if (! -d "$dir_docs") {
       # If not it might be ULN so try that
-      $dir_docs = glob "$dir_bin/share/doc/mysql-community-server*";
+      $dir_docs = glob "$dir_bin/share/doc/mysql-*-server*";
+      if (! -f "$dir_docs/INFO_BIN") {
+        # Debian/ Ubuntu
+        $dir_docs = glob "$dir_bin/share/mysql/docs";
+      }
     }
   }
 } else {
-  # tar.gz package, Windows, or developer work (in BZR)
+  # tar.gz package, Windows, or developer work (in git)
   $dir_docs = $dir_bin;
   $dir_docs =~ s|/lib||;
   if(-d "$dir_docs/docs") {
@@ -55,7 +63,7 @@
 open(I_SRC,"<","$dir_docs/INFO_SRC") or print "Cannot open 'INFO_SRC' in '$dir_docs' (starting from bindir '$dir_bin')\n";
 while(defined ($line = <I_SRC>)) {
   if ($line =~ m|^MySQL source \d\.\d\.\d+|) {$found_version = "Found MySQL version number";}
-  if ($line =~ m|^revision-id: .*@.*-2\d{13}-\w+$|) {$found_revision = "Found BZR revision id";}
+  if ($line =~ m|^commit: \w{40}$|) {$found_revision = "Found GIT revision id";}
 }
 close I_SRC;
 print "INFO_SRC: $found_version / $found_revision\n";
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/group_min_max_innodb.test percona-xtrabackup-2.3.7/mysql-test/t/group_min_max_innodb.test
--- percona-xtrabackup-2.2.3/mysql-test/t/group_min_max_innodb.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/group_min_max_innodb.test	2017-02-27 07:47:02.000000000 +0000
@@ -138,3 +138,122 @@
 DROP TABLE t1;
 
 --echo End of 5.5 tests
+
+--echo #
+--echo # Bug#17909656 - WRONG RESULTS FOR A SIMPLE QUERY WITH GROUP BY
+--echo #
+
+CREATE TABLE t0 (
+  i1 INTEGER NOT NULL
+);
+
+INSERT INTO t0 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
+                      (11),(12),(13),(14),(15),(16),(17),(18),(19),(20),
+                      (21),(22),(23),(24),(25),(26),(27),(28),(29),(30);
+
+CREATE TABLE t1 (
+  c1 CHAR(1) NOT NULL,
+  i1 INTEGER NOT NULL,
+  i2 INTEGER NOT NULL,
+  UNIQUE KEY k1 (c1,i2)
+) ENGINE=InnoDB;
+
+INSERT INTO t1 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'F',i1,i1 FROM t0;
+                 
+CREATE TABLE t2 (
+  c1 CHAR(1) NOT NULL,
+  i1 INTEGER NOT NULL,
+  i2 INTEGER NOT NULL,
+  UNIQUE KEY k2 (c1,i1,i2)
+) ENGINE=InnoDB;
+
+INSERT INTO t2 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'F',i1,i1 FROM t0;
+
+-- disable_result_log
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+-- enable_result_log
+
+let $DEFAULT_TRACE_MEM_SIZE=1048576; # 1MB
+eval set optimizer_trace_max_mem_size=$DEFAULT_TRACE_MEM_SIZE;
+set @@session.optimizer_trace='enabled=on';
+set end_markers_in_json=on;
+let $show_method=
+SELECT TRACE RLIKE 'minmax_keypart_in_disjunctive_query'
+AS OK FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+
+let query=
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
+GROUP BY c1;
+--replace_column 9 ROWS
+eval EXPLAIN $query;
+eval $query;
+eval $show_method;
+
+let query=
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
+GROUP BY c1;
+--replace_column 9 ROWS
+eval EXPLAIN $query;
+eval $query;
+eval $show_method;
+
+let query=
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
+GROUP BY c1;
+--replace_column 9 ROWS
+eval EXPLAIN $query;
+eval $query;
+eval $show_method;
+
+let query=
+SELECT c1, max(i2) FROM t1 
+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
+GROUP BY c1;
+--replace_column 9 ROWS
+eval EXPLAIN $query;
+eval $query;
+eval $show_method;
+
+let query=
+SELECT c1, i1, max(i2) FROM t2
+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
+GROUP BY c1,i1;
+--replace_column 9 ROWS
+eval EXPLAIN $query;
+eval $query;
+eval $show_method;
+
+let query=
+SELECT c1, i1, max(i2) FROM t2 
+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
+GROUP BY c1,i1;
+--replace_column 9 ROWS
+eval EXPLAIN $query;
+eval $query;
+eval $show_method;
+
+let query=
+SELECT c1, i1, max(i2) FROM t2 
+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
+GROUP BY c1,i1;
+--replace_column 9 ROWS
+eval EXPLAIN $query;
+eval $query;
+eval $show_method;
+
+SET optimizer_trace_max_mem_size=DEFAULT;
+SET optimizer_trace=DEFAULT;
+SET end_markers_in_json=DEFAULT;
+
+DROP TABLE t0,t1,t2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/group_min_max.test percona-xtrabackup-2.3.7/mysql-test/t/group_min_max.test
--- percona-xtrabackup-2.2.3/mysql-test/t/group_min_max.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/group_min_max.test	2017-02-27 07:47:02.000000000 +0000
@@ -1244,3 +1244,47 @@
 drop table t1;
 --echo # End of test#50539.
 
+--echo #
+--echo # Bug#17217128 -  BAD INTERACTION BETWEEN MIN/MAX AND
+--echo #                 "HAVING SUM(DISTINCT)": WRONG RESULTS.
+--echo #
+
+CREATE TABLE t (a INT, b INT, KEY(a,b));
+INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5);
+let $DEFAULT_TRACE_MEM_SIZE=1048576; # 1MB
+eval set optimizer_trace_max_mem_size=$DEFAULT_TRACE_MEM_SIZE;
+set @@session.optimizer_trace='enabled=on';
+set end_markers_in_json=on;
+
+ANALYZE TABLE t;
+
+SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+  FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+
+SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+EXPLAIN SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+  FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+
+SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+EXPLAIN SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+  FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+
+SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+EXPLAIN SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+  FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+
+SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+SELECT TRACE RLIKE 'have_both_agg_distinct_and_min_max' AS OK
+  FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+
+SET optimizer_trace_max_mem_size=DEFAULT;
+SET optimizer_trace=DEFAULT;
+SET end_markers_in_json=DEFAULT;
+
+DROP TABLE t;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/information_schema.test percona-xtrabackup-2.3.7/mysql-test/t/information_schema.test
--- percona-xtrabackup-2.2.3/mysql-test/t/information_schema.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/information_schema.test	2017-02-27 07:47:02.000000000 +0000
@@ -1838,6 +1838,23 @@
 drop database mysqltest;
 use test;
 
+--echo #
+--echo # Test for bug #16869534 - "QUERYING SUBSET OF COLUMNS DOESN'T USE TABLE
+--echo #                           CACHE; OPENED_TABLES INCREASES"
+--echo #
+--disable_result_log
+SELECT * FROM INFORMATION_SCHEMA.TABLES;
+--enable_result_log
+SELECT VARIABLE_VALUE INTO @val1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+  VARIABLE_NAME LIKE 'Opened_tables';
+--disable_result_log
+SELECT ENGINE FROM INFORMATION_SCHEMA.TABLES;
+--enable_result_log
+--echo # The below SELECT query should give same output as above SELECT query.
+SELECT VARIABLE_VALUE INTO @val2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+  VARIABLE_NAME LIKE 'Opened_tables';
+--echo # The below select should return '1'
+SELECT @val1 = @val2;
 
 --echo #
 --echo # End of 5.5 tests
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/innodb_recovery_with_upper_case_names-master.opt percona-xtrabackup-2.3.7/mysql-test/t/innodb_recovery_with_upper_case_names-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/t/innodb_recovery_with_upper_case_names-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/innodb_recovery_with_upper_case_names-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--innodb-fast-shutdown=2
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/innodb_recovery_with_upper_case_names.test percona-xtrabackup-2.3.7/mysql-test/t/innodb_recovery_with_upper_case_names.test
--- percona-xtrabackup-2.2.3/mysql-test/t/innodb_recovery_with_upper_case_names.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/innodb_recovery_with_upper_case_names.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,63 @@
+--echo Bug #18412598  UNCLEAN SYSTEM SHUTDOWN RECOVERY FAILS
+--echo		      FOR SCHEMA WITH CAPITAL LETTERS
+
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+--source include/have_case_insensitive_file_system.inc
+
+# Start the server with innodb-fast-shutdown=2,so that
+# during next invocation of server it enters crash
+# recovery mode
+
+create database MYDB;
+USE MYDB;
+CREATE TABLE mytable (id int primary key) ENGINE=innodb;
+CREATE TABLE FOO (id int,constraint FOREIGN KEY (id) REFERENCES mytable(id) ON DELETE CASCADE) ENGINE=innodb;
+CREATE TABLE mytable_ref (id int,constraint FOREIGN KEY (id) REFERENCES FOO(id) ON DELETE CASCADE) ENGINE=innodb;
+
+INSERT INTO mytable VALUES (10),(20),(30),(40);
+INSERT INTO FOO VALUES (20),(10);
+INSERT INTO mytable_ref VALUES (20),(10);
+
+SHOW VARIABLES LIKE 'innodb_fast_shutdown';
+
+START TRANSACTION;
+
+INSERT INTO mytable VALUES (50);
+INSERT INTO FOO VALUES (50);
+INSERT INTO mytable_ref VALUES (50);
+
+# Stop the server
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--echo # Restart the server. This will go into crash recovery mode
+--exec echo "restart: --innodb-fast-shutdown=0 " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+USE MYDB;
+SELECT * FROM mytable;
+SELECT * FROM FOO;
+SELECT * FROM mytable_ref;
+
+DELETE FROM mytable WHERE id =10;
+
+SELECT * FROM FOO;
+SELECT * FROM mytable_ref;
+
+# Create table with mixed names,this should
+# fail in case insensitive systems
+
+--error ER_TABLE_EXISTS_ERROR
+CREATE TABLE MYtable (id int) ENGINE=innodb;
+
+--error ER_TABLE_EXISTS_ERROR
+CREATE TABLE Foo (id int) ENGINE=innodb;
+
+DROP TABLE mytable_ref,FOO;
+DROP TABLE mytable;
+use test;
+DROP DATABASE MYDB;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/loaddata.test percona-xtrabackup-2.3.7/mysql-test/t/loaddata.test
--- percona-xtrabackup-2.2.3/mysql-test/t/loaddata.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/loaddata.test	2017-02-27 07:47:02.000000000 +0000
@@ -635,3 +635,24 @@
 drop table t1;
 
 --echo End of 5.1 tests
+
+--echo #
+--echo # Bug#11759519 INFINITE HANG WITH 100% CPU USAGE WITH LOAD DATA LOCAL AND IMPORT ERRORS
+--echo #
+SET @old_mode= @@sql_mode;
+CREATE TABLE t1 (fld1 INT);
+--copy_file $EXE_MYSQL $MYSQLTEST_VARDIR/mysql
+
+SET sql_mode='strict_all_tables';
+
+--echo # Without fix, load data hangs forever.
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,1000
+eval LOAD DATA LOCAL INFILE '$MYSQLTEST_VARDIR/mysql' REPLACE INTO TABLE t1
+     FIELDS TERMINATED BY 't' LINES TERMINATED BY '';
+
+SET @@sql_mode= @old_mode;
+
+--remove_file $MYSQLTEST_VARDIR/mysql
+DROP TABLE t1;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/lock_sync.test percona-xtrabackup-2.3.7/mysql-test/t/lock_sync.test
--- percona-xtrabackup-2.2.3/mysql-test/t/lock_sync.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/lock_sync.test	2017-02-27 07:47:02.000000000 +0000
@@ -1088,6 +1088,10 @@
 connect (con1, localhost, root);
 connect (con2, localhost, root);
 
+--echo # Note: This test now provides coverage for the scenario where
+--echo # opening of table during analyze phase of OPTIMIZE TABLE
+--echo # fails (instead of original coverage for open_ltable() code).
+
 --echo # Connection con1
 connection con1;
 SET SESSION lock_wait_timeout= 1;
@@ -1100,7 +1104,7 @@
 SET DEBUG_SYNC= 'now WAIT_FOR opti_recreate';
 SET DEBUG_SYNC= 'after_lock_tables_takes_lock SIGNAL thrlock WAIT_FOR release_thrlock';
 --echo # Sending:
---send INSERT INTO t1 VALUES (3)
+--send LOCK TABLES t1 WRITE
 
 --echo # Connection default
 connection default;
@@ -1117,7 +1121,7 @@
 
 --echo # Connection con2
 connection con2;
---echo # Reaping: INSERT INTO t1 VALUES (3)
+--echo # Reaping: LOCK TABLES t1 WRITE
 --reap
 disconnect con2;
 --source include/wait_until_disconnected.inc
@@ -1187,6 +1191,113 @@
 disconnect con2;
 
 
+--echo #
+--echo #Bug#18110156: RECREATE+ANALYZE OPTIMIZE TABLE T AND ONLINE 
+--echo #              ALTER TABLE T MAY DEADLOCK
+
+CREATE TABLE t1 (fld1 INT) ENGINE=InnoDB;
+connect (con1, localhost, root);
+connect (con2, localhost, root);
+
+--enable_connect_log
+connection con1;
+SET DEBUG_SYNC= 'before_lock_tables_takes_lock SIGNAL before_thr_lock WAIT_FOR do_thr_lock EXECUTE 3';
+SET DEBUG_SYNC= 'ha_admin_open_ltable SIGNAL opti_recreate WAIT_FOR opti_analyze';
+--send OPTIMIZE TABLE t1
+
+connection con2;
+--echo # Skip thr_lock acquisition during the initial phase of OPTIMIZE TABLE
+SET DEBUG_SYNC= 'now WAIT_FOR before_thr_lock';
+SET DEBUG_SYNC= 'now SIGNAL do_thr_lock';
+--echo # Skip thr_lock acquisition during the recreate phase of OPTIMIZE TABLE
+SET DEBUG_SYNC= 'now WAIT_FOR before_thr_lock';
+SET DEBUG_SYNC= 'now SIGNAL do_thr_lock';
+SET DEBUG_SYNC= 'now WAIT_FOR opti_recreate';
+SET DEBUG_SYNC= 'alter_table_inplace_after_lock_downgrade SIGNAL lock_downgraded
+WAIT_FOR finish_alter';
+--send ALTER TABLE t1 ADD INDEX index1(fld1), ALGORITHM=INPLACE, LOCK=NONE
+
+--echo #Without the patch, the test case hangs.
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR lock_downgraded';
+SET DEBUG_SYNC= 'now SIGNAL opti_analyze';
+SET DEBUG_SYNC= 'now WAIT_FOR before_thr_lock';
+SET DEBUG_SYNC= 'now SIGNAL finish_alter';
+SET DEBUG_SYNC= 'now SIGNAL do_thr_lock';
+
+--echo #Reap: OPTIMIZE TABLE t1
+--connection con1
+--reap
+
+--echo #Reap: ALTER TABLE t1
+--connection con2
+--reap 
+--disable_connect_log
+
+--echo #Clean up.
+--connection default
+DROP TABLE t1;
+SET DEBUG_SYNC= 'RESET';
+--disconnect con2
+--disconnect con1
+
+
+--echo #
+--echo # Bug#19070633 - POSSIBLE ACCESS TO FREED MEMORY IN IS_FREE_LOCK() AND IS_USED_LOCK().
+--echo #
+
+--enable_connect_log
+
+--echo # Verifying issue for IS_FREE_LOCK() function.
+SELECT GET_LOCK("lock_19070633", 600);
+
+connect (con1, localhost, root,,);
+--echo # Waiting after getting user level lock info and releasing mutex.
+SET DEBUG_SYNC= 'after_getting_user_level_lock_info SIGNAL parked WAIT_FOR go';
+--echo # Sending: SELECT IS_FREE_LOCK("lock_19070633");
+send SELECT IS_FREE_LOCK("lock_19070633");
+
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR parked';
+SELECT RELEASE_LOCK("lock_19070633");
+--echo # Signaling connection con1 after releasing the lock.
+--echo # Without fix, accessing user level lock info in con1 would result in
+--echo # crash or valgrind issue invalid read is reported.
+SET DEBUG_SYNC= 'now SIGNAL go';
+
+connection con1;
+--echo # Reaping: SELECT IS_FREE_LOCK("lock_19070633");
+--reap
+
+connection default;
+--echo # Verifying issue for IS_USED_LOCK() function.
+SELECT GET_LOCK("lock_19070633", 600);
+
+connection con1;
+--echo # Waiting after getting user level lock info and releasing mutex.
+SET DEBUG_SYNC= 'after_getting_user_level_lock_info SIGNAL parked WAIT_FOR go';
+--echo # Sending: SELECT IS_USED_LOCK("lock_19070633");
+send SELECT IS_USED_LOCK("lock_19070633");
+
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR parked';
+SELECT RELEASE_LOCK("lock_19070633");
+--echo # Signaling connection con1 after releasing the lock.
+--echo # Without fix, accessing user level lock info in con1 would result in
+--echo # crash or valgrind issue invalid read is reported.
+SET DEBUG_SYNC= 'now SIGNAL go';
+
+connection con1;
+--echo # Reaping: SELECT IS_USED_LOCK("lock_19070633");
+--replace_column 1 #
+--reap
+
+connection default;
+SET DEBUG_SYNC= 'RESET';
+disconnect con1;
+
+--disable_connect_log
+
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.
 --source include/wait_until_count_sessions.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/log_errchk.test percona-xtrabackup-2.3.7/mysql-test/t/log_errchk.test
--- percona-xtrabackup-2.2.3/mysql-test/t/log_errchk.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/log_errchk.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,65 @@
+#
+--source include/not_windows.inc
+--source include/force_restart.inc
+--source include/not_embedded.inc
+
+# 
+# Bug#14757009 : WHEN THE GENERAL_LOG IS A SOCKET AND THE READER GOES AWAY,
+#                MYSQL QUITS WORKING.
+#
+call mtr.add_suppression("Could not open");
+
+--let $gen_log_file= $MYSQLTEST_VARDIR/tmp/general_log.fifo
+--let $slow_query_log_file= $MYSQLTEST_VARDIR/tmp/slow_log.fifo
+--let GREP_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
+
+--exec mkfifo $gen_log_file
+--exec mkfifo $slow_query_log_file
+
+--echo # Case 1: Setting fife file to general_log_file and slow_query_log_file
+--echo #         system variable.
+# Only regular files can be set to general log. Setting fifo file to general log
+# reports an error.
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error ER_WRONG_VALUE_FOR_VAR
+--eval SET GLOBAL general_log_file="$gen_log_file";
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error ER_WRONG_VALUE_FOR_VAR
+--eval SET GLOBAL slow_query_log_file="$slow_query_log_file";
+
+--echo # Case 2: Starting server with fifo file as general log file
+--echo #         and slow query log file.
+# Restart server with fifo file as general log file.
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 60
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+# Write file to make mysql-test-run.pl start up the server again
+--exec echo "restart: --general-log-file=$gen_log_file --slow-query-log-file=$slow_query_log_file" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+# With fix error should be reported in the error log file if file is not a
+# regular file.
+--perl
+  my $file= $ENV{'GREP_FILE'};
+  my $pattern= "Turning logging off for the whole duration";
+  open(FILE, "$file") or die("Unable to open $file: $!\n");
+  my $count = 0;
+  while (<FILE>) {
+    if ($_ =~ m/$pattern/) {
+      $count++;
+      break;
+    }
+  }
+  if ($count >= 2){
+    print "Setting fifo file as general log file and slow query log failed.\n";
+  } else {
+    print "test failed.\n";
+  }
+  close(FILE);
+EOF
+
+# Cleanup
+--remove_file $gen_log_file
+--remove_file $slow_query_log_file
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/long_tmpdir-master.sh percona-xtrabackup-2.3.7/mysql-test/t/long_tmpdir-master.sh
--- percona-xtrabackup-2.2.3/mysql-test/t/long_tmpdir-master.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/long_tmpdir-master.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,5 @@
+#! /bin/bash
+
 d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789"
 test -d "$d" || mkdir "$d"
 rm -f "$d"/*
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh percona-xtrabackup-2.3.7/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh
--- percona-xtrabackup-2.2.3/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,5 @@
+#! /bin/bash
+#
 # This test requires a non-lowercase tmpdir directory on a case-sensitive
 # filesystem.
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/lowercase_mixed_tmpdir-master.sh percona-xtrabackup-2.3.7/mysql-test/t/lowercase_mixed_tmpdir-master.sh
--- percona-xtrabackup-2.2.3/mysql-test/t/lowercase_mixed_tmpdir-master.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/lowercase_mixed_tmpdir-master.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,5 @@
+#! /bin/bash
+
 # This test requires a non-lowercase tmpdir directory on a case-sensitive
 # filesystem.
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/lowercase_table4-master.opt percona-xtrabackup-2.3.7/mysql-test/t/lowercase_table4-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/t/lowercase_table4-master.opt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/lowercase_table4-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -1 +1 @@
---lower-case-table-names=2
+--lower-case-table-names=2
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/myisam.test percona-xtrabackup-2.3.7/mysql-test/t/myisam.test
--- percona-xtrabackup-2.2.3/mysql-test/t/myisam.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/myisam.test	2017-02-27 07:47:02.000000000 +0000
@@ -1745,3 +1745,73 @@
 INSERT INTO t1 VALUES(0000),(0000);
 SELECT * FROM t1 FORCE INDEX(k1) WHERE f1 = 'lhsi';
 DROP TABLE t1;
+
+--echo #
+--echo # Bug 17156940 THE UPDATE AND SELECT BEHAVE DIFFERENTLY
+--echo #              UNDER THE SAME CONDITIONS.
+--echo #
+
+CREATE TABLE t1 (
+  col1 VARCHAR(255) DEFAULT NULL,
+  col1_id INT(11) DEFAULT NULL,
+  KEY col1 (col1),
+  KEY col1_id (col1_id)
+) ENGINE=MyISAM;
+
+INSERT INTO t1 (col1, col1_id) VALUES
+  ('5cm', 10000), ('people', 10000), ('king', 10000), ('queen', 10000),
+  ('minister', 10000), ('servent', 13000);
+INSERT INTO t1 (col1, col1_id)
+  SELECT col1, col1_id FROM t1 WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_id)
+  SELECT col1, col1_id FROM t1 WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_id)
+  SELECT col1, col1_id FROM t1 WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_id) VALUES
+  ('5cm ', 10000), ('5cm ', 10000);
+SELECT col1, hex(col1), col1_id, count(*) from t1
+  WHERE col1= '5cm' GROUP BY hex(col1), col1_id;
+UPDATE t1 SET col1_id= 1414 WHERE col1= '5cm';
+SELECT count(*) FROM t1 WHERE col1= '5cm';
+SELECT count(*) FROM t1 WHERE col1_id= 1414;
+DELETE FROM t1 WHERE col1= '5cm';
+SELECT count(*) FROM t1 WHERE col1= '5cm';
+DROP TABLE t1;
+
+
+--echo # Test for multi column key.
+
+CREATE TABLE t1 (
+  col1 VARCHAR(255) DEFAULT NULL,
+  col1_dummy VARCHAR(25) DEFAULT NULL,
+  col1_id INT(11) DEFAULT NULL,
+  col1_id_dummy INT(10) DEFAULT NULL,
+
+  KEY col1 (col1, col1_dummy),
+  KEY col1_id (col1, col1_id_dummy)
+) ENGINE=MyISAM;
+
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy) VALUES
+  ('5cm', '5cm' , 10000, 100), ('people', 'people', 10000, 100),
+  ('king', 'king' , 10000, 100), ('queen', 'queen', 10000, 100),
+  ('minister', 'minister', 10000, 100), ('servent', 'servent', 13000, 100);
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy)
+  SELECT col1, col1_dummy, col1_id, col1_id_dummy FROM t1
+    WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy)
+  SELECT col1, col1_dummy, col1_id, col1_id_dummy FROM t1
+    WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy)
+  SELECT col1, col1_dummy, col1_id, col1_id_dummy FROM t1
+  WHERE col1 <> '5cm';
+INSERT INTO t1 (col1, col1_dummy, col1_id, col1_id_dummy) VALUES
+  ('5cm ', '5cm ',  10000, 100), ('5cm ', '5cm ', 10000, 100);
+SELECT col1, hex(col1), col1_id, count(*) from t1 WHERE col1= '5cm'
+  GROUP BY hex(col1), col1_id;
+UPDATE t1 SET col1_id= 1414 WHERE col1= '5cm' AND col1_dummy= '5cm';
+SELECT count(*) FROM t1 WHERE col1= '5cm';
+SELECT count(*) FROM t1 WHERE col1_id= 1414;
+DELETE FROM t1 WHERE col1= '5cm' AND col1_dummy= '5cm';
+SELECT count(*) FROM t1 WHERE col1= '5cm';
+DROP TABLE t1;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/mysqlbinlog_debug.test percona-xtrabackup-2.3.7/mysql-test/t/mysqlbinlog_debug.test
--- percona-xtrabackup-2.2.3/mysql-test/t/mysqlbinlog_debug.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/mysqlbinlog_debug.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,24 @@
+# This file is created to add test cases for mysqlbinlog tool
+#  which can be executed only against debug compiled mysqlbinlog
+#  tool.
+
+--source include/mysqlbinlog_have_debug.inc
+-- source include/have_binlog_format_statement.inc
+-- source include/have_log_bin.inc
+
+--echo #
+--echo # Bug#18742916 : MYSQLBINLOG --RAW DOES NOT CHECK FOR ERRORS
+--echo #
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error 1
+--exec $MYSQL_BINLOG -#d,simulate_result_file_write_error_for_FD_event --raw --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT -r$MYSQLTEST_VARDIR/tmp/ master-bin.000001 2>&1
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error 1
+--exec $MYSQL_BINLOG -#d,simulate_result_file_write_error --raw --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT -r$MYSQLTEST_VARDIR/tmp/ master-bin.000001 2>&1
+# Cleanup
+--remove_file $MYSQLTEST_VARDIR/tmp/master-bin.000001
+
+--echo
+--echo End of tests
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/mysqlbinlog_mixed_or_statment.test percona-xtrabackup-2.3.7/mysql-test/t/mysqlbinlog_mixed_or_statment.test
--- percona-xtrabackup-2.2.3/mysql-test/t/mysqlbinlog_mixed_or_statment.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/mysqlbinlog_mixed_or_statment.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,44 @@
+
+--source include/have_binlog_format_mixed_or_statement.inc
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+--echo #
+--echo # Bug#18913551 - LOCK TABLES USES INCORRECT LOCK FOR IMPLICITLY USED
+--echo #                TABLES.
+--echo #
+
+--enable_connect_log
+
+SET @org_concurrent_insert= @@global.concurrent_insert;
+SET @@global.concurrent_insert=1;
+
+CREATE TABLE t1(a INT) ENGINE=MyISAM;
+CREATE FUNCTION f1() RETURNS INT RETURN (SELECT MIN(a) FROM t1);
+CREATE VIEW v1 AS (SELECT 1 FROM dual WHERE f1() = 1);
+
+LOCK TABLE v1 READ;
+
+connect (con1, localhost, root);
+SET lock_wait_timeout=1;
+--echo # With fix, con1 does not get lock on table "t1" so following insert
+--echo # operation fails after waiting for "lock_wait_timeout" duration.
+--error ER_LOCK_WAIT_TIMEOUT
+INSERT INTO t1 VALUES (1);
+
+connection default;
+UNLOCK TABLES;
+
+--echo # V1 should be empty here.
+SELECT * FROM v1;
+
+# Cleanup
+disconnect con1;
+SET @@global.concurrent_insert= @org_concurrent_insert;
+DROP TABLE t1;
+DROP VIEW v1;
+DROP FUNCTION f1;
+--disable_connect_log
+
+#Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/mysqldump.test percona-xtrabackup-2.3.7/mysql-test/t/mysqldump.test
--- percona-xtrabackup-2.2.3/mysql-test/t/mysqldump.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/mysqldump.test	2017-02-27 07:47:02.000000000 +0000
@@ -2461,3 +2461,42 @@
 --echo #
 --echo # End of 5.1 tests
 --echo #
+
+--echo #
+--echo #BUG#17477959 - VIEW COLUMNS EXCEED TABLE LIMITS
+--echo #
+
+#Create a view with a large column name and number of columns.
+let $colnum= 798;
+let $str= 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit;
+while ($colnum)
+{
+  let $str= 1 AS thisColumnContainsAVeryLongNameThatNearsThe64CharacterLimit$colnum, $str;
+  dec $colnum;
+}
+--eval CREATE VIEW v1 AS SELECT $str
+
+--exec $MYSQL_DUMP -uroot --all-databases > $MYSQLTEST_VARDIR/tmp/bug17477959.sql
+#Reload of the dump fails without the patch
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug17477959.sql
+#Cleanup.
+--remove_file $MYSQLTEST_VARDIR/tmp/bug17477959.sql
+DROP VIEW v1;
+
+
+--echo #
+--echo # End of 5.6 tests
+--echo #
+
+--echo #
+--echo # Bug #11752369 : MYSQLDUMP SHOULD CONVERT GEOMETRY COLUMNS TO HEX WITH
+--echo #                 --HEX-BLOB OPTION
+
+CREATE DATABASE dump_gis;
+USE dump_gis;
+CREATE TABLE t1 (a GEOMETRY);
+INSERT INTO t1 VALUES(GeomFromText('LineString(1 1, 2 1, 2 2, 1 2, 1 1)'));
+SELECT HEX(a) FROM t1;
+--exec $MYSQL_DUMP -necqt --compact --hex-blob dump_gis
+DROP DATABASE dump_gis;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/mysql_upgrade.test percona-xtrabackup-2.3.7/mysql-test/t/mysql_upgrade.test
--- percona-xtrabackup-2.2.3/mysql-test/t/mysql_upgrade.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/mysql_upgrade.test	2017-02-27 07:47:02.000000000 +0000
@@ -149,5 +149,58 @@
 --exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
 DROP USER 'bug13586336'@'localhost';
 
+--echo #
+--echo # Bug #20023823 BACKPORT THE FIX FOR MYSQL_INSTALL_DB/MYSQL_UPGRADE
+--echo #               ON NON-EMPTY PLUGIN COLUMN
+--echo #
+
+--echo # Creating user with empty plugin and empty password
+--echo # plugin should be changed to mysql_native_password after the update
+
+CREATE USER B20023823_empty@localhost;
+GRANT ALL PRIVILEGES on *.* TO B20023823_empty@localhost;
+update mysql.user set plugin='' WHERE user='B20023823_empty'
+                                and host='localhost';
+flush privileges;
+--echo # Creating user with default plugin, i.e. mysql_native_password
+--echo # this plugin should not be changed during the upgrade
+
+CREATE USER B20023823_def@localhost IDENTIFIED BY 'test';
+
+--echo # Creating user with 41 bytes hash pass (default) and setting its plugin
+--echo # to empty string. Plugin should be set to mysql_native_password
+--echo # after the upgrade is finished
+
+CREATE USER B20023823_41hash@localhost IDENTIFIED WITH mysql_native_password;
+set session old_passwords=0;
+set password for B20023823_41hash@localhost = password('test');
+update mysql.user set plugin='' WHERE user='B20023823_41hash'
+                                      and host='localhost';
+flush privileges;
+
+--echo # Creating user with 16 bytes hash pass and setting its plugin
+--echo # to empty string. Plugin should be set to mysql_old_password
+--echo # after the upgrade is finished
+
+CREATE USER B20023823_16hash@localhost identified with mysql_old_password;
+set session old_passwords=1;
+set password for B20023823_16hash@localhost = password('test');
+update mysql.user set plugin='' WHERE user='B20023823_16hash'
+                                and host='localhost';
+flush privileges;
+SELECT user, plugin from mysql.user;
+
+--echo # repair the user's plugin
+--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
+
+--echo # expect non-empty
+SELECT user, plugin from mysql.user;
+
+--echo # cleanup
+DROP USER B20023823_empty@localhost;
+DROP USER B20023823_def@localhost;
+DROP USER B20023823_41hash@localhost;
+DROP USER B20023823_16hash@localhost;
+
 --echo
 --echo End of tests
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/openssl_1.test percona-xtrabackup-2.3.7/mysql-test/t/openssl_1.test
--- percona-xtrabackup-2.2.3/mysql-test/t/openssl_1.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/openssl_1.test	2017-02-27 07:47:02.000000000 +0000
@@ -15,8 +15,8 @@
 
 grant select on test.* to ssl_user1@localhost require SSL;
 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client";
+grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client" ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
 flush privileges;
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/outfile_loaddata.test percona-xtrabackup-2.3.7/mysql-test/t/outfile_loaddata.test
--- percona-xtrabackup-2.2.3/mysql-test/t/outfile_loaddata.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/outfile_loaddata.test	2017-02-27 07:47:02.000000000 +0000
@@ -169,6 +169,8 @@
 --eval LOAD DATA INFILE '$file' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ÑŠ'
 --remove_file $file
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
+SELECT * FROM t1;
+SELECT * FROM t2;
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --eval SELECT * FROM t1 INTO OUTFILE '$file' LINES STARTING BY 'ÑŠ'
@@ -191,6 +193,8 @@
 --eval LOAD DATA INFILE '$file' INTO TABLE t2 CHARACTER SET binary LINES TERMINATED BY 'ÑŠ'
 --remove_file $file
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
+SELECT * FROM t1;
+SELECT * FROM t2;
 
 --echo # Default (binary) charset:
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/partition_archive.test percona-xtrabackup-2.3.7/mysql-test/t/partition_archive.test
--- percona-xtrabackup-2.2.3/mysql-test/t/partition_archive.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/partition_archive.test	2017-02-27 07:47:02.000000000 +0000
@@ -126,3 +126,20 @@
 select count(*) from t1;
 drop table t1;
 
+
+--echo #
+--echo #BUG 18618561: FAILED ALTER TABLE ENGINE CHANGE WITH PARTITIONS
+--echo #              CORRUPTS FRM
+
+CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
+PARTITIONS 5;
+SHOW CREATE TABLE t1;
+
+--error ER_GET_ERRNO
+ALTER TABLE t1 ENGINE= ARCHIVE;
+
+--echo #After the patch, the ENGINE is correctly displayed as MyISAM
+SHOW CREATE TABLE t1;
+
+--echo #Cleanup.
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/partition_index_innodb.test percona-xtrabackup-2.3.7/mysql-test/t/partition_index_innodb.test
--- percona-xtrabackup-2.2.3/mysql-test/t/partition_index_innodb.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/partition_index_innodb.test	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,6 @@
+--source include/have_partition.inc
+--source include/have_innodb_16k.inc
+
 --echo #
 --echo # Bug#18167648: WRONG RESULTS WITH PARTITIONING, INDEX_MERGE AND NO PK
 --echo #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/partition_index_myisam.test percona-xtrabackup-2.3.7/mysql-test/t/partition_index_myisam.test
--- percona-xtrabackup-2.2.3/mysql-test/t/partition_index_myisam.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/partition_index_myisam.test	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,8 @@
+--source include/have_partition.inc
+
+--echo #
+--echo # Bug#18167648: WRONG RESULTS WITH PARTITIONING, INDEX_MERGE AND NO PK
+--echo #
 CREATE TABLE t1 (
   a smallint,
   b smallint,
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/partition_innodb.test percona-xtrabackup-2.3.7/mysql-test/t/partition_innodb.test
--- percona-xtrabackup-2.2.3/mysql-test/t/partition_innodb.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/partition_innodb.test	2017-02-27 07:47:02.000000000 +0000
@@ -703,3 +703,172 @@
 ALTER TABLE t1 IMPORT TABLESPACE;
 DROP TABLE t1;
 USE test;
+
+--echo #
+--echo # Bug#13737949: CRASH IN HA_PARTITION::INDEX_INIT
+--echo # Bug#18694052: SERVER CRASH IN HA_PARTITION::INIT_RECORD_PRIORITY_QUEUE
+--echo #
+CREATE TABLE t1
+(a INT,
+ b INT,
+ PRIMARY KEY (a))
+ ENGINE = InnoDB
+ PARTITION BY HASH (a) PARTITIONS 3;
+ START TRANSACTION WITH CONSISTENT SNAPSHOT;
+ --connect (con1, localhost, root,,)
+ --echo # con1
+ ALTER TABLE t1 ADD INDEX idx1 (b);
+ --connection default
+ --echo # con default
+ --error ER_TABLE_DEF_CHANGED
+ SELECT b FROM t1 WHERE b = 0;
+ --error ER_TABLE_DEF_CHANGED
+ SELECT b FROM t1 WHERE b = 0;
+ --disconnect con1
+ DROP TABLE t1;
+
+--echo # Same test without partitioning
+CREATE TABLE t1
+(a INT,
+ b INT,
+ PRIMARY KEY (a))
+ ENGINE = InnoDB;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+--echo # con1
+--connect (con1, localhost, root,,)
+ALTER TABLE t1 ADD INDEX idx1 (b);
+--connection default
+--echo # con default
+--error ER_TABLE_DEF_CHANGED
+SELECT b FROM t1 WHERE b = 0;
+--error ER_TABLE_DEF_CHANGED
+SELECT b FROM t1 WHERE b = 0;
+--disconnect con1
+DROP TABLE t1;
+
+--echo Bug 17896265	 PARTITIONED TABLE HAS MISPLACED ROWS, AFTER INPLACE ALTER
+
+#Check basic Interchange
+CREATE TABLE t1 (
+f1 INT(11) NOT NULL,
+f2 INT(11) NOT NULL
+)
+ENGINE=InnoDB
+PARTITION BY KEY (f1,f2) PARTITIONS 2;
+INSERT INTO t1 VALUES (9585,5);
+--error ER_ALTER_OPERATION_NOT_SUPPORTED
+ALTER TABLE t1 CHANGE f1 f1 INT AFTER f2, ALGORITHM=INPLACE;
+
+# Check when interchanging columns do not change the order
+CREATE TABLE t2 (
+f1 INT(11) NOT NULL,
+f2 INT(11) NOT NULL,
+f3 INT(11) NOT NULL,
+f4 INT(11) NOT NULL
+)
+ENGINE=InnoDB
+PARTITION BY KEY (f2,f3) PARTITIONS 2;
+INSERT INTO t2 VALUES (10,9585,5,20);
+
+ALTER TABLE t2 CHANGE f3 f3 INT AFTER f4, ALGORITHM=INPLACE;
+# Check if row is in the wrong partition!
+CHECK TABLE t2;
+
+--error ER_ALTER_OPERATION_NOT_SUPPORTED
+ALTER TABLE t2 CHANGE f3 f3 INT AFTER f1, ALGORITHM=INPLACE;
+
+#Bring back to original position
+ALTER TABLE t2 CHANGE f4 f4 INT AFTER f3, ALGORITHM=INPLACE;
+CHECK TABLE t2;
+
+#Change the column order of field which are not part of KEY
+ALTER TABLE t2 CHANGE f1 f1 INT AFTER f4, ALGORITHM=INPLACE;
+CHECK TABLE t2;
+
+#now order is f2,f3,f4,f1
+ALTER TABLE t2 CHANGE f1 f1 INT AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t2;
+
+#now order is f2,f1,f3,f4
+--error ER_ALTER_OPERATION_NOT_SUPPORTED
+ALTER TABLE t2 CHANGE f2 f2 INT AFTER f4, ALGORITHM=INPLACE;
+
+#check if Range partition is effected
+CREATE TABLE t3 (f1 INT,f2 INT) ENGINE=INNODB
+PARTITION BY RANGE(f1) (
+PARTITION p0 VALUES LESS THAN (100),
+PARTITION p1 VALUES LESS THAN (200),
+PARTITION p2 VALUES LESS THAN (600),
+PARTITION p3 VALUES LESS THAN MAXVALUE
+);
+insert into t3 values (90,120);
+insert into t3 values (120,300);
+ALTER TABLE t3 CHANGE f1 f1 int AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t3;
+
+#check with hash partitions
+CREATE TABLE t4 (
+f1 INT(11) NOT NULL,
+f2 INT(11) NOT NULL
+)
+ENGINE=InnoDB
+PARTITION BY HASH (MOD(f1,f2)) PARTITIONS 2;
+INSERT INTO t4 VALUES (9585,5);
+ALTER TABLE t4 CHANGE f1 f1 INT AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t4;
+
+#Check with column partitioning
+CREATE TABLE t5 (
+    f1 INT,
+    f2 INT
+)
+ENGINE=InnoDB
+PARTITION BY RANGE COLUMNS(f1,f2) (
+    PARTITION p0 VALUES LESS THAN (10000,12),
+    PARTITION p1 VALUES LESS THAN (MAXVALUE, MAXVALUE)
+);
+
+INSERT INTO t5 VALUES (1,20000);
+ALTER TABLE t5 CHANGE f1 f1 INT AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t5;
+
+#Check with column partitioning and subpartition
+CREATE TABLE t6 (
+    a INT,
+    b INT
+)
+ENGINE=InnoDB
+PARTITION BY RANGE COLUMNS(a,b)
+SUBPARTITION BY KEY(a,b)
+SUBPARTITIONS 2 (
+    PARTITION p0 VALUES LESS THAN (10000,12),
+    PARTITION p1 VALUES LESS THAN (MAXVALUE, MAXVALUE)
+);
+INSERT INTO t6 VALUES (9585,5);
+
+--error ER_ALTER_OPERATION_NOT_SUPPORTED
+ALTER TABLE t6 CHANGE a a INT AFTER b, ALGORITHM=INPLACE;
+
+#check when the columns are not adjacent
+CREATE TABLE t7 (
+f1 INT(11) NOT NULL,
+f2 INT(11) NOT NULL,
+f3 INT(11) NOT NULL,
+f4 INT(11) NOT NULL,
+f5 INT(11) NOT NULL
+
+)
+ENGINE=InnoDB
+PARTITION BY KEY (f1,f5) PARTITIONS 2;
+INSERT INTO t7 VALUES (9585,10,20,10,5);
+
+ALTER TABLE t7 CHANGE f5 f5 INT AFTER f3, ALGORITHM=INPLACE;
+CHECK TABLE t7;
+
+ALTER TABLE t7 CHANGE f5 f5 INT AFTER f2, ALGORITHM=INPLACE;
+CHECK TABLE t7;
+
+--error ER_ALTER_OPERATION_NOT_SUPPORTED
+ALTER TABLE t7 CHANGE f1 f1 INT AFTER f4, ALGORITHM=INPLACE;
+
+DROP TABLE t1,t2,t3,t4,t5,t6,t7;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/partition_pruning.test percona-xtrabackup-2.3.7/mysql-test/t/partition_pruning.test
--- percona-xtrabackup-2.2.3/mysql-test/t/partition_pruning.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/partition_pruning.test	2017-02-27 07:47:02.000000000 +0000
@@ -1535,3 +1535,51 @@
 explain partitions select * from t1 where a between 10 and 10+33;
 
 drop table t0, t1;
+
+--echo #
+--echo # Bug#71095: Wrong results with PARTITION BY LIST COLUMNS()
+--echo #
+CREATE TABLE t1
+(c1 int,
+ c2 int,
+ c3 int,
+ c4 int,
+ PRIMARY KEY (c1,c2))
+PARTITION BY LIST COLUMNS (c2)
+(PARTITION p1 VALUES IN (1,2),
+ PARTITION p2 VALUES IN (3,4));
+INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
+INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+DROP TABLE t1;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/plugin_auth.test percona-xtrabackup-2.3.7/mysql-test/t/plugin_auth.test
--- percona-xtrabackup-2.2.3/mysql-test/t/plugin_auth.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/plugin_auth.test	2017-02-27 07:47:02.000000000 +0000
@@ -621,3 +621,37 @@
 
 
 --echo End of 5.5 tests
+
+--echo #
+--echo # Bug #18057562: PROXY USERS LOCKED OUT WHEN UNDERLYING PROXIED USER
+--echo #                PASSWORD IS EXPIRED
+--echo #
+
+--echo # Restart server with disconnect_on_expired_password OFF;
+
+let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+--exec echo "wait" > $restart_file
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--exec echo "restart:--disconnect_on_expired_password=0" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+CREATE USER 'empl_external'@'localhost' IDENTIFIED WITH test_plugin_server AS 'employee';
+CREATE USER 'employee'@'localhost' IDENTIFIED BY 'passkey';
+GRANT PROXY ON 'employee'@'localhost' TO 'empl_external'@'localhost';
+
+--echo # Expiring the proxied user's password
+ALTER USER employee@localhost PASSWORD EXPIRE;
+
+--echo # Connecting with the proxied user and executing a query after the
+--echo # proxied user's password is expired
+--error 1, ER_MUST_CHANGE_PASSWORD
+--exec $MYSQL -S $MASTER_MYSOCK -u employee --password=passkey -e "SELECT current_user();SELECT user();" 2>&1
+
+--echo # Connecting with the proxy user and executing a query after the proxied
+--echo # user's password is expired. Here we are not supposed to get error.
+--exec $MYSQL -S $MASTER_MYSOCK -u empl_external $PLUGIN_AUTH_OPT --password=employee -e "SELECT current_user();SELECT user();" 2>&1
+
+#Cleanup
+DROP USER 'empl_external'@'localhost', 'employee'@'localhost';
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/plugin.test percona-xtrabackup-2.3.7/mysql-test/t/plugin.test
--- percona-xtrabackup-2.2.3/mysql-test/t/plugin.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/plugin.test	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,7 @@
+#
 --source include/not_windows_embedded.inc
 --source include/have_example_plugin.inc
+--source include/have_debug_sync.inc
 
 --error ER_UNKNOWN_STORAGE_ENGINE
 CREATE TABLE t1(a int) ENGINE=EXAMPLE;
@@ -160,3 +162,118 @@
 SELECT @@SESSION.example_double_thdvar;
 
 UNINSTALL PLUGIN example;
+
+--echo #
+--echo # BUG#18008907 - DEADLOCK BETWEEN MYSQL_CHANGE_USER(), SHOW VARIABLES AND INSTALL PLUGIN
+--echo #
+
+--enable_connect_log
+
+delimiter |;
+
+CREATE PROCEDURE p_install()
+BEGIN
+  INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
+END
+|
+
+CREATE PROCEDURE p_show_vars()
+BEGIN
+  SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES;
+END|
+
+delimiter ;|
+
+connect(con1, localhost, root,,);
+
+--echo # Case 18008907_1: Deadlock situation cause by
+--echo #                  con1: has LOCK_system_variables_hash and waits on LOCK_plugin  AND
+--echo #                  default: has LOCK_plugin and waits on LOCK_system_variables_hash.
+--echo #
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
+--send call p_show_vars();
+
+connection default;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
+--send call p_install();
+
+connection con1;
+# Without fix, reap will hang.
+--replace_column 1 #
+--reap;
+SET DEBUG_SYNC='RESET';
+
+connection default;
+--replace_regex /(Can\'t open shared library).*$/\1/
+--error ER_CANT_OPEN_LIBRARY
+--reap;
+SET DEBUG_SYNC='RESET';
+
+--echo # Case 18008907_2: Deadlock situation caused by
+--echo #                  default: has LOCK_system_variables_hash and waits on LOCK_global_system_variables,
+--echo #                  con1: has LOCK_plugin and waits on LOCK_system_variables_hash AND
+--echo #                  con2: has LOCK_global_system_variables and waits on LOCK_plugin.
+
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
+--send call p_show_vars();
+
+connection con1;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
+--send call p_install();
+
+connect(con2, localhost, root,,);
+SET DEBUG_SYNC='now WAIT_FOR create_connection';
+# Without fix, deadlock situation will occur on timeout of debug_syncs in
+# default and con1.  Because of this, change_user operation hangs.
+change_user;
+
+connection con1;
+--replace_regex /(Can\'t open shared library).*$/\1/
+--error ER_CANT_OPEN_LIBRARY
+--reap;
+
+connection default;
+--replace_column 1 #
+--reap;
+disconnect con2;
+
+--echo # Case 18008907_3: Testing Concurrent "Show Variables" and "Plugin Uninstall" operations.
+
+#Installing plugin
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+
+connection con1;
+#Acquiring LOCK_system_variables_hash and LOCK_plugin_delete
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
+--send call p_show_vars();
+
+connect(con2, localhost, root,,);
+SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
+--send UNINSTALL PLUGIN example;
+
+connection default;
+#Plugin Uninstall operation will wait until show variables operations releases LOCK_plugin_delete.
+let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+                     WHERE INFO='UNINSTALL PLUGIN example' and
+                     STATE='System lock';
+--source include/wait_condition.inc
+SET DEBUG_SYNC='now SIGNAL go';
+
+connection con1;
+--replace_column 1 #
+--reap
+
+connection con2;
+--reap
+
+connection default;
+DROP PROCEDURE p_show_vars;
+DROP PROCEDURE p_install;
+SET DEBUG_SYNC='RESET';
+disconnect con1;
+disconnect con2;
+
+--disable_connect_log
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/query_cache.test percona-xtrabackup-2.3.7/mysql-test/t/query_cache.test
--- percona-xtrabackup-2.2.3/mysql-test/t/query_cache.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/query_cache.test	2017-02-27 07:47:02.000000000 +0000
@@ -1403,5 +1403,56 @@
 SELECT COUNT(*) FROM (SELECT * FROM t1 ) tt;
 DROP TABLE t1;
 SET GLOBAL query_cache_size= @qc;
+
+
 --echo #
+--echo #BUG 18710853: QUERY CACHE NOT INVALIDATED ON CASCADE DELETE IF DB NAME HAS
+--echo #              SPECIAL SYMBOLS
+
+SET @query_cache_size.saved = @@query_cache_size;
+SET GLOBAL query_cache_size = 1024*1024;
+
+CREATE DATABASE `db-db`;
+CREATE TABLE `db-db`.`t$1` (fld1 INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE `db-db`.`t$2` (fld1 INT PRIMARY KEY, fld2 INT,
+CONSTRAINT t2_fk FOREIGN KEY (fld2) REFERENCES `db-db`.`t$1` (fld1) ON
+DELETE CASCADE) ENGINE=InnoDB;
+CREATE TABLE `db-db`.`t$3` (fld1 INT PRIMARY KEY, fld2 INT,
+CONSTRAINT t3_fk FOREIGN KEY (fld2) REFERENCES `db-db`.`t$1` (fld1) ON
+UPDATE CASCADE) ENGINE=InnoDB;
+
+INSERT INTO `db-db`.`t$1` VALUES (100);
+INSERT INTO `db-db`.`t$1` VALUES (300);
+INSERT INTO `db-db`.`t$2` VALUES (1, 100);
+INSERT INTO `db-db`.`t$3` VALUES (2, 300);
+
+SELECT * FROM `db-db`.`t$2`;
+SELECT * FROM `db-db`.`t$3`;
+
+DELETE FROM `db-db`.`t$1` WHERE fld1= 100;
+UPDATE `db-db`.`t$1` SET fld1= 200 WHERE fld1= 300;
 
+--echo #After fix the number of the records returned with the
+--echo #query cache and without the query cache are the same.
+SELECT * FROM `db-db`.`t$2`;
+SELECT SQL_NO_CACHE * FROM `db-db`.`t$2`;
+
+SELECT * FROM `db-db`.`t$3`;
+SELECT SQL_NO_CACHE * FROM `db-db`.`t$3`;
+
+--echo #Test case added for code coverage, invalidation
+--echo #triggered at the SQL layer.
+
+CREATE TABLE `db-db`.`t$4` (fld1 INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO `db-db`.`t$4` VALUES (100);
+
+SELECT * FROM `db-db`.`t$4`;
+INSERT INTO `db-db`.`t$4` VALUES (200);
+SELECT * FROM `db-db`.`t$4`;
+SELECT SQL_NO_CACHE * FROM `db-db`.`t$4`;
+
+--echo #cleanup
+DROP DATABASE `db-db`;
+SET GLOBAL query_cache_size = @query_cache_size.saved;
+
+--echo #
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/rewrite_general_log.test percona-xtrabackup-2.3.7/mysql-test/t/rewrite_general_log.test
--- percona-xtrabackup-2.2.3/mysql-test/t/rewrite_general_log.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/rewrite_general_log.test	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,3 @@
-#
 # WL#5706/Bug#58712/Bug#11746378
 # Encrypt or remove passwords from slow, query, and binary logs
 # (see sql/sql_rewrite.cc for bulk of implementation)
@@ -107,6 +106,29 @@
 # VIEWs do not accepted variables at this time.
 EXPLAIN EXTENDED SELECT @a=5,@b:=10,@c:=20,@d:=40+5,(@e:=80)+5;
 
+--echo #
+--echo # Bug#16953758: PREPARED STATEMENT IS WRITTEN TO GENERAL QUERY LOG AFTER ITS EXECUTION IS FINISH
+--echo #
+TRUNCATE TABLE mysql.general_log;
+SET GLOBAL general_log='ON';
+SET @sql='SELECT command_type, argument FROM mysql.general_log WHERE argument LIKE "%Bug#16953758%"';
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+
+--echo #
+--echo # Bug#18616826: PREPARED STATEMENTS WHOSE EXECUTION FAIL ARE NOT LOGGED TO THE GENERAL LOG
+--echo #
+TRUNCATE TABLE mysql.general_log;
+SET @sql='DROP TABLE 18616826_does_not_exist';
+PREPARE stmt FROM @sql;
+--error ER_BAD_TABLE_ERROR
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+SELECT command_type, argument FROM mysql.general_log WHERE argument LIKE "DROP TABLE 18616826_does_not_exist";
+
+
 DROP TABLE test_log;
 
 --remove_file $MYSQLTEST_VARDIR/log/rewrite_general.log
@@ -115,4 +137,8 @@
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
 
+
+--echo
 --echo End of 5.6 tests!
+--echo
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/show_processlist.test percona-xtrabackup-2.3.7/mysql-test/t/show_processlist.test
--- percona-xtrabackup-2.2.3/mysql-test/t/show_processlist.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/show_processlist.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,62 @@
+###############################################################################
+--echo Bug#17283409  4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
+--echo SHOW BINLOGS
+# After the fix for bug 17283409, We allow new connections while processing
+# 'SHOW PROCESSLIST' command. This test script is to prove that even though we
+# allow new connections to come in, 'SHOW PROCESSLIST' will not consider them,
+# hence there is no worry of 'SHOW PROCESSLIST' going into a infinite loop if
+# new connections are coming in continously.
+###############################################################################
+--source include/have_debug_sync.inc
+--source include/count_sessions.inc
+--enable_connect_log
+connect(connection1,localhost,root,,test,$MASTER_MYPORT,);
+--connection default
+SET DEBUG_SYNC='before_copying_threads SIGNAL parked1 WAIT_FOR go';
+--send SHOW PROCESSLIST
+--connection connection1
+echo "Wait_for parked1";
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect(connection2,localhost,root,,test,$MASTER_MYPORT,);
+connect(connection3,localhost,root,,test,$MASTER_MYPORT,);
+SET DEBUG_SYNC='now SIGNAL go';
+
+--connection default
+# We are yet to copy threads when connection 2 and connection 3 joined the
+# system. So this will show all 4 connections ( default + connection 1,2,3).
+--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
+--reap
+
+# Test 2: To prove that connections which joined after copying thread will not
+# be entertained
+SET DEBUG_SYNC='after_copying_threads SIGNAL parked1 WAIT_FOR go';
+--send SHOW PROCESSLIST
+
+--connection connection1
+echo "Wait_for parked1";
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect(connection4,localhost,root,,test,$MASTER_MYPORT,);
+connect(connection5,localhost,root,,test,$MASTER_MYPORT,);
+SET DEBUG_SYNC='now SIGNAL go';
+--connection default
+# This will show 4 connections only ( default + connection 1,2,3 ).  Connections
+# (connection4, connection 5) which entered after reading the first element
+# from the iterator will not be processed by show processlist.
+--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
+--reap
+
+#Now try the command once again.
+# This will show 6 connections ( default + connection 1,2,3,4,5 )
+--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
+SHOW PROCESSLIST;
+
+--echo "Cleanup"
+# Reset DEBUG_SYNC
+SET DEBUG_SYNC='RESET';
+--disconnect connection1
+--disconnect connection2
+--disconnect connection3
+--disconnect connection4
+--disconnect connection5
+--disable_connect_log
+--source include/wait_until_count_sessions.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/sp.test percona-xtrabackup-2.3.7/mysql-test/t/sp.test
--- percona-xtrabackup-2.2.3/mysql-test/t/sp.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/sp.test	2017-02-27 07:47:02.000000000 +0000
@@ -15,6 +15,9 @@
 # Tests that require multibyte character sets, which are not always available,
 #   go into separate files (e.g. sp-ucs2.test)
 
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
 use test;
 
 # Test tables
@@ -9005,4 +9008,119 @@
 
 DROP TABLE t1;
 
+
+--echo
+--echo #
+--echo # BUG 16041903: CONTINUE HANDLER NOT INVOKED
+--echo # IN A STORED FUNCTION AFTER A LOCK WAIT TIMEOUT
+--echo #
+
+--echo
+--echo # Save and set lock wait timeout
+SET @lock_wait_timeout_saved= @@lock_wait_timeout;
+SET @innodb_lock_wait_timeout_saved= @@innodb_lock_wait_timeout;
+SET @@lock_wait_timeout= 1;
+SET @@innodb_lock_wait_timeout= 1;
+
+--echo
+--echo # Create a function with exit handler:
+DELIMITER //;
+CREATE FUNCTION f1() RETURNS VARCHAR(20)
+BEGIN
+  DECLARE EXIT HANDLER FOR SQLSTATE '42S02' RETURN 'No such table';
+  INSERT INTO no_such_table VALUES (1);
+END//
+
+--echo
+--echo # Create a function calling f1():
+CREATE FUNCTION f2() RETURNS VARCHAR(20)
+BEGIN
+  RETURN f1();
+END//
+
+--echo
+--echo # Create a function provoking deadlock:
+CREATE FUNCTION f3() RETURNS VARCHAR(20)
+BEGIN
+  UPDATE t1 SET i= 1 WHERE i= 1;
+  RETURN 'Will never get here';
+END//
+
+--echo
+--echo # Create a function calling f3, to create
+--echo # a deadlock indirectly:
+CREATE FUNCTION f4() RETURNS VARCHAR(20)
+BEGIN
+  RETURN f3();
+END//
+DELIMITER ;//
+
+--echo
+--echo # Open another connection, create and initialize a table
+--echo # to be used for provoking deadlock, put a lock on the table:
+connect (con1,localhost,root,,);
+CREATE TABLE t1 (i INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+SET AUTOCOMMIT= 0;
+UPDATE t1 SET i=1 WHERE i=1;
+
+--echo
+--echo # On the default connection, do an update to provoke a
+--echo # deadlock, then call the function with handler. This case
+--echo # fails without the patch (with error ER_NO_SUCH_TABLE):
+--connection default
+SET AUTOCOMMIT= 0;
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t1 SET i=1 WHERE i=1;
+SELECT f1() AS 'f1():';
+
+--echo
+--echo # Provoke another deadlock, then call the function with
+--echo # handler indirectly. This case fails without the patch
+--echo # (with error ER_NO_SUCH_TABLE):
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t1 SET i= 1 WHERE i= 1;
+SELECT f2() AS 'f2():';
+
+--echo
+--echo # Provoke yet another deadlock, but now from within a function,
+--echo # then call the function with handler. This succeeds even
+--echo # without the patch because is_fatal_sub_stmt_error is reset
+--echo # in restore_sub_stmt after the failing function has been
+--echo # executed. The test case is included anyway for better coverage:
+--error ER_LOCK_WAIT_TIMEOUT
+SELECT f3() AS 'f3():';
+SELECT f1() AS 'f1():';
+
+--echo # Provoke yet another deadlock, but now from within a function,
+--echo # calling another function, then call the function with handler.
+--echo # This succeeds even without the patch because
+--echo # is_fatal_sub_stmt_error is reset in restore_sub_stmt after
+--echo # the failing function has been executed. The test case is
+--echo # included anyway for better coverage:
+--error ER_LOCK_WAIT_TIMEOUT
+SELECT f4() AS 'f4():';
+SELECT f1() AS 'f1():';
+
+--echo
+--echo # Disconnect, drop functions and table:
+--disconnect con1
+DROP FUNCTION f4;
+DROP FUNCTION f3;
+DROP FUNCTION f2;
+DROP FUNCTION f1;
+DROP TABLE t1;
+
+--echo
+--echo # Reset lock wait timeouts
+SET @@lock_wait_timeout= @lock_wait_timeout_saved;
+SET @@innodb_lock_wait_timeout= @innodb_lock_wait_timeout_saved;
+
+--echo #
+--echo # BUG 16041903: End of test case
+--echo #
+
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
+
 --echo # End of 5.6 tests
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/sp-threads.test percona-xtrabackup-2.3.7/mysql-test/t/sp-threads.test
--- percona-xtrabackup-2.2.3/mysql-test/t/sp-threads.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/sp-threads.test	2017-02-27 07:47:02.000000000 +0000
@@ -82,6 +82,7 @@
 --sleep 2
 # There should be call statement in locked state.
 --replace_column 1 # 3 localhost 6 #
+--replace_result "starting" STATE "init" STATE "cleaning up" STATE
 --sorted_result
 show processlist;
 unlock tables;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/sp_validation.test percona-xtrabackup-2.3.7/mysql-test/t/sp_validation.test
--- percona-xtrabackup-2.2.3/mysql-test/t/sp_validation.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/sp_validation.test	2017-02-27 07:47:02.000000000 +0000
@@ -1698,7 +1698,6 @@
 --echo
 CALL p2();
 --echo
---error ER_BAD_FIELD_ERROR
 UPDATE t2 SET a = 30;
 
 --echo
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/temporal_literal.test percona-xtrabackup-2.3.7/mysql-test/t/temporal_literal.test
--- percona-xtrabackup-2.2.3/mysql-test/t/temporal_literal.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/temporal_literal.test	2017-02-27 07:47:02.000000000 +0000
@@ -190,3 +190,31 @@
 SELECT DATE'2001-01-01' FROM t1 GROUP BY DATE'2001-01-01';
 DROP TABLE t1;
 
+--echo #
+--echo # BUG #16812821: INCONSISTANT RESULTS WHEN ODBC DATE FORMAT IS USED
+--echo #
+CREATE TABLE t1(c1 INT, c2 DATE, c3 TIME, c4 TIMESTAMP);
+CREATE TABLE t2(c11 INT, C12 INT);
+INSERT INTO t1 VALUES (1, '2014-01-02', '01:01:01', '2014-01-02 01:01:01'),
+                      (2, '2014-01-04', '01:01:01', '2014-01-02 01:01:01');
+INSERT INTO t2 VALUES (3, 4), (5, 6);
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+  WHERE c2 BETWEEN {d'2014-01-01'} AND {d'2014-01-05'};
+
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+  WHERE c3 BETWEEN {t'01:01:01'} AND {t'01:01:05'};
+
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+  WHERE c4 BETWEEN {ts'2014-01-01 01:01:01'} AND {ts'2014-01-05 01:01:01'};
+
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+  WHERE c2 BETWEEN DATE'2014-01-01' AND DATE'2014-01-05';
+
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+  WHERE c3 BETWEEN TIME'01:01:01' AND TIME'01:01:05';
+
+SELECT * FROM t1 LEFT JOIN t2 ON c1 = c11
+  WHERE c4 BETWEEN TIMESTAMP'2014-01-01 01:01:01'
+               AND TIMESTAMP'2014-01-05 01:01:01';
+
+DROP TABLE t1, t2;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/temp_pool-master.opt percona-xtrabackup-2.3.7/mysql-test/t/temp_pool-master.opt
--- percona-xtrabackup-2.2.3/mysql-test/t/temp_pool-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/temp_pool-master.opt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+--tmpdir=$MYSQLTEST_VARDIR/tmp
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/temp_pool.test percona-xtrabackup-2.3.7/mysql-test/t/temp_pool.test
--- percona-xtrabackup-2.2.3/mysql-test/t/temp_pool.test	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/temp_pool.test	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+--source include/linux.inc
+--source include/not_embedded.inc
+
+--echo #
+--echo # BUG#11747548:DETECT ORPHAN TEMP-POOL FILES, AND HANDLE GRACEFULLY.
+--echo #
+
+--echo #Set up.
+CREATE TABLE pid_table(pid_no INT);
+CREATE TABLE t1 (a BLOB);
+INSERT INTO t1 VALUES (1), (2);
+
+--echo #Create MYD and MYI files for intrinsic temp table.
+--let $pid_file=`SELECT @@pid_file`
+--replace_result $pid_file pid_file
+--eval LOAD DATA LOCAL INFILE '$pid_file' INTO TABLE pid_table
+--let $temp_file_MYD= `SELECT CONCAT('#sql_', LCASE(HEX(pid_no)), '_0', '.MYD') FROM pid_table`
+--let $temp_file_MYI= `SELECT CONCAT('#sql_', LCASE(HEX(pid_no)), '_0', '.MYI') FROM pid_table`
+--write_file $MYSQLTEST_VARDIR/tmp/$temp_file_MYD
+EOF
+--write_file $MYSQLTEST_VARDIR/tmp/$temp_file_MYI
+EOF
+
+--echo #Reports an error since the temp file already exists.
+--replace_regex /.*Can't create\/write *.*/Can't create or write to file/
+--error 1
+SELECT a FROM t1 ORDER BY rand(1);
+
+--echo #With patch, the query executes successfully.
+SELECT a FROM t1 ORDER BY rand(1);
+
+--echo #cleanup
+DROP TABLE t1, pid_table;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/trigger.test percona-xtrabackup-2.3.7/mysql-test/t/trigger.test
--- percona-xtrabackup-2.2.3/mysql-test/t/trigger.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/trigger.test	2017-02-27 07:47:02.000000000 +0000
@@ -2637,4 +2637,34 @@
 DROP TRIGGER t2_ai;
 DROP TABLE t1, t2, t3;
 
+--echo #
+--echo # Bug#18596756 - FAILED PREPARING OF TRIGGER ON TRUNCATED TABLES CAUSE
+--echo #                ERROR 1054.
+--echo #
+
+CREATE TABLE t1(id INT);
+CREATE TABLE t2(id INT);
+
+CREATE TRIGGER trigger1 BEFORE INSERT ON t1 FOR EACH ROW
+  SET NEW.id= (SELECT * FROM t2);
+
+INSERT INTO t2 VALUES(0);
+INSERT INTO t1 VALUES(0);
+
+TRUNCATE TABLE t2;
+
+INSERT INTO t2 VALUES(0);
+#Without the fix, trigger fired for following INSERT operation reports
+#"ER_BAD_FIELD_ERROR" error.
+INSERT INTO t1 VALUES(0);
+
+DROP TABLE t2;
+
+--error ER_NO_SUCH_TABLE
+#Without the fix, trigger fired for following INSERT operation reports
+#"ER_BAD_FIELD_ERROR" error also here.
+INSERT INTO t1 VALUES(0);
+
+DROP TABLE t1;
+
 --echo End of 6.0 tests.
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/trigger-trans.test percona-xtrabackup-2.3.7/mysql-test/t/trigger-trans.test
--- percona-xtrabackup-2.2.3/mysql-test/t/trigger-trans.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/trigger-trans.test	2017-02-27 07:47:02.000000000 +0000
@@ -2,6 +2,9 @@
 # (or just InnoDB storage engine)
 --source include/have_innodb.inc
 
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
@@ -182,3 +185,54 @@
 select * from t2 order by b;
 drop trigger t1_after_insert;
 drop table t1,t2;
+
+--echo #
+--echo #Bug#19683834 SOME INNODB ERRORS CAUSES STORED FUNCTION
+--echo #             AND TRIGGER HANDLERS TO BE IGNORED
+
+--echo #Code fixed in Bug#16041903
+--enable_connect_log
+
+CREATE TABLE t1 (id int unsigned PRIMARY KEY, val int DEFAULT 0)
+ENGINE=InnoDB;
+INSERT INTO t1 (id) VALUES (1), (2);
+
+CREATE TABLE t2 (id int PRIMARY KEY);
+CREATE TABLE t3 LIKE t2;
+
+# Trigger with continue handler for ER_DUP_ENTRY(1062)
+DELIMITER //;
+CREATE TRIGGER bef_insert BEFORE INSERT ON t2 FOR EACH ROW
+BEGIN
+   DECLARE CONTINUE HANDLER FOR 1062 BEGIN END;
+   INSERT INTO t3 (id) VALUES (NEW.id);
+   INSERT INTO t3 (id) VALUES (NEW.id);
+END//
+DELIMITER ;//
+
+# Transaction 1: Grab locks on t1
+START TRANSACTION;
+UPDATE t1 SET val = val + 1;
+
+# Transaction 2:
+--connect (con2,localhost,root,,test,,)
+SET SESSION innodb_lock_wait_timeout = 2;
+# Trigger lock timeout (1205)
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t1 SET val = val + 1;
+
+# This insert should go through, as the continue handler should
+# handle ER_DUP_ENTRY, even after ER_LOCK_WAIT_TIMEOUT (Bug#16041903)
+INSERT INTO t2 (id) VALUES (1);
+
+# Cleanup
+disconnect con2;
+--source include/wait_until_disconnected.inc
+connection default;
+
+DROP TABLE t3, t2, t1;
+
+--disable_connect_log
+
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/union.test percona-xtrabackup-2.3.7/mysql-test/t/union.test
--- percona-xtrabackup-2.2.3/mysql-test/t/union.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/union.test	2017-02-27 07:47:02.000000000 +0000
@@ -1226,3 +1226,33 @@
 SELECT(SELECT 1 AS a ORDER BY a) AS dev;
 SELECT(SELECT 1 AS a LIMIT 1) AS dev;
 SELECT(SELECT 1 AS a FROM dual ORDER BY a DESC LIMIT 1) AS dev;
+
+--echo #
+--echo # Bug #17059925 : UNIONS COMPUTES ROWS_EXAMINED INCORRECTLY
+--echo #
+
+## Save current state of slow log variables
+SET @old_slow_query_log= @@global.slow_query_log;
+SET @old_log_output= @@global.log_output;
+SET @old_long_query_time= @@long_query_time;
+SET GLOBAL log_output= "TABLE";
+SET GLOBAL slow_query_log= ON;
+SET SESSION long_query_time= 0;
+
+CREATE TABLE t17059925 (a INT);
+CREATE TABLE t2 (b INT);
+CREATE TABLE t3 (c INT);
+INSERT INTO t17059925 VALUES (1), (2), (3);
+INSERT INTO t2 VALUES (4), (5), (6);
+INSERT INTO t3 VALUES (7), (8), (9);
+TRUNCATE table mysql.slow_log;
+--sorted_result
+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3;
+SELECT sql_text, rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%t17059925%';
+DROP TABLE t17059925, t2, t3;
+
+## Reset to initial values
+SET @@long_query_time= @old_long_query_time;
+SET @@global.log_output= @old_log_output;
+SET @@global.slow_query_log= @old_slow_query_log;
+
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/variables-big.test percona-xtrabackup-2.3.7/mysql-test/t/variables-big.test
--- percona-xtrabackup-2.2.3/mysql-test/t/variables-big.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/variables-big.test	2017-02-27 07:47:02.000000000 +0000
@@ -39,18 +39,23 @@
 --disable_warnings
 SET SESSION transaction_prealloc_size=1024*1024*1024*1;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--sorted_result
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*2;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--sorted_result
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*3;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--sorted_result
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*4;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--sorted_result
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*5;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--sorted_result
 SHOW PROCESSLIST;
 --enable_warnings
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/view.test percona-xtrabackup-2.3.7/mysql-test/t/view.test
--- percona-xtrabackup-2.2.3/mysql-test/t/view.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/view.test	2017-02-27 07:47:02.000000000 +0000
@@ -4318,6 +4318,43 @@
 DROP TABLE t1;
 
 
+--echo #
+--echo # BUG#14117018 - MYSQL SERVER CREATES INVALID VIEW DEFINITION
+--echo # BUG#18405221 - SHOW CREATE VIEW OUTPUT INCORRECT
+--echo #
+
+CREATE VIEW v1 AS (SELECT '' FROM DUAL);
+CREATE VIEW v2 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+                  (SELECT '' FROM DUAL);
+CREATE VIEW v3 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+                  (SELECT '' FROM DUAL) UNION ALL
+                  (SELECT '' FROM DUAL);
+CREATE VIEW v4 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+                  (SELECT '' AS col2 FROM DUAL) UNION ALL
+                  (SELECT '' FROM DUAL);
+
+--echo # Name for the column in select1 is set properly with or
+--echo # without this fix.
+SHOW CREATE VIEW v1;
+
+--echo # Name for the column in select2 is set with this fix.
+--echo # Without this fix, name would not have set for the
+--echo # columns in select2.
+SHOW CREATE VIEW v2;
+
+--echo # Name for the field item in select2 & select3 is set with this fix.
+--echo # Without this fix, name would not have set for the
+--echo # columns in select2 & select3.
+SHOW CREATE VIEW v3;
+
+--echo # Name for the field item in select3 is set with this fix.
+--echo # Without this fix, name would not have set for the
+--echo # columns in select3.
+SHOW CREATE VIEW v4;
+
+DROP VIEW v1, v2, v3, v4;
+
+
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.
 --source include/wait_until_count_sessions.inc
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/windows.test percona-xtrabackup-2.3.7/mysql-test/t/windows.test
--- percona-xtrabackup-2.2.3/mysql-test/t/windows.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/windows.test	2017-02-27 07:47:02.000000000 +0000
@@ -98,3 +98,19 @@
 
 SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
   WHERE VARIABLE_NAME = 'socket';
+
+--echo #
+--echo # Bug#16581605: REPLACE.EXE UTILITY IS BROKEN IN 5.5
+--echo #
+
+# Creating a temporary text file.
+--write_file $MYSQL_TMP_DIR/bug16581605.txt
+abc
+def
+EOF
+
+#REPLACE.EXE UTILITY will work fine after the fix.
+--exec $REPLACE abc xyz < $MYSQL_TMP_DIR/bug16581605.txt
+
+#Cleanup
+remove_file $MYSQL_TMP_DIR/bug16581605.txt;
diff -Nru percona-xtrabackup-2.2.3/mysql-test/t/wl6443_deprecation.test percona-xtrabackup-2.3.7/mysql-test/t/wl6443_deprecation.test
--- percona-xtrabackup-2.2.3/mysql-test/t/wl6443_deprecation.test	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/t/wl6443_deprecation.test	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,4 @@
+--source include/have_profiling.inc
 --source include/not_embedded.inc
 --source include/have_validate_password_plugin.inc
 
diff -Nru percona-xtrabackup-2.2.3/mysql-test/valgrind.supp percona-xtrabackup-2.3.7/mysql-test/valgrind.supp
--- percona-xtrabackup-2.2.3/mysql-test/valgrind.supp	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysql-test/valgrind.supp	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2014, 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 Library General Public
@@ -498,200 +498,6 @@
 }
 
 #
-# BUG#45630
-# Suppress valgrind failures within nptl_pthread_exit_hack_handler on Ubuntu 9.04, x86 (but not amd64)
-#
-
-{
-   Mem loss within nptl_pthread_exit_hack_handler 1
-   Memcheck:Leak
-   fun:malloc
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   obj:*/ld-*.so
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-   fun:pthread_exit
-   fun:nptl_pthread_exit_hack_handler
-   fun:start_thread
-   fun:clone
-}
-
-{
-   Mem loss within nptl_pthread_exit_hack_handler 2
-   Memcheck:Leak
-   fun:malloc
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   obj:*/ld-*.so
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-   fun:pthread_exit
-   fun:nptl_pthread_exit_hack_handler
-   fun:start_thread
-   fun:clone
-}
-
-{
-   Mem loss within nptl_pthread_exit_hack_handler 3
-   Memcheck:Leak
-   fun:calloc
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   obj:*/ld-*.so
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-   fun:pthread_exit
-   fun:nptl_pthread_exit_hack_handler
-   fun:start_thread
-   fun:clone
-}
-
-{
-   Mem loss within nptl_pthread_exit_hack_handler 4
-   Memcheck:Leak
-   fun:malloc
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   obj:*/ld-*.so
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-   fun:pthread_exit
-   fun:nptl_pthread_exit_hack_handler
-   fun:start_thread
-}
-
-{
-   Mem loss within nptl_pthread_exit_hack_handler 5
-   Memcheck:Leak
-   fun:calloc
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   obj:*/ld-*.so
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-   fun:pthread_exit
-   fun:nptl_pthread_exit_hack_handler
-   fun:start_thread
-}
-
-# suppressions for glibc 2.6.1 64 bit
-
-{
-   Mem loss within nptl_pthread_exit_hack_handler 6
-   Memcheck:Leak
-   fun:malloc
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-   fun:pthread_exit
-   fun:nptl_pthread_exit_hack_handler
-}
-
-{
-   Mem loss within nptl_pthread_exit_hack_handler 7
-   Memcheck:Leak
-   fun:malloc
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-   fun:pthread_exit
-   fun:nptl_pthread_exit_hack_handler
-   fun:start_thread
-   fun:clone
-}
-
-{
-   Mem loss within nptl_pthread_exit_hack_handler 8
-   Memcheck:Leak
-   fun:calloc
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-   fun:pthread_exit
-   fun:nptl_pthread_exit_hack_handler
-   fun:start_thread
-   fun:clone
-}
-
-{
-   Mem loss within nptl_pthread_exit_hack_handler 8
-   Memcheck:Leak
-   fun:calloc
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   obj:*/ld-*.so
-   obj:*/libc-*.so
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-   fun:pthread_exit
-   fun:nptl_pthread_exit_hack_handler
-}
-
-#
 # Pthread doesn't free all thread specific memory before program exists
 #
 {
@@ -1045,6 +851,34 @@
    fun:SSL_COMP_get_compression_methods
    fun:SSL_library_init
 }
+
+{
+   OpenSSL still reachable.
+   Memcheck:Leak
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:engine_cleanup_add_last
+   fun:ENGINE_add
+}
+
+{
+   OpenSSL still reachable.
+   Memcheck:Leak
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:engine_cleanup_add_last
+   fun:ENGINE_add
+}
+
+{
+   OpenSSL still reachable.
+   Memcheck:Leak
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:ENGINE_new
+}
+
 {
    BUG#14801497 CONDITIONAL JUMP OR MOVE DEPENDS ON UNINITIALISED VALUE(S) IN CREATE_TMP_TABLE
    Memcheck:Cond
diff -Nru percona-xtrabackup-2.2.3/mysys/CMakeLists.txt percona-xtrabackup-2.3.7/mysys/CMakeLists.txt
--- percona-xtrabackup-2.2.3/mysys/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -25,7 +25,6 @@
 				my_compress.c my_copy.c  my_create.c my_delete.c
 				my_div.c my_error.c my_file.c my_fopen.c my_fstream.c 
 				my_gethwaddr.c my_getsystime.c my_getwd.c my_compare.c my_init.c
-				my_isnan.c
 				my_lib.c my_lock.c my_malloc.c my_mess.c
 				my_mkdir.c my_mmap.c my_once.c my_open.c my_pread.c my_pthread.c
 				my_quick.c my_read.c my_redel.c my_rename.c my_seek.c my_sleep.c
@@ -77,7 +76,6 @@
 SET_TARGET_PROPERTIES(queues PROPERTIES COMPILE_FLAGS "-DMAIN")
 ADD_TEST(queues_test queues)
 
-INSTALL_DEBUG_SYMBOLS(mysys)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru percona-xtrabackup-2.2.3/mysys/lf_hash.c percona-xtrabackup-2.3.7/mysys/lf_hash.c
--- percona-xtrabackup-2.2.3/mysys/lf_hash.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/lf_hash.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2015, 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
@@ -503,3 +503,187 @@
   */
   return 0;
 }
+
+/**
+  Search for list element satisfying condition specified by match
+  function and position cursor on it.
+
+  @param head          Head of the list to search in.
+  @param first_hashnr  Hash value to start search from.
+  @param last_hashnr   Hash value to stop search after.
+  @param match         Match function.
+  @param cursor        Cursor to be position.
+  @param pins          LF_PINS for the calling thread to be used during
+                       search for pinning result.
+
+  @retval 0 - not found
+  @retval 1 - found
+*/
+
+static int lfind_match(LF_SLIST * volatile *head,
+                       uint32 first_hashnr, uint32 last_hashnr,
+                       lf_hash_match_func *match,
+                       CURSOR *cursor, LF_PINS *pins)
+{
+  uint32       cur_hashnr;
+  intptr       link;
+
+retry:
+  cursor->prev= (intptr *)head;
+  do { /* PTR() isn't necessary below, head is a dummy node */
+    cursor->curr= (LF_SLIST *)(*cursor->prev);
+    lf_pin(pins, 1, cursor->curr);
+  } while (*cursor->prev != (intptr)cursor->curr && LF_BACKOFF);
+  for (;;)
+  {
+    if (unlikely(!cursor->curr))
+      return 0; /* end of the list */
+    do {
+      /* QQ: XXX or goto retry ? */
+      link= cursor->curr->link;
+      cursor->next= PTR(link);
+      lf_pin(pins, 0, cursor->next);
+    } while (link != cursor->curr->link && LF_BACKOFF);
+    cur_hashnr= cursor->curr->hashnr;
+    if (*cursor->prev != (intptr)cursor->curr)
+    {
+      (void)LF_BACKOFF;
+      goto retry;
+    }
+    if (!DELETED(link))
+    {
+      if (cur_hashnr >= first_hashnr)
+      {
+        if (cur_hashnr > last_hashnr)
+          return 0;
+
+        if (cur_hashnr & 1)
+        {
+          /* Normal node. Check if element matches condition. */
+          if ((*match)((uchar *)(cursor->curr + 1)))
+            return 1;
+        }
+        else
+        {
+          /*
+            Dummy node. Nothing to check here.
+
+            Still thanks to the fact that dummy nodes are never deleted we
+            can save it as a safe place to restart iteration if ever needed.
+          */
+          head= (LF_SLIST * volatile *)&(cursor->curr->link);
+        }
+      }
+
+      cursor->prev= &(cursor->curr->link);
+      lf_pin(pins, 2, cursor->curr);
+    }
+    else
+    {
+      /*
+        we found a deleted node - be nice, help the other thread
+        and remove this deleted node
+      */
+      if (my_atomic_casptr((void **)cursor->prev,
+                           (void **)&cursor->curr, cursor->next))
+        lf_pinbox_free(pins, cursor->curr);
+      else
+      {
+        (void)LF_BACKOFF;
+        goto retry;
+      }
+    }
+    cursor->curr= cursor->next;
+    lf_pin(pins, 1, cursor->curr);
+  }
+}
+
+/**
+  Find random hash element which satisfies condition specified by
+  match function.
+
+  @param hash      Hash to search element in.
+  @param pin       Pins for calling thread to be used during search
+                   and for pinning its result.
+  @param match     Pointer to match function. This function takes
+                   pointer to object stored in hash as parameter
+                   and returns 0 if object doesn't satisfy its
+                   condition (and non-0 value if it does).
+  @param rand_val  Random value to be used for selecting hash
+                   bucket from which search in sort-ordered
+                   list needs to be started.
+
+  @retval A pointer to a random element matching condition.
+  @retval NULL      - if nothing is found
+  @retval MY_ERRPTR - OOM.
+
+  @note This function follows the same pinning protocol as lf_hash_search(),
+        i.e. uses pins[0..2]. On return pins[0..1] are removed and pins[2]
+        is used to pin object found. It is also not removed in case when
+        object is not found/error occurs but its value is undefined in
+        this case.
+        So calling lf_hash_unpin() is mandatory after call to this function
+        in case of both success and failure.
+*/
+
+void *lf_hash_random_match(LF_HASH *hash, LF_PINS *pins,
+                           lf_hash_match_func *match,
+                           uint rand_val)
+{
+  /* Convert random value to valid hash value. */
+  uint hashnr= (rand_val & INT_MAX32);
+  uint bucket;
+  uint32 rev_hashnr;
+  LF_SLIST * volatile *el;
+  CURSOR cursor;
+  int res;
+
+  bucket= hashnr % hash->size;
+  rev_hashnr= my_reverse_bits(hashnr);
+
+  el= lf_dynarray_lvalue(&hash->array, bucket);
+  if (unlikely(!el))
+    return MY_ERRPTR;
+  /*
+    Bucket might be totally empty if it has not been accessed since last
+    time LF_HASH::size has been increased. In this case we initialize it
+    by inserting dummy node for this bucket to the correct position in
+    split-ordered list. This should help future lf_hash_* calls trying to
+    access the same bucket.
+  */
+  if (*el == NULL && unlikely(initialize_bucket(hash, el, bucket, pins)))
+    return MY_ERRPTR;
+
+  /*
+    To avoid bias towards the first matching element in the bucket, we start
+    looking for elements with inversed hash value greater or equal than
+    inversed value of our random hash.
+  */
+  res= lfind_match(el, rev_hashnr | 1, UINT_MAX32, match, &cursor, pins);
+
+  if (! res && hashnr != 0)
+  {
+    /*
+      We have not found matching element - probably we were too close to
+      the tail of our split-ordered list. To avoid bias against elements
+      at the head of the list we restart our search from its head. Unless
+      we were already searching from it.
+
+      To avoid going through elements at which we have already looked
+      twice we stop once we reach element from which we have begun our
+      first search.
+    */
+    el= lf_dynarray_lvalue(&hash->array, 0);
+    if (unlikely(!el))
+      return MY_ERRPTR;
+    res= lfind_match(el, 1, rev_hashnr, match, &cursor, pins);
+  }
+
+  if (res)
+    lf_pin(pins, 2, cursor.curr);
+  lf_unpin(pins, 0);
+  lf_unpin(pins, 1);
+
+  return res ? cursor.curr + 1 : 0;
+}
+
diff -Nru percona-xtrabackup-2.2.3/mysys/mf_iocache2.c percona-xtrabackup-2.3.7/mysys/mf_iocache2.c
--- percona-xtrabackup-2.2.3/mysys/mf_iocache2.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/mf_iocache2.c	2017-02-27 07:47:02.000000000 +0000
@@ -408,6 +408,13 @@
       if (my_b_write(info, (uchar*) par, length2))
 	goto err;
     }
+    else if (*fmt == 'c')                     /* char type parameter */
+    {
+      char par[2];
+      par[0] = va_arg(args, int);
+      if (my_b_write(info, (uchar*) par, 1))
+        goto err;
+    }
     else if (*fmt == 'b')                       /* Sized buffer parameter, only precision makes sense */
     {
       char *par = va_arg(args, char *);
diff -Nru percona-xtrabackup-2.2.3/mysys/my_fopen.c percona-xtrabackup-2.3.7/mysys/my_fopen.c
--- percona-xtrabackup-2.2.3/mysys/my_fopen.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_fopen.c	2017-02-27 07:47:02.000000000 +0000
@@ -120,7 +120,10 @@
                         FILE_SHARE_DELETE, NULL,
                         OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL,
                         NULL)) == INVALID_HANDLE_VALUE)
+  {
+    _close(fd);
     return NULL;
+  }
 
   if ((handle_fd= _open_osfhandle((intptr_t)osfh,
                                   _O_APPEND | _O_TEXT)) == -1)
diff -Nru percona-xtrabackup-2.2.3/mysys/my_fstream.c percona-xtrabackup-2.3.7/mysys/my_fstream.c
--- percona-xtrabackup-2.2.3/mysys/my_fstream.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_fstream.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -104,6 +104,7 @@
   DBUG_ENTER("my_fwrite");
   DBUG_PRINT("my",("stream: 0x%lx  Buffer: 0x%lx  Count: %u  MyFlags: %d",
 		   (long) stream, (long) Buffer, (uint) Count, MyFlags));
+  DBUG_EXECUTE_IF("simulate_fwrite_error",  DBUG_RETURN(-1););
 
 #if !defined(NO_BACKGROUND) && defined(USE_MY_STREAM)
   errors=0;
diff -Nru percona-xtrabackup-2.2.3/mysys/my_isnan.c percona-xtrabackup-2.3.7/mysys/my_isnan.c
--- percona-xtrabackup-2.2.3/mysys/my_isnan.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_isnan.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/* Copyright (c) 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 */
-
-#include "my_global.h"
-
-#ifdef __WIN__
-#include <float.h>
-#endif
-
-#include <math.h>
-
-double my_double_isnan(double x)
-{
-  return isnan(x);
-}
diff -Nru percona-xtrabackup-2.2.3/mysys/my_lib.c percona-xtrabackup-2.3.7/mysys/my_lib.c
--- percona-xtrabackup-2.2.3/mysys/my_lib.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_lib.c	2017-02-27 07:47:02.000000000 +0000
@@ -20,32 +20,9 @@
 #include	<m_string.h>
 #include	<my_dir.h>	/* Structs used by my_dir,includes sys/types */
 #include	"mysys_err.h"
-#if defined(HAVE_DIRENT_H)
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if defined(HAVE_SYS_NDIR_H)
-#  include <sys/ndir.h>
-# endif
-# if defined(HAVE_SYS_DIR_H)
-#  include <sys/dir.h>
-# endif
-# if defined(HAVE_NDIR_H)
-#  include <ndir.h>
-# endif
-# if defined(_WIN32)
-# ifdef __BORLANDC__
-# include <dir.h>
-# endif
-# endif
-#endif
 
-#if defined(HAVE_READDIR_R)
-#define READDIR(A,B,C) ((errno=readdir_r(A,B,&C)) != 0 || !C)
-#else
-#define READDIR(A,B,C) (!(C=readdir(A)))
+#if !defined(_WIN32)
+# include <dirent.h>
 #endif
 
 /*
@@ -88,6 +65,8 @@
 
 #if !defined(_WIN32)
 
+static char* directory_file_name(char *dst, const char *src);
+
 MY_DIR	*my_dir(const char *path, myf MyFlags)
 {
   char          *buffer;
@@ -96,32 +75,27 @@
   DYNAMIC_ARRAY *dir_entries_storage;
   MEM_ROOT      *names_storage;
   DIR		*dirp;
-  struct dirent *dp;
   char		tmp_path[FN_REFLEN + 2], *tmp_file;
-  char	dirent_tmp[sizeof(struct dirent)+_POSIX_PATH_MAX+1];
+  const struct dirent *dp;
 
   DBUG_ENTER("my_dir");
   DBUG_PRINT("my",("path: '%s' MyFlags: %d",path,MyFlags));
 
-#if !defined(HAVE_READDIR_R)
-  mysql_mutex_lock(&THR_LOCK_open);
-#endif
-
   dirp = opendir(directory_file_name(tmp_path,(char *) path));
 #if defined(__amiga__)
   if ((dirp->dd_fd) < 0)			/* Directory doesn't exists */
     goto error;
 #endif
-  if (dirp == NULL || 
+  if (dirp == NULL ||
       ! (buffer= my_malloc(ALIGN_SIZE(sizeof(MY_DIR)) + 
                            ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)) +
                            sizeof(MEM_ROOT), MyFlags)))
     goto error;
 
-  dir_entries_storage= (DYNAMIC_ARRAY*)(buffer + ALIGN_SIZE(sizeof(MY_DIR))); 
+  dir_entries_storage= (DYNAMIC_ARRAY*)(buffer + ALIGN_SIZE(sizeof(MY_DIR)));
   names_storage= (MEM_ROOT*)(buffer + ALIGN_SIZE(sizeof(MY_DIR)) +
                              ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)));
-  
+
   if (my_init_dynamic_array(dir_entries_storage, sizeof(FILEINFO),
                             ENTRIES_START_SIZE, ENTRIES_INCREMENT))
   {
@@ -129,25 +103,23 @@
     goto error;
   }
   init_alloc_root(names_storage, NAMES_START_SIZE, NAMES_START_SIZE);
-  
+
   /* MY_DIR structure is allocated and completly initialized at this point */
   result= (MY_DIR*)buffer;
 
   tmp_file=strend(tmp_path);
 
-  dp= (struct dirent*) dirent_tmp;
-  
-  while (!(READDIR(dirp,(struct dirent*) dirent_tmp,dp)))
+  for (dp= readdir(dirp) ; dp; dp= readdir(dirp))
   {
     if (!(finfo.name= strdup_root(names_storage, dp->d_name)))
       goto error;
-    
+
     if (MyFlags & MY_WANT_STAT)
     {
-      if (!(finfo.mystat= (MY_STAT*)alloc_root(names_storage, 
+      if (!(finfo.mystat= (MY_STAT*)alloc_root(names_storage,
                                                sizeof(MY_STAT))))
         goto error;
-      
+
       memset(finfo.mystat, 0, sizeof(MY_STAT));
       (void) strmov(tmp_file,dp->d_name);
       (void) my_stat(tmp_path, finfo.mystat, MyFlags);
@@ -162,21 +134,16 @@
   }
 
   (void) closedir(dirp);
-#if !defined(HAVE_READDIR_R)
-  mysql_mutex_unlock(&THR_LOCK_open);
-#endif
+
   result->dir_entry= (FILEINFO *)dir_entries_storage->buffer;
   result->number_off_files= dir_entries_storage->elements;
-  
+
   if (!(MyFlags & MY_DONT_SORT))
     my_qsort((void *) result->dir_entry, result->number_off_files,
           sizeof(FILEINFO), (qsort_cmp) comp_names);
   DBUG_RETURN(result);
 
  error:
-#if !defined(HAVE_READDIR_R)
-  mysql_mutex_unlock(&THR_LOCK_open);
-#endif
   my_errno=errno;
   if (dirp)
     (void) closedir(dirp);
@@ -198,7 +165,7 @@
  * Returns pointer to dst;
  */
 
-char * directory_file_name (char * dst, const char *src)
+static char* directory_file_name(char *dst, const char *src)
 {
   /* Process as Unix format: just remove test the final slash. */
   char *end;
diff -Nru percona-xtrabackup-2.2.3/mysys/my_pread.c percona-xtrabackup-2.3.7/mysys/my_pread.c
--- percona-xtrabackup-2.2.3/mysys/my_pread.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_pread.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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,7 +113,7 @@
 } /* my_pread */
 
 
-/*
+/**
   Write a chunk of bytes to a file at a given position
 
   SYNOPSIOS
@@ -129,25 +129,36 @@
     to set the position in the file back to the original position
     if the system doesn't support pwrite()
 
-  RETURN
-    (size_t) -1   Error
-    #             Number of bytes read
+  if (MyFlags & (MY_NABP | MY_FNABP))
+  @returns
+    0  if Count == 0
+    On succes, 0
+    On failure, (size_t)-1 == MY_FILE_ERROR
+
+  otherwise
+  @returns
+    0  if Count == 0
+    On success, the number of bytes written.
+    On partial success (if less than Count bytes could be written),
+       the actual number of bytes written.
+    On failure, (size_t)-1 == MY_FILE_ERROR
 */
 
 size_t my_pwrite(File Filedes, const uchar *Buffer, size_t Count,
                  my_off_t offset, myf MyFlags)
 {
-  size_t writtenbytes, written;
-  uint errors;
+  size_t writtenbytes;
+  size_t sum_written= 0;
+  uint errors= 0;
+  const size_t initial_count= Count;
 
   DBUG_ENTER("my_pwrite");
   DBUG_PRINT("my",("fd: %d  Seek: %llu  Buffer: %p  Count: %lu  MyFlags: %d",
              Filedes, offset, Buffer, (ulong)Count, MyFlags));
-  errors= 0;
-  written= 0;
 
   for (;;)
   {
+    errno= 0;
 #if !defined (HAVE_PREAD) && !defined (_WIN32)
     int error;
     writtenbytes= (size_t) -1;
@@ -163,11 +174,14 @@
     writtenbytes= pwrite(Filedes, Buffer, Count, offset);
 #endif
     if(writtenbytes == Count)
+    {
+      sum_written+= writtenbytes;
       break;
+    }
     my_errno= errno;
     if (writtenbytes != (size_t) -1)
     {
-      written+= writtenbytes;
+      sum_written+= writtenbytes;
       Buffer+= writtenbytes;
       Count-= writtenbytes;
       offset+= writtenbytes;
@@ -185,24 +199,37 @@
       errors++;
       continue;
     }
-    if ((writtenbytes && writtenbytes != (size_t) -1) || my_errno == EINTR)
-      continue;					/* Retry */
+    if (writtenbytes != 0 && writtenbytes != (size_t) -1)
+      continue;
+    else if (my_errno == EINTR)
+    {
+      continue;                                 /* Retry */
+    }
+    else if (writtenbytes == 0 && !errors++)    /* Retry once */
+    {
+      /* We may come here if the file quota is exeeded */
+      continue;
+    }
 #endif
-    if (MyFlags & (MY_NABP | MY_FNABP))
+    break;                                  /* Return bytes written */
+  }
+  if (MyFlags & (MY_NABP | MY_FNABP))
+  {
+    if (sum_written == initial_count)
+      DBUG_RETURN(0);        /* Want only errors, not bytes written */
+    if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
     {
-      if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
-      {
-        char errbuf[MYSYS_STRERROR_SIZE];
-        my_error(EE_WRITE, MYF(ME_BELL | ME_WAITTANG), my_filename(Filedes),
-                 my_errno, my_strerror(errbuf, sizeof(errbuf), my_errno));
-      }
-      DBUG_RETURN(MY_FILE_ERROR);		/* Error on read */
+      char errbuf[MYSYS_STRERROR_SIZE];
+      my_error(EE_WRITE, MYF(ME_BELL | ME_WAITTANG), my_filename(Filedes),
+               my_errno, my_strerror(errbuf, sizeof(errbuf), my_errno));
     }
-    else
-      break;					/* Return bytes written */
+    DBUG_RETURN(MY_FILE_ERROR);
   }
   DBUG_EXECUTE_IF("check", my_seek(Filedes, -1, SEEK_SET, MYF(0)););
-  if (MyFlags & (MY_NABP | MY_FNABP))
-    DBUG_RETURN(0);			/* Want only errors */
-  DBUG_RETURN(writtenbytes+written); /* purecov: inspected */
+
+  if (sum_written == 0)
+    DBUG_RETURN(MY_FILE_ERROR);
+
+  DBUG_RETURN(sum_written);
+
 } /* my_pwrite */
diff -Nru percona-xtrabackup-2.2.3/mysys/my_pthread.c percona-xtrabackup-2.3.7/mysys/my_pthread.c
--- percona-xtrabackup-2.2.3/mysys/my_pthread.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_pthread.c	2017-02-27 07:47:02.000000000 +0000
@@ -28,8 +28,6 @@
 #define SCHED_POLICY SCHED_OTHER
 #endif
 
-uint thd_lib_detected= 0;
-
 /* To allow use of pthread_getspecific with two arguments */
 
 #ifdef HAVE_NONPOSIX_PTHREAD_GETSPECIFIC
diff -Nru percona-xtrabackup-2.2.3/mysys/my_redel.c percona-xtrabackup-2.3.7/mysys/my_redel.c
--- percona-xtrabackup-2.2.3/mysys/my_redel.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_redel.c	2017-02-27 07:47:02.000000000 +0000
@@ -75,19 +75,11 @@
 
 int my_copystat(const char *from, const char *to, int MyFlags)
 {
-  struct stat statbuf;
+  MY_STAT statbuf;
 
-  if (stat(from, &statbuf))
-  {
-    my_errno=errno;
-    if (MyFlags & (MY_FAE+MY_WME))
-    {
-      char errbuf[MYSYS_STRERROR_SIZE];
-      my_error(EE_STAT, MYF(ME_BELL+ME_WAITTANG), from,
-               errno, my_strerror(errbuf, sizeof(errbuf), errno));
-    }
+  if (my_stat(from, &statbuf, MyFlags) == NULL)
     return -1;				/* Can't get stat on input file */
-  }
+
   if ((statbuf.st_mode & S_IFMT) != S_IFREG)
     return 1;
 
diff -Nru percona-xtrabackup-2.2.3/mysys/my_sync.c percona-xtrabackup-2.3.7/mysys/my_sync.c
--- percona-xtrabackup-2.2.3/mysys/my_sync.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_sync.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2015, 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
@@ -90,7 +90,11 @@
     if (after_sync_wait)
       (*after_sync_wait)();
     if ((my_flags & MY_IGNORE_BADFD) &&
-        (er == EBADF || er == EINVAL || er == EROFS))
+        (er == EBADF || er == EINVAL || er == EROFS
+#ifdef __APPLE__
+        || er == ENOTSUP
+#endif
+        ))
     {
       DBUG_PRINT("info", ("ignoring errno %d", er));
       res= 0;
@@ -111,6 +115,8 @@
 } /* my_sync */
 
 
+#ifdef NEED_EXPLICIT_SYNC_DIR
+
 static const char cur_dir_name[]= {FN_CURLIB, 0};
 
 
@@ -126,8 +132,6 @@
     0 if ok, !=0 if error
 */
 
-#ifdef NEED_EXPLICIT_SYNC_DIR
-
 int my_sync_dir(const char *dir_name, myf my_flags)
 {
   File dir_fd;
diff -Nru percona-xtrabackup-2.2.3/mysys/my_thr_init.c percona-xtrabackup-2.3.7/mysys/my_thr_init.c
--- percona-xtrabackup-2.2.3/mysys/my_thr_init.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_thr_init.c	2017-02-27 07:47:02.000000000 +0000
@@ -44,25 +44,7 @@
 #ifdef _MSC_VER
 static void install_sigabrt_handler();
 #endif
-#ifdef TARGET_OS_LINUX
 
-/*
-  Dummy thread spawned in my_thread_global_init() below to avoid
-  race conditions in NPTL pthread_exit code.
-*/
-
-static pthread_handler_t
-nptl_pthread_exit_hack_handler(void *arg __attribute((unused)))
-{
-  /* Do nothing! */
-  pthread_exit(0);
-  return 0;
-}
-
-#endif /* TARGET_OS_LINUX */
-
-
-static uint get_thread_lib(void);
 
 /** True if @c my_thread_global_init() has been called. */
 static my_bool my_thread_global_init_done= 0;
@@ -179,35 +161,6 @@
   if (my_thread_init())
     return 1;
 
-  thd_lib_detected= get_thread_lib();
-
-#ifdef TARGET_OS_LINUX
-  /*
-    BUG#24507: Race conditions inside current NPTL pthread_exit()
-    implementation.
-
-    To avoid a possible segmentation fault during concurrent
-    executions of pthread_exit(), a dummy thread is spawned which
-    initializes internal variables of pthread lib. See bug description
-    for a full explanation.
-
-    TODO: Remove this code when fixed versions of glibc6 are in common
-    use.
-  */
-  if (thd_lib_detected == THD_LIB_NPTL)
-  {
-    pthread_t       dummy_thread;
-    pthread_attr_t  dummy_thread_attr;
-
-    pthread_attr_init(&dummy_thread_attr);
-    pthread_attr_setdetachstate(&dummy_thread_attr, PTHREAD_CREATE_JOINABLE);
-
-    if (pthread_create(&dummy_thread,&dummy_thread_attr,
-                       nptl_pthread_exit_hack_handler, NULL) == 0)
-      (void)pthread_join(dummy_thread, NULL);
-  }
-#endif /* TARGET_OS_LINUX */
-
   mysql_mutex_init(key_THR_LOCK_lock, &THR_LOCK_lock, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_THR_LOCK_myisam, &THR_LOCK_myisam, MY_MUTEX_INIT_SLOW);
   mysql_mutex_init(key_THR_LOCK_myisam_mmap, &THR_LOCK_myisam_mmap, MY_MUTEX_INIT_FAST);
@@ -313,6 +266,9 @@
   struct st_my_thread_var *tmp;
   my_bool error=0;
 
+  if (!my_thread_global_init_done)
+    return 1; /* cannot proceed with unintialized library */
+
 #ifdef EXTRA_DEBUG_THREADS
   fprintf(stderr,"my_thread_init(): thread_id: 0x%lx\n",
           (ulong) pthread_self());
@@ -487,21 +443,6 @@
 #endif /* DBUG_OFF */
 
 
-static uint get_thread_lib(void)
-{
-#ifdef _CS_GNU_LIBPTHREAD_VERSION
-  char buff[64];
-    
-  confstr(_CS_GNU_LIBPTHREAD_VERSION, buff, sizeof(buff));
-
-  if (!strncasecmp(buff, "NPTL", 4))
-    return THD_LIB_NPTL;
-  if (!strncasecmp(buff, "linuxthreads", 12))
-    return THD_LIB_LT;
-#endif
-  return THD_LIB_OTHER;
-}
-
 #ifdef _WIN32
 /*
   In Visual Studio 2005 and later, default SIGABRT handler will overwrite
diff -Nru percona-xtrabackup-2.2.3/mysys/my_wincond.c percona-xtrabackup-2.3.7/mysys/my_wincond.c
--- percona-xtrabackup-2.2.3/mysys/my_wincond.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_wincond.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -344,26 +344,4 @@
   return 0;
 }
 
-/****************************************************************************
-** Fix localtime_r() to be a bit safer
-****************************************************************************/
-
-struct tm *localtime_r(const time_t *timep,struct tm *tmp)
-{
-  if (*timep == (time_t) -1)			/* This will crash win32 */
-  {
-    memset(tmp, 0, sizeof(*tmp));
-  }
-  else
-  {
-    struct tm *res=localtime(timep);
-    if (!res)                                   /* Wrong date */
-    {
-      memset(tmp, 0, sizeof(*tmp));             /* Keep things safe */
-      return 0;
-    }
-    *tmp= *res;
-  }
-  return tmp;
-}
 #endif /* __WIN__ */
diff -Nru percona-xtrabackup-2.2.3/mysys/my_write.c percona-xtrabackup-2.3.7/mysys/my_write.c
--- percona-xtrabackup-2.2.3/mysys/my_write.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/my_write.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -18,16 +18,33 @@
 #include <errno.h>
 
 
-	/* Write a chunk of bytes to a file */
+/**
+  Write a chunk of bytes to a file
 
+  if (MyFlags & (MY_NABP | MY_FNABP))
+  @returns
+    0  if Count == 0
+    On succes, 0
+    On failure, (size_t)-1 == MY_FILE_ERROR
+
+  otherwise
+  @returns
+    0  if Count == 0
+    On success, the number of bytes written.
+    On partial success (if less than Count bytes could be written),
+       the actual number of bytes written.
+    On failure, (size_t)-1 == MY_FILE_ERROR
+*/
 size_t my_write(File Filedes, const uchar *Buffer, size_t Count, myf MyFlags)
 {
-  size_t writtenbytes, written;
-  uint errors;
+  size_t writtenbytes;
+  size_t sum_written= 0;
+  uint errors= 0;
+  const size_t initial_count= Count;
+
   DBUG_ENTER("my_write");
   DBUG_PRINT("my",("fd: %d  Buffer: %p  Count: %lu  MyFlags: %d",
 		   Filedes, Buffer, (ulong) Count, MyFlags));
-  errors= 0; written= 0;
 
   /* The behavior of write(fd, buf, 0) is not portable */
   if (unlikely(!Count))
@@ -37,6 +54,7 @@
                    { DBUG_SET("+d,simulate_file_write_error");});
   for (;;)
   {
+    errno= 0;
 #ifdef _WIN32
     writtenbytes= my_win_write(Filedes, Buffer, Count);
 #else
@@ -48,10 +66,13 @@
                       writtenbytes= (size_t) -1;
                     });
     if (writtenbytes == Count)
+    {
+      sum_written+= writtenbytes;
       break;
+    }
     if (writtenbytes != (size_t) -1)
     {						/* Safeguard */
-      written+= writtenbytes;
+      sum_written+= writtenbytes;
       Buffer+= writtenbytes;
       Count-= writtenbytes;
     }
@@ -72,39 +93,37 @@
       continue;
     }
 
-    if ((writtenbytes == 0 || writtenbytes == (size_t) -1))
+    if (writtenbytes != 0 && writtenbytes != (size_t) -1)
+      continue;                                 /* Retry if something written */
+    else if (my_errno == EINTR)
     {
-      if (my_errno == EINTR)
-      {
-        DBUG_PRINT("debug", ("my_write() was interrupted and returned %ld",
-                             (long) writtenbytes));
-        continue;                               /* Interrupted */
-      }
-
-      if (!writtenbytes && !errors++)		/* Retry once */
-      {
-        /* We may come here if the file quota is exeeded */
-        errno= EFBIG;				/* Assume this is the error */
-        continue;
-      }
+      DBUG_PRINT("debug", ("my_write() was interrupted and returned %ld",
+                           (long) writtenbytes));
+      continue;                                 /* Interrupted, retry */
     }
-    else
-      continue;					/* Retry */
-#endif
-    if (MyFlags & (MY_NABP | MY_FNABP))
+    else if (writtenbytes == 0 && !errors++)    /* Retry once */
     {
-      if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
-      {
-        char errbuf[MYSYS_STRERROR_SIZE];
-        my_error(EE_WRITE, MYF(ME_BELL+ME_WAITTANG), my_filename(Filedes),
-                 my_errno, my_strerror(errbuf, sizeof(errbuf), my_errno));
-      }
-      DBUG_RETURN(MY_FILE_ERROR);		/* Error on read */
+      /* We may come here if the file quota is exeeded */
+      continue;
     }
-    else
-      break;					/* Return bytes written */
+#endif
+    break;
   }
   if (MyFlags & (MY_NABP | MY_FNABP))
-    DBUG_RETURN(0);			/* Want only errors */
-  DBUG_RETURN(writtenbytes+written);
+  {
+    if (sum_written == initial_count)
+      DBUG_RETURN(0);        /* Want only errors, not bytes written */
+    if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
+    {
+      char errbuf[MYSYS_STRERROR_SIZE];
+      my_error(EE_WRITE, MYF(ME_BELL+ME_WAITTANG), my_filename(Filedes),
+               my_errno, my_strerror(errbuf, sizeof(errbuf), my_errno));
+    }
+    DBUG_RETURN(MY_FILE_ERROR);
+  }
+
+  if (sum_written == 0)
+    DBUG_RETURN(MY_FILE_ERROR);
+
+  DBUG_RETURN(sum_written);
 } /* my_write */
diff -Nru percona-xtrabackup-2.2.3/mysys/psi_noop.c percona-xtrabackup-2.3.7/mysys/psi_noop.c
--- percona-xtrabackup-2.2.3/mysys/psi_noop.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/psi_noop.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2015, 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
@@ -629,12 +629,11 @@
   return NULL;
 }
 
-static PSI_digest_locker*
-digest_add_token_noop(PSI_digest_locker *locker NNN,
-                      uint token NNN,
-                      struct OPAQUE_LEX_YYSTYPE *yylval NNN)
+void
+digest_end_noop(PSI_digest_locker *locker NNN,
+                const struct sql_digest_storage *digest NNN)
 {
-  return NULL;
+  return;
 }
 
 static int
@@ -742,7 +741,7 @@
   set_socket_info_noop,
   set_socket_thread_owner_noop,
   digest_start_noop,
-  digest_add_token_noop,
+  digest_end_noop,
   set_thread_connect_attrs_noop
 };
 
diff -Nru percona-xtrabackup-2.2.3/mysys/ptr_cmp.c percona-xtrabackup-2.3.7/mysys/ptr_cmp.c
--- percona-xtrabackup-2.2.3/mysys/ptr_cmp.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/ptr_cmp.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -41,6 +41,16 @@
 
 #else	/* __sun */
 
+/**
+  Special case for ORDER BY / GROUP BY CHAR(0) NOT NULL
+ */
+static
+int ptr_compare_zero_length(size_t *compare_length __attribute__((unused)),
+                            uchar **a __attribute__((unused)),
+                            uchar **b __attribute__((unused)))
+{
+  return 0;
+}
 static int ptr_compare(size_t *compare_length, uchar **a, uchar **b);
 static int ptr_compare_0(size_t *compare_length, uchar **a, uchar **b);
 static int ptr_compare_1(size_t *compare_length, uchar **a, uchar **b);
@@ -58,6 +68,8 @@
 #else
 qsort2_cmp get_ptr_compare (size_t size)
 {
+  if (size == 0)
+    return (qsort2_cmp) ptr_compare_zero_length;
   if (size < 4)
     return (qsort2_cmp) ptr_compare;
   switch (size & 3) {
@@ -85,6 +97,7 @@
   reg3 int length= *compare_length;
   reg1 uchar *first,*last;
 
+  DBUG_ASSERT(length > 0);
   first= *a; last= *b;
   while (--length)
   {
diff -Nru percona-xtrabackup-2.2.3/mysys/thr_alarm.c percona-xtrabackup-2.3.7/mysys/thr_alarm.c
--- percona-xtrabackup-2.2.3/mysys/thr_alarm.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/thr_alarm.c	2017-02-27 07:47:02.000000000 +0000
@@ -80,16 +80,8 @@
   sigfillset(&full_signal_set);			/* Neaded to block signals */
   mysql_mutex_init(key_LOCK_alarm, &LOCK_alarm, MY_MUTEX_INIT_FAST);
   mysql_cond_init(key_COND_alarm, &COND_alarm, NULL);
-  if (thd_lib_detected == THD_LIB_LT)
-    thr_client_alarm= SIGALRM;
-  else
-    thr_client_alarm= SIGUSR1;
-#ifndef USE_ALARM_THREAD
-  if (thd_lib_detected != THD_LIB_LT)
-#endif
-  {
-    my_sigset(thr_client_alarm, thread_alarm);
-  }
+  thr_client_alarm= SIGUSR1;
+  my_sigset(thr_client_alarm, thread_alarm);
   sigemptyset(&s);
   sigaddset(&s, THR_SERVER_ALARM);
   alarm_thread=pthread_self();
@@ -106,11 +98,6 @@
   }
 #elif defined(USE_ONE_SIGNAL_HAND)
   pthread_sigmask(SIG_BLOCK, &s, NULL);		/* used with sigwait() */
-  if (thd_lib_detected == THD_LIB_LT)
-  {
-    my_sigset(thr_client_alarm, process_alarm);        /* Linuxthreads */
-    pthread_sigmask(SIG_UNBLOCK, &s, NULL);
-  }
 #else
   my_sigset(THR_SERVER_ALARM, process_alarm);
   pthread_sigmask(SIG_UNBLOCK, &s, NULL);
@@ -294,18 +281,6 @@
   This must be first as we can't call DBUG inside an alarm for a normal thread
 */
 
-  if (thd_lib_detected == THD_LIB_LT &&
-      !pthread_equal(pthread_self(),alarm_thread))
-  {
-#if defined(MAIN) && !defined(__bsdi__)
-    printf("thread_alarm in process_alarm\n"); fflush(stdout);
-#endif
-#ifdef SIGNAL_HANDLER_RESET_ON_DELIVERY
-    my_sigset(thr_client_alarm, process_alarm);	/* int. thread system calls */
-#endif
-    return;
-  }
-
   /*
     We have to do do the handling of the alarm in a sub function,
     because otherwise we would get problems with two threads calling
diff -Nru percona-xtrabackup-2.2.3/mysys/thr_lock.c percona-xtrabackup-2.3.7/mysys/thr_lock.c
--- percona-xtrabackup-2.2.3/mysys/thr_lock.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/thr_lock.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -377,18 +377,6 @@
   return 0;
 }
 
-static inline my_bool have_specific_lock(THR_LOCK_DATA *data,
-					 enum thr_lock_type type)
-{
-  for ( ; data ; data=data->next)
-  {
-    if (data->type == type)
-      return 1;
-  }
-  return 0;
-}
-
-
 static void wake_up_waiters(THR_LOCK *lock);
 
 
diff -Nru percona-xtrabackup-2.2.3/mysys/waiting_threads.c percona-xtrabackup-2.3.7/mysys/waiting_threads.c
--- percona-xtrabackup-2.2.3/mysys/waiting_threads.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys/waiting_threads.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -294,7 +294,10 @@
 uint32 wt_cycle_stats[2][WT_CYCLE_STATS+1];
 uint32 wt_success_stats;
 
-static my_atomic_rwlock_t cycle_stats_lock, wait_stats_lock, success_stats_lock;
+static my_atomic_rwlock_t
+  cycle_stats_lock __attribute__((unused)),
+  wait_stats_lock __attribute__((unused)),
+  success_stats_lock __attribute__((unused));
 
 #ifdef SAFE_STATISTICS
 #define incr(VAR, LOCK)                           \
diff -Nru percona-xtrabackup-2.2.3/mysys_ssl/CMakeLists.txt percona-xtrabackup-2.3.7/mysys_ssl/CMakeLists.txt
--- percona-xtrabackup-2.2.3/mysys_ssl/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys_ssl/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -62,7 +62,6 @@
 TARGET_LINK_LIBRARIES(mysys_ssl dbug strings ${SSL_LIBRARIES} ${ZLIB_LIBRARY})
 DTRACE_INSTRUMENT(mysys_ssl)
 
-INSTALL_DEBUG_SYMBOLS(mysys_ssl)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(mysys_ssl DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru percona-xtrabackup-2.2.3/mysys_ssl/my_default.cc percona-xtrabackup-2.3.7/mysys_ssl/my_default.cc
--- percona-xtrabackup-2.2.3/mysys_ssl/my_default.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys_ssl/my_default.cc	2017-02-27 07:47:02.000000000 +0000
@@ -154,7 +154,6 @@
 					const char *dir, const char *ext,
 					const char *config_file, int recursion_level);
 static my_bool mysql_file_getline(char *str, int size, MYSQL_FILE *file);
-static int check_file_permissions(const char *file_name);
 
 
 /**
@@ -1460,7 +1459,7 @@
            1 - Failed to stat.
            2 - Success.
 */
-static int check_file_permissions(const char *file_name)
+int check_file_permissions(const char *file_name)
 {
 #if !defined(__WIN__)
   MY_STAT stat_info;
diff -Nru percona-xtrabackup-2.2.3/mysys_ssl/my_getopt.cc percona-xtrabackup-2.3.7/mysys_ssl/my_getopt.cc
--- percona-xtrabackup-2.2.3/mysys_ssl/my_getopt.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/mysys_ssl/my_getopt.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2015, 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
@@ -38,7 +38,6 @@
 static void fini_one_value(const struct my_option *, void *, longlong);
 static int setval(const struct my_option *, void *, char *, my_bool);
 static char *check_struct_option(char *cur_arg, char *key_name);
-static void print_cmdline_password_warning();
 static my_bool get_bool_argument(const struct my_option *opts,
                                  const char *argument,
                                  bool *error);
@@ -656,7 +655,7 @@
  * if password string is specified on the command line.
  */
 
-static void print_cmdline_password_warning()
+void print_cmdline_password_warning()
 {
   static my_bool password_warning_announced= FALSE;
 
@@ -1013,6 +1012,46 @@
   return num;
 }
 
+/*
+  function: eval_num_suffix_ull
+
+  Transforms a number with a suffix to unsigned longlong number. Suffix can
+  be k|K for kilo, m|M for mega or g|G for giga.
+*/
+
+static ulonglong eval_num_suffix_ull(char *argument, int *error,
+                                     char *option_name)
+{
+  char *endchar;
+  ulonglong num;
+
+  *error= 0;
+  errno= 0;
+  num= strtoull(argument, &endchar, 10);
+  if (errno == ERANGE)
+  {
+    my_getopt_error_reporter(ERROR_LEVEL,
+                             "Incorrect unsigned integer value:'%s'", argument);
+    *error= 1;
+    return 0;
+  }
+  if (*endchar == 'k' || *endchar == 'K')
+    num*= 1024L;
+  else if (*endchar == 'm' || *endchar == 'M')
+    num*= 1024L * 1024L;
+  else if (*endchar == 'g' || *endchar == 'G')
+    num*= 1024L * 1024L * 1024L;
+  else if (*endchar)
+  {
+    fprintf(stderr,
+	    "Unknown suffix '%c' used for variable '%s' (value '%s')\n",
+	    *endchar, option_name, argument);
+    *error= 1;
+    return 0;
+  }
+  return num;
+}
+
 /* 
   function: getopt_ll
 
@@ -1117,7 +1156,7 @@
 
 static ulonglong getopt_ull(char *arg, const struct my_option *optp, int *err)
 {
-  ulonglong num= eval_num_suffix(arg, err, (char*) optp->name);
+  ulonglong num= eval_num_suffix_ull(arg, err, (char*) optp->name);
   return getopt_ull_limit_value(num, optp, NULL);
 }
 
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/changelog percona-xtrabackup-2.3.7/packaging/deb-precise/changelog
--- percona-xtrabackup-2.2.3/packaging/deb-precise/changelog	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/changelog	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,77 @@
+mysql-community (5.6.24-1ubuntu12.04) precise; urgency=low
+
+  * new upstream release
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Mon, 16 Feb 2014 15:45:09 +0530
+
+mysql-community (5.6.23-1ubuntu12.04) precise; urgency=low
+
+  * new upstream release
+  * dh_apparmor to now run before dh_installinit in d/rules
+  * mysql-community-server now recommends mysql-client
+  * mysql-community-server now depends on apparmor
+  * removed template install-test-db; not installed by default
+  * d/compat incremented to 9 from 8
+  * d/control updated to build depend on debhelper 9
+  * added d/*.lintian-overrides and d/source/lintian-overrides
+  * d/rules updated to reflect correct file permissions
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 31 Dec 2014 10:51:07 +0530
+
+mysql-community (5.6.22-1ubuntu12.04) precise; urgency=low
+
+  * new upstream release
+  * fixed d/*server.postinst to allow dropping test db without
+    setting root password
+  * init script will now run my_i_db if data dir is not present or empty
+  * updated init script to read app armor profile on startup
+  * added more system resources to app armor profile
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 24 Sep 2014 14:48:07 +0530
+
+mysql-community (5.6.21-1ubuntu12.04) precise; urgency=low
+
+  * new upstream release
+  * updated d/rules to increment -j8 as make option
+  * updated d/source/include-binaries to add mysql_no_login plugin
+  * updated CMake option WITH_EXTRA_CHARSETS from complex to all
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 20 Aug 2014 19:12:30 +0530
+
+mysql-community (5.6.20-1ubuntu12.04) precise; urgency=low
+
+  * new upstream release
+  * added fakeroot as build-dep in d/control
+  * added d/*.dirs for bench, dev and test pkg
+  * updated d/rules to make compilation verbose
+  * removed default CFLAGS, CXXFLAGS in d/rules
+  * added patch for testsuite search paths under d/patches
+  * modified cmake option for testsuite in d/rules
+  * updated patch d/fix-mysql_install_db.patch
+  * enabled two patches in d/patches/series
+  * removed extra permissions check in d/rules when fixed in source
+  * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf
+  * modified d/*-test.* for updated location of testsuite
+  * updated d/{mysql-*-server.install,rules} to include debug plugins
+  * updated d/rules to remove storage engine cmake options
+  * modified data dir permission in d/*server.{pre,post}inst
+  * updated d/source/include-binaries to add debug plugins
+  * updated d/rules to rename debug plugins
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 02 Jul 2014 17:45:30 +0530
+
+mysql-community (5.6.19-1ubuntu12.04) precise; urgency=low
+
+  * new upstream release
+  * d/rules updated to rid of files removed from source
+  * modified path for source tar in source pkg
+  * obscured actual filenames in d/source/include-binaries
+  * modified d/rules to handle obscured filenames
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Mon, 05 May 2014 15:45:10 +0530
+
+mysql-community (5.6.17-1ubuntu12.04) precise; urgency=low
+
+  * new upstream release
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Fri, 28 Feb 2014 18:06:30 +0530
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/compat percona-xtrabackup-2.3.7/packaging/deb-precise/compat
--- percona-xtrabackup-2.2.3/packaging/deb-precise/compat	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/compat	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+9
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/control percona-xtrabackup-2.3.7/packaging/deb-precise/control
--- percona-xtrabackup-2.2.3/packaging/deb-precise/control	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/control	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,188 @@
+Source: mysql-community
+Maintainer: MySQL Release Engineering <mysql-build@oss.oracle.com>
+Section: database
+Priority: optional
+Standards-Version: 3.9.3
+Homepage: http://www.mysql.com/
+Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, lsb-release, cmake, fakeroot
+
+Package: mysql-server
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Server meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql server
+ package available in the repository.
+
+Package: mysql-community-server
+Architecture: any
+Pre-depends: debconf (>= 0.2.17), adduser
+Depends: mysql-common (= ${binary:Version}), apparmor,
+ ${shlibs:Depends}, ${misc:Depends}
+Recommends: mysql-client (= ${binary:Version})
+Conflicts: mysql,
+ mysql-server-5.0, mysql-server-core-5.0,
+ mysql-server-5.1, mysql-server-core-5.1,
+ mysql-server-5.5, mysql-server-core-5.5,
+ mysql-server-5.6, mysql-server-core-5.6,
+ mysql-commercial-server
+Replaces: mysql,
+ mysql-server-5.0, mysql-server-core-5.0,
+ mysql-server-5.1, mysql-server-core-5.1,
+ mysql-server-5.5, mysql-server-core-5.5,
+ mysql-server-5.6, mysql-server-core-5.6,
+ mysql-commercial-server
+Provides: virtual-mysql-server, virtual-mysql-server-core,
+ mysql-server-5.6, mysql-server-core-5.6
+Description: MySQL Server
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package includes the MySQL server binary as well as related
+ utilities to run and administer a MySQL server.
+
+Package: mysql-client
+Architecture: any
+Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Client meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql client
+ package available in the repository.
+
+Package: mysql-community-client
+Architecture: any
+Depends: mysql-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql,
+ mysql-client-5.0, mysql-client-core-5.0,
+ mysql-client-5.1, mysql-client-core-5.1,
+ mysql-client-5.5, mysql-client-core-5.5,
+ mysql-client-5.6, mysql-client-core-5.6,
+ mysql-commercial-client
+Replaces: mysql,
+ mysql-client-5.0, mysql-client-core-5.0,
+ mysql-client-5.1, mysql-client-core-5.1,
+ mysql-client-5.5, mysql-client-core-5.5,
+ mysql-client-5.6, mysql-client-core-5.6,
+ mysql-commercial-client
+Provides: virtual-mysql-client, virtual-mysql-client-core,
+ mysql-client-5.6, mysql-client-core-5.6
+Description: MySQL Client
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the standard MySQL clients and
+ administration tools.
+
+Package: libmysqlclient18
+Architecture: any
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: mysql-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL shared client libraries
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the shared libraries for MySQL client
+ applications.
+
+Package: mysql-common
+Architecture: any
+Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends}
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql
+Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev
+Provides: mysql-common
+Description: MySQL Common
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains common files needed by MySQL client
+ library, MySQL database server, and MySQL embedded server.
+
+Package: libmysqlclient-dev
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient18 (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL development headers
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the development header files necessary
+ to develop MySQL client applications.
+
+Package: libmysqld-dev
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient-dev (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL embedded server library
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the MySQL server as an embedded library.
+
+Package: mysql-testsuite
+Architecture: any
+Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Testsuite meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql test
+ package available in the repository.
+
+Package: mysql-community-test
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}),
+ mysql-community-client (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql,
+ mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5,
+ mysql-testsuite-5.6, mysql-commercial-test
+Description: MySQL Test Run MTR - The MySQL testsuite
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the MySQL regression test suite for MySQL
+ database server.
+
+Package: mysql-community-bench
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql, mysql-commercial-bench
+Description: MySQL Bench
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle.
+
+Package: mysql-community-source
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: MySQL source
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/copyright percona-xtrabackup-2.3.7/packaging/deb-precise/copyright
--- percona-xtrabackup-2.2.3/packaging/deb-precise/copyright	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/copyright	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,41 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: MySQL Server 5.6
+Upstream-Contact: MySQL Release Engineering <mysql-build@oss.oracle.com>
+Source: http://dev.mysql.com/
+
+Copyright: 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+License:
+ This is a release of MySQL, a dual-license SQL database server.
+ For the avoidance of doubt, this particular copy of the software
+ is released under the version 2 of the GNU General Public License.
+ MySQL is brought to you by Oracle.
+ .
+ MySQL FOSS License Exception
+ We want free and open source software applications under certain
+ licenses to be able to use specified GPL-licensed MySQL client
+ libraries despite the fact that not all such FOSS licenses are
+ compatible with version 2 of the GNU General Public License.
+ Therefore there are special exceptions to the terms and conditions
+ of the GPLv2 as applied to these client libraries, which are
+ identified and described in more detail in the FOSS License
+ Exception at
+ <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+ .
+ This distribution may include materials developed by third
+ parties. For license and attribution notices for these
+ materials, please refer to the documentation that accompanies
+ this distribution (see the "Licenses for Third-Party Components"
+ appendix) or view the online documentation at
+ <http://dev.mysql.com/doc/>.
+ .
+ GPLv2 Disclaimer
+ For the avoidance of doubt, except that if any license choice
+ other than GPL or LGPL is available it will apply instead,
+ Oracle elects to use only the General Public License version 2
+ (GPLv2) at this time for any software where a choice of GPL
+ license versions is made available with the language indicating
+ that GPLv2 or any later version may be used, or where a choice
+ .
+ The full text of the GNU General Public License version 2 can
+ be found in the file
+ `/usr/share/mysql/doc/COPYING'.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/extra/apparmor-profile percona-xtrabackup-2.3.7/packaging/deb-precise/extra/apparmor-profile
--- percona-xtrabackup-2.2.3/packaging/deb-precise/extra/apparmor-profile	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/extra/apparmor-profile	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,49 @@
+# vim:syntax=apparmor
+# Last Modified: Fri Feb 28 18:06:30 2014
+#include <tunables/global>
+
+/usr/sbin/mysqld {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+  #include <abstractions/user-tmp>
+
+# Allow system resource access
+  /sys/devices/system/cpu/ r,
+  capability sys_resource,
+  capability dac_override,
+  capability setuid,
+  capability setgid,
+
+# Allow config access
+  /etc/mysql/conf.d/ r,
+  /etc/mysql/conf.d/*.cnf r,
+  /etc/mysql/*.cnf r,
+
+# Allow pid and socket file access
+  /run/mysqld/mysqld.pid rw,
+  /run/mysqld/mysqld.sock rw,
+
+# Allow read/ write to /tmp
+  /tmp/ r,
+  /tmp/* rw,
+
+# Allow execution of server binary
+  /usr/sbin/mysqld mr,
+  /usr/sbin/mysqld-debug mr,
+
+# Allow plugin access
+  /usr/lib/mysql/plugin/ r,
+  /usr/lib/mysql/plugin/*.so* mr,
+
+# Allow error msg and charset access
+  /usr/share/mysql/ r,
+  /usr/share/mysql/** r,
+
+# Allow data dir access
+  /var/lib/mysql/ r,
+  /var/lib/mysql/** rwk,
+
+# Allow log file access
+  /var/log/mysql/ r,
+  /var/log/mysql/** rw,
+}
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/extra/my.cnf percona-xtrabackup-2.3.7/packaging/deb-precise/extra/my.cnf
--- percona-xtrabackup-2.2.3/packaging/deb-precise/extra/my.cnf	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/extra/my.cnf	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,57 @@
+# Copyright (c) 2014, 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
+
+#
+# The MySQL Community Server configuration file.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+[client]
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+[mysqld_safe]
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+nice		= 0
+
+[mysqld]
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+lc-messages-dir	= /usr/share/mysql
+explicit_defaults_for_timestamp
+
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+bind-address	= 127.0.0.1
+
+log-error	= /var/log/mysql/error.log
+
+# Recommended in standard MySQL setup
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+!includedir /etc/mysql/conf.d/
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/extra/mysql_embedded.1 percona-xtrabackup-2.3.7/packaging/deb-precise/extra/mysql_embedded.1
--- percona-xtrabackup-2.2.3/packaging/deb-precise/extra/mysql_embedded.1	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/extra/mysql_embedded.1	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+.so man1/mysql.1
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient18.install percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient18.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient18.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient18.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2014, 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
+
+usr/lib/*/libmysqlclient.so.*
+# legal
+usr/share/doc/libmysqlclient18/COPYING
+usr/share/doc/libmysqlclient18/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient18.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient18.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient18.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient18.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql
+libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz
+libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+libmysqlclient18: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient-dev.dirs percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient-dev.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient-dev.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient-dev.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,17 @@
+# Copyright (c) 2014, 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
+
+usr/include/mysql
+usr/include/mysql/mysql
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient-dev.install percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient-dev.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient-dev.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,29 @@
+# Copyright (c) 2014, 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
+
+usr/include/mysql/*.h
+usr/include/mysql/mysql/*.h
+usr/include/mysql/mysql/*.h.pp
+usr/include/mysql/mysql/psi/*.h
+usr/lib/*/libmysqlclient.a
+usr/lib/*/libmysqlclient.so
+usr/lib/*/libmysqlservices.a
+usr/bin/mysql_config
+usr/bin/mysql_config_editor
+usr/share/man/man1/mysql_config.1
+usr/share/man/man1/mysql_config_editor.1
+# legal
+usr/share/doc/libmysqlclient-dev/COPYING
+usr/share/doc/libmysqlclient-dev/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient-dev.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient-dev.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqlclient-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqlclient-dev.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql
+libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz
+libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+libmysqlclient-dev: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqld-dev.install percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqld-dev.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqld-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqld-dev.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2014, 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
+
+usr/lib/*/libmysqld.a
+usr/lib/*/libmysqld-debug.a
+# legal
+usr/share/doc/libmysqld-dev/COPYING
+usr/share/doc/libmysqld-dev/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqld-dev.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqld-dev.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/libmysqld-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/libmysqld-dev.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql
+libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz
+libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-client.install percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-client.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-client.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-client.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 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
+
+# legal
+usr/share/doc/mysql-client/COPYING
+usr/share/doc/mysql-client/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-client.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-client.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-client.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-client.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql
+mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz
+mysql-client: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-common.dirs percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-common.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-common.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-common.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+# Copyright (c) 2014, 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
+
+etc/mysql/conf.d
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-common.install percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-common.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-common.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-common.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,30 @@
+# Copyright (c) 2014, 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
+
+etc/mysql/my.cnf
+usr/share/aclocal/mysql.m4
+usr/share/mysql/docs/INFO_SRC
+usr/share/mysql/docs/INFO_BIN
+usr/share/mysql/INSTALL-BINARY
+usr/share/mysql/docs/ChangeLog
+# localized error msgs
+usr/share/mysql/*/errmsg.sys
+usr/share/mysql/errmsg-utf8.txt
+# charsets
+usr/share/mysql/charsets/*.xml
+usr/share/mysql/charsets/README
+# legal
+usr/share/doc/mysql-common/COPYING
+usr/share/doc/mysql-common/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-common.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-common.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-common.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-common.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql
+mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz
+mysql-common: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-bench.dirs percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-bench.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-bench.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-bench.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,17 @@
+# Copyright (c) 2014, 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
+
+usr/lib/mysql
+usr/lib/mysql/sql-bench
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-bench.install percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-bench.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-bench.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-bench.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2014, 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
+
+usr/lib/mysql/sql-bench/*
+# legal
+usr/share/doc/mysql-community-bench/COPYING
+usr/share/doc/mysql-community-bench/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-bench.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-bench.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-bench.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-bench.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql
+mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz
+mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-client.install percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-client.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-client.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-client.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,60 @@
+# Copyright (c) 2014, 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
+
+# binaries
+usr/bin/innochecksum
+usr/bin/myisam_ftdump
+usr/bin/mysql
+usr/bin/mysql_embedded
+usr/bin/mysqlaccess
+usr/bin/mysqlaccess.conf
+usr/bin/mysqladmin
+usr/bin/mysqlbug
+usr/bin/mysqlcheck
+usr/bin/mysql_client_test
+usr/bin/mysql_client_test_embedded
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysqlimport
+usr/bin/mysql_plugin
+usr/bin/mysqlshow
+usr/bin/mysqlslap
+usr/bin/mysql_waitpid
+# man pages
+usr/share/man/man1/innochecksum.1
+usr/share/man/man1/myisam_ftdump.1
+usr/share/man/man1/mysql.1
+usr/share/man/man1/mysql_embedded.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqlbug.1
+usr/share/man/man1/mysqlcheck.1
+usr/share/man/man1/mysql_client_test.1
+usr/share/man/man1/mysql_client_test_embedded.1
+usr/share/man/man1/mysqldump.1
+usr/share/man/man1/mysqldumpslow.1
+usr/share/man/man1/mysql_find_rows.1
+usr/share/man/man1/mysql_fix_extensions.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlman.1
+usr/share/man/man1/mysql_plugin.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
+usr/share/man/man1/mysql_waitpid.1
+# legal
+usr/share/doc/mysql-community-client/COPYING
+usr/share/doc/mysql-community-client/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-client.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-client.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-client.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-client.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql
+mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz
+mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+mysql-community-client: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.config percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.config
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.config	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.config	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ] && [ -z "$2" ];
+then
+
+	set -e
+
+	PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server
+	INSTALLED_PKG=none
+	MYSQLDATA=/var/lib/mysql
+
+	IFS_BACKUP=${IFS}
+	IFS=":"
+	for PKG in ${PKG_LIST};
+	do
+		STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4)
+		if [ "${STATUS}" = "installed" ];
+		then
+			INSTALLED_PKG=${PKG}
+			break
+		fi
+	done
+	IFS=${IFS_BACKUP}
+
+	if [ "${INSTALLED_PKG}" = "none" ];
+	then
+		if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ];
+		then
+			db_input high mysql-community-server/data-dir || true
+		else
+			db_fset mysql-community-server/data-dir seen true
+		fi
+
+		while :; do
+			PASSWD=""
+			db_input high mysql-community-server/root-pass || true
+			db_go
+
+			db_get mysql-community-server/root-pass
+			if [ -z "${RET}" ];
+			then
+				db_fset mysql-community-server/root-pass seen true
+				db_fset mysql-community-server/re-root-pass seen true
+				break
+			fi
+			PASSWD="${RET}"
+
+			db_input high mysql-community-server/re-root-pass || true
+			db_go
+
+			db_get mysql-community-server/re-root-pass
+			if [ "${RET}" == "${PASSWD}" ];
+			then
+				PASSWD=""
+				break
+			fi
+
+			db_fset mysql-community-server/root-pass-mismatch seen false
+			db_input critical mysql-community-server/root-pass-mismatch
+			db_set mysql-community-server/root-pass ""
+			db_set mysql-community-server/re-root-pass ""
+		done
+
+	else
+		db_fset mysql-community-server/data-dir seen true
+		db_fset mysql-community-server/root-pass seen true
+		db_fset mysql-community-server/re-root-pass seen true
+	fi
+
+	set +e
+fi
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.dirs percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2014, 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
+
+etc/mysql/conf.d
+etc/init.d
+usr/lib/mysql
+usr/lib/mysql/plugin
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.install percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,86 @@
+# Copyright (c) 2014, 2015, 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
+
+# binaries
+usr/bin/msql2mysql
+usr/bin/myisamchk
+usr/bin/myisamlog
+usr/bin/myisampack
+usr/bin/my_print_defaults
+usr/bin/mysqlbinlog
+usr/bin/mysql_convert_table_format
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqlhotcopy
+usr/bin/mysql_install_db
+usr/bin/mysql_secure_installation
+usr/bin/mysql_setpermission
+usr/bin/mysqltest
+usr/bin/mysqltest_embedded
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysql_upgrade
+usr/bin/mysql_zap
+usr/bin/perror
+usr/bin/replace
+usr/bin/resolveip
+usr/bin/resolve_stack_dump
+usr/sbin/mysqld
+# debug binary
+usr/sbin/mysqld-debug
+# man pages
+usr/share/man/man1/comp_err.1
+usr/share/man/man1/msql2mysql.1
+usr/share/man/man1/myisamchk.1
+usr/share/man/man1/myisamlog.1
+usr/share/man/man1/myisampack.1
+usr/share/man/man1/my_print_defaults.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysqld_multi.1
+usr/share/man/man1/mysqld_safe.1
+usr/share/man/man1/mysqlhotcopy.1
+usr/share/man/man1/mysql_install_db.1
+usr/share/man/man1/mysql_secure_installation.1
+usr/share/man/man1/mysql.server.1
+usr/share/man/man1/mysql_setpermission.1
+usr/share/man/man1/mysql-stress-test.pl.1
+usr/share/man/man1/mysqltest.1
+usr/share/man/man1/mysqltest_embedded.1
+usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man1/mysql_upgrade.1
+usr/share/man/man1/mysql_zap.1
+usr/share/man/man1/perror.1
+usr/share/man/man1/replace.1
+usr/share/man/man1/resolveip.1
+usr/share/man/man1/resolve_stack_dump.1
+usr/share/man/man8/mysqld.8
+# app armor profile
+etc/apparmor.d/usr.sbin.mysqld
+# SQL files
+usr/share/mysql/*.sql
+# plugins
+usr/lib/mysql/plugin/*.so
+usr/lib/mysql/plugin/debug/*.so
+usr/lib/mysql/plugin/daemon_example.ini
+usr/lib/mysql/plugin/debug/daemon_example.ini
+# support files
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/magic
+usr/share/mysql/mysql-log-rotate
+usr/share/mysql/my-default.cnf
+usr/share/mysql/dictionary.txt
+# legal
+usr/share/doc/mysql-community-server/COPYING
+usr/share/doc/mysql-community-server/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,23 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql
+mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz
+mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+mysql-community-server: embedded-library
+# Since we ship debug plugins so this error is overridden
+mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/*
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.mysql.init percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.mysql.init
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.mysql.init	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.mysql.init	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,174 @@
+#!/bin/bash
+#
+### BEGIN INIT INFO
+# Provides:          mysql
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Should-Start:      $network $time
+# Should-Stop:       $network $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/ Stop MySQL Community Server daemon
+# Description:       This service script facilitates startup and shutdown of
+#                    mysqld daemon throught its wrapper script mysqld_safe
+### END INIT INFO
+#
+
+# Copyright (c) 2014, 2015, 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
+
+. /lib/lsb/init-functions
+
+cd /
+umask 077
+
+MYSQLDATA=/var/lib/mysql
+VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4)
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+  'start')
+	PSCOUNT=$(get_pcount)
+	if [ "${PSCOUNT}" -gt 1 ];
+	then
+		log_action_msg "A MySQL Server is already started"
+	else
+		MYSQLRUN=/var/run/mysqld
+		MYSQLDATA=/var/lib/mysql
+		MYSQLLOG=/var/log/mysql
+
+		if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ];
+		then
+			mkdir ${MYSQLDATA}
+			chown mysql:mysql ${MYSQLDATA}
+			chmod 750 ${MYSQLDATA}
+		fi
+
+		if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ];
+		then
+			mkdir ${MYSQLDATA}/mysql
+			chown mysql:mysql ${MYSQLDATA}/mysql
+			chmod 750 ${MYSQLDATA}/mysql
+		fi
+
+		if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ];
+		then
+			mysql_install_db --user=mysql > /dev/null
+		fi
+
+		if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ];
+		then
+			mkdir ${MYSQLLOG}
+			chown mysql:adm ${MYSQLLOG}
+			chmod 750 ${MYSQLLOG}
+			touch ${MYSQLLOG}/error.log
+			chmod 640 ${MYSQLLOG}/error.log
+			chown mysql:adm ${MYSQLLOG}/error.log
+		fi
+
+		if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ];
+		then
+			mkdir ${MYSQLRUN}
+			chown mysql:mysql ${MYSQLRUN}
+			chmod 755 ${MYSQLRUN}
+		fi
+
+		/lib/init/apparmor-profile-load usr.sbin.mysqld
+
+		su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &"
+		for i in 1 2 3 4 5 6;
+		do
+			sleep 1
+			echo -n .
+		done
+		echo
+		PSCOUNT=$(get_pcount)
+		if [ "${PSCOUNT}" -gt 1 ];
+		then
+			log_action_msg "MySQL Community Server ${VERSION} is started"
+		else
+			log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details."
+		fi
+	fi
+	;;
+
+  'stop')
+	PSCOUNT=$(get_pcount)
+	if [ "${PSCOUNT}" -gt 1 ];
+	then
+		killall -15 mysqld
+		server_stop
+		if [ "$?" -eq 0 ];
+		then
+			log_action_msg "MySQL Community Server ${VERSION} is stopped"
+		else
+			log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out"
+		fi
+	else
+		log_action_msg "MySQL Community Server ${VERSION} is already stopped"
+	fi
+	;;
+
+  'restart'|'reload'|'force-reload')
+	log_action_msg "Stopping MySQL Community Server ${VERSION}"
+	$0 stop
+	log_action_msg "Re-starting MySQL Community Server ${VERSION}"
+	$0 start
+	;;
+
+  'status')
+	PSCOUNT=$(get_pcount)
+	if [ ${PSCOUNT} -gt 1 ];
+	then
+		log_action_msg "MySQL Community Server ${VERSION} is running"
+	else
+		log_action_msg "MySQL Community Server ${VERSION} is not running"
+		exit 3
+	fi
+	;;
+
+  *)
+	echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
+	exit 1
+	;;
+esac
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.postinst percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.postinst
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.postinst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.postinst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+. /usr/share/debconf/confmodule
+
+take_upstart_job_backup () {
+	if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ];
+	then
+		mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup
+	fi
+}
+
+case "$1" in
+	configure)
+
+	if [ -z "$2" ];
+	then
+		set -e
+
+		MYSQLDATA=/var/lib/mysql
+
+		if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ];
+		then
+			mkdir ${MYSQLDATA}/mysql
+			chown mysql:mysql ${MYSQLDATA}/mysql
+			chmod 750 ${MYSQLDATA}/mysql
+			if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ];
+			then
+				mysql_install_db --user=mysql > /dev/null
+			fi
+		fi
+
+		db_get mysql-community-server/root-pass && PASSWD=${RET}
+		if [ ! -z "${PASSWD}" ];
+		then
+			db_set mysql-community-server/root-pass ""
+			db_set mysql-community-server/re-root-pass ""
+			PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';"
+		else
+			PASSWD=""
+		fi
+
+		SQL=`mktemp`
+		if [ -f "${SQL}" ];
+		then
+			chmod 700 ${SQL}
+			cat << EOF > ${SQL}
+USE mysql;
+${PASSWD}
+DELETE FROM user WHERE user='';
+FLUSH PRIVILEGES;
+EOF
+			mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL
+			PASSWD=""
+			rm -f ${SQL}
+		fi
+
+		set +e
+
+	fi
+
+	;;
+
+	abort-upgrade|abort-remove|abort-configure)
+
+	;;
+
+	*)
+	exit 1
+	;;
+esac
+
+db_stop
+
+take_upstart_job_backup
+
+#DEBHELPER#
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.postrm percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.postrm
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.postrm	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.postrm	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,154 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ];
+then
+. /usr/share/debconf/confmodule
+fi
+
+place_upstart_job_back () {
+	if [ -e "/var/lib/mysql/.mysql.conf.backup" ];
+	then
+		mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf
+	fi
+}
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+	remove)
+
+	set -e
+
+	place_upstart_job_back
+
+	set +e
+
+	;;
+
+	purge)
+
+	set -e
+
+	place_upstart_job_back
+
+	MYSQLDATA=/var/lib/mysql
+	MYSQLLOG=/var/log/mysql
+	MYSQLRUN=/var/run/mysqld
+
+	server_stop
+
+	db_input high mysql-community-server/remove-data-dir || true
+	db_go
+	db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET}
+	if [ "${RMDATADIR}" = "true" ];
+	then
+		if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ];
+		then
+			rm -rf ${MYSQLRUN}
+		fi
+
+		if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ];
+		then
+			rm -rf ${MYSQLLOG}
+		fi
+
+		if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ];
+		then
+			rm -rf ${MYSQLDATA}
+		fi
+
+		if getent passwd mysql >/dev/null;
+		then
+			userdel mysql
+		fi
+	fi
+
+	set +e
+	;;
+
+	abort-install)
+
+	set -e
+
+	place_upstart_job_back
+
+	if [ -x "/etc/init.d/mysql" ];
+	then
+		invoke-rc.d mysql start || exit $?
+	else
+	        if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ];
+		then
+			rm -rf ${MYSQLRUN}
+		fi
+
+		if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ];
+		then
+			rm -rf ${MYSQLLOG}
+		fi
+
+		if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ];
+		then
+			rm -rf ${MYSQLDATA}
+		fi
+
+		if getent passwd mysql >/dev/null;
+		then
+			userdel mysql
+		fi
+	fi
+
+	set +e
+	;;
+
+	upgrade|abort-upgrade)
+
+	;;
+
+	*)
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.preinst percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.preinst
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.preinst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.preinst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,123 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+	install)
+
+	if [ -z "$2" ];
+	then
+
+		set -e
+
+		if [ -x "/etc/init.d/mysql" ];
+		then
+			invoke-rc.d mysql stop || exit $?
+			server_stop
+		fi
+
+		MYSQLDATA=/var/lib/mysql
+		MYSQLLOG=/var/log/mysql
+		MYSQLRUN=/var/run/mysqld
+
+		if ! getent group mysql >/dev/null;
+		then
+			addgroup --system mysql >/dev/null
+		fi
+
+		if ! getent passwd mysql >/dev/null;
+		then
+			adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null
+		fi
+
+		if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ];
+		then
+			mkdir ${MYSQLDATA}
+			chown mysql:mysql ${MYSQLDATA}
+			chmod 750 ${MYSQLDATA}
+		fi
+
+		if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ];
+		then
+			mkdir ${MYSQLLOG}
+			chown mysql:adm ${MYSQLLOG}
+			chmod 750 ${MYSQLLOG}
+			touch ${MYSQLLOG}/error.log
+			chmod 640 ${MYSQLLOG}/error.log
+			chown mysql:adm ${MYSQLLOG}/error.log
+		fi
+
+		if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ];
+		then
+			mkdir ${MYSQLRUN}
+			chown mysql:mysql ${MYSQLRUN}
+			chmod 755 ${MYSQLRUN}
+		fi
+
+		set +e
+
+	fi
+
+	;;
+
+	upgrade)
+
+	set -e
+
+	#DEBHELPER#
+	server_stop
+
+	set +e
+
+	;;
+
+	abort-upgrade)
+
+	;;
+
+	*)
+        exit 1
+        ;;
+esac
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.prerm percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.prerm
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.prerm	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.prerm	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+set -e
+
+#DEBHELPER#
+
+set +e
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.templates percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.templates
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-server.templates	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-server.templates	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+Template: mysql-community-server/root-pass
+Type: password
+Description: Enter root password:
+ Please provide a strong password that will be set for the root account of your MySQL database.
+ Leave it blank if you do not wish to set or change the root password at this time.
+
+Template: mysql-community-server/re-root-pass
+Type: password
+Description: Re-enter root password:
+ Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone.
+
+Template: mysql-community-server/root-pass-mismatch
+Type: error
+Description: The two passwords did not match
+ Please try again. Make sure you type the exact same password twice.
+
+Template: mysql-community-server/remove-data-dir
+Type: boolean
+Default: false
+Description: Remove data directory at /var/lib/mysql ?
+ This operation will remove the data directory that stores all the databases, tables and related meta-data.
+ It is highly recommended to take data backup before removing the data directory.
+
+Template: mysql-community-server/data-dir
+Type: note
+Description: Data directory found when no MySQL server package is installed
+ A data directory '/var/lib/mysql' is present on this system when no MySQL server 
+ package is currently installed on the system. The directory may be under control of
+ server package received from third-party vendors. It may also be an unclaimed data
+ directory from previous removal of mysql packages.
+ .
+ It is highly recommended to take data backup. If you have not done so, now would be
+ the time to take backup in another shell. Once completed, press 'Ok' to continue.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-source.install percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-source.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-source.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-source.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2014, 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
+
+../*.dsc    usr/src/mysql/
+../*.tar.gz usr/src/mysql/
+# legal
+usr/share/doc/mysql-community-source/COPYING
+usr/share/doc/mysql-community-source/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-source.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-source.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-source.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-source.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql
+mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz
+mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-test.dirs percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-test.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-test.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-test.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+# Copyright (c) 2014, 2015, 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
+
+usr/lib/mysql-test
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-test.install percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-test.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-test.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-test.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2014, 2015, 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
+
+usr/lib/mysql-test/*
+usr/share/man/man1/mysql-test-run.pl.1
+# legal
+usr/share/doc/mysql-community-test/COPYING
+usr/share/doc/mysql-community-test/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-test.links percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-test.links
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-test.links	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-test.links	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,17 @@
+# Copyright (c) 2014, 2015, 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
+
+usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run
+usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-test.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-test.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-community-test.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-community-test.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql
+mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz
+mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-server.install percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-server.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-server.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-server.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 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
+
+# legal
+usr/share/doc/mysql-server/COPYING
+usr/share/doc/mysql-server/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-server.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-server.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-server.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-server.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql
+mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz
+mysql-server: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-testsuite.install percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-testsuite.install
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-testsuite.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-testsuite.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 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
+
+# legal
+usr/share/doc/mysql-testsuite/COPYING
+usr/share/doc/mysql-testsuite/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-testsuite.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-testsuite.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-precise/mysql-testsuite.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/mysql-testsuite.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql
+mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz
+mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/patches/fix-man-page-links.patch percona-xtrabackup-2.3.7/packaging/deb-precise/patches/fix-man-page-links.patch
--- percona-xtrabackup-2.2.3/packaging/deb-precise/patches/fix-man-page-links.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/patches/fix-man-page-links.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,14 @@
+From: Akhil Mohan <akhil.mohan@oracle.com>
+Description: Fix path in man page link.
+Bug: http://bugs.mysql.com/bug.php?id=70952
+
+--- a/man/mysql_client_test_embedded.1	2013-11-08 19:00:22.000000000 +0530
++++ b/man/mysql_client_test_embedded.1	2013-11-14 19:29:56.768315219 +0530
+@@ -1 +1 @@
+-.so man-gpl-tmp2/mysql_client_test.1
++.so man1/mysql_client_test.1
+--- a/man/mysqltest_embedded.1	2013-11-08 19:00:22.000000000 +0530
++++ b/man/mysqltest_embedded.1	2013-11-14 19:31:19.079280675 +0530
+@@ -1 +1 @@
+-.so man-gpl-tmp2/mysqltest.1
++.so man1/mysqltest.1
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/patches/fix-mtr-search-paths.patch percona-xtrabackup-2.3.7/packaging/deb-precise/patches/fix-mtr-search-paths.patch
--- percona-xtrabackup-2.2.3/packaging/deb-precise/patches/fix-mtr-search-paths.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/patches/fix-mtr-search-paths.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+From: Akhil Mohan <akhil.mohan@oracle.com>
+Description: Adding extra search path for testsuite.
+
+--- a/mysql-test/lib/mtr_cases.pm	2014-02-24 13:14:37 +0530
++++ b/mysql-test/lib/mtr_cases.pm	2014-07-02 11:46:24 +0530
+@@ -288,6 +288,7 @@
+     {
+       $suitedir= my_find_dir($::basedir,
+ 			     ["share/mysql-test/suite",
++			      "lib/mysql-test/suite",
+ 			      "mysql-test/suite",
+ 			      "internal/mysql-test/suite",
+ 			      "mysql-test",
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/patches/fix-mysql_install_db.patch percona-xtrabackup-2.3.7/packaging/deb-precise/patches/fix-mysql_install_db.patch
--- percona-xtrabackup-2.2.3/packaging/deb-precise/patches/fix-mysql_install_db.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/patches/fix-mysql_install_db.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,43 @@
+From: Terje Røsten <terje.rosten@oracle.com>
+Description: Maintains the pending --skip-my-cnf option in mainline
+Bug: <TODO>
+
+diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
+index 440a977..7d068fc 100644
+--- a/scripts/mysql_install_db.pl.in
++++ b/scripts/mysql_install_db.pl.in
+@@ -113,6 +113,7 @@ EOF2
+   print <<EOF3;
+   --rpm                For internal use.  This option is used by RPM files
+                        during the MySQL installation process.
++                       Implies --keep-my-cnf option.
+   --skip-name-resolve  Use IP addresses rather than hostnames when creating
+                        grant table entries.  This option can be useful if
+                        your DNS does not work.
+@@ -439,7 +440,7 @@ if ( $opt->{srcdir} and $opt->{basedir} )
+ {
+   error($opt,"Specify either --basedir or --srcdir, not both");
+ }
+-if ( $opt->{'keep-my-cnf'} )
++if ( $opt->{rpm} || $opt->{'keep-my-cnf'} )
+ {
+   $keep_my_cnf = 1;
+ }
+@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
+ }
+
+ # ----------------------------------------------------------------------
+-# Create database directories mysql & test
++# Create database directory mysql
+ # ----------------------------------------------------------------------
+
+ # FIXME The shell variant uses "mkdir -p":
+@@ -697,7 +698,7 @@ if ($opt_user)
+   }
+ }
+
+-foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
++foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql")
+ {
+   mkdir($dir, 0700) unless -d $dir;
+   if ($opt_user and -w "/")
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/patches/series percona-xtrabackup-2.3.7/packaging/deb-precise/patches/series
--- percona-xtrabackup-2.2.3/packaging/deb-precise/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/patches/series	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 2015, 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
+
+#fix-man-page-links.patch
+fix-mysql_install_db.patch
+fix-mtr-search-paths.patch
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/rules percona-xtrabackup-2.3.7/packaging/deb-precise/rules
--- percona-xtrabackup-2.2.3/packaging/deb-precise/rules	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/rules	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,135 @@
+#!/usr/bin/make -f
+
+# Copyright (c) 2014, 2015, 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
+
+%:
+	dh $@
+
+export DH_VERBOSE=1
+export CFLAGS=
+export CXXFLAGS=
+
+override_dh_auto_configure:
+	@echo "RULES.$@"
+	cmake . \
+		-DBUILD_CONFIG=mysql_release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DINSTALL_DOCDIR=share/mysql/docs \
+		-DINSTALL_DOCREADMEDIR=share/mysql \
+		-DINSTALL_INCLUDEDIR=include/mysql \
+		-DINSTALL_INFODIR=share/mysql/docs \
+		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_MANDIR=share/man \
+		-DINSTALL_MYSQLSHAREDIR=share/mysql \
+		-DINSTALL_MYSQLTESTDIR=lib/mysql-test \
+		-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+		-DINSTALL_SBINDIR=sbin \
+		-DINSTALL_SCRIPTDIR=bin \
+		-DINSTALL_SQLBENCHDIR=lib/mysql \
+		-DINSTALL_SUPPORTFILESDIR=share/mysql \
+		-DMYSQL_DATADIR=/var/lib/mysql \
+		-DSYSCONFDIR=/etc/mysql \
+		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+		-DWITH_SSL=bundled \
+		-DWITH_ZLIB=system \
+		-DWITH_EXTRA_CHARSETS=all \
+		-DWITH_INNODB_MEMCACHED=1 \
+		-DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \
+		-DINSTALL_LAYOUT=DEB
+
+	cat CMakeCache.txt
+	touch $@
+
+override_dh_auto_build:
+	@echo "RULES.$@"
+	$(MAKE) -j8 VERBOSE=1
+	touch $@
+
+override_dh_auto_test:
+	@echo "RULES.$@"
+	echo "No tests run because test 9: pfs_connect_attr is failing unreasonably"
+	touch $@
+
+override_dh_auto_install:
+
+	@echo "RULES.$@"
+	# complete install first
+	$(MAKE) install DESTDIR=debian/tmp
+	# remove all redundant files and links
+	rm debian/tmp/usr/lib/*/*_r*
+	rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake
+	rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake
+	rm debian/tmp/usr/lib/mysql-test/Makefile
+	# add missing man pages
+	install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1
+	# add MySQL Server configuration file my.cnf to mysql-common package
+	install -g root -o root -m 0644 -D debian/extra/my.cnf debian/tmp/etc/mysql/my.cnf
+	# add MySQL Server debug binary and library to package
+	install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug
+	install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a
+	# add debug plugin libraries to package
+	install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug
+	for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done
+	install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug
+	install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug
+	# add apparmor profile
+	install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld
+	# add directory for legal docs
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source
+	# add COPYING file to each package
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING
+	# add README file to each package
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README
+	touch $@
+
+override_dh_installinit:
+	@echo "RULES.$@"
+	dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld
+	dh_installinit --name=mysql -- defaults 19 21
+	touch $@
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/source/format percona-xtrabackup-2.3.7/packaging/deb-precise/source/format
--- percona-xtrabackup-2.2.3/packaging/deb-precise/source/format	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/source/format	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/source/include-binaries percona-xtrabackup-2.3.7/packaging/deb-precise/source/include-binaries
--- percona-xtrabackup-2.2.3/packaging/deb-precise/source/include-binaries	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/source/include-binaries	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+# Copyright (c) 2014, 2015, 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
+
+# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins
+debian/extra/server-binary
+debian/extra/embedded-server
+debian/extra/adt_null-plugin
+debian/extra/auth-plugin
+debian/extra/auth_socket-plugin
+debian/extra/auth_test_plugin-plugin
+debian/extra/innodb_engine-plugin
+debian/extra/libdaemon_example-plugin
+debian/extra/libmemcached-plugin
+debian/extra/mypluglib-plugin
+debian/extra/mysql_no_login-plugin
+debian/extra/qa_auth_client-plugin
+debian/extra/qa_auth_interface-plugin
+debian/extra/qa_auth_server-plugin
+debian/extra/semisync_master-plugin
+debian/extra/semisync_slave-plugin
+debian/extra/validate_password-plugin
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-precise/watch percona-xtrabackup-2.3.7/packaging/deb-precise/watch
--- percona-xtrabackup-2.2.3/packaging/deb-precise/watch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-precise/watch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2 @@
+version=3
+http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/changelog percona-xtrabackup-2.3.7/packaging/deb-trusty/changelog
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/changelog	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/changelog	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,84 @@
+mysql-community (5.6.24-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Mon, 16 Feb 2014 15:45:09 +0530
+
+mysql-community (5.6.23-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+  * dh_apparmor to now run before dh_installinit in d/rules
+  * mysql-community-server now recommends mysql-client
+  * mysql-community-server now depends on apparmor
+  * removed template install-test-db; not installed by default
+  * d/compat incremented to 9 from 8
+  * d/control updated to build depend on debhelper 9
+  * added d/*.lintian-overrides and d/source/lintian-overrides
+  * d/rules updated to reflect correct file permissions
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 31 Dec 2014 10:51:07 +0530
+
+mysql-community (5.6.22-2ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+  * mysql-common now replaces mysql-server-{,core-}5.6
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 28 Nov 2014 15:18:07 +0530
+
+mysql-community (5.6.22-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+  * fixed d/*server.postinst to allow dropping test db without
+    setting root password
+  * init script will now run my_i_db if data dir is not present or empty
+  * updated init script to read app armor profile on startup
+  * added more system resources to app armor profile
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 24 Sep 2014 14:48:07 +0530
+
+mysql-community (5.6.21-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+  * updated d/rules to increment -j8 as make option
+  * updated d/source/include-binaries to add mysql_no_login plugin
+  * updated CMake option WITH_EXTRA_CHARSETS from complex to all
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 20 Aug 2014 19:12:30 +0530
+
+mysql-community (5.6.20-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+  * added fakeroot as build-dep in d/control
+  * added d/*.dirs for bench, dev and test pkg
+  * updated d/rules to make compilation verbose
+  * removed default CFLAGS, CXXFLAGS in d/rules
+  * added patch for testsuite search paths under d/patches
+  * modified cmake option for testsuite in d/rules
+  * updated patch d/fix-mysql_install_db.patch
+  * enabled two patches in d/patches/series
+  * removed extra permissions check in d/rules when fixed in source
+  * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf
+  * modified d/*-test.* for updated location of testsuite
+  * updated d/{mysql-*-server.install,rules} to include debug plugins
+  * updated d/rules to remove storage engine cmake options
+  * modified data dir permission in d/*server.{pre,post}inst
+  * updated d/source/include-binaries to add debug plugins
+  * updated d/rules to rename debug plugins
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 02 Jul 2014 17:45:30 +0530
+
+mysql-community (5.6.19-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+  * d/rules updated to rid of files removed from source
+  * modified path for source tar in source pkg
+  * obscured actual filenames in d/source/include-binaries
+  * modified d/rules to handle obscured filenames
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Mon, 05 May 2014 15:45:10 +0530
+
+mysql-community (5.6.17-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Fri, 28 Feb 2014 18:06:30 +0530
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/compat percona-xtrabackup-2.3.7/packaging/deb-trusty/compat
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/compat	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/compat	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+9
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/control percona-xtrabackup-2.3.7/packaging/deb-trusty/control
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/control	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/control	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,189 @@
+Source: mysql-community
+Maintainer: MySQL Release Engineering <mysql-build@oss.oracle.com>
+Section: database
+Priority: optional
+Standards-Version: 3.9.5
+Homepage: http://www.mysql.com/
+Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, lsb-release, cmake, fakeroot
+
+Package: mysql-server
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Server meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql server
+ package available in the repository.
+
+Package: mysql-community-server
+Architecture: any
+Pre-depends: debconf (>= 0.2.17), adduser
+Depends: mysql-common (= ${binary:Version}), apparmor,
+ ${shlibs:Depends}, ${misc:Depends}
+Recommends: mysql-client (= ${binary:Version})
+Conflicts: mysql,
+ mysql-server-5.0, mysql-server-core-5.0,
+ mysql-server-5.1, mysql-server-core-5.1,
+ mysql-server-5.5, mysql-server-core-5.5,
+ mysql-server-5.6, mysql-server-core-5.6,
+ mysql-commercial-server
+Replaces: mysql,
+ mysql-server-5.0, mysql-server-core-5.0,
+ mysql-server-5.1, mysql-server-core-5.1,
+ mysql-server-5.5, mysql-server-core-5.5,
+ mysql-server-5.6, mysql-server-core-5.6,
+ mysql-commercial-server
+Provides: virtual-mysql-server, virtual-mysql-server-core,
+ mysql-server-5.6, mysql-server-core-5.6
+Description: MySQL Server
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package includes the MySQL server binary as well as related
+ utilities to run and administer a MySQL server.
+
+Package: mysql-client
+Architecture: any
+Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Client meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql client
+ package available in the repository.
+
+Package: mysql-community-client
+Architecture: any
+Depends: mysql-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql,
+ mysql-client-5.0, mysql-client-core-5.0,
+ mysql-client-5.1, mysql-client-core-5.1,
+ mysql-client-5.5, mysql-client-core-5.5,
+ mysql-client-5.6, mysql-client-core-5.6,
+ mysql-commercial-client
+Replaces: mysql,
+ mysql-client-5.0, mysql-client-core-5.0,
+ mysql-client-5.1, mysql-client-core-5.1,
+ mysql-client-5.5, mysql-client-core-5.5,
+ mysql-client-5.6, mysql-client-core-5.6,
+ mysql-commercial-client
+Provides: virtual-mysql-client, virtual-mysql-client-core,
+ mysql-client-5.6, mysql-client-core-5.6
+Description: MySQL Client
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the standard MySQL clients and
+ administration tools.
+
+Package: libmysqlclient18
+Architecture: any
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: mysql-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL shared client libraries
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the shared libraries for MySQL client
+ applications.
+
+Package: mysql-common
+Architecture: any
+Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends}
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql
+Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev,
+ mysql-server-5.6, mysql-server-core-5.6
+Provides: mysql-common
+Description: MySQL Common
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains common files needed by MySQL client
+ library, MySQL database server, and MySQL embedded server.
+
+Package: libmysqlclient-dev
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient18 (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL development headers
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the development header files necessary
+ to develop MySQL client applications.
+
+Package: libmysqld-dev
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient-dev (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL embedded server library
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the MySQL server as an embedded library.
+
+Package: mysql-testsuite
+Architecture: any
+Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Testsuite meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql test
+ package available in the repository.
+
+Package: mysql-community-test
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}),
+ mysql-community-client (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql,
+ mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5,
+ mysql-testsuite-5.6, mysql-commercial-test
+Description: MySQL Test Run MTR - The MySQL testsuite
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the MySQL regression test suite for MySQL
+ database server.
+
+Package: mysql-community-bench
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql, mysql-commercial-bench
+Description: MySQL Bench
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle.
+
+Package: mysql-community-source
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: MySQL source
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/copyright percona-xtrabackup-2.3.7/packaging/deb-trusty/copyright
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/copyright	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/copyright	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,41 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: MySQL Server 5.6
+Upstream-Contact: MySQL Release Engineering <mysql-build@oss.oracle.com>
+Source: http://dev.mysql.com/
+
+Copyright: 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+License:
+ This is a release of MySQL, a dual-license SQL database server.
+ For the avoidance of doubt, this particular copy of the software
+ is released under the version 2 of the GNU General Public License.
+ MySQL is brought to you by Oracle.
+ .
+ MySQL FOSS License Exception
+ We want free and open source software applications under certain
+ licenses to be able to use specified GPL-licensed MySQL client
+ libraries despite the fact that not all such FOSS licenses are
+ compatible with version 2 of the GNU General Public License.
+ Therefore there are special exceptions to the terms and conditions
+ of the GPLv2 as applied to these client libraries, which are
+ identified and described in more detail in the FOSS License
+ Exception at
+ <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+ .
+ This distribution may include materials developed by third
+ parties. For license and attribution notices for these
+ materials, please refer to the documentation that accompanies
+ this distribution (see the "Licenses for Third-Party Components"
+ appendix) or view the online documentation at
+ <http://dev.mysql.com/doc/>.
+ .
+ GPLv2 Disclaimer
+ For the avoidance of doubt, except that if any license choice
+ other than GPL or LGPL is available it will apply instead,
+ Oracle elects to use only the General Public License version 2
+ (GPLv2) at this time for any software where a choice of GPL
+ license versions is made available with the language indicating
+ that GPLv2 or any later version may be used, or where a choice
+ .
+ The full text of the GNU General Public License version 2 can
+ be found in the file
+ `/usr/share/mysql/doc/COPYING'.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/extra/apparmor-profile percona-xtrabackup-2.3.7/packaging/deb-trusty/extra/apparmor-profile
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/extra/apparmor-profile	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/extra/apparmor-profile	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,49 @@
+# vim:syntax=apparmor
+# Last Modified: Fri Feb 28 18:06:30 2014
+#include <tunables/global>
+
+/usr/sbin/mysqld {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+  #include <abstractions/user-tmp>
+
+# Allow system resource access
+  /sys/devices/system/cpu/ r,
+  capability sys_resource,
+  capability dac_override,
+  capability setuid,
+  capability setgid,
+
+# Allow config access
+  /etc/mysql/conf.d/ r,
+  /etc/mysql/conf.d/*.cnf r,
+  /etc/mysql/*.cnf r,
+
+# Allow pid and socket file access
+  /run/mysqld/mysqld.pid rw,
+  /run/mysqld/mysqld.sock rw,
+
+# Allow read/ write to /tmp
+  /tmp/ r,
+  /tmp/* rw,
+
+# Allow execution of server binary
+  /usr/sbin/mysqld mr,
+  /usr/sbin/mysqld-debug mr,
+
+# Allow plugin access
+  /usr/lib/mysql/plugin/ r,
+  /usr/lib/mysql/plugin/*.so* mr,
+
+# Allow error msg and charset access
+  /usr/share/mysql/ r,
+  /usr/share/mysql/** r,
+
+# Allow data dir access
+  /var/lib/mysql/ r,
+  /var/lib/mysql/** rwk,
+
+# Allow log file access
+  /var/log/mysql/ r,
+  /var/log/mysql/** rw,
+}
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/extra/my.cnf percona-xtrabackup-2.3.7/packaging/deb-trusty/extra/my.cnf
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/extra/my.cnf	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/extra/my.cnf	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,57 @@
+# Copyright (c) 2014, 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
+
+#
+# The MySQL Community Server configuration file.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+[client]
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+[mysqld_safe]
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+nice		= 0
+
+[mysqld]
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+lc-messages-dir	= /usr/share/mysql
+explicit_defaults_for_timestamp
+
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+bind-address	= 127.0.0.1
+
+log-error	= /var/log/mysql/error.log
+
+# Recommended in standard MySQL setup
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+!includedir /etc/mysql/conf.d/
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/extra/mysql_embedded.1 percona-xtrabackup-2.3.7/packaging/deb-trusty/extra/mysql_embedded.1
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/extra/mysql_embedded.1	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/extra/mysql_embedded.1	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+.so man1/mysql.1
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqlclient18.install percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqlclient18.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqlclient18.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqlclient18.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2014, 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
+
+usr/lib/*/libmysqlclient.so.*
+# legal
+usr/share/doc/libmysqlclient18/COPYING
+usr/share/doc/libmysqlclient18/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqlclient18.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqlclient18.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqlclient18.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqlclient18.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql
+libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz
+libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+libmysqlclient18: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqlclient-dev.install percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqlclient-dev.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqlclient-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqlclient-dev.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,29 @@
+# Copyright (c) 2014, 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
+
+usr/include/mysql/*.h
+usr/include/mysql/mysql/*.h
+usr/include/mysql/mysql/*.h.pp
+usr/include/mysql/mysql/psi/*.h
+usr/lib/*/libmysqlclient.a
+usr/lib/*/libmysqlclient.so
+usr/lib/*/libmysqlservices.a
+usr/bin/mysql_config
+usr/bin/mysql_config_editor
+usr/share/man/man1/mysql_config.1
+usr/share/man/man1/mysql_config_editor.1
+# legal
+usr/share/doc/libmysqlclient-dev/COPYING
+usr/share/doc/libmysqlclient-dev/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqlclient-dev.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqlclient-dev.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqlclient-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqlclient-dev.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql
+libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz
+libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+libmysqlclient-dev: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqld-dev.install percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqld-dev.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqld-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqld-dev.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2014, 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
+
+usr/lib/*/libmysqld.a
+usr/lib/*/libmysqld-debug.a
+# legal
+usr/share/doc/libmysqld-dev/COPYING
+usr/share/doc/libmysqld-dev/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqld-dev.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqld-dev.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/libmysqld-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/libmysqld-dev.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql
+libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz
+libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-client.install percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-client.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-client.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-client.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 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
+
+# legal
+usr/share/doc/mysql-client/COPYING
+usr/share/doc/mysql-client/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-client.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-client.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-client.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-client.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql
+mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz
+mysql-client: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-common.dirs percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-common.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-common.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-common.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+# Copyright (c) 2014, 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
+
+etc/mysql/conf.d
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-common.install percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-common.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-common.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-common.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,30 @@
+# Copyright (c) 2014, 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
+
+etc/mysql/my.cnf
+usr/share/aclocal/mysql.m4
+usr/share/mysql/docs/INFO_SRC
+usr/share/mysql/docs/INFO_BIN
+usr/share/mysql/INSTALL-BINARY
+usr/share/mysql/docs/ChangeLog
+# localized error msgs
+usr/share/mysql/*/errmsg.sys
+usr/share/mysql/errmsg-utf8.txt
+# charsets
+usr/share/mysql/charsets/*.xml
+usr/share/mysql/charsets/README
+# legal
+usr/share/doc/mysql-common/COPYING
+usr/share/doc/mysql-common/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-common.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-common.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-common.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-common.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql
+mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz
+mysql-common: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-bench.install percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-bench.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-bench.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-bench.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2014, 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
+
+usr/lib/mysql/sql-bench/*
+# legal
+usr/share/doc/mysql-community-bench/COPYING
+usr/share/doc/mysql-community-bench/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-bench.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-bench.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-bench.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-bench.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql
+mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz
+mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-client.install percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-client.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-client.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-client.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,60 @@
+# Copyright (c) 2014, 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
+
+# binaries
+usr/bin/innochecksum
+usr/bin/myisam_ftdump
+usr/bin/mysql
+usr/bin/mysql_embedded
+usr/bin/mysqlaccess
+usr/bin/mysqlaccess.conf
+usr/bin/mysqladmin
+usr/bin/mysqlbug
+usr/bin/mysqlcheck
+usr/bin/mysql_client_test
+usr/bin/mysql_client_test_embedded
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysqlimport
+usr/bin/mysql_plugin
+usr/bin/mysqlshow
+usr/bin/mysqlslap
+usr/bin/mysql_waitpid
+# man pages
+usr/share/man/man1/innochecksum.1
+usr/share/man/man1/myisam_ftdump.1
+usr/share/man/man1/mysql.1
+usr/share/man/man1/mysql_embedded.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqlbug.1
+usr/share/man/man1/mysqlcheck.1
+usr/share/man/man1/mysql_client_test.1
+usr/share/man/man1/mysql_client_test_embedded.1
+usr/share/man/man1/mysqldump.1
+usr/share/man/man1/mysqldumpslow.1
+usr/share/man/man1/mysql_find_rows.1
+usr/share/man/man1/mysql_fix_extensions.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlman.1
+usr/share/man/man1/mysql_plugin.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
+usr/share/man/man1/mysql_waitpid.1
+# legal
+usr/share/doc/mysql-community-client/COPYING
+usr/share/doc/mysql-community-client/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-client.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-client.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-client.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-client.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql
+mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz
+mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+mysql-community-client: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.config percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.config
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.config	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.config	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ] && [ -z "$2" ];
+then
+
+	set -e
+
+	PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server
+	INSTALLED_PKG=none
+	MYSQLDATA=/var/lib/mysql
+
+	IFS_BACKUP=${IFS}
+	IFS=":"
+	for PKG in ${PKG_LIST};
+	do
+		STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4)
+		if [ "${STATUS}" = "installed" ];
+		then
+			INSTALLED_PKG=${PKG}
+			break
+		fi
+	done
+	IFS=${IFS_BACKUP}
+
+	if [ "${INSTALLED_PKG}" = "none" ];
+	then
+		if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ];
+		then
+			db_input high mysql-community-server/data-dir || true
+		else
+			db_fset mysql-community-server/data-dir seen true
+		fi
+
+		while :; do
+			PASSWD=""
+			db_input high mysql-community-server/root-pass || true
+			db_go
+
+			db_get mysql-community-server/root-pass
+			if [ -z "${RET}" ];
+			then
+				db_fset mysql-community-server/root-pass seen true
+				db_fset mysql-community-server/re-root-pass seen true
+				break
+			fi
+			PASSWD="${RET}"
+
+			db_input high mysql-community-server/re-root-pass || true
+			db_go
+
+			db_get mysql-community-server/re-root-pass
+			if [ "${RET}" == "${PASSWD}" ];
+			then
+				PASSWD=""
+				break
+			fi
+
+			db_fset mysql-community-server/root-pass-mismatch seen false
+			db_input critical mysql-community-server/root-pass-mismatch
+			db_set mysql-community-server/root-pass ""
+			db_set mysql-community-server/re-root-pass ""
+		done
+
+	else
+		db_fset mysql-community-server/data-dir seen true
+		db_fset mysql-community-server/root-pass seen true
+		db_fset mysql-community-server/re-root-pass seen true
+	fi
+
+	set +e
+fi
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.dirs percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2014, 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
+
+etc/mysql/conf.d
+etc/init.d
+usr/lib/mysql
+usr/lib/mysql/plugin
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.install percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,86 @@
+# Copyright (c) 2014, 2015, 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
+
+# binaries
+usr/bin/msql2mysql
+usr/bin/myisamchk
+usr/bin/myisamlog
+usr/bin/myisampack
+usr/bin/my_print_defaults
+usr/bin/mysqlbinlog
+usr/bin/mysql_convert_table_format
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqlhotcopy
+usr/bin/mysql_install_db
+usr/bin/mysql_secure_installation
+usr/bin/mysql_setpermission
+usr/bin/mysqltest
+usr/bin/mysqltest_embedded
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysql_upgrade
+usr/bin/mysql_zap
+usr/bin/perror
+usr/bin/replace
+usr/bin/resolveip
+usr/bin/resolve_stack_dump
+usr/sbin/mysqld
+# debug binary
+usr/sbin/mysqld-debug
+# man pages
+usr/share/man/man1/comp_err.1
+usr/share/man/man1/msql2mysql.1
+usr/share/man/man1/myisamchk.1
+usr/share/man/man1/myisamlog.1
+usr/share/man/man1/myisampack.1
+usr/share/man/man1/my_print_defaults.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysqld_multi.1
+usr/share/man/man1/mysqld_safe.1
+usr/share/man/man1/mysqlhotcopy.1
+usr/share/man/man1/mysql_install_db.1
+usr/share/man/man1/mysql_secure_installation.1
+usr/share/man/man1/mysql.server.1
+usr/share/man/man1/mysql_setpermission.1
+usr/share/man/man1/mysql-stress-test.pl.1
+usr/share/man/man1/mysqltest.1
+usr/share/man/man1/mysqltest_embedded.1
+usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man1/mysql_upgrade.1
+usr/share/man/man1/mysql_zap.1
+usr/share/man/man1/perror.1
+usr/share/man/man1/replace.1
+usr/share/man/man1/resolveip.1
+usr/share/man/man1/resolve_stack_dump.1
+usr/share/man/man8/mysqld.8
+# app armor profile
+etc/apparmor.d/usr.sbin.mysqld
+# SQL files
+usr/share/mysql/*.sql
+# plugins
+usr/lib/mysql/plugin/*.so
+usr/lib/mysql/plugin/debug/*.so
+usr/lib/mysql/plugin/daemon_example.ini
+usr/lib/mysql/plugin/debug/daemon_example.ini
+# support files
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/magic
+usr/share/mysql/mysql-log-rotate
+usr/share/mysql/my-default.cnf
+usr/share/mysql/dictionary.txt
+# legal
+usr/share/doc/mysql-community-server/COPYING
+usr/share/doc/mysql-community-server/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,23 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql
+mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz
+mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+mysql-community-server: embedded-library
+# Since we ship debug plugins so this error is overridden
+mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/*
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.mysql.init percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.mysql.init
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.mysql.init	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.mysql.init	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,174 @@
+#!/bin/bash
+#
+### BEGIN INIT INFO
+# Provides:          mysql
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Should-Start:      $network $time
+# Should-Stop:       $network $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/ Stop MySQL Community Server daemon
+# Description:       This service script facilitates startup and shutdown of
+#                    mysqld daemon throught its wrapper script mysqld_safe
+### END INIT INFO
+#
+
+# Copyright (c) 2014, 2015, 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
+
+. /lib/lsb/init-functions
+
+cd /
+umask 077
+
+MYSQLDATA=/var/lib/mysql
+VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4)
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+  'start')
+	PSCOUNT=$(get_pcount)
+	if [ "${PSCOUNT}" -gt 1 ];
+	then
+		log_action_msg "A MySQL Server is already started"
+	else
+		MYSQLRUN=/var/run/mysqld
+		MYSQLDATA=/var/lib/mysql
+		MYSQLLOG=/var/log/mysql
+
+		if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ];
+		then
+			mkdir ${MYSQLDATA}
+			chown mysql:mysql ${MYSQLDATA}
+			chmod 750 ${MYSQLDATA}
+		fi
+
+		if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ];
+		then
+			mkdir ${MYSQLDATA}/mysql
+			chown mysql:mysql ${MYSQLDATA}/mysql
+			chmod 750 ${MYSQLDATA}/mysql
+		fi
+
+		if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ];
+		then
+			mysql_install_db --user=mysql > /dev/null
+		fi
+
+		if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ];
+		then
+			mkdir ${MYSQLLOG}
+			chown mysql:adm ${MYSQLLOG}
+			chmod 750 ${MYSQLLOG}
+			touch ${MYSQLLOG}/error.log
+			chmod 640 ${MYSQLLOG}/error.log
+			chown mysql:adm ${MYSQLLOG}/error.log
+		fi
+
+		if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ];
+		then
+			mkdir ${MYSQLRUN}
+			chown mysql:mysql ${MYSQLRUN}
+			chmod 755 ${MYSQLRUN}
+		fi
+
+		/lib/init/apparmor-profile-load usr.sbin.mysqld
+
+		su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &"
+		for i in 1 2 3 4 5 6;
+		do
+			sleep 1
+			echo -n .
+		done
+		echo
+		PSCOUNT=$(get_pcount)
+		if [ "${PSCOUNT}" -gt 1 ];
+		then
+			log_action_msg "MySQL Community Server ${VERSION} is started"
+		else
+			log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details."
+		fi
+	fi
+	;;
+
+  'stop')
+	PSCOUNT=$(get_pcount)
+	if [ "${PSCOUNT}" -gt 1 ];
+	then
+		killall -15 mysqld
+		server_stop
+		if [ "$?" -eq 0 ];
+		then
+			log_action_msg "MySQL Community Server ${VERSION} is stopped"
+		else
+			log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out"
+		fi
+	else
+		log_action_msg "MySQL Community Server ${VERSION} is already stopped"
+	fi
+	;;
+
+  'restart'|'reload'|'force-reload')
+	log_action_msg "Stopping MySQL Community Server ${VERSION}"
+	$0 stop
+	log_action_msg "Re-starting MySQL Community Server ${VERSION}"
+	$0 start
+	;;
+
+  'status')
+	PSCOUNT=$(get_pcount)
+	if [ ${PSCOUNT} -gt 1 ];
+	then
+		log_action_msg "MySQL Community Server ${VERSION} is running"
+	else
+		log_action_msg "MySQL Community Server ${VERSION} is not running"
+		exit 3
+	fi
+	;;
+
+  *)
+	echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
+	exit 1
+	;;
+esac
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.postinst percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.postinst
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.postinst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.postinst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+. /usr/share/debconf/confmodule
+
+take_upstart_job_backup () {
+	if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ];
+	then
+		mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup
+	fi
+}
+
+case "$1" in
+	configure)
+
+	if [ -z "$2" ];
+	then
+		set -e
+
+		MYSQLDATA=/var/lib/mysql
+
+		if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ];
+		then
+			mkdir ${MYSQLDATA}/mysql
+			chown mysql:mysql ${MYSQLDATA}/mysql
+			chmod 750 ${MYSQLDATA}/mysql
+			if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ];
+			then
+				mysql_install_db --user=mysql > /dev/null
+			fi
+		fi
+
+		db_get mysql-community-server/root-pass && PASSWD=${RET}
+		if [ ! -z "${PASSWD}" ];
+		then
+			db_set mysql-community-server/root-pass ""
+			db_set mysql-community-server/re-root-pass ""
+			PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';"
+		else
+			PASSWD=""
+		fi
+
+		SQL=`mktemp`
+		if [ -f "${SQL}" ];
+		then
+			chmod 700 ${SQL}
+			cat << EOF > ${SQL}
+USE mysql;
+${PASSWD}
+DELETE FROM user WHERE user='';
+FLUSH PRIVILEGES;
+EOF
+			mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL
+			PASSWD=""
+			rm -f ${SQL}
+		fi
+
+		set +e
+
+	fi
+
+	;;
+
+	abort-upgrade|abort-remove|abort-configure)
+
+	;;
+
+	*)
+	exit 1
+	;;
+esac
+
+db_stop
+
+take_upstart_job_backup
+
+#DEBHELPER#
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.postrm percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.postrm
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.postrm	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.postrm	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,154 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ];
+then
+. /usr/share/debconf/confmodule
+fi
+
+place_upstart_job_back () {
+	if [ -e "/var/lib/mysql/.mysql.conf.backup" ];
+	then
+		mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf
+	fi
+}
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+	remove)
+
+	set -e
+
+	place_upstart_job_back
+
+	set +e
+
+	;;
+
+	purge)
+
+	set -e
+
+	place_upstart_job_back
+
+	MYSQLDATA=/var/lib/mysql
+	MYSQLLOG=/var/log/mysql
+	MYSQLRUN=/var/run/mysqld
+
+	server_stop
+
+	db_input high mysql-community-server/remove-data-dir || true
+	db_go
+	db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET}
+	if [ "${RMDATADIR}" = "true" ];
+	then
+		if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ];
+		then
+			rm -rf ${MYSQLRUN}
+		fi
+
+		if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ];
+		then
+			rm -rf ${MYSQLLOG}
+		fi
+
+		if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ];
+		then
+			rm -rf ${MYSQLDATA}
+		fi
+
+		if getent passwd mysql >/dev/null;
+		then
+			userdel mysql
+		fi
+	fi
+
+	set +e
+	;;
+
+	abort-install)
+
+	set -e
+
+	place_upstart_job_back
+
+	if [ -x "/etc/init.d/mysql" ];
+	then
+		invoke-rc.d mysql start || exit $?
+	else
+	        if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ];
+		then
+			rm -rf ${MYSQLRUN}
+		fi
+
+		if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ];
+		then
+			rm -rf ${MYSQLLOG}
+		fi
+
+		if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ];
+		then
+			rm -rf ${MYSQLDATA}
+		fi
+
+		if getent passwd mysql >/dev/null;
+		then
+			userdel mysql
+		fi
+	fi
+
+	set +e
+	;;
+
+	upgrade|abort-upgrade)
+
+	;;
+
+	*)
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.preinst percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.preinst
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.preinst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.preinst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,123 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+	install)
+
+	if [ -z "$2" ];
+	then
+
+		set -e
+
+		if [ -x "/etc/init.d/mysql" ];
+		then
+			invoke-rc.d mysql stop || exit $?
+			server_stop
+		fi
+
+		MYSQLDATA=/var/lib/mysql
+		MYSQLLOG=/var/log/mysql
+		MYSQLRUN=/var/run/mysqld
+
+		if ! getent group mysql >/dev/null;
+		then
+			addgroup --system mysql >/dev/null
+		fi
+
+		if ! getent passwd mysql >/dev/null;
+		then
+			adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null
+		fi
+
+		if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ];
+		then
+			mkdir ${MYSQLDATA}
+			chown mysql:mysql ${MYSQLDATA}
+			chmod 750 ${MYSQLDATA}
+		fi
+
+		if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ];
+		then
+			mkdir ${MYSQLLOG}
+			chown mysql:adm ${MYSQLLOG}
+			chmod 750 ${MYSQLLOG}
+			touch ${MYSQLLOG}/error.log
+			chmod 640 ${MYSQLLOG}/error.log
+			chown mysql:adm ${MYSQLLOG}/error.log
+		fi
+
+		if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ];
+		then
+			mkdir ${MYSQLRUN}
+			chown mysql:mysql ${MYSQLRUN}
+			chmod 755 ${MYSQLRUN}
+		fi
+
+		set +e
+
+	fi
+
+	;;
+
+	upgrade)
+
+	set -e
+
+	#DEBHELPER#
+	server_stop
+
+	set +e
+
+	;;
+
+	abort-upgrade)
+
+	;;
+
+	*)
+        exit 1
+        ;;
+esac
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.prerm percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.prerm
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.prerm	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.prerm	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+set -e
+
+#DEBHELPER#
+
+set +e
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.templates percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.templates
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-server.templates	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-server.templates	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+Template: mysql-community-server/root-pass
+Type: password
+Description: Enter root password:
+ Please provide a strong password that will be set for the root account of your MySQL database.
+ Leave it blank if you do not wish to set or change the root password at this time.
+
+Template: mysql-community-server/re-root-pass
+Type: password
+Description: Re-enter root password:
+ Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone.
+
+Template: mysql-community-server/root-pass-mismatch
+Type: error
+Description: The two passwords did not match
+ Please try again. Make sure you type the exact same password twice.
+
+Template: mysql-community-server/remove-data-dir
+Type: boolean
+Default: false
+Description: Remove data directory at /var/lib/mysql ?
+ This operation will remove the data directory that stores all the databases, tables and related meta-data.
+ It is highly recommended to take data backup before removing the data directory.
+
+Template: mysql-community-server/data-dir
+Type: note
+Description: Data directory found when no MySQL server package is installed
+ A data directory '/var/lib/mysql' is present on this system when no MySQL server 
+ package is currently installed on the system. The directory may be under control of
+ server package received from third-party vendors. It may also be an unclaimed data
+ directory from previous removal of mysql packages.
+ .
+ It is highly recommended to take data backup. If you have not done so, now would be
+ the time to take backup in another shell. Once completed, press 'Ok' to continue.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-source.install percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-source.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-source.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-source.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2014, 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
+
+../*.dsc    usr/src/mysql/
+../*.tar.gz usr/src/mysql/
+# legal
+usr/share/doc/mysql-community-source/COPYING
+usr/share/doc/mysql-community-source/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-source.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-source.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-source.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-source.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql
+mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz
+mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-test.install percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-test.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-test.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-test.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2014, 2015, 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
+
+usr/lib/mysql-test/*
+usr/share/man/man1/mysql-test-run.pl.1
+# legal
+usr/share/doc/mysql-community-test/COPYING
+usr/share/doc/mysql-community-test/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-test.links percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-test.links
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-test.links	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-test.links	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,17 @@
+# Copyright (c) 2014, 2015, 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
+
+usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run
+usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-test.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-test.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-community-test.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-community-test.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql
+mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz
+mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-server.install percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-server.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-server.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-server.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 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
+
+# legal
+usr/share/doc/mysql-server/COPYING
+usr/share/doc/mysql-server/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-server.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-server.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-server.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-server.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql
+mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz
+mysql-server: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-testsuite.install percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-testsuite.install
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-testsuite.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-testsuite.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 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
+
+# legal
+usr/share/doc/mysql-testsuite/COPYING
+usr/share/doc/mysql-testsuite/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-testsuite.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-testsuite.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/mysql-testsuite.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/mysql-testsuite.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql
+mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz
+mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/patches/fix-man-page-links.patch percona-xtrabackup-2.3.7/packaging/deb-trusty/patches/fix-man-page-links.patch
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/patches/fix-man-page-links.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/patches/fix-man-page-links.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,14 @@
+From: Akhil Mohan <akhil.mohan@oracle.com>
+Description: Fix path in man page link.
+Bug: http://bugs.mysql.com/bug.php?id=70952
+
+--- a/man/mysql_client_test_embedded.1	2013-11-08 19:00:22.000000000 +0530
++++ b/man/mysql_client_test_embedded.1	2013-11-14 19:29:56.768315219 +0530
+@@ -1 +1 @@
+-.so man-gpl-tmp2/mysql_client_test.1
++.so man1/mysql_client_test.1
+--- a/man/mysqltest_embedded.1	2013-11-08 19:00:22.000000000 +0530
++++ b/man/mysqltest_embedded.1	2013-11-14 19:31:19.079280675 +0530
+@@ -1 +1 @@
+-.so man-gpl-tmp2/mysqltest.1
++.so man1/mysqltest.1
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/patches/fix-mtr-search-paths.patch percona-xtrabackup-2.3.7/packaging/deb-trusty/patches/fix-mtr-search-paths.patch
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/patches/fix-mtr-search-paths.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/patches/fix-mtr-search-paths.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+From: Akhil Mohan <akhil.mohan@oracle.com>
+Description: Adding extra search path for testsuite.
+
+--- a/mysql-test/lib/mtr_cases.pm	2014-02-24 13:14:37 +0530
++++ b/mysql-test/lib/mtr_cases.pm	2014-07-02 11:46:24 +0530
+@@ -288,6 +288,7 @@
+     {
+       $suitedir= my_find_dir($::basedir,
+ 			     ["share/mysql-test/suite",
++			      "lib/mysql-test/suite",
+ 			      "mysql-test/suite",
+ 			      "internal/mysql-test/suite",
+ 			      "mysql-test",
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/patches/fix-mysql_install_db.patch percona-xtrabackup-2.3.7/packaging/deb-trusty/patches/fix-mysql_install_db.patch
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/patches/fix-mysql_install_db.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/patches/fix-mysql_install_db.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,43 @@
+From: Terje Røsten <terje.rosten@oracle.com>
+Description: Maintains the pending --skip-my-cnf option in mainline
+Bug: <TODO>
+
+diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
+index 440a977..7d068fc 100644
+--- a/scripts/mysql_install_db.pl.in
++++ b/scripts/mysql_install_db.pl.in
+@@ -113,6 +113,7 @@ EOF2
+   print <<EOF3;
+   --rpm                For internal use.  This option is used by RPM files
+                        during the MySQL installation process.
++                       Implies --keep-my-cnf option.
+   --skip-name-resolve  Use IP addresses rather than hostnames when creating
+                        grant table entries.  This option can be useful if
+                        your DNS does not work.
+@@ -439,7 +440,7 @@ if ( $opt->{srcdir} and $opt->{basedir} )
+ {
+   error($opt,"Specify either --basedir or --srcdir, not both");
+ }
+-if ( $opt->{'keep-my-cnf'} )
++if ( $opt->{rpm} || $opt->{'keep-my-cnf'} )
+ {
+   $keep_my_cnf = 1;
+ }
+@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
+ }
+
+ # ----------------------------------------------------------------------
+-# Create database directories mysql & test
++# Create database directory mysql
+ # ----------------------------------------------------------------------
+
+ # FIXME The shell variant uses "mkdir -p":
+@@ -697,7 +698,7 @@ if ($opt_user)
+   }
+ }
+
+-foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
++foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql")
+ {
+   mkdir($dir, 0700) unless -d $dir;
+   if ($opt_user and -w "/")
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/patches/series percona-xtrabackup-2.3.7/packaging/deb-trusty/patches/series
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/patches/series	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 2015, 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
+
+#fix-man-page-links.patch
+fix-mysql_install_db.patch
+fix-mtr-search-paths.patch
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/rules percona-xtrabackup-2.3.7/packaging/deb-trusty/rules
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/rules	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/rules	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,135 @@
+#!/usr/bin/make -f
+
+# Copyright (c) 2014, 2015, 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
+
+%:
+	dh $@
+
+export DH_VERBOSE=1
+export CFLAGS=
+export CXXFLAGS=
+
+override_dh_auto_configure:
+	@echo "RULES.$@"
+	cmake . \
+		-DBUILD_CONFIG=mysql_release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DINSTALL_DOCDIR=share/mysql/docs \
+		-DINSTALL_DOCREADMEDIR=share/mysql \
+		-DINSTALL_INCLUDEDIR=include/mysql \
+		-DINSTALL_INFODIR=share/mysql/docs \
+		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_MANDIR=share/man \
+		-DINSTALL_MYSQLSHAREDIR=share/mysql \
+		-DINSTALL_MYSQLTESTDIR=lib/mysql-test \
+		-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+		-DINSTALL_SBINDIR=sbin \
+		-DINSTALL_SCRIPTDIR=bin \
+		-DINSTALL_SQLBENCHDIR=lib/mysql \
+		-DINSTALL_SUPPORTFILESDIR=share/mysql \
+		-DMYSQL_DATADIR=/var/lib/mysql \
+		-DSYSCONFDIR=/etc/mysql \
+		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+		-DWITH_SSL=bundled \
+		-DWITH_ZLIB=system \
+		-DWITH_EXTRA_CHARSETS=all \
+		-DWITH_INNODB_MEMCACHED=1 \
+		-DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \
+		-DINSTALL_LAYOUT=DEB
+
+	cat CMakeCache.txt
+	touch $@
+
+override_dh_auto_build:
+	@echo "RULES.$@"
+	$(MAKE) -j8 VERBOSE=1
+	touch $@
+
+override_dh_auto_test:
+	@echo "RULES.$@"
+	echo "No tests run because test 9: pfs_connect_attr is failing unreasonably"
+	touch $@
+
+override_dh_auto_install:
+
+	@echo "RULES.$@"
+	# complete install first
+	$(MAKE) install DESTDIR=debian/tmp
+	# remove all redundant files and links
+	rm debian/tmp/usr/lib/*/*_r*
+	rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake
+	rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake
+	rm debian/tmp/usr/lib/mysql-test/Makefile
+	# add missing man pages
+	install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1
+	# add MySQL Server configuration file my.cnf to mysql-common package
+	install -g root -o root -m 0644 -D debian/extra/my.cnf debian/tmp/etc/mysql/my.cnf
+	# add MySQL Server debug binary and library to package
+	install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug
+	install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a
+	# add debug plugin libraries to package
+	install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug
+	for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done
+	install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug
+	install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug
+	# add apparmor profile
+	install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld
+	# add directory for legal docs
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source
+	# add COPYING file to each package
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING
+	# add README file to each package
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README
+	touch $@
+
+override_dh_installinit:
+	@echo "RULES.$@"
+	dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld
+	dh_installinit --name=mysql -- defaults 19 21
+	touch $@
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/source/format percona-xtrabackup-2.3.7/packaging/deb-trusty/source/format
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/source/format	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/source/format	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/source/include-binaries percona-xtrabackup-2.3.7/packaging/deb-trusty/source/include-binaries
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/source/include-binaries	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/source/include-binaries	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+# Copyright (c) 2014, 2015, 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
+
+# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins
+debian/extra/server-binary
+debian/extra/embedded-server
+debian/extra/adt_null-plugin
+debian/extra/auth-plugin
+debian/extra/auth_socket-plugin
+debian/extra/auth_test_plugin-plugin
+debian/extra/innodb_engine-plugin
+debian/extra/libdaemon_example-plugin
+debian/extra/libmemcached-plugin
+debian/extra/mypluglib-plugin
+debian/extra/mysql_no_login-plugin
+debian/extra/qa_auth_client-plugin
+debian/extra/qa_auth_interface-plugin
+debian/extra/qa_auth_server-plugin
+debian/extra/semisync_master-plugin
+debian/extra/semisync_slave-plugin
+debian/extra/validate_password-plugin
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-trusty/watch percona-xtrabackup-2.3.7/packaging/deb-trusty/watch
--- percona-xtrabackup-2.2.3/packaging/deb-trusty/watch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-trusty/watch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2 @@
+version=3
+http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/changelog percona-xtrabackup-2.3.7/packaging/deb-utopic/changelog
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/changelog	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/changelog	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,87 @@
+mysql-community (5.6.24-1ubuntu14.10) utopic; urgency=low
+
+  * new upstream release
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Mon, 16 Feb 2014 15:45:09 +0530
+
+mysql-community (5.6.23-1ubuntu14.10) utopic; urgency=low
+
+  * new upstream release
+  * mysql-community-server now recommends mysql-client
+  * mysql-community-server now depends on apparmor
+  * removed template install-test-db; not installed by default
+  * d/compat incremented to 9 from 8
+  * d/control updated to build depend on debhelper 9
+  * added d/*.lintian-overrides and d/source/lintian-overrides
+  * d/rules updated to reflect correct file permissions
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 31 Dec 2014 10:51:07 +0530
+
+mysql-community (5.6.22-2ubuntu14.10) utopic; urgency=low
+
+  * new upstream release
+  * mysql-common now replaces mysql-server-{,core-}5.6
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 28 Nov 2014 15:18:07 +0530
+
+mysql-community (5.6.22-1ubuntu14.10) utopic; urgency=low
+
+  * new upstream release
+  * fixed d/*server.postinst to allow dropping test db without
+    setting root password
+  * init script will now run my_i_db if data dir is not present or empty
+  * updated init script to read app armor profile on startup
+  * forked packaging source from trusty and rebranded for utopic
+  * updated d/m-c-source.install to pack *.xz packaging source archive
+  * added more system resources to app armor profile
+  * dh_apparmor to now run before dh_installinit in d/rules
+  * libmysqlclient-dev now replaces mysql-client-{,core-}5.6
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 05 Nov 2014 17:04:07 +0530
+
+mysql-community (5.6.21-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+  * updated d/rules to increment -j8 as make option
+  * updated d/source/include-binaries to add mysql_no_login plugin
+  * updated CMake option WITH_EXTRA_CHARSETS from complex to all
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 20 Aug 2014 19:12:30 +0530
+
+mysql-community (5.6.20-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+  * added fakeroot as build-dep in d/control
+  * added d/*.dirs for bench, dev and test pkg
+  * updated d/rules to make compilation verbose
+  * removed default CFLAGS, CXXFLAGS in d/rules
+  * added patch for testsuite search paths under d/patches
+  * modified cmake option for testsuite in d/rules
+  * updated patch d/fix-mysql_install_db.patch
+  * enabled two patches in d/patches/series
+  * removed extra permissions check in d/rules when fixed in source
+  * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf
+  * modified d/*-test.* for updated location of testsuite
+  * updated d/{mysql-*-server.install,rules} to include debug plugins
+  * updated d/rules to remove storage engine cmake options
+  * modified data dir permission in d/*server.{pre,post}inst
+  * updated d/source/include-binaries to add debug plugins
+  * updated d/rules to rename debug plugins
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 02 Jul 2014 17:45:30 +0530
+
+mysql-community (5.6.19-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+  * d/rules updated to rid of files removed from source
+  * modified path for source tar in source pkg
+  * obscured actual filenames in d/source/include-binaries
+  * modified d/rules to handle obscured filenames
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Mon, 05 May 2014 15:45:10 +0530
+
+mysql-community (5.6.17-1ubuntu14.04) trusty; urgency=low
+
+  * new upstream release
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Fri, 28 Feb 2014 18:06:30 +0530
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/compat percona-xtrabackup-2.3.7/packaging/deb-utopic/compat
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/compat	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/compat	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+9
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/control percona-xtrabackup-2.3.7/packaging/deb-utopic/control
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/control	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/control	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,190 @@
+Source: mysql-community
+Maintainer: MySQL Release Engineering <mysql-build@oss.oracle.com>
+Section: database
+Priority: optional
+Standards-Version: 3.9.5
+Homepage: http://www.mysql.com/
+Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, lsb-release, cmake, fakeroot
+
+Package: mysql-server
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Server meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql server
+ package available in the repository.
+
+Package: mysql-community-server
+Architecture: any
+Pre-depends: debconf (>= 0.2.17), adduser
+Depends: mysql-common (= ${binary:Version}), apparmor,
+ ${shlibs:Depends}, ${misc:Depends}
+Recommends: mysql-client (= ${binary:Version})
+Conflicts: mysql,
+ mysql-server-5.0, mysql-server-core-5.0,
+ mysql-server-5.1, mysql-server-core-5.1,
+ mysql-server-5.5, mysql-server-core-5.5,
+ mysql-server-5.6, mysql-server-core-5.6,
+ mysql-commercial-server
+Replaces: mysql,
+ mysql-server-5.0, mysql-server-core-5.0,
+ mysql-server-5.1, mysql-server-core-5.1,
+ mysql-server-5.5, mysql-server-core-5.5,
+ mysql-server-5.6, mysql-server-core-5.6,
+ mysql-commercial-server
+Provides: virtual-mysql-server, virtual-mysql-server-core,
+ mysql-server-5.6, mysql-server-core-5.6
+Description: MySQL Server
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package includes the MySQL server binary as well as related
+ utilities to run and administer a MySQL server.
+
+Package: mysql-client
+Architecture: any
+Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Client meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql client
+ package available in the repository.
+
+Package: mysql-community-client
+Architecture: any
+Depends: mysql-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql,
+ mysql-client-5.0, mysql-client-core-5.0,
+ mysql-client-5.1, mysql-client-core-5.1,
+ mysql-client-5.5, mysql-client-core-5.5,
+ mysql-client-5.6, mysql-client-core-5.6,
+ mysql-commercial-client
+Replaces: mysql,
+ mysql-client-5.0, mysql-client-core-5.0,
+ mysql-client-5.1, mysql-client-core-5.1,
+ mysql-client-5.5, mysql-client-core-5.5,
+ mysql-client-5.6, mysql-client-core-5.6,
+ mysql-commercial-client
+Provides: virtual-mysql-client, virtual-mysql-client-core,
+ mysql-client-5.6, mysql-client-core-5.6
+Description: MySQL Client
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the standard MySQL clients and
+ administration tools.
+
+Package: libmysqlclient18
+Architecture: any
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: mysql-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL shared client libraries
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the shared libraries for MySQL client
+ applications.
+
+Package: mysql-common
+Architecture: any
+Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends}
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql
+Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev,
+ mysql-server-5.6, mysql-server-core-5.6
+Provides: mysql-common
+Description: MySQL Common
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains common files needed by MySQL client
+ library, MySQL database server, and MySQL embedded server.
+
+Package: libmysqlclient-dev
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient18 (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Replaces: mysql-client-5.6, mysql-client-core-5.6
+Description: MySQL development headers
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the development header files necessary
+ to develop MySQL client applications.
+
+Package: libmysqld-dev
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient-dev (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL embedded server library
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the MySQL server as an embedded library.
+
+Package: mysql-testsuite
+Architecture: any
+Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Testsuite meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql test
+ package available in the repository.
+
+Package: mysql-community-test
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}),
+ mysql-community-client (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql,
+ mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5,
+ mysql-testsuite-5.6, mysql-commercial-test
+Description: MySQL Test Run MTR - The MySQL testsuite
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the MySQL regression test suite for MySQL
+ database server.
+
+Package: mysql-community-bench
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql, mysql-commercial-bench
+Description: MySQL Bench
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle.
+
+Package: mysql-community-source
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: MySQL source
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/copyright percona-xtrabackup-2.3.7/packaging/deb-utopic/copyright
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/copyright	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/copyright	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,41 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: MySQL Server 5.6
+Upstream-Contact: MySQL Release Engineering <mysql-build@oss.oracle.com>
+Source: http://dev.mysql.com/
+
+Copyright: 2000, 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+License:
+ This is a release of MySQL, a dual-license SQL database server.
+ For the avoidance of doubt, this particular copy of the software
+ is released under the version 2 of the GNU General Public License.
+ MySQL is brought to you by Oracle.
+ .
+ MySQL FOSS License Exception
+ We want free and open source software applications under certain
+ licenses to be able to use specified GPL-licensed MySQL client
+ libraries despite the fact that not all such FOSS licenses are
+ compatible with version 2 of the GNU General Public License.
+ Therefore there are special exceptions to the terms and conditions
+ of the GPLv2 as applied to these client libraries, which are
+ identified and described in more detail in the FOSS License
+ Exception at
+ <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+ .
+ This distribution may include materials developed by third
+ parties. For license and attribution notices for these
+ materials, please refer to the documentation that accompanies
+ this distribution (see the "Licenses for Third-Party Components"
+ appendix) or view the online documentation at
+ <http://dev.mysql.com/doc/>.
+ .
+ GPLv2 Disclaimer
+ For the avoidance of doubt, except that if any license choice
+ other than GPL or LGPL is available it will apply instead,
+ Oracle elects to use only the General Public License version 2
+ (GPLv2) at this time for any software where a choice of GPL
+ license versions is made available with the language indicating
+ that GPLv2 or any later version may be used, or where a choice
+ .
+ The full text of the GNU General Public License version 2 can
+ be found in the file
+ `/usr/share/mysql/doc/COPYING'.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/extra/apparmor-profile percona-xtrabackup-2.3.7/packaging/deb-utopic/extra/apparmor-profile
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/extra/apparmor-profile	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/extra/apparmor-profile	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,49 @@
+# vim:syntax=apparmor
+# Last Modified: Fri Feb 28 18:06:30 2014
+#include <tunables/global>
+
+/usr/sbin/mysqld {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+  #include <abstractions/user-tmp>
+
+# Allow system resource access
+  /sys/devices/system/cpu/ r,
+  capability sys_resource,
+  capability dac_override,
+  capability setuid,
+  capability setgid,
+
+# Allow config access
+  /etc/mysql/conf.d/ r,
+  /etc/mysql/conf.d/*.cnf r,
+  /etc/mysql/*.cnf r,
+
+# Allow pid and socket file access
+  /run/mysqld/mysqld.pid rw,
+  /run/mysqld/mysqld.sock rw,
+
+# Allow read/ write to /tmp
+  /tmp/ r,
+  /tmp/* rw,
+
+# Allow execution of server binary
+  /usr/sbin/mysqld mr,
+  /usr/sbin/mysqld-debug mr,
+
+# Allow plugin access
+  /usr/lib/mysql/plugin/ r,
+  /usr/lib/mysql/plugin/*.so* mr,
+
+# Allow error msg and charset access
+  /usr/share/mysql/ r,
+  /usr/share/mysql/** r,
+
+# Allow data dir access
+  /var/lib/mysql/ r,
+  /var/lib/mysql/** rwk,
+
+# Allow log file access
+  /var/log/mysql/ r,
+  /var/log/mysql/** rw,
+}
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/extra/my.cnf percona-xtrabackup-2.3.7/packaging/deb-utopic/extra/my.cnf
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/extra/my.cnf	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/extra/my.cnf	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,57 @@
+# Copyright (c) 2015, 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
+
+#
+# The MySQL Community Server configuration file.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+[client]
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+[mysqld_safe]
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+nice		= 0
+
+[mysqld]
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+lc-messages-dir	= /usr/share/mysql
+explicit_defaults_for_timestamp
+
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+bind-address	= 127.0.0.1
+
+log-error	= /var/log/mysql/error.log
+
+# Recommended in standard MySQL setup
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+!includedir /etc/mysql/conf.d/
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/extra/mysql_embedded.1 percona-xtrabackup-2.3.7/packaging/deb-utopic/extra/mysql_embedded.1
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/extra/mysql_embedded.1	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/extra/mysql_embedded.1	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+.so man1/mysql.1
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqlclient18.install percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqlclient18.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqlclient18.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqlclient18.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+usr/lib/*/libmysqlclient.so.*
+# legal
+usr/share/doc/libmysqlclient18/COPYING
+usr/share/doc/libmysqlclient18/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqlclient18.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqlclient18.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqlclient18.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqlclient18.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql
+libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz
+libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+libmysqlclient18: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqlclient-dev.install percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqlclient-dev.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqlclient-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqlclient-dev.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,29 @@
+# Copyright (c) 2015, 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
+
+usr/include/mysql/*.h
+usr/include/mysql/mysql/*.h
+usr/include/mysql/mysql/*.h.pp
+usr/include/mysql/mysql/psi/*.h
+usr/lib/*/libmysqlclient.a
+usr/lib/*/libmysqlclient.so
+usr/lib/*/libmysqlservices.a
+usr/bin/mysql_config
+usr/bin/mysql_config_editor
+usr/share/man/man1/mysql_config.1
+usr/share/man/man1/mysql_config_editor.1
+# legal
+usr/share/doc/libmysqlclient-dev/COPYING
+usr/share/doc/libmysqlclient-dev/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqlclient-dev.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqlclient-dev.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqlclient-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqlclient-dev.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql
+libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz
+libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+libmysqlclient-dev: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqld-dev.install percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqld-dev.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqld-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqld-dev.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2015, 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
+
+usr/lib/*/libmysqld.a
+usr/lib/*/libmysqld-debug.a
+# legal
+usr/share/doc/libmysqld-dev/COPYING
+usr/share/doc/libmysqld-dev/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqld-dev.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqld-dev.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/libmysqld-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/libmysqld-dev.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql
+libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz
+libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-client.install percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-client.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-client.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-client.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2015, 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
+
+# legal
+usr/share/doc/mysql-client/COPYING
+usr/share/doc/mysql-client/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-client.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-client.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-client.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-client.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql
+mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz
+mysql-client: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-common.dirs percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-common.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-common.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-common.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+# Copyright (c) 2015, 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
+
+etc/mysql/conf.d
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-common.install percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-common.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-common.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-common.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,30 @@
+# Copyright (c) 2015, 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
+
+etc/mysql/my.cnf
+usr/share/aclocal/mysql.m4
+usr/share/mysql/docs/INFO_SRC
+usr/share/mysql/docs/INFO_BIN
+usr/share/mysql/INSTALL-BINARY
+usr/share/mysql/docs/ChangeLog
+# localized error msgs
+usr/share/mysql/*/errmsg.sys
+usr/share/mysql/errmsg-utf8.txt
+# charsets
+usr/share/mysql/charsets/*.xml
+usr/share/mysql/charsets/README
+# legal
+usr/share/doc/mysql-common/COPYING
+usr/share/doc/mysql-common/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-common.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-common.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-common.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-common.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql
+mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz
+mysql-common: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-bench.install percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-bench.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-bench.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-bench.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+usr/lib/mysql/sql-bench/*
+# legal
+usr/share/doc/mysql-community-bench/COPYING
+usr/share/doc/mysql-community-bench/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-bench.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-bench.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-bench.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-bench.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql
+mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz
+mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-client.install percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-client.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-client.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-client.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,60 @@
+# Copyright (c) 2015, 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
+
+# binaries
+usr/bin/innochecksum
+usr/bin/myisam_ftdump
+usr/bin/mysql
+usr/bin/mysql_embedded
+usr/bin/mysqlaccess
+usr/bin/mysqlaccess.conf
+usr/bin/mysqladmin
+usr/bin/mysqlbug
+usr/bin/mysqlcheck
+usr/bin/mysql_client_test
+usr/bin/mysql_client_test_embedded
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysqlimport
+usr/bin/mysql_plugin
+usr/bin/mysqlshow
+usr/bin/mysqlslap
+usr/bin/mysql_waitpid
+# man pages
+usr/share/man/man1/innochecksum.1
+usr/share/man/man1/myisam_ftdump.1
+usr/share/man/man1/mysql.1
+usr/share/man/man1/mysql_embedded.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqlbug.1
+usr/share/man/man1/mysqlcheck.1
+usr/share/man/man1/mysql_client_test.1
+usr/share/man/man1/mysql_client_test_embedded.1
+usr/share/man/man1/mysqldump.1
+usr/share/man/man1/mysqldumpslow.1
+usr/share/man/man1/mysql_find_rows.1
+usr/share/man/man1/mysql_fix_extensions.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlman.1
+usr/share/man/man1/mysql_plugin.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
+usr/share/man/man1/mysql_waitpid.1
+# legal
+usr/share/doc/mysql-community-client/COPYING
+usr/share/doc/mysql-community-client/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-client.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-client.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-client.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-client.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql
+mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz
+mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+mysql-community-client: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.config percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.config
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.config	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.config	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# Copyright (c) 2015, 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
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ] && [ -z "$2" ];
+then
+
+	set -e
+
+	PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server
+	INSTALLED_PKG=none
+	MYSQLDATA=/var/lib/mysql
+
+	IFS_BACKUP=${IFS}
+	IFS=":"
+	for PKG in ${PKG_LIST};
+	do
+		STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4)
+		if [ "${STATUS}" = "installed" ];
+		then
+			INSTALLED_PKG=${PKG}
+			break
+		fi
+	done
+	IFS=${IFS_BACKUP}
+
+	if [ "${INSTALLED_PKG}" = "none" ];
+	then
+		if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ];
+		then
+			db_input high mysql-community-server/data-dir || true
+		else
+			db_fset mysql-community-server/data-dir seen true
+		fi
+
+		while :; do
+			PASSWD=""
+			db_input high mysql-community-server/root-pass || true
+			db_go
+
+			db_get mysql-community-server/root-pass
+			if [ -z "${RET}" ];
+			then
+				db_fset mysql-community-server/root-pass seen true
+				db_fset mysql-community-server/re-root-pass seen true
+				break
+			fi
+			PASSWD="${RET}"
+
+			db_input high mysql-community-server/re-root-pass || true
+			db_go
+
+			db_get mysql-community-server/re-root-pass
+			if [ "${RET}" == "${PASSWD}" ];
+			then
+				PASSWD=""
+				break
+			fi
+
+			db_fset mysql-community-server/root-pass-mismatch seen false
+			db_input critical mysql-community-server/root-pass-mismatch
+			db_set mysql-community-server/root-pass ""
+			db_set mysql-community-server/re-root-pass ""
+		done
+
+	else
+		db_fset mysql-community-server/data-dir seen true
+		db_fset mysql-community-server/root-pass seen true
+		db_fset mysql-community-server/re-root-pass seen true
+	fi
+
+	set +e
+fi
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.dirs percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+etc/mysql/conf.d
+etc/init.d
+usr/lib/mysql
+usr/lib/mysql/plugin
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.install percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,86 @@
+# Copyright (c) 2015, 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
+
+# binaries
+usr/bin/msql2mysql
+usr/bin/myisamchk
+usr/bin/myisamlog
+usr/bin/myisampack
+usr/bin/my_print_defaults
+usr/bin/mysqlbinlog
+usr/bin/mysql_convert_table_format
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqlhotcopy
+usr/bin/mysql_install_db
+usr/bin/mysql_secure_installation
+usr/bin/mysql_setpermission
+usr/bin/mysqltest
+usr/bin/mysqltest_embedded
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysql_upgrade
+usr/bin/mysql_zap
+usr/bin/perror
+usr/bin/replace
+usr/bin/resolveip
+usr/bin/resolve_stack_dump
+usr/sbin/mysqld
+# debug binary
+usr/sbin/mysqld-debug
+# man pages
+usr/share/man/man1/comp_err.1
+usr/share/man/man1/msql2mysql.1
+usr/share/man/man1/myisamchk.1
+usr/share/man/man1/myisamlog.1
+usr/share/man/man1/myisampack.1
+usr/share/man/man1/my_print_defaults.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysqld_multi.1
+usr/share/man/man1/mysqld_safe.1
+usr/share/man/man1/mysqlhotcopy.1
+usr/share/man/man1/mysql_install_db.1
+usr/share/man/man1/mysql_secure_installation.1
+usr/share/man/man1/mysql.server.1
+usr/share/man/man1/mysql_setpermission.1
+usr/share/man/man1/mysql-stress-test.pl.1
+usr/share/man/man1/mysqltest.1
+usr/share/man/man1/mysqltest_embedded.1
+usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man1/mysql_upgrade.1
+usr/share/man/man1/mysql_zap.1
+usr/share/man/man1/perror.1
+usr/share/man/man1/replace.1
+usr/share/man/man1/resolveip.1
+usr/share/man/man1/resolve_stack_dump.1
+usr/share/man/man8/mysqld.8
+# app armor profile
+etc/apparmor.d/usr.sbin.mysqld
+# SQL files
+usr/share/mysql/*.sql
+# plugins
+usr/lib/mysql/plugin/*.so
+usr/lib/mysql/plugin/debug/*.so
+usr/lib/mysql/plugin/daemon_example.ini
+usr/lib/mysql/plugin/debug/daemon_example.ini
+# support files
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/magic
+usr/share/mysql/mysql-log-rotate
+usr/share/mysql/my-default.cnf
+usr/share/mysql/dictionary.txt
+# legal
+usr/share/doc/mysql-community-server/COPYING
+usr/share/doc/mysql-community-server/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,23 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql
+mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz
+mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+mysql-community-server: embedded-library
+# Since we ship debug plugins so this error is overridden
+mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/*
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.mysql.init percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.mysql.init
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.mysql.init	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.mysql.init	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,174 @@
+#!/bin/bash
+#
+### BEGIN INIT INFO
+# Provides:          mysql
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Should-Start:      $network $time
+# Should-Stop:       $network $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/ Stop MySQL Community Server daemon
+# Description:       This service script facilitates startup and shutdown of
+#                    mysqld daemon throught its wrapper script mysqld_safe
+### END INIT INFO
+#
+
+# Copyright (c) 2015, 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
+
+. /lib/lsb/init-functions
+
+cd /
+umask 077
+
+MYSQLDATA=/var/lib/mysql
+VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4)
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+  'start')
+	PSCOUNT=$(get_pcount)
+	if [ "${PSCOUNT}" -gt 1 ];
+	then
+		log_action_msg "A MySQL Server is already started"
+	else
+		MYSQLRUN=/var/run/mysqld
+		MYSQLDATA=/var/lib/mysql
+		MYSQLLOG=/var/log/mysql
+
+		if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ];
+		then
+			mkdir ${MYSQLDATA}
+			chown mysql:mysql ${MYSQLDATA}
+			chmod 750 ${MYSQLDATA}
+		fi
+
+		if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ];
+		then
+			mkdir ${MYSQLDATA}/mysql
+			chown mysql:mysql ${MYSQLDATA}/mysql
+			chmod 750 ${MYSQLDATA}/mysql
+		fi
+
+		if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ];
+		then
+			mysql_install_db --user=mysql > /dev/null
+		fi
+
+		if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ];
+		then
+			mkdir ${MYSQLLOG}
+			chown mysql:adm ${MYSQLLOG}
+			chmod 750 ${MYSQLLOG}
+			touch ${MYSQLLOG}/error.log
+			chmod 640 ${MYSQLLOG}/error.log
+			chown mysql:adm ${MYSQLLOG}/error.log
+		fi
+
+		if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ];
+		then
+			mkdir ${MYSQLRUN}
+			chown mysql:mysql ${MYSQLRUN}
+			chmod 755 ${MYSQLRUN}
+		fi
+
+		/lib/init/apparmor-profile-load usr.sbin.mysqld
+
+		su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &"
+		for i in 1 2 3 4 5 6;
+		do
+			sleep 1
+			echo -n .
+		done
+		echo
+		PSCOUNT=$(get_pcount)
+		if [ "${PSCOUNT}" -gt 1 ];
+		then
+			log_action_msg "MySQL Community Server ${VERSION} is started"
+		else
+			log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details."
+		fi
+	fi
+	;;
+
+  'stop')
+	PSCOUNT=$(get_pcount)
+	if [ "${PSCOUNT}" -gt 1 ];
+	then
+		killall -15 mysqld
+		server_stop
+		if [ "$?" -eq 0 ];
+		then
+			log_action_msg "MySQL Community Server ${VERSION} is stopped"
+		else
+			log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out"
+		fi
+	else
+		log_action_msg "MySQL Community Server ${VERSION} is already stopped"
+	fi
+	;;
+
+  'restart'|'reload'|'force-reload')
+	log_action_msg "Stopping MySQL Community Server ${VERSION}"
+	$0 stop
+	log_action_msg "Re-starting MySQL Community Server ${VERSION}"
+	$0 start
+	;;
+
+  'status')
+	PSCOUNT=$(get_pcount)
+	if [ ${PSCOUNT} -gt 1 ];
+	then
+		log_action_msg "MySQL Community Server ${VERSION} is running"
+	else
+		log_action_msg "MySQL Community Server ${VERSION} is not running"
+		exit 3
+	fi
+	;;
+
+  *)
+	echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
+	exit 1
+	;;
+esac
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.postinst percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.postinst
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.postinst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.postinst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Copyright (c) 2015, 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
+
+. /usr/share/debconf/confmodule
+
+take_upstart_job_backup () {
+	if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ];
+	then
+		mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup
+	fi
+}
+
+case "$1" in
+	configure)
+
+	if [ -z "$2" ];
+	then
+		set -e
+
+		MYSQLDATA=/var/lib/mysql
+
+		if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ];
+		then
+			mkdir ${MYSQLDATA}/mysql
+			chown mysql:mysql ${MYSQLDATA}/mysql
+			chmod 750 ${MYSQLDATA}/mysql
+			if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ];
+			then
+				mysql_install_db --user=mysql > /dev/null
+			fi
+		fi
+
+		db_get mysql-community-server/root-pass && PASSWD=${RET}
+		if [ ! -z "${PASSWD}" ];
+		then
+			db_set mysql-community-server/root-pass ""
+			db_set mysql-community-server/re-root-pass ""
+			PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';"
+		else
+			PASSWD=""
+		fi
+
+		SQL=`mktemp`
+		if [ -f "${SQL}" ];
+		then
+			chmod 700 ${SQL}
+			cat << EOF > ${SQL}
+USE mysql;
+${PASSWD}
+DELETE FROM user WHERE user='';
+FLUSH PRIVILEGES;
+EOF
+			mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL
+			PASSWD=""
+			rm -f ${SQL}
+		fi
+
+		set +e
+
+	fi
+
+	;;
+
+	abort-upgrade|abort-remove|abort-configure)
+
+	;;
+
+	*)
+	exit 1
+	;;
+esac
+
+db_stop
+
+take_upstart_job_backup
+
+#DEBHELPER#
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.postrm percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.postrm
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.postrm	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.postrm	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,154 @@
+#!/bin/bash
+
+# Copyright (c) 2015, 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
+
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ];
+then
+. /usr/share/debconf/confmodule
+fi
+
+place_upstart_job_back () {
+	if [ -e "/var/lib/mysql/.mysql.conf.backup" ];
+	then
+		mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf
+	fi
+}
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+	remove)
+
+	set -e
+
+	place_upstart_job_back
+
+	set +e
+
+	;;
+
+	purge)
+
+	set -e
+
+	place_upstart_job_back
+
+	MYSQLDATA=/var/lib/mysql
+	MYSQLLOG=/var/log/mysql
+	MYSQLRUN=/var/run/mysqld
+
+	server_stop
+
+	db_input high mysql-community-server/remove-data-dir || true
+	db_go
+	db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET}
+	if [ "${RMDATADIR}" = "true" ];
+	then
+		if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ];
+		then
+			rm -rf ${MYSQLRUN}
+		fi
+
+		if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ];
+		then
+			rm -rf ${MYSQLLOG}
+		fi
+
+		if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ];
+		then
+			rm -rf ${MYSQLDATA}
+		fi
+
+		if getent passwd mysql >/dev/null;
+		then
+			userdel mysql
+		fi
+	fi
+
+	set +e
+	;;
+
+	abort-install)
+
+	set -e
+
+	place_upstart_job_back
+
+	if [ -x "/etc/init.d/mysql" ];
+	then
+		invoke-rc.d mysql start || exit $?
+	else
+	        if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ];
+		then
+			rm -rf ${MYSQLRUN}
+		fi
+
+		if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ];
+		then
+			rm -rf ${MYSQLLOG}
+		fi
+
+		if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ];
+		then
+			rm -rf ${MYSQLDATA}
+		fi
+
+		if getent passwd mysql >/dev/null;
+		then
+			userdel mysql
+		fi
+	fi
+
+	set +e
+	;;
+
+	upgrade|abort-upgrade)
+
+	;;
+
+	*)
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.preinst percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.preinst
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.preinst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.preinst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,123 @@
+#!/bin/bash
+
+# Copyright (c) 2015, 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
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+	install)
+
+	if [ -z "$2" ];
+	then
+
+		set -e
+
+		if [ -x "/etc/init.d/mysql" ];
+		then
+			invoke-rc.d mysql stop || exit $?
+			server_stop
+		fi
+
+		MYSQLDATA=/var/lib/mysql
+		MYSQLLOG=/var/log/mysql
+		MYSQLRUN=/var/run/mysqld
+
+		if ! getent group mysql >/dev/null;
+		then
+			addgroup --system mysql >/dev/null
+		fi
+
+		if ! getent passwd mysql >/dev/null;
+		then
+			adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null
+		fi
+
+		if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ];
+		then
+			mkdir ${MYSQLDATA}
+			chown mysql:mysql ${MYSQLDATA}
+			chmod 750 ${MYSQLDATA}
+		fi
+
+		if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ];
+		then
+			mkdir ${MYSQLLOG}
+			chown mysql:adm ${MYSQLLOG}
+			chmod 750 ${MYSQLLOG}
+			touch ${MYSQLLOG}/error.log
+			chmod 640 ${MYSQLLOG}/error.log
+			chown mysql:adm ${MYSQLLOG}/error.log
+		fi
+
+		if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ];
+		then
+			mkdir ${MYSQLRUN}
+			chown mysql:mysql ${MYSQLRUN}
+			chmod 755 ${MYSQLRUN}
+		fi
+
+		set +e
+
+	fi
+
+	;;
+
+	upgrade)
+
+	set -e
+
+	#DEBHELPER#
+	server_stop
+
+	set +e
+
+	;;
+
+	abort-upgrade)
+
+	;;
+
+	*)
+        exit 1
+        ;;
+esac
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.prerm percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.prerm
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.prerm	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.prerm	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Copyright (c) 2015, 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
+
+set -e
+
+#DEBHELPER#
+
+set +e
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.templates percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.templates
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-server.templates	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-server.templates	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+Template: mysql-community-server/root-pass
+Type: password
+Description: Enter root password:
+ Please provide a strong password that will be set for the root account of your MySQL database.
+ Leave it blank if you do not wish to set or change the root password at this time.
+
+Template: mysql-community-server/re-root-pass
+Type: password
+Description: Re-enter root password:
+ Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone.
+
+Template: mysql-community-server/root-pass-mismatch
+Type: error
+Description: The two passwords did not match
+ Please try again. Make sure you type the exact same password twice.
+
+Template: mysql-community-server/remove-data-dir
+Type: boolean
+Default: false
+Description: Remove data directory at /var/lib/mysql ?
+ This operation will remove the data directory that stores all the databases, tables and related meta-data.
+ It is highly recommended to take data backup before removing the data directory.
+
+Template: mysql-community-server/data-dir
+Type: note
+Description: Data directory found when no MySQL server package is installed
+ A data directory '/var/lib/mysql' is present on this system when no MySQL server 
+ package is currently installed on the system. The directory may be under control of
+ server package received from third-party vendors. It may also be an unclaimed data
+ directory from previous removal of mysql packages.
+ .
+ It is highly recommended to take data backup. If you have not done so, now would be
+ the time to take backup in another shell. Once completed, press 'Ok' to continue.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-source.install percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-source.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-source.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-source.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+../*.dsc    usr/src/mysql/
+../*.tar.gz usr/src/mysql/
+../*.tar.xz usr/src/mysql/
+# legal
+usr/share/doc/mysql-community-source/COPYING
+usr/share/doc/mysql-community-source/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-source.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-source.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-source.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-source.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql
+mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz
+mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-test.install percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-test.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-test.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-test.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2015, 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
+
+usr/lib/mysql-test/*
+usr/share/man/man1/mysql-test-run.pl.1
+# legal
+usr/share/doc/mysql-community-test/COPYING
+usr/share/doc/mysql-community-test/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-test.links percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-test.links
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-test.links	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-test.links	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,17 @@
+# Copyright (c) 2015, 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
+
+usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run
+usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-test.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-test.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-community-test.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-community-test.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql
+mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz
+mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-server.install percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-server.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-server.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-server.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2015, 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
+
+# legal
+usr/share/doc/mysql-server/COPYING
+usr/share/doc/mysql-server/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-server.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-server.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-server.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-server.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql
+mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz
+mysql-server: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-testsuite.install percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-testsuite.install
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-testsuite.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-testsuite.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2015, 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
+
+# legal
+usr/share/doc/mysql-testsuite/COPYING
+usr/share/doc/mysql-testsuite/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-testsuite.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-testsuite.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/mysql-testsuite.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/mysql-testsuite.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql
+mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz
+mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/patches/fix-man-page-links.patch percona-xtrabackup-2.3.7/packaging/deb-utopic/patches/fix-man-page-links.patch
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/patches/fix-man-page-links.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/patches/fix-man-page-links.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,14 @@
+From: Akhil Mohan <akhil.mohan@oracle.com>
+Description: Fix path in man page link.
+Bug: http://bugs.mysql.com/bug.php?id=70952
+
+--- a/man/mysql_client_test_embedded.1	2013-11-08 19:00:22.000000000 +0530
++++ b/man/mysql_client_test_embedded.1	2013-11-14 19:29:56.768315219 +0530
+@@ -1 +1 @@
+-.so man-gpl-tmp2/mysql_client_test.1
++.so man1/mysql_client_test.1
+--- a/man/mysqltest_embedded.1	2013-11-08 19:00:22.000000000 +0530
++++ b/man/mysqltest_embedded.1	2013-11-14 19:31:19.079280675 +0530
+@@ -1 +1 @@
+-.so man-gpl-tmp2/mysqltest.1
++.so man1/mysqltest.1
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/patches/fix-mtr-search-paths.patch percona-xtrabackup-2.3.7/packaging/deb-utopic/patches/fix-mtr-search-paths.patch
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/patches/fix-mtr-search-paths.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/patches/fix-mtr-search-paths.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+From: Akhil Mohan <akhil.mohan@oracle.com>
+Description: Adding extra search path for testsuite.
+
+--- a/mysql-test/lib/mtr_cases.pm	2014-02-24 13:14:37 +0530
++++ b/mysql-test/lib/mtr_cases.pm	2014-07-02 11:46:24 +0530
+@@ -288,6 +288,7 @@
+     {
+       $suitedir= my_find_dir($::basedir,
+ 			     ["share/mysql-test/suite",
++			      "lib/mysql-test/suite",
+ 			      "mysql-test/suite",
+ 			      "internal/mysql-test/suite",
+ 			      "mysql-test",
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/patches/fix-mysql_install_db.patch percona-xtrabackup-2.3.7/packaging/deb-utopic/patches/fix-mysql_install_db.patch
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/patches/fix-mysql_install_db.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/patches/fix-mysql_install_db.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,43 @@
+From: Terje Røsten <terje.rosten@oracle.com>
+Description: Maintains the pending --skip-my-cnf option in mainline
+Bug: <TODO>
+
+diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
+index 440a977..7d068fc 100644
+--- a/scripts/mysql_install_db.pl.in
++++ b/scripts/mysql_install_db.pl.in
+@@ -113,6 +113,7 @@ EOF2
+   print <<EOF3;
+   --rpm                For internal use.  This option is used by RPM files
+                        during the MySQL installation process.
++                       Implies --keep-my-cnf option.
+   --skip-name-resolve  Use IP addresses rather than hostnames when creating
+                        grant table entries.  This option can be useful if
+                        your DNS does not work.
+@@ -439,7 +440,7 @@ if ( $opt->{srcdir} and $opt->{basedir} )
+ {
+   error($opt,"Specify either --basedir or --srcdir, not both");
+ }
+-if ( $opt->{'keep-my-cnf'} )
++if ( $opt->{rpm} || $opt->{'keep-my-cnf'} )
+ {
+   $keep_my_cnf = 1;
+ }
+@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
+ }
+
+ # ----------------------------------------------------------------------
+-# Create database directories mysql & test
++# Create database directory mysql
+ # ----------------------------------------------------------------------
+
+ # FIXME The shell variant uses "mkdir -p":
+@@ -697,7 +698,7 @@ if ($opt_user)
+   }
+ }
+
+-foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
++foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql")
+ {
+   mkdir($dir, 0700) unless -d $dir;
+   if ($opt_user and -w "/")
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/patches/series percona-xtrabackup-2.3.7/packaging/deb-utopic/patches/series
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/patches/series	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2015, 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
+
+#fix-man-page-links.patch
+fix-mysql_install_db.patch
+fix-mtr-search-paths.patch
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/rules percona-xtrabackup-2.3.7/packaging/deb-utopic/rules
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/rules	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/rules	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,135 @@
+#!/usr/bin/make -f
+
+# Copyright (c) 2015, 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
+
+%:
+	dh $@
+
+export DH_VERBOSE=1
+export CFLAGS=
+export CXXFLAGS=
+
+override_dh_auto_configure:
+	@echo "RULES.$@"
+	cmake . \
+		-DBUILD_CONFIG=mysql_release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DINSTALL_DOCDIR=share/mysql/docs \
+		-DINSTALL_DOCREADMEDIR=share/mysql \
+		-DINSTALL_INCLUDEDIR=include/mysql \
+		-DINSTALL_INFODIR=share/mysql/docs \
+		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_MANDIR=share/man \
+		-DINSTALL_MYSQLSHAREDIR=share/mysql \
+		-DINSTALL_MYSQLTESTDIR=lib/mysql-test \
+		-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+		-DINSTALL_SBINDIR=sbin \
+		-DINSTALL_SCRIPTDIR=bin \
+		-DINSTALL_SQLBENCHDIR=lib/mysql \
+		-DINSTALL_SUPPORTFILESDIR=share/mysql \
+		-DMYSQL_DATADIR=/var/lib/mysql \
+		-DSYSCONFDIR=/etc/mysql \
+		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+		-DWITH_SSL=bundled \
+		-DWITH_ZLIB=system \
+		-DWITH_EXTRA_CHARSETS=all \
+		-DWITH_INNODB_MEMCACHED=1 \
+		-DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \
+		-DINSTALL_LAYOUT=DEB
+
+	cat CMakeCache.txt
+	touch $@
+
+override_dh_auto_build:
+	@echo "RULES.$@"
+	$(MAKE) -j8 VERBOSE=1
+	touch $@
+
+override_dh_auto_test:
+	@echo "RULES.$@"
+	echo "No tests run because test 9: pfs_connect_attr is failing unreasonably"
+	touch $@
+
+override_dh_auto_install:
+
+	@echo "RULES.$@"
+	# complete install first
+	$(MAKE) install DESTDIR=debian/tmp
+	# remove all redundant files and links
+	rm debian/tmp/usr/lib/*/*_r*
+	rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake
+	rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake
+	rm debian/tmp/usr/lib/mysql-test/Makefile
+	# add missing man pages
+	install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1
+	# add MySQL Server configuration file my.cnf to mysql-common package
+	install -g root -o root -m 0644 -D debian/extra/my.cnf debian/tmp/etc/mysql/my.cnf
+	# add MySQL Server debug binary and library to package
+	install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug
+	install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a
+	# add debug plugin libraries to package
+	install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug
+	for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done
+	install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug
+	install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug
+	# add apparmor profile
+	install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld
+	# add directory for legal docs
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source
+	# add COPYING file to each package
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING
+	# add README file to each package
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README
+	touch $@
+
+override_dh_installinit:
+	@echo "RULES.$@"
+	dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld
+	dh_installinit --name=mysql -- defaults 19 21
+	touch $@
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/source/format percona-xtrabackup-2.3.7/packaging/deb-utopic/source/format
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/source/format	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/source/format	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/source/include-binaries percona-xtrabackup-2.3.7/packaging/deb-utopic/source/include-binaries
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/source/include-binaries	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/source/include-binaries	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+# Copyright (c) 2015, 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
+
+# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins
+debian/extra/server-binary
+debian/extra/embedded-server
+debian/extra/adt_null-plugin
+debian/extra/auth-plugin
+debian/extra/auth_socket-plugin
+debian/extra/auth_test_plugin-plugin
+debian/extra/innodb_engine-plugin
+debian/extra/libdaemon_example-plugin
+debian/extra/libmemcached-plugin
+debian/extra/mypluglib-plugin
+debian/extra/mysql_no_login-plugin
+debian/extra/qa_auth_client-plugin
+debian/extra/qa_auth_interface-plugin
+debian/extra/qa_auth_server-plugin
+debian/extra/semisync_master-plugin
+debian/extra/semisync_slave-plugin
+debian/extra/validate_password-plugin
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-utopic/watch percona-xtrabackup-2.3.7/packaging/deb-utopic/watch
--- percona-xtrabackup-2.2.3/packaging/deb-utopic/watch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-utopic/watch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2 @@
+version=3
+http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/changelog percona-xtrabackup-2.3.7/packaging/deb-wheezy/changelog
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/changelog	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/changelog	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,73 @@
+mysql-community (5.6.24-1debian7) wheezy; urgency=low
+
+  * new upstream release
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Mon, 16 Feb 2014 15:45:09 +0530
+
+mysql-community (5.6.23-1debian7) wheezy; urgency=low
+
+  * new upstream release
+  * mysql-community-server now recommends mysql-client
+  * removed template install-test-db; not installed by default
+  * d/compat incremented to 9 from 8
+  * d/control updated to build depend on debhelper 9
+  * added d/*.lintian-overrides and d/source/lintian-overrides
+  * d/rules updated to reflect correct file permissions
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 31 Dec 2014 10:51:07 +0530
+
+mysql-community (5.6.22-1debian7) wheezy; urgency=low
+
+  * new upstream release
+  * fixed d/*server.postinst to allow dropping test db without
+    setting root password
+  * init script will now run my_i_db if data dir is not present or empty
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 24 Sep 2014 14:48:07 +0530
+
+mysql-community (5.6.21-1debian7) wheezy; urgency=low
+
+  * new upstream release
+  * updated d/rules to increment -j8 as make option
+  * updated d/source/include-binaries to add mysql_no_login plugin
+  * updated CMake option WITH_EXTRA_CHARSETS from complex to all
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 20 Aug 2014 19:12:30 +0530
+
+mysql-community (5.6.20-1debian7) wheezy; urgency=low
+
+  * new upstream release
+  * added fakeroot as build-dep in d/control
+  * added d/*.dirs for bench, dev and test pkg
+  * updated d/rules to make compilation verbose
+  * removed default CFLAGS, CXXFLAGS in d/rules
+  * added patch for testsuite search paths under d/patches
+  * modified cmake option for testsuite in d/rules
+  * updated patch d/fix-mysql_install_db.patch
+  * enabled two patches in d/patches/series
+  * removed extra permissions check in d/rules when fixed in source
+  * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf
+  * modified d/*-test.* for updated location of testsuite
+  * updated d/{mysql-*-server.install,rules} to include debug plugins
+  * updated d/rules to remove storage engine cmake options
+  * modified data dir permission in d/*server.{pre,post}inst
+  * updated d/source/include-binaries to add debug plugins
+  * updated d/rules to rename debug plugins
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Wed, 02 Jul 2014 17:45:30 +0530
+
+mysql-community (5.6.19-1debian7) wheezy; urgency=low
+
+  * new upstream release
+  * d/rules updated to rid of files removed from source
+  * modified path for source tar in source pkg
+  * obscured actual filenames in d/source/include-binaries
+  * modified d/rules to handle obscured filenames
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Mon, 05 May 2014 15:45:10 +0530
+
+mysql-community (5.6.17-1debian7) stable; urgency=low
+
+  * new upstream release
+
+ -- Akhil Mohan <akhil.mohan@oracle.com>  Fri, 28 Feb 2014 18:06:30 +0530
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/compat percona-xtrabackup-2.3.7/packaging/deb-wheezy/compat
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/compat	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/compat	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+9
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/control percona-xtrabackup-2.3.7/packaging/deb-wheezy/control
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/control	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/control	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,188 @@
+Source: mysql-community
+Maintainer: MySQL Release Engineering <mysql-build@oss.oracle.com>
+Section: database
+Priority: optional
+Standards-Version: 3.9.3
+Homepage: http://www.mysql.com/
+Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, lsb-release, cmake, fakeroot
+
+Package: mysql-server
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Server meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql server
+ package available in the repository.
+
+Package: mysql-community-server
+Architecture: any
+Pre-depends: debconf (>= 0.2.17), adduser
+Depends: mysql-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Recommends: mysql-client (= ${binary:Version})
+Conflicts: mysql,
+ mysql-server-5.0, mysql-server-core-5.0,
+ mysql-server-5.1, mysql-server-core-5.1,
+ mysql-server-5.5, mysql-server-core-5.5,
+ mysql-server-5.6, mysql-server-core-5.6,
+ mysql-commercial-server
+Replaces: mysql,
+ mysql-server-5.0, mysql-server-core-5.0,
+ mysql-server-5.1, mysql-server-core-5.1,
+ mysql-server-5.5, mysql-server-core-5.5,
+ mysql-server-5.6, mysql-server-core-5.6,
+ mysql-commercial-server
+Provides: virtual-mysql-server, virtual-mysql-server-core,
+ mysql-server-5.6, mysql-server-core-5.6
+Description: MySQL Server
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package includes the MySQL server binary as well as related
+ utilities to run and administer a MySQL server.
+
+Package: mysql-client
+Architecture: any
+Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Client meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql client
+ package available in the repository.
+
+Package: mysql-community-client
+Architecture: any
+Depends: mysql-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql,
+ mysql-client-5.0, mysql-client-core-5.0,
+ mysql-client-5.1, mysql-client-core-5.1,
+ mysql-client-5.5, mysql-client-core-5.5,
+ mysql-client-5.6, mysql-client-core-5.6,
+ mysql-commercial-client
+Replaces: mysql,
+ mysql-client-5.0, mysql-client-core-5.0,
+ mysql-client-5.1, mysql-client-core-5.1,
+ mysql-client-5.5, mysql-client-core-5.5,
+ mysql-client-5.6, mysql-client-core-5.6,
+ mysql-commercial-client
+Provides: virtual-mysql-client, virtual-mysql-client-core,
+ mysql-client-5.6, mysql-client-core-5.6
+Description: MySQL Client
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the standard MySQL clients and
+ administration tools.
+
+Package: libmysqlclient18
+Architecture: any
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: mysql-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL shared client libraries
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the shared libraries for MySQL client
+ applications.
+
+Package: mysql-common
+Architecture: any
+Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends}
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql
+Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev
+Provides: mysql-common
+Description: MySQL Common
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains common files needed by MySQL client
+ library, MySQL database server, and MySQL embedded server.
+
+Package: libmysqlclient-dev
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient18 (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL development headers
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the development header files necessary
+ to develop MySQL client applications.
+
+Package: libmysqld-dev
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient-dev (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL embedded server library
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the MySQL server as an embedded library.
+
+Package: mysql-testsuite
+Architecture: any
+Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Testsuite meta package depending on latest version
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This is a meta package that depends on the latest mysql test
+ package available in the repository.
+
+Package: mysql-community-test
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}),
+ mysql-community-client (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql,
+ mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5,
+ mysql-testsuite-5.6, mysql-commercial-test
+Description: MySQL Test Run MTR - The MySQL testsuite
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle. This package contains the MySQL regression test suite for MySQL
+ database server.
+
+Package: mysql-community-bench
+Architecture: any
+Depends: mysql-community-server (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mysql, mysql-commercial-bench
+Description: MySQL Bench
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle.
+
+Package: mysql-community-source
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: MySQL source
+ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+ and robust SQL (Structured Query Language) database server. MySQL Server
+ is intended for mission-critical, heavy-load production systems as well
+ as for embedding into mass-deployed software. MySQL is a trademark of
+ Oracle.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/copyright percona-xtrabackup-2.3.7/packaging/deb-wheezy/copyright
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/copyright	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/copyright	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,41 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: MySQL Server 5.6
+Upstream-Contact: MySQL Release Engineering <mysql-build@oss.oracle.com>
+Source: http://dev.mysql.com/
+
+Copyright: 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+License:
+ This is a release of MySQL, a dual-license SQL database server.
+ For the avoidance of doubt, this particular copy of the software
+ is released under the version 2 of the GNU General Public License.
+ MySQL is brought to you by Oracle.
+ .
+ MySQL FOSS License Exception
+ We want free and open source software applications under certain
+ licenses to be able to use specified GPL-licensed MySQL client
+ libraries despite the fact that not all such FOSS licenses are
+ compatible with version 2 of the GNU General Public License.
+ Therefore there are special exceptions to the terms and conditions
+ of the GPLv2 as applied to these client libraries, which are
+ identified and described in more detail in the FOSS License
+ Exception at
+ <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+ .
+ This distribution may include materials developed by third
+ parties. For license and attribution notices for these
+ materials, please refer to the documentation that accompanies
+ this distribution (see the "Licenses for Third-Party Components"
+ appendix) or view the online documentation at
+ <http://dev.mysql.com/doc/>.
+ .
+ GPLv2 Disclaimer
+ For the avoidance of doubt, except that if any license choice
+ other than GPL or LGPL is available it will apply instead,
+ Oracle elects to use only the General Public License version 2
+ (GPLv2) at this time for any software where a choice of GPL
+ license versions is made available with the language indicating
+ that GPLv2 or any later version may be used, or where a choice
+ .
+ The full text of the GNU General Public License version 2 can
+ be found in the file
+ `/usr/share/mysql/doc/COPYING'.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/extra/my.cnf percona-xtrabackup-2.3.7/packaging/deb-wheezy/extra/my.cnf
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/extra/my.cnf	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/extra/my.cnf	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,57 @@
+# Copyright (c) 2014, 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
+
+#
+# The MySQL Community Server configuration file.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+[client]
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+[mysqld_safe]
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+nice		= 0
+
+[mysqld]
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+lc-messages-dir	= /usr/share/mysql
+explicit_defaults_for_timestamp
+
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+bind-address	= 127.0.0.1
+
+log-error	= /var/log/mysql/error.log
+
+# Recommended in standard MySQL setup
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+!includedir /etc/mysql/conf.d/
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/extra/mysql_embedded.1 percona-xtrabackup-2.3.7/packaging/deb-wheezy/extra/mysql_embedded.1
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/extra/mysql_embedded.1	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/extra/mysql_embedded.1	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+.so man1/mysql.1
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient18.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient18.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient18.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient18.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2014, 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
+
+usr/lib/*/libmysqlclient.so.*
+# legal
+usr/share/doc/libmysqlclient18/COPYING
+usr/share/doc/libmysqlclient18/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient18.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient18.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient18.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient18.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql
+libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz
+libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+libmysqlclient18: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient-dev.dirs percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient-dev.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient-dev.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient-dev.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,17 @@
+# Copyright (c) 2014, 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
+
+usr/include/mysql
+usr/include/mysql/mysql
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient-dev.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient-dev.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient-dev.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,29 @@
+# Copyright (c) 2014, 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
+
+usr/include/mysql/*.h
+usr/include/mysql/mysql/*.h
+usr/include/mysql/mysql/*.h.pp
+usr/include/mysql/mysql/psi/*.h
+usr/lib/*/libmysqlclient.a
+usr/lib/*/libmysqlclient.so
+usr/lib/*/libmysqlservices.a
+usr/bin/mysql_config
+usr/bin/mysql_config_editor
+usr/share/man/man1/mysql_config.1
+usr/share/man/man1/mysql_config_editor.1
+# legal
+usr/share/doc/libmysqlclient-dev/COPYING
+usr/share/doc/libmysqlclient-dev/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient-dev.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient-dev.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqlclient-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqlclient-dev.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql
+libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz
+libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+libmysqlclient-dev: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqld-dev.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqld-dev.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqld-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqld-dev.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2014, 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
+
+usr/lib/*/libmysqld.a
+usr/lib/*/libmysqld-debug.a
+# legal
+usr/share/doc/libmysqld-dev/COPYING
+usr/share/doc/libmysqld-dev/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqld-dev.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqld-dev.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/libmysqld-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/libmysqld-dev.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql
+libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz
+libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-client.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-client.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-client.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-client.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 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
+
+# legal
+usr/share/doc/mysql-client/COPYING
+usr/share/doc/mysql-client/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-client.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-client.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-client.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-client.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql
+mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz
+mysql-client: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-common.dirs percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-common.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-common.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-common.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+# Copyright (c) 2014, 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
+
+etc/mysql/conf.d
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-common.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-common.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-common.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-common.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,30 @@
+# Copyright (c) 2014, 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
+
+etc/mysql/my.cnf
+usr/share/aclocal/mysql.m4
+usr/share/mysql/docs/INFO_SRC
+usr/share/mysql/docs/INFO_BIN
+usr/share/mysql/INSTALL-BINARY
+usr/share/mysql/docs/ChangeLog
+# localized error msgs
+usr/share/mysql/*/errmsg.sys
+usr/share/mysql/errmsg-utf8.txt
+# charsets
+usr/share/mysql/charsets/*.xml
+usr/share/mysql/charsets/README
+# legal
+usr/share/doc/mysql-common/COPYING
+usr/share/doc/mysql-common/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-common.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-common.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-common.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-common.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql
+mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz
+mysql-common: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-bench.dirs percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-bench.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-bench.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-bench.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,17 @@
+# Copyright (c) 2014, 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
+
+usr/lib/mysql
+usr/lib/mysql/sql-bench
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-bench.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-bench.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-bench.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-bench.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2014, 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
+
+usr/lib/mysql/sql-bench/*
+# legal
+usr/share/doc/mysql-community-bench/COPYING
+usr/share/doc/mysql-community-bench/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-bench.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-bench.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-bench.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-bench.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql
+mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz
+mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-client.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-client.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-client.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-client.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,60 @@
+# Copyright (c) 2014, 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
+
+# binaries
+usr/bin/innochecksum
+usr/bin/myisam_ftdump
+usr/bin/mysql
+usr/bin/mysql_embedded
+usr/bin/mysqlaccess
+usr/bin/mysqlaccess.conf
+usr/bin/mysqladmin
+usr/bin/mysqlbug
+usr/bin/mysqlcheck
+usr/bin/mysql_client_test
+usr/bin/mysql_client_test_embedded
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysqlimport
+usr/bin/mysql_plugin
+usr/bin/mysqlshow
+usr/bin/mysqlslap
+usr/bin/mysql_waitpid
+# man pages
+usr/share/man/man1/innochecksum.1
+usr/share/man/man1/myisam_ftdump.1
+usr/share/man/man1/mysql.1
+usr/share/man/man1/mysql_embedded.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqlbug.1
+usr/share/man/man1/mysqlcheck.1
+usr/share/man/man1/mysql_client_test.1
+usr/share/man/man1/mysql_client_test_embedded.1
+usr/share/man/man1/mysqldump.1
+usr/share/man/man1/mysqldumpslow.1
+usr/share/man/man1/mysql_find_rows.1
+usr/share/man/man1/mysql_fix_extensions.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlman.1
+usr/share/man/man1/mysql_plugin.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
+usr/share/man/man1/mysql_waitpid.1
+# legal
+usr/share/doc/mysql-community-client/COPYING
+usr/share/doc/mysql-community-client/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-client.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-client.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-client.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-client.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql
+mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz
+mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+mysql-community-client: embedded-library
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.config percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.config
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.config	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.config	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ] && [ -z "$2" ];
+then
+
+	set -e
+
+	PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server
+	INSTALLED_PKG=none
+	MYSQLDATA=/var/lib/mysql
+
+	IFS_BACKUP=${IFS}
+	IFS=":"
+	for PKG in ${PKG_LIST};
+	do
+		STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4)
+		if [ "${STATUS}" = "installed" ];
+		then
+			INSTALLED_PKG=${PKG}
+			break
+		fi
+	done
+	IFS=${IFS_BACKUP}
+
+	if [ "${INSTALLED_PKG}" = "none" ];
+	then
+		if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ];
+		then
+			db_input high mysql-community-server/data-dir || true
+		else
+			db_fset mysql-community-server/data-dir seen true
+		fi
+
+		while :; do
+			PASSWD=""
+			db_input high mysql-community-server/root-pass || true
+			db_go
+
+			db_get mysql-community-server/root-pass
+			if [ -z "${RET}" ];
+			then
+				db_fset mysql-community-server/root-pass seen true
+				db_fset mysql-community-server/re-root-pass seen true
+				break
+			fi
+			PASSWD="${RET}"
+
+			db_input high mysql-community-server/re-root-pass || true
+			db_go
+
+			db_get mysql-community-server/re-root-pass
+			if [ "${RET}" == "${PASSWD}" ];
+			then
+				PASSWD=""
+				break
+			fi
+
+			db_fset mysql-community-server/root-pass-mismatch seen false
+			db_input critical mysql-community-server/root-pass-mismatch
+			db_set mysql-community-server/root-pass ""
+			db_set mysql-community-server/re-root-pass ""
+		done
+
+	else
+		db_fset mysql-community-server/data-dir seen true
+		db_fset mysql-community-server/root-pass seen true
+		db_fset mysql-community-server/re-root-pass seen true
+	fi
+
+	set +e
+fi
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.dirs percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2014, 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
+
+etc/mysql/conf.d
+etc/init.d
+usr/lib/mysql
+usr/lib/mysql/plugin
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,84 @@
+# Copyright (c) 2014, 2015, 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
+
+# binaries
+usr/bin/msql2mysql
+usr/bin/myisamchk
+usr/bin/myisamlog
+usr/bin/myisampack
+usr/bin/my_print_defaults
+usr/bin/mysqlbinlog
+usr/bin/mysql_convert_table_format
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqlhotcopy
+usr/bin/mysql_install_db
+usr/bin/mysql_secure_installation
+usr/bin/mysql_setpermission
+usr/bin/mysqltest
+usr/bin/mysqltest_embedded
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysql_upgrade
+usr/bin/mysql_zap
+usr/bin/perror
+usr/bin/replace
+usr/bin/resolveip
+usr/bin/resolve_stack_dump
+usr/sbin/mysqld
+# debug binary
+usr/sbin/mysqld-debug
+# man pages
+usr/share/man/man1/comp_err.1
+usr/share/man/man1/msql2mysql.1
+usr/share/man/man1/myisamchk.1
+usr/share/man/man1/myisamlog.1
+usr/share/man/man1/myisampack.1
+usr/share/man/man1/my_print_defaults.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysqld_multi.1
+usr/share/man/man1/mysqld_safe.1
+usr/share/man/man1/mysqlhotcopy.1
+usr/share/man/man1/mysql_install_db.1
+usr/share/man/man1/mysql_secure_installation.1
+usr/share/man/man1/mysql.server.1
+usr/share/man/man1/mysql_setpermission.1
+usr/share/man/man1/mysql-stress-test.pl.1
+usr/share/man/man1/mysqltest.1
+usr/share/man/man1/mysqltest_embedded.1
+usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man1/mysql_upgrade.1
+usr/share/man/man1/mysql_zap.1
+usr/share/man/man1/perror.1
+usr/share/man/man1/replace.1
+usr/share/man/man1/resolveip.1
+usr/share/man/man1/resolve_stack_dump.1
+usr/share/man/man8/mysqld.8
+# SQL files
+usr/share/mysql/*.sql
+# plugins
+usr/lib/mysql/plugin/*.so
+usr/lib/mysql/plugin/debug/*.so
+usr/lib/mysql/plugin/daemon_example.ini
+usr/lib/mysql/plugin/debug/daemon_example.ini
+# support files
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/magic
+usr/share/mysql/mysql-log-rotate
+usr/share/mysql/my-default.cnf
+usr/share/mysql/dictionary.txt
+# legal
+usr/share/doc/mysql-community-server/COPYING
+usr/share/doc/mysql-community-server/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,23 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql
+mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz
+mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl
+# Due to static linking this cannot be avoided and hence being overridden
+mysql-community-server: embedded-library
+# Since we ship debug plugins so this error is overridden
+mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/*
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.mysql.init percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.mysql.init
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.mysql.init	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.mysql.init	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,172 @@
+#!/bin/bash
+#
+### BEGIN INIT INFO
+# Provides:          mysql
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Should-Start:      $network $time
+# Should-Stop:       $network $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/ Stop MySQL Community Server daemon
+# Description:       This service script facilitates startup and shutdown of
+#                    mysqld daemon throught its wrapper script mysqld_safe
+### END INIT INFO
+#
+
+# Copyright (c) 2014, 2015, 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
+
+. /lib/lsb/init-functions
+
+cd /
+umask 077
+
+MYSQLDATA=/var/lib/mysql
+VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4)
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+  'start')
+	PSCOUNT=$(get_pcount)
+	if [ "${PSCOUNT}" -gt 1 ];
+	then
+		log_action_msg "A MySQL Server is already started"
+	else
+		MYSQLRUN=/var/run/mysqld
+		MYSQLDATA=/var/lib/mysql
+		MYSQLLOG=/var/log/mysql
+
+		if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ];
+		then
+			mkdir ${MYSQLDATA}
+			chown mysql:mysql ${MYSQLDATA}
+			chmod 750 ${MYSQLDATA}
+		fi
+
+		if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ];
+		then
+			mkdir ${MYSQLDATA}/mysql
+			chown mysql:mysql ${MYSQLDATA}/mysql
+			chmod 750 ${MYSQLDATA}/mysql
+		fi
+
+		if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ];
+		then
+			mysql_install_db --user=mysql > /dev/null
+		fi
+
+		if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ];
+		then
+			mkdir ${MYSQLLOG}
+			chown mysql:adm ${MYSQLLOG}
+			chmod 750 ${MYSQLLOG}
+			touch ${MYSQLLOG}/error.log
+			chmod 640 ${MYSQLLOG}/error.log
+			chown mysql:adm ${MYSQLLOG}/error.log
+		fi
+
+		if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ];
+		then
+			mkdir ${MYSQLRUN}
+			chown mysql:mysql ${MYSQLRUN}
+			chmod 755 ${MYSQLRUN}
+		fi
+
+		su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &"
+		for i in 1 2 3 4 5 6;
+		do
+			sleep 1
+			echo -n .
+		done
+		echo
+		PSCOUNT=$(get_pcount)
+		if [ "${PSCOUNT}" -gt 1 ];
+		then
+			log_action_msg "MySQL Community Server ${VERSION} is started"
+		else
+			log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details."
+		fi
+	fi
+	;;
+
+  'stop')
+	PSCOUNT=$(get_pcount)
+	if [ "${PSCOUNT}" -gt 1 ];
+	then
+		killall -15 mysqld
+		server_stop
+		if [ "$?" -eq 0 ];
+		then
+			log_action_msg "MySQL Community Server ${VERSION} is stopped"
+		else
+			log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out"
+		fi
+	else
+		log_action_msg "MySQL Community Server ${VERSION} is already stopped"
+	fi
+	;;
+
+  'restart'|'reload'|'force-reload')
+	log_action_msg "Stopping MySQL Community Server ${VERSION}"
+	$0 stop
+	log_action_msg "Re-starting MySQL Community Server ${VERSION}"
+	$0 start
+	;;
+
+  'status')
+	PSCOUNT=$(get_pcount)
+	if [ ${PSCOUNT} -gt 1 ];
+	then
+		log_action_msg "MySQL Community Server ${VERSION} is running"
+	else
+		log_action_msg "MySQL Community Server ${VERSION} is not running"
+		exit 3
+	fi
+	;;
+
+  *)
+	echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
+	exit 1
+	;;
+esac
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.postinst percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.postinst
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.postinst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.postinst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+. /usr/share/debconf/confmodule
+
+take_upstart_job_backup () {
+	if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ];
+	then
+		mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup
+	fi
+}
+
+case "$1" in
+	configure)
+
+	if [ -z "$2" ];
+	then
+		set -e
+
+		MYSQLDATA=/var/lib/mysql
+
+		if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ];
+		then
+			mkdir ${MYSQLDATA}/mysql
+			chown mysql:mysql ${MYSQLDATA}/mysql
+			chmod 750 ${MYSQLDATA}/mysql
+			if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ];
+			then
+				mysql_install_db --user=mysql > /dev/null
+			fi
+		fi
+
+		db_get mysql-community-server/root-pass && PASSWD=${RET}
+		if [ ! -z "${PASSWD}" ];
+		then
+			db_set mysql-community-server/root-pass ""
+			db_set mysql-community-server/re-root-pass ""
+			PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';"
+		else
+			PASSWD=""
+		fi
+
+		SQL=`mktemp`
+		if [ -f "${SQL}" ];
+		then
+			chmod 700 ${SQL}
+			cat << EOF > ${SQL}
+USE mysql;
+${PASSWD}
+DELETE FROM user WHERE user='';
+FLUSH PRIVILEGES;
+EOF
+			mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL
+			PASSWD=""
+			rm -f ${SQL}
+		fi
+
+		set +e
+
+	fi
+
+	;;
+
+	abort-upgrade|abort-remove|abort-configure)
+
+	;;
+
+	*)
+	exit 1
+	;;
+esac
+
+db_stop
+
+take_upstart_job_backup
+
+#DEBHELPER#
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.postrm percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.postrm
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.postrm	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.postrm	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,154 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ];
+then
+. /usr/share/debconf/confmodule
+fi
+
+place_upstart_job_back () {
+	if [ -e "/var/lib/mysql/.mysql.conf.backup" ];
+	then
+		mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf
+	fi
+}
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+	remove)
+
+	set -e
+
+	place_upstart_job_back
+
+	set +e
+
+	;;
+
+	purge)
+
+	set -e
+
+	place_upstart_job_back
+
+	MYSQLDATA=/var/lib/mysql
+	MYSQLLOG=/var/log/mysql
+	MYSQLRUN=/var/run/mysqld
+
+	server_stop
+
+	db_input high mysql-community-server/remove-data-dir || true
+	db_go
+	db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET}
+	if [ "${RMDATADIR}" = "true" ];
+	then
+		if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ];
+		then
+			rm -rf ${MYSQLRUN}
+		fi
+
+		if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ];
+		then
+			rm -rf ${MYSQLLOG}
+		fi
+
+		if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ];
+		then
+			rm -rf ${MYSQLDATA}
+		fi
+
+		if getent passwd mysql >/dev/null;
+		then
+			userdel mysql
+		fi
+	fi
+
+	set +e
+	;;
+
+	abort-install)
+
+	set -e
+
+	place_upstart_job_back
+
+	if [ -x "/etc/init.d/mysql" ];
+	then
+		invoke-rc.d mysql start || exit $?
+	else
+	        if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ];
+		then
+			rm -rf ${MYSQLRUN}
+		fi
+
+		if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ];
+		then
+			rm -rf ${MYSQLLOG}
+		fi
+
+		if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ];
+		then
+			rm -rf ${MYSQLDATA}
+		fi
+
+		if getent passwd mysql >/dev/null;
+		then
+			userdel mysql
+		fi
+	fi
+
+	set +e
+	;;
+
+	upgrade|abort-upgrade)
+
+	;;
+
+	*)
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.preinst percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.preinst
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.preinst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.preinst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,123 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+get_pcount () {
+	PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l)
+	echo "${PSCOUNT}"
+}
+
+server_stop () {
+	PSCOUNT=$(get_pcount)
+	COUNT=0
+	while :; do
+		COUNT=$(( COUNT+1 ))
+		echo -n .
+		if [ "${PSCOUNT}" -eq 1 ];
+		then
+			echo
+			break
+		fi
+		if [ "${COUNT}" -gt 15 ];
+		then
+			echo
+			return 1
+		fi
+		PSCOUNT=$(get_pcount)
+		sleep 1
+	done
+	return 0
+}
+
+case "$1" in
+	install)
+
+	if [ -z "$2" ];
+	then
+
+		set -e
+
+		if [ -x "/etc/init.d/mysql" ];
+		then
+			invoke-rc.d mysql stop || exit $?
+			server_stop
+		fi
+
+		MYSQLDATA=/var/lib/mysql
+		MYSQLLOG=/var/log/mysql
+		MYSQLRUN=/var/run/mysqld
+
+		if ! getent group mysql >/dev/null;
+		then
+			addgroup --system mysql >/dev/null
+		fi
+
+		if ! getent passwd mysql >/dev/null;
+		then
+			adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null
+		fi
+
+		if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ];
+		then
+			mkdir ${MYSQLDATA}
+			chown mysql:mysql ${MYSQLDATA}
+			chmod 750 ${MYSQLDATA}
+		fi
+
+		if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ];
+		then
+			mkdir ${MYSQLLOG}
+			chown mysql:adm ${MYSQLLOG}
+			chmod 750 ${MYSQLLOG}
+			touch ${MYSQLLOG}/error.log
+			chmod 640 ${MYSQLLOG}/error.log
+			chown mysql:adm ${MYSQLLOG}/error.log
+		fi
+
+		if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ];
+		then
+			mkdir ${MYSQLRUN}
+			chown mysql:mysql ${MYSQLRUN}
+			chmod 755 ${MYSQLRUN}
+		fi
+
+		set +e
+
+	fi
+
+	;;
+
+	upgrade)
+
+	set -e
+
+	#DEBHELPER#
+	server_stop
+
+	set +e
+
+	;;
+
+	abort-upgrade)
+
+	;;
+
+	*)
+        exit 1
+        ;;
+esac
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.prerm percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.prerm
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.prerm	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.prerm	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Copyright (c) 2014, 2015, 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
+
+set -e
+
+#DEBHELPER#
+
+set +e
+
+exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.templates percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.templates
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-server.templates	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-server.templates	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+Template: mysql-community-server/root-pass
+Type: password
+Description: Enter root password:
+ Please provide a strong password that will be set for the root account of your MySQL database.
+ Leave it blank if you do not wish to set or change the root password at this time.
+
+Template: mysql-community-server/re-root-pass
+Type: password
+Description: Re-enter root password:
+ Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone.
+
+Template: mysql-community-server/root-pass-mismatch
+Type: error
+Description: The two passwords did not match
+ Please try again. Make sure you type the exact same password twice.
+
+Template: mysql-community-server/remove-data-dir
+Type: boolean
+Default: false
+Description: Remove data directory at /var/lib/mysql ?
+ This operation will remove the data directory that stores all the databases, tables and related meta-data.
+ It is highly recommended to take data backup before removing the data directory.
+
+Template: mysql-community-server/data-dir
+Type: note
+Description: Data directory found when no MySQL server package is installed
+ A data directory '/var/lib/mysql' is present on this system when no MySQL server 
+ package is currently installed on the system. The directory may be under control of
+ server package received from third-party vendors. It may also be an unclaimed data
+ directory from previous removal of mysql packages.
+ .
+ It is highly recommended to take data backup. If you have not done so, now would be
+ the time to take backup in another shell. Once completed, press 'Ok' to continue.
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-source.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-source.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-source.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-source.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2014, 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
+
+../*.dsc    usr/src/mysql/
+../*.tar.gz usr/src/mysql/
+# legal
+usr/share/doc/mysql-community-source/COPYING
+usr/share/doc/mysql-community-source/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-source.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-source.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-source.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-source.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql
+mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz
+mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-test.dirs percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-test.dirs
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-test.dirs	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-test.dirs	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+# Copyright (c) 2014, 2015, 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
+
+usr/lib/mysql-test
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-test.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-test.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-test.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-test.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2014, 2015, 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
+
+usr/lib/mysql-test/*
+usr/share/man/man1/mysql-test-run.pl.1
+# legal
+usr/share/doc/mysql-community-test/COPYING
+usr/share/doc/mysql-community-test/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-test.links percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-test.links
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-test.links	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-test.links	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,17 @@
+# Copyright (c) 2014, 2015, 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
+
+usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run
+usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-test.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-test.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-community-test.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-community-test.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql
+mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz
+mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-server.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-server.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-server.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-server.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 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
+
+# legal
+usr/share/doc/mysql-server/COPYING
+usr/share/doc/mysql-server/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-server.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-server.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-server.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-server.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql
+mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz
+mysql-server: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-testsuite.install percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-testsuite.install
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-testsuite.install	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-testsuite.install	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 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
+
+# legal
+usr/share/doc/mysql-testsuite/COPYING
+usr/share/doc/mysql-testsuite/README
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-testsuite.lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-testsuite.lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/mysql-testsuite.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/mysql-testsuite.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+# Copyright (c) 2015, 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
+
+# Additional license file is needed so overriding this warning
+mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql
+mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz
+mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/patches/fix-man-page-links.patch percona-xtrabackup-2.3.7/packaging/deb-wheezy/patches/fix-man-page-links.patch
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/patches/fix-man-page-links.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/patches/fix-man-page-links.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,14 @@
+From: Akhil Mohan <akhil.mohan@oracle.com>
+Description: Fix path in man page link.
+Bug: http://bugs.mysql.com/bug.php?id=70952
+
+--- a/man/mysql_client_test_embedded.1	2013-11-08 19:00:22.000000000 +0530
++++ b/man/mysql_client_test_embedded.1	2013-11-14 19:29:56.768315219 +0530
+@@ -1 +1 @@
+-.so man-gpl-tmp2/mysql_client_test.1
++.so man1/mysql_client_test.1
+--- a/man/mysqltest_embedded.1	2013-11-08 19:00:22.000000000 +0530
++++ b/man/mysqltest_embedded.1	2013-11-14 19:31:19.079280675 +0530
+@@ -1 +1 @@
+-.so man-gpl-tmp2/mysqltest.1
++.so man1/mysqltest.1
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/patches/fix-mtr-search-paths.patch percona-xtrabackup-2.3.7/packaging/deb-wheezy/patches/fix-mtr-search-paths.patch
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/patches/fix-mtr-search-paths.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/patches/fix-mtr-search-paths.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+From: Akhil Mohan <akhil.mohan@oracle.com>
+Description: Adding extra search path for testsuite.
+
+--- a/mysql-test/lib/mtr_cases.pm	2014-02-24 13:14:37 +0530
++++ b/mysql-test/lib/mtr_cases.pm	2014-07-02 11:46:24 +0530
+@@ -288,6 +288,7 @@
+     {
+       $suitedir= my_find_dir($::basedir,
+ 			     ["share/mysql-test/suite",
++			      "lib/mysql-test/suite",
+ 			      "mysql-test/suite",
+ 			      "internal/mysql-test/suite",
+ 			      "mysql-test",
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/patches/fix-mysql_install_db.patch percona-xtrabackup-2.3.7/packaging/deb-wheezy/patches/fix-mysql_install_db.patch
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/patches/fix-mysql_install_db.patch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/patches/fix-mysql_install_db.patch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,43 @@
+From: Terje Røsten <terje.rosten@oracle.com>
+Description: Maintains the pending --skip-my-cnf option in mainline
+Bug: <TODO>
+
+diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
+index 440a977..7d068fc 100644
+--- a/scripts/mysql_install_db.pl.in
++++ b/scripts/mysql_install_db.pl.in
+@@ -113,6 +113,7 @@ EOF2
+   print <<EOF3;
+   --rpm                For internal use.  This option is used by RPM files
+                        during the MySQL installation process.
++                       Implies --keep-my-cnf option.
+   --skip-name-resolve  Use IP addresses rather than hostnames when creating
+                        grant table entries.  This option can be useful if
+                        your DNS does not work.
+@@ -439,7 +440,7 @@ if ( $opt->{srcdir} and $opt->{basedir} )
+ {
+   error($opt,"Specify either --basedir or --srcdir, not both");
+ }
+-if ( $opt->{'keep-my-cnf'} )
++if ( $opt->{rpm} || $opt->{'keep-my-cnf'} )
+ {
+   $keep_my_cnf = 1;
+ }
+@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
+ }
+
+ # ----------------------------------------------------------------------
+-# Create database directories mysql & test
++# Create database directory mysql
+ # ----------------------------------------------------------------------
+
+ # FIXME The shell variant uses "mkdir -p":
+@@ -697,7 +698,7 @@ if ($opt_user)
+   }
+ }
+
+-foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
++foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql")
+ {
+   mkdir($dir, 0700) unless -d $dir;
+   if ($opt_user and -w "/")
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/patches/series percona-xtrabackup-2.3.7/packaging/deb-wheezy/patches/series
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/patches/series	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2014, 2015, 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
+
+#fix-man-page-links.patch
+fix-mysql_install_db.patch
+fix-mtr-search-paths.patch
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/rules percona-xtrabackup-2.3.7/packaging/deb-wheezy/rules
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/rules	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/rules	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,132 @@
+#!/usr/bin/make -f
+
+# Copyright (c) 2014, 2015, 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
+
+%:
+	dh $@
+
+export DH_VERBOSE=1
+export CFLAGS=
+export CXXFLAGS=
+
+override_dh_auto_configure:
+	@echo "RULES.$@"
+	cmake . \
+		-DBUILD_CONFIG=mysql_release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DINSTALL_DOCDIR=share/mysql/docs \
+		-DINSTALL_DOCREADMEDIR=share/mysql \
+		-DINSTALL_INCLUDEDIR=include/mysql \
+		-DINSTALL_INFODIR=share/mysql/docs \
+		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_MANDIR=share/man \
+		-DINSTALL_MYSQLSHAREDIR=share/mysql \
+		-DINSTALL_MYSQLTESTDIR=lib/mysql-test \
+		-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+		-DINSTALL_SBINDIR=sbin \
+		-DINSTALL_SCRIPTDIR=bin \
+		-DINSTALL_SQLBENCHDIR=lib/mysql \
+		-DINSTALL_SUPPORTFILESDIR=share/mysql \
+		-DMYSQL_DATADIR=/var/lib/mysql \
+		-DSYSCONFDIR=/etc/mysql \
+		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+		-DWITH_SSL=bundled \
+		-DWITH_ZLIB=system \
+		-DWITH_EXTRA_CHARSETS=all \
+		-DWITH_INNODB_MEMCACHED=1 \
+		-DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \
+		-DINSTALL_LAYOUT=DEB
+
+	cat CMakeCache.txt
+	touch $@
+
+override_dh_auto_build:
+	@echo "RULES.$@"
+	$(MAKE) -j8 VERBOSE=1
+	touch $@
+
+override_dh_auto_test:
+	@echo "RULES.$@"
+	echo "No tests run because test 9: pfs_connect_attr is failing unreasonably"
+	touch $@
+
+override_dh_auto_install:
+
+	@echo "RULES.$@"
+	# complete install first
+	$(MAKE) install DESTDIR=debian/tmp
+	# remove all redundant files and links
+	rm debian/tmp/usr/lib/*/*_r*
+	rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake
+	rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake
+	rm debian/tmp/usr/lib/mysql-test/Makefile
+	# add missing man pages
+	install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1
+	# add MySQL Server configuration file my.cnf to mysql-common package
+	install -g root -o root -m 0644 -D debian/extra/my.cnf debian/tmp/etc/mysql/my.cnf
+	# add MySQL Server debug binary and library to package
+	install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug
+	install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a
+	# add debug plugin libraries to package
+	install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug
+	for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done
+	install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug
+	install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug
+	# add directory for legal docs
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test
+	install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source
+	# add COPYING file to each package
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING
+	# add README file to each package
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README
+	install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README
+	touch $@
+
+override_dh_installinit:
+	@echo "RULES.$@"
+	dh_installinit --name=mysql -- defaults 19 21
+	touch $@
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/source/format percona-xtrabackup-2.3.7/packaging/deb-wheezy/source/format
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/source/format	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/source/format	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/source/include-binaries percona-xtrabackup-2.3.7/packaging/deb-wheezy/source/include-binaries
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/source/include-binaries	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/source/include-binaries	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+# Copyright (c) 2014, 2015, 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
+
+# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins
+debian/extra/server-binary
+debian/extra/embedded-server
+debian/extra/adt_null-plugin
+debian/extra/auth-plugin
+debian/extra/auth_socket-plugin
+debian/extra/auth_test_plugin-plugin
+debian/extra/innodb_engine-plugin
+debian/extra/libdaemon_example-plugin
+debian/extra/libmemcached-plugin
+debian/extra/mypluglib-plugin
+debian/extra/mysql_no_login-plugin
+debian/extra/qa_auth_client-plugin
+debian/extra/qa_auth_interface-plugin
+debian/extra/qa_auth_server-plugin
+debian/extra/semisync_master-plugin
+debian/extra/semisync_slave-plugin
+debian/extra/validate_password-plugin
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/source/lintian-overrides percona-xtrabackup-2.3.7/packaging/deb-wheezy/source/lintian-overrides
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/source/lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2015, 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
+
+# We provide our own versioning scheme so this warning is overridden
+mysql-community source: changelog-should-mention-nmu
+mysql-community source: source-nmu-has-incorrect-version-number
diff -Nru percona-xtrabackup-2.2.3/packaging/deb-wheezy/watch percona-xtrabackup-2.3.7/packaging/deb-wheezy/watch
--- percona-xtrabackup-2.2.3/packaging/deb-wheezy/watch	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/deb-wheezy/watch	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2 @@
+version=3
+http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-fedora/mysql-5.6.16-mysql-install.patch percona-xtrabackup-2.3.7/packaging/rpm-fedora/mysql-5.6.16-mysql-install.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-fedora/mysql-5.6.16-mysql-install.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-fedora/mysql-5.6.16-mysql-install.patch	2017-02-27 07:47:02.000000000 +0000
@@ -1,17 +1,8 @@
 diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
-index 440a977..7d068fc 100644
+index 1fa5164..4aa49ca 100644
 --- a/scripts/mysql_install_db.pl.in
 +++ b/scripts/mysql_install_db.pl.in
-@@ -75,6 +97,8 @@ Usage: $0 [OPTIONS]
-   --help               Display this help and exit.                     
-   --ldata=path         The path to the MySQL data directory. Same as --datadir.
-   --no-defaults        Don't read default options from any option file.
-+  --keep-my-cnf        Don't try to create my.cnf based on template. 
-+                       Useful for systems with working, updated my.cnf.
- EOF1
-   if ( $^O !~ m/^(MSWin32|cygwin)$/ ) {
-     print <<EOF2;
-@@ -86,6 +110,7 @@ EOF2
+@@ -113,6 +113,7 @@ EOF2
    print <<EOF3;
    --rpm                For internal use.  This option is used by RPM files
                         during the MySQL installation process.
@@ -19,89 +10,16 @@
    --skip-name-resolve  Use IP addresses rather than hostnames when creating
                         grant table entries.  This option can be useful if
                         your DNS does not work.
-@@ -149,6 +174,7 @@ sub parse_arguments
- 
-              "skip-name-resolve",
-              "verbose",
-+             "keep-my-cnf",
-              "rpm",
-              "help",
-              "random-passwords",
-@@ -399,11 +431,16 @@ $basedir= "@prefix@" if ! $basedir;		# Default
- # ----------------------------------------------------------------------
- 
- my $print_defaults;
-+my $keep_my_cnf = 0;
- 
- if ( $opt->{srcdir} and $opt->{basedir} )
+@@ -439,7 +440,7 @@ if ( $opt->{srcdir} and $opt->{basedir} )
  {
    error($opt,"Specify either --basedir or --srcdir, not both");
  }
+-if ( $opt->{'keep-my-cnf'} )
 +if ( $opt->{rpm} || $opt->{'keep-my-cnf'} )
-+{
-+  $keep_my_cnf = 1;
-+}
- if ( $opt->{srcdir} )
  {
-   $opt->{builddir} = $opt->{srcdir} unless $opt->{builddir};
-@@ -425,7 +462,7 @@ my $config_file;
- my $copy_cfg_file;
- 
- # ----------------------------------------------------------------------
--# This will be the default config file
-+# This will be the default config file (unless creation is unwanted)
- # ----------------------------------------------------------------------
- 
- my $cnfext = ( $^O =~ m/^(MSWin32|cygwin)$/ ) ? "ini" : "cnf";
-@@ -434,6 +471,11 @@ $config_file= "$basedir/my.$cnfext";
- 
- my $cfg_template= find_in_basedir($opt,"file","my-default.$cnfext",
- 				  ".", "share","share/mysql","support-files");
-+# Distros might move files
-+if ((! -r $cfg_template) && (-r "@pkgdatadir@/my-default.cnf")) {
-+  $cfg_template = "@pkgdatadir@/my-default.cnf";
-+}
-+
- -e $cfg_template or cannot_find_file("my-default.$cnfext");
- 
- $copy_cfg_file= $config_file;
-@@ -443,22 +485,21 @@ if (-e $copy_cfg_file)
-   $copy_cfg_file =~ s/my.$cnfext/my-new.$cnfext/;
-   # Too early to print warning here, the user may not notice
+   $keep_my_cnf = 1;
  }
--open (TEMPL, $cfg_template) or error($opt, "Could not open config template $cfg_template");
--if (open (CFG, "> $copy_cfg_file"))
--{
--  while (<TEMPL>)
--  {
--    # Remove lines beginning with # *** which are template comments
--    print CFG $_ unless /^# \*\*\*/;
-+
-+if ( ! $keep_my_cnf ) {
-+  open (TEMPL, $cfg_template) or error($opt, "Could not open config template $cfg_template");
-+  if (open (CFG, "> $copy_cfg_file")) {
-+    while (<TEMPL>) {
-+      # Remove lines beginning with # *** which are template comments
-+      print CFG $_ unless /^# \*\*\*/;
-+    }
-+    close CFG;
-+  } else {
-+    warning($opt,"Could not write to config file $copy_cfg_file: $!");
-+    $failed_write_cfg= 1;
-   }
--  close CFG;
-+  close TEMPL;
- }
--else
--{
--  warning($opt,"Could not write to config file $copy_cfg_file: $!");
--  $failed_write_cfg= 1;
--}
--close TEMPL;
- 
- # ----------------------------------------------------------------------
- # Now we can get arguments from the groups [mysqld] and [mysql_install_db]
-@@ -621,7 +662,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
+@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
  }
  
  # ----------------------------------------------------------------------
@@ -110,7 +28,7 @@
  # ----------------------------------------------------------------------
  
  # FIXME The shell variant uses "mkdir -p":
-@@ -654,7 +695,7 @@ if ($opt_user)
+@@ -697,7 +698,7 @@ if ($opt_user)
    }
  }
  
@@ -119,18 +37,3 @@
  {
    mkdir($dir, 0700) unless -d $dir;
    if ($opt_user and -w "/")
-@@ -848,7 +889,13 @@ if ( open(PIPE, "| $mysqld_install_cmd_line") )
-            "",
-            "Support MySQL by buying support/licenses at http://shop.mysql.com");
- 
--    if ($copy_cfg_file eq $config_file and !$failed_write_cfg)
-+    if ($keep_my_cnf)
-+    {
-+      report($opt,
-+	     "Note: new default config file not created.",
-+	     "Please make sure your config file is current");
-+    }
-+    elsif ($copy_cfg_file eq $config_file and !$failed_write_cfg)
-     {
-       report($opt,
- 	     "New default config file was created as $config_file and",
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-fedora/mysql.spec.in percona-xtrabackup-2.3.7/packaging/rpm-fedora/mysql.spec.in
--- percona-xtrabackup-2.2.3/packaging/rpm-fedora/mysql.spec.in	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-fedora/mysql.spec.in	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2015, 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
@@ -20,7 +20,6 @@
 
 %global mysql_vendor Oracle and/or its affiliates
 %global mysqldatadir /var/lib/mysql
-%global obs_ver      %{version}
 
 # By default, a build will include the bundeled "yaSSL" library for SSL.
 %{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
@@ -28,7 +27,6 @@
 # Regression tests may take a long time, override the default to skip them
 %{!?runselftest:%global runselftest 1}
 
-%{!?without_systemd:             %global systemd 1}
 %{!?with_debuginfo:              %global nodebuginfo 1}
 %{!?product_suffix:              %global product_suffix community}
 %{!?feature_set:                 %global feature_set community}
@@ -80,9 +78,7 @@
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
-%if 0%{?systemd}
 BuildRequires:  systemd
-%endif
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
@@ -117,26 +113,23 @@
 Requires:       net-tools
 %if 0%{?commercial}
 Obsoletes:      mysql-community-server < %{version}-%{release}
-Requires:       mysql-enterprise-client%{?_isa} = %{version}-%{release}
-Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-common%{?_isa} = %{version}-%{release}
 %else
 Requires:       mysql-community-client%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
 %endif
 Obsoletes:      mariadb-server
-Obsoletes:      community-mysql-server < %{obs_ver}
-Obsoletes:      mysql-server < %{obs_ver}
+Obsoletes:      mariadb-galera-server
+Obsoletes:      community-mysql-server < %{version}-%{release}
+Obsoletes:      mysql-server < %{version}-%{release}
 Provides:       mysql-server = %{version}-%{release}
 Provides:       mysql-server%{?_isa} = %{version}-%{release}
-%if 0%{?systemd}
+Provides:       mysql-compat-server = %{version}-%{release}
+Provides:       mysql-compat-server%{?_isa} = %{version}-%{release}
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
-%else
-Requires(post):   /sbin/chkconfig
-Requires(preun):  /sbin/chkconfig
-Requires(preun):  /sbin/service
-%endif
 
 %description    server
 The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
@@ -164,13 +157,13 @@
 Group:          Applications/Databases
 %if 0%{?commercial}
 Obsoletes:      mysql-community-client < %{version}-%{release}
-Requires:       mysql-enterprise-libs%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-libs%{?_isa} = %{version}-%{release}
 %else
 Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
 %endif
 Obsoletes:      mariadb
-Obsoletes:      community-mysql < %{obs_ver}
-Obsoletes:      mysql < %{obs_ver}
+Obsoletes:      community-mysql < %{version}-%{release}
+Obsoletes:      mysql < %{version}-%{release}
 Provides:       mysql = %{version}-%{release}
 Provides:       mysql%{?_isa} = %{version}-%{release}
 
@@ -178,15 +171,18 @@
 This package contains the standard MySQL clients and administration
 tools.
 
-
 %package        common
 Summary:        MySQL database common files for server and client libs
 Group:          Applications/Databases
 %if 0%{?commercial}
 Obsoletes:      mysql-community-common < %{version}-%{release}
 %endif
-Obsoletes:      community-mysql-common < %{obs_ver}
-Obsoletes:      mysql-common < %{obs_ver}
+Obsoletes:      mariadb-common
+Obsoletes:      mariadb-config
+Obsoletes:      mariadb-errmsg
+Obsoletes:      community-mysql-common < %{version}-%{release}
+Obsoletes:      community-mysql-errmsg < %{version}-%{release}
+Obsoletes:      mysql-common < %{version}-%{release}
 Provides:       mysql-common = %{version}-%{release}
 Provides:       mysql-common%{?_isa} = %{version}-%{release}
 
@@ -199,14 +195,14 @@
 Summary:        Test suite for the MySQL database server
 Group:          Applications/Databases
 %if 0%{?commercial}
-Requires:       mysql-enterprise-server%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-server%{?_isa} = %{version}-%{release}
 Obsoletes:      mysql-community-test < %{version}-%{release}
 %else
 Requires:       mysql-community-server%{?_isa} = %{version}-%{release}
 %endif
 Obsoletes:      mariadb-test
-Obsoletes:      community-mysql-test < %{obs_ver}
-Obsoletes:      mysql-test < %{obs_ver}
+Obsoletes:      community-mysql-test < %{version}-%{release}
+Obsoletes:      mysql-test < %{version}-%{release}
 Provides:       mysql-test = %{version}-%{release}
 Provides:       mysql-test%{?_isa} = %{version}-%{release}
 
@@ -215,6 +211,25 @@
 database server.
 
 
+%package        bench
+Summary:        MySQL benchmark suite
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-bench < %{version}-%{release}
+Requires:       mysql-commercial-server%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-server%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-bench
+Obsoletes:      community-mysql-bench < %{obs_ver}
+Obsoletes:      mysql-bench < %{obs_ver}
+Provides:       mysql-bench = %{version}-%{release}
+Provides:       mysql-bench%{?_isa} = %{version}-%{release}
+
+%description    bench
+This package contains the MySQL Benchmark Suite for MySQL database
+server.
+
 %package        devel
 Summary:        Development header files and libraries for MySQL database client applications
 Group:          Applications/Databases
@@ -239,13 +254,13 @@
 Group:          Applications/Databases
 %if 0%{?commercial}
 Obsoletes:      mysql-community-libs < %{version}-%{release}
-Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-common%{?_isa} = %{version}-%{release}
 %else
 Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
 %endif
 Obsoletes:      mariadb-libs
-Obsoletes:      community-mysql-libs < %{obs_ver}
-Obsoletes:      mysql-libs < %{obs_ver}
+Obsoletes:      community-mysql-libs < %{version}-%{release}
+Obsoletes:      mysql-libs < %{version}-%{release}
 Provides:       mysql-libs = %{version}-%{release}
 Provides:       mysql-libs%{?_isa} = %{version}-%{release}
 
@@ -258,13 +273,13 @@
 Group:          Applications/Databases
 %if 0%{?commercial}
 Obsoletes:      mysql-community-embedded < %{version}-%{release}
-Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-common%{?_isa} = %{version}-%{release}
 %else
 Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
 %endif
 Obsoletes:      mariadb-embedded
-Obsoletes:      community-mysql-embedded < %{obs_ver}
-Obsoletes:      mysql-embedded < %{obs_ver}
+Obsoletes:      community-mysql-embedded < %{version}-%{release}
+Obsoletes:      mysql-embedded < %{version}-%{release}
 Provides:       mysql-embedded = %{version}-%{release}
 Provides:       mysql-emdedded%{?_isa} = %{version}-%{release}
 
@@ -285,20 +300,20 @@
 Group:          Applications/Databases
 %if 0%{?commercial}
 Obsoletes:      mysql-community-embedded-devel < %{version}-%{release}
-Requires:       mysql-enterprise-devel%{?_isa} = %{version}-%{release}
-Requires:       mysql-enterprise-embedded%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-devel%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-embedded%{?_isa} = %{version}-%{release}
 %else
 Requires:       mysql-community-devel%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-embedded%{?_isa} = %{version}-%{release}
 %endif
 Obsoletes:      mariadb-embedded-devel
-Obsoletes:      community-mysql-embedded-devel < %{obs_ver}
-Obsoletes:      mysql-embedded-devel < %{obs_ver}
+Obsoletes:      community-mysql-embedded-devel < %{version}-%{release}
+Obsoletes:      mysql-embedded-devel < %{version}-%{release}
 Provides:       mysql-embedded-devel = %{version}-%{release}
 Provides:       mysql-embedded-devel%{?_isa} = %{version}-%{release}
 
 %description    embedded-devel
-This package contains files needed for developing applicatison using
+This package contains files needed for developing applications using
 the embedded version of the MySQL server.
 
 %prep
@@ -318,26 +333,25 @@
 fi
 %endif
 
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-export LDFLAGS="%{__global_ldflags}"
-
 # Build debug versions of mysqld and libmysqld.a
 mkdir debug
 (
   cd debug
   # Attempt to remove any optimisation flags from the debug build
-  CFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
-  CXXFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /') 
+  optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
   cmake ../%{src_dir} \
            -DBUILD_CONFIG=mysql_release \
            -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
+           -DCMAKE_C_FLAGS="$optflags" \
+           -DCMAKE_CXX_FLAGS="$optflags" \
            -DWITH_INNODB_MEMCACHED=1 \
            -DINSTALL_LIBDIR="%{_lib}/mysql" \
            -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
            -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
+           -DWITH_EMBEDDED_SERVER=1 \
            -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
            %{?ssl_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
@@ -354,11 +368,15 @@
            -DBUILD_CONFIG=mysql_release \
            -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DCMAKE_C_FLAGS="%{optflags}" \
+           -DCMAKE_CXX_FLAGS="%{optflags}" \
            -DWITH_INNODB_MEMCACHED=1 \
            -DINSTALL_LIBDIR="%{_lib}/mysql" \
            -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
            -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
+           -DWITH_EMBEDDED_SERVER=1 \
            -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
            %{?ssl_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
@@ -383,6 +401,7 @@
 # Install logrotate and autostart
 install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
 install -D -m 0644 $MBD/release/packaging/rpm-fedora/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+install -d %{buildroot}%{_sysconfdir}/my.cnf.d
 install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/mysql-systemd-start
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mysqld.service
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/mysql.conf
@@ -436,34 +455,16 @@
 
 %post server
 datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
-/bin/chmod 0755 "$datadir"
-/bin/touch /var/log/mysqld.log
-%if 0%{?systemd}
+/bin/chmod 0755 "$datadir" >/dev/null 2>&1 || :
+/bin/touch /var/log/mysqld.log >/dev/null 2>&1 || :
 %systemd_post mysqld.service
-/sbin/service mysqld enable >/dev/null 2>&1 || :
-%else
-/sbin/chkconfig --add mysqld
-/usr/bin/mysql_install_db --datadir="$datadir" --user=mysql >/dev/null 2>&1 || :
-%endif
+/usr/bin/systemctl enable mysqld >/dev/null 2>&1 || :
 
 %preun server
-%if 0%{?systemd}
 %systemd_preun mysqld.service
-%else
-if [ "$1" = 0 ]; then
-    /sbin/service mysqld stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del mysqld
-fi
-%endif
 
 %postun server
-%if 0%{?systemd}
 %systemd_postun_with_restart mysqld.service
-%else
-if [ $1 -ge 1 ]; then
-    /sbin/service mysqld condrestart >/dev/null 2>&1 || :
-fi
-%endif
 
 %post libs -p /sbin/ldconfig
 
@@ -498,7 +499,6 @@
 %attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1*
 %attr(644, root, root) %{_mandir}/man1/mysqlman.1*
 %attr(644, root, root) %{_mandir}/man1/mysql.server.1*
-%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
 %attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
 %attr(644, root, root) %{_mandir}/man1/mysql_zap.1*
 %attr(644, root, root) %{_mandir}/man1/mysqlbug.1*
@@ -508,6 +508,7 @@
 %attr(644, root, root) %{_mandir}/man1/resolveip.1*
 
 %config(noreplace) %{_sysconfdir}/my.cnf
+%dir %{_sysconfdir}/my.cnf.d
 
 %attr(755, root, root) %{_bindir}/innochecksum
 %attr(755, root, root) %{_bindir}/my_print_defaults
@@ -528,7 +529,6 @@
 %attr(755, root, root) %{_bindir}/mysqld_safe
 %attr(755, root, root) %{_bindir}/mysqldumpslow
 %attr(755, root, root) %{_bindir}/mysqlhotcopy
-%attr(755, root, root) %{_bindir}/mysqltest
 %attr(755, root, root) %{_bindir}/perror
 %attr(755, root, root) %{_bindir}/replace
 %attr(755, root, root) %{_bindir}/resolve_stack_dump
@@ -538,7 +538,26 @@
 %attr(755, root, root) %{_sbindir}/mysqld
 %attr(755, root, root) %{_sbindir}/mysqld-debug
 
-%{_libdir}/mysql/plugin
+%dir %{_libdir}/mysql/plugin
+%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/innodb_engine.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/libmemcached.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/mysql_no_login.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/validate_password.so
+%dir %{_libdir}/mysql/plugin/debug
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/innodb_engine.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmemcached.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mysql_no_login.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so
 
 %attr(644, root, root) %{_datadir}/mysql/fill_help_tables.sql
 %attr(644, root, root) %{_datadir}/mysql/mysql_system_tables.sql
@@ -553,17 +572,14 @@
 %attr(644, root, root) %{_datadir}/mysql/innodb_memcached_config.sql
 %attr(644, root, root) %{_datadir}/mysql/magic
 %attr(644, root, root) %{_prefix}/lib/tmpfiles.d/mysql.conf
-%if 0%{?systemd}
 %attr(644, root, root) %{_unitdir}/mysqld.service
-%else
-%attr(755, root, root) %{_sysconfdir}/init.d/mysqld
-%endif
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %dir %attr(755, mysql, mysql) /var/lib/mysql
 %dir %attr(755, mysql, mysql) /var/run/mysqld
 
 %files common
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %{_datadir}/mysql/charsets/
 %{_datadir}/mysql/errmsg-utf8.txt
 %{_datadir}/mysql/bulgarian/
@@ -593,10 +609,9 @@
 
 %files client
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %attr(755, root, root) %{_bindir}/msql2mysql
 %attr(755, root, root) %{_bindir}/mysql
-%attr(755, root, root) %{_bindir}/mysql_config
-%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
 %attr(755, root, root) %{_bindir}/mysql_find_rows
 %attr(755, root, root) %{_bindir}/mysql_waitpid
 %attr(755, root, root) %{_bindir}/mysqlaccess
@@ -609,6 +624,8 @@
 %attr(755, root, root) %{_bindir}/mysqlimport
 %attr(755, root, root) %{_bindir}/mysqlshow
 %attr(755, root, root) %{_bindir}/mysqlslap
+%attr(755, root, root) %{_bindir}/mysql_config
+%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
 %attr(755, root, root) %{_bindir}/mysql_config_editor
 
 %attr(644, root, root) %{_mandir}/man1/msql2mysql.1*
@@ -627,10 +644,11 @@
 
 %files devel
 %defattr(-, root, root, -)
-%attr(755, root, root) %{_bindir}/mysql_config
-%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
+%doc %{?license_files_server}
 %attr(644, root, root) %{_mandir}/man1/comp_err.1*
 %attr(644, root, root) %{_mandir}/man1/mysql_config.1*
+%attr(755, root, root) %{_bindir}/mysql_config
+%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
 %{_includedir}/mysql
 %{_datadir}/aclocal/mysql.m4
 %{_libdir}/mysql/libmysqlclient.a
@@ -641,35 +659,84 @@
 
 %files libs
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %dir %attr(755, root, root) %{_libdir}/mysql
 %attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
-%{_libdir}/mysql/libmysqlclient.so.*
-%{_libdir}/mysql/libmysqlclient_r.so.*
+%{_libdir}/mysql/libmysqlclient.so.18*
+%{_libdir}/mysql/libmysqlclient_r.so.18*
 
 %files test
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %attr(-, root, root) %{_datadir}/mysql-test
 %attr(755, root, root) %{_bindir}/mysql_client_test
 %attr(755, root, root) %{_bindir}/mysql_client_test_embedded
+%attr(755, root, root) %{_bindir}/mysqltest
 %attr(755, root, root) %{_bindir}/mysqltest_embedded
+
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so
+%attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
+%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
+
 %attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
 %attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
 %attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
 %attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
 %attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
 
+%files bench
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%{_datadir}/sql-bench
+
 %files embedded
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
+%dir %attr(755, root, root) %{_libdir}/mysql
 %attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so.*
 
 %files embedded-devel
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %attr(644, root, root) %{_libdir}/mysql/libmysqld.a
 %attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
 
 %changelog
+* Wed Jan 14 2015 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.24-1
+- Add mysql_no_login.so plugin
+
+* Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.22-1
+- Add license info in each subpackage
+- Remove systemd conditional
+- Various clean up
+- Add support for Fedora 21
+- Update to 5.6.22
+
+* Wed Aug 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.21-1
+- Updated to 5.6.21
+
+* Tue Jul 22 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.20-3
+- Provide mysql-compat-server dependencies 
+
+* Thu Jul 10 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.20-2
+- Remove dtrace dependencies 
+
+* Wed Jun 25 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.20-1
+- Add bench package
+
 * Fri Feb 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.17-1
 - 5.6.17
 - Enable shared libmysqld by cmake option
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-fedora/mysql-systemd-start percona-xtrabackup-2.3.7/packaging/rpm-fedora/mysql-systemd-start
--- percona-xtrabackup-2.2.3/packaging/rpm-fedora/mysql-systemd-start	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-fedora/mysql-systemd-start	2017-02-27 07:47:02.000000000 +0000
@@ -8,10 +8,19 @@
 # post mode :  ping server until answer is received
 # 
 
+get_option () {
+    local section=$1
+    local option=$2
+    local default=$3
+    ret=$(/usr/bin/my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
+    [ -z $ret ] && ret=$default
+    echo $ret
+}
+
 install_db () {    
     # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode)
-    datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
-    
+    datadir=$(get_option mysqld datadir "/var/lib/mysql")
+
     # Restore log, dir, perms and SELinux contexts
     [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
     log=/var/log/mysqld.log
@@ -35,9 +44,16 @@
     # Wait for ping to answer to signal startup completed,
     # might take a while in case of e.g. crash recovery
     # MySQL systemd service will timeout script if no answer
+    datadir=$(get_option mysqld datadir "/var/lib/mysql")
+    socket=$(get_option  mysqld socket "$datadir/mysql.sock")
+    case $socket in
+        /*) adminsocket="$socket" ;;
+        *) adminsocket="$datadir/$socket" ;;
+    esac
+
     while /bin/true ; do
         sleep 1
-        mysqladmin ping >/dev/null 2>&1 && break
+        mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break
     done
     exit 0
 }
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-oel/filter-requires.sh percona-xtrabackup-2.3.7/packaging/rpm-oel/filter-requires.sh
--- percona-xtrabackup-2.2.3/packaging/rpm-oel/filter-requires.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-oel/filter-requires.sh	2017-02-27 07:47:02.000000000 +0000
@@ -2,5 +2,5 @@
 #
 
 /usr/lib/rpm/perl.req $* |
-sed -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
+sed -e '/perl(GD)/d' -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
 
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-oel/mysql-5.6.16-mysql-install.patch percona-xtrabackup-2.3.7/packaging/rpm-oel/mysql-5.6.16-mysql-install.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-oel/mysql-5.6.16-mysql-install.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-oel/mysql-5.6.16-mysql-install.patch	2017-02-27 07:47:02.000000000 +0000
@@ -1,17 +1,8 @@
 diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
-index 440a977..7d068fc 100644
+index 1fa5164..4aa49ca 100644
 --- a/scripts/mysql_install_db.pl.in
 +++ b/scripts/mysql_install_db.pl.in
-@@ -75,6 +97,8 @@ Usage: $0 [OPTIONS]
-   --help               Display this help and exit.                     
-   --ldata=path         The path to the MySQL data directory. Same as --datadir.
-   --no-defaults        Don't read default options from any option file.
-+  --keep-my-cnf        Don't try to create my.cnf based on template. 
-+                       Useful for systems with working, updated my.cnf.
- EOF1
-   if ( $^O !~ m/^(MSWin32|cygwin)$/ ) {
-     print <<EOF2;
-@@ -86,6 +110,7 @@ EOF2
+@@ -113,6 +113,7 @@ EOF2
    print <<EOF3;
    --rpm                For internal use.  This option is used by RPM files
                         during the MySQL installation process.
@@ -19,89 +10,16 @@
    --skip-name-resolve  Use IP addresses rather than hostnames when creating
                         grant table entries.  This option can be useful if
                         your DNS does not work.
-@@ -149,6 +174,7 @@ sub parse_arguments
- 
-              "skip-name-resolve",
-              "verbose",
-+             "keep-my-cnf",
-              "rpm",
-              "help",
-              "random-passwords",
-@@ -399,11 +431,16 @@ $basedir= "@prefix@" if ! $basedir;		# Default
- # ----------------------------------------------------------------------
- 
- my $print_defaults;
-+my $keep_my_cnf = 0;
- 
- if ( $opt->{srcdir} and $opt->{basedir} )
+@@ -439,7 +440,7 @@ if ( $opt->{srcdir} and $opt->{basedir} )
  {
    error($opt,"Specify either --basedir or --srcdir, not both");
  }
+-if ( $opt->{'keep-my-cnf'} )
 +if ( $opt->{rpm} || $opt->{'keep-my-cnf'} )
-+{
-+  $keep_my_cnf = 1;
-+}
- if ( $opt->{srcdir} )
  {
-   $opt->{builddir} = $opt->{srcdir} unless $opt->{builddir};
-@@ -425,7 +462,7 @@ my $config_file;
- my $copy_cfg_file;
- 
- # ----------------------------------------------------------------------
--# This will be the default config file
-+# This will be the default config file (unless creation is unwanted)
- # ----------------------------------------------------------------------
- 
- my $cnfext = ( $^O =~ m/^(MSWin32|cygwin)$/ ) ? "ini" : "cnf";
-@@ -434,6 +471,11 @@ $config_file= "$basedir/my.$cnfext";
- 
- my $cfg_template= find_in_basedir($opt,"file","my-default.$cnfext",
- 				  ".", "share","share/mysql","support-files");
-+# Distros might move files
-+if ((! -r $cfg_template) && (-r "@pkgdatadir@/my-default.cnf")) {
-+  $cfg_template = "@pkgdatadir@/my-default.cnf";
-+}
-+
- -e $cfg_template or cannot_find_file("my-default.$cnfext");
- 
- $copy_cfg_file= $config_file;
-@@ -443,22 +485,21 @@ if (-e $copy_cfg_file)
-   $copy_cfg_file =~ s/my.$cnfext/my-new.$cnfext/;
-   # Too early to print warning here, the user may not notice
+   $keep_my_cnf = 1;
  }
--open (TEMPL, $cfg_template) or error($opt, "Could not open config template $cfg_template");
--if (open (CFG, "> $copy_cfg_file"))
--{
--  while (<TEMPL>)
--  {
--    # Remove lines beginning with # *** which are template comments
--    print CFG $_ unless /^# \*\*\*/;
-+
-+if ( ! $keep_my_cnf ) {
-+  open (TEMPL, $cfg_template) or error($opt, "Could not open config template $cfg_template");
-+  if (open (CFG, "> $copy_cfg_file")) {
-+    while (<TEMPL>) {
-+      # Remove lines beginning with # *** which are template comments
-+      print CFG $_ unless /^# \*\*\*/;
-+    }
-+    close CFG;
-+  } else {
-+    warning($opt,"Could not write to config file $copy_cfg_file: $!");
-+    $failed_write_cfg= 1;
-   }
--  close CFG;
-+  close TEMPL;
- }
--else
--{
--  warning($opt,"Could not write to config file $copy_cfg_file: $!");
--  $failed_write_cfg= 1;
--}
--close TEMPL;
- 
- # ----------------------------------------------------------------------
- # Now we can get arguments from the groups [mysqld] and [mysql_install_db]
-@@ -621,7 +662,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
+@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
  }
  
  # ----------------------------------------------------------------------
@@ -110,7 +28,7 @@
  # ----------------------------------------------------------------------
  
  # FIXME The shell variant uses "mkdir -p":
-@@ -654,7 +695,7 @@ if ($opt_user)
+@@ -697,7 +698,7 @@ if ($opt_user)
    }
  }
  
@@ -119,18 +37,3 @@
  {
    mkdir($dir, 0700) unless -d $dir;
    if ($opt_user and -w "/")
-@@ -848,7 +889,13 @@ if ( open(PIPE, "| $mysqld_install_cmd_line") )
-            "",
-            "Support MySQL by buying support/licenses at http://shop.mysql.com");
- 
--    if ($copy_cfg_file eq $config_file and !$failed_write_cfg)
-+    if ($keep_my_cnf)
-+    {
-+      report($opt,
-+	     "Note: new default config file not created.",
-+	     "Please make sure your config file is current");
-+    }
-+    elsif ($copy_cfg_file eq $config_file and !$failed_write_cfg)
-     {
-       report($opt,
- 	     "New default config file was created as $config_file and",
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-oel/mysql.init percona-xtrabackup-2.3.7/packaging/rpm-oel/mysql.init
--- percona-xtrabackup-2.2.3/packaging/rpm-oel/mysql.init	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-oel/mysql.init	2017-02-27 07:47:02.000000000 +0000
@@ -50,11 +50,15 @@
 get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
 mypidfile="$result"
 
+case $socketfile in
+    /*) adminsocket="$socketfile" ;;
+     *) adminsocket="$datadir/$socketfile" ;;
+esac
 
 start(){
     [ -x $exec ] || exit 5
     # check to see if it's already running
-    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
+    RESPONSE=$(/usr/bin/mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1)
     if [ $? = 0 ]; then
 	# already running, do nothing
 	action $"Starting $prog: " /bin/true
@@ -107,7 +111,7 @@
 	ret=0
 	TIMEOUT="$STARTTIMEOUT"
 	while [ $TIMEOUT -gt 0 ]; do
-	    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
+	    RESPONSE=$(/usr/bin/mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1) && break
 	    echo "$RESPONSE" | grep -q "Access denied for user" && break
 	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
 		echo "MySQL Daemon failed to start."
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-oel/mysql.spec.in percona-xtrabackup-2.3.7/packaging/rpm-oel/mysql.spec.in
--- percona-xtrabackup-2.2.3/packaging/rpm-oel/mysql.spec.in	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-oel/mysql.spec.in	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2015, 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
@@ -85,7 +85,7 @@
 Summary:        A very fast and reliable SQL database server
 Group:          Applications/Databases
 Version:        @VERSION@
-Release:        4%{?dist}
+Release:        3%{?commercial:.1}%{?dist}
 License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
 URL:            http://www.mysql.com/
@@ -119,7 +119,7 @@
 
 %if 0%{?rhel} > 6
 # For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
-%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::)
+%global __requires_exclude ^perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
 %global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
 %else
 # https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6
@@ -154,17 +154,24 @@
 Requires:       shadow-utils
 Requires:       net-tools
 %if 0%{?commercial}
+Provides:       MySQL-server-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-server-advanced < %{version}-%{release}
 Obsoletes:      mysql-community-server < %{version}-%{release}
-Requires:       mysql-enterprise-client%{?_isa} = %{version}-%{release}
-Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-common%{?_isa} = %{version}-%{release}
 %else
+Provides:       MySQL-server%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-client%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      MySQL-server < %{version}-%{release}
 Obsoletes:      mysql-server < %{version}-%{release}
 Obsoletes:      mariadb-server
+Obsoletes:      mariadb-galera-server
 Provides:       mysql-server = %{version}-%{release}
 Provides:       mysql-server%{?_isa} = %{version}-%{release}
+Provides:       mysql-compat-server = %{version}-%{release}
+Provides:       mysql-compat-server%{?_isa} = %{version}-%{release}
 %if 0%{?systemd}
 Requires(post):   systemd
 Requires(preun):  systemd
@@ -200,11 +207,15 @@
 Summary:        MySQL database client applications and tools
 Group:          Applications/Databases
 %if 0%{?commercial}
+Provides:       MySQL-client-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-client-advanced < %{version}-%{release}
 Obsoletes:      mysql-community-client < %{version}-%{release}
-Requires:       mysql-enterprise-libs%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-libs%{?_isa} = %{version}-%{release}
 %else
+Provides:       MySQL-client%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      MySQL-client < %{version}-%{release}
 Obsoletes:      mariadb
 %if 0%{?rhel} > 5
 Obsoletes:      mysql < %{version}-%{release}
@@ -235,31 +246,57 @@
 Summary:        Test suite for the MySQL database server
 Group:          Applications/Databases
 %if 0%{?commercial}
+Provides:       MySQL-test-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-test-advanced < %{version}-%{release}
 Obsoletes:      mysql-community-test < %{version}-%{release}
-Requires:       mysql-enterprise-server%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-server%{?_isa} = %{version}-%{release}
 %else
+Provides:       MySQL-test%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-server%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      MySQL-test < %{version}-%{release}
 Obsoletes:      mysql-test < %{version}-%{release}
 Obsoletes:      mariadb-test
 Provides:       mysql-test = %{version}-%{release}
 Provides:       mysql-test%{?_isa} = %{version}-%{release}
 
-
 %description    test
 This package contains the MySQL regression test suite for MySQL
 database server.
 
 
+%package        bench
+Summary:        MySQL benchmark suite
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-bench < %{version}-%{release}
+Requires:       mysql-commercial-server%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-server%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-bench
+Obsoletes:      community-mysql-bench < %{version}-%{release}
+Obsoletes:      mysql-bench < %{version}-%{release}
+Provides:       mysql-bench = %{version}-%{release}
+Provides:       mysql-bench%{?_isa} = %{version}-%{release}
+
+%description    bench
+This package contains the MySQL Benchmark Suite for MySQL database
+server.
+
 %package        devel
 Summary:        Development header files and libraries for MySQL database client applications
 Group:          Applications/Databases
 %if 0%{?commercial}
+Provides:       MySQL-devel-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-devel-advanced < %{version}-%{release}
 Obsoletes:      mysql-community-devel < %{version}-%{release}
-Requires:       mysql-enterprise-libs%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-libs%{?_isa} = %{version}-%{release}
 %else
+Provides:       MySQL-devel%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      MySQL-devel < %{version}-%{release}
 Obsoletes:      mysql-devel < %{version}-%{release}
 Obsoletes:      mariadb-devel
 Provides:       mysql-devel = %{version}-%{release}
@@ -273,11 +310,15 @@
 Summary:        Shared libraries for MySQL database client applications
 Group:          Applications/Databases
 %if 0%{?commercial}
+Provides:       MySQL-shared-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-shared-advanced < %{version}-%{release}
 Obsoletes:      mysql-community-libs < %{version}-%{release}
-Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-common%{?_isa} = %{version}-%{release}
 %else
+Provides:       MySQL-shared%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      MySQL-shared < %{version}-%{release}
 Obsoletes:      mysql-libs < %{version}-%{release}
 Obsoletes:      mariadb-libs
 Provides:       mysql-libs = %{version}-%{release}
@@ -295,11 +336,15 @@
 Provides:       mysql-libs-compat = %{version}-%{release}
 Provides:       mysql-libs-compat%{?_isa} = %{version}-%{release}
 %if 0%{?commercial}
+Provides:       MySQL-shared-compat-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-shared-compat-advanced < %{version}-%{release}
 Obsoletes:      mysql-community-libs-compat < %{version}-%{release}
-Requires:       mysql-enterprise-libs%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-libs%{?_isa} = %{version}-%{release}
 %else
+Provides:       MySQL-shared-compat%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      MySQL-shared-compat < %{version}-%{release}
 %if 0%{?rhel} > 5
 Obsoletes:      mysql-libs < %{version}-%{release}
 %endif
@@ -313,11 +358,16 @@
 Summary:        MySQL embedded library
 Group:          Applications/Databases
 %if 0%{?commercial}
+Provides:       MySQL-embedded-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-embedded-advanced < %{version}-%{release}
 Obsoletes:      mysql-community-embedded < %{version}-%{release}
-Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-common%{?_isa} = %{version}-%{release}
 %else
+Provides:       MySQL-embedded%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      mariadb-embedded
+Obsoletes:      MySQL-embedded < %{version}-%{release}
 Obsoletes:      mysql-embedded < %{version}-%{release}
 Provides:       mysql-embedded = %{version}-%{release}
 Provides:       mysql-emdedded%{?_isa} = %{version}-%{release}
@@ -339,12 +389,13 @@
 Group:          Applications/Databases
 %if 0%{?commercial}
 Obsoletes:      mysql-community-embedded-devel < %{version}-%{release}
-Requires:       mysql-enterprise-devel%{?_isa} = %{version}-%{release}
-Requires:       mysql-enterprise-embedded%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-devel%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-embedded%{?_isa} = %{version}-%{release}
 %else
 Requires:       mysql-community-devel%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-embedded%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      mariadb-embedded-devel
 Obsoletes:      mysql-embedded-devel < %{version}-%{release}
 Provides:       mysql-embedded-devel = %{version}-%{release}
 Provides:       mysql-embedded-devel%{?_isa} = %{version}-%{release}
@@ -358,9 +409,9 @@
 Summary:        Convenience package for easy upgrades of MySQL package set
 Group:          Applications/Databases
 %if 0%{?commercial}
-Requires:       mysql-enterprise-client%{?_isa} = %{version}-%{release}
-Requires:       mysql-enterprise-libs%{?_isa} = %{version}-%{release}
-Requires:       mysql-enterprise-libs-compat%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-libs%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-libs-compat%{?_isa} = %{version}-%{release}
 %else
 Requires:       mysql-community-client%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
@@ -437,23 +488,22 @@
 )
 %endif # 0%{?compatlib}
 
-export CFLAGS="%{optflags} %{?el7:-DTAOCRYPT_DISABLE_X86ASM}"
-export CXXFLAGS="%{optflags} %{?el7:-DTAOCRYPT_DISABLE_X86ASM}"
-
 # Build debug versions of mysqld and libmysqld.a
 mkdir debug
 (
   cd debug
   # Attempt to remove any optimisation flags from the debug build
-  CFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
-  CXXFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /') 
+  optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
   cmake ../%{src_dir} \
            -DBUILD_CONFIG=mysql_release \
            -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
+           -DCMAKE_C_FLAGS="$optflags" \
+           -DCMAKE_CXX_FLAGS="$optflags" \
            -DWITH_INNODB_MEMCACHED=1 \
            -DINSTALL_LIBDIR="%{_lib}/mysql" \
            -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
            -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DWITH_EMBEDDED_SERVER=1 \
@@ -473,9 +523,12 @@
            -DBUILD_CONFIG=mysql_release \
            -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DCMAKE_C_FLAGS="%{optflags}" \
+           -DCMAKE_CXX_FLAGS="%{optflags}" \
            -DWITH_INNODB_MEMCACHED=1 \
            -DINSTALL_LIBDIR="%{_lib}/mysql" \
            -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
            -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DWITH_EMBEDDED_SERVER=1 \
@@ -512,6 +565,7 @@
 # Install logrotate and autostart
 install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
 install -D -m 0644 $MBD/release/packaging/rpm-oel/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+install -d %{buildroot}%{_sysconfdir}/my.cnf.d
 %if 0%{?systemd}
 install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/mysql-systemd-start
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mysqld.service
@@ -520,7 +574,7 @@
 %endif
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/mysql.conf
 
-# Make library links
+# Add libdir to linker
 install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d
 echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
 
@@ -543,6 +597,7 @@
 rm -rf %{buildroot}%{_datadir}/mysql/binary-configure
 rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
 rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
+rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql 
 %if 0%{?systemd}
 rm -rf %{buildroot}%{_sysconfdir}/init.d/mysqld
 %endif
@@ -571,11 +626,11 @@
 
 %post server
 datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
-/bin/chmod 0755 "$datadir"
-/bin/touch /var/log/mysqld.log
+/bin/chmod 0755 "$datadir" >/dev/null 2>&1 || :
+/bin/touch /var/log/mysqld.log >/dev/null 2>&1 || :
 %if 0%{?systemd}
 %systemd_post mysqld.service
-/sbin/service mysqld enable >/dev/null 2>&1 || :
+/usr/bin/systemctl enable mysqld >/dev/null 2>&1 || :
 %else
 /sbin/chkconfig --add mysqld
 %endif
@@ -648,6 +703,7 @@
 %attr(644, root, root) %{_mandir}/man1/resolveip.1*
 
 %config(noreplace) %{_sysconfdir}/my.cnf
+%dir %{_sysconfdir}/my.cnf.d
 
 %attr(755, root, root) %{_bindir}/innochecksum
 %attr(755, root, root) %{_bindir}/my_print_defaults
@@ -685,6 +741,7 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/innodb_engine.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libmemcached.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/mysql_no_login.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/validate_password.so
@@ -694,6 +751,7 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/innodb_engine.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmemcached.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mysql_no_login.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so
@@ -712,6 +770,19 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
 
+%if 0%{?commercial}
+%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/openssl_udf.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/firewall.so 
+%attr(644, root, root) %{_datadir}/mysql/linux_install_firewall.sql 
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/openssl_udf.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/firewall.so 
+%endif
 %attr(644, root, root) %{_datadir}/mysql/fill_help_tables.sql
 %attr(644, root, root) %{_datadir}/mysql/mysql_system_tables.sql
 %attr(644, root, root) %{_datadir}/mysql/mysql_system_tables_data.sql
@@ -736,6 +807,7 @@
 
 %files common
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %{_datadir}/mysql/charsets/
 %{_datadir}/mysql/errmsg-utf8.txt
 %{_datadir}/mysql/bulgarian/
@@ -765,6 +837,7 @@
 
 %files client
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %attr(755, root, root) %{_bindir}/msql2mysql
 %attr(755, root, root) %{_bindir}/mysql
 %attr(755, root, root) %{_bindir}/mysql_find_rows
@@ -799,6 +872,7 @@
 
 %files devel
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %attr(644, root, root) %{_mandir}/man1/comp_err.1*
 %attr(644, root, root) %{_mandir}/man1/mysql_config.1*
 %attr(755, root, root) %{_bindir}/mysql_config
@@ -813,6 +887,7 @@
 
 %files libs
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %dir %attr(755, root, root) %{_libdir}/mysql
 %attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
 %{_libdir}/mysql/libmysqlclient.so.18*
@@ -821,6 +896,7 @@
 %if 0%{?compatlib}
 %files libs-compat
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %dir %attr(755, root, root) %{_libdir}/mysql
 %attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
 %{_libdir}/mysql/libmysqlclient.so.%{compatlib}
@@ -831,6 +907,7 @@
 
 %files test
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %attr(-, root, root) %{_datadir}/mysql-test
 %attr(755, root, root) %{_bindir}/mysql_client_test
 %attr(755, root, root) %{_bindir}/mysql_client_test_embedded
@@ -841,14 +918,21 @@
 %attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
 %attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
 
+%files bench
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%{_datadir}/sql-bench
+
 %files embedded
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %dir %attr(755, root, root) %{_libdir}/mysql
 %attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so.*
 
 %files embedded-devel
 %defattr(-, root, root, -)
+%doc %{?license_files_server}
 %attr(644, root, root) %{_libdir}/mysql/libmysqld.a
 %attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
@@ -860,6 +944,38 @@
 %endif
 
 %changelog
+* Wed Jan 14 2015 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.24-1
+- Add mysql_no_login.so plugin
+
+* Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.22-1
+- Add license info in each subpackage
+
+* Tue Jul 22 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.20-4
+- Provide mysql-compat-server dependencies
+
+* Tue Jul 08 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.20-3
+- Remove perl(GD) and dtrace dependencies 
+
+* Thu Jun 26 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.20-2
+- Resolve embedded-devel conflict issue
+
+* Wed Jun 25 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.20-1
+- Add bench package
+- Enable dtrace 
+
+* Tue May 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.18-2
+- Disable dtrace for el7 
+
+* Thu Apr 24 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.18-1
+- Updated for 5.6.18
+
+* Mon Apr 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.17-6
+- Fix Cflags for el7 
+
+* Mon Mar 31 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.17-5
+- Support for enterprise packages
+- Upgrade from MySQL-* packages
+
 * Fri Mar 14 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.17-4
 - Resolve mysql conflict with mysql-community-client 
 
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-oel/mysql-systemd-start percona-xtrabackup-2.3.7/packaging/rpm-oel/mysql-systemd-start
--- percona-xtrabackup-2.2.3/packaging/rpm-oel/mysql-systemd-start	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-oel/mysql-systemd-start	2017-02-27 07:47:02.000000000 +0000
@@ -8,10 +8,19 @@
 # post mode :  ping server until answer is received
 # 
 
+get_option () {
+    local section=$1
+    local option=$2
+    local default=$3
+    ret=$(/usr/bin/my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
+    [ -z $ret ] && ret=$default
+    echo $ret
+}
+
 install_db () {    
     # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode)
-    datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
-    
+    datadir=$(get_option mysqld datadir "/var/lib/mysql")
+
     # Restore log, dir, perms and SELinux contexts
     [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
     log=/var/log/mysqld.log
@@ -35,9 +44,16 @@
     # Wait for ping to answer to signal startup completed,
     # might take a while in case of e.g. crash recovery
     # MySQL systemd service will timeout script if no answer
+    datadir=$(get_option mysqld datadir "/var/lib/mysql")
+    socket=$(get_option  mysqld socket "$datadir/mysql.sock")
+    case $socket in
+        /*) adminsocket="$socket" ;;
+        *) adminsocket="$datadir/$socket" ;;
+    esac
+
     while /bin/true ; do
         sleep 1
-        mysqladmin ping >/dev/null 2>&1 && break
+        mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break
     done
     exit 0
 }
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/CMakeLists.txt percona-xtrabackup-2.3.7/packaging/rpm-sles/CMakeLists.txt
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,28 @@
+# Copyright (c) 2012, 2013, 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
+
+
+IF(UNIX)
+  SET(prefix ${CMAKE_INSTALL_PREFIX})
+  SET(SPECFILENAME "mysql.spec")
+  # Left in current directory, to be taken during build
+  CONFIGURE_FILE(mysql.spec.in ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
+  FOREACH(fedfile my.cnf my_config.h mysql.init
+          mysqld.service mysql-systemd-start mysql.conf
+          filter-requires.sh filter-provides.sh)
+    CONFIGURE_FILE(${fedfile} ${CMAKE_CURRENT_BINARY_DIR}/${fedfile} COPYONLY)
+  ENDFOREACH()
+ENDIF()
+
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/filter-provides.sh percona-xtrabackup-2.3.7/packaging/rpm-sles/filter-provides.sh
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/filter-provides.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/filter-provides.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,6 @@
+#! /bin/bash
+#
+
+/usr/lib/rpm/perl.prov $* |
+sed -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
+
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/filter-requires.sh percona-xtrabackup-2.3.7/packaging/rpm-sles/filter-requires.sh
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/filter-requires.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/filter-requires.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,6 @@
+#! /bin/bash
+#
+
+/usr/lib/rpm/perl.req $* |
+sed -e '/perl(GD)/d' -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
+
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/my.cnf percona-xtrabackup-2.3.7/packaging/rpm-sles/my.cnf
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/my.cnf	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/my.cnf	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,31 @@
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html
+
+[mysqld]
+#
+# Remove leading # and set to the amount of RAM for the most important data
+# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
+# innodb_buffer_pool_size = 128M
+#
+# Remove leading # to turn on a very important data integrity option: logging
+# changes to the binary log between backups.
+# log_bin
+#
+# Remove leading # to set options mainly useful for reporting servers.
+# The server defaults are faster for transactions and fast SELECTs.
+# Adjust sizes as needed, experiment to find the optimal values.
+# join_buffer_size = 128M
+# sort_buffer_size = 2M
+# read_rnd_buffer_size = 2M
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# Recommended in standard MySQL setup
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES 
+
+[mysqld_safe]
+log-error=/var/log/mysql/mysqld.log
+pid-file=/var/run/mysql/mysqld.pid
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/my_config.h percona-xtrabackup-2.3.7/packaging/rpm-sles/my_config.h
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/my_config.h	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/my_config.h	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+ *  Fedora supports multi arch: having 32 and 64 versions of MySQL
+ *  installed at the same time. my_config.h will differ due arch
+ *  dependent defs creating a file conflict. We move arch specific
+ *  headers to arch specific file names and include the correct arch
+ *  specific file by installing this generic file.
+ *
+ */
+
+#if defined(__i386__)
+#include "my_config_i386.h"
+#elif defined(__ia64__)
+#include "my_config_ia64.h"
+#elif defined(__powerpc__)
+#include "my_config_ppc.h"
+#elif defined(__powerpc64__)
+#include "my_config_ppc64.h"
+#elif defined(__s390x__)
+#include "my_config_s390x.h"
+#elif defined(__s390__)
+#include "my_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "my_config_sparc64.h"
+#elif defined(__sparc__)
+#include "my_config_sparc.h"
+#elif defined(__x86_64__)
+#include "my_config_x86_64.h"
+#else
+#error "This MySQL devel package does not work your architecture?"
+#endif
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/mysql.conf percona-xtrabackup-2.3.7/packaging/rpm-sles/mysql.conf
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/mysql.conf	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/mysql.conf	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1 @@
+d /var/run/mysql 0755 mysql mysql -
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/mysqld.service percona-xtrabackup-2.3.7/packaging/rpm-sles/mysqld.service
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/mysqld.service	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/mysqld.service	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,48 @@
+#
+# Simple MySQL systemd service file
+#
+# systemd supports lots of fancy features, look here (and linked docs) for a full list: 
+#   http://www.freedesktop.org/software/systemd/man/systemd.exec.html
+#
+# Note: this file ( /usr/lib/systemd/system/mysql.service )
+# will be overwritten on package upgrade, please copy the file to 
+#
+#  /etc/systemd/system/mysql.service 
+#  
+# to make needed changes.
+# 
+# systemd-delta can be used to check differences between the two mysql.service files.
+#
+
+[Unit]
+Description=MySQL Community Server
+After=network.target
+After=syslog.target
+
+[Install]
+WantedBy=multi-user.target
+Alias=mysql.service
+
+[Service]
+User=mysql
+Group=mysql
+
+# Execute pre and post scripts as root
+PermissionsStartOnly=true
+
+# Needed to create system tables etc.
+ExecStartPre=/usr/bin/mysql-systemd-start pre
+
+# Start main service
+ExecStart=/usr/bin/mysqld_safe
+
+# Don't signal startup success before a ping works
+ExecStartPost=/usr/bin/mysql-systemd-start post
+
+# Give up if ping don't get an answer
+TimeoutSec=600
+
+Restart=always
+PrivateTmp=false
+
+
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/mysql.init percona-xtrabackup-2.3.7/packaging/rpm-sles/mysql.init
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/mysql.init	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/mysql.init	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,252 @@
+#! /bin/bash
+#
+# Copyright (c) 2013, 2014, 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
+
+
+
+# MySQL Database start/stop script
+
+# chkconfig:   - 64 36
+# description: MySQL Database
+# processname: mysqld
+# config:      /etc/my.cnf
+# pidfile:     /var/run/mysql/mysqld.pid
+
+# Comments to support LSB init script conventions
+### BEGIN INIT INFO
+# Provides:          mysql
+# Required-Start:    $network $remote_fs
+# Required-Stop:     $network $remote_fs
+# Default-Start:     3 5
+# Default-Stop:      0 1 6
+# Short-Description: MySQL Database
+# Description:       MySQL Database
+### END INIT INFO
+
+# 
+# https://en.opensuse.org/openSUSE:Packaging_init_scripts#Exit_Status_Codes
+# 
+
+[ -e /etc/rc.status ] && . /etc/rc.status
+
+rc_reset
+
+STARTTIMEOUT=180
+STOPTIMEOUT=60
+PROG=/usr/bin/mysqld_safe
+
+[ -e /etc/sysconfig/mysql ] && . /etc/sysconfig/mysql
+
+# Lock directory
+lockfile=/var/lock/subsys/mysql
+
+get_option () {
+    local section=$1
+    local option=$2
+    local default=$3
+    ret=$(/usr/bin/my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
+    [ -z $ret ] && ret=$default
+    echo $ret
+}
+
+datadir=$(get_option mysqld datadir "/var/lib/mysql")
+socket=$(get_option  mysqld socket "$datadir/mysql.sock")
+pidfile=$(get_option mysqld_safe pid-file "/var/run/mysql/mysqld.pid")
+logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
+
+install_db () {
+    # Note: something different than datadir=/var/lib/mysql requires 
+    # SELinux policy changes (in enforcing mode)
+    datadir=$(get_option mysqld datadir "/var/lib/mysql")
+    logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
+
+    # Restore log, dir, perms and SELinux contexts
+    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || return 1
+
+    [ -e $logfile ] || touch $logfile || return 1
+    chmod 0640 $logfile
+    chown mysql:mysql $logfile || return 1
+    if [ -x /usr/sbin/restorecon ]; then
+        /usr/sbin/restorecon "$datadir"
+        /usr/sbin/restorecon $logfile
+    fi
+
+    # If special mysql dir is in place, skip db install 
+    [ -d "$datadir/mysql" ] && return 0
+
+    # Create initial db
+    /usr/bin/mysql_install_db --datadir="$datadir" --rpm --user=mysql --keep-my-cnf
+    return $?
+}
+
+# Wait for ping to answer to signal startup completed,
+# might take a while in case of e.g. crash recovery
+pinger () {
+    mysqld_safe_pid=$1
+    timer=$STARTTIMEOUT
+    ret=0
+    while [ $timer -gt 0 ]; do
+        sleep 1
+        mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 && break
+	timer=$(expr $timer - 1)
+
+	# Check if mysqld_safe is still alive, if not there is no hope
+	if ! kill -0 $mysqld_safe_pid >/dev/null 2>&1 ; then
+	    ret=1
+	    break
+	fi
+    done
+    
+    # Did we timeout?
+    if [ $timer = 0 ]; then
+	echo "MySQL Database start up timeout after ${STARTTIMEOUT}s"
+	ret=1
+    fi
+    return $ret
+}
+
+# Check if mysqld is running
+chk_running () {
+    ret=0
+    if [ -e "$pidfile" ]; then
+	pid=$(cat "$pidfile") || ret=4
+    else
+	ret=7
+    fi
+
+    # Check if $pid is a mysqld pid
+    if [ $ret -eq 0 ]; then
+	[ -L "/proc/$pid/exe" ] || ret=7 
+    fi
+
+    if [ $ret -eq 0 ]; then
+	exec=$(readlink "/proc/$pid/exe") || ret=7
+    fi
+
+    if [ $ret -eq 0 ]; then
+	[ "x$(basename $exec)" = "xmysqld" ] || ret=7
+    fi
+    return $ret
+}
+
+start () {
+    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
+	echo -n "Starting service MySQL:"
+	rc_reset ; rc_status -v ; rc_exit
+    fi
+
+    if ! install_db; then
+	echo -n "MySQL Database could not initialize data directory:"
+	rc_failed 6 ; rc_status -v ; rc_exit
+    fi
+
+    $PROG --basedir=/usr --datadir="$datadir" --pid-file="$pidfile" >/dev/null 2>&1 &
+    if pinger $! ; then
+	echo -n "Starting service MySQL:"
+	touch $lockfile
+	rc_reset
+    else
+	echo -n "Failed to start service MySQL:"
+	rc_failed 3
+    fi
+    rc_status -v
+}
+
+stop () {
+    chk_running
+    ret=$?
+    if [ $ret -ne 0 ]; then
+	echo -n "Shutting down service MySQL:"
+	rc_reset ; rc_status -v ; return 0
+    fi
+
+    # chk_running has verified this works
+    pid=$(cat "$pidfile")
+
+    # We use a signal to avoid having to know the root password
+    # Send single kill command and then wait
+    if kill $pid >/dev/null 2>&1; then
+	timer=$STOPTIMEOUT
+	while [ $timer -gt 0 ]; do
+            kill -0 $pid >/dev/null 2>&1 || break
+            sleep 1
+            timer=$(expr $timer - 1)
+	done
+    else
+	echo -n "Shutting down service MySQL:"
+	rc_failed 4 ; rc_status -v ; rc_exit
+    fi
+    
+    if [ $timer -eq 0 ]; then
+	echo -n "Failed to stop service MySQL:"
+	rc_failed 1
+    else
+	rm -f $lockfile
+	rm -f "$socketfile"
+	echo -n "Shutting down service MySQL:"
+	rc_reset
+    fi
+    rc_status -v
+} 
+
+restart () {
+    stop
+    start
+}
+
+reload () {
+    ret=0
+    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
+	pid=$(cat "$pidfile")
+	kill -HUP $pid >/dev/null 2>&1
+	echo -n "Reloading service MySQL:"
+	rc_reset
+    else
+	echo -n "Reloading of service MySQL failed:"
+        rc_failed 7
+    fi
+    rc_status -v
+}
+
+condrestart () {
+    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
+	restart
+    fi
+}
+
+status () {
+   echo -n "Checking for service MySQL:"
+   checkproc mysqld
+   rc_status -v
+}  
+
+case "$1" in
+    start  ) start   ;;
+    stop   ) stop    ;;
+    restart) restart ;;
+    status ) status  ;;
+    condrestart        ) condrestart ;;
+    reload|force-reload) reload ;;
+
+    *) echo $"Usage: $0 {start|stop|restart|condrestart|status|reload|force-reload}"; exit 1 ;;
+esac
+
+rc_exit
+
+
+
+
+
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/mysql.spec.in percona-xtrabackup-2.3.7/packaging/rpm-sles/mysql.spec.in
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/mysql.spec.in	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/mysql.spec.in	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,1685 @@
+# Copyright (c) 2000, 2015, 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; see the file COPYING. If not, write to the
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
+# MA  02110-1301  USA.
+
+
+%global mysql_vendor    Oracle and/or its affiliates
+%global mysqldatadir    /var/lib/mysql
+
+# By default, a build will include the bundeled "yaSSL" library for SSL.
+%{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
+
+# Regression tests may take a long time, override the default to skip them
+%{!?runselftest:%global runselftest 0}
+
+%{!?with_systemd:                %global systemd 0}
+%{!?with_debuginfo:              %global nodebuginfo 1}
+%{!?product_suffix:              %global product_suffix community}
+%{!?feature_set:                 %global feature_set community}
+%{!?compilation_comment_release: %global compilation_comment_release MySQL Community Server - (GPL)}
+%{!?compilation_comment_debug:   %global compilation_comment_debug MySQL Community Server - Debug (GPL)}
+%{!?src_base:                    %global src_base mysql}
+
+%global src_dir               %{src_base}-%{version}
+
+# multiarch
+%global multiarchs            ppc %{power64} %{ix86} x86_64 %{sparc}
+
+# No debuginfo for now, ships /usr/sbin/mysqld-debug and libmysqlcliet-debug.a
+%if 0%{?nodebuginfo}
+%global _enable_debug_package 0
+%global debug_package         %{nil}
+%global __os_install_post     /usr/lib/rpm/brp-compress %{nil}
+%endif
+
+%if 0%{?commercial}
+%global license_files_server  %{src_dir}/LICENSE.mysql
+%global license_type          Commercial
+%else
+%global license_files_server  %{src_dir}/COPYING %{src_dir}/README
+%global license_type          GPLv2
+%endif
+
+%if 0%{?suse_version} == 1110
+%global dist                  .sles11
+%global sles11                1
+%endif
+
+%if 0%{?suse_version} == 1315
+%global dist                  .sles12
+%global sles12                1
+%endif
+
+# https://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
+%{?sles12:                %global systemd 1}
+%{!?_tmpfilesdir:         %global _tmpfilesdir /usr/lib/tmpfiles.d}
+
+Name:           mysql-%{product_suffix}
+Summary:        A very fast and reliable SQL database server
+Group:          Applications/Databases
+Version:        @VERSION@
+Release:        2%{?commercial:.1}%{?dist}
+License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
+Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
+URL:            http://www.mysql.com/
+Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com>
+Vendor:         %{mysql_vendor}
+Source1:        mysql-systemd-start
+Source2:        mysqld.service
+Source3:        mysql.conf
+Source4:        my_config.h
+Source90:       filter-provides.sh
+Source91:       filter-requires.sh
+BuildRequires:  cmake
+BuildRequires:  perl
+BuildRequires:  libaio-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openssl-devel
+BuildRequires:  zlib-devel
+%if 0%{?systemd}
+BuildRequires:  systemd
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  systemd-rpm-macros
+%endif
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+%if 0%{?rhel} > 6
+# For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
+%global __requires_exclude ^perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
+%global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
+%else
+# https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6
+%global __perl_provides %{SOURCE90}
+%global __perl_requires %{SOURCE91}
+%endif
+
+%description
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest
+news and information about the MySQL software. Also please see the
+documentation and the manual for more information.
+
+%package        server
+Summary:        A very fast and reliable SQL database server
+Group:          Applications/Databases
+Requires:       coreutils
+Requires:       grep
+Requires:       procps
+Requires:       net-tools
+Requires:       perl-base
+%if 0%{?commercial}
+Provides:       MySQL-server-advanced = %{version}-%{release}
+Obsoletes:      MySQL-server-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-server < %{version}-%{release}
+Requires:       mysql-commercial-client = %{version}-%{release}
+Requires:       mysql-commercial-common = %{version}-%{release}
+%else
+Provides:       MySQL-server = %{version}-%{release}
+Requires:       mysql-community-client = %{version}-%{release}
+Requires:       mysql-community-common = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-server < %{version}-%{release}
+Obsoletes:      mysql < %{version}-%{release}
+Obsoletes:      mysql-tools < %{version}-%{release}
+Obsoletes:      mariadb-server
+Obsoletes:      mariadb-galera-server
+Provides:       mysql = %{version}-%{release}
+Provides:       mysql-tools = %{version}-%{release}
+%if 0%{?systemd}
+%{?systemd_requires}
+%else
+PreReq:         insserv
+%endif
+PreReq:         sed
+PreReq:         pwdutils
+Conflicts:      otherproviders(mysql)
+Conflicts:      otherproviders(mysql-debug)
+Conflicts:      otherproviders(mysql-tools)
+
+%description    server
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest news and
+information about the MySQL software.  Also please see the documentation
+and the manual for more information.
+
+This package includes the MySQL server binary as well as related utilities
+to run and administer a MySQL server.
+
+%package        client
+Summary:        MySQL database client applications and tools
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-client-advanced = %{version}-%{release}
+Obsoletes:      MySQL-client-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-client < %{version}-%{release}
+Requires:       mysql-commercial-libs = %{version}-%{release}
+%else
+Provides:       MySQL-client = %{version}-%{release}
+Requires:       mysql-community-libs = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-client < %{version}-%{release}
+Provides:       mysql-client = %{version}-%{release}
+Obsoletes:      mysql-client < %{version}-%{release}
+Obsoletes:      mariadb
+Conflicts:      otherproviders(mysql-client)
+
+%description    client
+This package contains the standard MySQL clients and administration
+tools.
+
+%package        common
+Summary:        MySQL database common files for server and client libs
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-common < %{version}-%{release}
+%endif
+Provides:       mysql-common = %{version}-%{release}
+
+%description    common
+This packages contains common files needed by MySQL client library,
+MySQL database server, and MySQL embedded server.
+
+
+%package        test
+Summary:        Test suite for the MySQL database server
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-test-advanced = %{version}-%{release}
+Obsoletes:      MySQL-test-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-test < %{version}-%{release}
+Requires:       mysql-commercial-server = %{version}-%{release}
+%else
+Provides:       MySQL-test = %{version}-%{release}
+Requires:       mysql-community-server = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-test < %{version}-%{release}
+Obsoletes:      mysql-test < %{version}-%{release}
+Obsoletes:      mariadb-test
+Provides:       mysql-test = %{version}-%{release}
+Conflicts:      otherproviders(mysql-test)
+
+%description    test
+This package contains the MySQL regression test suite for MySQL
+database server.
+
+
+%package        bench
+Summary:        MySQL benchmark suite
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-bench < %{version}-%{release}
+Requires:       mysql-commercial-server = %{version}-%{release}
+%else
+Requires:       mysql-community-server = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-bench
+Obsoletes:      community-mysql-bench < %{version}-%{release}
+Obsoletes:      mysql-bench < %{version}-%{release}
+Provides:       mysql-bench = %{version}-%{release}
+Conflicts:      otherproviders(mysql-bench)
+
+%description    bench
+This package contains the MySQL Benchmark Suite for MySQL database
+server.
+
+%package        devel
+Summary:        Development header files and libraries for MySQL database client applications
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-devel-advanced = %{version}-%{release}
+Obsoletes:      MySQL-devel-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-devel < %{version}-%{release}
+Requires:       mysql-commercial-libs = %{version}-%{release}
+%else
+Provides:       MySQL-devel = %{version}-%{release}
+Requires:       mysql-community-libs = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-devel < %{version}-%{release}
+Obsoletes:      mysql-devel < %{version}-%{release}
+Obsoletes:      mariadb-devel
+Obsoletes:      libmysqlclient-devel
+Provides:       mysql-devel = %{version}-%{release}
+Provides:       libmysqlclient-devel = %{version}-%{release}
+
+%description    devel
+This package contains the development header files and libraries necessary
+to develop MySQL client applications.
+
+%package        libs
+Summary:        Shared libraries for MySQL database client applications
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-shared-advanced = %{version}-%{release}
+Obsoletes:      MySQL-shared-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-libs < %{version}-%{release}
+Requires:       mysql-commercial-common = %{version}-%{release}
+%else
+Provides:       MySQL-shared = %{version}-%{release}
+Requires:       mysql-community-common = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-shared < %{version}-%{release}
+Obsoletes:      mysql-libs < %{version}-%{release}
+Obsoletes:      mariadb-libs
+Obsoletes:      libmysqlclient18 < %{version}-%{release}
+Obsoletes:      libmysqlclient_r18 < %{version}-%{release}
+Provides:       mysql-libs = %{version}-%{release}
+Provides:       libmysqlclient18 = %{version}-%{release}
+Provides:       libmysqlclient_r18 = %{version}-%{release}
+
+%description    libs
+This package contains the shared libraries for MySQL client
+applications.
+
+%package        embedded
+Summary:        MySQL embedded library
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-embedded-advanced = %{version}-%{release}
+Obsoletes:      MySQL-embedded-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-embedded < %{version}-%{release}
+Requires:       mysql-commercial-common = %{version}-%{release}
+%else
+Provides:       MySQL-embedded = %{version}-%{release}
+Requires:       mysql-community-common = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-embedded
+Obsoletes:      MySQL-embedded < %{version}-%{release}
+Obsoletes:      mysql-embedded < %{version}-%{release}
+Provides:       mysql-embedded = %{version}-%{release}
+
+%description    embedded
+This package contains the MySQL server as an embedded library.
+
+The embedded MySQL server library makes it possible to run a full-featured
+MySQL server inside the client application. The main benefits are increased
+speed and more simple management for embedded applications.
+
+The API is identical for the embedded MySQL version and the
+client/server version.
+
+For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
+
+%package        embedded-devel
+Summary:        Development header files and libraries for MySQL as an embeddable library
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-embedded-devel < %{version}-%{release}
+Requires:       mysql-commercial-devel = %{version}-%{release}
+Requires:       mysql-commercial-embedded = %{version}-%{release}
+%else
+Requires:       mysql-community-devel = %{version}-%{release}
+Requires:       mysql-community-embedded = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-embedded-devel
+Obsoletes:      mysql-embedded-devel < %{version}-%{release}
+Provides:       mysql-embedded-devel = %{version}-%{release}
+
+%description    embedded-devel
+This package contains files needed for developing applications using
+the embedded version of the MySQL server.
+
+%prep
+%setup -q -T -a 0 -c -n %{src_dir}
+pushd %{src_dir}
+
+%build
+# Fail quickly and obviously if user tries to build as root
+%if 0%{?runselftest}
+if [ "x$(id -u)" = "x0" ] ; then
+   echo "The MySQL regression tests may fail if run as root."
+   echo "If you really need to build the RPM as root, use"
+   echo "--define='runselftest 0' to skip the regression tests."
+   exit 1
+fi
+%endif
+
+
+# Build debug versions of mysqld and libmysqld.a
+mkdir debug
+(
+  cd debug
+  # Attempt to remove any optimisation flags from the debug build
+  optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-D_FORTIFY_SOURCE=2/ /' -e 's/-Wp, / /')
+  cmake ../%{src_dir} \
+           -DBUILD_CONFIG=mysql_release \
+           -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=Debug \
+           -DCMAKE_C_FLAGS="$optflags" \
+           -DCMAKE_CXX_FLAGS="$optflags" \
+           -DWITH_INNODB_MEMCACHED=1 \
+           -DINSTALL_LIBDIR="%{_lib}/mysql" \
+           -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           -DWITH_EMBEDDED_SERVER=1 \
+           -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
+           %{?ssl_option} \
+           -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
+           -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
+  echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
+  make %{?_smp_mflags} VERBOSE=1
+)
+
+# Build full release
+mkdir release
+(
+  cd release
+  cmake ../%{src_dir} \
+           -DBUILD_CONFIG=mysql_release \
+           -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DCMAKE_C_FLAGS="%{optflags}" \
+           -DCMAKE_CXX_FLAGS="%{optflags}" \
+           -DWITH_INNODB_MEMCACHED=1 \
+           -DINSTALL_LIBDIR="%{_lib}/mysql" \
+           -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           -DWITH_EMBEDDED_SERVER=1 \
+           -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
+           %{?ssl_option} \
+           -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
+           -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
+  echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
+  make %{?_smp_mflags} VERBOSE=1
+)
+
+%install
+MBD=$RPM_BUILD_DIR/%{src_dir}
+
+# Ensure that needed directories exists
+install -d -m 0755 %{buildroot}/var/lib/mysql
+install -d -m 0755 %{buildroot}/var/run/mysql
+install -d -m 0750 %{buildroot}/var/log/mysql
+
+# Install all binaries
+cd $MBD/release
+make DESTDIR=%{buildroot} install
+
+# Install logrotate and autostart
+install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
+install -D -m 0644 $MBD/release/packaging/rpm-sles/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+install -d %{buildroot}%{_sysconfdir}/my.cnf.d
+%if 0%{?systemd}
+install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/mysql-systemd-start
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mysql.service
+%else
+install -D -m 0755 $MBD/release/packaging/rpm-sles/mysql.init %{buildroot}%{_sysconfdir}/init.d/mysql
+%endif
+install -D -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/mysql.conf
+
+# Make library links
+install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+
+# multiarch support
+%ifarch %{multiarchs}
+mv %{buildroot}/%{_includedir}/mysql/my_config.h \
+   %{buildroot}/%{_includedir}/mysql/my_config_%{_arch}.h
+install -p -m 0644 %{SOURCE4} %{buildroot}/%{_includedir}/mysql/my_config.h
+%endif
+
+# Remove files pages we explicitly do not want to package
+rm -rf %{buildroot}%{_infodir}/mysql.info*
+rm -rf %{buildroot}%{_datadir}/mysql/binary-configure
+rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
+rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
+%if 0%{?systemd}
+rm -rf %{buildroot}%{_sysconfdir}/init.d/mysql
+%endif
+rm -rf %{buildroot}%{_bindir}/mysql_embedded
+rm -rf %{buildroot}%{_bindir}/mysql_setpermission
+rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
+rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql 
+
+# rcmysql symlink
+install -d %{buildroot}%{_sbindir}
+%if 0%{?systemd}
+ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcmysql
+%else
+ln -sf %{_initrddir}/mysql %{buildroot}%{_sbindir}/rcmysql
+%endif
+
+%check
+%if 0%{?runselftest}
+pushd release
+make test VERBOSE=1
+export MTR_BUILD_THREAD=auto
+pushd mysql-test
+./mtr \
+    --mem --parallel=auto --force --retry=0 \
+    --mysqld=--binlog-format=mixed \
+    --suite-timeout=720 --testcase-timeout=30 \
+    --clean-vardir
+rm -r $(readlink var) var
+%endif
+
+%pre server
+/usr/sbin/groupadd -r mysql >/dev/null 2>&1 || :
+/usr/sbin/useradd -g mysql -o -r -d /var/lib/mysql -s /bin/false \
+    -c "MySQL Server" -u 60 mysql >/dev/null 2>&1 || :
+%if 0%{?systemd}
+%service_add_pre mysql.service
+%endif
+
+%post server
+datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
+/bin/chmod 0755 "$datadir"
+/bin/touch /var/log/mysql/mysqld.log
+%if 0%{?systemd}
+%service_add_post mysql.service
+/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf >/dev/null 2>&1 || :
+/bin/systemctl enable mysql.service >/dev/null 2>&1 || :
+%else
+/sbin/insserv /etc/init.d/mysql
+%endif
+
+%preun server
+%if 0%{?systemd}
+%service_del_preun mysql.service
+%else
+if [ "$1" -eq 0 ]; then
+    /usr/sbin/rcmysql stop >/dev/null 2>&1 || :
+    /sbin/insserv /etc/init.d
+fi
+%endif
+
+%postun server
+%if 0%{?systemd}
+%service_del_postun mysql.service
+%else
+if [ $1 -ge 1 ]; then
+    /usr/sbin/rcmysql condrestart >/dev/null 2>&1 || :
+fi
+%endif
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%if 0%{?compatlib}
+%post libs-compat -p /sbin/ldconfig
+
+%postun libs-compat -p /sbin/ldconfig
+%endif
+
+%post embedded -p /sbin/ldconfig
+
+%postun embedded -p /sbin/ldconfig
+
+%files server
+%defattr(-, root, root, -)
+%doc %{?license_files_server} %{src_dir}/Docs/ChangeLog
+%doc %{src_dir}/Docs/INFO_SRC*
+%doc release/Docs/INFO_BIN*
+%doc release/support-files/my-default.cnf
+%attr(644, root, root) %{_mandir}/man1/innochecksum.1*
+%attr(644, root, root) %{_mandir}/man1/my_print_defaults.1*
+%attr(644, root, root) %{_mandir}/man1/myisam_ftdump.1*
+%attr(644, root, root) %{_mandir}/man1/myisamchk.1*
+%attr(644, root, root) %{_mandir}/man1/myisamlog.1*
+%attr(644, root, root) %{_mandir}/man1/myisampack.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_convert_table_format.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_fix_extensions.1*
+%attr(644, root, root) %{_mandir}/man8/mysqld.8*
+%attr(644, root, root) %{_mandir}/man1/mysqld_multi.1*
+%attr(644, root, root) %{_mandir}/man1/mysqld_safe.1*
+%attr(644, root, root) %{_mandir}/man1/mysqldumpslow.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_install_db.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_plugin.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_secure_installation.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_upgrade.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlman.1*
+%attr(644, root, root) %{_mandir}/man1/mysql.server.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_zap.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlbug.1*
+%attr(644, root, root) %{_mandir}/man1/perror.1*
+%attr(644, root, root) %{_mandir}/man1/replace.1*
+%attr(644, root, root) %{_mandir}/man1/resolve_stack_dump.1*
+%attr(644, root, root) %{_mandir}/man1/resolveip.1*
+
+%config(noreplace) %{_sysconfdir}/my.cnf
+%dir %{_sysconfdir}/my.cnf.d
+
+%attr(755, root, root) %{_bindir}/innochecksum
+%attr(755, root, root) %{_bindir}/my_print_defaults
+%attr(755, root, root) %{_bindir}/myisam_ftdump
+%attr(755, root, root) %{_bindir}/myisamchk
+%attr(755, root, root) %{_bindir}/myisamlog
+%attr(755, root, root) %{_bindir}/myisampack
+%attr(755, root, root) %{_bindir}/mysql_convert_table_format
+%attr(755, root, root) %{_bindir}/mysql_fix_extensions
+%attr(755, root, root) %{_bindir}/mysql_install_db
+%attr(755, root, root) %{_bindir}/mysql_plugin
+%attr(755, root, root) %{_bindir}/mysql_secure_installation
+%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
+%attr(755, root, root) %{_bindir}/mysql_upgrade
+%attr(755, root, root) %{_bindir}/mysql_zap
+%attr(755, root, root) %{_bindir}/mysqlbug
+%attr(755, root, root) %{_bindir}/mysqld_multi
+%attr(755, root, root) %{_bindir}/mysqld_safe
+%attr(755, root, root) %{_bindir}/mysqldumpslow
+%attr(755, root, root) %{_bindir}/mysqlhotcopy
+%attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/perror
+%attr(755, root, root) %{_bindir}/replace
+%attr(755, root, root) %{_bindir}/resolve_stack_dump
+%attr(755, root, root) %{_bindir}/resolveip
+%if 0%{?systemd}
+%attr(755, root, root) %{_bindir}/mysql-systemd-start
+%endif
+%attr(755, root, root) %{_sbindir}/mysqld
+%attr(755, root, root) %{_sbindir}/mysqld-debug
+%attr(755, root, root) %{_sbindir}/rcmysql
+
+%dir %{_libdir}/mysql/plugin
+%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/innodb_engine.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/libmemcached.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/mysql_no_login.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/validate_password.so
+%dir %{_libdir}/mysql/plugin/debug
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/innodb_engine.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmemcached.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mysql_no_login.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so
+%if 0%{?commercial}
+%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/openssl_udf.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/firewall.so 
+%attr(644, root, root) %{_datadir}/mysql/linux_install_firewall.sql 
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/openssl_udf.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/firewall.so 
+%endif
+%attr(644, root, root) %{_datadir}/mysql/fill_help_tables.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables_data.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_test_data_timezone.sql
+%attr(644, root, root) %{_datadir}/mysql/my-*.cnf
+%attr(644, root, root) %{_datadir}/mysql/mysql-log-rotate
+%attr(644, root, root) %{_datadir}/mysql/mysql_security_commands.sql
+%attr(644, root, root) %{_datadir}/mysql/dictionary.txt
+%attr(644, root, root) %{_datadir}/mysql/innodb_memcached_config.sql
+%attr(644, root, root) %{_datadir}/mysql/magic
+%attr(644, root, root) %{_prefix}/lib/tmpfiles.d/mysql.conf
+%if 0%{?systemd}
+%attr(644, root, root) %{_unitdir}/mysql.service
+%else
+%attr(755, root, root) %{_sysconfdir}/init.d/mysql
+%endif
+%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
+%dir %attr(755, mysql, mysql) /var/lib/mysql
+%dir %attr(755, mysql, mysql) /var/run/mysql
+%dir %attr(750, mysql, mysql) /var/log/mysql
+
+%files common
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%{_datadir}/mysql/charsets/
+%{_datadir}/mysql/errmsg-utf8.txt
+%{_datadir}/mysql/bulgarian/
+%{_datadir}/mysql/czech/
+%{_datadir}/mysql/danish/
+%{_datadir}/mysql/dutch/
+%{_datadir}/mysql/english/
+%{_datadir}/mysql/estonian/
+%{_datadir}/mysql/french/
+%{_datadir}/mysql/german/
+%{_datadir}/mysql/greek/
+%{_datadir}/mysql/hungarian/
+%{_datadir}/mysql/italian/
+%{_datadir}/mysql/japanese/
+%{_datadir}/mysql/korean/
+%{_datadir}/mysql/norwegian-ny/
+%{_datadir}/mysql/norwegian/
+%{_datadir}/mysql/polish/
+%{_datadir}/mysql/portuguese/
+%{_datadir}/mysql/romanian/
+%{_datadir}/mysql/russian/
+%{_datadir}/mysql/serbian/
+%{_datadir}/mysql/slovak/
+%{_datadir}/mysql/spanish/
+%{_datadir}/mysql/swedish/
+%{_datadir}/mysql/ukrainian/
+
+%files client
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%attr(755, root, root) %{_bindir}/msql2mysql
+%attr(755, root, root) %{_bindir}/mysql
+%attr(755, root, root) %{_bindir}/mysql_find_rows
+%attr(755, root, root) %{_bindir}/mysql_waitpid
+%attr(755, root, root) %{_bindir}/mysqlaccess
+# XXX: This should be moved to %{_sysconfdir}
+%attr(644, root, root) %{_bindir}/mysqlaccess.conf
+%attr(755, root, root) %{_bindir}/mysqladmin
+%attr(755, root, root) %{_bindir}/mysqlbinlog
+%attr(755, root, root) %{_bindir}/mysqlcheck
+%attr(755, root, root) %{_bindir}/mysqldump
+%attr(755, root, root) %{_bindir}/mysqlimport
+%attr(755, root, root) %{_bindir}/mysqlshow
+%attr(755, root, root) %{_bindir}/mysqlslap
+%attr(755, root, root) %{_bindir}/mysql_config
+%attr(755, root, root) %{_bindir}/mysql_config_editor
+
+%attr(644, root, root) %{_mandir}/man1/msql2mysql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_find_rows.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_waitpid.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlaccess.1*
+%attr(644, root, root) %{_mandir}/man1/mysqladmin.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlbinlog.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlcheck.1*
+%attr(644, root, root) %{_mandir}/man1/mysqldump.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlimport.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlshow.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlslap.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_config_editor.1*
+
+%files devel
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%attr(644, root, root) %{_mandir}/man1/comp_err.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_config.1*
+%attr(755, root, root) %{_bindir}/mysql_config
+%{_includedir}/mysql
+%{_datadir}/aclocal/mysql.m4
+%{_libdir}/mysql/libmysqlclient.a
+%{_libdir}/mysql/libmysqlclient_r.a
+%{_libdir}/mysql/libmysqlservices.a
+%{_libdir}/mysql/libmysqlclient_r.so
+%{_libdir}/mysql/libmysqlclient.so
+
+%files libs
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%{_libdir}/mysql/libmysqlclient.so.18*
+%{_libdir}/mysql/libmysqlclient_r.so.18*
+
+%if 0%{?compatlib}
+%files libs-compat
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%{_libdir}/mysql/libmysqlclient.so.%{compatlib}
+%{_libdir}/mysql/libmysqlclient.so.%{compatlib}.0.0
+%{_libdir}/mysql/libmysqlclient_r.so.%{compatlib}
+%{_libdir}/mysql/libmysqlclient_r.so.%{compatlib}.0.0
+%endif
+
+%files test
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%attr(-, root, root) %{_datadir}/mysql-test
+%attr(755, root, root) %{_bindir}/mysql_client_test
+%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
+%attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/mysqltest_embedded
+
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so
+%attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
+%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
+
+%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
+%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
+%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
+
+%files bench
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%{_datadir}/sql-bench
+
+%files embedded
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%attr(755, root, root) %{_libdir}/mysql/libmysqld.so.*
+
+%files embedded-devel
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
+%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
+%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
+
+%changelog
+* Wed Jan 14 2015 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.24-1
+- Add mysql_no_login.so plugin
+
+* Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.22-1
+- Backport to 5.6.22
+
+* Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.6-0.2.m16
+- Include boost sources
+- Add license info in each subpackage
+
+* Tue Sep 02 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.6-0.1.m16
+- Updated for 5.7.6
+
+* Mon Sep 01 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.2.m15
+- Added openssl_udf.so plugin to commercial packages
+
+* Mon Jun 30 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.1.m15
+- Port to SLES
+
+* Thu Jun 26 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.3.m15
+- Resolve embedded-devel conflict issue
+
+* Wed Jun 25 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.2.m15
+- Add bench package
+- Enable dtrace 
+
+* Thu Apr 24 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.1.m15
+- Updated for 5.7.5
+
+* Mon Apr 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.5.m14
+- Fix Cflags for el7 
+
+* Mon Mar 31 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.4.m14
+- Support for enterprise packages
+- Upgrade from MySQL-* packages
+
+* Wed Mar 12 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.3.m14
+- Resolve conflict with mysql-libs-compat 
+
+* Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.2.m14
+- Resolve conflict issues during upgrade
+- Add ha_example.so plugin which is now included
+
+* Fri Feb 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.1.m14
+- 5.7.4
+- Enable shared libmysqld by cmake option
+- Move mysqltest and test plugins to test subpackage
+
+* Mon Nov 18 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.3-0.3.m13
+- Fixed isa_bits error 
+
+* Fri Oct 25 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.3-0.1.m13
+- Initial 5.7 port
+
+* Fri Oct 25 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.15-1
+- Fixed uln advanced rpm libyassl.a error
+- Updated to 5.6.15
+
+* Wed Oct 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.14-3
+- Fixed mysql_install_db usage 
+- Improved handling of plugin directory 
+
+* Fri Sep 27 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.14-2
+- Refresh mysql-install patch and service renaming
+
+* Mon Sep 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.14-1
+- Updated to 5.6.14
+
+* Wed Sep 04 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-5
+- Support upgrade from 5.5 ULN packages to 5.6 
+
+* Tue Aug 27 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-4
+- Enhanced perl filtering 
+- Added openssl-devel to buildreq 
+
+* Wed Aug 21 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-3
+- Removed mysql_embedded binary to resolve multilib conflict issue
+
+* Fri Aug 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-2 
+- Fixed Provides and Obsoletes issues in server, test packages 
+
+* Wed Aug 14 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-1
+- Updated to 5.6.13
+
+* Mon Aug 05 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-9
+- Added files list to embedded packages 
+
+* Thu Aug 01 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-8
+- Updated libmysqld.a with libmysqld.so in embedded package
+
+* Mon Jul 29 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-7
+- Updated test package dependency from client to server
+
+* Wed Jul 24 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-6
+- Added libs-compat dependency under libs package to resolve server
+  installation conflicts issue.
+ 
+* Wed Jul 17 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-5
+- Removed libmysqlclient.so.16 from libs package
+ 
+* Fri Jul 05 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-4
+- Adjusted to work on OEL6
+
+* Wed Jun 26 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-3
+- Move libs to mysql/
+- Basic multi arch support
+- Fix changelog dates
+
+* Thu Jun 20 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-2
+- Major cleanup
+
+* Tue Jun 04 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-1
+- Updated to 5.6.12
+
+* Mon Nov 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Allow to override the default to use the bundled yaSSL by an option like
+      --define="with_ssl /path/to/ssl"
+
+* Wed Oct 10 2012 Bjorn Munch <bjorn.munch@oracle.com>
+
+- Replace old my-*.cnf config file examples with template my-default.cnf
+
+* Fri Oct 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Let the installation use the new option "--random-passwords" of "mysql_install_db".
+  (Bug# 12794345 Ensure root password)
+- Fix an inconsistency: "new install" vs "upgrade" are told from the (non)existence
+  of "$mysql_datadir/mysql" (holding table "mysql.user" and other system stuff).
+
+* Tue Jul 24 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add a macro "runselftest":
+  if set to 1 (default), the test suite will be run during the RPM build;
+  this can be oveeridden via the command line by adding
+      --define "runselftest 0"
+  Failures of the test suite will NOT make the RPM build fail!
+
+* Mon Jul 16 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add the man page for the "mysql_config_editor".
+
+* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
+
+* Wed Feb 29 2012 Brajmohan Saxena <brajmohan.saxena@oracle.com>
+
+- Removal all traces of the readline library from mysql (BUG 13738013)
+
+* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix duplicate mentioning of "mysql_plugin" and its manual page,
+  it is better to keep alphabetic order in the files list (merging!).
+
+* Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
+  the RPMs of any configuration (of the current or the preceding release series)
+  by the new ones. This is done by not using the implicitly generated capabilities
+  (which include the configuration name) and relying on more generic ones which
+  just list the function ("server", "client", ...).
+  The implicit generation cannot be prevented, so all these capabilities must be
+  explicitly listed in "Obsoletes:"
+
+* Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6.  Due to
+  changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install)
+  this necessitated a move of the libmygcc.a installation to the install
+  phase, which is probably where it belonged in the first place.
+
+* Tue Sep 13 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- "make_win_bin_dist" and its manual are dropped, cmake does it different.
+
+* Thu Sep 08 2011 Daniel Fischer <daniel.fischer@oracle.com>
+
+- Add mysql_plugin man page.
+
+* Tue Aug 30 2011 Tor Didriksen <tor.didriksen@oracle.com>
+
+- Set CXX=g++ by default to add a dependency on libgcc/libstdc++.
+  Also, remove the use of the -fno-exceptions and -fno-rtti flags.
+  TODO: update distro_buildreq/distro_requires
+
+* Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add the manual page for "mysql_plugin" to the server package.
+
+* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Null-upmerge the fix of bug#37165: This spec file is not affected.
+- Replace "/var/lib/mysql" by the spec file variable "%%{mysqldatadir}".
+
+* Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com>
+
+- Source plugin library files list from cmake-generated file.
+
+* Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com>
+
+- Added the mysql_plugin client - enables or disables plugins.
+
+* Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com>
+
+- Fix bug#12561297: Added the MySQL embedded binary
+
+* Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix bug#45415: "rpm upgrade recreates test database"
+  Let the creation of the "test" database happen only during a new installation,
+  not in an RPM upgrade.
+  This affects both the "mkdir" and the call of "mysql_install_db".
+
+* Wed Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix bug#56581: If an installation deviates from the default file locations
+  ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade)
+  should still work, and use these locations.
+  The problem was that the fix for bug#27072 did not check for local settings.
+
+* Mon Jan 31 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
+
+* Tue Nov 23 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- EXCEPTIONS-CLIENT has been deleted, remove it from here too
+- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing
+  a '-j' argument to make.
+
+* Mon Nov 1 2010 Georgi Kodinov <georgi.godinov@oracle.com>
+
+- Added test authentication (WL#1054) plugin binaries
+
+* Wed Oct 6 2010 Georgi Kodinov <georgi.godinov@oracle.com>
+
+- Added example external authentication (WL#1054) plugin binaries
+
+* Wed Aug 11 2010 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- With a recent spec file cleanup, names have changed: A "-community" part was dropped.
+  Reflect that in the "Obsoletes" specifications.
+- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM.
+- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade".
+
+* Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Change the behaviour on installation and upgrade:
+  On installation, do not autostart the server.
+  *Iff* the server was stopped before the upgrade is started, this is taken as a
+  sign the administrator is handling that manually, and so the new server will
+  not be started automatically at the end of the upgrade.
+  The start/stop scripts will still be installed, so the server will be started
+  on the next machine boot.
+  This is the 5.5 version of fixing bug#27072 (RPM autostarting the server).
+
+* Tue Jun 1 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Implement SELinux checks from distribution-specific spec file.
+
+* Wed May 12 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Large number of changes to build using CMake
+- Introduce distribution-specific RPMs
+- Drop debuginfo, build all binaries with debug/symbols
+- Remove __os_install_post, use native macro
+- Remove _unpackaged_files_terminate_build, make it an error to have
+  unpackaged files
+- Remove cluster RPMs
+
+* Wed Mar 24 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Add "--with-perfschema" to the configure options.
+
+* Mon Mar 22 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- User "usr/lib*" to allow for both "usr/lib" and "usr/lib64",
+  mask "rmdir" return code 1.
+- Remove "ha_example.*" files from the list, they aren't built.
+
+* Wed Mar 17 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Fix a wrong path name in handling the debug plugins.
+
+* Wed Mar 10 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Take the result of the debug plugin build and put it into the optimized tree,
+  so that it becomes part of the final installation;
+  include the files in the packlist. Part of the fixes for bug#49022.
+
+* Mon Mar 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Set "Oracle and/or its affiliates" as the vendor and copyright owner,
+  accept upgrading from packages showing MySQL or Sun as vendor.
+
+* Fri Feb 12 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Formatting changes:
+  Have a consistent structure of separator lines and of indentation
+  (8 leading blanks => tab).
+- Introduce the variable "src_dir".
+- Give the environment variables "MYSQL_BUILD_CC(CXX)" precedence
+  over "CC" ("CXX").
+- Drop the old "with_static" argument analysis, this is not supported
+  in 5.1 since ages.
+- Introduce variables to control the handlers individually, as well
+  as other options.
+- Use the new "--with-plugin" notation for the table handlers.
+- Drop handling "/etc/rc.d/init.d/mysql", the switch to "/etc/init.d/mysql"
+  was done back in 2002 already.
+- Make "--with-zlib-dir=bundled" the default, add an option to disable it.
+- Add missing manual pages to the file list.
+- Improve the runtime check for "libgcc.a", protect it against being tried
+  with the Intel compiler "icc".
+
+* Mon Jan 11 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Change RPM file naming:
+  - Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
+  - Release counts from 1, not 0.
+
+* Wed Dec 23 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- The "semisync" plugin file name has lost its introductory "lib",
+  adapt the file lists for the subpackages.
+  This is a part missing from the fix for bug#48351.
+- Remove the "fix_privilege_tables" manual, it does not exist in 5.5
+  (and likely, the whole script will go, too).
+
+* Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Fix some problems with the directives around "tcmalloc" (experimental),
+  remove erroneous traces of the InnoDB plugin (that is 5.1 only).
+
+* Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
+
+- Removed mysql_fix_privilege_tables
+
+* Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com>
+
+- "mysqlmanager" got removed from version 5.4, all references deleted.
+
+* Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin.
+
+* Thu Aug 27 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- This version does not contain the "Instance manager", "mysqlmanager":
+  Remove it from the spec file so that packaging succeeds.
+
+* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Add conditionals for bundled zlib and innodb plugin
+
+* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Install plugin libraries in appropriate packages.
+- Disable libdaemon_example and ftexample plugins.
+
+* Thu Aug 20 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Update variable used for mysql-test suite location to match source.
+
+* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Correct yesterday's fix, so that it also works for the last flag,
+  and fix a wrong quoting: un-quoted quote marks must not be escaped.
+
+* Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com>
+
+- Removed "mysql_upgrade_shell"
+- Removed some copy/paste between debug and normal build
+
+* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
+  This should cover both gcc and icc flags.  Fixes bug#40546.
+
+* Fri Aug 29 2008 Kent Boortz <kent@mysql.com>
+
+- Removed the "Federated" storage engine option, and enabled in all
+
+* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
+  Some generated files aren't needed in RPMs:
+  - the "sql-bench/" subdirectory
+  Some files were missing:
+  - /usr/share/aclocal/mysql.m4  ("devel" subpackage)
+  - Manual "mysqlbug" ("server" subpackage)
+  - Program "innochecksum" and its manual ("server" subpackage)
+  - Manual "mysql_find_rows" ("client" subpackage)
+  - Script "mysql_upgrade_shell" ("client" subpackage)
+  - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
+  - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)
+
+* Mon Mar 31 2008 Kent Boortz <kent@mysql.com>
+
+- Made the "Federated" storage engine an option
+- Made the "Cluster" storage engine and sub packages an option
+
+* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Add the man pages for "ndbd" and "ndb_mgmd".
+
+* Mon Feb 18 2008 Timothy Smith <tim@mysql.com>
+
+- Require a manual upgrade if the alread-installed mysql-server is
+  from another vendor, or is of a different major version.
+
+* Wed May 02 2007 Joerg Bruehe <joerg@mysql.com>
+
+- "ndb_size.tmpl" is not needed any more,
+  "man1/mysql_install_db.1" lacked the trailing '*'.
+
+* Sat Apr 07 2007 Kent Boortz <kent@mysql.com>
+
+- Removed man page for "mysql_create_system_tables"
+
+* Wed Mar 21 2007 Daniel Fischer <df@mysql.com>
+
+- Add debug server.
+
+* Mon Mar 19 2007 Daniel Fischer <df@mysql.com>
+
+- Remove Max RPMs; the server RPMs contain a mysqld compiled with all
+  features that previously only were built into Max.
+
+* Fri Mar 02 2007 Joerg Bruehe <joerg@mysql.com>
+
+- Add several man pages for NDB which are now created.
+
+* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
+
+- Put back "libmygcc.a", found no real reason it was removed.
+
+- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
+  correct "libgcc.a" path is returned for the 32/64 bit architecture.
+
+* Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
+
+* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"
+  in the server RPM.
+- The "mysqlmanager" man page got moved from section 1 to 8.
+
+* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Call "make install" using "benchdir_root=%%{_datadir}",
+  because that is affecting the regression test suite as well.
+
+* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
+  replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading
+  (bug#22081).
+
+* Mon Nov 13 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Add "--with-partition" t 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Use the Perl script to run the tests, because it will automatically check
+  whether the server is configured with SSL.
+
+* Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com>
+
+- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216)
+
+- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
+  there are some more aspects which need to be solved before this is possible.
+  For now, just ensure the binary "mysql_upgrade" is delivered and installysql.com>
+
+- To run "mysql_upgrade", we need a running server;
+  start it in isolation and skip password checks.
+
+* Sat May 20 2006 Kent Boortz <kent@mysql.com>
+
+- Always compile for PIC, position independent code.
+
+* Wed May 10 2006 Kent Boortz <kent@mysql.com>
+
+- Use character set "all" when compiling with Cluster, to make Cluster
+  nodes independent on the character set directory, and the problem
+  that two RPM sub packages both wants to install this directory.
+
+* Mon May 01 2006 Kent Boortz <kent@mysql.com>
+
+- Use "./libtool --mode=execute" instead of searching for the
+  executable in current directory and ".libs".
+
+* Fri Apr 28 2006 Kent Boortz <kent@mysql.com>
+
+- Install and run "mysql_upgrade"
+
+* Wed Apr 12 2006 Jim Winstead <jimw@mysql.com>
+
+- Remove sql-bench, and MySQL-bench RPM (will be built as an independent
+  project from the mysql-bench repository)
+
+* Tue Apr 11 2006 Jim Winstead <jimw@mysql.com>
+
+- Remove old mysqltestmanager and related programs
+* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
+
+- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
+
+* Tue Mar 07 2006 Kent Boortz <kent@mysql.com>
+
+- Changed product name from "Community Edition" to "Community Server"
+
+* Mon Mar 06 2006 Kent Boortz <kent@mysql.com>
+
+- Fast mutexes is now disabled by default, but should be
+  used in Linux builds.
+
+* Mon Feb 20 2006 Kent Boortz <kent@mysql.com>
+
+- Reintroduced a max build
+- Limited testing of 'debug' and 'max' servers
+- Berkeley DB only in 'max'
+
+* Mon Feb 13 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Use "-i" on "make test-force";
+  this is essential for later evaluation of this log file.
+
+* Thu Feb 09 2006 Kent Boortz <kent@mysql.com>
+
+- Pass '-static' to libtool, link static with our own libraries, dynamic
+  with system libraries.  Link with the bundled zlib.
+
+* Wed Feb 08 2006 Kristian Nielsen <knielsen@mysql.com>
+
+- Modified RPM spec to match new 5.1 debug+max combined community packaging.
+
+* Sun Dec 18 2005 Kent Boortz <kent@mysql.com>
+
+- Added "client/mysqlslap"
+
+* Mon Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>
+
+- Added zlib to the list of (static) libraries installed
+- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
+- Compile MySQL with bundled zlib
+- Fixed %%packager name to "MySQL Production Engineering Team"
+
+* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Avoid using the "bundled" zlib on "shared" builds:
+  As it is not installed (on the build system), this gives dependency
+  problems with "libtool" causing the build to fail.
+  (Change was done on Nov 11, but left uncommented.)
+
+* Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Extend the file existence check for "init.d/mysql" on un-install
+  to also guard the call to "insserv"/"chkconfig".
+
+* Thu Oct 27 2005 Lenz Grimmer <lenz@grimmer.com>
+
+- added more man pages
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Made yaSSL support an option (off by default)
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Enabled yaSSL support
+
+* Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
+
+- Give mode arguments the same way in all places
+lenz@mysql.com>
+
+- fixed the removing of the RPM_BUILD_ROOT in the %%clean section (the
+  $RBR variable did not get expanded, thus leaving old build roots behind)
+
+* Thu Aug 04 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed the creation of the mysql user group account in the postinstall
+  section (BUG 12348)
+- Fixed enabling the Archive storage engine in the Max binary
+
+* Tue Aug 02 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed the Requires: tag for the server RPM (BUG 12233)
+
+* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>
+
+- create a "mysql" user group and assign the mysql user account to that group
+  in the server postinstall section. (BUG 10984)
+
+* Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Do not build statically on i386 by default, only when adding either "--with
+  static" or "--define '_with_static 1'" to the RPM build options. Static
+  linking really only makes sense when linking against the specially patched
+  glibc 2.2.5.
+
+* Mon Jun 06 2005 Lenz Grimmer <lenz@mysql.com>
+
+- added mysql_client_test to the "bench" subpackage (BUG 10676)
+- added the libndbclient static and shared libraries (BUG 10676)
+
+* Wed Jun 01 2005 Lenz Grimmer <lenz@mysql.com>
+
+- use "mysqldatadir" variable instead of hard-coding the path multiple times
+- use the "mysqld_user" variable on all occasions a user name is referenced
+- removed (incomplete) Brazilian translations
+- removed redundant release tags from the subpackage descriptions
+
+* Wed May 25 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Added a "make clean" between separate calls to "BuildMySQL".
+
+* Thu May 12 2005 Guilhem Bichot <guilhem@mysql.com>
+
+- Removed the mysql_tableinfo script made obsolete by the information schema
+
+* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Enabled the "blackhole" storage engine for the Max RPM
+
+* Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- removed the MySQL manual files (html/ps/texi) - they have been removed
+  from the MySQL sources and are now available seperately.
+
+* Mon Apr 4 2005 Petr Chardin <petr@mysql.com>
+
+- old mysqlmanager, mysq* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
+
+- enabled the "Ndbcluster" storage engine for the max binary
+- added extra make install in ndb subdir after Max build to get ndb binaries
+- added packages for ndbcluster storage engine
+
+* Fri Jan 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- replaced obsoleted "BuildPrereq" with "BuildRequires" instead
+
+* Thu Jan 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- enabled the "Federated" storage engine for the max binary
+
+* Tue Jan 04 2005 Petr Chardin <petr@mysql.com>
+
+- ISAM and merge storage engines were purged. As well as appropriate
+  tools and manpages (isamchk and isamlog)
+
+* Fri Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
+
+- enabled the "Archive" storage engine for the max binary
+- enabled the "CSV" storage engine for the max binary
+- enabled the "Example" storage engine for the max binary
+
+* Thu Aug 26 2004 Lenz Grimmer <lenz@mysql.com>
+
+- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)
+
+* Fri Aug 20 2004 Lenz Grimmer <lenz@mysql.com>
+
+- do not link statically on IA64/AMD64 as these systems do not have
+  a patched glibc installed
+
+* Tue Aug 10 2004 Lenz Grimmer <lenz@mysql.com>
+
+- Added libmygcc.a to the devel subpackage (required to link applications
+  against the the embedded server libmysqld.a) (BUG 4921)
+
+* Mon Aug 09 2004 Lenz Grimmer <lenz@mysql.com>
+
+- Added EXCEPTIONS-CLIENT to the "devel" package
+
+* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
+
+- disabled OpenSSL in the Max binaries again (the RPM packages were the
+  only exception to this anyway) (BUG 1043)
+
+* Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
+
+- fixed server postinstall (mysql_install_db was called with the wrong
+  parameter)
+
+* Thu Jun 24 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added mysql_tzinfo_to_sql to the server subpackage
+- run "make clean" instead of "make distclean"
+
+* Mon Apr 05 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added ncurses-devel to the build prerequisites (BUG 3377)
+
+* Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
+
+- when using gcc, _always_ use CXX=gcc
+- replaced Copyright with License field (Copyright is obsolete)
+
+* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added myisam_ftdump to the Server package
+
+* Tue Jan 13 2004 Lenz Grimmer <lenz@mysql.com>
+
+- link the mysql client against libreadline instead of libedit (BUG 2289)
+
+* Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com>
+
+- marked /etc/logrotate.d/mysql as a config file (BUG 2156)
+
+* Sat Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
+
+- fixed file permissions (BUG 1672)
+
+* Thu Dec 11 2003 Lenz Grimmer <lenz@mysql.com>
+
+- made testing for gcc3 a bit more robust
+
+* Fri Dec 05 2003 Lenz Grimmer <lenz@mysql.com>
+
+- added missing file mysql_create_system_tables to the server subpackage
+
+* Fri Nov 21 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed dependency on MySQL-client from the MySQL-devel subpackage
+  as it is not really required. (BUG 1610)
+
+* Fri Aug 29 2003 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed BUG 1162 (removed macro names from the changelog)
+- Really fixed BUG 998 (disable the checking for installed but
+  unpackaged files)
+
+* Tue Aug 05 2003 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed BUG 959 (libmysqld not being compiled properly)
+- Fixed BUG 998 (RPM build errors): added missing files to the
+  distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
+  mysql_fix_privilege_tables.1), removed "-n" from install section.
+
+* Wed Jul 09 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed the GIF Icon (file was not included in the sources anyway)
+- removed unused variable shared_lib_version
+- do not run automake before building the standard binary
+  (should not be necessary)
+- add server suffix '-standard' to standard binary (to be in line
+  with the binary tarball distributions)
+- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir,
+  _datadir, _includedir) throughout the spec file.
+- allow overriding CC and CXX (required when building with other compilers)
+
+* Fri May 16 2003 Lenz Grimmer <lenz@mysql.com>
+
+- re-enabled RAID again
+
+* Wed Apr 30 2003 Lenz Grimmer <lenz@mysql.com>
+
+- disabled MyISAM RAID (--with-raid)- it throws an assertion which
+  needs to be investigated first.
+
+* Mon Mar 10 2003 Lenz Grimmer <lenz@mysql.com>
+
+- added missing file mysql_secure_installation to server subpackage
+  (BUG 141)
+
+* Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com>
+
+- re-added missing pre- and post(un)install scripts to server subpackage
+- added config file /etc/my.cnf to the file list (just for completeness)
+- make sure to create the datadir with 755 permissions
+
+* Mon Jan 27 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed unusedql.com>
+
+- Reworked the build steps a little bit: the Max binary is supposed
+  to include OpenSSL, which cannot be linked statically, thus trying
+  to statically link against a special glibc is futile anyway
+- because of this, it is not required to make yet another build run
+  just to compile the shared libs (saves a lot of time)
+- updated package description of the Max subpackage
+- clean up the BuildRoot directory afterwards
+
+* Mon Jul 15 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Updated Packager information
+- Fixed the build options: the regular package is supposed to
+  include InnoDB and linked statically, while the Max package
+  should include BDB and SSL support
+
+* Fri May 03 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Use more RPM macros (e.g. infodir, mandir) to make the spec
+  file more portable
+- reorganized the installation of documentation files: let RPM
+  take care of this
+- reorganized the file list: actually install man pages along
+  with the binaries of the respective subpackage
+- do not include libmysqld.a in the devel subpackage as well, if we
+  have a special "embedded" subpackage
+- reworked the package descriptions
+
+* Mon Oct  8 2001 Monty
+
+- Added embedded server as a separate RPM
+
+* Fri Apr 13 2001 Monty
+
+- Added mysqld-max to the distribution
+
+* Tue Jan 2  2001  Monty
+
+- Added mysql-test to the bench package
+
+* Fri Aug 18 2000 Tim Smith <tim@mysql.com>
+
+- Added separate libmysql_r directory; now both a threaded
+  and non-threaded library is shipped.
+
+* Tue Sep 28 1999 David Axmark <davida@mysql.com>
+
+- Added the support-files/my-example.cnf to the docs directory.
+
+- Removed devel dependency on base since it is about client
+  development.
+
+* Wed Sep 8 1999 David Axmark <davida@mysql.com>
+
+- Cleaned up some for 3.23.
+
+* Thu Jul 1 1999 David Axmark <davida@mysql.com>
+
+- Added support for shared libraries in a separate sub
+  package. Original fix by David Fox (dsfox@cogsci.ucsd.edu)
+
+- The --enable-assembler switch is now automatically disables on
+  platforms there assembler code is unavailable. This should allow
+  building this RPM on non i386 systems.
+
+* Mon Feb 22 1999 David Axmark <david@detron.se>
+
+- Removed unportable cc switches from the spec file. The defaults can
+  now be overridden with environment variables. This feature is used
+  to compile the official RPM with optimal (but compiler version
+  specific) switches.
+
+- Removed the repetitive description parts for the sub rpms. Maybe add
+  again if RPM gets a multiline macro capability.
+
+- Added support for a pt_BR translation. Translation contributed by
+  Jorge Godoy <jorge@bestway.com.br>.
+
+* Wed Nov 4 1998 David Axmark <david@detron.se>
+
+- A lot of changes in all the rpm and install scripts. This may even
+  be a working RPM :-)
+
+* Sun Aug 16 1998 David Axmark <david@detron.se>
+
+- A developers changelog for MySQL is available in the source RPM. And
+  there is a history of major user visible changed in the Reference
+  Manual.  Only RPM specific changes will be documented here.
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-sles/mysql-systemd-start percona-xtrabackup-2.3.7/packaging/rpm-sles/mysql-systemd-start
--- percona-xtrabackup-2.2.3/packaging/rpm-sles/mysql-systemd-start	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-sles/mysql-systemd-start	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,53 @@
+#! /bin/bash
+#
+# Scripts to run by MySQL systemd service
+# 
+# Needed argument: pre | post
+# 
+# pre mode  :  try to run mysql_install_db and fix perms and SELinux contexts
+# post mode :  ping server until answer is received
+# 
+
+install_db () {    
+    # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode)
+    datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
+    
+    # Restore log, dir, perms and SELinux contexts
+    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    log=/var/log/mysql/mysqld.log
+    [ -e $log ] || touch $log
+    chmod 0640 $log
+    chown mysql:mysql $log || exit 1
+    if [ -x /usr/sbin/restorecon ]; then
+        /usr/sbin/restorecon "$datadir"
+        /usr/sbin/restorecon $log
+    fi
+
+    # If special mysql dir is in place, skip db install 
+    [ -d "$datadir/mysql" ] && exit 0
+
+    # Create initial db
+    /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql --keep-my-cnf
+}
+
+pinger () {
+    # Wait for ping to answer to signal startup completed,
+    # might take a while in case of e.g. crash recovery
+    # MySQL systemd service will timeout script if no answer
+    ret=1
+    while /bin/true ; do
+        sleep 1
+        mysqladmin ping >/dev/null 2>&1 && ret=0 && break
+    done
+
+    exit 0
+}
+
+# main
+case $1 in
+    "pre") install_db ;;
+    "post") pinger ;;
+esac
+
+exit 0
+
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/CMakeLists.txt percona-xtrabackup-2.3.7/packaging/rpm-uln/CMakeLists.txt
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# Copyright (c) 2012, 2013, 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
-
-
-IF(UNIX)
-  SET(prefix ${CMAKE_INSTALL_PREFIX})
-
-  SET(SPECFILENAME "mysql.${VERSION}.spec")
-  IF("${VERSION}" MATCHES "-ndb-")
-    STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
-    SET(SPECFILENAME "mysql-cluster-${NDBVERSION}.spec")
-  ENDIF()
-
-  # Left in current directory, to be taken during build
-  CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
-
-  FOREACH(ulnfile filter-requires-mysql.sh generate-tarball.sh my.cnf my_config.h
-          mysql-5.5-fix-tests.patch mysql-5.5-libdir.patch
-          mysql-5.5-mtr1.patch mysql-5.5-testing.patch
-          mysql-chain-certs.patch mysql-embedded-check.c mysql-expired-certs.patch
-          mysql.init mysql-install-test.patch mysql-strmov.patch scriptstub.c
-          README.mysql-docs)
-    CONFIGURE_FILE(${ulnfile} ${CMAKE_CURRENT_BINARY_DIR}/${ulnfile} COPYONLY)
-  ENDFOREACH()
-ENDIF()
-
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/filter-requires-mysql.sh percona-xtrabackup-2.3.7/packaging/rpm-uln/filter-requires-mysql.sh
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/filter-requires-mysql.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/filter-requires-mysql.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/lib/rpm/perl.req $* | grep -v -e "perl(th" -e "perl(lib::mtr" -e "perl(mtr"
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/generate-tarball.sh percona-xtrabackup-2.3.7/packaging/rpm-uln/generate-tarball.sh
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/generate-tarball.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/generate-tarball.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-VERSION=$1
-
-rm -rf mysql-$VERSION
-
-tar xfz mysql-$VERSION.tar.gz || exit 1
-
-rm mysql-$VERSION/Docs/mysql.info
-
-tar cfz mysql-$VERSION-nodocs.tar.gz mysql-$VERSION || exit 1
-
-rm -rf mysql-$VERSION
-
-exit 0
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/my.cnf percona-xtrabackup-2.3.7/packaging/rpm-uln/my.cnf
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/my.cnf	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/my.cnf	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-[mysqld]
-datadir=/var/lib/mysql
-socket=/var/lib/mysql/mysql.sock
-user=mysql
-# Disabling symbolic-links is recommended to prevent assorted security risks
-symbolic-links=0
-
-[mysqld_safe]
-log-error=/var/log/mysqld.log
-pid-file=/var/run/mysqld/mysqld.pid
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/my_config.h percona-xtrabackup-2.3.7/packaging/rpm-uln/my_config.h
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/my_config.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/my_config.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/*
- * Kluge to support multilib installation of both 32- and 64-bit RPMS:
- * we need to arrange that header files that appear in both RPMs are
- * identical.  Hence, this file is architecture-independent and calls
- * in an arch-dependent file that will appear in just one RPM.
- *
- * To avoid breaking arches not explicitly supported by Red Hat, we
- * use this indirection file *only* on known multilib arches.
- *
- * Note: this may well fail if user tries to use gcc's -I- option.
- * But that option is deprecated anyway.
- */
-#if defined(__x86_64__)
-#include "my_config_x86_64.h"
-#elif defined(__i386__)
-#include "my_config_i386.h"
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#include "my_config_ppc64.h"
-#elif defined(__ppc__) || defined(__powerpc__)
-#include "my_config_ppc.h"
-#elif defined(__s390x__)
-#include "my_config_s390x.h"
-#elif defined(__s390__)
-#include "my_config_s390.h"
-#elif defined(__sparc__) && defined(__arch64__)
-#include "my_config_sparc64.h"
-#elif defined(__sparc__)
-#include "my_config_sparc.h"
-#endif
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-5.5-fix-tests.patch percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-5.5-fix-tests.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-5.5-fix-tests.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-5.5-fix-tests.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-Adapt tests (where needed) to RedHat conventions.
-
-1) The RedHat convention uses the package name "mysql*" whereas upstream uses "MySQL*".
-   Test "file_contents" constructs path names and needs to be adapted.
-
-=== modified file 'mysql-test/t/file_contents.test'
---- mysql-5.5.17-orig/mysql-test/t/file_contents.test	2011-10-10 12:03:29 +0000
-+++ mysql-5.5.17/mysql-test/t/file_contents.test	2011-11-16 18:07:55 +0000
-@@ -17,20 +17,20 @@ if ($dir_bin =~ m|/usr/|) {
-   $dir_docs =~ s|/lib|/share/doc|;
-   if(-d "$dir_docs/packages") {
-     # SuSE: "packages/" in the documentation path
--    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
-+    $dir_docs = glob "$dir_docs/packages/mysql-server*";
-   } else {
-     # RedHat: version number in directory name
--    $dir_docs = glob "$dir_docs/MySQL-server*";
-+    $dir_docs = glob "$dir_docs/mysql-server*";
-   }
- } elsif ($dir_bin =~ m|/usr$|) {
-   # RPM build during development
-   $dir_docs = "$dir_bin/share/doc";
-   if(-d "$dir_docs/packages") {
-     # SuSE: "packages/" in the documentation path
--    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
-+    $dir_docs = glob "$dir_docs/packages/mysql-server*";
-   } else {
-     # RedHat: version number in directory name
--    $dir_docs = glob "$dir_docs/MySQL-server*";
-+    $dir_docs = glob "$dir_docs/mysql-server*";
-   }
- } else {
-   # tar.gz package, Windows, or developer work (in BZR)
-
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-5.5-libdir.patch percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-5.5-libdir.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-5.5-libdir.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-5.5-libdir.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-The RPMs built by MySQL AB (-> Sun -> Oracle) put the libraries into "/usr/lib".
-Those built by RedHat put them into "/usr/lib/mysql".
-This patch is to modify the cmake files to follow the RedHat convention.
-Similar, the server is now in "/usr/libexec" (formerly "/usr/sbin").
-
-
-diff -Naur mysql-5.5.17.orig/cmake/install_layout.cmake mysql-5.5.17/cmake/install_layout.cmake
---- mysql-5.5.17.orig/cmake/install_layout.cmake	2011-06-30 15:46:53 +0000
-+++ mysql-5.5.17/cmake/install_layout.cmake	2011-10-27 16:40:10 +0000
-@@ -140,14 +140,14 @@ SET(INSTALL_SBINDIR_RPM                 
- # be applied at build time via "rpmbuild".
- #
- SET(INSTALL_BINDIR_RPM                  "bin")
--SET(INSTALL_SBINDIR_RPM                 "sbin")
-+SET(INSTALL_SBINDIR_RPM                 "libexec")
- SET(INSTALL_SCRIPTDIR_RPM               "bin")
- #
- IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
--  SET(INSTALL_LIBDIR_RPM                "lib64")
-+  SET(INSTALL_LIBDIR_RPM                "lib64/mysql")
-   SET(INSTALL_PLUGINDIR_RPM             "lib64/mysql/plugin")
- ELSE()
--  SET(INSTALL_LIBDIR_RPM                "lib")
-+  SET(INSTALL_LIBDIR_RPM                "lib/mysql")
-   SET(INSTALL_PLUGINDIR_RPM             "lib/mysql/plugin")
- ENDIF()
- #
-
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-5.5-mtr1.patch percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-5.5-mtr1.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-5.5-mtr1.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-5.5-mtr1.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Drop support for version 1 of "mysql-test-run.pl" from the RPMs:
-
-1) The auto-generation of Perl dependencies will mishandle that code,
-   probably because its run directory differs from its storage location.
-2) It does not provide several variables which are used in tests of MySQL 5.5
-
-If you really need it, take it from the source tarball.
-
-=== modified file 'mysql-test/mysql-test-run.pl'
---- mysql-5.5.17-orig/mysql-test/mysql-test-run.pl	2011-10-03 11:16:40 +0000
-+++ mysql-5.5.17/mysql-test/mysql-test-run.pl	2011-11-16 19:06:38 +0000
-@@ -58,10 +58,9 @@ BEGIN {
-   if ( $version == 1 )
-   {
-     print "=======================================================\n";
--    print "  WARNING: Using mysql-test-run.pl version 1!  \n";
-+    print "  ERROR: Support for version 1 is dropped in this distribution!  \n";
-     print "=======================================================\n";
--    # Should use exec() here on *nix but this appears not to work on Windows
--    exit(system($^X, "lib/v1/mysql-test-run.pl", @ARGV) >> 8);
-+    exit(1);
-   }
-   elsif ( $version == 2 )
-   {
-
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-5.5-testing.patch percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-5.5-testing.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-5.5-testing.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-5.5-testing.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-Hack the top-level Makefile to enable the openssl regression tests.
-(Why doesn't this happen automatically given the configure option??)
-
-Also, increase the overall timeout for the regression tests to 12 hours,
-because on a slow or heavily-loaded build machine sometimes the default of
-5 hours isn't enough.  (This has been demonstrated to fail in mass-rebuild
-scenarios, which aren't that uncommon for Fedora.)  Similarly increase the
-per-testcase timeout to 30 minutes, since the default of 15 hasn't got a
-great deal of headroom either.
-
-
-diff -Naur mysql-5.1.32.orig/Makefile.am mysql-5.1.32/Makefile.am
---- mysql-5.1.32.orig/Makefile.am	2009-02-13 19:51:56.000000000 -0500
-+++ mysql-5.1.32/Makefile.am	2009-03-04 18:12:36.000000000 -0500
-@@ -98,7 +98,7 @@
- 
- test-ns:
- 	cd mysql-test ; \
--	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
-+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed --suite-timeout=720 --testcase-timeout=30
- 
- test-binlog-statement:
- 	cd mysql-test ; \
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-chain-certs.patch percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-chain-certs.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-chain-certs.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-chain-certs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-Fix things so that chains of certificates work in the server and client
-certificate files.
-
-This only really works for OpenSSL-based builds, as yassl is unable to read
-multiple certificates from a file.  The patch below to yassl/src/ssl.cpp
-doesn't fix that, but just arranges that the viosslfactories.c patch won't
-have any ill effects in a yassl build.  Since we don't use yassl in Red Hat/
-Fedora builds, I'm not feeling motivated to try to fix yassl for this.
-
-See RH bug #598656.  Filed upstream at http://bugs.mysql.com/bug.php?id=54158
-
-   ===
-
-Joerg Bruehe, MySQL Build Team at Oracle: First patch adapted to code changes in MySQL 5.5
-
-
-diff -Naur mysql-5.5.29.orig/vio/viosslfactories.c mysql-5.5.29/vio/viosslfactories.c
---- mysql-5.5.29.orig/vio/viosslfactories.c	2010-05-06 11:28:07.000000000 -0400
-+++ mysql-5.5.29/vio/viosslfactories.c	2010-05-26 23:23:46.000000000 -0400
-@@ -106,7 +106,7 @@
-     key_file= cert_file;
- 
-   if (cert_file &&
--      SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0)
-+      SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0)
-   {
-     *error= SSL_INITERR_CERT;
-     DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file));
-diff -Naur mysql-5.1.47.orig/extra/yassl/src/ssl.cpp mysql-5.1.47/extra/yassl/src/ssl.cpp
---- mysql-5.1.47.orig/extra/yassl/src/ssl.cpp	2010-05-06 11:24:26.000000000 -0400
-+++ mysql-5.1.47/extra/yassl/src/ssl.cpp	2010-05-26 23:29:13.000000000 -0400
-@@ -1606,10 +1606,10 @@
-     }
- 
- 
--    int SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*)
-+    int SSL_CTX_use_certificate_chain_file(SSL_CTX* ctx, const char* file)
-     {
--        // TDOD:
--        return SSL_SUCCESS;
-+        // For the moment, treat like use_certificate_file
-+        return read_file(ctx, file, SSL_FILETYPE_PEM, Cert);
-     }
- 
- 
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-embedded-check.c percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-embedded-check.c
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-embedded-check.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-embedded-check.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* simple test program to see if we can link the embedded server library */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "mysql.h"
-
-MYSQL *mysql;
-
-static char *server_options[] = \
-       { "mysql_test", "--defaults-file=my.cnf", NULL };
-int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
-
-static char *server_groups[] = { "libmysqld_server", 
-                                 "libmysqld_client", NULL };
-
-int main(int argc, char **argv)
-{
-   mysql_library_init(num_elements, server_options, server_groups);
-   mysql = mysql_init(NULL);
-   mysql_close(mysql);
-   mysql_library_end();
-
-   return 0;
-}
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-expired-certs.patch percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-expired-certs.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-expired-certs.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-expired-certs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,555 +0,0 @@
-Upstream insists on generating SSL testing certificates with relatively short
-lifespan, which has repeatedly caused problems (ie, one day the regression
-tests suddenly stop working).  Replace them with certificates with 20-year
-lifespan.  We should periodically regenerate these, too, but at least not
-very often.
-
-
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/cacert.pem mysql-5.1.50/mysql-test/std_data/cacert.pem
---- mysql-5.1.50.orig/mysql-test/std_data/cacert.pem	2010-08-03 13:55:04.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/cacert.pem	2010-08-27 23:42:05.751428144 -0400
-@@ -1,17 +1,22 @@
- -----BEGIN CERTIFICATE-----
--MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
-+MIIDsjCCApqgAwIBAgIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
- BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
--VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx
-+VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkwNTU5NTNaFw0xNTAxMjgwNTU5NTNaMEQx
- CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
--MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
--wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1
--yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq
--rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV
--HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME
--bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO
--BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM
--IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g
--JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj
--AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn
--7F4WeS07J8LKardSvM0+hOA=
-+MREwDwYDVQQKEwhNeVNRTCBBQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-+ggEBAL6kNN4peX7uhK9rb06W/QbPEpVuejmdWdl2PqMshP/eSuXXw7kwVgfpxx9R
-+vC000CKQQSG9MCoZjtqPnFRsetmWLZgApRpEalGXTXJqq9sEbCfoFizg94U8G7d2
-+u5XJjLVmcG34ru36KoBgVx1zeH1puBAf8dOzrE4L7Y+ZQBFzFohjh8C2LqWC4nM5
-+qsLmOkDWMipGqYU5DvkKjIbTbwTyRNRgZHWSPfVDDPUIUOsY4BGUp2DpgeGY9aEv
-+lIs57Ev9JqlIUCV65lOhhDkG+xwmkHKHA+ECEU9cALI8+uXbh48MB9XpMOuk408X
-+/lX89aZwD0/G9kmObVGnE2G+H5UCAwEAAaOBpjCBozAdBgNVHQ4EFgQUsft+d7VA
-+jWgRftkR5cPG2k2sUbAwdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbCh
-+SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV
-+cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMAwGA1UdEwQFMAMB
-+Af8wDQYJKoZIhvcNAQEFBQADggEBALRUOAmdL8R8sl1y8kiEiFgDatdXK5RDqWai
-+8yZChfmwTIToHhmQsOEshJe2e8hky3huUj+33VyXjINoMbebIwMuXPwEkbJal8RZ
-+nSJmF0jN1Qz7J/jFffwK9xmejWZJx49Kt2+Qwrwp6kDeq9TLFqQOoVczgyJPYsTL
-+NAOib5WqTud3XWvCwxrhqmWu7JZq6sp1fomP/uunprb8y2miWfLESZN2mKAhm44Q
-+Lws867LT8v2lskEjq2dT1LutD5+R66XcdjgSr0uDziDs64jZwCD6ea94hVFM7ej0
-+ZOXYeSEZJ56FjUxu632e9fY8NyMh30yKjjmQf1mM9PuGJvdvsWU=
- -----END CERTIFICATE-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/client-cert.pem mysql-5.1.50/mysql-test/std_data/client-cert.pem
---- mysql-5.1.50.orig/mysql-test/std_data/client-cert.pem	2010-08-03 13:55:04.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/client-cert.pem	2010-08-27 23:42:05.752428395 -0400
-@@ -1,46 +1,69 @@
- Certificate:
-     Data:
--        Version: 1 (0x0)
--        Serial Number: 1048577 (0x100001)
--        Signature Algorithm: md5WithRSAEncryption
-+        Version: 3 (0x2)
-+        Serial Number: 6 (0x6)
-+        Signature Algorithm: sha1WithRSAEncryption
-         Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
-         Validity
--            Not Before: Jan 29 11:50:22 2010 GMT
--            Not After : Jan 28 11:50:22 2015 GMT
-+            Not Before: Feb 20 03:03:26 2010 GMT
-+            Not After : Sep  3 03:03:26 2030 GMT
-         Subject: C=SE, ST=Uppsala, O=MySQL AB
-         Subject Public Key Info:
-             Public Key Algorithm: rsaEncryption
--                Public-Key: (1024 bit)
--                Modulus:
--                    00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed:
--                    78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8:
--                    a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4:
--                    9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be:
--                    15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7:
--                    87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16:
--                    8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48:
--                    a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f:
--                    fc:3d:78:9b:49:6e:86:83:77
-+            RSA Public Key: (1024 bit)
-+                Modulus (1024 bit):
-+                    00:c2:e7:20:cf:89:59:2f:67:cb:4c:9f:e8:11:f2:
-+                    23:e5:f1:b1:ee:3f:66:5f:c3:f5:fd:1e:31:ee:8f:
-+                    4c:2a:bd:c0:4a:a5:9f:c8:44:d5:77:8f:15:1b:4d:
-+                    78:6e:b2:a2:48:a5:24:33:05:40:02:b3:c1:87:8d:
-+                    59:3c:1a:07:aa:86:f0:04:e1:9c:20:4b:22:32:c4:
-+                    51:9e:40:e4:31:c3:57:f5:98:bf:2e:b1:fd:2c:56:
-+                    bf:49:d9:9b:e7:17:cc:95:5f:b5:08:19:5e:9d:df:
-+                    65:22:39:2c:48:fb:69:96:31:7a:35:4d:de:60:b4:
-+                    c1:60:19:5f:96:56:7e:55:19
-                 Exponent: 65537 (0x10001)
--    Signature Algorithm: md5WithRSAEncryption
--        5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0:
--        34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81:
--        c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99:
--        01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b:
--        89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77:
--        02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee:
--        02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35:
--        32:0b
-+        X509v3 extensions:
-+            X509v3 Basic Constraints: 
-+                CA:FALSE
-+            X509v3 Subject Key Identifier: 
-+                8D:10:67:91:33:76:9C:02:E5:78:5D:D8:C5:EF:25:96:B2:D7:FA:1F
-+            X509v3 Authority Key Identifier: 
-+                keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
-+                DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-+                serial:BE:58:AD:4C:1F:3D:25:95
-+
-+    Signature Algorithm: sha1WithRSAEncryption
-+        a9:88:10:3e:5d:2a:47:29:c8:03:27:7a:31:5a:8e:10:03:bc:
-+        b5:4e:37:1d:12:7b:eb:5f:50:71:70:b1:a3:8e:93:0e:77:17:
-+        6c:47:b6:c9:a4:4d:2a:c4:38:f0:61:55:b2:7f:28:ba:06:79:
-+        ee:67:11:7d:d4:c9:7f:0a:18:c8:c1:cb:d0:2c:f9:63:0f:bb:
-+        45:ca:de:ea:bb:ac:00:01:52:48:36:2b:07:2b:c8:46:c7:b1:
-+        21:81:bd:77:39:e7:4c:39:aa:bd:ac:60:d8:a7:bf:cf:14:98:
-+        4a:0b:a1:40:55:06:8d:6f:35:a9:39:a0:71:a9:97:ba:7c:73:
-+        3c:41:ba:c5:1c:11:4b:2b:43:1d:2d:ba:7b:5f:14:b5:3d:64:
-+        62:15:36:b4:16:bd:78:c8:43:8d:f9:1c:a5:d2:ac:a1:58:74:
-+        e1:99:de:ad:04:19:43:a8:bd:0a:fd:19:9b:50:44:46:6d:18:
-+        55:4d:bf:b4:5b:a4:93:62:c7:64:91:6c:54:34:d1:f8:f3:ff:
-+        12:6d:5f:85:e7:35:9e:5c:42:81:5e:fb:c8:bb:44:51:98:b2:
-+        ef:1b:9f:5a:22:77:28:7d:da:fb:08:c2:94:9a:0f:42:08:93:
-+        54:10:1e:ad:f2:4f:fc:62:98:51:e9:9b:b9:3a:93:d9:e4:1f:
-+        1d:c4:76:d0
- -----BEGIN CERTIFICATE-----
--MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
--A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
--QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT
--RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI
--hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4
--oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2
--atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu
--hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ
--A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja
--dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY
--RrLFnG84kYo1Mgs=
-+MIIDETCCAfmgAwIBAgIBBjANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
-+MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
-+UUwgQUIwHhcNMTAwMjIwMDMwMzI2WhcNMzAwOTAzMDMwMzI2WjAyMQswCQYDVQQG
-+EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJ
-+KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnIM+JWS9ny0yf6BHyI+Xxse4/Zl/D9f0e
-+Me6PTCq9wEqln8hE1XePFRtNeG6yokilJDMFQAKzwYeNWTwaB6qG8AThnCBLIjLE
-+UZ5A5DHDV/WYvy6x/SxWv0nZm+cXzJVftQgZXp3fZSI5LEj7aZYxejVN3mC0wWAZ
-+X5ZWflUZAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUjRBnkTN2nALl
-+eF3Yxe8llrLX+h8wdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbChSKRG
-+MEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBz
-+YWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUA
-+A4IBAQCpiBA+XSpHKcgDJ3oxWo4QA7y1TjcdEnvrX1BxcLGjjpMOdxdsR7bJpE0q
-+xDjwYVWyfyi6BnnuZxF91Ml/ChjIwcvQLPljD7tFyt7qu6wAAVJINisHK8hGx7Eh
-+gb13OedMOaq9rGDYp7/PFJhKC6FAVQaNbzWpOaBxqZe6fHM8QbrFHBFLK0MdLbp7
-+XxS1PWRiFTa0Fr14yEON+Ryl0qyhWHThmd6tBBlDqL0K/RmbUERGbRhVTb+0W6ST
-+YsdkkWxUNNH48/8SbV+F5zWeXEKBXvvIu0RRmLLvG59aIncofdr7CMKUmg9CCJNU
-+EB6t8k/8YphR6Zu5OpPZ5B8dxHbQ
- -----END CERTIFICATE-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/client-key.pem mysql-5.1.50/mysql-test/std_data/client-key.pem
---- mysql-5.1.50.orig/mysql-test/std_data/client-key.pem	2010-08-03 13:55:05.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/client-key.pem	2010-08-27 23:42:05.752428395 -0400
-@@ -1,15 +1,15 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIICXQIBAAKBgQDMmjdJE2bcz+MLE6Ej7XjbTr0R9owNdvmjMlaa+KEhalVOTT/m
--Z50mmbLNpJrSK1lc14rTYGj4GL3FvhXhKjyj1GHL9RGUF4GB94eM9mrS7tjmd/Zi
--Zk0uFo0IgUrJxksx5bnHioSWSKdHjA0mkFZO5qVujLPyn/w9eJtJboaDdwIDAQAB
--AoGASqk/4We2En+93y3jkIO4pXafIe3w/3zZ7caRue1ehx4RUQh5d+95djuB9u7J
--HEZ7TpjM7QNyao5EueL6gvbxt0LXFvqAMni7yM9tt/HUYtHHPqYiRtUny9bKYFTm
--l8szCCMal/wD9GZU9ByHDNHm7tHUMyMhARNTYSgx+SERFmECQQD/6jJocC4SXf6f
--T3LqimWR02lbJ7qCoDgRglsUXh0zjrG+IIiAyE+QOCCx1GMe3Uw6bsIuYwdHT6as
--WcdPs04xAkEAzKulvEvLVvN5zfa/DTYRTV7jh6aDleOxjsD5oN/oJXoACnPzVuUL
--qQQMNtuAXm6Q1QItrRxpQsSKbY0UQka6JwJBAOSgoNoG5lIIYTKIMvzwGV+XBLeo
--HYsXgh+6Wo4uql3mLErUG78ZtWL9kc/tE4R+ZdyKGLaCR/1gXmH5bwN4B/ECQEBb
--uUH8k3REG4kojesZlVc+/00ojzgS4UKCa/yqa9VdB6ZBz8MDQydinnShkTwgiGpy
--xOoqhO753o2UT0qH8wECQQC99IEJWUnwvExVMkLaZH5NjAFJkb22sjkmuT11tAgU
--RQgOMoDOm6driojnOnDWOkx1r1Gy9NgMLooduja4v6cx
-+MIICWwIBAAKBgQDC5yDPiVkvZ8tMn+gR8iPl8bHuP2Zfw/X9HjHuj0wqvcBKpZ/I
-+RNV3jxUbTXhusqJIpSQzBUACs8GHjVk8GgeqhvAE4ZwgSyIyxFGeQOQxw1f1mL8u
-+sf0sVr9J2ZvnF8yVX7UIGV6d32UiOSxI+2mWMXo1Td5gtMFgGV+WVn5VGQIDAQAB
-+AoGARXcXLKDpVooJ3W+IyQyiWsw//IhANpWjUOm4JiyQmxMyO+i4ACr4Yjpu7WI5
-+MEseqAGj20NdwxjKO0PXsCIe5LmrGZ+SI8+CSERFOWXWRtCWz7y7SG30i1k6suvM
-+mwqWom0tJLwn93uA1lm/WSwKQwUrJRahRQd3EaZqrl7DP5kCQQD/8gbuYAT5pxQe
-+ULLGM0RvEsXxDYbEDxNbY5wrBazfklBwpumxZpFl6jEAT++7Kh2Ns3A7kB1oUNlA
-+FPYr+dYPAkEAwvHEwRtoyUr8jqoqVVJWI76CDmBjEOzVeMKW97ztqbs2LxZW8dYI
-+iOh/myFGpdoUwgu0U8w9MmXcj3ZeZCYKVwJALyQ+AJPw9qa+fuLwOq9gsHCtwrty
-+EhSQxSlwrz/pWniRll439vPkXfgntF4E0t1r+hiN2Hqv3/HcQgBaYzkuIwJAG023
-+bACFxaOuCeFFepvEms8E8jSHy4gQQhCnCl24v8wLw76SQN7kZSCDNtwLRBFuVNtE
-+z3PMonFn2eQPRmGZkwJAP1c1BHprMQx/ruafdscROILv3JrH40C1bR6KVVBKt1dK
-+Qpnpgi7hK5rUQjDF8k3bn9ugTt06jyeHe/QhAml0kg==
- -----END RSA PRIVATE KEY-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server-cert.pem mysql-5.1.50/mysql-test/std_data/server-cert.pem
---- mysql-5.1.50.orig/mysql-test/std_data/server-cert.pem	2010-08-03 13:55:08.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/server-cert.pem	2010-08-27 23:42:05.753428361 -0400
-@@ -1,41 +1,69 @@
- Certificate:
-     Data:
--        Version: 1 (0x0)
--        Serial Number: 1048578 (0x100002)
--        Signature Algorithm: md5WithRSAEncryption
-+        Version: 3 (0x2)
-+        Serial Number: 4 (0x4)
-+        Signature Algorithm: sha1WithRSAEncryption
-         Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
-         Validity
--            Not Before: Jan 29 11:56:49 2010 GMT
--            Not After : Jan 28 11:56:49 2015 GMT
-+            Not Before: Feb 20 02:55:06 2010 GMT
-+            Not After : Sep  3 02:55:06 2030 GMT
-         Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost
-         Subject Public Key Info:
-             Public Key Algorithm: rsaEncryption
--                Public-Key: (512 bit)
--                Modulus:
--                    00:cd:e4:87:51:9d:72:11:a0:d1:fa:f3:92:8b:13:
--                    1c:eb:f7:e2:9a:2f:72:a8:d6:65:48:d1:69:af:1b:
--                    c0:4c:13:e5:60:60:51:41:e9:ab:a6:bc:13:bb:0c:
--                    5e:32:7c:d9:6c:9e:cd:05:24:84:78:db:80:91:2e:
--                    d8:88:2b:c2:ed
-+            RSA Public Key: (1024 bit)
-+                Modulus (1024 bit):
-+                    00:e3:7d:4f:c2:23:77:a9:3a:2c:d2:69:59:a0:2f:
-+                    4e:d1:51:4c:ae:8d:f5:17:cc:ce:58:9c:83:4f:0b:
-+                    a3:bb:29:a2:b8:1d:3e:1b:04:f9:a9:3e:e2:61:d0:
-+                    e6:7b:b9:7c:12:d8:1f:86:c9:53:b5:04:dd:df:26:
-+                    e9:c0:2b:de:4a:96:2e:f3:23:6f:79:6d:a9:d2:4e:
-+                    17:af:2f:de:8b:68:44:ae:de:a3:e2:c4:37:1c:04:
-+                    ad:73:4b:85:f9:83:ac:fe:b7:c1:54:47:2e:96:d4:
-+                    31:96:85:94:69:d6:5a:63:24:04:99:89:19:1d:56:
-+                    8a:d1:77:aa:87:fb:38:cd:b7
-                 Exponent: 65537 (0x10001)
--    Signature Algorithm: md5WithRSAEncryption
--        73:ce:9c:6e:39:46:b4:14:be:da:3f:f3:1b:ba:90:bc:23:43:
--        d7:82:2a:70:4e:a6:d9:5a:65:5c:b7:df:71:df:75:77:c5:80:
--        a4:af:fa:d2:59:e2:fd:c9:9c:f0:98:95:8e:69:a9:8c:7c:d8:
--        6f:48:d2:e3:36:e0:cd:ff:3f:d1:a5:e6:ab:75:09:c4:50:10:
--        c4:96:dd:bf:3b:de:32:46:da:ca:4a:f1:d6:52:8a:33:2f:ab:
--        f5:2e:70:3f:d4:9c:be:00:c8:03:f9:39:8a:df:5b:70:3c:40:
--        ef:03:be:7c:3d:1d:32:32:f3:51:81:e2:83:30:6e:3d:38:9b:
--        fb:3c
-+        X509v3 extensions:
-+            X509v3 Basic Constraints: 
-+                CA:FALSE
-+            X509v3 Subject Key Identifier: 
-+                CC:8C:71:40:D0:0F:BF:D1:99:79:3F:1B:E9:10:76:19:67:36:0F:A3
-+            X509v3 Authority Key Identifier: 
-+                keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
-+                DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-+                serial:BE:58:AD:4C:1F:3D:25:95
-+
-+    Signature Algorithm: sha1WithRSAEncryption
-+        6f:ad:5e:59:fa:84:3a:be:e2:72:b1:e8:66:2a:4e:f8:73:19:
-+        11:06:11:92:78:56:3e:d6:e8:68:29:90:8b:59:d2:fe:aa:ae:
-+        25:59:c7:e9:99:bb:4a:06:43:dd:40:bd:cb:f4:ae:79:95:7d:
-+        8e:90:ef:58:d2:a8:fc:bf:07:f3:37:b2:9b:bd:da:e6:8c:56:
-+        dd:5e:c6:4a:70:7c:3e:3d:a1:e8:35:06:b8:a7:7b:ac:26:85:
-+        54:5d:09:a2:7b:77:b4:17:7f:72:31:cb:ff:cc:67:6d:e6:3e:
-+        c6:dc:96:eb:4a:0a:ae:e9:48:ae:8a:e0:d6:73:57:6e:32:4c:
-+        00:dc:28:da:55:b3:9f:9f:d8:98:cc:d9:f1:b6:b3:14:67:2e:
-+        a1:47:1e:51:11:cf:70:9f:31:8f:ba:59:29:f2:d0:88:0b:e2:
-+        51:6b:f8:31:ed:6d:ac:00:5e:d3:78:4c:95:97:02:cc:74:2b:
-+        3b:c6:28:e6:2a:c3:30:99:35:b4:4d:31:46:d4:90:f2:47:ed:
-+        64:85:1a:75:2a:72:0a:2f:c6:3a:2f:d2:ac:6b:31:cc:e5:a8:
-+        07:c2:d6:22:f3:c6:0f:bf:67:d9:d6:b2:79:cd:48:b5:c3:e0:
-+        e3:18:7f:b5:74:c9:43:19:fb:c4:93:29:ca:cc:90:2b:1b:6f:
-+        45:f6:25:f9
- -----BEGIN CERTIFICATE-----
--MIIBtzCCASACAxAAAjANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
--A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
--QUIwHhcNMTAwMTI5MTE1NjQ5WhcNMTUwMTI4MTE1NjQ5WjBGMQswCQYDVQQGEwJT
--RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNVBAMT
--CWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDN5IdRnXIRoNH685KL
--Exzr9+KaL3Ko1mVI0WmvG8BME+VgYFFB6aumvBO7DF4yfNlsns0FJIR424CRLtiI
--K8LtAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAc86cbjlGtBS+2j/zG7qQvCND14Iq
--cE6m2VplXLffcd91d8WApK/60lni/cmc8JiVjmmpjHzYb0jS4zbgzf8/0aXmq3UJ
--xFAQxJbdvzveMkbaykrx1lKKMy+r9S5wP9ScvgDIA/k5it9bcDxA7wO+fD0dMjLz
--UYHigzBuPTib+zw=
-+MIIDJTCCAg2gAwIBAgIBBDANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
-+MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
-+UUwgQUIwHhcNMTAwMjIwMDI1NTA2WhcNMzAwOTAzMDI1NTA2WjBGMQswCQYDVQQG
-+EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV
-+BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA431PwiN3
-+qTos0mlZoC9O0VFMro31F8zOWJyDTwujuymiuB0+GwT5qT7iYdDme7l8EtgfhslT
-+tQTd3ybpwCveSpYu8yNveW2p0k4Xry/ei2hErt6j4sQ3HAStc0uF+YOs/rfBVEcu
-+ltQxloWUadZaYyQEmYkZHVaK0Xeqh/s4zbcCAwEAAaOBozCBoDAJBgNVHRMEAjAA
-+MB0GA1UdDgQWBBTMjHFA0A+/0Zl5PxvpEHYZZzYPozB0BgNVHSMEbTBrgBSx+353
-+tUCNaBF+2RHlw8baTaxRsKFIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1Vw
-+cHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAvlit
-+TB89JZUwDQYJKoZIhvcNAQEFBQADggEBAG+tXln6hDq+4nKx6GYqTvhzGREGEZJ4
-+Vj7W6GgpkItZ0v6qriVZx+mZu0oGQ91Avcv0rnmVfY6Q71jSqPy/B/M3spu92uaM
-+Vt1exkpwfD49oeg1Brine6wmhVRdCaJ7d7QXf3Ixy//MZ23mPsbclutKCq7pSK6K
-+4NZzV24yTADcKNpVs5+f2JjM2fG2sxRnLqFHHlERz3CfMY+6WSny0IgL4lFr+DHt
-+bawAXtN4TJWXAsx0KzvGKOYqwzCZNbRNMUbUkPJH7WSFGnUqcgovxjov0qxrMczl
-+qAfC1iLzxg+/Z9nWsnnNSLXD4OMYf7V0yUMZ+8STKcrMkCsbb0X2Jfk=
- -----END CERTIFICATE-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server-key.pem mysql-5.1.50/mysql-test/std_data/server-key.pem
---- mysql-5.1.50.orig/mysql-test/std_data/server-key.pem	2010-08-03 13:55:08.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/server-key.pem	2010-08-27 23:42:05.754428433 -0400
-@@ -1,9 +1,15 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIIBOwIBAAJBAM3kh1GdchGg0frzkosTHOv34povcqjWZUjRaa8bwEwT5WBgUUHp
--q6a8E7sMXjJ82WyezQUkhHjbgJEu2Igrwu0CAwEAAQJBAJuwhFbF3NzRpBbEmnqJ
--4GPa1UJMQMLFJF+04tqj/HxJcAIVhOJhGmmtYNw1yjz/ZsPnfJCMz4eFOtdjvGtf
--peECIQDmFFg2WLvYo+2m9w9V7z4ZIkg7ixYkI/ObUUctfZkPOQIhAOUWnrvjFrAX
--bIvYT/YR50+3ZDLEc51XxNgJnWqWYl1VAiEAnTOFWgyivFC1DgF8PvDp8u5TgCt2
--A1d1GMgd490O+TECIC/WMl0/hTxOF9930vKqOGf//o9PUGkZq8QE9fcM4gtlAiAE
--iOcFpnLjtWj57jrhuw214ucnB5rklkQQe+AtcARNkg==
-+MIICXgIBAAKBgQDjfU/CI3epOizSaVmgL07RUUyujfUXzM5YnINPC6O7KaK4HT4b
-+BPmpPuJh0OZ7uXwS2B+GyVO1BN3fJunAK95Kli7zI295banSThevL96LaESu3qPi
-+xDccBK1zS4X5g6z+t8FURy6W1DGWhZRp1lpjJASZiRkdVorRd6qH+zjNtwIDAQAB
-+AoGAUb0o91y/FjMs/72S0pes/lDz+JRRSGfyjKxQEgrgndNsADOhqRu0iTdrKDJj
-+XnlbN3ooecnFJfnFrvTQcJhSmlS30j6VrBw6LXpCBK3dvjYgJ9LOne7WK+dF1+vS
-+FMQtsP04C56Sxy6HJDpMyWJ6oS3Bu169ygG2AxKo+Fk+E6ECQQD38w/MzmrARz2Z
-+AGeEPDUnVZPYgtmXkmks95S0/2jSoLhmgpvJimzxwpYwVG/BG8dSDVuTDu5kp05D
-+3bZIp3EzAkEA6uAwJsCZPtHXlWU3wYZJsA697rUNjPaCQOIaZ/lnh5RUHTmUiw1h
-+Oj/VORqKB0kXqcDfawwLjZEvh1Xli+H5bQJBANTmhw2TvEPnp/OFTl1UGUvyBmXl
-+TRMB639qAu07VfVtfYi/4ya1zn/0VmOfTOoigQ5qW9Q1AOu6YNCTQl62L9MCQQDc
-+YfEsW2kvNYxYJHoVfuBjbuGuOnn1e1Oqd70ZND59S6NFLMMBWlORaVWzWACNZ3rp
-+kAzSj6HDeqgjD2jsQONdAkEAt7S1YHUn8F760bRn4AnAto2TVOYdArtTP/wYjd4o
-+9rJREO/d8AYkYJ96APLvF0SZ4n3t1pLwQRsKKN8ZGTmzLA==
- -----END RSA PRIVATE KEY-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server8k-cert.pem mysql-5.1.50/mysql-test/std_data/server8k-cert.pem
---- mysql-5.1.50.orig/mysql-test/std_data/server8k-cert.pem	2010-08-03 13:55:08.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/server8k-cert.pem	2010-08-27 23:43:00.005366270 -0400
-@@ -1,51 +1,69 @@
-+Certificate:
-+    Data:
-+        Version: 3 (0x2)
-+        Serial Number: 5 (0x5)
-+        Signature Algorithm: sha1WithRSAEncryption
-+        Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
-+        Validity
-+            Not Before: Feb 20 03:00:54 2010 GMT
-+            Not After : Sep  3 03:00:54 2030 GMT
-+        Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server
-+        Subject Public Key Info:
-+            Public Key Algorithm: rsaEncryption
-+            RSA Public Key: (1024 bit)
-+                Modulus (1024 bit):
-+                    00:c5:da:44:95:06:77:16:21:af:a0:c4:3c:e9:f8:
-+                    1d:2d:95:f9:63:90:8c:3f:86:ba:77:76:4a:52:4b:
-+                    6b:af:29:f5:1c:aa:d4:3f:3e:42:9f:6d:46:ba:86:
-+                    90:b1:2d:cc:db:c6:33:15:a3:f4:af:53:33:4f:a1:
-+                    56:d1:aa:3b:26:10:f7:64:b5:f9:bf:1b:b1:47:8e:
-+                    cc:a6:d6:0d:aa:4a:77:e3:a3:63:9d:2a:dc:65:f4:
-+                    7f:91:17:38:2d:d6:cd:4e:8d:53:52:97:6e:87:fc:
-+                    64:60:a6:a1:00:ac:96:6c:e4:42:94:75:17:46:6f:
-+                    91:b5:dd:06:47:ed:05:e3:db
-+                Exponent: 65537 (0x10001)
-+        X509v3 extensions:
-+            X509v3 Basic Constraints: 
-+                CA:FALSE
-+            X509v3 Subject Key Identifier: 
-+                6E:60:3F:29:13:60:99:ED:0C:F7:15:B5:DB:7B:1C:FB:6F:60:19:ED
-+            X509v3 Authority Key Identifier: 
-+                keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
-+                DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-+                serial:BE:58:AD:4C:1F:3D:25:95
-+
-+    Signature Algorithm: sha1WithRSAEncryption
-+        63:2e:0f:07:14:06:cf:74:90:3d:37:42:f2:48:70:60:21:bc:
-+        34:52:31:f1:87:70:d2:b2:fb:ff:13:38:dc:f0:5e:43:d7:ee:
-+        a7:c7:1f:ac:aa:d2:8c:4f:fa:3c:4c:73:f6:b6:c2:0c:a0:ea:
-+        a2:c9:e2:73:61:c3:2e:78:40:0f:2a:d3:63:50:9b:b8:f9:89:
-+        40:ed:98:08:97:c3:07:24:17:34:b5:78:89:0a:bb:83:4c:e2:
-+        5c:2e:13:d6:21:30:ad:30:48:b5:70:12:ff:4a:6f:42:f0:f8:
-+        9f:b1:4b:bd:89:2b:f0:9d:e2:49:2b:35:69:18:1f:76:40:b4:
-+        76:bd:cb:dd:27:2f:c0:c1:e2:33:3e:6e:df:68:54:19:92:8a:
-+        bb:13:9c:cf:d6:17:56:da:bf:0d:64:70:3a:45:b7:aa:5f:e3:
-+        f5:96:ae:34:f2:17:37:27:d0:4b:e8:30:4a:c0:02:42:e2:d2:
-+        30:eb:eb:c7:d7:ec:d8:df:5c:43:58:e2:6f:b7:58:54:0d:c4:
-+        01:71:2d:59:8f:44:c7:a1:6c:0b:41:28:fa:b7:63:a7:68:d3:
-+        4f:c3:0f:17:9e:b2:32:50:e6:0b:87:3d:e2:39:47:c0:d8:0a:
-+        3b:f6:af:50:68:0f:9d:ef:6e:34:0d:3a:07:94:f8:a4:d7:24:
-+        86:32:d3:b4
- -----BEGIN CERTIFICATE-----
--MIIJFDCCBPwCAQEwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCU0UxEDAOBgNV
--BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMQ0wCwYDVQQLEwRUZXN0MQsw
--CQYDVQQDEwJDQTAeFw0xMDA3MjgxNDA3MjhaFw0xODEwMTQxNDA3MjhaMFIxCzAJ
--BgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQjEN
--MAsGA1UECxMEVGVzdDEPMA0GA1UEAxMGc2VydmVyMIIEIjANBgkqhkiG9w0BAQEF
--AAOCBA8AMIIECgKCBAEA6h3v1OWb9I9U/Z8diBu/xYGS8NCTD3ZESboHxVI2qSEC
--PgxNNcG8Lh0ktQdgYcOe64MnDTZX0Bibm47hoDldrAlTSffFxQhylqBBoXxDF+Lr
--hXIqCz7K0PsK+bYusL9ezJ7PETDnCT7oy95q4GXbKsutbNsm9if4ZE41gs2KnoU2
--DA7kvMmkKojrMIL4+BqTXA20LLo0iSbgvUTvpSJw4u96BeyzMNnxK2wP5vvTtUo5
--hACbfU87YjaSKs+q2VXCzfyYGZk1L1xk5GUI0bP+jutf1dDzNttW2/q2Nf5rxx09
--Gh/GwmOnEk1O7cOZ8VQCsOHirIM39NuSARsY6Y3G5XM4k2W4nxyR/RtdG9bvs/33
--aGsZ5V5yp7WSs8s9HHwaCPSsUiLKckQ7uA0TTRgbeweMrrLKovG57jsbBBB8pQD4
--PRd31qgxCdstWXHiWwRyI8vOLWENPXPFqA/rJwwqNdWTogy38aqVXxGYR8PIwjA2
--OaIwFjwGZcsPNLqw6bgAN8O2UBqZHWiMF8mi7brvioDvAIufZuqa2SqT/At45H83
--psQ6R4FsxZt6SAK7EsdPo8OYTrY1i4iPZd/eKhnEu2srEZgsKRwY5H1mvDH5fWCc
--HSFu07sWmlmK6Or65Fsa0IaKLJiQDVVETd6xrI0wkM4AOcbKDrS7aywJ426dopbs
--+LFdt4N0cdII4gBgJAfLuuA2yrDXRq4P6cgpVMy0R+0dEYE8zzm8zf1a+Ud273LS
--9+LB+LJKwqbW8nOPBoiekimIKfJYoOA4+C/mAjsYl1sVjjEhXJAs9S9L2UvnUk1P
--sZi4UKHI6eAIEl7VM1sQ4GbdZ0px2dF2Ax7pGkhD+DLpYyYkCprharKZdmuUNLUd
--NhXxi/HSEiE+Uy+o8RIzmH7LuROl/ZgnfHjJEiBLt2qPvwrwYd4c3XuXWs4YsWfV
--JTt8Mx2ihgVcdGy9//shCSmgJwR1oWrhgC10AEL2fKeRnYUal1i+IxFPp7nb8uwx
--UADgR0cY4A3qR/JP489QFIcxBTVs65De+Bq3ecnujk6yeGpD9iptonq4Y8uNZMc1
--kOE7GiFGwR4EufT5SEMh+tUkjth2r+842vmZZuxrVQaohDiATmIJA07W51zKH+nQ
--uw4qVKnAhPaDLCLc7YMIH9JcmkeQX0nf8/S2O2WYDH8glVDi5hfW08tCmV647vRY
--nTIywUTO0lFpz7M+VyMNaJ6yXU6biBV5hLAI8C5ldr/SWI789W2+ebBaJ9gfK+PT
--trohFSK37GcoSH4V6qSLJHCBASEsiddqHIHMLJZRYD+B6J3tLhjVUM43u+MEGbFT
--d33ZDke/WzLTExWkaOv36e67gDBmgDuj9yroq3wGfwIDAQABMA0GCSqGSIb3DQEB
--BAUAA4IEAQCc9RBhRbuWlmRZPZkqIdi5/+enyjoMmOa6ryJPxFSP8D2jrlHgQsk1
--+GsJmPFT3rwWfoGAQu/aeSX4sp8OhKVJtqNA6MJrGYnZIMolgYa1wZPbkjJsdEfi
--UsZdIB0n2+KA0xwEdGPdkGCfNPBtOg557DkcyEvsIZ9ELp4Pp2XzWRhyFGasJZc4
--YwgD/3K2rpOPZoMkBKeKqV19j41OfLKGBVyuaqzitbu9+KT4RU1ibr2a+UuFCwdT
--oqyN7bfWXjcjXOMkxCsOmLfKmqQxs7TEOVrYPTdYjamDxLy/e5g5FgoCxGY8iil0
--+YFLZyH6eEx/Os9DlG/M3O1MeRD9U97CdsphbDVZIDyWw5xeX8qQHJe0KSprAgiG
--TLhTZHeyrKujQCQS1oFFmNy4gSqXt0j1/6/9T80j6HeyjiiYEaEQK9YLTAjRoA7W
--VN8wtHI5F3RlNOVQEJks/bjdlpLL3VhaWtfewGh/mXRGcow84cgcsejMexmhreHm
--JfTUl9+X1IFFxGq2/606A9ROQ7kN/s4rXu7/TiMODXI/kZijoWd2SCc7Z0YWoNo7
--IRKkmZtrsflJbObEuK2Jk59uqzSxyQOBId8qtbPo8qJJyHGV5GCp34g4x67BxJBo
--h1iyVMamBAS5Ip1ejghuROrB8Hit8NhAZApXju62btJeXLX+mQayXb/wC/IXNJJD
--83tXiLfZgs6GzLAq7+KW/64sZSvj87CPiNtxkvjchAvyr+fhbBXCrf4rlOjJE6SH
--Je2/Jon7uqijncARGLBeYUT0Aa6k1slpXuSKxDNt7EIkP21kDZ5/OJ0Y1u587KVB
--dEhuDgNf2/8ij7gAQBwBoZMe1DrwddrxgLLBlyHpAZetNYFZNT+Cs/OlpqI0Jm59
--kK9pX0BY4AGOd23XM3K/uLawdmf67kkftim7aVaqXFHPiWsJVtlzmidKvNSmbmZe
--dOmMXp6PBoqcdusFVUS7vjd3KAes5wUX/CaTyOOPRu0LMSnpwEnaL76IC9x4Jd6d
--7QqY/OFTjpPH8nP57LwouiT6MgSUCWGaOkPuBJ9w9sENSbbINpgJJ42iAe2kE+R7
--qEIvf/2ETCTseeQUqm2nWiSPLkNagEh6kojmEoKrGyrv3YjrSXSOY1a70tDVy43+
--ueQDQzNZm3Q7inpke2ZKvWyY0LQmLzP2te+tnNBcdLyKJx7emPRTuMUlEdK7cLbt
--V3Sy9IKtyAXqqd66fPFj4NhJygyncj8M6CSqhG5L0GhDbkA8UJ8yK/gfKm3h5xe2
--utULK5VMtAhQt6cVahO59A9t/OI17y45bmlIgdlEQISzVFe9ZbIUJW44zBfPx74k
--/w8pMRr8gEuRqpL2WdJiKGG6lhMHLVFo
-+MIIDIjCCAgqgAwIBAgIBBTANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
-+MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
-+UUwgQUIwHhcNMTAwMjIwMDMwMDU0WhcNMzAwOTAzMDMwMDU0WjBDMQswCQYDVQQG
-+EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxDzANBgNV
-+BAMTBnNlcnZlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxdpElQZ3FiGv
-+oMQ86fgdLZX5Y5CMP4a6d3ZKUktrryn1HKrUPz5Cn21GuoaQsS3M28YzFaP0r1Mz
-+T6FW0ao7JhD3ZLX5vxuxR47MptYNqkp346NjnSrcZfR/kRc4LdbNTo1TUpduh/xk
-+YKahAKyWbORClHUXRm+Rtd0GR+0F49sCAwEAAaOBozCBoDAJBgNVHRMEAjAAMB0G
-+A1UdDgQWBBRuYD8pE2CZ7Qz3FbXbexz7b2AZ7TB0BgNVHSMEbTBrgBSx+353tUCN
-+aBF+2RHlw8baTaxRsKFIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcHNh
-+bGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAvlitTB89
-+JZUwDQYJKoZIhvcNAQEFBQADggEBAGMuDwcUBs90kD03QvJIcGAhvDRSMfGHcNKy
-++/8TONzwXkPX7qfHH6yq0oxP+jxMc/a2wgyg6qLJ4nNhwy54QA8q02NQm7j5iUDt
-+mAiXwwckFzS1eIkKu4NM4lwuE9YhMK0wSLVwEv9Kb0Lw+J+xS72JK/Cd4kkrNWkY
-+H3ZAtHa9y90nL8DB4jM+bt9oVBmSirsTnM/WF1bavw1kcDpFt6pf4/WWrjTyFzcn
-+0EvoMErAAkLi0jDr68fX7NjfXENY4m+3WFQNxAFxLVmPRMehbAtBKPq3Y6do00/D
-+DxeesjJQ5guHPeI5R8DYCjv2r1BoD53vbjQNOgeU+KTXJIYy07Q=
- -----END CERTIFICATE-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server8k-key.pem mysql-5.1.50/mysql-test/std_data/server8k-key.pem
---- mysql-5.1.50.orig/mysql-test/std_data/server8k-key.pem	2010-08-03 13:55:08.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/server8k-key.pem	2010-08-27 23:43:10.165365998 -0400
-@@ -1,99 +1,15 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIISKQIBAAKCBAEA6h3v1OWb9I9U/Z8diBu/xYGS8NCTD3ZESboHxVI2qSECPgxN
--NcG8Lh0ktQdgYcOe64MnDTZX0Bibm47hoDldrAlTSffFxQhylqBBoXxDF+LrhXIq
--Cz7K0PsK+bYusL9ezJ7PETDnCT7oy95q4GXbKsutbNsm9if4ZE41gs2KnoU2DA7k
--vMmkKojrMIL4+BqTXA20LLo0iSbgvUTvpSJw4u96BeyzMNnxK2wP5vvTtUo5hACb
--fU87YjaSKs+q2VXCzfyYGZk1L1xk5GUI0bP+jutf1dDzNttW2/q2Nf5rxx09Gh/G
--wmOnEk1O7cOZ8VQCsOHirIM39NuSARsY6Y3G5XM4k2W4nxyR/RtdG9bvs/33aGsZ
--5V5yp7WSs8s9HHwaCPSsUiLKckQ7uA0TTRgbeweMrrLKovG57jsbBBB8pQD4PRd3
--1qgxCdstWXHiWwRyI8vOLWENPXPFqA/rJwwqNdWTogy38aqVXxGYR8PIwjA2OaIw
--FjwGZcsPNLqw6bgAN8O2UBqZHWiMF8mi7brvioDvAIufZuqa2SqT/At45H83psQ6
--R4FsxZt6SAK7EsdPo8OYTrY1i4iPZd/eKhnEu2srEZgsKRwY5H1mvDH5fWCcHSFu
--07sWmlmK6Or65Fsa0IaKLJiQDVVETd6xrI0wkM4AOcbKDrS7aywJ426dopbs+LFd
--t4N0cdII4gBgJAfLuuA2yrDXRq4P6cgpVMy0R+0dEYE8zzm8zf1a+Ud273LS9+LB
--+LJKwqbW8nOPBoiekimIKfJYoOA4+C/mAjsYl1sVjjEhXJAs9S9L2UvnUk1PsZi4
--UKHI6eAIEl7VM1sQ4GbdZ0px2dF2Ax7pGkhD+DLpYyYkCprharKZdmuUNLUdNhXx
--i/HSEiE+Uy+o8RIzmH7LuROl/ZgnfHjJEiBLt2qPvwrwYd4c3XuXWs4YsWfVJTt8
--Mx2ihgVcdGy9//shCSmgJwR1oWrhgC10AEL2fKeRnYUal1i+IxFPp7nb8uwxUADg
--R0cY4A3qR/JP489QFIcxBTVs65De+Bq3ecnujk6yeGpD9iptonq4Y8uNZMc1kOE7
--GiFGwR4EufT5SEMh+tUkjth2r+842vmZZuxrVQaohDiATmIJA07W51zKH+nQuw4q
--VKnAhPaDLCLc7YMIH9JcmkeQX0nf8/S2O2WYDH8glVDi5hfW08tCmV647vRYnTIy
--wUTO0lFpz7M+VyMNaJ6yXU6biBV5hLAI8C5ldr/SWI789W2+ebBaJ9gfK+PTtroh
--FSK37GcoSH4V6qSLJHCBASEsiddqHIHMLJZRYD+B6J3tLhjVUM43u+MEGbFTd33Z
--Dke/WzLTExWkaOv36e67gDBmgDuj9yroq3wGfwIDAQABAoIEAQCSt6YoZqigz/50
--XvYT6Uf6T6S1lBDFXNmY1qOuDkLBJTWRiwYMDViQEaWCaZgGTKDYeT3M8uR/Phyu
--lRFi5vCEMufmcAeZ3hxptw7KU+R8ILJ207/zgit6YglTys9h5txTIack39+6FJmx
--wbZ64HpETJZnpMO6+fuZaMXyLjuT8mmXjvHcOgXOvjWeFkZOveDhjJkAesUXuqyX
--EI+ajoXuQiPXeKonkD2qd7NTjzfy4gw/ZF4NXs0ZVJeviqtIPo2xp33udOw2vRFh
--bMvlF4cNLAbIKYVyOG0ruOfd2I7Unsc/CvD1u5vlRVuUd8OO0JZLIZR7hlRX+A58
--8O1g2H/wJZAsF1BnLnFzDGYCX2WjCCK3Zn85FkKGRa0lTdYDduad/C/N3Y2/pHFE
--e7U/2D7IkEei59tD2HcsDBB3MJnckkn/hyiL9qWcxqWZ61vurE+XjU6tc6fnfhk9
--pJQ6yU3epPU7Vfsk0UGA7bbgKpsyzyH8Zl76YC2mN2ZVJjZekfhY+ibT9odEPdOl
--yLB5iXA6/WhKkDWaOqZGOH+7MblWgT9wHINlcn+nKzOr00JHl26ac6aMlXXi9vbe
--4jgJbFK1HYlFIndyX/BdqRTsFemDoDrVqrEYsaONoVYDd9c5qrqYOeh34DhOksQW
--hNwWBfmMlfzgOGtCYhMeK+AajqTtUbMYQA6qp47KJd/Oa5Dvi3ZCpvZh3Ll5iIau
--rqCtmojsWCqmpWSu7P+Wu4+O3XkUMPdQUuQ5rJFESEBB3yEJcxqk/RItTcKNElNC
--PASrPrMD9cli7S/pJ+frbhu1Gna1ArXzXQE9pMozPaBpjCig7+15R0lL3pmOKO6e
--WK3dgSwrnW6TQdLPlSD4lbRoiIdTHVBczztDeUqVvFiV3/cuaEi1nvaVdAYLqjuL
--ogK4HwE/FQ54S0ijAsP52n25usoH6OTU3bSd/7NTp0vZCy3yf10x7HUdsh2DvhRO
--3+TSK5t0yz0Nt7hNwcI6pLmWUIYcZgpFc/WsiiGscTfhy8rh3kRHI8ylGq53KNF+
--yCVmjqnBRWs91ArxmeF1ctX2t3w5p7gf65hJWqoX/2DiSi5FBsr6HLxa5sUi4wRZ
--136aCNt5Wu7w+AzPDbQW6qKUGSyfHJAw4JZasZcaZLise5IWb1ks0DtFbWWdT3ux
--8r2AM7IO1WopnekrYCnx/aBvBAv4NjWozVA517ztVttPERt3AGb4nm387nYt5R2U
--NO2GBWcDyT8JQLKmffE1AkWolCR1GsvcNLQfLCbnNppgsnsLE/viTG4mq1wjnd8O
--2Q8nH1SVTuyGFREMp/zsiAEaGfdd0hI2r1J7OdNPBBCtmhITsy9ZYHqm5vrGvy3s
--vi2GuB2RAoICAQD/oWUsg4eTJxHifTJLz/tVSTXnw7DhfbFVa1K1rUV63/MRQAFW
--pabN4T6Yfp3CpdRkljCA8KPJZj7euwhm4OEg1ulpOouA+cfWlE9RFE8wyOK5SYwM
--k+nk31P9MUC866pZg/ghzBGDub91OW1+ZGEtqnLI/n/LhiAIWt0hJvgZclTc1cAL
--xffHVlFwoSyNl/nc3ueZCC95nOLst2XcuxZLLbOFtZCmDYsp49q/Jn6EFjn4Ge2o
--qp38z6eZgDMP1F4lb9nDqXPHfUSt2jxKlmpfXS+IPKdba67+EjhbtmUYzaR4EoPI
--zh+o6SrVWT6Yve7KGiYv06fuRz1m/lLQO/Arbd9ntSjgn+ZEXGOkbhnHUX3DJ4ny
--/6XEGB9NLQjern4uNTn0AaV+uvhncapFMaIBnVfq0Cw8eog0136PBYRaVX7T44j5
--HwIyGXWtYGA/SzDEQoksD0Y/T61BEGnLZaKeavNd82WwFvcYHZtE0J4aQGjCEE7N
--+nijzCy+j5ETmme9KJvQHpEyXP3N4RBko1eWvyTwFZDdIXtoa6TTEI51lm+FXJ/b
--Y+BzMr6KRo29FB+7//1ptUoMvn5hzL0PwOv2ZSTQuoG5hLDEbxWXLNhd1VHcfznF
--3EZHwfD2F8aGQ3kz+fkMTNfK955KorDrmLgvmV9eZZ5yQxGZrs5H5YfKpwKCAgEA
--6nSUbzfSdVFUH89NM5FmEJgkD06vqCgHl2mpyF+VmDGcay4K06eA4QbRO5kns13+
--n6PcBl/YVW/rNE8iFi+WxfqUpAjdR1HlShvTuTRVqtFTfuN8XhbYU6VMjKyuE0kd
--LKe3KRdwubjVNhXRZLBknU+3Y/4hnIR7mcE3/M5Zv5hjb7XnwWg/SzxV9WojCKiu
--vQ7cXhH5/o7EuKcl1d6vueGhWsRylCG9RimwgViR2H7zD9kpkOc0nNym9cSpb0Gv
--Lui4cf/fVwIt2HfNEGBjbM/83e2MH6b8Xp1fFAy0aXCdRtOo4LVOzJVAxn5dERMX
--4JJ4d5cSFbssDN1bITOKzuytfBqRIQGNkOfizgQNWUiaFI0MhEN/icymjm1ybOIh
--Gc9tzqKI4wP2X9g+u3+Oof1QaBcZ4UbZEU9ITN87Pa6XVJmpNx7A81BafWoEPFeE
--ahoO4XDwlHZazDuSlOseEShxXcVwaIiqySy7OBEPBVuYdEd2Qw/z3JTx9Kw8MKnf
--hu+ar5tz5dPnJIsvLeYCcJDe/K6loiZuHTtPbWEy9p6It7qubQNPBvTSBN5eVDKc
--Q2bTQNCx8SAAA9C5gJiwWoQKsXJzbRFRY77P9JjuGpua3YJ2nYBHEJmF+fp1R33c
--uHIyMphPMkKC4GC3/43kkMr6tck8kZbXGSYsLsBr2GkCggIBAJvvrjILQianzKcm
--zAmnI6AQ+ssYesvyyrxaraeZvSqJdlLtgmOCxVANuQt5IW9djUSWwZvGL4Np1aw0
--15k6UNqhftzsE7FnrVneOsww4WXXBUcV8FKz4Bf3i9qFswILmGzmrfSf8YczRfGS
--SJKzVPxwX3jwlrBmbx/pnb7dcLbFIbNcyLvl1ZJJu4BDMVRmgssTRp/5eExtQZg4
--//A4SA8wH7TO3yAMXvn8vrGgH8kfbdlEp88d1SYk3g4rP/rGB3A63NIYikIEzmJn
--ICQ3wUfPJnGq3kRMWgEuyCZaCy2oNE3yrWVPJ8z3/2MJ/79ZDVNHxEeki2o1FuW+
--+nGAPq+fZIp03iy4HdVRro7dgugtc9QaSHJtNId8V4vSjviX5Oz3FxUb9AJst58S
--nVV8Q2FMxBa/SlzSOkhRtCg2q1gXkzhaMnIVUleRZFGQ2uWBToxKMjcoUifIyN1J
--z999bkfI4hBLq5pRSAXz+YVu5SMKa10GaawIwJLat+i+1zboF6QyI2o/Wz8nrsNq
--KX/ajFGu5C94WFgsVoWKNI90KBLe48Ssje9c68waBlV/WHMg1YLvU3yqVDOV+K5c
--IHB9tPMnG+AgBYZPxSzuvnLrrkj/GeKx0WI7TrvzOLRGKJo6irMEJ8IzFegASRUq
--TVZKYQDYRG7m+lKlSxU+pyMAh2c9AoICAE4kavCip1eIssQjYLTGSkFPo/0iGbOv
--G9CgXAE3snFWX67tWphupKrbjdMSWcQTmPD2OTg6q6zWL4twsIi6dcMooHAHsFC7
--//LyUV/SDJdxSyXohiQJ8zH1zwy35RDydnHSuF5OvLh53T44iWDI1dAEqLgAFI3J
--LjTxzEpLMGiGTuYFt+ejai0WQAQayvBw4ESM9m+4CB2K0hBFTXv5y5HlnNTW0uWC
--VUZUUMrbjUieDz8B/zOXi9aYSGFzmZFGUDAPSqJcSMEELemPDF7f8WNr8vi42tIV
--4tlaFD1nep4F9bWMiCXU6B2RxVQi+7vcJEIqL1KUnGd3ydfD00K+ng4Xnj7Vz/cz
--QE7CqrpFaXmPlCMzW6+dm51/AyhHXDLkL2od05hiXcNkJ7KMLWRqwExHVIxM3shR
--x7lYNl3ArUsCrNd6m4aOjnrKFk7kjeLavHxskPccoGKrC9o0JMfTkWLgmuBJFQ0S
--N/HzIbcvIFWF0Ms4ojb50yp6ziXhXfJOO/0KUQEki71XIhvw89mVZszDzD5lqzjf
--HCZMBU4MbmL6NdEevFIDH0zPPkx3HPNtJt3kIJbit9wI8VhUMe+ldGnGxpWb8tKw
--SfM3vrHkYr+lizk26XfXMFhdAuVtT7dzQKSNEyP/1a2Hs307Xzgiv8JulJ8QIkrX
--/nsYWPOAGLG5AoICABmdW9Ppkvuhb1AEcjTWb+XCyopoBc6vit/uQWD9uO+CeX7a
--cfzq+iH01CAjyVMc4E1JDc5Lpi106U+GRGcAAaPJB2Sp5NznoxaOVrb71blu4Q4x
--bNjtKM/P/DXpO+yJYoOPdKtaSDhtnfNDM7H/jztJ3XIrOltKA7CcRDohbBWIx8Q0
--0uEpvfFpZZBco3yVmjP0RLgIVYn/ZDj9wGhSvFWIJ5vv6GXmtDrcHGMLxcfv7t76
--UVcMW/Yy4mYJRCzGOrWagyVijJ6MTVNciqadWcH1KcbB3EGoMFYMn61or2qJABPM
--xz89IlhnROU1Re3X/QRx5t86cw6oa+FqrWMOhSs31I0dNWSuS/xDympG27YIYSDd
--mv5seT78GjFmMJC5pPOLoXsbTPB0HpsX2/UL/w/eRAfilTOef/Cf9VE5MP/C2YR7
--NBxUU7/+21D6WvdtBTcZbrXWGroAo8zPP+PwX0+c6WoAvqDJvCPndp8xZhSgEJN/
--0kScptezi8n3ZHI95EA9U5mAHxHz0IhDDVzWw/z1f1SBPxKVX3+By3zaa3lrD2ch
--cHq7nBkX72veEevnHUY8Z2rHE2G2jdmRfOtwm4sjL0VBV9fRRoxzJWRduKyeOtDL
--EhhBhUoTrT48UnfW9hxnbNLB9P/hh+UJu9HrS2uAwHoGE1+8gcyundupGDBn
-+MIICXgIBAAKBgQDF2kSVBncWIa+gxDzp+B0tlfljkIw/hrp3dkpSS2uvKfUcqtQ/
-+PkKfbUa6hpCxLczbxjMVo/SvUzNPoVbRqjsmEPdktfm/G7FHjsym1g2qSnfjo2Od
-+Ktxl9H+RFzgt1s1OjVNSl26H/GRgpqEArJZs5EKUdRdGb5G13QZH7QXj2wIDAQAB
-+AoGBAJLCjh7Q9eLnx+QDzH9s+Q/IcH4nSbERmh1lFEopAc6j29qQ6PGkmDy0DUPs
-+70VOCOh5A4mo3aZzm9sUfVb24/nRtmyTP/AtMuIVGCsUqzI28dJRGvRlY0aSQG/C
-+ILqMP69kiMNGBvuyEIiJhisOmMvDFEp7HrrXHJM9qcc217DpAkEA4nzJ9yyy2e4O
-+r6/D711hdfcU/F+ktXw+pL77kSSdTABUap92Uv2RL36UA4q5h8RNvq/GrzMNm6Ye
-+u2IMvBCiTQJBAN+iRbiMJCSitTg5YVMluVbT87co7jbTqk7LN1ujyIFEklm4xlHG
-+DLJNgEoDR7QJtAkL++FyogC4zsQsey5voscCQQCp54trTbDuI9QIoAaQrrDKWgz4
-+NpfNPeOQm2UFQT5vIWAyjGWrZGViB8bp0UvVOcJI5nxaOiZfOYOcdrWu75uRAkAn
-+67zMc9/j1lPJRJz2Dc7nDBD+ikTz7pcBV897AWLCiK4jbBOi91q+3YzgKXO8VNsZ
-+nlUJasA2psbqSBJ5OJ5zAkEA2UxoMju54hASjT54Z92IzraVw4Vo8CYwOcw5fr7z
-++m5xg1mmWdLBclmZ+WjARzDuTHIW6u/WCxNGg42AykWzfw==
- -----END RSA PRIVATE KEY-----
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql.init percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql.init
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql.init	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,209 +0,0 @@
-#!/bin/sh
-#
-# mysqld	This shell script takes care of starting and stopping
-#		the MySQL subsystem (mysqld).
-#
-# chkconfig: - 64 36
-# description:	MySQL database server.
-# processname: mysqld
-# config: /etc/my.cnf
-# pidfile: /var/run/mysqld/mysqld.pid
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-
-exec="/usr/bin/mysqld_safe"
-prog="mysqld"
-
-# Set timeouts here so they can be overridden from /etc/sysconfig/mysqld
-STARTTIMEOUT=120
-STOPTIMEOUT=60
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-lockfile=/var/lock/subsys/$prog
-
-
-# extract value of a MySQL option from config files
-# Usage: get_mysql_option SECTION VARNAME DEFAULT
-# result is returned in $result
-# We use my_print_defaults which prints all options from multiple files,
-# with the more specific ones later; hence take the last match.
-get_mysql_option(){
-	result=`/usr/bin/my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1`
-	if [ -z "$result" ]; then
-	    # not found, use default
-	    result="$3"
-	fi
-}
-
-get_mysql_option mysqld datadir "/var/lib/mysql"
-datadir="$result"
-get_mysql_option mysqld socket "$datadir/mysql.sock"
-socketfile="$result"
-get_mysql_option mysqld_safe log-error "/var/log/mysqld.log"
-errlogfile="$result"
-get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
-mypidfile="$result"
-
-
-start(){
-    [ -x $exec ] || exit 5
-    # check to see if it's already running
-    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
-    if [ $? = 0 ]; then
-	# already running, do nothing
-	action $"Starting $prog: " /bin/true
-	ret=0
-    elif echo "$RESPONSE" | grep -q "Access denied for user"
-    then
-	# already running, do nothing
-	action $"Starting $prog: " /bin/true
-	ret=0
-    else
-    	# prepare for start
-	touch "$errlogfile"
-	chown mysql:mysql "$errlogfile" 
-	chmod 0640 "$errlogfile"
-	[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
-	if [ ! -d "$datadir/mysql" ] ; then
-	    # First, make sure $datadir is there with correct permissions
-	    if [ ! -e "$datadir" -a ! -h "$datadir" ]
-	    then
-		mkdir -p "$datadir" || exit 1
-	    fi
-	    chown mysql:mysql "$datadir"
-	    chmod 0755 "$datadir"
-	    [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
-	    # Now create the database
-	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db --datadir="$datadir" --user=mysql
-	    ret=$?
-	    chown -R mysql:mysql "$datadir"
-	    if [ $ret -ne 0 ] ; then
-		return $ret
-	    fi
-	fi
-	chown mysql:mysql "$datadir"
-	chmod 0755 "$datadir"
-	# Pass all the options determined above, to ensure consistent behavior.
-	# In many cases mysqld_safe would arrive at the same conclusions anyway
-	# but we need to be sure.  (An exception is that we don't force the
-	# log-error setting, since this script doesn't really depend on that,
-	# and some users might prefer to configure logging to syslog.)
-	# Note: set --basedir to prevent probes that might trigger SELinux
-	# alarms, per bug #547485
-	$exec   --datadir="$datadir" --socket="$socketfile" \
-		--pid-file="$mypidfile" \
-		--basedir=/usr --user=mysql >/dev/null 2>&1 &
-	safe_pid=$!
-	# Spin for a maximum of N seconds waiting for the server to come up;
-	# exit the loop immediately if mysqld_safe process disappears.
-	# Rather than assuming we know a valid username, accept an "access
-	# denied" response as meaning the server is functioning.
-	ret=0
-	TIMEOUT="$STARTTIMEOUT"
-	while [ $TIMEOUT -gt 0 ]; do
-	    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
-	    echo "$RESPONSE" | grep -q "Access denied for user" && break
-	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
-		echo "MySQL Daemon failed to start."
-		ret=1
-		break
-	    fi
-	    sleep 1
-	    let TIMEOUT=${TIMEOUT}-1
-	done
-	if [ $TIMEOUT -eq 0 ]; then
-	    echo "Timeout error occurred trying to start MySQL Daemon."
-	    ret=1
-	fi
-	if [ $ret -eq 0 ]; then
-	    action $"Starting $prog: " /bin/true
-	    touch $lockfile
-	else
-	    action $"Starting $prog: " /bin/false
-	fi
-    fi
-    return $ret
-}
-
-stop(){
-	if [ ! -f "$mypidfile" ]; then
-	    # not running; per LSB standards this is "ok"
-	    action $"Stopping $prog: " /bin/true
-	    return 0
-	fi
-	MYSQLPID=`cat "$mypidfile"`
-	if [ -n "$MYSQLPID" ]; then
-	    /bin/kill "$MYSQLPID" >/dev/null 2>&1
-	    ret=$?
-	    if [ $ret -eq 0 ]; then
-		TIMEOUT="$STOPTIMEOUT"
-		while [ $TIMEOUT -gt 0 ]; do
-		    /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break
-		    sleep 1
-		    let TIMEOUT=${TIMEOUT}-1
-		done
-		if [ $TIMEOUT -eq 0 ]; then
-		    echo "Timeout error occurred trying to stop MySQL Daemon."
-		    ret=1
-		    action $"Stopping $prog: " /bin/false
-		else
-		    rm -f $lockfile
-		    rm -f "$socketfile"
-		    action $"Stopping $prog: " /bin/true
-		fi
-	    else
-		action $"Stopping $prog: " /bin/false
-	    fi
-	else
-	    # failed to read pidfile, probably insufficient permissions
-	    action $"Stopping $prog: " /bin/false
-	    ret=4
-	fi
-	return $ret
-}
- 
-restart(){
-    stop
-    start
-}
-
-condrestart(){
-    [ -e $lockfile ] && restart || :
-}
-
-
-# See how we were called.
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  status)
-    status -p "$mypidfile" $prog
-    ;;
-  restart)
-    restart
-    ;;
-  condrestart|try-restart)
-    condrestart
-    ;;
-  reload)
-    exit 3
-    ;;
-  force-reload)
-    restart
-    ;;
-  *)
-    echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-    exit 2
-esac
-
-exit $?
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-install-test.patch percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-install-test.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-install-test.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-install-test.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Improve the documentation that will be installed in the mysql-test RPM.
-
-
-diff -Naur mysql-5.1.43.orig/mysql-test/README mysql-5.1.43/mysql-test/README
---- mysql-5.1.43.orig/mysql-test/README	2010-01-15 12:14:43.000000000 -0500
-+++ mysql-5.1.43/mysql-test/README	2010-02-13 21:18:06.000000000 -0500
-@@ -6,6 +6,16 @@
- actually have a co-existing MySQL installation. The tests will not
- conflict with it.
- 
-+For use in Red Hat distributions, you should run the script as user mysql,
-+so the best bet is something like
-+	cd /usr/share/mysql-test
-+	sudo -u mysql ./mysql-test-run
-+This will use the installed mysql executables, but will run a private copy
-+of the server process (using data files within /usr/share/mysql-test),
-+so you need not start the mysqld service beforehand.
-+To clean up afterwards, remove the created "var" subdirectory, eg
-+	sudo -u mysql rm -rf /usr/share/mysql-test/var
-+
- All tests must pass. If one or more of them fail on your system, please
- read the following manual section for instructions on how to report the
- problem:
-@@ -25,7 +35,8 @@
- 
- With no test cases named on the command line, mysql-test-run falls back
- to the normal "non-extern" behavior. The reason for this is that some
--tests cannot run with an external server.
-+tests cannot run with an external server (because they need to control the
-+options with which the server is started).
- 
- 
- You can create your own test cases. To create a test case, create a new
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql.spec.sh percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql.spec.sh
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql.spec.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql.spec.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,2002 +0,0 @@
-#
-#   This file was modified by Oracle in 2011 and later.
-#   Details of the modifications are described in the "changelog" section.
-#
-#   Modifications copyright (c) 2011, 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
-# 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; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
-# MA  02110-1301  USA.
-
-##############################################################################
-# Some common macro definitions
-##############################################################################
-
-# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
-# change these, has to be exactly as is.
-# %define mysql_old_vendor        MySQL AB               # Applies to traditional MySQL RPMs only.
-# %define mysql_vendor_2          Sun Microsystems, Inc.
-%define mysql_vendor            Oracle and/or its affiliates
-
-%define mysql_version   @VERSION@
-
-%define mysqldatadir    /var/lib/mysql
-
-%define release         1
-
-##############################################################################
-# Command line handling
-##############################################################################
-#
-# To set options:
-#
-#   $ rpmbuild --define="option <x>" ...
-#
-
-# ----------------------------------------------------------------------------
-# Commercial builds
-# ----------------------------------------------------------------------------
-%if %{undefined commercial}
-%define commercial 0
-%endif
-
-# ----------------------------------------------------------------------------
-# Source name
-# ----------------------------------------------------------------------------
-%if %{undefined src_base}
-%define src_base mysql
-%endif
-%define src_dir %{src_base}-%{mysql_version}
-
-# ----------------------------------------------------------------------------
-# Feature set (storage engines, options).  Default to community (everything)
-# ----------------------------------------------------------------------------
-%if %{undefined feature_set}
-%define feature_set community
-%endif
-
-# ----------------------------------------------------------------------------
-# Server comment strings
-# ----------------------------------------------------------------------------
-%if %{undefined compilation_comment_debug}
-%define compilation_comment_debug       MySQL Community Server - Debug (GPL)
-%endif
-%if %{undefined compilation_comment_release}
-%define compilation_comment_release     MySQL Community Server (GPL)
-%endif
-
-# ----------------------------------------------------------------------------
-# Product and server suffixes
-# ----------------------------------------------------------------------------
-%if %{undefined product_suffix}
-  %if %{defined short_product_tag}
-    %define product_suffix      -%{short_product_tag}
-  %else
-    %define product_suffix      %{nil}
-  %endif
-%endif
-
-%if %{undefined server_suffix}
-%define server_suffix   %{nil}
-%endif
-
-# ----------------------------------------------------------------------------
-# Distribution support
-# ----------------------------------------------------------------------------
-%if %{undefined distro_specific}
-%define distro_specific 0
-%endif
-%if %{distro_specific}
-    %if %(test -f /etc/oracle-release && echo 1 || echo 0)
-      %define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
-      %if "%elver" == "6"
-        %define distro_description      Oracle Linux 6
-        %define distro_releasetag       el6
-        %define distro_buildreq         gcc-c++ ncurses-devel perl readline-devel time zlib-devel
-        %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
-      %else
-        %{error:Oracle Linux %{elver} is unsupported}
-      %endif
-    %else
-      %if %(test -f /etc/redhat-release && echo 1 || echo 0)
-        %define rhelver %(rpm -qf --qf '%%{version}\\n' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
-          %if "%rhelver" == "5"
-            %define distro_description    Red Hat Enterprise Linux 5
-            %define distro_releasetag     rhel5
-            %define distro_buildreq       gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
-            %define distro_requires       chkconfig coreutils grep procps shadow-utils net-tools
-          %else
-            %if "%rhelver" == "6"
-              %define distro_description    Red Hat Enterprise Linux 6
-              %define distro_releasetag     rhel6
-              %define distro_buildreq       gcc-c++ ncurses-devel perl readline-devel time zlib-devel
-              %define distro_requires       chkconfig coreutils grep procps shadow-utils net-tools
-            %else
-              %{error:Red Hat Enterprise Linux %{rhelver} is unsupported}
-            %endif
-          %endif
-      %else
-        %if %(test -f /etc/SuSE-release && echo 1 || echo 0)
-          %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release | cut -d. -f1)
-          %if "%susever" == "10"
-            %define distro_description    SUSE Linux Enterprise Server 10
-            %define distro_releasetag     sles10
-            %define distro_buildreq       gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client readline-devel zlib-devel
-            %define distro_requires       aaa_base coreutils grep procps pwdutils
-          %else
-            %if "%susever" == "11"
-              %define distro_description  SUSE Linux Enterprise Server 11
-              %define distro_releasetag   sles11
-              %define distro_buildreq     gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client procps pwdutils readline-devel zlib-devel
-              %define distro_requires     aaa_base coreutils grep procps pwdutils
-            %else
-              %{error:SuSE %{susever} is unsupported}
-            %endif
-          %endif
-        %else
-          %{error:Unsupported distribution}
-        %endif
-      %endif
-    %endif
-%else
-  %define glibc_version %(/lib/libc.so.6 | grep stable | cut -d, -f1 | cut -c38-)
-  %define distro_description            Generic Linux (glibc %{glibc_version})
-  %define distro_releasetag             linux_glibc%{glibc_version}
-  %define distro_buildreq               gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
-  %define distro_requires               coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd
-%endif
-
-# Avoid debuginfo RPMs, leaves binaries unstripped
-%define debug_package   %{nil}
-
-# Hack to work around bug in RHEL5 __os_install_post macro, wrong inverted
-# test for __debug_package
-%define __strip         /bin/true
-
-# ----------------------------------------------------------------------------
-# Support optional "tcmalloc" library (experimental)
-# ----------------------------------------------------------------------------
-%if %{defined malloc_lib_target}
-%define WITH_TCMALLOC 1
-%else
-%define WITH_TCMALLOC 0
-%endif
-
-##############################################################################
-# Configuration based upon above user input, not to be set directly
-##############################################################################
-
-%if %{commercial}
-%define license_files_server    %{src_dir}/LICENSE.mysql
-%define license_type            Commercial
-%else
-%define license_files_server    %{src_dir}/COPYING %{src_dir}/README
-%define license_type            GPL
-%endif
-
-##############################################################################
-# Main spec file section
-##############################################################################
-
-Name: mysql%{product_suffix}
-Summary: MySQL client programs and shared libraries
-Group: Applications/Databases
-Version: @MYSQL_RPM_VERSION@
-Release: %{release}%{?distro_releasetag:.%{distro_releasetag}}
-# exceptions allow client libraries to be linked with most open source SW,
-# not only GPL code.
-License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
-URL: http://www.mysql.com/
-Packager: MySQL Release Engineering <mysql-build@oss.oracle.com>
-Vendor:         %{mysql_vendor}
-
-# Regression tests may take a long time, override the default to skip them 
-%{!?runselftest:%global runselftest 1}
-
-# Upstream has a mirror redirector for downloads, so the URL is hard to
-# represent statically.  You can get the tarball by following a link from
-# http://dev.mysql.com/downloads/mysql/
-Source0: %{src_dir}.tar.gz
-# The upstream tarball includes non-free documentation that only the
-# copyright holder (MySQL -> Sun -> Oracle) may ship.
-# To remove the non-free documentation, run this script after downloading
-# the tarball into the current directory:
-# ./generate-tarball.sh $VERSION
-# Then, source name changes:
-#   Source0: mysql-%{version}-nodocs.tar.gz
-%if %{commercial}
-NoSource: 0
-%endif
-Source1: generate-tarball.sh
-Source2: mysql.init
-Source3: my.cnf
-Source4: scriptstub.c
-Source5: my_config.h
-# The below is only needed for packages built outside MySQL -> Sun -> Oracle:
-Source6: README.mysql-docs
-Source9: mysql-embedded-check.c
-# Working around perl dependency checking bug in rpm FTTB. Remove later.
-Source999: filter-requires-mysql.sh
-
-# Patch1: mysql-ssl-multilib.patch           Not needed by MySQL (yaSSL), will not work in 5.5 (cmake)
-# Patch2: mysql-5.5-errno.patch              Fixed in trunk
-Patch4: mysql-5.5-testing.patch
-Patch5: mysql-install-test.patch
-# Patch6: mysql-5.6-stack-guard.patch        Fixed in 5.6
-# Patch7: mysql-disable-test.patch           Already fixed in current 5.1
-# Patch8: mysql-setschedparam.patch          Will not work in 5.5 (cmake)
-# Patch9: mysql-no-docs.patch                Will not work in 5.5 (cmake)
-Patch10: mysql-strmov.patch
-       # Not used by MySQL
-# Patch12: mysql-cve-2008-7247.patch         Already fixed in 5.5
-Patch13: mysql-expired-certs.patch
-       # Will not be used by MySQL
-# Patch14: mysql-missing-string-code.patch   Undecided, will not work in 5.5 (cmake)
-# Patch15: mysql-lowercase-bug.patch         Fixed in MySQL 5.1.54 and 5.5.9
-Patch16: mysql-chain-certs.patch
-Patch17: mysql-5.5-libdir.patch
-Patch18: mysql-5.5-fix-tests.patch
-Patch19: mysql-5.5-mtr1.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  %{distro_buildreq}
-BuildRequires: gawk
-# make test requires time and ps
-BuildRequires: procps
-# Socket and Time::HiRes are needed to run regression tests
-BuildRequires: perl(Socket), perl(Time::HiRes)
-
-Requires: %{distro_requires}
-Requires: fileutils
-Requires: mysql-libs%{product_suffix} = %{version}-%{release}
-Requires: bash
-
-# If %%{product_suffix} is non-empty, the auto-generated capability is insufficient:
-# We want all dependency handling to use the generic name only.
-# Similar in other sub-packages
-Provides: mysql
-
-# MySQL (with caps) is upstream's spelling of their own RPMs for mysql
-Obsoletes: MySQL
-# mysql-cluster used to be built from this SRPM, but no more
-Obsoletes: mysql-cluster < 5.1.44
-# We need cross-product "Obsoletes:" to allow cross-product upgrades:
-Obsoletes: mysql < %{version}-%{release} 
-Obsoletes: mysql-advanced < %{version}-%{release}
-
-# Working around perl dependency checking bug in rpm FTTB. Remove later.
-%global __perl_requires %{SOURCE999}
-
-%description -n mysql%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
-client/server implementation consisting of a server daemon (mysqld)
-and many different client programs and libraries. The base package
-contains the standard MySQL client programs and generic MySQL files.
-
-The MySQL software has Dual Licensing, which means you can use the MySQL
-software free of charge under the GNU General Public License
-(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
-licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
-the GPL. See the chapter "Licensing and Support" in the manual for
-further info.
-
-%package -n mysql-libs%{product_suffix}
-
-Summary: The shared libraries required for MySQL clients
-Group: Applications/Databases
-Requires: /sbin/ldconfig
-Obsoletes: mysql-libs < %{version}-%{release}  
-Obsoletes: mysql-libs-advanced < %{version}-%{release}
-Provides: mysql-libs
-
-%description -n mysql-libs%{product_suffix}
-The mysql-libs package provides the essential shared libraries for any 
-MySQL client program or interface. You will need to install this package
-to use any other MySQL package or any clients that need to connect to a
-MySQL server.
-
-%package -n mysql-server%{product_suffix}
-
-Summary: The MySQL server and related files
-Group: Applications/Databases
-Requires: mysql%{product_suffix} = %{version}-%{release}
-Requires: sh-utils
-Requires(pre): /usr/sbin/useradd
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-Requires(postun): initscripts
-# mysqlhotcopy needs DBI/DBD support
-Requires: perl-DBI, perl-DBD-MySQL
-Obsoletes: MySQL-server
-Obsoletes: mysql-server < %{version}-%{release}
-Obsoletes: mysql-server-advanced < %{version}-%{release}
-Provides: mysql-server
-
-%description -n mysql-server%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
-client/server implementation consisting of a server daemon (mysqld)
-and many different client programs and libraries. This package contains
-the MySQL server and some accompanying files and directories.
-
-%package -n mysql-devel%{product_suffix}
-
-Summary: Files for development of MySQL applications
-Group: Applications/Databases
-Requires: mysql%{product_suffix} = %{version}-%{release}
-Requires: openssl-devel
-Obsoletes: MySQL-devel
-Obsoletes: mysql-devel < %{version}-%{release}
-Obsoletes: mysql-devel-advanced < %{version}-%{release}
-Provides: mysql-devel
-
-%description -n mysql-devel%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains the libraries and header files that are needed for
-developing MySQL client applications.
-
-%package -n mysql-embedded%{product_suffix}
-
-Summary: MySQL as an embeddable library
-Group: Applications/Databases
-Obsoletes: mysql-embedded < %{version}-%{release}
-Obsoletes: mysql-embedded-advanced < %{version}-%{release}
-Provides: mysql-embedded
-
-%description -n mysql-embedded%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains a version of the MySQL server that can be embedded
-into a client application instead of running as a separate process,
-as well as a command line client with such an embedded server.
-
-%package -n mysql-embedded-devel%{product_suffix}
-
-Summary: Development files for MySQL as an embeddable library
-Group: Applications/Databases
-Requires: mysql-embedded%{product_suffix} = %{version}-%{release}
-Requires: mysql-devel%{product_suffix} = %{version}-%{release}
-Obsoletes: mysql-embedded-devel < %{version}-%{release}
-Obsoletes: mysql-embedded-devel-advanced < %{version}-%{release}
-Provides: mysql-embedded-devel
-
-%description -n mysql-embedded-devel%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains files needed for developing and testing with
-the embedded version of the MySQL server.
-
-%package -n mysql-test%{product_suffix}
-
-Summary: The test suite distributed with MySQL
-Group: Applications/Databases
-Requires: mysql%{product_suffix} = %{version}-%{release}
-Requires: mysql-server%{product_suffix} = %{version}-%{release}
-Obsoletes: MySQL-test
-Obsoletes: mysql-test < %{version}-%{release}
-Obsoletes: mysql-test-advanced < %{version}-%{release}
-Provides: mysql-test
-
-%description -n mysql-test%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains the regression test suite distributed with
-the MySQL sources.
-
-%prep
-%setup -T -a 0 -c -n %{src_dir}
-
-cd %{src_dir} # read about "%setup -n"
-# %patch1 -p1
-# %patch2 -p1
-# %patch4 -p1  TODO / FIXME: if wanted, needs to be adapted to new mysql-test-run setup
-%patch5 -p1
-# %patch6 -p1
-# %patch8 -p1
-# %patch9 -p1
-# %patch10 -p1
-# %patch13 -p1
-# %patch14 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-
-# workaround for upstream bug #56342
-rm -f mysql-test/t/ssl_8k_key-master.opt
-
-%build
-
-# Fail quickly and obviously if user tries to build as root
-%if %runselftest
-	if [ x"`id -u`" = x0 ]; then
-		echo "The MySQL regression tests may fail if run as root."
-		echo "If you really need to build the RPM as root, use"
-		echo "--define='runselftest 0' to skip the regression tests."
-		exit 1
-	fi
-%endif
-
-# Be strict about variables, bail at earliest opportunity, etc.
-set -eu
-
-# Optional package files
-touch optional-files-devel
-
-#
-# Set environment in order of preference, MYSQL_BUILD_* first, then variable
-# name, finally a default.  RPM_OPT_FLAGS is assumed to be a part of the
-# default RPM build environment.
-#
-# We set CXX=gcc by default to support so-called 'generic' binaries, where we
-# do not have a dependancy on libgcc/libstdc++.  This only works while we do
-# not require C++ features such as exceptions, and may need to be removed at
-# a later date.
-#
-
-# This is a hack, $RPM_OPT_FLAGS on ia64 hosts contains flags which break
-# the compile in cmd-line-utils/readline - needs investigation, but for now
-# we simply unset it and use those specified directly in cmake.
-%if "%{_arch}" == "ia64"
-RPM_OPT_FLAGS=
-%endif
-
-# This goes in sync with Patch19. "rm" is faster than "patch" for this.
-rm -rf %{src_dir}/mysql-test/lib/v1
-
-export PATH=${MYSQL_BUILD_PATH:-$PATH}
-export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
-export CXX=${MYSQL_BUILD_CXX:-${CXX:-g++}}
-export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
-# Following "%ifarch" developed by RedHat, MySQL/Oracle does not support/maintain Linux/Sparc:
-# gcc seems to have some bugs on sparc as of 4.4.1, back off optimization
-# submitted as bz #529298
-%ifarch sparc sparcv9 sparc64
-CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
-%endif
-export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors}}
-export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
-export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
-export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-%{?_smp_mflags}}
-
-# Build debug mysqld and libmysqld.a
-mkdir debug
-(
-  cd debug
-  # Attempt to remove any optimisation flags from the debug build
-  CFLAGS=`echo " ${CFLAGS} " | \
-            sed -e 's/ -O[0-9]* / /' \
-                -e 's/ -unroll2 / /' \
-                -e 's/ -ip / /' \
-                -e 's/^ //' \
-                -e 's/ $//'`
-  CXXFLAGS=`echo " ${CXXFLAGS} " | \
-              sed -e 's/ -O[0-9]* / /' \
-                  -e 's/ -unroll2 / /' \
-                  -e 's/ -ip / /' \
-                  -e 's/^ //' \
-                  -e 's/ $//'`
-  # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
-  # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
-  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-           -DCMAKE_BUILD_TYPE=Debug \
-           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
-           -DFEATURE_SET="%{feature_set}" \
-           -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
-           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
-  echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
-  make ${MAKE_JFLAG} VERBOSE=1
-)
-# Build full release
-mkdir release
-(
-  cd release
-  # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
-  # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
-  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
-           -DFEATURE_SET="%{feature_set}" \
-           -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
-           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
-  echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
-  make ${MAKE_JFLAG} VERBOSE=1
-)
-
-# TODO / FIXME: Do we need "scriptstub"?
-gcc $CFLAGS $LDFLAGS -o scriptstub "-DLIBDIR=\"%{_libdir}/mysql\"" %{SOURCE4}
-
-# TODO / FIXME: "libmysqld.so" should have been produced above
-# regular build will make libmysqld.a but not libmysqld.so :-(
-cd release
-mkdir libmysqld/work
-cd libmysqld/work
-# "libmysqld" provides the same ABI as "libmysqlclient", but it implements the server:
-# The shared object is identified by the full version,
-# for linkage selection the first two levels are sufficient so that upgrades are possible
-# (see "man ld", option "-soname").
-SO_FULL='%{mysql_version}'
-SO_USE=`echo $SO_FULL | sed -e 's/\([0-9]\.[0-9]\)\.[0-9]*/\1/'`
-# These two modules should pull everything else which is needed:
-ar -x ../libmysqld.a client.c.o signal_handler.cc.o
-gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.$SO_USE -o libmysqld.so.$SO_FULL \
-	*.o ../libmysqld.a \
-	-lpthread -lcrypt -laio -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
-# this is to check that we built a complete library
-cp %{SOURCE9} .
-PROGNAME=`basename %{SOURCE9} .c`
-ln -s libmysqld.so.$SO_FULL libmysqld.so.$SO_USE
-gcc -I../../include -I../../../%{src_dir}/include $CFLAGS -o $PROGNAME %{SOURCE9} libmysqld.so.$SO_USE
-LD_LIBRARY_PATH=. ldd $PROGNAME
-cd ../..
-cd ..
-
-# TODO / FIXME: autotools only?
-# make check
-
-# TODO / FIXME: Test suite is run elsewhere in release builds -
-#               do we need this for users who want to build from source?
-# Also, check whether MTR_BUILD_THREAD=auto would solve all issues
-%if %runselftest
-  # hack to let 32- and 64-bit tests run concurrently on same build machine
-  case `uname -m` in
-    ppc64 | s390x | x86_64 | sparc64 )
-      MTR_BUILD_THREAD=7
-      ;;
-    *)
-      MTR_BUILD_THREAD=11
-      ;;
-  esac
-  export MTR_BUILD_THREAD
-
-  # if you want to change which tests are run, look at mysql-5.5-testing.patch too.
-  (cd release && make test-bt-fast )
-%endif
-
-%install
-RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/%{src_dir}
-[ -n "$RPM_BUILD_ROOT" -a  "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-# Ensure that needed directories exists
-# TODO / FIXME: needed ?  install -d $RBR%{mysqldatadir}/mysql
-# TODO / FIXME: needed ?  install -d $RBR%{_datadir}/mysql-test
-# TODO / FIXME: needed ?  install -d $RBR%{_datadir}/mysql/SELinux/RHEL4
-# TODO / FIXME: needed ?  install -d $RBR%{_includedir}
-# TODO / FIXME: needed ?  install -d $RBR%{_libdir}
-# TODO / FIXME: needed ?  install -d $RBR%{_mandir}
-# TODO / FIXME: needed ?  install -d $RBR%{_sbindir}
-
-# Install all binaries
-(
-  cd $MBD/release
-  make DESTDIR=$RBR install
-)
-
-# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921).  Do
-# this in a sub-shell to ensure we don't pollute the install environment
-# with compiler bits.
-(
-  PATH=${MYSQL_BUILD_PATH:-$PATH}
-  CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
-  CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
-  if "${CC}" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1; then
-    libgcc=`${CC} ${CFLAGS} --print-libgcc-file`
-    if [ -f ${libgcc} ]; then
-      mkdir -p $RBR%{_libdir}/mysql
-      install -m 644 ${libgcc} $RBR%{_libdir}/mysql/libmygcc.a
-      echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
-    fi
-  fi
-)
-
-# multilib header hacks
-# we only apply this to known Red Hat multilib arches, per bug #181335
-case `uname -i` in
-  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
-    mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
-    install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
-    ;;
-  *)
-    ;;
-esac
-
-mkdir -p $RPM_BUILD_ROOT/var/log
-touch $RPM_BUILD_ROOT/var/log/mysqld.log
-
-# List the installed tree for RPM package maintenance purposes.
-find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES
-
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/var/run/mysqld
-install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/my.cnf
-# obsolete: mv $RPM_BUILD_ROOT/usr/sql-bench $RPM_BUILD_ROOT%{_datadir}/sql-bench   # 'sql-bench' is dropped
-# obsolete: mv $RPM_BUILD_ROOT/usr/mysql-test $RPM_BUILD_ROOT%{_datadir}/mysql-test  # 'mysql-test' is there already
-# 5.1.32 forgets to install the mysql-test README file
-# obsolete: install -m 0644 mysql-test/README $RPM_BUILD_ROOT%{_datadir}/mysql-test/README  # 'README' is there already
-
-mv ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysqlbug
-install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug
-mv ${RPM_BUILD_ROOT}%{_bindir}/mysql_config ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysql_config
-install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
-
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.a
-SO_FULL='%{mysql_version}'
-SO_USE=`echo $SO_FULL | sed -e 's/\([0-9]\.[0-9]\)\.[0-9]*/\1/'`
-install -m 0755 release/libmysqld/work/libmysqld.so.$SO_FULL ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so.$SO_FULL
-ln -s libmysqld.so.$SO_FULL ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so.$SO_USE
-ln -s libmysqld.so.$SO_USE  ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so
-
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/comp_err
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/comp_err.1*
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_binary_distribution
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_src_distribution
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_bin_dist.1*
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_src_distribution.1*
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/*.a
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.la
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.a
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_binary_distribution
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_sharedlib_distribution
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mi_test_all*
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ndb-config-2-node.ini
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysqld_multi.server
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/MySQL-shared-compat.spec
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/*.plist
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/preinstall
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/postinstall
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ChangeLog
-rm -fr ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
-
-mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
-
-# The below *only* applies to builds not done by MySQL / Sun / Oracle:
-# copy additional docs into build tree so %%doc will find them
-# cp %{SOURCE6} README.mysql-docs
-
-%clean
-[ -n "$RPM_BUILD_ROOT" -a  "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%pre -n mysql-server%{product_suffix}
-
-# Check if we can safely upgrade.  An upgrade is only safe if it's from one
-# of our RPMs in the same version family.
-
-# Handle both ways of spelling the capability.
-installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
-if [ $? -ne 0 -o -z "$installed" ]; then
-  installed=`rpm -q --whatprovides MySQL-server 2> /dev/null`
-fi
-if [ $? -eq 0 -a -n "$installed" ]; then
-  installed=`echo $installed | sed 's/\([^ ]*\) .*/\1/'` # Tests have shown duplicated package names
-  vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
-  version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
-  myvendor='%{mysql_vendor}'
-  myversion='%{mysql_version}'
-
-  old_family=`echo $version \
-    | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
-  new_family=`echo $myversion \
-    | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
-
-  [ -z "$vendor" ] && vendor='<unknown>'
-  [ -z "$old_family" ] && old_family="<unrecognized version $version>"
-  [ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
-
-  error_text=
-  if [ "$vendor" != "$myvendor" ]; then
-    error_text="$error_text
-The current MySQL server package is provided by a different
-vendor ($vendor) than $myvendor.
-Some files may be installed to different locations, including log
-files and the service startup script in %{_sysconfdir}/init.d/.
-"
-  fi
-
-  if [ "$old_family" != "$new_family" ]; then
-    error_text="$error_text
-Upgrading directly from MySQL $old_family to MySQL $new_family may not
-be safe in all cases.  A manual dump and restore using mysqldump is
-recommended.  It is important to review the MySQL manual's Upgrading
-section for version-specific incompatibilities.
-"
-  fi
-
-  if [ -n "$error_text" ]; then
-    cat <<HERE >&2
-
-******************************************************************
-A MySQL server package ($installed) is installed.
-$error_text
-A manual upgrade is required.
-
-- Ensure that you have a complete, working backup of your data and my.cnf
-  files
-- Shut down the MySQL server cleanly
-- Remove the existing MySQL packages.  Usually this command will
-  list the packages you should remove:
-  rpm -qa | grep -i '^mysql-'
-
-  You may choose to use 'rpm --nodeps -ev <package-name>' to remove
-  the package which contains the mysqlclient shared library.  The
-  library will be reinstalled by the MySQL-shared-compat package.
-- Install the new MySQL packages supplied by $myvendor
-- Ensure that the MySQL server is started
-- Run the 'mysql_upgrade' program
-
-This is a brief description of the upgrade process.  Important details
-can be found in the MySQL manual, in the Upgrading section.
-******************************************************************
-HERE
-    exit 1
-  fi
-fi
-
-/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
-/usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
-	-c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
-
-%post -n mysql-libs%{product_suffix}
-/sbin/ldconfig
-
-%post -n mysql-server%{product_suffix}
-if [ $1 = 1 ]; then
-    /sbin/chkconfig --add mysqld
-fi
-/bin/chmod 0755 /var/lib/mysql
-/bin/touch /var/log/mysqld.log
-
-%preun -n mysql-server%{product_suffix}
-if [ $1 = 0 ]; then
-    /sbin/service mysqld stop >/dev/null 2>&1
-    /sbin/chkconfig --del mysqld
-fi
-
-%postun -n mysql-libs%{product_suffix}
-if [ $1 = 0 ] ; then
-    /sbin/ldconfig
-fi
-
-%postun -n mysql-server%{product_suffix}
-if [ $1 -ge 1 ]; then
-    /sbin/service mysqld condrestart >/dev/null 2>&1 || :
-fi
-
-
-%files -n mysql%{product_suffix}
-%defattr(-,root,root)
-%doc %{license_files_server}
-
-# The below file *only* applies to builds not done by MySQL / Sun / Oracle:
-# %doc README.mysql-docs
-
-%{_bindir}/msql2mysql
-%{_bindir}/mysql
-%{_bindir}/mysql_config
-%{_bindir}/mysql_find_rows
-%{_bindir}/mysql_waitpid
-%{_bindir}/mysqlaccess
-%{_bindir}/mysqlaccess.conf
-%{_bindir}/mysqladmin
-%{_bindir}/mysqlbinlog
-%{_bindir}/mysqlcheck
-%{_bindir}/mysqldump
-%{_bindir}/mysqlimport
-%{_bindir}/mysqlshow
-%{_bindir}/mysqlslap
-%{_bindir}/my_print_defaults
-%{_bindir}/mysql_config_editor
-
-%{_mandir}/man1/mysql.1*
-%{_mandir}/man1/mysql_config.1*
-%{_mandir}/man1/mysql_find_rows.1*
-%{_mandir}/man1/mysql_waitpid.1*
-%{_mandir}/man1/mysqlaccess.1*
-%{_mandir}/man1/mysqladmin.1*
-%{_mandir}/man1/mysqldump.1*
-%{_mandir}/man1/mysqlshow.1*
-%{_mandir}/man1/mysqlslap.1*
-%{_mandir}/man1/my_print_defaults.1*
-%{_mandir}/man1/mysql_config_editor.1*
-
-%{_libdir}/mysql/mysqlbug
-%{_libdir}/mysql/mysql_config
-
-%files -n mysql-libs%{product_suffix}
-%defattr(-,root,root)
-%doc %{license_files_server}
-# although the default my.cnf contains only server settings, we put it in the
-# libs package because it can be used for client settings too.
-%config(noreplace) /etc/my.cnf
-%dir %{_libdir}/mysql
-%{_libdir}/mysql/libmysqlclient*.so.*
-/etc/ld.so.conf.d/*
-
-%dir %{_datadir}/mysql
-%{_datadir}/mysql/english
-%lang(bg) %{_datadir}/mysql/bulgarian
-%lang(cs) %{_datadir}/mysql/czech
-%lang(da) %{_datadir}/mysql/danish
-%lang(nl) %{_datadir}/mysql/dutch
-%lang(et) %{_datadir}/mysql/estonian
-%lang(fr) %{_datadir}/mysql/french
-%lang(de) %{_datadir}/mysql/german
-%lang(el) %{_datadir}/mysql/greek
-%lang(hu) %{_datadir}/mysql/hungarian
-%lang(it) %{_datadir}/mysql/italian
-%lang(ja) %{_datadir}/mysql/japanese
-%lang(ko) %{_datadir}/mysql/korean
-%lang(no) %{_datadir}/mysql/norwegian
-%lang(no) %{_datadir}/mysql/norwegian-ny
-%lang(pl) %{_datadir}/mysql/polish
-%lang(pt) %{_datadir}/mysql/portuguese
-%lang(ro) %{_datadir}/mysql/romanian
-%lang(ru) %{_datadir}/mysql/russian
-%lang(sr) %{_datadir}/mysql/serbian
-%lang(sk) %{_datadir}/mysql/slovak
-%lang(es) %{_datadir}/mysql/spanish
-%lang(sv) %{_datadir}/mysql/swedish
-%lang(uk) %{_datadir}/mysql/ukrainian
-%{_datadir}/mysql/charsets
-
-%files -n mysql-server%{product_suffix} -f release/support-files/plugins.files
-%defattr(-,root,root)
-%doc release/support-files/*.cnf
-%doc %{_datadir}/info/mysql.info*
-%doc %{src_dir}/Docs/ChangeLog
-%doc %{src_dir}/Docs/INFO_SRC*
-%doc release/Docs/INFO_BIN*
-
-%{_bindir}/myisamchk
-%{_bindir}/myisam_ftdump
-%{_bindir}/myisamlog
-%{_bindir}/myisampack
-%{_bindir}/mysql_convert_table_format
-%{_bindir}/mysql_fix_extensions
-%{_bindir}/mysql_install_db
-%{_bindir}/mysql_plugin
-%{_bindir}/mysql_secure_installation
-%if %{commercial}
-%else
-%{_bindir}/mysql_setpermission
-%endif
-%{_bindir}/mysql_tzinfo_to_sql
-%{_bindir}/mysql_upgrade
-%{_bindir}/mysql_zap
-%{_bindir}/mysqlbug
-%{_bindir}/mysqldumpslow
-%{_bindir}/mysqld_multi
-%{_bindir}/mysqld_safe
-%{_bindir}/mysqlhotcopy
-%{_bindir}/mysqltest
-%{_bindir}/innochecksum
-%{_bindir}/perror
-%{_bindir}/replace
-%{_bindir}/resolve_stack_dump
-%{_bindir}/resolveip
-
-/usr/libexec/mysqld
-/usr/libexec/mysqld-debug
-%{_libdir}/mysql/plugin/daemon_example.ini
-
-%if %{WITH_TCMALLOC}
-%{_libdir}/mysql/%{malloc_lib_target}
-%endif
-
-# obsolete by "-f release/support-files/plugins.files" above
-# %{_libdir}/mysql/plugin
-
-%{_mandir}/man1/msql2mysql.1*
-%{_mandir}/man1/myisamchk.1*
-%{_mandir}/man1/myisamlog.1*
-%{_mandir}/man1/myisampack.1*
-%{_mandir}/man1/mysql_convert_table_format.1*
-%{_mandir}/man1/myisam_ftdump.1*
-%{_mandir}/man1/mysql.server.1*
-%{_mandir}/man1/mysql_fix_extensions.1*
-%{_mandir}/man1/mysql_install_db.1*
-%{_mandir}/man1/mysql_plugin.1*
-%{_mandir}/man1/mysql_secure_installation.1*
-%{_mandir}/man1/mysql_upgrade.1*
-%{_mandir}/man1/mysql_zap.1*
-%{_mandir}/man1/mysqlbug.1*
-%{_mandir}/man1/mysqldumpslow.1*
-%{_mandir}/man1/mysqlbinlog.1*
-%{_mandir}/man1/mysqlcheck.1*
-%{_mandir}/man1/mysqld_multi.1*
-%{_mandir}/man1/mysqld_safe.1*
-%{_mandir}/man1/mysqlhotcopy.1*
-%{_mandir}/man1/mysqlimport.1*
-%{_mandir}/man1/mysqlman.1*
-%if %{commercial}
-%else
-%{_mandir}/man1/mysql_setpermission.1*
-%endif
-%{_mandir}/man1/mysqltest.1*
-%{_mandir}/man1/innochecksum.1*
-%{_mandir}/man1/perror.1*
-%{_mandir}/man1/replace.1*
-%{_mandir}/man1/resolve_stack_dump.1*
-%{_mandir}/man1/resolveip.1*
-%{_mandir}/man1/mysql_tzinfo_to_sql.1*
-%{_mandir}/man8/mysqld.8*
-
-%{_datadir}/mysql/dictionary.txt
-%{_datadir}/mysql/errmsg-utf8.txt
-%{_datadir}/mysql/fill_help_tables.sql
-%{_datadir}/mysql/innodb_memcached_config.sql
-%{_datadir}/mysql/magic
-%{_datadir}/mysql/mysql_security_commands.sql
-%{_datadir}/mysql/mysql_system_tables.sql
-%{_datadir}/mysql/mysql_system_tables_data.sql
-%{_datadir}/mysql/mysql_test_data_timezone.sql
-%{_datadir}/mysql/my-default.cnf
-
-/etc/rc.d/init.d/mysqld
-%attr(0755,mysql,mysql) %dir /var/run/mysqld
-%attr(0755,mysql,mysql) %dir /var/lib/mysql
-%attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /var/log/mysqld.log
-
-# TODO / FIXME: Do we need "libmygcc.a"? If yes, append "-f optional-files-devel"
-#               and fix the "rm -f" list in the "install" section.
-%files -n mysql-devel%{product_suffix}
-%defattr(-,root,root)
-/usr/include/mysql
-/usr/share/aclocal/mysql.m4
-%{_libdir}/mysql/libmysqlclient*.so
-
-%files -n mysql-embedded%{product_suffix}
-%defattr(-,root,root)
-%doc %{license_files_server}
-%{_libdir}/mysql/libmysqld.so.*
-%{_bindir}/mysql_embedded
-
-%files -n mysql-embedded-devel%{product_suffix}
-%defattr(-,root,root)
-%{_libdir}/mysql/libmysqld.so
-%{_bindir}/mysql_client_test_embedded
-%{_bindir}/mysqltest_embedded
-%{_mandir}/man1/mysql_client_test_embedded.1*
-%{_mandir}/man1/mysqltest_embedded.1*
-
-%files -n mysql-test%{product_suffix}
-%defattr(-,root,root)
-%{_bindir}/mysql_client_test
-%attr(-,mysql,mysql) %{_datadir}/mysql-test
-
-%{_mandir}/man1/mysql_client_test.1*
-
-%changelog
-* Mon Jul  8 2013 Tor Didriksen <tor.didriksen@oracle.com>
-- Fix Bug#35019 Use pthread_attr_getguardsize for better robustness
-  of stack thread sizes
-- Remove Patch6: mysql-5.6-stack-guard.patch
-
-* Mon Dec 10 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Replace old my-*.cnf config file examples with template my-default.cnf
-- Handle several files for packaging which are new in 5.6 (compared to 5.5).
-
-* Thu Dec  7 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Change the way in which "libmysqld.so" is created: Using all object modules
-  was wrong, gcc / ld can resolve the dependencies from "libmysqld.a".
-  Also, identify the ".so" version from the MySQL version, "0.0.1" was wrong.
-  Bug#15972480
-
-* Fri Nov  9 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- The "stack-guard.patch" needs to be adapted for MySQL 5.6,
-  reflect that in a name change "5.5" -> "5.6".
-- Set CXX=g++ by default to add a dependency on libgcc/libstdc++.
-  Also, remove the use of the -fno-exceptions and -fno-rtti flags.
-
-* Tue Sep 18 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Restrict the vendor check to Oracle: There is no history here
-  which we have to allow for.
-
-* Thu Jul 26 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Add the vendor and release series checks from the traditional MySQL RPM
-  spec file, to protect against errors happening during upgrades.
-- Do some code alignment with the traditional MySQL RPM spec file,
-  to make synchronous maintenance (and possibly even integration?) easier.
-
-* Mon Feb 13 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Add "Provides:" lines for the generic names of the subpackages,
-  independent of "product_suffix".
-
-* Tue Feb  7 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Make "mysql_setpermission" and its man page appear in GPL builds only.
-
-* Thu Nov 24 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Add two patches (#18 + #19) regarding the test suite;
-  version 1 of "mysql-test-run.pl" had to go because the auto-detection
-  of Perl dependencies does not handle differences between run directory
-  and delivery location.
-
-* Thu Nov  3 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Adapt from MySQL 5.1 to 5.5, tested using 5.5.17:
-  - Done by the MySQL Build Team at Oracle:
-    set as packager, set copyright owner and related info;
-  - handle command line options, allowing different configurations, platforms, ...
-    - configurations will show up in the file name as "product_suffix",
-    - use "-n" for all subpackage specifications,
-    - license may be GPL or commercial, mention that in the description,
-      the license output and the included license files will vary,
-    - commercial is "nosource",
-    - improve "requires" listings for different platforms,
-    - explicitly use "product_suffix" in the "requires" entries;
-  - adapt to 5.5 changes in features and function:
-    - remove "mysql-bench" package (files are outdated, not maintained),
-    - no InnoDB plugin,
-    - the set of plugins will vary by configuration, to control the "server"
-      package contents use "-f release/support-files/plugins.files" in the
-      "files" section,
-    - remove "mysqlmanager", "mysql_fix_privilege_tables",
-    - add "mysql_embedded", "mysql-plugin", "mysqlaccess.conf", "magic",
-    - "errmsg.txt" is now in UTF8: "errmsg-utf8.txt",
-    - adapt patches to changed code where needed, rename these to include "5.5",
-    - stop using patches which are not applicable to 5.5;
-  - 5.5 uses a different way of building:
-    - autotools are replaced by cmake,
-    - both a "release" and a "debug" server are built in separate subtrees
-      ("out of source"!), this also affects path names in further handling,
-    - the debug server is added to the "server" subpackage,
-    - add "mysql-5.5-libdir.patch" to handle file placement at user site.
-
-* Mon Dec 20 2010 Tom Lane <tgl@redhat.com> 5.1.52-1.1
-- Update to MySQL 5.1.52, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-52.html
-  including numerous small security issues
-Resolves: #652553
-- Sync with current Fedora package; this includes:
-- Duplicate COPYING and EXCEPTIONS-CLIENT in -libs and -embedded subpackages,
-  to ensure they are available when any subset of mysql RPMs are installed,
-  per revised packaging guidelines
-- Allow init script's STARTTIMEOUT/STOPTIMEOUT to be overridden from sysconfig
-
-* Thu Jul 15 2010 Tom Lane <tgl@redhat.com> 5.1.47-4
-- Add backported patch for CVE-2010-2008 (upstream bug 53804)
-Resolves: #614215
-- Add BuildRequires perl(Time::HiRes) ... seems to no longer be installed
-  by just pulling in perl.
-
-* Mon Jun 28 2010 Tom Lane <tgl@redhat.com> 5.1.47-3
-- Add -p "$mypidfile" to initscript's status call to improve corner cases.
-  (Note: can't be fixed in Fedora until 595597 is fixed there.)
-Resolves: #596008
-
-* Mon Jun  7 2010 Tom Lane <tgl@redhat.com> 5.1.47-2
-- Add back "partition" storage engine
-Resolves: #598585
-- Fix broken "federated" storage engine plugin
-Resolves: #587170
-- Read all certificates in SSL certificate files, to support chained certs
-Resolves: #598656
-
-* Mon May 24 2010 Tom Lane <tgl@redhat.com> 5.1.47-1
-- Update to MySQL 5.1.47, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-47.html
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-46.html
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-45.html
-  including fixes for CVE-2010-1621, CVE-2010-1626,
-  CVE-2010-1848, CVE-2010-1849, CVE-2010-1850
-Resolves: #590598
-- Create mysql group explicitly in pre-server script, to ensure correct GID
-
-* Mon Mar  8 2010 Tom Lane <tgl@redhat.com> 5.1.44-2
-- Update to MySQL 5.1.44, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-44.html
-Resolves: #565554
-- Remove mysql.info, which is not freely redistributable
-Related: #560181
-- Revert broken upstream fix for their bug 45058
-Related: #566547
-- Bring init script into some modicum of compliance with Fedora/LSB standards
-Resolves: #557711
-Resolves: #562749
-
-* Mon Feb 15 2010 Tom Lane <tgl@redhat.com> 5.1.43-2
-- Update to MySQL 5.1.43, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-43.html
-Resolves: #565554
-- Remove mysql-cluster, which is no longer supported by upstream in this
-  source distribution.  If we want it we'll need a separate SRPM for it.
-Resolves: #565210
-
-* Fri Jan 29 2010 Tom Lane <tgl@redhat.com> 5.1.42-7
-- Add backported patch for CVE-2008-7247 (upstream bug 39277)
-Resolves: #549329
-- Use non-expired certificates for SSL testing (upstream bug 50702)
-
-* Tue Jan 26 2010 Tom Lane <tgl@redhat.com> 5.1.42-6
-- Emit explicit error message if user tries to build RPM as root
-Resolves: #558915
-
-* Wed Jan 20 2010 Tom Lane <tgl@redhat.com> 5.1.42-5
-- Correct Source0: tag and comment to reflect how to get the tarball
-
-* Fri Jan  8 2010 Tom Lane <tgl@redhat.com> 5.1.42-4
-- Sync with current Fedora build, including:
-- Update to MySQL 5.1.42, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-42.html
-- Disable symbolic links by default in /etc/my.cnf
-Resolves: #553653
-- Remove static libraries (.a files) from package, per packaging guidelines
-- Change %%define to %%global, per packaging guidelines
-- Disable building the innodb plugin; it tickles assorted gcc bugs and
-  doesn't seem entirely ready for prime time anyway.
-Resolves: #553632
-- Start mysqld_safe with --basedir=/usr, to avoid unwanted SELinux messages
-  (see 547485)
-- Stop waiting during "service mysqld start" if mysqld_safe exits
-Resolves: #544095
-
-* Mon Nov 23 2009 Tom Lane <tgl@redhat.com> 5.1.41-1
-- Update to MySQL 5.1.41, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html
-  including fixes for CVE-2009-4019
-Resolves: #549327
-- Don't set old_passwords=1; we aren't being bug-compatible with 3.23 anymore
-Resolves: #540735
-
-* Tue Nov 10 2009 Tom Lane <tgl@redhat.com> 5.1.40-1
-- Update to MySQL 5.1.40, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html
-- Do not force the --log-error setting in mysqld init script
-Resolves: #533736
-
-* Sat Oct 17 2009 Tom Lane <tgl@redhat.com> 5.1.39-4
-- Replace kluge fix for ndbd sparc crash with a real fix (mysql bug 48132)
-
-* Thu Oct 15 2009 Tom Lane <tgl@redhat.com> 5.1.39-3
-- Work around two different compiler bugs on sparc, one by backing off
-  optimization from -O2 to -O1, and the other with a klugy patch
-Related: #529298, #529299
-- Clean up bogosity in multilib stub header support: ia64 should not be
-  listed (it's not multilib), sparc and sparc64 should be
-
-* Wed Sep 23 2009 Tom Lane <tgl@redhat.com> 5.1.39-2
-- Work around upstream bug 46895 by disabling outfile_loaddata test
-
-* Tue Sep 22 2009 Tom Lane <tgl@redhat.com> 5.1.39-1
-- Update to MySQL 5.1.39, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html
-
-* Mon Aug 31 2009 Tom Lane <tgl@redhat.com> 5.1.37-5
-- Work around unportable assumptions about stpcpy(); re-enable main.mysql test
-- Clean up some obsolete parameters to the configure script
-
-* Sat Aug 29 2009 Tom Lane <tgl@redhat.com> 5.1.37-4
-- Remove one misguided patch; turns out I was chasing a glibc bug
-- Temporarily disable "main.mysql" test; there's something broken there too,
-  but we need to get mysql built in rawhide for dependency reasons
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 5.1.37-3
-- rebuilt with new openssl
-
-* Fri Aug 14 2009 Tom Lane <tgl@redhat.com> 5.1.37-2
-- Add a couple of patches to improve the probability of the regression tests
-  completing in koji builds
-
-* Sun Aug  2 2009 Tom Lane <tgl@redhat.com> 5.1.37-1
-- Update to MySQL 5.1.37, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.36-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jul 10 2009 Tom Lane <tgl@redhat.com> 5.1.36-1
-- Update to MySQL 5.1.36, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-36.html
-
-* Sat Jun  6 2009 Tom Lane <tgl@redhat.com> 5.1.35-1
-- Update to MySQL 5.1.35, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-35.html
-- Ensure that /var/lib/mysql is created with the right SELinux context
-Resolves: #502966
-
-* Fri May 15 2009 Tom Lane <tgl@redhat.com> 5.1.34-1
-- Update to MySQL 5.1.34, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-34.html
-- Increase startup timeout per bug #472222
-
-* Wed Apr 15 2009 Tom Lane <tgl@redhat.com> 5.1.33-2
-- Increase stack size of ndbd threads for safety's sake.
-Related: #494631
-
-* Tue Apr  7 2009 Tom Lane <tgl@redhat.com> 5.1.33-1
-- Update to MySQL 5.1.33.
-- Disable use of pthread_setschedparam; doesn't work the way code expects.
-Related: #477624
-
-* Wed Mar  4 2009 Tom Lane <tgl@redhat.com> 5.1.32-1
-- Update to MySQL 5.1.32.
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.31-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 13 2009 Tom Lane <tgl@redhat.com> 5.1.31-1
-- Update to MySQL 5.1.31.
-
-* Thu Jan 22 2009 Tom Lane <tgl@redhat.com> 5.1.30-2
-- hm, apparently --with-innodb and --with-ndbcluster are still needed
-  even though no longer documented ...
-
-* Thu Jan 22 2009 Tom Lane <tgl@redhat.com> 5.1.30-1
-- Update to MySQL 5.1.30.  Note that this includes an ABI break for
-  libmysqlclient (it's now got .so major version 16).
-- This also updates mysql for new openssl build
-
-* Wed Oct  1 2008 Tom Lane <tgl@redhat.com> 5.0.67-2
-- Build the "embedded server" library, and package it in a new sub-RPM
-  mysql-embedded, along with mysql-embedded-devel for devel support files.
-Resolves: #149829
-
-* Sat Aug 23 2008 Tom Lane <tgl@redhat.com> 5.0.67-1
-- Update to mysql version 5.0.67
-- Move mysql_config's man page to base package, again (apparently I synced
-  that change the wrong way while importing specfile changes for ndbcluster)
-
-* Sun Jul 27 2008 Tom Lane <tgl@redhat.com> 5.0.51a-2
-- Enable ndbcluster support
-Resolves: #163758
-- Suppress odd crash messages during package build, caused by trying to
-  build dbug manual (which we don't install anyway) with dbug disabled
-Resolves: #437053
-- Improve mysql.init to pass configured datadir to mysql_install_db,
-  and to force user=mysql for both mysql_install_db and mysqld_safe.
-Related: #450178
-
-* Mon Mar  3 2008 Tom Lane <tgl@redhat.com> 5.0.51a-1
-- Update to mysql version 5.0.51a
-
-* Mon Mar  3 2008 Tom Lane <tgl@redhat.com> 5.0.45-11
-- Fix mysql-stack-guard patch to work correctly on IA64
-- Fix mysql.init to wait correctly when socket is not in default place
-Related: #435494
-
-* Mon Mar 03 2008 Dennis Gilmore <dennis@ausil.us> 5.0.45-10
-- add sparc64 to 64 bit arches for test suite checking
-- add sparc, sparcv9 and sparc64 to multilib handling
-
-* Thu Feb 28 2008 Tom Lane <tgl@redhat.com> 5.0.45-9
-- Fix the stack overflow problem encountered in January.  It seems the real
-issue is that the buildfarm machines were moved to RHEL5, which uses 64K not
-4K pages on PPC, and because RHEL5 takes the guard area out of the requested
-thread stack size we no longer had enough headroom.
-Related: #435337
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.0.45-8
-- Autorebuild for GCC 4.3
-
-* Tue Jan  8 2008 Tom Lane <tgl@redhat.com> 5.0.45-7
-- Unbelievable ... upstream still thinks that it's a good idea to have a
-  regression test that is guaranteed to begin failing come January 1.
-- ... and it seems we need to raise STACK_MIN_SIZE again too.
-
-* Thu Dec 13 2007 Tom Lane <tgl@redhat.com> 5.0.45-6
-- Back-port upstream fixes for CVE-2007-5925, CVE-2007-5969, CVE-2007-6303.
-Related: #422211
-
-* Wed Dec  5 2007 Tom Lane <tgl@redhat.com> 5.0.45-5
-- Rebuild for new openssl
-
-* Sat Aug 25 2007 Tom Lane <tgl@redhat.com> 5.0.45-4
-- Seems we need explicit BuildRequires on gawk and procps now
-- Rebuild to fix Fedora toolchain issues
-
-* Sun Aug 12 2007 Tom Lane <tgl@redhat.com> 5.0.45-3
-- Recent perl changes in rawhide mean we need a more specific BuildRequires
-
-* Thu Aug  2 2007 Tom Lane <tgl@redhat.com> 5.0.45-2
-- Update License tag to match code.
-- Work around recent Fedora change that makes "open" a macro name.
-
-* Sun Jul 22 2007 Tom Lane <tgl@redhat.com> 5.0.45-1
-- Update to MySQL 5.0.45
-Resolves: #246535
-- Move mysql_config's man page to base package
-Resolves: #245770
-- move my_print_defaults to base RPM, for consistency with Stacks packaging
-- mysql user is no longer deleted at RPM uninstall
-Resolves: #241912
-
-* Thu Mar 29 2007 Tom Lane <tgl@redhat.com> 5.0.37-2
-- Use a less hacky method of getting default values in initscript
-Related: #233771, #194596
-- Improve packaging of mysql-libs per suggestions from Remi Collet
-Resolves: #233731
-- Update default /etc/my.cnf ([mysql.server] has been bogus for a long time)
-
-* Mon Mar 12 2007 Tom Lane <tgl@redhat.com> 5.0.37-1
-- Update to MySQL 5.0.37
-Resolves: #231838
-- Put client library into a separate mysql-libs RPM to reduce dependencies
-Resolves: #205630
-
-* Fri Feb  9 2007 Tom Lane <tgl@redhat.com> 5.0.33-1
-- Update to MySQL 5.0.33
-- Install band-aid fix for "view" regression test designed to fail after 2006
-- Don't chmod -R the entire database directory tree on every startup
-Related: #221085
-- Fix unsafe use of install-info
-Resolves: #223713
-- Cope with new automake in F7
-Resolves: #224171
-
-* Thu Nov  9 2006 Tom Lane <tgl@redhat.com> 5.0.27-1
-- Update to MySQL 5.0.27 (see CVE-2006-4031, CVE-2006-4226, CVE-2006-4227)
-Resolves: #202247, #202675, #203427, #203428, #203432, #203434, #208641
-- Fix init script to return status 1 on server start timeout
-Resolves: #203910
-- Move mysqldumpslow from base package to mysql-server
-Resolves: #193559
-- Adjust link options for BDB module
-Resolves: #199368
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 5.0.22-2.1
-- rebuild
-
-* Sat Jun 10 2006 Tom Lane <tgl@redhat.com> 5.0.22-2
-- Work around brew's tendency not to clean up failed builds completely,
-  by adding code in mysql-testing.patch to kill leftover mysql daemons.
-
-* Thu Jun  8 2006 Tom Lane <tgl@redhat.com> 5.0.22-1
-- Update to MySQL 5.0.22 (fixes CVE-2006-2753)
-- Install temporary workaround for gcc bug on s390x (bz #193912)
-
-* Tue May  2 2006 Tom Lane <tgl@redhat.com> 5.0.21-2
-- Fix bogus perl Requires for mysql-test
-
-* Mon May  1 2006 Tom Lane <tgl@redhat.com> 5.0.21-1
-- Update to MySQL 5.0.21
-
-* Mon Mar 27 2006 Tom Lane <tgl@redhat.com> 5.0.18-4
-- Modify multilib header hack to not break non-RH arches, per bug #181335
-- Remove logrotate script, per bug #180639.
-- Add a new mysql-test RPM to carry the regression test files;
-  hack up test scripts as needed to make them run in /usr/share/mysql-test.
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 5.0.18-2.1
-- bump again for double-long bug on ppc(64)
-
-* Thu Feb  9 2006 Tom Lane <tgl@redhat.com> 5.0.18-2
-- err-log option has been renamed to log-error, fix my.cnf and initscript
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 5.0.18-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Jan  5 2006 Tom Lane <tgl@redhat.com> 5.0.18-1
-- Update to MySQL 5.0.18
-
-* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 5.0.16-4
-- fix my_config.h for ppc platforms
-
-* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 5.0.16-3
-- my_config.h needs to guard against 64-bit platforms that also define the
-  32-bit symbol
-
-* Wed Dec 14 2005 Tom Lane <tgl@redhat.com> 5.0.16-2
-- oops, looks like we want uname -i not uname -m
-
-* Mon Dec 12 2005 Tom Lane <tgl@redhat.com> 5.0.16-1
-- Update to MySQL 5.0.16
-- Add EXCEPTIONS-CLIENT license info to the shipped documentation
-- Make my_config.h architecture-independent for multilib installs;
-  put the original my_config.h into my_config_$ARCH.h
-- Add -fwrapv to CFLAGS so that gcc 4.1 doesn't break it
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Mon Nov 14 2005 Tom Lane <tgl@redhat.com> 5.0.15-3
-- Make stop script wait for daemon process to disappear (bz#172426)
-
-* Wed Nov  9 2005 Tom Lane <tgl@redhat.com> 5.0.15-2
-- Rebuild due to openssl library update.
-
-* Thu Nov  3 2005 Tom Lane <tgl@redhat.com> 5.0.15-1
-- Update to MySQL 5.0.15 (scratch build for now)
-
-* Wed Oct  5 2005 Tom Lane <tgl@redhat.com> 4.1.14-1
-- Update to MySQL 4.1.14
-
-* Tue Aug 23 2005 Tom Lane <tgl@redhat.com> 4.1.12-3
-- Use politically correct patch name.
-
-* Tue Jul 12 2005 Tom Lane <tgl@redhat.com> 4.1.12-2
-- Fix buffer overflow newly exposed in isam code; it's the same issue
-  previously found in myisam, and not very exciting, but I'm tired of
-  seeing build warnings.
-
-* Mon Jul 11 2005 Tom Lane <tgl@redhat.com> 4.1.12-1
-- Update to MySQL 4.1.12 (includes a fix for bz#158688, bz#158689)
-- Extend mysql-test-ssl.patch to solve rpl_openssl test failure (bz#155850)
-- Update mysql-lock-ssl.patch to match the upstream committed version
-- Add --with-isam to re-enable the old ISAM table type, per bz#159262
-- Add dependency on openssl-devel per bz#159569
-- Remove manual.txt, as upstream decided not to ship it anymore;
-  it was redundant with the mysql.info file anyway.
-
-* Mon May  9 2005 Tom Lane <tgl@redhat.com> 4.1.11-4
-- Include proper locking for OpenSSL in the server, per bz#155850
-
-* Mon Apr 25 2005 Tom Lane <tgl@redhat.com> 4.1.11-3
-- Enable openssl tests during build, per bz#155850
-- Might as well turn on --disable-dependency-tracking
-
-* Fri Apr  8 2005 Tom Lane <tgl@redhat.com> 4.1.11-2
-- Avoid dependency on <asm/atomic.h>, cause it won't build anymore on ia64.
-  This is probably a cleaner solution for bz#143537, too.
-
-* Thu Apr  7 2005 Tom Lane <tgl@redhat.com> 4.1.11-1
-- Update to MySQL 4.1.11 to fix bz#152911 as well as other issues
-- Move perl-DBI, perl-DBD-MySQL dependencies to server package (bz#154123)
-- Override configure thread library test to suppress HAVE_LINUXTHREADS check
-- Fix BDB failure on s390x (bz#143537)
-- At last we can enable "make test" on all arches
-
-* Fri Mar 11 2005 Tom Lane <tgl@redhat.com> 4.1.10a-1
-- Update to MySQL 4.1.10a to fix security vulnerabilities (bz#150868,
-  for CAN-2005-0711, and bz#150871 for CAN-2005-0709, CAN-2005-0710).
-
-* Sun Mar  6 2005 Tom Lane <tgl@redhat.com> 4.1.10-3
-- Fix package Requires: interdependencies.
-
-* Sat Mar  5 2005 Tom Lane <tgl@redhat.com> 4.1.10-2
-- Need -fno-strict-aliasing in at least one place, probably more.
-- Work around some C spec violations in mysql.
-
-* Fri Feb 18 2005 Tom Lane <tgl@redhat.com> 4.1.10-1
-- Update to MySQL 4.1.10.
-
-* Sat Jan 15 2005 Tom Lane <tgl@redhat.com> 4.1.9-1
-- Update to MySQL 4.1.9.
-
-* Wed Jan 12 2005 Tom Lane <tgl@redhat.com> 4.1.7-10
-- Don't assume /etc/my.cnf will specify pid-file (bz#143724)
-
-* Wed Jan 12 2005 Tim Waugh <twaugh@redhat.com> 4.1.7-9
-- Rebuilt for new readline.
-
-* Tue Dec 21 2004 Tom Lane <tgl@redhat.com> 4.1.7-8
-- Run make test on all archs except s390x (which seems to have a bdb issue)
-
-* Mon Dec 13 2004 Tom Lane <tgl@redhat.com> 4.1.7-7
-- Suppress someone's silly idea that libtool overhead can be skipped
-
-* Sun Dec 12 2004 Tom Lane <tgl@redhat.com> 4.1.7-6
-- Fix init script to not need a valid username for startup check (bz#142328)
-- Fix init script to honor settings appearing in /etc/my.cnf (bz#76051)
-- Enable SSL (bz#142032)
-
-* Thu Dec  2 2004 Tom Lane <tgl@redhat.com> 4.1.7-5
-- Add a restorecon to keep the mysql.log file in the right context (bz#143887)
-
-* Tue Nov 23 2004 Tom Lane <tgl@redhat.com> 4.1.7-4
-- Turn off old_passwords in default /etc/my.cnf file, for better compatibility
-  with mysql 3.x clients (per suggestion from Joe Orton).
-
-* Fri Oct 29 2004 Tom Lane <tgl@redhat.com> 4.1.7-3
-- Handle ldconfig more cleanly (put a file in /etc/ld.so.conf.d/).
-
-* Thu Oct 28 2004 Tom Lane <tgl@redhat.com> 4.1.7-2
-- rebuild in devel branch
-
-* Wed Oct 27 2004 Tom Lane <tgl@redhat.com> 4.1.7-1
-- Update to MySQL 4.1.x.
-
-* Tue Oct 12 2004 Tom Lane <tgl@redhat.com> 3.23.58-13
-- fix security issues CAN-2004-0835, CAN-2004-0836, CAN-2004-0837
-  (bugs #135372, 135375, 135387)
-- fix privilege escalation on GRANT ALL ON `Foo\_Bar` (CAN-2004-0957)
-
-* Wed Oct 06 2004 Tom Lane <tgl@redhat.com> 3.23.58-12
-- fix multilib problem with mysqlbug and mysql_config
-- adjust chkconfig priority per bug #128852
-- remove bogus quoting per bug #129409 (MySQL 4.0 has done likewise)
-- add sleep to mysql.init restart(); may or may not fix bug #133993
-
-* Tue Oct 05 2004 Tom Lane <tgl@redhat.com> 3.23.58-11
-- fix low-priority security issues CAN-2004-0388, CAN-2004-0381, CAN-2004-0457
-  (bugs #119442, 125991, 130347, 130348)
-- fix bug with dropping databases under recent kernels (bug #124352)
-
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> 3.23.58-10
-- rebuilt
-
-* Sat Apr 17 2004 Warren Togami <wtogami@redhat.com> 3.23.58-9
-- remove redundant INSTALL-SOURCE, manual.*
-- compress manual.txt.bz2
-- BR time
-
-* Tue Mar 16 2004 Tom Lane <tgl@redhat.com> 3.23.58-8
-- repair logfile attributes in %%files, per bug #102190
-- repair quoting problem in mysqlhotcopy, per bug #112693
-- repair missing flush in mysql_setpermission, per bug #113960
-- repair broken error message printf, per bug #115165
-- delete mysql user during uninstall, per bug #117017
-- rebuilt
-
-* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Tue Feb 24 2004 Tom Lane <tgl@redhat.com>
-- fix chown syntax in mysql.init
-- rebuild
-
-* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Tue Nov 18 2003 Kim Ho <kho@redhat.com> 3.23.58-5
-- update mysql.init to use anonymous user (UNKNOWN_MYSQL_USER) for
-  pinging mysql server (#108779)
-
-* Mon Oct 27 2003 Kim Ho <kho@redhat.com> 3.23.58-4
-- update mysql.init to wait (max 10 seconds) for mysql server to 
-  start (#58732)
-
-* Mon Oct 27 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-3
-- re-enable Berkeley DB support (#106832)
-- re-enable ia64 testing
-
-* Fri Sep 19 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-2
-- rebuilt
-
-* Mon Sep 15 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-1
-- upgrade to 3.23.58 for security fix
-
-* Tue Aug 26 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.57-2
-- rebuilt
-
-* Wed Jul 02 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.57-1
-- revert to prior version of MySQL due to license incompatibilities 
-  with packages that link against the client.  The MySQL folks are
-  looking into the issue.
-
-* Wed Jun 18 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-4
-- restrict test on ia64 (temporary)
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> 4.0.13-3
-- rebuilt
-
-* Thu May 29 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-2
-- fix filter-requires-mysql.sh with less restrictive for mysql-bench 
-
-* Wed May 28 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-1
-- update for MySQL 4.0
-- back-level shared libraries available in mysqlclient10 package
-
-* Fri May 09 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.56-2
-- add sql-bench package (#90110) 
-
-* Wed Mar 19 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.56-1
-- upgrade to 3.23.56 for security fixes
-- remove patch for double-free (included in 3.23.56) 
-
-* Tue Feb 18 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.54a-11
-- enable thread safe client
-- add patch for double free fix
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
-- rebuilt
-
-* Mon Jan 13 2003 Karsten Hopp <karsten@redhat.de> 3.23.54a-9
-- disable checks on s390x
-
-* Sat Jan  4 2003 Jeff Johnson <jbj@redhat.com> 3.23.54a-8
-- use internal dep generator.
-
-* Wed Jan  1 2003 Bill Nottingham <notting@redhat.com> 3.23.54a-7
-- fix mysql_config on hammer
-
-* Sun Dec 22 2002 Tim Powers <timp@redhat.com> 3.23.54a-6
-- don't use rpms internal dep generator
-
-* Tue Dec 17 2002 Elliot Lee <sopwith@redhat.com> 3.23.54a-5
-- Push it into the build system
-
-* Mon Dec 16 2002 Joe Orton <jorton@redhat.com> 3.23.54a-4
-- upgrade to 3.23.54a for safe_mysqld fix
-
-* Thu Dec 12 2002 Joe Orton <jorton@redhat.com> 3.23.54-3
-- upgrade to 3.23.54 for latest security fixes
-
-* Tue Nov 19 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-5
-- Always include <errno.h> for errno
-- Remove unpackaged files
-
-* Tue Nov 12 2002 Florian La Roche <Florian.LaRoche@redhat.de>
-- do not prereq userdel, not used at all
-
-* Mon Sep  9 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.52-4
-- Use %%{_libdir}
-- Add patch for x86-64
-
-* Wed Sep  4 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-3
-- rebuilt with gcc-3.2-7
-
-* Thu Aug 29 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.52-2
-- Add --enable-local-infile to configure - a new option
-  which doesn't default to the old behaviour (#72885)
-
-* Fri Aug 23 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.52-1
-- 3.23.52. Fixes a minor security problem, various bugfixes.
-
-* Sat Aug 10 2002 Elliot Lee <sopwith@redhat.com> 3.23.51-5
-- rebuilt with gcc-3.2 (we hope)
-
-* Mon Jul 22 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-4
-- rebuild
-
-* Thu Jul 18 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-3
-- Fix #63543 and #63542 
-
-* Thu Jul 11 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-2
-- Turn off bdb on PPC(#68591)
-- Turn off the assembly optimizations, for safety. 
-
-* Wed Jun 26 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-1
-- Work around annoying auto* thinking this is a crosscompile
-- 3.23.51
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Mon Jun 10 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.50-2
-- Add dependency on perl-DBI and perl-DBD-MySQL (#66349)
-
-* Thu May 30 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.50-1
-- 3.23.50
-
-* Thu May 23 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Mon May 13 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-4
-- Rebuild
-- Don't set CXX to gcc, it doesn't work anymore
-- Exclude Alpha
-
-* Mon Apr  8 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-3
-- Add the various .cnf examples as doc files to mysql-server (#60349)
-- Don't include manual.ps, it's just 200 bytes with a URL inside (#60349)
-- Don't include random files in /usr/share/mysql (#60349)
-- langify (#60349)
-
-* Thu Feb 21 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-2
-- Rebuild
-
-* Sun Feb 17 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-1
-- 3.23.49
-
-* Thu Feb 14 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.48-2
-- work around perl dependency bug.
-
-* Mon Feb 11 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.48-1
-- 3.23.48
-
-* Thu Jan 17 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-4
-- Use kill, not mysqladmin, to flush logs and shut down. Thus, 
-  an admin password can be set with no problems.
-- Remove reload from init script
-
-* Wed Jan 16 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-3
-- remove db3-devel from buildrequires, 
-  MySQL has had its own bundled copy since the mid thirties
-
-* Sun Jan  6 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-1
-- 3.23.47
-- Don't build for alpha, toolchain immature.
-
-* Mon Dec  3 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.46-1
-- 3.23.46
-- use -fno-rtti and -fno-exceptions, and set CXX to increase stability. 
-  Recommended by mysql developers.
-
-* Sun Nov 25 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.45-1
-- 3.23.45
-
-* Wed Nov 14 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.44-2
-- centralize definition of datadir in the initscript (#55873)
-
-* Fri Nov  2 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.44-1
-- 3.23.44
-
-* Thu Oct  4 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.43-1
-- 3.23.43
-
-* Mon Sep 10 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.42-1
-- 3.23.42
-- reenable innodb
-
-* Tue Aug 14 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.41-1
-- 3.23.41 bugfix release
-- disable innodb, to avoid the broken updates
-- Use "mysqladmin flush_logs" instead of kill -HUP in logrotate 
-  script (#51711)
-
-* Sat Jul 21 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.40, bugfix release
-- Add zlib-devel to buildrequires:
-
-* Fri Jul 20 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- BuildRequires-tweaking
-
-* Thu Jun 28 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- Reenable test, but don't run them for s390, s390x or ia64
-- Make /etc/my.cnf config(noplace). Same for /etc/logrotate.d/mysqld
-
-* Thu Jun 14 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.29
-- enable innodb
-- enable assembly again
-- disable tests for now...
-
-* Tue May 15 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.38
-- Don't use BDB on Alpha - no fast mutexes
-
-* Tue Apr 24 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.37
-- Add _GNU_SOURCE to the compile flags
-
-* Wed Mar 28 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- Make it obsolete our 6.2 PowerTools packages
-- 3.23.36 bugfix release - fixes some security issues
-  which didn't apply to our standard configuration
-- Make "make test" part of the build process, except on IA64
-  (it fails there)
-
-* Tue Mar 20 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.35 bugfix release
-- Don't delete the mysql user on uninstall
-
-* Tue Mar 13 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.34a bugfix release
-
-* Wed Feb  7 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- added readline-devel to BuildRequires:
-
-* Tue Feb  6 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- small i18n-fixes to initscript (action needs $)
-
-* Tue Jan 30 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- make it shut down and rotate logs without using mysqladmin 
-  (from #24909)
-
-* Mon Jan 29 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- conflict with "MySQL"
-
-* Tue Jan 23 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- improve gettextizing
-
-* Mon Jan 22 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.32
-- fix logrotate script (#24589)
-
-* Wed Jan 17 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- gettextize
-- move the items in Requires(post): to Requires: in preparation
-  for an errata for 7.0 when 3.23.31 is released
-- 3.23.31
-
-* Tue Jan 16 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- add the log file to the rpm database, and make it 0640
-  (#24116)
-- as above in logrotate script
-- changes to the init sequence - put most of the data
-  in /etc/my.cnf instead of hardcoding in the init script
-- use /var/run/mysqld/mysqld.pid instead of 
-  /var/run/mysqld/pid
-- use standard safe_mysqld
-- shut down cleaner
-
-* Mon Jan 08 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.30
-- do an explicit chmod on /var/lib/mysql in post, to avoid 
-  any problems with broken permissons. There is a report
-  of rm not changing this on its own (#22989)
-
-* Mon Jan 01 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- bzipped source
-- changed from 85 to 78 in startup, so it starts before
-  apache (which can use modules requiring mysql)
-
-* Wed Dec 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.29a
-
-* Tue Dec 19 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- add requirement for new libstdc++, build for errata
-
-* Mon Dec 18 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.29
-
-* Mon Nov 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.28 (gamma)
-- remove old patches, as they are now upstreamed
-
-* Thu Nov 14 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- Add a requirement for a new glibc (#20735)
-- build on IA64
-
-* Wed Nov  1 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- disable more assembly
-
-* Wed Nov  1 2000 Jakub Jelinek <jakub@redhat.com>
-- fix mysql on SPARC (#20124)
-
-* Tue Oct 31 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.27
-
-* Wed Oct 25 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- add patch for fixing bogus aliasing in mysql from Jakub,
-  which should fix #18905 and #18620
-
-* Mon Oct 23 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- check for negative niceness values, and negate it
-  if present (#17899)
-- redefine optflags on IA32 FTTB
-
-* Wed Oct 18 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.26, which among other fixes now uses mkstemp()
-  instead of tempnam().
-- revert changes made yesterday, the problem is now
-  isolated
- 
-* Tue Oct 17 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- use the compat C++ compiler FTTB. Argh.
-- add requirement of ncurses4 (see above)
-
-* Sun Oct 01 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.25
-- fix shutdown problem (#17956)
-
-* Tue Sep 26 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- Don't try to include no-longer-existing PUBLIC file
-  as doc (#17532)
-
-* Thu Sep 12 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- rename config file to /etc/my.cnf, which is what
-  mysqld wants... doh. (#17432)
-- include a changed safe_mysqld, so the pid file option
-  works. 
-- make mysql dir world readable to they can access the 
-  mysql socket. (#17432)
-- 3.23.24
-
-* Wed Sep 06 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.23
-
-* Sun Aug 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- Add "|| :" to condrestart to avoid non-zero exit code
-
-* Thu Aug 24 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- it's mysql.com, not mysql.org and use correct path to 
-  source (#16830)
-
-* Wed Aug 16 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- source file from /etc/rc.d, not /etc/rd.d. Doh.
-
-* Sun Aug 13 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- don't run ldconfig -n, it doesn't update ld.so.cache
-  (#16034)
-- include some missing binaries
-- use safe_mysqld to start the server (request from
-  mysql developers)
-
-* Sat Aug 05 2000 Bill Nottingham <notting@redhat.com>
-- condrestart fixes
-
-* Mon Aug 01 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.22. Disable the old patches, they're now in.
-
-* Thu Jul 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- bugfixes in the initscript
-- move the .so link to the devel package
-
-* Wed Jul 19 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- rebuild due to glibc changes
-
-* Tue Jul 18 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- disable compiler patch
-- don't include info directory file
-
-* Mon Jul 17 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- move back to /etc/rc.d/init.d
-
-* Fri Jul 14 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- more cleanups in initscript
-
-* Thu Jul 13 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- add a patch to work around compiler bug 
-  (from monty@mysql.com) 
-
-* Wed Jul 12 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- don't build the SQL daemon statically (glibc problems)
-- fix the logrotate script - only flush log if mysql
-  is running
-- change the reloading procedure 
-- remove icon - glint is obsolete a long time ago
-
-* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
-- automatic rebuild
-
-* Mon Jul 10 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- try the new compiler again
-- build the SQL daemon statically
-- add compile time support for complex charsets
-- enable assembler
-- more cleanups in initscript
-
-* Sun Jul 09 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- use old C++ compiler
-- Exclusivearch x86
-
-* Sat Jul 08 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- move .so files to devel package
-- more cleanups
-- exclude sparc for now
-
-* Wed Jul 05 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.21
-- remove file from /etc/sysconfig
-- Fix initscript a bit - initialization of databases doesn't
-  work yet
-- specify the correct licenses
-- include a /etc/my.conf (empty, FTTB)
-- add conditional restart to spec file
-
-* Tue Jul  2 2000 Jakub Jelinek <jakub@redhat.com>
-- Rebuild with new C++
-
-* Fri Jun 30 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- update to 3.23.20
-- use %%configure, %%makeinstall, %%{_tmppath}, %%{_mandir},
-  %%{_infodir}, /etc/init.d
-- remove the bench package
-- change some of the descriptions a little bit
-- fix the init script
-- some compile fixes
-- specify mysql user
-- use mysql uid 27 (postgresql is 26)
-- don't build on ia64
-
-* Sat Feb 26 2000 Jos Vos <jos@xos.nl>
-- Version 3.22.32 release XOS.1 for LinuX/OS 1.8.0
-- Upgrade from version 3.22.27 to 3.22.32.
-- Do "make install" instead of "make install-strip", because "install -s"
-  now appears to fail on various scripts.  Afterwards, strip manually.
-- Reorganize subpackages, according to common Red Hat packages: the client
-  program and shared library become the base package and the server and
-  some accompanying files are now in a separate server package.  The
-  server package implicitly requires the base package (shared library),
-  but we have added a manual require tag anyway (because of the shared
-  config file, and more).
-- Rename the mysql-benchmark subpackage to mysql-bench.
-
-* Mon Jan 31 2000 Jos Vos <jos@xos.nl>
-- Version 3.22.27 release XOS.2 for LinuX/OS 1.7.1
-- Add post(un)install scripts for updating ld.so.conf (client subpackage).
-
-* Sun Nov 21 1999 Jos Vos <jos@xos.nl>
-- Version 3.22.27 release XOS.1 for LinuX/OS 1.7.0
-- Initial version.
-- Some ideas borrowed from Red Hat Powertools 6.1, although this spec
-  file is a full rewrite from scratch.
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-strmov.patch percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-strmov.patch
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/mysql-strmov.patch	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/mysql-strmov.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-Remove overly optimistic definition of strmov() as stpcpy().
-
-mysql uses this macro with overlapping source and destination strings,
-which is verboten per spec, and fails on some Red Hat platforms.
-Deleting the definition is sufficient to make it fall back to a
-byte-at-a-time copy loop, which should consistently give the
-expected behavior.
-
-Note: the particular case that prompted this patch is reported and fixed
-at http://bugs.mysql.com/bug.php?id=48864.  However, my faith in upstream's
-ability to detect this type of error is low, and I also see little evidence
-of any real performance gain from optimizing these calls.  So I'm keeping
-this patch.
-
-
-diff -Naur mysql-5.1.37.orig/include/m_string.h mysql-5.1.37/include/m_string.h
---- mysql-5.1.37.orig/include/m_string.h	2009-07-13 19:08:50.000000000 -0400
-+++ mysql-5.1.37/include/m_string.h	2009-08-31 21:49:49.000000000 -0400
-@@ -81,13 +81,6 @@
- extern void *(*my_str_malloc)(size_t);
- extern void (*my_str_free)(void *);
- 
--#if defined(HAVE_STPCPY)
--#define strmov(A,B) stpcpy((A),(B))
--#ifndef stpcpy
--extern char *stpcpy(char *, const char *);	/* For AIX with gcc 2.95.3 */
--#endif
--#endif
--
- /* Declared in int2str() */
- extern char NEAR _dig_vec_upper[];
- extern char NEAR _dig_vec_lower[];
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/README.mysql-docs percona-xtrabackup-2.3.7/packaging/rpm-uln/README.mysql-docs
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/README.mysql-docs	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/README.mysql-docs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-The official MySQL documentation is not freely redistributable, so we cannot
-include it in RHEL or Fedora.  You can find it on-line at
-
-http://dev.mysql.com/doc/
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/README-ULN percona-xtrabackup-2.3.7/packaging/rpm-uln/README-ULN
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/README-ULN	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/README-ULN	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-In order to have RPMs of MySQL which are distributed via ULN for Oracle Linux
-to be as closely compatible to such RPMs built and distributed by RedHat,
-this directory contains additional files which originated at RedHat
-and are used only for such RPMs intended for distribution via ULN.
-
-Especially, this directory contains the spec file used to build these RPMs,
-named "mysql.spec".  Please regard the following note:
-
-    You are receiving a copy of the Red Hat spec file.
-    The terms of the Oracle license do NOT apply to the Red Hat spec file;
-    it is licensed under the
-          GNU GENERAL PUBLIC LICENSE Version 2, June 1991
-    separately from the Oracle programs you receive.
-
-
diff -Nru percona-xtrabackup-2.2.3/packaging/rpm-uln/scriptstub.c percona-xtrabackup-2.3.7/packaging/rpm-uln/scriptstub.c
--- percona-xtrabackup-2.2.3/packaging/rpm-uln/scriptstub.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/rpm-uln/scriptstub.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Translate call of myself into call of same-named script in LIBDIR */
-/* The macro LIBDIR must be defined as a double-quoted string */
-
-int main (int argc, char **argv)
-{
-  char *basename;
-  char *fullname;
-  char **newargs;
-  int i;
-
-  basename = strrchr(argv[0], '/');
-  if (basename)
-    basename++;
-  else
-    basename = argv[0];
-  fullname = malloc(strlen(LIBDIR) + strlen(basename) + 2);
-  sprintf(fullname, "%s/%s", LIBDIR, basename);
-  newargs = malloc((argc+1) * sizeof(char *));
-  newargs[0] = fullname;
-  for (i = 1; i < argc; i++)
-    newargs[i] = argv[i];
-  newargs[argc] = NULL;
-
-  execvp(fullname, newargs);
-
-  return 1;
-}
diff -Nru percona-xtrabackup-2.2.3/packaging/solaris/CMakeLists.txt percona-xtrabackup-2.3.7/packaging/solaris/CMakeLists.txt
--- percona-xtrabackup-2.2.3/packaging/solaris/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/solaris/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014 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
@@ -17,6 +17,10 @@
 # Any files in this directory are auxiliary files for Solaris "pkg" packages.
 # They will be configured during "pkg" creation, not during (binary) build.
 
+IF(NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
+  RETURN()
+ENDIF()
+
 # Currently, this expands to "support-files/" in most layouts,
 # but to "/usr/share/mysql/" in a RPM.
 # It is important not to pollute "/usr/bin".
diff -Nru percona-xtrabackup-2.2.3/packaging/WiX/custom_ui.wxs percona-xtrabackup-2.3.7/packaging/WiX/custom_ui.wxs
--- percona-xtrabackup-2.2.3/packaging/WiX/custom_ui.wxs	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/packaging/WiX/custom_ui.wxs	2017-02-27 07:47:02.000000000 +0000
@@ -2,7 +2,7 @@
          xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
 <!--
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2015, 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
@@ -30,7 +30,7 @@
       <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
       <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
       <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
-      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved." />
+      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved." />
       <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
       <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     </Dialog>
diff -Nru percona-xtrabackup-2.2.3/plugin/auth/CMakeLists.txt percona-xtrabackup-2.3.7/plugin/auth/CMakeLists.txt
--- percona-xtrabackup-2.2.3/plugin/auth/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/auth/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015 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
@@ -27,9 +27,14 @@
 
 MYSQL_ADD_PLUGIN(qa_auth_client qa_auth_client.c 
   MODULE_ONLY)
+  
+MYSQL_ADD_PLUGIN(mysql_no_login mysql_no_login.c 
+  MODULE_ONLY)
 
 CHECK_CXX_SOURCE_COMPILES(
-"#define _GNU_SOURCE
+"#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 #include <sys/socket.h>
 int main() {
   struct ucred cred;
diff -Nru percona-xtrabackup-2.2.3/plugin/auth/mysql_no_login.c percona-xtrabackup-2.3.7/plugin/auth/mysql_no_login.c
--- percona-xtrabackup-2.2.3/plugin/auth/mysql_no_login.c	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/auth/mysql_no_login.c	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,64 @@
+/*  Copyright (c) 2014, 2015 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 */
+
+/**
+  @file
+
+  mysql_no_login authentication plugin.
+
+  This plugin exists to support system user accounts, which
+  cannot be accessed externally.  This is useful for privileged
+  stored programs, views and events.  Such objects can be created
+  with DEFINER = [sys account] SQL SECURITY DEFINER.
+*/
+
+#include <my_global.h>
+#include <mysql/plugin_auth.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static int mysql_no_login(
+    MYSQL_PLUGIN_VIO *vio __attribute__((unused)),
+    MYSQL_SERVER_AUTH_INFO *info __attribute__((unused)))
+{
+  return CR_ERROR;
+}
+
+static struct st_mysql_auth mysql_no_login_handler=
+{
+  MYSQL_AUTHENTICATION_INTERFACE_VERSION,
+  0,
+  mysql_no_login
+};
+
+mysql_declare_plugin(mysql_no_login)
+{
+  MYSQL_AUTHENTICATION_PLUGIN,                  /* type constant    */
+  &mysql_no_login_handler,                      /* type descriptor  */
+  "mysql_no_login",                             /* Name             */
+  "Todd Farmer",                                /* Author           */
+  "No login authentication plugin",             /* Description      */
+  PLUGIN_LICENSE_GPL,                           /* License          */
+  NULL,                                         /* Init function    */
+  NULL,                                         /* Deinit function  */
+  0x0100,                                       /* Version (1.0)    */
+  NULL,                                         /* status variables */
+  NULL,                                         /* system variables */
+  NULL,                                         /* config options   */
+  0,                                            /* flags            */
+}
+mysql_declare_plugin_end;
diff -Nru percona-xtrabackup-2.2.3/plugin/innodb_memcached/CMakeLists.txt percona-xtrabackup-2.3.7/plugin/innodb_memcached/CMakeLists.txt
--- percona-xtrabackup-2.2.3/plugin/innodb_memcached/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/innodb_memcached/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -17,4 +17,6 @@
   ADD_SUBDIRECTORY(innodb_memcache)
 ENDIF()
 
-INSTALL_SCRIPT("${CMAKE_SOURCE_DIR}/plugin/innodb_memcached/innodb_memcache/scripts/innodb_memcached_config.sql" DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server)
+INSTALL(FILES "${CMAKE_SOURCE_DIR}/plugin/innodb_memcached/innodb_memcache/scripts/innodb_memcached_config.sql"
+ DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
diff -Nru percona-xtrabackup-2.2.3/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c percona-xtrabackup-2.3.7/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
--- percona-xtrabackup-2.2.3/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c	2017-02-27 07:47:02.000000000 +0000
@@ -4043,6 +4043,12 @@
     token_t *key_token = &tokens[KEY_TOKEN];
     assert(c != NULL);
 
+    /* We temporarily block the mgets commands till wl6650 checked in. */
+    if ((key_token + 1)->length > 0) {
+	out_string(c, "We temporarily don't support multiple get option.");
+	return NULL;
+    }
+
     do {
         while(key_token->length != 0) {
 
diff -Nru percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.c percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.c
--- percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,8 @@
+/*****************************************************************************
+This file was modified by Oracle on 2015/02/05
+Modifications copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+*****************************************************************************/
+
 #include "config.h"
 
 #include <stdlib.h>
@@ -270,7 +275,8 @@
    }
 
    hash_item *it;
-   it = item_alloc(engine, key, nkey, flags, exptime, nbytes, cookie);
+   it = item_alloc(engine, key, nkey, flags, engine->server.core->realtime(exptime),
+                   nbytes, cookie);
 
    if (it != NULL) {
       *item = it;
diff -Nru percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/include/handler_api.h percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/include/handler_api.h
--- percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/include/handler_api.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/include/handler_api.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2015, 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
@@ -32,6 +32,7 @@
 /** Defines for handler_unlock_table()'s mode field */
 #define HDL_READ	0x1
 #define HDL_WRITE	0x2
+#define HDL_FLUSH	0x3
 
 /** Defines for handler_binlog_row()'s mode field */
 typedef enum hdl_op_type {
diff -Nru percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h
--- percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2015, 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
@@ -74,6 +74,7 @@
 					is processing a request */
 	bool		is_stale;	/*!< connection closed, this is
 					stale */
+	bool		is_flushing;	/*!< if flush is running. */
 	void*		conn_cookie;	/*!< connection cookie */
 	uint64_t	n_total_reads;	/*!< number of reads */
 	uint64_t	n_reads_since_commit;
@@ -147,6 +148,8 @@
 						connection specific data */
 	pthread_mutex_t		cas_mutex;	/*!< mutex synchronizes
 						CAS */
+	pthread_mutex_t		flush_mutex;	/*!< mutex synchronizes
+						flush and DMLs. */
 	pthread_t		bk_thd_for_commit;/*!< background thread for
 						committing long running
 						transactions */
diff -Nru percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/src/handler_api.cc percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/src/handler_api.cc
--- percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/src/handler_api.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/src/handler_api.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2015, 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
@@ -151,6 +151,17 @@
 				? MDL_SHARED_WRITE
 				: MDL_SHARED_READ, MDL_TRANSACTION);
 
+	/* For flush, we need to request exclusive mdl lock. */
+	if (lock_type == HDL_FLUSH) {
+		tables.mdl_request.init(MDL_key::TABLE, db_name, table_name,
+					MDL_EXCLUSIVE, MDL_TRANSACTION);
+	} else {
+		tables.mdl_request.init(MDL_key::TABLE, db_name, table_name,
+					(lock_mode > TL_READ)
+					? MDL_SHARED_WRITE
+					: MDL_SHARED_READ, MDL_TRANSACTION);
+	}
+
 	if (!open_table(thd, &tables, &table_ctx)) {
 		TABLE*	table = tables.table;
 		table->use_all_columns();
diff -Nru percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/src/innodb_api.c percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
--- percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/src/innodb_api.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/src/innodb_api.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2015, 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
@@ -170,6 +170,40 @@
 			return(err);
 		}
 
+		/* If MDL is enabled, we need to create mysql handler. */
+		if (engine) {
+			/* Create a "Fake" THD if binlog is enabled */
+			/* For flush_all which request IB_LOCK_TABLE_X
+			lock, we need to add MDL lock. It's because we need
+			to block DMLs from sql layer. */
+			if (conn_data && (engine->enable_binlog
+					  || engine->enable_mdl
+					  || lock_mode == IB_LOCK_TABLE_X)) {
+				if (!conn_data->thd) {
+					conn_data->thd = handler_create_thd(
+						engine->enable_binlog);
+
+					if (!conn_data->thd) {
+						innodb_cb_cursor_close(*crsr);
+						*crsr = NULL;
+						return(DB_ERROR);
+					}
+				}
+
+				if (!conn_data->mysql_tbl) {
+					int lock_type =
+						(lock_mode == IB_LOCK_TABLE_X?
+							HDL_FLUSH : HDL_WRITE);
+					conn_data->mysql_tbl =
+						handler_open_table(
+							conn_data->thd,
+							dbname,
+							name,
+							lock_type);
+				}
+			}
+		}
+
 		err = innodb_cb_cursor_lock(engine, *crsr, lock_mode);
 
 		if (err != DB_SUCCESS) {
@@ -208,30 +242,8 @@
 				err = innodb_cb_cursor_lock(engine, *idx_crsr,
 						      lock_mode);
 			}
-
-			/* Create a "Fake" THD if binlog is enabled */
-			if (conn_data && (engine->enable_binlog
-					  || engine->enable_mdl)) {
-				if (!conn_data->thd) {
-					conn_data->thd = handler_create_thd(
-						engine->enable_binlog);
-
-					if (!conn_data->thd) {
-						innodb_cb_cursor_close(*crsr);
-						*crsr = NULL;
-						return(DB_ERROR);
-					}
-				}
-
-				if (!conn_data->mysql_tbl) {
-					conn_data->mysql_tbl =
-						handler_open_table(
-							conn_data->thd,
-							dbname,
-							name, HDL_WRITE);
-				}
-			}
 		}
+
 	} else {
 		ib_cb_cursor_new_trx(*crsr, ib_trx);
 
@@ -1208,17 +1220,11 @@
 							value_len,
 							table);
 		} else {
-			err = ib_cb_col_set_value(
+			err = innodb_api_setup_field_value(
 				tpl,
 				meta_info->extra_col_info[col_to_set].field_id,
-				value, value_len, need_cpy);
-
-			if (table) {
-				handler_rec_setup_str(
-					table,
-					col_info[col_to_set].field_id,
-					value, value_len);
-			}
+				&meta_info->extra_col_info[col_to_set],
+				(char*)value, value_len, table, need_cpy);
 		}
 	} else {
 		err = innodb_api_setup_field_value(
@@ -1494,9 +1500,19 @@
 			column_used = 0;
 		}
 
+		/* For int column, we don't support append command. */
+		if (append && !result->extra_col_value[column_used].is_str) {
+			return DB_UNSUPPORTED;
+		}
+
 		before_len = result->extra_col_value[column_used].value_len;
 		before_val = result->extra_col_value[column_used].value_str;
 	} else {
+		/* For int column, we don't support append command. */
+		if (append && !result->col_value[MCI_COL_VALUE].is_str) {
+			return DB_UNSUPPORTED;
+		}
+
 		before_len = result->col_value[MCI_COL_VALUE].value_len;
 		before_val = result->col_value[MCI_COL_VALUE].value_str;
 		column_used = UPDATE_ALL_VAL_COL;
@@ -1599,6 +1615,7 @@
 	/* If the return message is not success or record not found, just
 	exit */
 	if (err != DB_SUCCESS && err != DB_RECORD_NOT_FOUND) {
+		*out_result = 0;
 		goto func_exit;
 	}
 
@@ -1615,7 +1632,7 @@
 		} else {
 			/* cursor_data->mysql_tbl can't be created.
 			So safe to return here */
-			return(DB_RECORD_NOT_FOUND);
+			return(ENGINE_KEY_ENOENT);
 		}
 	}
 
@@ -1640,10 +1657,24 @@
 		}
 
 		before_len = result.extra_col_value[column_used].value_len;
-		before_val = result.extra_col_value[column_used].value_str;
+		if (result.extra_col_value[column_used].is_str) {
+			before_val = result.extra_col_value[column_used].value_str;
+			if (before_val) {
+				value = strtoull(before_val, &end_ptr, 10);
+			}
+		} else {
+			value = result.extra_col_value[column_used].value_int;
+		}
 	} else {
 		before_len = result.col_value[MCI_COL_VALUE].value_len;
-		before_val = result.col_value[MCI_COL_VALUE].value_str;
+		if (result.col_value[MCI_COL_VALUE].is_str) {
+			before_val = result.col_value[MCI_COL_VALUE].value_str;
+			if (before_val) {
+				value = strtoull(before_val, &end_ptr, 10);
+			}
+		} else {
+			value = result.col_value[MCI_COL_VALUE].value_int;
+		}
 		column_used = UPDATE_ALL_VAL_COL;
 	}
 
@@ -1654,10 +1685,6 @@
 
 	errno = 0;
 
-	if (before_val) {
-		value = strtoull(before_val, &end_ptr, 10);
-	}
-
 	if (errno == ERANGE) {
 		ret = ENGINE_EINVAL;
 		goto func_exit;
diff -Nru percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
--- percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2015, 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
@@ -424,6 +424,7 @@
 	UT_LIST_INIT(innodb_eng->conn_data);
 	pthread_mutex_init(&innodb_eng->conn_mutex, NULL);
 	pthread_mutex_init(&innodb_eng->cas_mutex, NULL);
+	pthread_mutex_init(&innodb_eng->flush_mutex, NULL);
 
 	/* Fetch InnoDB specific settings */
 	innodb_eng->meta_info = innodb_config(
@@ -684,6 +685,7 @@
 
 	pthread_mutex_destroy(&innodb_eng->conn_mutex);
 	pthread_mutex_destroy(&innodb_eng->cas_mutex);
+	pthread_mutex_destroy(&innodb_eng->flush_mutex);
 
 	if (innodb_eng->default_engine) {
 		def_eng->engine.destroy(innodb_eng->default_engine, force);
@@ -771,6 +773,8 @@
 		conn_data->cmd_buf = malloc(1024);
 		conn_data->cmd_buf_len = 1024;
 
+		conn_data->is_flushing = false;
+
 		pthread_mutex_init(&conn_data->curr_conn_mutex, NULL);
 		UNLOCK_CONN_IF_NOT_LOCKED(has_lock, engine);
 	}
@@ -785,16 +789,31 @@
 	}
 
 	LOCK_CURRENT_CONN_IF_NOT_LOCKED(has_lock, conn_data);
+
+	/* If flush is running, then wait for it complete. */
+	if (conn_data->is_flushing) {
+		/* Request flush_mutex for waiting for flush
+		completed. */
+		pthread_mutex_lock(&engine->flush_mutex);
+		pthread_mutex_unlock(&engine->flush_mutex);
+	}
+
 	conn_data->in_use = true;
 
 	crsr = conn_data->crsr;
 	read_crsr = conn_data->read_crsr;
 
 	if (lock_mode == IB_LOCK_TABLE_X) {
-		assert(!conn_data->crsr_trx);
-
-		conn_data->crsr_trx = ib_cb_trx_begin(
-			engine->trx_level, true, false);
+		if(!conn_data->crsr_trx) {
+			conn_data->crsr_trx = ib_cb_trx_begin(
+				engine->trx_level, true, false);
+		} else {
+			/* Write cursor transaction exists.
+			   Reuse this transaction.*/
+			assert(ib_cb_trx_start(conn_data->crsr_trx,
+					       engine->trx_level,
+					       true, false, NULL));
+		}
 
 		err = innodb_api_begin(
 			engine,
@@ -1493,6 +1512,31 @@
 	return(strlen(buf));
 }
 
+
+/*******************************************************************//**
+Free value assocaited with key */
+static
+void
+innodb_free_item(
+/*=====================*/
+	void* item)	/*!< in: Item to be freed */
+{
+
+	mci_item_t*	result = (mci_item_t*) item;
+	if (result->extra_col_value) {
+		for (int i = 0; i < result->n_extra_col; i++) {
+			if(result->extra_col_value[i].allocated)
+				free(result->extra_col_value[i].value_str);
+			}
+			free(result->extra_col_value);
+			result->extra_col_value=NULL;
+		}
+	if (result->col_value[MCI_COL_VALUE].allocated) {
+		free(result->col_value[MCI_COL_VALUE].value_str);
+		result->col_value[MCI_COL_VALUE].allocated =
+			false;
+	}
+}
 /*******************************************************************//**
 Support memcached "GET" command, fetch the value according to key
 @return ENGINE_SUCCESS if successfully, otherwise error code */
@@ -1514,7 +1558,7 @@
 	ib_err_t		err = DB_SUCCESS;
 	mci_item_t*		result = NULL;
 	ENGINE_ERROR_CODE	err_ret = ENGINE_SUCCESS;
-	innodb_conn_data_t*	conn_data;
+	innodb_conn_data_t*	conn_data = NULL;
 	meta_cfg_info_t*	meta_info = innodb_eng->meta_info;
 	int			option_length;
 	const char*		option_delimiter;
@@ -1625,31 +1669,17 @@
 	we will check whether the item is expired */
 	if (result->col_value[MCI_COL_EXP].is_valid
 	    && result->col_value[MCI_COL_EXP].value_int) {
-		uint64_t		time;
+		uint64_t time;
 		time = mci_get_time();
-
 		if (time > result->col_value[MCI_COL_EXP].value_int) {
-			/* Free allocated memory. */
-			if (result->extra_col_value) {
-				for (int i = 0; i < result->n_extra_col; i++) {
-					free(result->extra_col_value[i].value_str);
-				}
-
-				free(result->extra_col_value);
-			}
-			if (result->col_value[MCI_COL_VALUE].allocated) {
-				free(result->col_value[MCI_COL_VALUE].value_str);
-				result->col_value[MCI_COL_VALUE].allocated =
-					false;
-			}
-
+			innodb_free_item(result);
 			err_ret = ENGINE_KEY_ENOENT;
 			goto func_exit;
 		}
 	}
 
 	if (result->extra_col_value) {
-		int     	i;
+		int		i;
 		char*		c_value;
 		char*		value_end;
 		unsigned int	total_len = 0;
@@ -1779,6 +1809,13 @@
 	}
 
 err_exit:
+
+	/* If error return, memcached will not call InnoDB Memcached's
+	callback function "innodb_release" to reset the result_in_use
+	value. So we reset it here */
+	if (err_ret != ENGINE_SUCCESS && conn_data) {
+		conn_data->result_in_use = false;
+	}
 	return(err_ret);
 }
 
@@ -1945,14 +1982,14 @@
 		return(ENGINE_NOT_STORED);
 	}
 
-	innodb_api_arithmetic(innodb_eng, conn_data, key, nkey, delta,
-			      increment, cas, exptime, create, initial,
-			      result);
+	err_ret = innodb_api_arithmetic(innodb_eng, conn_data, key, nkey,
+					delta, increment, cas, exptime,
+					create, initial, result);
 
 	innodb_api_cursor_reset(innodb_eng, conn_data, CONN_OP_WRITE,
 				true);
 
-	return(ENGINE_SUCCESS);
+	return(err_ret);
 }
 
 /*******************************************************************//**
@@ -1961,14 +1998,16 @@
 @return number of connection cleaned */
 static
 bool
-innodb_flush_clean_conn(
-/*====================*/
+innodb_flush_sync_conn(
+/*===================*/
 	innodb_engine_t*	engine,		/*!< in/out: InnoDB memcached
 						engine */
-	const void*		cookie)		/*!< in: connection cookie */
+	const void*		cookie,		/*!< in: connection cookie */
+	bool			flush_flag)	/*!< in: flush is running or not */
 {
 	innodb_conn_data_t*	conn_data = NULL;
 	innodb_conn_data_t*	curr_conn_data;
+	bool			ret = true;
 
 	curr_conn_data = engine->server.cookie->get_engine_specific(cookie);
 	assert(curr_conn_data);
@@ -1978,11 +2017,26 @@
 
 	while (conn_data) {
 		if (conn_data != curr_conn_data && (!conn_data->is_stale)) {
-			if (curr_conn_data->thd) {
+			if (conn_data->thd) {
 				handler_thd_attach(conn_data->thd, NULL);
 			}
-			innodb_reset_conn(conn_data, false, true,
-					  engine->enable_binlog);
+			LOCK_CURRENT_CONN_IF_NOT_LOCKED(false, conn_data);
+			if (flush_flag == false) {
+				conn_data->is_flushing = flush_flag;
+				UNLOCK_CURRENT_CONN_IF_NOT_LOCKED(false, conn_data);
+				conn_data = UT_LIST_GET_NEXT(conn_list, conn_data);
+				continue;
+			}
+			if (!conn_data->in_use) {
+				/* Set flushing flag to conn_data for preventing
+				it is get by other request.  */
+				conn_data->is_flushing = flush_flag;
+				UNLOCK_CURRENT_CONN_IF_NOT_LOCKED(false, conn_data);
+			} else {
+				ret = false;
+				UNLOCK_CURRENT_CONN_IF_NOT_LOCKED(false, conn_data);
+				break;
+			}
 		}
 		conn_data = UT_LIST_GET_NEXT(conn_list, conn_data);
 	}
@@ -1990,7 +2044,8 @@
 	if (curr_conn_data->thd) {
 		handler_thd_attach(curr_conn_data->thd, NULL);
 	}
-	return(true);
+
+	return(ret);
 }
 
 /*******************************************************************//**
@@ -2031,6 +2086,9 @@
 	new opeartion */
         pthread_mutex_lock(&innodb_eng->conn_mutex);
 
+	/* Lock the flush_mutex for blocking other DMLs. */
+	pthread_mutex_lock(&innodb_eng->flush_mutex);
+
 	conn_data = innodb_eng->server.cookie->get_engine_specific(cookie);
 
 	if (conn_data) {
@@ -2043,21 +2101,34 @@
 				     IB_LOCK_TABLE_X, true, NULL);
 
 	if (!conn_data) {
+		pthread_mutex_unlock(&innodb_eng->flush_mutex);
 		pthread_mutex_unlock(&innodb_eng->conn_mutex);
 		return(ENGINE_SUCCESS);
 	}
 
-	innodb_flush_clean_conn(innodb_eng, cookie);
-
+	/* Commit any previous work on this connection */
 	innodb_api_cursor_reset(innodb_eng, conn_data, CONN_OP_FLUSH, true);
-	meta_info = conn_data->conn_meta;
+
+	if (!innodb_flush_sync_conn(innodb_eng, cookie, true)) {
+		pthread_mutex_unlock(&innodb_eng->flush_mutex);
+		pthread_mutex_unlock(&innodb_eng->conn_mutex);
+		innodb_flush_sync_conn(innodb_eng, cookie, false);
+		return(ENGINE_TMPFAIL);
+	}
 
 	ib_err = innodb_api_flush(innodb_eng, conn_data,
 				  meta_info->col_info[CONTAINER_DB].col_name,
 			          meta_info->col_info[CONTAINER_TABLE].col_name);
 
+	/* Commit work and release the MDL table. */
+	innodb_api_cursor_reset(innodb_eng, conn_data, CONN_OP_FLUSH, true);
+	innodb_conn_clean_data(conn_data, false, false);
+
+        pthread_mutex_unlock(&innodb_eng->flush_mutex);
         pthread_mutex_unlock(&innodb_eng->conn_mutex);
 
+	innodb_flush_sync_conn(innodb_eng, cookie, false);
+
 	return((ib_err == DB_SUCCESS) ? ENGINE_SUCCESS : ENGINE_TMPFAIL);
 }
 
diff -Nru percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h
--- percona-xtrabackup-2.2.3/plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2015, 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
@@ -127,6 +127,13 @@
 	const void*	cookie,		/*!< in: connection cookie */
 	void*		conn);		/*!< in: item to free */
 /*******************************************************************//**
+Free value assocaited with key */
+static
+void
+innodb_free_item(
+/*=====================*/
+        void* item);     /*!< in: Item to be freed */
+/*******************************************************************//**
 Support memcached "GET" command, fetch the value according to key
 @return ENGINE_SUCCESS if successfully, otherwise error code */
 static
diff -Nru percona-xtrabackup-2.2.3/plugin/semisync/semisync_master.cc percona-xtrabackup-2.3.7/plugin/semisync/semisync_master.cc
--- percona-xtrabackup-2.2.3/plugin/semisync/semisync_master.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/plugin/semisync/semisync_master.cc	2017-02-27 07:47:02.000000000 +0000
@@ -489,13 +489,26 @@
   /* Only switch off if semi-sync is enabled and is on */
   if (getMasterEnabled() && is_on())
   {
-    /* If user has chosen not to wait if no semi-sync slave available
-       and the last semi-sync slave exits, turn off semi-sync on master
-       immediately.
+    /* If user has chosen not to wait or if the server is shutting down if no
+       semi-sync slave available and the last semi-sync slave exits, turn off
+       semi-sync on master immediately.
      */
-    if (!rpl_semi_sync_master_wait_no_slave &&
-        rpl_semi_sync_master_clients == 0)
+    if (rpl_semi_sync_master_clients == 0 &&
+        (!rpl_semi_sync_master_wait_no_slave || abort_loop))
+    {
+      if (abort_loop)
+      {
+        if (commit_file_name_inited_ && reply_file_name_inited_)
+        {
+          int cmp = ActiveTranx::compare(reply_file_name_, reply_file_pos_ ,
+                                         commit_file_name_, commit_file_pos_);
+          if (cmp < 0)
+            sql_print_warning("SEMISYNC: Forced shutdown. Some updates might "
+                              "not be replicated.");
+        }
+      }
       switch_off();
+    }
   }
   unlock();
 }
@@ -724,6 +737,13 @@
        * when replication has progressed far enough, we will release
        * these waiting threads.
        */
+      if (abort_loop && rpl_semi_sync_master_clients == 0 && is_on())
+      {
+        sql_print_warning("SEMISYNC: Forced shutdown. Some updates might "
+                          "not be replicated.");
+        switch_off();
+        break;
+      }
       rpl_semi_sync_master_wait_sessions++;
       
       if (trace_level_ & kTraceDetail)
diff -Nru percona-xtrabackup-2.2.3/README percona-xtrabackup-2.3.7/README
--- percona-xtrabackup-2.2.3/README	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/README	2017-02-27 07:47:02.000000000 +0000
@@ -5,7 +5,7 @@
 is released under the version 2 of the GNU General Public License. 
 MySQL is brought to you by Oracle.
 
-Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the COPYING file.
 
diff -Nru percona-xtrabackup-2.2.3/scripts/CMakeLists.txt percona-xtrabackup-2.3.7/scripts/CMakeLists.txt
--- percona-xtrabackup-2.2.3/scripts/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -89,9 +89,9 @@
 
 IF(CMAKE_GENERATOR MATCHES "Makefiles")
   # Strip maintainer mode options if necessary
-  STRING(REPLACE "${MY_MAINTAINER_C_WARNINGS}" "" CFLAGS
+  STRING(REPLACE "${MY_C_WARNING_FLAGS}" "" CFLAGS
     "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-  STRING(REPLACE "${MY_MAINTAINER_CXX_WARNINGS}" "" CXXFLAGS
+  STRING(REPLACE "${MY_CXX_WARNING_FLAGS}" "" CXXFLAGS
     "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
   FOREACH(ARCH ${CMAKE_OSX_ARCHITECTURES})
     SET(CFLAGS   "${CFLAGS} -arch ${ARCH}")
@@ -99,21 +99,12 @@
   ENDFOREACH()
 ELSE()
   # Strip maintainer mode options if necessary
-  STRING(REPLACE "${MY_MAINTAINER_C_WARNINGS}" "" CFLAGS
+  STRING(REPLACE "${MY_C_WARNING_FLAGS}" "" CFLAGS
     "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-  STRING(REPLACE "${MY_MAINTAINER_CXX_WARNINGS}" "" CXXFLAGS
+  STRING(REPLACE "${MY_CXX_WARNING_FLAGS}" "" CXXFLAGS
     "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 ENDIF()
 
-FOREACH(WFLAG
-    "-Wno-null-conversion"
-    "-Wno-unused-parameter"
-    "-Wno-unused-private-field"
-    )
-  STRING(REPLACE "${WFLAG}" "" CFLAGS "${CFLAGS}")
-  STRING(REPLACE "${WFLAG}" "" CXXFLAGS "${CXXFLAGS}")
-ENDFOREACH()
-
 IF(UNIX)
   # FIND_PROC and CHECK_PID are used by mysqld_safe
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -234,6 +225,7 @@
 SET(scriptdir ${prefix}/${INSTALL_BINDIR})
 SET(datadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
 SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
+SET(libsubdir  ${INSTALL_LIBDIR})
 SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR})
 SET(pkglibdir ${prefix}/${INSTALL_LIBDIR})
 SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR})
diff -Nru percona-xtrabackup-2.2.3/scripts/mysqlbug.sh percona-xtrabackup-2.3.7/scripts/mysqlbug.sh
--- percona-xtrabackup-2.2.3/scripts/mysqlbug.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysqlbug.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2000-2002, 2004 MySQL AB
+# Copyright (c) 2000, 2014 Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -18,6 +18,7 @@
 # Create a bug report and mail it to the mysql mailing list
 # Based on glibc bug reporting script.
 
+echo "Warning: $0 is deprecated and will be removed in a future version." 1>&2
 echo "Finding system information for a MySQL bug report"
 
 VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@"
diff -Nru percona-xtrabackup-2.2.3/scripts/mysql_config.sh percona-xtrabackup-2.3.7/scripts/mysql_config.sh
--- percona-xtrabackup-2.2.3/scripts/mysql_config.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysql_config.sh	2017-02-27 07:47:02.000000000 +0000
@@ -76,7 +76,8 @@
 
 me=`get_full_path $0`
 
-basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
+# Script might have been renamed but assume mysql_<something>config<something>
+basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'`
 
 ldata='@localstatedir@'
 execdir='@libexecdir@'
@@ -85,11 +86,11 @@
 # If installed, search for the compiled in directory first (might be "lib64")
 pkglibdir='@pkglibdir@'
 pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
-fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+fix_path pkglibdir $pkglibdir_rel @libsubdir@/mysql @libsubdir@
 
 plugindir='@pkgplugindir@'
 plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
-fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
+fix_path plugindir $plugindir_rel @libsubdir@/mysql/plugin @libsubdir@/plugin
 
 pkgincludedir='@pkgincludedir@'
 if [ -f "$basedir/include/mysql/mysql.h" ]; then
@@ -112,7 +113,7 @@
 # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
 libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
-libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
+libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
 embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
 embedded_libs="$embedded_libs @QUOTED_CMAKE_CXX_LINK_FLAGS@"
 
diff -Nru percona-xtrabackup-2.2.3/scripts/mysqld_safe.sh percona-xtrabackup-2.3.7/scripts/mysqld_safe.sh
--- percona-xtrabackup-2.2.3/scripts/mysqld_safe.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysqld_safe.sh	2017-02-27 07:47:02.000000000 +0000
@@ -504,7 +504,7 @@
   plugin_dir="${PLUGIN_DIR}"
 else
   # Try to find plugin dir relative to basedir
-  for dir in lib/mysql/plugin lib/plugin
+  for dir in lib64/mysql/plugin lib64/plugin lib/mysql/plugin lib/plugin
   do
     if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then
       plugin_dir="${MY_BASEDIR_VERSION}/${dir}"
diff -Nru percona-xtrabackup-2.2.3/scripts/mysqlhotcopy.sh percona-xtrabackup-2.3.7/scripts/mysqlhotcopy.sh
--- percona-xtrabackup-2.2.3/scripts/mysqlhotcopy.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysqlhotcopy.sh	2017-02-27 07:47:02.000000000 +0000
@@ -158,6 +158,8 @@
 my @db_desc = ();
 my $tgt_name = undef;
 
+print STDERR "Warning: $0 is deprecated and will be removed in a future version.\n";
+
 usage("") if ($opt{help});
 
 if ( $opt{regexp} || $opt{suffix} || @ARGV > 2 ) {
diff -Nru percona-xtrabackup-2.2.3/scripts/mysql_install_db.pl.in percona-xtrabackup-2.3.7/scripts/mysql_install_db.pl.in
--- percona-xtrabackup-2.2.3/scripts/mysql_install_db.pl.in	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysql_install_db.pl.in	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2014, 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
@@ -94,11 +94,14 @@
                        Read this file after the global files are read.
   --defaults-file=name Only read default options from the given file name.
   --force              Causes mysql_install_db to run even if DNS does not
-                       work.  In that case, grant table entries that normally
-                       use hostnames will use IP addresses.
+                       work.  In that case, grant table entries that
+                       normally use hostnames will use IP addresses.
   --help               Display this help and exit.                     
   --ldata=path         The path to the MySQL data directory. Same as --datadir.
   --no-defaults        Don't read default options from any option file.
+  --keep-my-cnf        Don't try to create my.cnf based on template. 
+                       Useful for systems with working, updated my.cnf.
+                       Deprecated, will be removed in future version.
 EOF1
   if ( $^O !~ m/^(MSWin32|cygwin)$/ ) {
     print <<EOF2;
@@ -173,6 +176,7 @@
 
              "skip-name-resolve",
              "verbose",
+             "keep-my-cnf",
              "rpm",
              "help",
              "random-passwords",
@@ -429,11 +433,16 @@
 # ----------------------------------------------------------------------
 
 my $print_defaults;
+my $keep_my_cnf = 0;
 
 if ( $opt->{srcdir} and $opt->{basedir} )
 {
   error($opt,"Specify either --basedir or --srcdir, not both");
 }
+if ( $opt->{'keep-my-cnf'} )
+{
+  $keep_my_cnf = 1;
+}
 if ( $opt->{srcdir} )
 {
   $opt->{builddir} = $opt->{srcdir} unless $opt->{builddir};
@@ -455,7 +464,7 @@
 my $copy_cfg_file;
 
 # ----------------------------------------------------------------------
-# This will be the default config file
+# This will be the default config file (unless creation is unwanted)
 # ----------------------------------------------------------------------
 
 my $cnfext = ( $^O =~ m/^(MSWin32|cygwin)$/ ) ? "ini" : "cnf";
@@ -464,6 +473,11 @@
 
 my $cfg_template= find_in_basedir($opt,"file","my-default.$cnfext",
 				  ".", "share","share/mysql","support-files");
+# Distros might move files
+if ((! -r $cfg_template) && (-r "@pkgdatadir@/my-default.cnf")) {
+  $cfg_template = "@pkgdatadir@/my-default.cnf";
+}
+
 -e $cfg_template or cannot_find_file("my-default.$cnfext");
 
 $copy_cfg_file= $config_file;
@@ -473,41 +487,40 @@
   $copy_cfg_file =~ s/my.$cnfext/my-new.$cnfext/;
   # Too early to print warning here, the user may not notice
 }
-open (TEMPL, $cfg_template) or error($opt, "Could not open config template $cfg_template");
-if (open (CFG, "> $copy_cfg_file"))
-{
-  while (<TEMPL>)
-  {
-    # Remove lines beginning with # *** which are template comments
-    print CFG $_ unless /^# \*\*\*/;
+
+if ( ! $keep_my_cnf ) {
+  open (TEMPL, $cfg_template) or error($opt, "Could not open config template $cfg_template");
+  if (open (CFG, "> $copy_cfg_file")) {
+    while (<TEMPL>) {
+      # Remove lines beginning with # *** which are template comments
+      print CFG $_ unless /^# \*\*\*/;
+    }
+    close CFG;
+  } else {
+    warning($opt,"Could not write to config file $copy_cfg_file: $!");
+    $failed_write_cfg= 1;
   }
-  close CFG;
+  close TEMPL;
 }
-else
-{
-  warning($opt,"Could not write to config file $copy_cfg_file: $!");
-  $failed_write_cfg= 1;
-}
-close TEMPL;
 
 # ----------------------------------------------------------------------
 # Now we can get arguments from the groups [mysqld] and [mysql_install_db]
 # in the my.cfg file, then re-run to merge with command line arguments.
 # ----------------------------------------------------------------------
 
-my $print_def_file;
+my $cmd;
+my @default_options;
 if ( $opt->{'defaults-file'} )
 {
-  $print_def_file= $opt->{'defaults-file'};
+  $cmd = quote_options($print_defaults,
+                       "--defaults-file=$opt->{'defaults-file'}",
+                       "mysqld", "mysql_install_db");
 }
 else
 {
-  $print_def_file= $config_file;
+  $cmd = quote_options($print_defaults, "mysqld", "mysql_install_db");
 }
 
-my @default_options;
-my $cmd = quote_options($print_defaults,"--defaults-file=$print_def_file",
-                        "mysqld","mysql_install_db");
 open(PIPE, "$cmd |") or error($opt,"can't run $cmd: $!");
 while ( <PIPE> )
 {
@@ -878,7 +891,13 @@
            "",
            "Support MySQL by buying support/licenses at http://shop.mysql.com");
 
-    if ($copy_cfg_file eq $config_file and !$failed_write_cfg)
+    if ($keep_my_cnf)
+    {
+      report($opt,
+	     "Note: new default config file not created.",
+	     "Please make sure your config file is current");
+    }
+    elsif ($copy_cfg_file eq $config_file and !$failed_write_cfg)
     {
       report($opt,
 	     "New default config file was created as $config_file and",
diff -Nru percona-xtrabackup-2.2.3/scripts/mysql_install_db.sh percona-xtrabackup-2.3.7/scripts/mysql_install_db.sh
--- percona-xtrabackup-2.2.3/scripts/mysql_install_db.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysql_install_db.sh	2017-02-27 07:47:02.000000000 +0000
@@ -49,8 +49,8 @@
                        Read this file after the global files are read.
   --defaults-file=name Only read default options from the given file name.
   --force              Causes mysql_install_db to run even if DNS does not
-                       work.  In that case, grant table entries that normally
-                       use hostnames will use IP addresses.
+                       work.  In that case, grant table entries that
+                       normally use hostnames will use IP addresses.
   --help               Display this help and exit.                     
   --ldata=path         The path to the MySQL data directory. Same as --datadir.
   --no-defaults        Don't read default options from any option file.
diff -Nru percona-xtrabackup-2.2.3/scripts/mysql_setpermission.sh percona-xtrabackup-2.3.7/scripts/mysql_setpermission.sh
--- percona-xtrabackup-2.2.3/scripts/mysql_setpermission.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysql_setpermission.sh	2017-02-27 07:47:02.000000000 +0000
@@ -266,13 +266,13 @@
   foreach $host (@hosts) {
     # user privileges: SELECT
     if (($todo == 2) || ($todo == 3)) {
-      $sth = $dbh->do("GRANT SELECT ON $db.* TO $user@\"$host\" IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
+      $sth = $dbh->do("GRANT SELECT ON $db.* TO \'$user\'@\'$host\' IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
     } elsif ($todo == 4) {
       # user privileges: SELECT,INSERT,UPDATE,DELETE
-      $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE ON $db.* TO $user@\"$host\" IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
+      $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE ON $db.* TO \'$user\'@\'$host\' IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
     } elsif ($todo == 5) {
       # user privileges: SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES
-      $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES ON $db.* TO $user@\"$host\" IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
+      $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES ON $db.* TO \'$user\'@\'$host\' IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
     } elsif ($todo == 6) {
        # all privileges
        $sth = $dbh->do("GRANT ALL ON $db.* TO \'$user\'\@\'$host\' IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
diff -Nru percona-xtrabackup-2.2.3/scripts/mysql_system_tables_data.sql percona-xtrabackup-2.3.7/scripts/mysql_system_tables_data.sql
--- percona-xtrabackup-2.2.3/scripts/mysql_system_tables_data.sql	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysql_system_tables_data.sql	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2007, 2014, 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
@@ -39,10 +39,10 @@
 -- Fill "user" table with default users allowing root access
 -- from local machine if "user" table didn't exist before
 CREATE TEMPORARY TABLE tmp_user LIKE user;
-INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N');
-REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N' FROM dual WHERE @current_hostname != 'localhost';
-REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N');
-REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N');
+INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'mysql_native_password','','N');
+REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'mysql_native_password','','N' FROM dual WHERE @current_hostname != 'localhost';
+REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'mysql_native_password','','N');
+REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'mysql_native_password','','N');
 INSERT INTO tmp_user (host,user) VALUES ('localhost','');
 INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
 INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
diff -Nru percona-xtrabackup-2.2.3/scripts/mysql_system_tables_fix.sql percona-xtrabackup-2.3.7/scripts/mysql_system_tables_fix.sql
--- percona-xtrabackup-2.2.3/scripts/mysql_system_tables_fix.sql	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysql_system_tables_fix.sql	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2003, 2014, 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
@@ -606,8 +606,10 @@
 
 drop procedure mysql.die;
 
-ALTER TABLE user ADD plugin char(64) DEFAULT '',  ADD authentication_string TEXT;
-ALTER TABLE user MODIFY plugin char(64) DEFAULT '';
+ALTER TABLE user ADD plugin char(64) DEFAULT 'mysql_native_password',  ADD authentication_string TEXT;
+ALTER TABLE user MODIFY plugin char(64) DEFAULT 'mysql_native_password';
+UPDATE user SET plugin=IF((length(password) = 41) OR (length(password) = 0), 'mysql_native_password', '') WHERE plugin = '';
+UPDATE user SET plugin=IF(length(password) = 16, 'mysql_old_password', '') WHERE plugin = '';
 ALTER TABLE user MODIFY authentication_string TEXT;
 
 -- establish if the field is already there.
@@ -628,6 +630,23 @@
 INSERT INTO proxies_priv SELECT * FROM tmp_proxies_priv WHERE @had_proxies_priv_table=0;
 DROP TABLE tmp_proxies_priv;
 
+-- Checking for any duplicate hostname and username combination are exists.
+-- If exits we will throw error.
+DROP PROCEDURE IF EXISTS mysql.count_duplicate_host_names;
+DELIMITER //
+CREATE PROCEDURE mysql.count_duplicate_host_names()
+BEGIN
+  SET @duplicate_hosts=(SELECT count(*) FROM mysql.user GROUP BY user, lower(host) HAVING count(*) > 1 LIMIT 1);
+  IF @duplicate_hosts > 1 THEN
+    SIGNAL SQLSTATE '45000'  SET MESSAGE_TEXT = 'Multiple accounts exist for @user_name, @host_name that differ only in Host lettercase; remove all except one of them';
+  END IF;
+END //
+DELIMITER ;
+CALL mysql.count_duplicate_host_names();
+-- Get warnings (if any)
+SHOW WARNINGS;
+DROP PROCEDURE mysql.count_duplicate_host_names;
+
 # Convering the host name to lower case for existing users
 UPDATE user SET host=LOWER( host ) WHERE LOWER( host ) <> host;
 
diff -Nru percona-xtrabackup-2.2.3/scripts/mysql_system_tables.sql percona-xtrabackup-2.3.7/scripts/mysql_system_tables.sql
--- percona-xtrabackup-2.2.3/scripts/mysql_system_tables.sql	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysql_system_tables.sql	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2007, 2014, 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
@@ -25,7 +25,7 @@
 -- Remember for later if db table already existed
 set @had_db_table= @@warning_count != 0;
 
-CREATE TABLE IF NOT EXISTS user (   Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Reload_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Shutdown_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_db_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Super_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tablespace_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL, ssl_cipher BLOB NOT NULL, x509_issuer BLOB NOT NULL, x509_subject BLOB NOT NULL, max_questions int(11) unsigned DEFAULT 0  NOT NULL, max_updates int(11) unsigned DEFAULT 0  NOT NULL, max_connections int(11) unsigned DEFAULT 0  NOT NULL, max_user_connections int(11) unsigned DEFAULT 0  NOT NULL, plugin char(64) DEFAULT '', authentication_string TEXT, password_expired ENUM('N', 'Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
+CREATE TABLE IF NOT EXISTS user (   Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Reload_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Shutdown_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_db_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Super_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tablespace_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL, ssl_cipher BLOB NOT NULL, x509_issuer BLOB NOT NULL, x509_subject BLOB NOT NULL, max_questions int(11) unsigned DEFAULT 0  NOT NULL, max_updates int(11) unsigned DEFAULT 0  NOT NULL, max_connections int(11) unsigned DEFAULT 0  NOT NULL, max_user_connections int(11) unsigned DEFAULT 0  NOT NULL, plugin char(64) DEFAULT 'mysql_native_password', authentication_string TEXT, password_expired ENUM('N', 'Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
 
 -- Remember for later if user table already existed
 set @had_user_table= @@warning_count != 0;
diff -Nru percona-xtrabackup-2.2.3/scripts/mysql_zap.sh percona-xtrabackup-2.3.7/scripts/mysql_zap.sh
--- percona-xtrabackup-2.2.3/scripts/mysql_zap.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/scripts/mysql_zap.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright (c) 2000-2002, 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2000, 2014 Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 
 # Usage: mysql_zap [-signal] [-f] [-t] pattern
 
+print STDERR "Warning: $0 is deprecated and will be removed in a future version.\n";
+
 # Configuration parameters.
 
 $sig = "";			# Default to try all signals
diff -Nru percona-xtrabackup-2.2.3/sql/binlog.cc percona-xtrabackup-2.3.7/sql/binlog.cc
--- percona-xtrabackup-2.2.3/sql/binlog.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/binlog.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2015, 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
@@ -155,9 +155,12 @@
   Helper class to perform a thread excursion.
 
   This class is used to temporarily switch to another session (THD
-  structure). It will set up the PSI structures and other "globals"
-  correctly (e.g., thread-specific variables) so that the POSIX thread
-  looks exactly like the session attached to.
+  structure). It will set up thread specific "globals" correctly
+  so that the POSIX thread looks exactly like the session attached to.
+  However, PSI_thread info is not touched as it is required to show
+  the actual physial view in PFS instrumentation i.e., it should
+  depict as the real thread doing the work instead of thread it switched
+  to.
 
   On destruction, the original session (which is supplied to the
   constructor) will be re-attached automatically. For example, with
@@ -180,17 +183,10 @@
 public:
   Thread_excursion(THD *thd)
     : m_original_thd(thd)
-#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
-    , m_saved_psi(PSI_server ? PSI_server->get_thread() : NULL)
-#endif
   {
   }
 
   ~Thread_excursion() {
-#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
-    if (PSI_server)
-      PSI_server->set_thread(m_saved_psi);
-#endif
 #ifndef EMBEDDED_LIBRARY
     if (unlikely(setup_thread_globals(m_original_thd)))
       DBUG_ASSERT(0);                           // Out of memory?!
@@ -253,18 +249,10 @@
    */
   int attach_to(THD *thd)
   {
-#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
-    if (PSI_server)
-      PSI_server->set_thread(thd_get_psi(thd));
-#endif
 #ifndef EMBEDDED_LIBRARY
     if (DBUG_EVALUATE_IF("simulate_session_attach_error", 1, 0)
         || unlikely(setup_thread_globals(thd)))
     {
-#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
-      if (PSI_server)
-        PSI_server->set_thread(m_saved_psi);
-#endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
       /*
         Indirectly uses pthread_setspecific, which can only return
         ENOMEM or EINVAL. Since store_globals are using correct keys,
@@ -296,7 +284,6 @@
   }
 
   THD *m_original_thd;
-  PSI_thread *m_saved_psi;
 };
 
 
@@ -770,7 +757,7 @@
   {
     my_off_t stmt_bytes= 0;
     my_off_t trx_bytes= 0;
-    DBUG_ASSERT(stmt_cache.has_xid() == 0 && trx_cache.has_xid() <= 1);
+    DBUG_ASSERT(stmt_cache.has_xid() == 0);
     if (int error= stmt_cache.flush(thd, &stmt_bytes, wrote_xid))
       return error;
     if (int error= trx_cache.flush(thd, &trx_bytes, wrote_xid))
@@ -1862,7 +1849,10 @@
 {
   size_t log_name_len = strlen(log_name) + 1;
   int thread_count=0;
-
+#ifndef DBUG_OFF
+  if (current_thd)
+    DEBUG_SYNC(current_thd,"purge_logs_after_lock_index_before_thread_count");
+#endif
   mysql_mutex_lock(&LOCK_thread_count);
 
   Thread_iterator it= global_thread_list_begin();
@@ -2585,8 +2575,13 @@
   this object.
   @param prev_gtids If not NULL, then the GTIDs from the
   Previous_gtids_log_events are stored in this object.
+  @param first_gtid If not NULL, then the first GTID information from the
+  file will be stored in this object.
   @param last_gtid If not NULL, then the last GTID information from the
   file will be stored in this object.
+  @param sid_map The sid_map object to use in the rpl_sidno generation
+  of the Gtid_log_event. If lock is needed in the sid_map, the caller
+  must hold it.
   @param verify_checksum Set to true to verify event checksums.
 
   @retval GOT_GTIDS The file was successfully read and it contains
@@ -2605,7 +2600,9 @@
 { GOT_GTIDS, GOT_PREVIOUS_GTIDS, NO_GTIDS, ERROR, TRUNCATED };
 static enum_read_gtids_from_binlog_status
 read_gtids_from_binlog(const char *filename, Gtid_set *all_gtids,
-                       Gtid_set *prev_gtids, Gtid *last_gtid,
+                       Gtid_set *prev_gtids, Gtid *first_gtid,
+                       Gtid *last_gtid,
+                       Sid_map* sid_map,
                        bool verify_checksum)
 {
   DBUG_ENTER("read_gtids_from_binlog");
@@ -2622,6 +2619,20 @@
   File file;
   IO_CACHE log;
 
+  /*
+    We assert here that both all_gtids and prev_gtids, if specified,
+    uses the same sid_map as the one passed as a parameter. This is just
+    to ensure that, if the sid_map needed some lock and was locked by
+    the caller, the lock applies to all the GTID sets this function is
+    dealing with.
+  */
+#ifndef DBUG_OFF
+  if (all_gtids)
+    DBUG_ASSERT(all_gtids->get_sid_map() == sid_map);
+  if (prev_gtids)
+    DBUG_ASSERT(prev_gtids->get_sid_map() == sid_map);
+#endif
+
   const char *errmsg= NULL;
   if ((file= open_binlog_file(&log, filename, &errmsg)) < 0)
   {
@@ -2642,6 +2653,7 @@
   Log_event *ev= NULL;
   enum_read_gtids_from_binlog_status ret= NO_GTIDS;
   bool done= false;
+  bool seen_first_gtid= false;
   while (!done &&
          (ev= Log_event::read_log_event(&log, 0, fd_ev_p, verify_checksum)) !=
          NULL)
@@ -2710,21 +2722,24 @@
           ret= GOT_GTIDS;
       }
       /*
-        When all_gtids==NULL, we just check if the binary log contains
-        at least one Gtid_log_event, so that we can distinguish the
-        return values GOT_GTID and GOT_PREVIOUS_GTIDS. We don't need
-        to read anything else from the binary log.
-        But if last_gtid is requested (i.e., NOT NULL), we should continue to
-        read all gtids. Otherwise, we are done.
+        When all_gtids, first_gtid and last_gtid are all NULL,
+        we just check if the binary log contains at least one Gtid_log_event,
+        so that we can distinguish the return values GOT_GTID and
+        GOT_PREVIOUS_GTIDS. We don't need to read anything else from the
+        binary log.
+        If all_gtids or last_gtid is requested (i.e., NOT NULL), we should
+        continue to read all gtids.
+        If just first_gtid was requested, we will be done after storing this
+        Gtid_log_event info on it.
       */
-      if (all_gtids == NULL && last_gtid == NULL)
+      if (all_gtids == NULL && first_gtid == NULL && last_gtid == NULL)
       {
         ret= GOT_GTIDS, done= true;
       }
       else
       {
         Gtid_log_event *gtid_ev= (Gtid_log_event *)ev;
-        rpl_sidno sidno= gtid_ev->get_sidno(false/*false=don't need lock*/);
+        rpl_sidno sidno= gtid_ev->get_sidno(sid_map);
         if (sidno < 0)
           ret= ERROR, done= true;
         else
@@ -2739,6 +2754,17 @@
             DBUG_PRINT("info", ("Got Gtid from file '%s': Gtid(%d, %lld).",
                                 filename, sidno, gtid_ev->get_gno()));
           }
+
+          /* If the first GTID was requested, stores it */
+          if (first_gtid && !seen_first_gtid)
+          {
+            first_gtid->set(sidno, gtid_ev->get_gno());
+            seen_first_gtid= true;
+            /* If the first_gtid was the only thing requested, we are done */
+            if (all_gtids == NULL && last_gtid == NULL)
+              ret= GOT_GTIDS, done= true;
+          }
+
           if (last_gtid)
             last_gtid->set(sidno, gtid_ev->get_gno());
         }
@@ -2782,6 +2808,7 @@
 
 bool MYSQL_BIN_LOG::find_first_log_not_in_gtid_set(char *binlog_file_name,
                                                    const Gtid_set *gtid_set,
+                                                   Gtid *first_gtid,
                                                    const char **errmsg)
 {
   DBUG_ENTER("MYSQL_BIN_LOG::gtid_read_start_binlog");
@@ -2827,6 +2854,8 @@
     subset of the given gtid set. Since every binary log begins with
     a Previous_gtids_log_event, that contains all GTIDs in all
     previous binary logs.
+    We also ask for the first GTID in the binary log to know if we
+    should send the FD event with the "created" field cleared or not.
   */
   DBUG_PRINT("info", ("Iterating backwards through binary logs, and reading "
                       "only the Previous_gtids_log_event, to find the first "
@@ -2838,7 +2867,9 @@
     const char *filename= rit->c_str();
     DBUG_PRINT("info", ("Read Previous_gtids_log_event from filename='%s'",
                         filename));
-    switch (read_gtids_from_binlog(filename, NULL, &previous_gtid_set, NULL,
+    switch (read_gtids_from_binlog(filename, NULL, &previous_gtid_set,
+                                   first_gtid, NULL/* last_gtid */,
+                                   previous_gtid_set.get_sid_map(),
                                    opt_master_verify_checksum))
     {
     case ERROR:
@@ -2889,8 +2920,8 @@
 }
 
 bool MYSQL_BIN_LOG::init_gtid_sets(Gtid_set *all_gtids, Gtid_set *lost_gtids,
-                                   Gtid *last_gtid,
-                                   bool verify_checksum, bool need_lock)
+                                   Gtid *last_gtid, bool verify_checksum,
+                                   bool need_lock, bool is_server_starting)
 {
   DBUG_ENTER("MYSQL_BIN_LOG::init_gtid_sets");
   DBUG_PRINT("info", ("lost_gtids=%p; so we are recovering a %s log",
@@ -2926,6 +2957,13 @@
   list<string>::reverse_iterator rit;
   bool reached_first_file= false;
 
+  /* Initialize the sid_map to be used in read_gtids_from_binlog */
+  Sid_map *sid_map= NULL;
+  if (all_gtids)
+    sid_map= all_gtids->get_sid_map();
+  else if (lost_gtids)
+    sid_map= lost_gtids->get_sid_map();
+
   for (error= find_log_pos(&linfo, NULL, false/*need_lock_index=false*/); !error;
        error= find_next_log(&linfo, false/*need_lock_index=false*/))
   {
@@ -2937,6 +2975,16 @@
     DBUG_PRINT("error", ("Error reading binlog index"));
     goto end;
   }
+  /*
+    On server starting, one new empty binlog file is created and
+    its file name is put into index file before initializing
+    GLOBAL.GTID_EXECUTED AND GLOBAL.GTID_PURGED, it is not the
+    last binlog file before the server restarts, so we remove
+    its file name from filename_list.
+  */
+  if (is_server_starting && !is_relay_log && !filename_list.empty())
+    filename_list.pop_back();
+
   error= 0;
 
   if (all_gtids != NULL)
@@ -2959,19 +3007,40 @@
                           filename, got_gtids, reached_first_file));
       switch (read_gtids_from_binlog(filename, got_gtids ? NULL : all_gtids,
                                      reached_first_file ? lost_gtids : NULL,
-                                     last_gtid,
-                                     verify_checksum))
+                                     NULL/* first_gtid */, last_gtid,
+                                     sid_map, verify_checksum))
       {
-      case ERROR:
-        error= 1;
-        goto end;
-      case GOT_GTIDS:
-      case GOT_PREVIOUS_GTIDS:
-        got_gtids= true;
-        /*FALLTHROUGH*/
-      case NO_GTIDS:
-      case TRUNCATED:
-        break;
+        case ERROR:
+        {
+          error= 1;
+          goto end;
+        }
+        case GOT_GTIDS:
+        case GOT_PREVIOUS_GTIDS:
+        {
+          got_gtids= true;
+          break;
+        }
+        case NO_GTIDS:
+        {
+          /*
+            If the binlog_gtid_simple_recovery is enabled, and the
+            last binary log does not contain any GTID event, do not
+            read any more binary logs, GLOBAL.GTID_EXECUTED and
+            GLOBAL.GTID_PURGED should be empty in the case. Otherwise,
+            initialize GTID_EXECUTED as usual.
+          */
+          if (binlog_gtid_simple_recovery && !is_relay_log)
+          {
+            DBUG_ASSERT(all_gtids->is_empty() && lost_gtids->is_empty());
+            goto end;
+          }
+          /*FALLTHROUGH*/
+        }
+        case TRUNCATED:
+        {
+          break;
+        }
       }
     }
   }
@@ -2982,18 +3051,39 @@
     {
       const char *filename= it->c_str();
       DBUG_PRINT("info", ("filename='%s'", filename));
-      switch (read_gtids_from_binlog(filename, NULL, lost_gtids, NULL,
-                                     verify_checksum))
+      switch (read_gtids_from_binlog(filename, NULL, lost_gtids,
+                                     NULL/* first_gtid */, NULL/* last_gtid */,
+                                     sid_map, verify_checksum))
       {
-      case ERROR:
-        error= 1;
-        /*FALLTHROUGH*/
-      case GOT_GTIDS:
-        goto end;
-      case GOT_PREVIOUS_GTIDS:
-      case NO_GTIDS:
-      case TRUNCATED:
-        break;
+        case ERROR:
+        {
+          error= 1;
+          /*FALLTHROUGH*/
+        }
+        case GOT_GTIDS:
+        {
+          goto end;
+        }
+        case NO_GTIDS:
+        {
+          /*
+            If the binlog_gtid_simple_recovery is enabled, and the
+            first binary log does not contain any GTID event, do not
+            read any more binary logs, GLOBAL.GTID_PURGED should be
+            empty in the case.
+          */
+          if (binlog_gtid_simple_recovery && !is_relay_log)
+          {
+            DBUG_ASSERT(lost_gtids->is_empty());
+            goto end;
+          }
+          /*FALLTHROUGH*/
+        }
+        case GOT_PREVIOUS_GTIDS:
+        case TRUNCATED:
+        {
+          break;
+        }
       }
     }
   }
@@ -3159,6 +3249,8 @@
     else
       global_sid_lock->assert_some_wrlock();
     Previous_gtids_log_event prev_gtids_ev(previous_gtid_set);
+    if (is_relay_log)
+      prev_gtids_ev.set_relay_log_event();
     if (need_sid_lock)
       global_sid_lock->unlock();
     prev_gtids_ev.checksum_alg= s.checksum_alg;
@@ -3214,10 +3306,20 @@
       all the content of index file is copyed into the crash safe index
       file. Then move the crash safe index file to index file.
     */
+    DBUG_EXECUTE_IF("simulate_disk_full_on_open_binlog",
+                    {DBUG_SET("+d,simulate_no_free_space_error");});
     if (DBUG_EVALUATE_IF("fault_injection_updating_index", 1, 0) ||
         add_log_to_index((uchar*) log_file_name, strlen(log_file_name),
                          need_lock_index))
+    {
+      DBUG_EXECUTE_IF("simulate_disk_full_on_open_binlog",
+                      {
+                        DBUG_SET("-d,simulate_file_write_error");
+                        DBUG_SET("-d,simulate_no_free_space_error");
+                        DBUG_SET("-d,simulate_disk_full_on_open_binlog");
+                      });
       goto err;
+    }
 
 #ifdef HAVE_REPLICATION
     DBUG_EXECUTE_IF("crash_create_after_update_index", DBUG_SUICIDE(););
@@ -3238,10 +3340,6 @@
     purge_index_entry(NULL, NULL, need_lock_index);
   close_purge_index_file();
 #endif
-  sql_print_error("Could not use %s for logging (error %d). \
-Turning logging off for the whole duration of the MySQL server process. \
-To turn it on again: fix the cause, \
-shutdown the MySQL server and restart it.", name, errno);
   if (file >= 0)
     mysql_file_close(file, MYF(0));
   end_io_cache(&log_file);
@@ -3249,6 +3347,26 @@
   my_free(name);
   name= NULL;
   log_state= LOG_CLOSED;
+  if (binlog_error_action == ABORT_SERVER)
+  {
+    THD *thd= current_thd;
+    /*
+      On fatal error when code enters here we should forcefully clear the
+      previous errors so that a new critical error message can be pushed
+      to the client side.
+     */
+    thd->clear_error();
+    my_error(ER_BINLOG_LOGGING_IMPOSSIBLE, MYF(0), "Either disk is full or "
+             "file system is read only while opening the binlog. Aborting the "
+             "server");
+    thd->protocol->end_statement();
+    _exit(EXIT_FAILURE);
+  }
+  else
+    sql_print_error("Could not use %s for logging (error %d). "
+                    "Turning logging off for the whole duration of the MySQL "
+                    "server process. To turn it on again: fix the cause, "
+                    "shutdown the MySQL server and restart it.", name, errno);
   DBUG_RETURN(1);
 }
 
@@ -3646,6 +3764,13 @@
   ha_reset_logs(thd);
 
   /*
+    We need to get both locks to be sure that no one is trying to
+    write to the index log file.
+  */
+  mysql_mutex_lock(&LOCK_log);
+  mysql_mutex_lock(&LOCK_index);
+
+  /*
     The following mutex is needed to ensure that no threads call
     'delete thd' as we would then risk missing a 'rollback' from this
     thread. If the transaction involved MyISAM tables, it should go
@@ -3653,13 +3778,6 @@
   */
   mysql_mutex_lock(&LOCK_thread_count);
 
-  /*
-    We need to get both locks to be sure that no one is trying to
-    write to the index log file.
-  */
-  mysql_mutex_lock(&LOCK_log);
-  mysql_mutex_lock(&LOCK_index);
-
   global_sid_lock->wrlock();
 
   /* Save variables so that we can reopen the log */
@@ -4836,7 +4954,7 @@
     /* reopen the binary log file. */
     file_to_open= new_name_ptr;
     error= open_binlog(old_name, new_name_ptr, io_cache_type,
-                       max_size, true,
+                       max_size, true/*null_created_arg=true*/,
                        false/*need_lock_index=false*/,
                        true/*need_sid_lock=true*/,
                        extra_description_event);
@@ -4870,12 +4988,28 @@
        - ...
     */
     close(LOG_CLOSE_INDEX);
-    sql_print_error("Could not open %s for logging (error %d). "
-                    "Turning logging off for the whole duration "
-                    "of the MySQL server process. To turn it on "
-                    "again: fix the cause, shutdown the MySQL "
-                    "server and restart it.", 
-                    new_name_ptr, errno);
+    if (binlog_error_action == ABORT_SERVER)
+    {
+      THD *thd= current_thd;
+      /*
+        On fatal error when code enters here we should forcefully clear the
+        previous errors so that a new critical error message can be pushed
+        to the client side.
+       */
+      thd->clear_error();
+      my_error(ER_BINLOG_LOGGING_IMPOSSIBLE, MYF(0), "Either disk is full or "
+               "file system is read only while rotating the binlog. Aborting "
+               "the server");
+      thd->protocol->end_statement();
+      _exit(EXIT_FAILURE);
+    }
+    else
+      sql_print_error("Could not open %s for logging (error %d). "
+                      "Turning logging off for the whole duration "
+                      "of the MySQL server process. To turn it on "
+                      "again: fix the cause, shutdown the MySQL "
+                      "server and restart it.",
+                      new_name_ptr, errno);
   }
 
   mysql_mutex_unlock(&LOCK_index);
@@ -5339,12 +5473,19 @@
   @retval
     nonzero - error in rotating routine.
 */
-int MYSQL_BIN_LOG::rotate_and_purge(bool force_rotate)
+int MYSQL_BIN_LOG::rotate_and_purge(THD* thd, bool force_rotate)
 {
   int error= 0;
   DBUG_ENTER("MYSQL_BIN_LOG::rotate_and_purge");
   bool check_purge= false;
 
+  /*
+    Wait for handlerton to insert any pending information into the binlog.
+    For e.g. ha_ndbcluster which updates the binlog asynchronously this is
+    needed so that the user see its own commands in the binlog.
+  */
+  ha_binlog_wait(thd);
+
   DBUG_ASSERT(!is_relay_log);
   mysql_mutex_lock(&LOCK_log);
   error= rotate(force_rotate, &check_purge);
diff -Nru percona-xtrabackup-2.2.3/sql/binlog.h percona-xtrabackup-2.3.7/sql/binlog.h
--- percona-xtrabackup-2.2.3/sql/binlog.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/binlog.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 #ifndef BINLOG_H_INCLUDED
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, 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
@@ -465,12 +465,15 @@
 
     @param[out] binlog_file_name, the file name of oldest binary log found
     @param[in]  gtid_set, the given gtid set
+    @param[out] first_gtid, the first GTID information from the binary log
+                file returned at binlog_file_name
     @param[out] errmsg, the error message outputted, which is left untouched
                 if the function returns false
     @return false on success, true on error.
   */
   bool find_first_log_not_in_gtid_set(char *binlog_file_name,
                                       const Gtid_set *gtid_set,
+                                      Gtid *first_gtid,
                                       const char **errmsg);
 
   /**
@@ -488,11 +491,12 @@
     @param need_lock If true, LOCK_log, LOCK_index, and
     global_sid_lock->wrlock are acquired; otherwise they are asserted
     to be taken already.
+    @param is_server_starting True if the server is starting.
     @return false on success, true on error.
   */
   bool init_gtid_sets(Gtid_set *gtid_set, Gtid_set *lost_groups,
                       Gtid *last_gtid, bool verify_checksum,
-                      bool need_lock);
+                      bool need_lock, bool is_server_starting= false);
 
   void set_previous_gtid_set(Gtid_set *previous_gtid_set_param)
   {
@@ -615,7 +619,7 @@
   int remove_logs_from_index(LOG_INFO* linfo, bool need_update_threads);
   int rotate(bool force_rotate, bool* check_purge);
   void purge();
-  int rotate_and_purge(bool force_rotate);
+  int rotate_and_purge(THD* thd, bool force_rotate);
   /**
      Flush binlog cache and synchronize to disk.
 
diff -Nru percona-xtrabackup-2.2.3/sql/CMakeLists.txt percona-xtrabackup-2.3.7/sql/CMakeLists.txt
--- percona-xtrabackup-2.2.3/sql/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2015, 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
@@ -28,8 +28,24 @@
   ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc
   ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h 
 )
+SET(GEN_DIGEST_SOURCES
+  ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h 
+)
+
+SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES}
+                            ${GEN_DIGEST_SOURCES}
+                            PROPERTIES GENERATED 1)
+
+# Gen_lex_token
+# Make sure sql_yacc.h is generated before compiling gen_lex_token
+ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc)
+ADD_DEPENDENCIES(gen_lex_token GenServerSource)
 
-SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} PROPERTIES GENERATED 1)
+ADD_CUSTOM_COMMAND(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h
+  COMMAND gen_lex_token > lex_token.h
+  DEPENDS gen_lex_token
+)
 
 ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER) 
 IF(SSL_DEFINES)
@@ -116,6 +132,7 @@
   sql_db.cc
   sql_delete.cc
   sql_derived.cc
+  sql_digest.cc
   sql_do.cc 
   sql_error.cc
   sql_executor.cc
@@ -173,6 +190,7 @@
 
 SET(SQL_SOURCE
   ${GEN_SOURCES}
+  ${GEN_DIGEST_SOURCES}
   ${MYSYS_LIBWRAP_SOURCE}
   ${SQL_SHARED_SOURCES}
   ../libmysql/errmsg.c
@@ -204,6 +222,7 @@
 
 ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
 ADD_DEPENDENCIES(sql GenServerSource)
+ADD_DEPENDENCIES(sql GenDigestServerSource)
 DTRACE_INSTRUMENT(sql)
 TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS} 
   mysys mysys_ssl dbug strings vio regex   
@@ -342,6 +361,11 @@
         DEPENDS ${GEN_SOURCES}
 )
 
+ADD_CUSTOM_TARGET( 
+        GenDigestServerSource
+        DEPENDS ${GEN_DIGEST_SOURCES}
+)
+
 #Need this only for embedded
 SET_TARGET_PROPERTIES(GenServerSource PROPERTIES EXCLUDE_FROM_ALL TRUE)
 
@@ -349,14 +373,15 @@
 ENDIF()
 
 FOREACH(tool glibtoolize libtoolize aclocal autoconf autoheader automake gtar 
- tar bzr)
+ tar git)
  STRING(TOUPPER ${tool}  TOOL)
  FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
  MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
 ENDFOREACH()
 
 CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/cmake/make_dist.cmake.in ${CMAKE_BINARY_DIR}/make_dist.cmake @ONLY)
+  ${CMAKE_SOURCE_DIR}/cmake/make_dist.cmake.in
+  ${CMAKE_BINARY_DIR}/make_dist.cmake @ONLY)
 
 ADD_CUSTOM_TARGET(dist 
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/make_dist.cmake
@@ -366,8 +391,7 @@
 
 ADD_CUSTOM_TARGET(distclean
   COMMAND ${CMAKE_COMMAND} -E echo  WARNING: distclean target is not functional
-  COMMAND ${CMAKE_COMMAND} -E echo  Use 'bzr clean-tree' with --unknown and/or
-    --ignored parameter instead
+  COMMAND ${CMAKE_COMMAND} -E echo  Use 'git clean -fdx' instead
   VERBATIM
   )
 
diff -Nru percona-xtrabackup-2.2.3/sql/debug_sync.cc percona-xtrabackup-2.3.7/sql/debug_sync.cc
--- percona-xtrabackup-2.2.3/sql/debug_sync.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/debug_sync.cc	2017-02-27 07:47:02.000000000 +0000
@@ -32,19 +32,22 @@
 
   Nomenclature:
 
-    - signal:             A value of a global variable that persists
-                          until overwritten by a new signal. The global
-                          variable can also be seen as a "signal post"
-                          or "flag mast". Then the signal is what is
-                          attached to the "signal post" or "flag mast".
-
-    - emit a signal:      Assign the value (the signal) to the global
-                          variable ("set a flag") and broadcast a
-                          global condition to wake those waiting for
-                          a signal.
+    - signal:             An event identified by a name that a signal
+                          thread uses to notify the wait thread that
+                          waits on this event. When the signal  thread
+                          notifies the wait thread, the signal name
+                          is copied into global list and the wait thread
+                          is signalled to wake up and proceed with further
+                          processing.
+
+    - emit a signal:      Signal thread wakes up wait thread or multiple
+                          wait threads that shall wait for the signal identified
+                          by a signal name. This signal thread copies the signal
+                          name into a global list and broadcasts the event which
+                          wakes the threads that wait for this event.
 
-    - wait for a signal:  Loop over waiting for the global condition until
-                          the global value matches the wait-for signal.
+    - wait for a signal:  Wait on a event indentified by the signal name until
+                          the signal thread signals the event.
 
   By default, all sync points are inactive. They do nothing (except to
   burn a couple of CPU cycles for checking if they are active).
@@ -80,12 +83,19 @@
   conn2 waits immediately at the special sync point 'now' for another
   thread to emit the 'opened' signal.
 
-  A signal remains in effect until it is overwritten. If conn1 signals
-  'opened' before conn2 reaches 'now', conn2 will still find the 'opened'
-  signal. It does not wait in this case.
+  If conn1 signals 'opened' before conn2 reaches 'now', conn2 will find
+  the 'opened' signal. The wait thread shall not wait in this case.
 
   When conn2 reaches 'after_abort_locks', it signals 'flushed', which lets
-  conn1 awake.
+  conn1 awake and clears the 'flushed' signal from the global list. In case
+  the 'flushed' signal is to be notified to multiple wait threads, an attribute
+  NO_CLEAR_EVENT need to be specified with the WAIT_FOR in addition to signal
+  the name as:
+      SET DEBUG_SYNC= 'WAIT_FOR flushed NO_CLEAR_EVENT';
+  It is up to the user to ensure once when all the wait threads have processed
+  the 'flushed' signal to clear/deactivate the signal using the RESET action
+  of DEBUG_SYNC accordingly.
+
 
   Normally the activation of a sync point is cleared when it has been
   executed. Sometimes it is necessary to keep the sync point active for
@@ -149,7 +159,8 @@
        <sync point name> TEST |
        <sync point name> CLEAR |
        <sync point name> {{SIGNAL <signal name> |
-                           WAIT_FOR <signal name> [TIMEOUT <seconds>]}
+                           WAIT_FOR <signal name> [TIMEOUT <seconds>]
+                           [NO_CLEAR_EVENT]}
                           [EXECUTE <count>] &| HIT_LIMIT <count>}
 
   Here '&|' means 'and/or'. This means that one of the sections
@@ -161,8 +172,6 @@
   The facility is an optional part of the MySQL server.
   It is enabled in a debug server by default.
 
-      ./configure --enable-debug-sync
-
   The Debug Sync Facility, when compiled in, is disabled by default. It
   can be enabled by a mysqld command line option:
 
@@ -329,6 +338,9 @@
 #include "sql_priv.h"
 #include "sql_parse.h"
 
+#include <set>
+#include <string>
+
 using std::max;
 using std::min;
 
@@ -349,6 +361,7 @@
   String        wait_for;               /* signal to wait for */
   String        sync_point;             /* sync point name */
   bool          need_sort;              /* if new action, array needs sort */
+  bool          clear_event;            /* do not clear signal if false */
 };
 
 /* Debug sync control. Referenced by THD. */
@@ -367,21 +380,28 @@
   char                  ds_proc_info[80];       /* proc_info string */
 };
 
+typedef std::set<std::string> signal_event_set;
 
 /**
   Definitions for the debug sync facility.
-  1. Global string variable to hold a "signal" ("signal post", "flag mast").
+  1. Global set of signal names which are signalled.
   2. Global condition variable for signaling and waiting.
   3. Global mutex to synchronize access to the above.
 */
 struct st_debug_sync_globals
 {
-  String                ds_signal;              /* signal variable */
+  signal_event_set      ds_signal_set;          /* list of signals signalled */
   mysql_cond_t          ds_cond;                /* condition variable */
   mysql_mutex_t         ds_mutex;               /* mutex variable */
   ulonglong             dsp_hits;               /* statistics */
   ulonglong             dsp_executed;           /* statistics */
   ulonglong             dsp_max_active;         /* statistics */
+
+  st_debug_sync_globals() : dsp_hits(0), dsp_executed(0), dsp_max_active(0) {}
+private:
+  // Not implemented:
+  st_debug_sync_globals(const st_debug_sync_globals&);
+  st_debug_sync_globals &operator=(const st_debug_sync_globals&);
 };
 static st_debug_sync_globals debug_sync_global; /* All globals in one object */
 
@@ -486,7 +506,6 @@
     int rc;
 
     /* Initialize the global variables. */
-    debug_sync_global.ds_signal.length(0);
     if ((rc= mysql_cond_init(key_debug_sync_globals_ds_cond,
                              &debug_sync_global.ds_cond, NULL)) ||
         (rc= mysql_mutex_init(key_debug_sync_globals_ds_mutex,
@@ -520,7 +539,7 @@
     debug_sync_C_callback_ptr= NULL;
 
     /* Destroy the global variables. */
-    debug_sync_global.ds_signal.free();
+    debug_sync_global.ds_signal_set.clear();
     mysql_cond_destroy(&debug_sync_global.ds_cond);
     mysql_mutex_destroy(&debug_sync_global.ds_mutex);
 
@@ -868,9 +887,9 @@
   /* Remove all actions of this thread. */
   ds_control->ds_active= 0;
 
-  /* Clear the global signal. */
+  /* Clear the signals. */
   mysql_mutex_lock(&debug_sync_global.ds_mutex);
-  debug_sync_global.ds_signal.length(0);
+  debug_sync_global.ds_signal_set.clear();
   mysql_mutex_unlock(&debug_sync_global.ds_mutex);
 
   DBUG_VOID_RETURN;
@@ -1478,6 +1497,7 @@
     /* Set default for EXECUTE and TIMEOUT options. */
     action->execute= 1;
     action->timeout= opt_debug_sync_timeout;
+    action->clear_event= true;
 
     /* Get next token. If none follows, set action. */
     if (!(ptr= debug_sync_token(&token, &token_length, ptr)))
@@ -1529,6 +1549,17 @@
   }
 
   /*
+    Try NO_CLEAR_EVENT.
+  */
+  if (!my_strcasecmp(system_charset_info, token, "NO_CLEAR_EVENT"))
+  {
+    action->clear_event= false;
+    /* Get next token. If none follows, set action. */
+    if (!(ptr= debug_sync_token(&token, &token_length, ptr)))
+      goto set_action;
+  }
+
+  /*
     Try HIT_LIMIT.
   */
   if (!my_strcasecmp(system_charset_info, token, "HIT_LIMIT"))
@@ -1617,7 +1648,7 @@
     The value of the system variable 'debug_sync' reflects if
     the facility is enabled ("ON") or disabled (default, "OFF").
 
-    When "ON", the current signal is added.
+    When "ON", the list of signals signalled are added separated by comma.
 */
 
 uchar *debug_sync_value_ptr(THD *thd)
@@ -1627,26 +1658,28 @@
 
   if (opt_debug_sync_timeout)
   {
-    static char on[]= "ON - current signal: '"; 
+    std::string signals_on("ON - signals: '");
+    static char sep[]= ",";
 
-    // Ensure exclusive access to debug_sync_global.ds_signal
+    // Ensure exclusive access to debug_sync_global.ds_signal_set
     mysql_mutex_lock(&debug_sync_global.ds_mutex);
 
-    size_t lgt= (sizeof(on) /* includes '\0' */ +
-                 debug_sync_global.ds_signal.length() + 1 /* for '\'' */);
-    char *vend;
-    char *vptr;
+    signal_event_set::const_iterator iter;
+    for (iter= debug_sync_global.ds_signal_set.begin();
+         iter != debug_sync_global.ds_signal_set.end(); )
+    {
+      signals_on.append(*iter);
+      if ((++iter) != debug_sync_global.ds_signal_set.end())
+        signals_on.append(sep);
+    }
+    signals_on.append("'");
+
+    const char *c_str= signals_on.c_str();
+    const size_t lgt= strlen(c_str) + 1;
 
     if ((value= (char*) alloc_root(thd->mem_root, lgt)))
-    {
-      vend= value + lgt - 1; /* reserve space for '\0'. */
-      vptr= debug_sync_bmove_len(value, vend, STRING_WITH_LEN(on));
-      vptr= debug_sync_bmove_len(vptr, vend, debug_sync_global.ds_signal.ptr(),
-                                 debug_sync_global.ds_signal.length());
-      if (vptr < vend)
-        *(vptr++)= '\'';
-      *vptr= '\0'; /* We have one byte reserved for the worst case. */
-    }
+      memcpy(value, c_str, lgt);
+
     mysql_mutex_unlock(&debug_sync_global.ds_mutex);
   }
   else
@@ -1661,6 +1694,62 @@
 
 
 /**
+  Return true if the signal is found in global signal list.
+
+  @param signal Signal name identifying the signal.
+
+  @note
+    If signal is found in the global signal set, it means that the
+    signal thread has signalled to the waiting thread. This method
+    must be called with the debug_sync_global.ds_mutex held.
+
+  @eretval true  if signal is found in the global signal list.
+  @retval false otherwise.
+*/
+
+static inline bool is_signalled(const std::string *signal_name)
+{
+  return (debug_sync_global.ds_signal_set.find(*signal_name) !=
+          debug_sync_global.ds_signal_set.end());
+}
+
+
+/**
+  Return false if signal has been added to global signal list.
+
+  @param signal signal name that is to be added to the global signal
+         list.
+
+  @note
+    This method add signal name to the global signal list and signals
+    the waiting thread that this signal has been emitted. This method
+    must be called with the debug_sync_global.ds_mutex held.
+*/
+
+static inline void add_signal_event(const std::string *signal_name)
+{
+  debug_sync_global.ds_signal_set.insert(*signal_name);
+}
+
+
+/**
+  Remove the signal from the global signal list.
+
+  @param signal signal name to be removed from the global signal list.
+
+  @note
+    This method erases the signal from the signal list.  This happens
+    when the wait thread has processed the signal event from the
+    signalling thread. This method should be called with the
+    debug_sync_global.ds_mutex held.
+*/
+static inline void clear_signal_event(const std::string *signal_name)
+{
+  debug_sync_global.ds_signal_set.erase(*signal_name);
+}
+
+
+/**
   Execute requested action at a synchronization point.
 
   @param[in]    thd                 thread handle
@@ -1711,7 +1800,7 @@
 
     /*
       Take mutex to ensure that only one thread access
-      debug_sync_global.ds_signal at a time.  Need to take mutex for
+      debug_sync_global.ds_signal_set at a time.  Need to take mutex for
       read access too, to create a memory barrier in order to avoid that
       threads just reads an old cached version of the signal.
     */
@@ -1719,15 +1808,9 @@
 
     if (action->signal.length())
     {
-      /* Copy the signal to the global variable. */
-      if (debug_sync_global.ds_signal.copy(action->signal))
-      {
-        /*
-          Error is reported by my_malloc().
-          We must disable the facility. We have no way to return an error.
-        */
-        debug_sync_emergency_disable(); /* purecov: tested */
-      }
+      std::string signal= action->signal.ptr();
+      /* Copy the signal to the global set. */
+      add_signal_event(&signal);
       /* Wake threads waiting in a sync point. */
       mysql_cond_broadcast(&debug_sync_global.ds_cond);
       DBUG_PRINT("debug_sync_exec", ("signal '%s'  at: '%s'",
@@ -1740,6 +1823,7 @@
       mysql_cond_t  *old_cond= 0;
       int             error= 0;
       struct timespec abstime;
+      std::string wait_for= action->wait_for.ptr();
 
       /*
         We don't use enter_cond()/exit_cond(). They do not save old
@@ -1762,30 +1846,27 @@
 
       set_timespec(abstime, action->timeout);
       DBUG_EXECUTE("debug_sync_exec", {
-          /* Functions as DBUG_PRINT args can change keyword and line nr. */
-          const char *sig_glob= debug_sync_global.ds_signal.c_ptr();
           DBUG_PRINT("debug_sync_exec",
-                     ("wait for '%s'  at: '%s'  curr: '%s'",
-                      sig_wait, dsp_name, sig_glob));});
-
+                     ("wait for '%s'  at: '%s'",
+                      sig_wait, dsp_name));});
       /*
         Wait until global signal string matches the wait_for string.
         Interrupt when thread or query is killed or facility disabled.
         The facility can become disabled when some thread cannot get
         the required dynamic memory allocated.
       */
-      while (stringcmp(&debug_sync_global.ds_signal, &action->wait_for) &&
+      while (!is_signalled(&wait_for) &&
              !thd->killed && opt_debug_sync_timeout)
       {
         error= mysql_cond_timedwait(&debug_sync_global.ds_cond,
                                     &debug_sync_global.ds_mutex,
                                     &abstime);
+
         DBUG_EXECUTE("debug_sync", {
             /* Functions as DBUG_PRINT args can change keyword and line nr. */
-            const char *sig_glob= debug_sync_global.ds_signal.c_ptr();
             DBUG_PRINT("debug_sync",
-                       ("awoke from %s  global: %s  error: %d",
-                        sig_wait, sig_glob, error));});
+                       ("awoke from %s error: %d", sig_wait, error)); });
+
         if (error == ETIMEDOUT || error == ETIME)
         {
           // We should not make the statement fail, even if in strict mode.
@@ -1799,6 +1880,9 @@
         }
         error= 0;
       }
+      if (action->clear_event)
+        clear_signal_event(&wait_for);
+
       DBUG_EXECUTE("debug_sync_exec",
                    if (thd->killed)
                      DBUG_PRINT("debug_sync_exec",
@@ -1911,7 +1995,7 @@
 
   @description
     The function is similar to @c debug_sync_eval_action but is
-    to be called immediately from the server code rather than 
+    to be called immediately from the server code rather than
     to be triggered by setting a value to DEBUG_SYNC system variable.
 
   @note
@@ -1920,7 +2004,7 @@
 
     Caution.
     The function allocates in THD::mem_root and therefore
-    is not recommended to be deployed inside big loops.    
+    is not recommended to be deployed inside big loops.
 */
 
 bool debug_sync_set_action(THD *thd, const char *action_str, size_t len)
@@ -1930,7 +2014,7 @@
   DBUG_ENTER("debug_sync_set_action");
   DBUG_ASSERT(thd);
   DBUG_ASSERT(action_str);
-  
+
   value= strmake_root(thd->mem_root, action_str, len);
   rc= debug_sync_eval_action(thd, value);
   DBUG_RETURN(rc);
diff -Nru percona-xtrabackup-2.2.3/sql/event_data_objects.cc percona-xtrabackup-2.3.7/sql/event_data_objects.cc
--- percona-xtrabackup-2.2.3/sql/event_data_objects.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/event_data_objects.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2015, 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
@@ -1334,6 +1334,7 @@
 #endif
   List<Item> empty_item_list;
   bool ret= TRUE;
+  sql_digest_state *parent_digest= thd->m_digest;
   PSI_statement_locker *parent_locker= thd->m_statement_psi;
 
   DBUG_ENTER("Event_job_data::execute");
@@ -1409,6 +1410,7 @@
     if (parser_state.init(thd, thd->query(), thd->query_length()))
       goto end;
 
+    thd->m_digest= NULL;
     thd->m_statement_psi= NULL;
     if (parse_sql(thd, & parser_state, creation_ctx))
     {
@@ -1416,9 +1418,11 @@
                       "%serror during compilation of %s.%s",
                       thd->is_fatal_error ? "fatal " : "",
                       (const char *) dbname.str, (const char *) name.str);
+      thd->m_digest= parent_digest;
       thd->m_statement_psi= parent_locker;
       goto end;
     }
+    thd->m_digest= parent_digest;
     thd->m_statement_psi= parent_locker;
   }
 
diff -Nru percona-xtrabackup-2.2.3/sql/event_scheduler.cc percona-xtrabackup-2.3.7/sql/event_scheduler.cc
--- percona-xtrabackup-2.2.3/sql/event_scheduler.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/event_scheduler.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2015, 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
@@ -159,9 +159,7 @@
 
   dec_thread_running();
   thd->release_resources();
-  mysql_mutex_lock(&LOCK_thread_count);
   remove_global_thread(thd);
-  mysql_mutex_unlock(&LOCK_thread_count);
   delete thd;
 }
 
@@ -303,6 +301,10 @@
   Event_job_data job_data;
   bool res;
 
+  DBUG_ASSERT(thd->m_digest == NULL);
+  DBUG_ASSERT(thd->m_statement_psi == NULL);
+
+
   thd->thread_stack= &my_stack;                // remember where our stack is
   res= post_init_event_thread(thd);
 
@@ -331,6 +333,9 @@
                           job_data.definer.str,
                           job_data.dbname.str, job_data.name.str);
 end:
+  DBUG_ASSERT(thd->m_statement_psi == NULL);
+  DBUG_ASSERT(thd->m_digest == NULL);
+
   DBUG_PRINT("info", ("Done with Event %s.%s", event->dbname.str,
              event->name.str));
 
diff -Nru percona-xtrabackup-2.2.3/sql/field.cc percona-xtrabackup-2.3.7/sql/field.cc
--- percona-xtrabackup-2.2.3/sql/field.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/field.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -2348,7 +2348,7 @@
     return TYPE_WARN_OUT_OF_RANGE;
   }
   
-  if (!isfinite(nr)) // Handle infinity as special case
+  if (!my_isfinite(nr)) // Handle infinity as special case
   {
     overflow(nr < 0.0);
     return TYPE_WARN_OUT_OF_RANGE;
@@ -4492,7 +4492,7 @@
 
 bool Field_real::truncate(double *nr, double max_value)
 {
-  if (isnan(*nr))
+  if (my_isnan(*nr))
   {
     *nr= 0;
     set_null();
@@ -7767,8 +7767,7 @@
       If content of the 'from'-address is cached in the 'value'-object
       it is possible that the content needs a character conversion.
     */
-    uint32 dummy_offset;
-    if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
+    if (!String::needs_conversion_on_storage(length, cs, field_charset))
     {
       store_ptr_and_length(from, length);
       return TYPE_OK;
@@ -8398,12 +8397,11 @@
   ASSERT_COLUMN_MARKED_FOR_WRITE;
   int err= 0;
   type_conversion_status ret= TYPE_OK;
-  uint32 not_used;
   char buff[STRING_BUFFER_USUAL_SIZE];
   String tmpstr(buff,sizeof(buff), &my_charset_bin);
 
   /* Convert character set if necessary */
-  if (String::needs_conversion(length, cs, field_charset, &not_used))
+  if (String::needs_conversion_on_storage(length, cs, field_charset))
   { 
     uint dummy_errors;
     tmpstr.copy(from, length, cs, field_charset, &dummy_errors);
@@ -8629,12 +8627,11 @@
   type_conversion_status ret= TYPE_OK;
   char *not_used;
   uint not_used2;
-  uint32 not_used_offset;
   char buff[STRING_BUFFER_USUAL_SIZE];
   String tmpstr(buff,sizeof(buff), &my_charset_bin);
 
   /* Convert character set if necessary */
-  if (String::needs_conversion(length, cs, field_charset, &not_used_offset))
+  if (String::needs_conversion_on_storage(length, cs, field_charset))
   { 
     uint dummy_errors;
     tmpstr.copy(from, length, cs, field_charset, &dummy_errors);
diff -Nru percona-xtrabackup-2.2.3/sql/field.h percona-xtrabackup-2.3.7/sql/field.h
--- percona-xtrabackup-2.2.3/sql/field.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/field.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef FIELD_INCLUDED
 #define FIELD_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/sql/filesort.cc percona-xtrabackup-2.3.7/sql/filesort.cc
--- percona-xtrabackup-2.2.3/sql/filesort.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/filesort.cc	2017-02-27 07:47:02.000000000 +0000
@@ -528,18 +528,33 @@
 
   for (ord= order; ord; ord= ord->next, pos++)
   {
-    Item *item= ord->item[0]->real_item();
+    Item *const item= ord->item[0], *const real_item= item->real_item();
     pos->field= 0; pos->item= 0;
-    if (item->type() == Item::FIELD_ITEM)
-      pos->field= ((Item_field*) item)->field;
-    else if (item->type() == Item::SUM_FUNC_ITEM && !item->const_item())
-      pos->field= ((Item_sum*) item)->get_tmp_table_field();
-    else if (item->type() == Item::COPY_STR_ITEM)
+    if (real_item->type() == Item::FIELD_ITEM)
+    {
+      // Could be a field, or Item_direct_view_ref wrapping a field
+      DBUG_ASSERT(item->type() == Item::FIELD_ITEM ||
+                  (item->type() == Item::REF_ITEM &&
+                   static_cast<Item_ref*>(item)->ref_type() ==
+                   Item_ref::VIEW_REF));
+      pos->field= static_cast<Item_field*>(real_item)->field;
+    }
+    else if (real_item->type() == Item::SUM_FUNC_ITEM &&
+             !real_item->const_item())
+    {
+      // Aggregate, or Item_aggregate_ref
+      DBUG_ASSERT(item->type() == Item::SUM_FUNC_ITEM ||
+                  (item->type() == Item::REF_ITEM &&
+                   static_cast<Item_ref*>(item)->ref_type() ==
+                   Item_ref::AGGREGATE_REF));
+      pos->field= item->get_tmp_table_field();
+    }
+    else if (real_item->type() == Item::COPY_STR_ITEM)
     {						// Blob patch
-      pos->item= ((Item_copy*) item)->get_item();
+      pos->item= static_cast<Item_copy*>(real_item)->get_item();
     }
     else
-      pos->item= *ord->item;
+      pos->item= item;
     pos->reverse= (ord->direction == ORDER::ORDER_DESC);
     DBUG_ASSERT(pos->field != NULL || pos->item != NULL);
   }
@@ -1020,7 +1035,7 @@
         if (sort_field->need_strxnfrm)
         {
           char *from=(char*) res->ptr();
-          uint tmp_length;
+          uint tmp_length __attribute__((unused));
           if ((uchar*) from == to)
           {
             DBUG_ASSERT(sort_field->length >= length);
diff -Nru percona-xtrabackup-2.2.3/sql/gcalc_tools.cc percona-xtrabackup-2.3.7/sql/gcalc_tools.cc
--- percona-xtrabackup-2.2.3/sql/gcalc_tools.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/gcalc_tools.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -222,7 +222,7 @@
         result= result & !next_res;
         break;
       case op_backdifference:
-        result= !result & next_res;
+        result= (!result) & next_res;
         break;
       default:
         DBUG_ASSERT(FALSE);
diff -Nru percona-xtrabackup-2.2.3/sql/gen_lex_hash.cc percona-xtrabackup-2.3.7/sql/gen_lex_hash.cc
--- percona-xtrabackup-2.2.3/sql/gen_lex_hash.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/gen_lex_hash.cc	2017-02-27 07:47:02.000000000 +0000
@@ -311,6 +311,7 @@
   set_links(root_by_len,max_len);
   print_hash_map("sql_functions_map");
 
+  free(hash_map);
   hash_map= 0;
   size_hash_map= 0;
 
diff -Nru percona-xtrabackup-2.2.3/sql/gen_lex_token.cc percona-xtrabackup-2.3.7/sql/gen_lex_token.cc
--- percona-xtrabackup-2.2.3/sql/gen_lex_token.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/gen_lex_token.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,353 @@
+/*
+   Copyright (c) 2011, 2015, 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,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#include <my_global.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+/* We only need the tokens here */
+#define YYSTYPE_IS_DECLARED
+#include <sql_yacc.h>
+#include <lex.h>
+
+#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
+
+/*
+  This is a tool used during build only,
+  so MY_MAX_TOKEN does not need to be exact,
+  only big enough to hold:
+  - 256 character terminal tokens
+  - YYNTOKENS named terminal tokens
+  from bison.
+  See also YYMAXUTOK.
+*/
+#define MY_MAX_TOKEN 1000
+/** Generated token. */
+struct gen_lex_token_string
+{
+  const char *m_token_string;
+  int m_token_length;
+  bool m_append_space;
+  bool m_start_expr;
+};
+
+gen_lex_token_string compiled_token_array[MY_MAX_TOKEN];
+int max_token_seen= 0;
+
+char char_tokens[256];
+
+int tok_generic_value= 0;
+int tok_generic_value_list= 0;
+int tok_row_single_value= 0;
+int tok_row_single_value_list= 0;
+int tok_row_multiple_value= 0;
+int tok_row_multiple_value_list= 0;
+int tok_unused= 0;
+
+void set_token(int tok, const char *str)
+{
+  if (tok <= 0)
+  {
+    fprintf(stderr, "Bad token found\n");
+    exit(1);
+  }
+
+  if (tok > max_token_seen)
+  {
+    max_token_seen= tok;
+  }
+
+  if (max_token_seen >= MY_MAX_TOKEN)
+  {
+    fprintf(stderr, "Added that many new keywords ? Increase MY_MAX_TOKEN\n");
+    exit(1);
+  }
+
+  compiled_token_array[tok].m_token_string= str;
+  compiled_token_array[tok].m_token_length= strlen(str);
+  compiled_token_array[tok].m_append_space= true;
+  compiled_token_array[tok].m_start_expr= false;
+}
+
+void set_start_expr_token(int tok)
+{
+  compiled_token_array[tok].m_start_expr= true;
+}
+
+void compute_tokens()
+{
+  int tok;
+  unsigned int i;
+  char *str;
+
+  /*
+    Default value.
+  */
+  for (tok= 0; tok < MY_MAX_TOKEN; tok++)
+  {
+    compiled_token_array[tok].m_token_string= "(unknown)";
+    compiled_token_array[tok].m_token_length= 9;
+    compiled_token_array[tok].m_append_space= true;
+    compiled_token_array[tok].m_start_expr= false;
+  }
+
+  /*
+    Tokens made of just one terminal character
+  */
+  for (tok=0; tok < 256; tok++)
+  {
+    str= & char_tokens[tok];
+    str[0]= (char) tok;
+    compiled_token_array[tok].m_token_string= str;
+    compiled_token_array[tok].m_token_length= 1;
+    compiled_token_array[tok].m_append_space= true;
+  }
+
+  max_token_seen= 255;
+
+  /*
+    String terminal tokens, used in sql_yacc.yy
+  */
+  set_token(NEG, "~");
+  set_token(TABLE_REF_PRIORITY, "TABLE_REF_PRIORITY");
+
+  /*
+    Tokens hard coded in sql_lex.cc
+  */
+
+  set_token(WITH_CUBE_SYM, "WITH CUBE");
+  set_token(WITH_ROLLUP_SYM, "WITH ROLLUP");
+  set_token(NOT2_SYM, "!");
+  set_token(OR2_SYM, "|");
+  set_token(PARAM_MARKER, "?");
+  set_token(SET_VAR, ":=");
+  set_token(UNDERSCORE_CHARSET, "(_charset)");
+  set_token(END_OF_INPUT, "");
+
+  /*
+    Values.
+    These tokens are all normalized later,
+    so this strings will never be displayed.
+  */
+  set_token(BIN_NUM, "(bin)");
+  set_token(DECIMAL_NUM, "(decimal)");
+  set_token(FLOAT_NUM, "(float)");
+  set_token(HEX_NUM, "(hex)");
+  set_token(LEX_HOSTNAME, "(hostname)");
+  set_token(LONG_NUM, "(long)");
+  set_token(NUM, "(num)");
+  set_token(TEXT_STRING, "(text)");
+  set_token(NCHAR_STRING, "(nchar)");
+  set_token(ULONGLONG_NUM, "(ulonglong)");
+
+  /*
+    Identifiers.
+  */
+  set_token(IDENT, "(id)");
+  set_token(IDENT_QUOTED, "(id_quoted)");
+
+  /*
+    Unused tokens
+  */
+  set_token(LOCATOR_SYM, "LOCATOR");
+  set_token(SERVER_OPTIONS, "SERVER_OPTIONS");
+  set_token(UDF_RETURNS_SYM, "UDF_RETURNS");
+
+  /*
+    See symbols[] in sql/lex.h
+  */
+  for (i= 0; i< sizeof(symbols)/sizeof(symbols[0]); i++)
+  {
+    set_token(symbols[i].tok, symbols[i].name);
+  }
+
+  /*
+    See sql_functions[] in sql/lex.h
+  */
+  for (i= 0; i< sizeof(sql_functions)/sizeof(sql_functions[0]); i++)
+  {
+    set_token(sql_functions[i].tok, sql_functions[i].name);
+  }
+
+  /*
+    Additional FAKE tokens,
+    used internally to normalize a digest text.
+  */
+
+  max_token_seen++;
+  tok_generic_value= max_token_seen;
+  set_token(tok_generic_value, "?");
+
+  max_token_seen++;
+  tok_generic_value_list= max_token_seen;
+  set_token(tok_generic_value_list, "?, ...");
+
+  max_token_seen++;
+  tok_row_single_value= max_token_seen;
+  set_token(tok_row_single_value, "(?)");
+
+  max_token_seen++;
+  tok_row_single_value_list= max_token_seen;
+  set_token(tok_row_single_value_list, "(?) /* , ... */");
+
+  max_token_seen++;
+  tok_row_multiple_value= max_token_seen;
+  set_token(tok_row_multiple_value, "(...)");
+
+  max_token_seen++;
+  tok_row_multiple_value_list= max_token_seen;
+  set_token(tok_row_multiple_value_list, "(...) /* , ... */");
+
+  max_token_seen++;
+  tok_unused= max_token_seen;
+  set_token(tok_unused, "UNUSED");
+
+  /*
+    Fix whitespace for some special tokens.
+  */
+
+  /*
+    The lexer parses "@@variable" as '@', '@', 'variable',
+    returning a token for '@' alone.
+
+    This is incorrect, '@' is not really a token,
+    because the syntax "@ @ variable" (with spaces) is not accepted:
+    The lexer keeps some internal state after the '@' fake token.
+
+    To work around this, digest text are printed as "@@variable".
+  */
+  compiled_token_array[(int) '@'].m_append_space= false;
+
+  /*
+    Define additional properties for tokens.
+
+    List all the token that are followed by an expression.
+    This is needed to differentiate unary from binary
+    '+' and '-' operators, because we want to:
+    - reduce <unary +> <NUM> to <?>,
+    - preserve <...> <binary +> <NUM> as is.
+  */
+  set_start_expr_token('(');
+  set_start_expr_token(',');
+  set_start_expr_token(EVERY_SYM);
+  set_start_expr_token(AT_SYM);
+  set_start_expr_token(STARTS_SYM);
+  set_start_expr_token(ENDS_SYM);
+  set_start_expr_token(DEFAULT);
+  set_start_expr_token(RETURN_SYM);
+  set_start_expr_token(IF);
+  set_start_expr_token(ELSEIF_SYM);
+  set_start_expr_token(CASE_SYM);
+  set_start_expr_token(WHEN_SYM);
+  set_start_expr_token(WHILE_SYM);
+  set_start_expr_token(UNTIL_SYM);
+  set_start_expr_token(SELECT_SYM);
+
+  set_start_expr_token(OR_SYM);
+  set_start_expr_token(OR2_SYM);
+  set_start_expr_token(XOR);
+  set_start_expr_token(AND_SYM);
+  set_start_expr_token(AND_AND_SYM);
+  set_start_expr_token(NOT_SYM);
+  set_start_expr_token(BETWEEN_SYM);
+  set_start_expr_token(LIKE);
+  set_start_expr_token(REGEXP);
+
+  set_start_expr_token('|');
+  set_start_expr_token('&');
+  set_start_expr_token(SHIFT_LEFT);
+  set_start_expr_token(SHIFT_RIGHT);
+  set_start_expr_token('+');
+  set_start_expr_token('-');
+  set_start_expr_token(INTERVAL_SYM);
+  set_start_expr_token('*');
+  set_start_expr_token('/');
+  set_start_expr_token('%');
+  set_start_expr_token(DIV_SYM);
+  set_start_expr_token(MOD_SYM);
+  set_start_expr_token('^');
+}
+
+void print_tokens()
+{
+  int tok;
+
+  printf("#ifdef LEX_TOKEN_WITH_DEFINITION\n");
+  printf("lex_token_string lex_token_array[]=\n");
+  printf("{\n");
+  printf("/* PART 1: character tokens. */\n");
+
+  for (tok= 0; tok<256; tok++)
+  {
+    printf("/* %03d */  { \"\\x%02x\", 1, %s, %s},\n",
+           tok,
+           tok,
+           compiled_token_array[tok].m_append_space ? "true" : "false",
+           compiled_token_array[tok].m_start_expr ? "true" : "false");
+  }
+
+  printf("/* PART 2: named tokens. */\n");
+
+  for (tok= 256; tok<= max_token_seen; tok++)
+  {
+    printf("/* %03d */  { \"%s\", %d, %s, %s},\n",
+           tok,
+           compiled_token_array[tok].m_token_string,
+           compiled_token_array[tok].m_token_length,
+           compiled_token_array[tok].m_append_space ? "true" : "false",
+           compiled_token_array[tok].m_start_expr ? "true" : "false");
+  }
+
+  printf("/* DUMMY */ { \"\", 0, false, false}\n");
+  printf("};\n");
+  printf("#endif /* LEX_TOKEN_WITH_DEFINITION */\n");
+
+  printf("/* DIGEST specific tokens. */\n");
+  printf("#define TOK_GENERIC_VALUE %d\n", tok_generic_value);
+  printf("#define TOK_GENERIC_VALUE_LIST %d\n", tok_generic_value_list);
+  printf("#define TOK_ROW_SINGLE_VALUE %d\n", tok_row_single_value);
+  printf("#define TOK_ROW_SINGLE_VALUE_LIST %d\n", tok_row_single_value_list);
+  printf("#define TOK_ROW_MULTIPLE_VALUE %d\n", tok_row_multiple_value);
+  printf("#define TOK_ROW_MULTIPLE_VALUE_LIST %d\n", tok_row_multiple_value_list);
+  printf("#define TOK_UNUSED %d\n", tok_unused);
+}
+
+int main(int argc,char **argv)
+{
+  puts("/*");
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2011"));
+  puts("*/");
+
+  printf("/*\n");
+  printf("  This file is generated, do not edit.\n");
+  printf("  See file sql/gen_lex_token.cc.\n");
+  printf("*/\n");
+  printf("struct lex_token_string\n");
+  printf("{\n");
+  printf("  const char *m_token_string;\n");
+  printf("  int m_token_length;\n");
+  printf("  bool m_append_space;\n");
+  printf("  bool m_start_expr;\n");
+  printf("};\n");
+  printf("typedef struct lex_token_string lex_token_string;\n");
+
+  compute_tokens();
+  print_tokens();
+
+  return 0;
+}
+
diff -Nru percona-xtrabackup-2.2.3/sql/global_threads.h percona-xtrabackup-2.3.7/sql/global_threads.h
--- percona-xtrabackup-2.2.3/sql/global_threads.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/global_threads.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2014 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
@@ -23,23 +23,39 @@
 class THD;
 
 extern mysql_mutex_t LOCK_thread_count;
+extern mysql_mutex_t LOCK_thd_remove;
 extern mysql_cond_t COND_thread_count;
 
 /**
-  We maintail a set of all registered threads.
-  We provide acccessors to iterate over all threads.
-  There is no guarantee on the order of THDs when iterating.
+  We maintain a set of all registered threads.
+  We provide accessors (global_thread_list_begin, global_thread_list_end)
+  to iterate over all threads. There is no guarantee on the order of THDs
+  when iterating. The caller of these two accessors is expected to
+  hold lock on LOCK_thread_count mutex before calling these accessors inorder
+  to make sure that there are no new threads are added to the system while
+  processing this thread list.
 
   We also provide mutators for inserting, and removing an element:
-  add_global_thread() inserts a THD into the set, and increments the counter.
-  remove_global_thread() removes a THD from the set, and decrements the counter.
-  remove_global_thread() also broadcasts COND_thread_count.
-
-  All functions must be called with LOCK_thread_count.
+    > add_global_thread() inserts a THD into the set, and increments the counter.
+       The caller of this function is expected to hold lock on LOCK_thread_count
+       mutex before calling this function to avoid any parallel operations
+       happening on the set.
+    > remove_global_thread() removes a THD from the set, and decrements the counter.
+       This function acquires lock on LOCK_thd_remove followed by lock on
+       LOCK_thread_count. At the end of the function, it releases both the
+       locks. remove_global_thread() also broadcasts COND_thread_count.
+
+  We also provide a function (copy_global_thread_list) to copy global thread list
+  into a new set. The caller of this function is expected to hold lock on
+  LOCK_thd_remove to avoid any removal from the copied set. This function also
+  acquires lock on LOCK_thread_count before the copy operation to
+  avoid any parallel modification to the set and will release the lock at the
+  end of the function.
  */
 typedef std::set<THD*>::iterator Thread_iterator;
 Thread_iterator global_thread_list_begin();
 Thread_iterator global_thread_list_end();
+void copy_global_thread_list(std::set<THD*> *new_copy);
 void add_global_thread(THD *);
 void remove_global_thread(THD *);
 
diff -Nru percona-xtrabackup-2.2.3/sql/ha_ndbcluster.cc percona-xtrabackup-2.3.7/sql/ha_ndbcluster.cc
--- percona-xtrabackup-2.2.3/sql/ha_ndbcluster.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/ha_ndbcluster.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2015, 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
@@ -8154,7 +8154,7 @@
       of the transaction
     */
     DBUG_PRINT("info", ("Rollback before start or end-of-statement only"));
-    mark_transaction_to_rollback(thd, 1);
+    thd->mark_transaction_to_rollback(1);
     my_error(ER_WARN_ENGINE_TRANSACTION_ROLLBACK, MYF(0), "NDB");
     DBUG_RETURN(0);
   }
diff -Nru percona-xtrabackup-2.2.3/sql/handler.cc percona-xtrabackup-2.3.7/sql/handler.cc
--- percona-xtrabackup-2.2.3/sql/handler.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/handler.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -3216,7 +3216,14 @@
     if (forced != NULL)
     {
       nr= forced->minimum();
-      nb_reserved_values= forced->values();
+      /*
+        In a multi insert statement when the number of affected rows is known
+        then reserve those many number of auto increment values. So that
+        interval will be starting value to starting value + number of affected
+        rows * increment of auto increment.
+       */
+      nb_reserved_values= (estimation_rows_to_insert > 0) ?
+        estimation_rows_to_insert : forced->values();
     }
     else
     {
@@ -6264,7 +6271,7 @@
 ha_rows DsMrr_impl::dsmrr_info(uint keyno, uint n_ranges, uint rows,
                                uint *bufsz, uint *flags, Cost_estimate *cost)
 {  
-  ha_rows res;
+  ha_rows res __attribute__((unused));
   uint def_flags= *flags;
   uint def_bufsz= *bufsz;
 
diff -Nru percona-xtrabackup-2.2.3/sql/handler.h percona-xtrabackup-2.3.7/sql/handler.h
--- percona-xtrabackup-2.2.3/sql/handler.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/handler.h	2017-02-27 07:47:02.000000000 +0000
@@ -999,6 +999,8 @@
 */
 
 #define HTON_SUPPORTS_EXTENDED_KEYS  (1 << 10)
+// Engine supports foreign key constraint.
+#define HTON_SUPPORTS_FOREIGN_KEYS   (1 << 11)
 
 
 enum enum_tx_isolation { ISO_READ_UNCOMMITTED, ISO_READ_COMMITTED,
diff -Nru percona-xtrabackup-2.2.3/sql/ha_partition.cc percona-xtrabackup-2.3.7/sql/ha_partition.cc
--- percona-xtrabackup-2.2.3/sql/ha_partition.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/ha_partition.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2015, 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
@@ -97,6 +97,13 @@
 static uint partition_flags();
 static uint alter_table_flags(uint flags);
 
+
+/****************************************************************************
+    Check whether the partition column order changes after alter
+****************************************************************************/
+static bool check_partition_column_order(List<Create_field> *create_list,
+                                         Field** field_arary);
+
 #ifdef HAVE_PSI_INTERFACE
 PSI_mutex_key key_partition_auto_inc_mutex;
 
@@ -221,6 +228,34 @@
           HA_FAST_CHANGE_PARTITION);
 }
 
+static bool check_partition_column_order(List<Create_field> *create_list,
+                                         Field** field_arary)
+{
+
+  Field **f_ptr;
+  List_iterator_fast<Create_field> new_field_it;
+  Create_field *new_field= NULL;
+  new_field_it.init(*create_list);
+
+  for (f_ptr= field_arary ; *f_ptr; f_ptr++)
+  {
+    while ((new_field= new_field_it++))
+    {
+      if (new_field->field == *f_ptr)
+        break;
+    }
+    if (!new_field)
+      break;
+  }
+
+  if (!new_field)
+  {
+    /* Not same order, INPLACE cannot be allowed!*/
+    return false;
+  }
+  return true;
+}
+
 const uint32 ha_partition::NO_CURRENT_PART_ID= NOT_A_PARTITION_ID;
 
 /*
@@ -4344,6 +4379,11 @@
       part_elem->part_state= PART_NORMAL;
     }
   } while (!error && (++i < num_parts));
+  if (error)
+  {
+    /* Reset to PART_NORMAL. */
+    set_all_part_state(m_part_info, PART_NORMAL);
+  }
   DBUG_RETURN(error);
 }
 
@@ -5114,6 +5154,7 @@
     {
       (void) m_file[j]->ha_index_end();
     }
+    destroy_record_priority_queue();
   }
   DBUG_RETURN(error);
 }
@@ -8047,6 +8088,26 @@
   if (ha_alter_info->alter_info->flags == Alter_info::ALTER_PARTITION)
     DBUG_RETURN(HA_ALTER_INPLACE_NO_LOCK);
 
+  /* We cannot allow INPLACE to change order of KEY partitioning fields! */
+  if (ha_alter_info->handler_flags & Alter_inplace_info::ALTER_COLUMN_ORDER)
+  {
+    /* If column partitioning is used then no need to check partition order */
+    if (m_part_info->list_of_part_fields && !m_part_info->column_list)
+    {
+      if(!check_partition_column_order(&ha_alter_info->alter_info->create_list,
+                                       table->part_info->part_field_array))
+        DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
+    }
+
+    /* Check subpartition ordering */
+    if (m_part_info->list_of_subpart_fields)
+    {
+      if(!check_partition_column_order(&ha_alter_info->alter_info->create_list,
+                                       table->part_info->subpart_field_array))
+        DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
+    }
+  }
+
   part_inplace_ctx=
     new (thd->mem_root) ha_partition_inplace_ctx(thd, m_tot_parts);
   if (!part_inplace_ctx)
diff -Nru percona-xtrabackup-2.2.3/sql/hostname.cc percona-xtrabackup-2.3.7/sql/hostname.cc
--- percona-xtrabackup-2.2.3/sql/hostname.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/hostname.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -413,7 +413,7 @@
 {
   const struct sockaddr *ip= (const sockaddr *) ip_storage;
   int err_code;
-  bool err_status;
+  bool err_status __attribute__((unused));
   Host_errors errors;
 
   DBUG_ENTER("ip_to_hostname");
diff -Nru percona-xtrabackup-2.2.3/sql/item.cc percona-xtrabackup-2.3.7/sql/item.cc
--- percona-xtrabackup-2.2.3/sql/item.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1516,9 +1516,25 @@
   DBUG_ASSERT(fixed);
 
   enum_field_types type= field_type();
-  return (type == MYSQL_TYPE_BLOB || type == MYSQL_TYPE_GEOMETRY ||
-          // Char length, not the byte one, should be taken into account
-          max_length/collation.collation->mbmaxlen > CONVERT_IF_BIGGER_TO_BLOB);
+  if (type == MYSQL_TYPE_BLOB || type == MYSQL_TYPE_GEOMETRY ||
+      // Char length, not the byte one, should be taken into account
+      (max_length/collation.collation->mbmaxlen > CONVERT_IF_BIGGER_TO_BLOB))
+    return true;
+
+  /*
+    This function is used only for subquery/semijoin materialization;
+    these are not able to handle a tmp table with share->uniques==true; it is
+    possible, if the tmp table has many rows, that it becomes a MyISAM table,
+    which will have share->uniques==true if the column's length in bytes is
+    bigger than MI_MAX_KEY_LENGTH.
+    So we add and extra restriction, only in MySQL 5.6: if longer than this,
+    pretend it's a blob, to disable materialization:
+  */
+  if (max_length >=
+      (MI_MAX_KEY_LENGTH - HA_KEY_NULL_LENGTH - HA_KEY_BLOB_LENGTH))
+    return true;
+
+  return false;
 }
 
 
@@ -3952,6 +3968,9 @@
   bool rc= FALSE;
   if (state == STRING_VALUE || state == LONG_DATA_VALUE)
   {
+    if (value.cs_info.final_character_set_of_str_value == NULL ||
+        value.cs_info.character_set_of_placeholder == NULL)
+      return true;
     /*
       Check is so simple because all charsets were set up properly
       in setup_one_conversion_function, where typecode of
@@ -5878,6 +5897,18 @@
 }
 
 
+/**
+  Verifies that the input string is well-formed according to its character set.
+  @param send_error   If true, call my_error if string is not well-formed.
+
+  Will truncate input string if it is not well-formed.
+
+  @return
+  If well-formed: input string.
+  If not well-formed:
+    if strict mode: NULL pointer and we set this Item's value to NULL
+    if not strict mode: input string truncated up to last good character
+ */
 String *Item::check_well_formed_result(String *str, bool send_error)
 {
   /* Check whether we got a well-formed string */
@@ -5992,7 +6023,7 @@
 
   If max_length > CONVERT_IF_BIGGER_TO_BLOB create a blob @n
   If max_length > 0 create a varchar @n
-  If max_length == 0 create a CHAR(0) 
+  If max_length == 0 create a CHAR(0) (or VARCHAR(0) if we are grouping)
 
   @param table		Table for which the field is created
 */
@@ -6010,8 +6041,19 @@
     field= new Field_varstring(max_length, maybe_null, item_name.ptr(),
                                table->s, collation.collation);
   else
-    field= new Field_string(max_length, maybe_null, item_name.ptr(),
-                            collation.collation);
+  {
+    /*
+     marker == 4 : see create_tmp_table()
+     With CHAR(0) end_update() may write garbage into the next field.
+    */
+    if (max_length == 0 && marker == 4 && maybe_null &&
+        field_type() == MYSQL_TYPE_VAR_STRING && type() != Item::TYPE_HOLDER)
+      field= new Field_varstring(max_length, maybe_null, item_name.ptr(),
+                                 table->s, collation.collation);
+    else
+      field= new Field_string(max_length, maybe_null, item_name.ptr(),
+                              collation.collation);
+  }
   if (field)
     field->init(table);
   return field;
diff -Nru percona-xtrabackup-2.2.3/sql/item_func.cc percona-xtrabackup-2.3.7/sql/item_func.cc
--- percona-xtrabackup-2.2.3/sql/item_func.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item_func.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -1826,9 +1826,11 @@
 {
   Item_result argtype= args[0]->result_type();
   /* use precision ony for the data type it is applicable for and valid */
-  max_length=args[0]->max_length -
-    (argtype == DECIMAL_RESULT || argtype == INT_RESULT ?
-     args[0]->decimals : 0);
+  uint32 char_length= args[0]->max_char_length() -
+                      (argtype == DECIMAL_RESULT || argtype == INT_RESULT ?
+                       args[0]->decimals : 0);
+  fix_char_length(char_length > MY_INT64_NUM_DECIMAL_DIGITS ?
+                  MY_INT64_NUM_DECIMAL_DIGITS : char_length);
   maybe_null=1;
   unsigned_flag=args[0]->unsigned_flag | args[1]->unsigned_flag;
 }
@@ -3678,8 +3680,12 @@
 	{
 	  f_args.args[i]=    (char*) res->ptr();
 	  f_args.lengths[i]= res->length();
-	  break;
 	}
+	else
+	{
+	  f_args.lengths[i]= 0;
+	}
+	break;
       }
     case INT_RESULT:
       *((longlong*) to) = args[i]->val_int();
@@ -6497,21 +6503,24 @@
   DBUG_ASSERT(fixed == 1);
   String *res=args[0]->val_str(&value);
   User_level_lock *ull;
+  longlong ret_val= 0LL;
 
   null_value=0;
   if (!res || !res->length())
   {
     null_value=1;
-    return 0;
+    return ret_val;
   }
   
   mysql_mutex_lock(&LOCK_user_locks);
   ull= (User_level_lock *) my_hash_search(&hash_user_locks, (uchar*) res->ptr(),
                                           (size_t) res->length());
-  mysql_mutex_unlock(&LOCK_user_locks);
   if (!ull || !ull->locked)
-    return 1;
-  return 0;
+    ret_val= 1;
+  mysql_mutex_unlock(&LOCK_user_locks);
+  DEBUG_SYNC(current_thd, "after_getting_user_level_lock_info");
+
+  return ret_val;
 }
 
 longlong Item_func_is_used_lock::val_int()
@@ -6519,6 +6528,7 @@
   DBUG_ASSERT(fixed == 1);
   String *res=args[0]->val_str(&value);
   User_level_lock *ull;
+  my_thread_id thread_id= 0UL;
 
   null_value=1;
   if (!res || !res->length())
@@ -6527,12 +6537,15 @@
   mysql_mutex_lock(&LOCK_user_locks);
   ull= (User_level_lock *) my_hash_search(&hash_user_locks, (uchar*) res->ptr(),
                                           (size_t) res->length());
+  if ((ull != NULL) && ull->locked)
+  {
+    null_value= 0;
+    thread_id= ull->thread_id;
+  }
   mysql_mutex_unlock(&LOCK_user_locks);
-  if (!ull || !ull->locked)
-    return 0;
+  DEBUG_SYNC(current_thd, "after_getting_user_level_lock_info");
 
-  null_value=0;
-  return ull->thread_id;
+  return thread_id;
 }
 
 
diff -Nru percona-xtrabackup-2.2.3/sql/item_func.h percona-xtrabackup-2.3.7/sql/item_func.h
--- percona-xtrabackup-2.2.3/sql/item_func.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item_func.h	2017-02-27 07:47:02.000000000 +0000
@@ -228,7 +228,7 @@
                      void * arg, traverse_order order);
   inline double fix_result(double value)
   {
-    if (isfinite(value))
+    if (my_isfinite(value))
       return value;
     null_value=1;
     return 0.0;
@@ -262,7 +262,7 @@
   */
   inline double check_float_overflow(double value)
   {
-    return isfinite(value) ? value : raise_float_overflow();
+    return my_isfinite(value) ? value : raise_float_overflow();
   }
   /**
     Throw an error if the input BIGINT value represented by the
diff -Nru percona-xtrabackup-2.2.3/sql/item.h percona-xtrabackup-2.3.7/sql/item.h
--- percona-xtrabackup-2.2.3/sql/item.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,8 +1,7 @@
 #ifndef ITEM_INCLUDED
 #define ITEM_INCLUDED
 
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights
-   reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -4051,6 +4050,11 @@
   row_version_type row_version;
   /* Next in list of all Item_trigger_field's in trigger */
   Item_trigger_field *next_trg_field;
+  /*
+    Next list of Item_trigger_field's in "sp_head::
+    m_list_of_trig_fields_item_lists".
+  */
+  SQL_I_List<Item_trigger_field> *next_trig_field_list;
   /* Index of the field in the TABLE::field array */
   uint field_idx;
   /* Pointer to Table_trigger_list object for table of this trigger */
@@ -4062,8 +4066,9 @@
                      ulong priv, const bool ro)
     :Item_field(context_arg,
                (const char *)NULL, (const char *)NULL, field_name_arg),
-     row_version(row_ver_arg), field_idx((uint)-1), original_privilege(priv),
-     want_privilege(priv), table_grants(NULL), read_only (ro)
+     row_version(row_ver_arg), next_trig_field_list(NULL), field_idx((uint)-1),
+     original_privilege(priv), want_privilege(priv), table_grants(NULL),
+     read_only (ro)
   {}
   void setup_field(THD *thd, TABLE *table, GRANT_INFO *table_grant_info);
   enum Type type() const { return TRIGGER_FIELD_ITEM; }
@@ -4167,7 +4172,11 @@
     collation.set(item->collation);
     unsigned_flag= item->unsigned_flag;
     if (item->type() == FIELD_ITEM)
+    {
       cached_field= ((Item_field *)item)->field;
+      if (cached_field->table)
+        used_table_map= cached_field->table->map;
+    }
     return 0;
   };
   enum Type type() const { return CACHE_ITEM; }
diff -Nru percona-xtrabackup-2.2.3/sql/item_row.cc percona-xtrabackup-2.3.7/sql/item_row.cc
--- percona-xtrabackup-2.2.3/sql/item_row.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item_row.cc	2017-02-27 07:47:02.000000000 +0000
@@ -56,6 +56,30 @@
   }
 }
 
+Item_row::Item_row(Item *head, List<Item> &tail):
+  used_tables_cache(0), not_null_tables_cache(0),
+  const_item_cache(1), with_null(0)
+{
+
+  //TODO: think placing 2-3 component items in item (as it done for function)
+  arg_count= 1 + tail.elements;
+  items= (Item**) sql_alloc(sizeof(Item*)*arg_count);
+  if (items == NULL)
+  {
+    arg_count= 0;
+    return; // OOM
+  }
+  items[0]= head;
+  List_iterator<Item> li(tail);
+  uint i= 1;
+  Item *item;
+  while ((item= li++))
+  {
+    items[i]= item;
+    i++;    
+  }
+}
+
 void Item_row::illegal_method_call(const char *method)
 {
   DBUG_ENTER("Item_row::illegal_method_call");
@@ -73,7 +97,7 @@
   Item **arg, **arg_end;
   for (arg= items, arg_end= items+arg_count; arg != arg_end ; arg++)
   {
-    if ((*arg)->fix_fields(thd, arg))
+    if (!(*arg)->fixed && (*arg)->fix_fields(thd, arg))
       return TRUE;
     // we can't assign 'item' before, because fix_fields() can change arg
     Item *item= *arg;
diff -Nru percona-xtrabackup-2.2.3/sql/item_row.h percona-xtrabackup-2.3.7/sql/item_row.h
--- percona-xtrabackup-2.2.3/sql/item_row.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item_row.h	2017-02-27 07:47:02.000000000 +0000
@@ -25,6 +25,7 @@
   bool with_null;
 public:
   Item_row(List<Item> &);
+  Item_row(Item *head, List<Item> &tail);
   Item_row(Item_row *item):
     Item(),
     items(item->items),
diff -Nru percona-xtrabackup-2.2.3/sql/item_strfunc.cc percona-xtrabackup-2.3.7/sql/item_strfunc.cc
--- percona-xtrabackup-2.2.3/sql/item_strfunc.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item_strfunc.cc	2017-02-27 07:47:02.000000000 +0000
@@ -173,16 +173,27 @@
 }
 
 
+/*
+  The MD5()/SHA() functions treat their parameter as being a case sensitive.
+  Thus we set binary collation on it so different instances of MD5() will be
+  compared properly.
+*/
+static CHARSET_INFO *get_checksum_charset(const char *csname)
+{
+  CHARSET_INFO *cs= get_charset_by_csname(csname, MY_CS_BINSORT, MYF(0));
+  if (!cs)
+  {
+    // Charset has no binary collation: use my_charset_bin.
+    cs= &my_charset_bin;
+  }
+  return cs;
+}
+
+
 void Item_func_md5::fix_length_and_dec()
 {
-  /*
-    The MD5() function treats its parameter as being a case sensitive. Thus
-    we set binary collation on it so different instances of MD5() will be
-    compared properly.
-  */
-  args[0]->collation.set(
-      get_charset_by_csname(args[0]->collation.collation->csname,
-                            MY_CS_BINSORT,MYF(0)), DERIVATION_COERCIBLE);
+  CHARSET_INFO *cs= get_checksum_charset(args[0]->collation.collation->csname);
+  args[0]->collation.set(cs, DERIVATION_COERCIBLE);
   fix_length_and_charset(32, default_charset());
 }
 
@@ -212,14 +223,8 @@
 
 void Item_func_sha::fix_length_and_dec()
 {
-  /*
-    The SHA() function treats its parameter as being a case sensitive. Thus
-    we set binary collation on it so different instances of MD5() will be
-    compared properly.
-  */
-  args[0]->collation.set(
-      get_charset_by_csname(args[0]->collation.collation->csname,
-                            MY_CS_BINSORT,MYF(0)), DERIVATION_COERCIBLE);
+  CHARSET_INFO *cs= get_checksum_charset(args[0]->collation.collation->csname);
+  args[0]->collation.set(cs, DERIVATION_COERCIBLE);
   // size of hex representation of hash
   fix_length_and_charset(SHA1_HASH_SIZE * 2, default_charset());
 }
@@ -342,18 +347,9 @@
       ER(ER_WRONG_PARAMETERS_TO_NATIVE_FCT), "sha2");
   }
 
-  /*
-    The SHA2() function treats its parameter as being a case sensitive.
-    Thus we set binary collation on it so different instances of SHA2()
-    will be compared properly.
-  */
+  CHARSET_INFO *cs= get_checksum_charset(args[0]->collation.collation->csname);
+  args[0]->collation.set(cs, DERIVATION_COERCIBLE);
 
-  args[0]->collation.set(
-      get_charset_by_csname(
-        args[0]->collation.collation->csname,
-        MY_CS_BINSORT,
-        MYF(0)),
-      DERIVATION_COERCIBLE);
 #else
   push_warning_printf(current_thd,
     Sql_condition::WARN_LEVEL_WARN,
@@ -1827,6 +1823,42 @@
   return (&tmp_value);
 }
 
+
+/**
+  A helper function for trim(leading ...) for multibyte charsets.
+  @param res        Copy of 'res' in calling functions.
+  @param ptr        Where to start trimming.
+  @param end        End of string to be trimmed.
+  @param remove_str The string to be removed from [ptr .. end)
+  @return           Pointer to left-trimmed string.
+ */
+static inline
+char *trim_left_mb(String *res, char *ptr, char *end, String *remove_str)
+{
+  const char * const r_ptr= remove_str->ptr();
+  const uint remove_length= remove_str->length();
+
+  while (ptr + remove_length <= end)
+  {
+    uint num_bytes= 0;
+    while (num_bytes < remove_length)
+    {
+      uint len;
+      if ((len= my_ismbchar(res->charset(), ptr + num_bytes, end)))
+        num_bytes+= len;
+      else
+        ++num_bytes;
+    }
+    if (num_bytes != remove_length)
+      break;
+    if (memcmp(ptr, r_ptr, remove_length))
+      break;
+    ptr+= remove_length;
+  }
+  return ptr;
+}
+
+
 /*
 ** The trim functions are extension to ANSI SQL because they trim substrings
 ** They ltrim() and rtrim() functions are optimized for 1 byte strings
@@ -1861,19 +1893,28 @@
 
   ptr= (char*) res->ptr();
   end= ptr+res->length();
-  if (remove_length == 1)
+#ifdef USE_MB
+  if (use_mb(res->charset()))
   {
-    char chr=(*remove_str)[0];
-    while (ptr != end && *ptr == chr)
-      ptr++;
+    ptr= trim_left_mb(res, ptr, end, remove_str);
   }
   else
+#endif /* USE_MB */
   {
-    const char *r_ptr=remove_str->ptr();
-    end-=remove_length;
-    while (ptr <= end && !memcmp(ptr, r_ptr, remove_length))
-      ptr+=remove_length;
-    end+=remove_length;
+    if (remove_length == 1)
+    {
+      char chr=(*remove_str)[0];
+      while (ptr != end && *ptr == chr)
+        ptr++;
+    }
+    else
+    {
+      const char *r_ptr=remove_str->ptr();
+      end-=remove_length;
+      while (ptr <= end && !memcmp(ptr, r_ptr, remove_length))
+        ptr+=remove_length;
+      end+=remove_length;
+    }
   }
   if (ptr == res->ptr())
     return res;
@@ -1967,11 +2008,8 @@
 {
   DBUG_ASSERT(fixed == 1);
   char buff[MAX_FIELD_WIDTH], *ptr, *end;
-  const char *r_ptr;
   String tmp(buff, sizeof(buff), system_charset_info);
   String *res, *remove_str;
-  uint remove_length;
-  LINT_INIT(remove_length);
 
   res= args[0]->val_str(str);
   if ((null_value=args[0]->null_value))
@@ -1984,33 +2022,19 @@
       return 0;
   }
 
-  if ((remove_length= remove_str->length()) == 0 ||
+  const uint remove_length= remove_str->length();
+  if (remove_length == 0 ||
       remove_length > res->length())
     return res;
 
   ptr= (char*) res->ptr();
   end= ptr+res->length();
-  r_ptr= remove_str->ptr();
+  const char * const r_ptr= remove_str->ptr();
 #ifdef USE_MB
   if (use_mb(res->charset()))
   {
-    while (ptr + remove_length <= end)
-    {
-      uint num_bytes= 0;
-      while (num_bytes < remove_length)
-      {
-        uint len;
-        if ((len= my_ismbchar(res->charset(), ptr + num_bytes, end)))
-          num_bytes+= len;
-        else
-          ++num_bytes;
-      }
-      if (num_bytes != remove_length)
-        break;
-      if (memcmp(ptr, r_ptr, remove_length))
-        break;
-      ptr+= remove_length;
-    }
+    ptr= trim_left_mb(res, ptr, end, remove_str);
+
     char *p=ptr;
     register uint32 l;
  loop:
@@ -2694,7 +2718,7 @@
       return 0; /* purecov: inspected */
     nr= my_double_round(nr, (longlong) dec, FALSE, FALSE);
     str->set_real(nr, dec, &my_charset_numeric);
-    if (isnan(nr) || my_isinf(nr))
+    if (my_isnan(nr) || my_isinf(nr))
       return str;
     str_length=str->length();
   }
@@ -3229,6 +3253,16 @@
     rpad->set_charset(&my_charset_bin);
   }
 
+#ifdef USE_MB
+  if (use_mb(rpad->charset()))
+  {
+    // This will chop off any trailing illegal characters from rpad.
+    String *well_formed_pad= args[2]->check_well_formed_result(rpad, false);
+    if (!well_formed_pad)
+      goto err;
+  }
+#endif
+
   if (count <= (res_char_length= res->numchars()))
   {						// String to pad is big enough
     res->length(res->charpos((int) count));	// Shorten result if longer
@@ -3334,6 +3368,16 @@
     pad->set_charset(&my_charset_bin);
   }
 
+#ifdef USE_MB
+  if (use_mb(pad->charset()))
+  {
+    // This will chop off any trailing illegal characters from pad.
+    String *well_formed_pad= args[2]->check_well_formed_result(pad, false);
+    if (!well_formed_pad)
+      goto err;
+  }
+#endif
+
   res_char_length= res->numchars();
 
   if (count <= res_char_length)
diff -Nru percona-xtrabackup-2.2.3/sql/item_sum.cc percona-xtrabackup-2.3.7/sql/item_sum.cc
--- percona-xtrabackup-2.2.3/sql/item_sum.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item_sum.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
    rights reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -790,17 +790,39 @@
     if (!(tmp_table_param= new TMP_TABLE_PARAM))
       return TRUE;
 
-    /* Create a table with an unique key over all parameters */
-    for (uint i=0; i < item_sum->get_arg_count() ; i++)
+    /**
+      Create a table with an unique key over all parameters.
+      If the list contains only const values, const_distinct
+      is set to CONST_NOT_NULL to avoid creation of temp table
+      and thereby counting as count(distinct of const values)
+      will always be 1. If any of these const values is null,
+      const_distinct is set to CONST_NULL to ensure aggregation
+      does not happen.
+     */
+    uint const_items= 0;
+    uint num_args= item_sum->get_arg_count();
+    DBUG_ASSERT(num_args);
+    for (uint i=0; i < num_args; i++)
     {
       Item *item=item_sum->get_arg(i);
       if (list.push_back(item))
-        return TRUE;                              // End of memory
-      if (item->const_item() && item->is_null())
-        always_null= true;
+        return true;                              // End of memory
+      if (item->const_item())
+      {
+        if (item->is_null())
+        {
+          const_distinct= CONST_NULL;
+          return false;
+        }
+        else
+          const_items++;
+      }
+    }
+    if (num_args == const_items)
+    {
+      const_distinct= CONST_NOT_NULL;
+      return false;
     }
-    if (always_null)
-      return FALSE;
     count_field_types(select_lex, tmp_table_param, list, 0);
     tmp_table_param->force_copy_fields= item_sum->has_force_copy_fields();
     DBUG_ASSERT(table == 0);
@@ -928,11 +950,12 @@
     {
       (void) arg->val_int();
       if (arg->null_value)
-        always_null= true;
+      {
+        const_distinct= CONST_NULL;
+        DBUG_RETURN(false);
+      }
     }
 
-    if (always_null)
-      DBUG_RETURN(FALSE);
 
     enum enum_field_types field_type;
 
@@ -977,7 +1000,7 @@
   item_sum->clear();
   if (tree)
     tree->reset();
-  /* tree and table can be both null only if always_null */
+  /* tree and table can be both null only if const_distinct is enabled*/
   if (item_sum->sum_func() == Item_sum::COUNT_FUNC || 
       item_sum->sum_func() == Item_sum::COUNT_DISTINCT_FUNC)
   {
@@ -1013,13 +1036,21 @@
 
 bool Aggregator_distinct::add()
 {
-  if (always_null)
+  if (const_distinct == CONST_NULL)
     return 0;
 
   if (item_sum->sum_func() == Item_sum::COUNT_FUNC || 
       item_sum->sum_func() == Item_sum::COUNT_DISTINCT_FUNC)
   {
     int error;
+
+    if (const_distinct == CONST_NOT_NULL)
+    {
+      DBUG_ASSERT(item_sum->fixed == 1);
+      Item_sum_count *sum= (Item_sum_count *)item_sum;
+      sum->count= 1;
+      return 0;
+    }
     copy_fields(tmp_table_param);
     if (copy_funcs(tmp_table_param->items_to_copy, table->in_use))
       return TRUE;
@@ -1076,11 +1107,17 @@
   if (endup_done)
     return;
 
+  if (const_distinct ==  CONST_NOT_NULL)
+  {
+    endup_done= TRUE;
+    return;
+  }
+
   /* we are going to calculate the aggregate value afresh */
   item_sum->clear();
 
   /* The result will definitely be null : no more calculations needed */
-  if (always_null)
+  if (const_distinct == CONST_NULL)
     return;
 
   if (item_sum->sum_func() == Item_sum::COUNT_FUNC || 
@@ -1088,6 +1125,7 @@
   {
     DBUG_ASSERT(item_sum->fixed == 1);
     Item_sum_count *sum= (Item_sum_count *)item_sum;
+
     if (tree && tree->elements == 0)
     {
       /* everything fits in memory */
diff -Nru percona-xtrabackup-2.2.3/sql/item_sum.h percona-xtrabackup-2.3.7/sql/item_sum.h
--- percona-xtrabackup-2.2.3/sql/item_sum.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item_sum.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_SUM_INCLUDED
 #define ITEM_SUM_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. reserved.
    reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -589,14 +589,24 @@
   */  
   uint tree_key_length;
 
-  /* 
-    Set to true if the result is known to be always NULL.
-    If set deactivates creation and usage of the temporary table (in the 
-    'table' member) and the Unique instance (in the 'tree' member) as well as 
-    the calculation of the final value on the first call to 
-    Item_[sum|avg|count]::val_xxx(). 
-  */
-  bool always_null;
+  enum Const_distinct{
+    NOT_CONST= 0,
+    /**
+      Set to true if the result is known to be always NULL.
+      If set deactivates creation and usage of the temporary table (in the
+      'table' member) and the Unique instance (in the 'tree' member) as well as
+      the calculation of the final value on the first call to
+      Item_[sum|avg|count]::val_xxx().
+     */
+    CONST_NULL,
+    /**
+      Set to true if count distinct is on only const items. Distinct on a const
+      value will always be the constant itself. And count distinct of the same
+      would always be 1. Similar to CONST_NULL, it avoids creation of temporary
+      table and the Unique instance.
+     */
+    CONST_NOT_NULL
+  } const_distinct;
 
   /**
     When feeding back the data in endup() from Unique/temp table back to
@@ -611,7 +621,7 @@
 public:
   Aggregator_distinct (Item_sum *sum) :
     Aggregator(sum), table(NULL), tmp_table_param(NULL), tree(NULL),
-    always_null(false), use_distinct_values(false) {}
+    const_distinct(NOT_CONST), use_distinct_values(false) {}
   virtual ~Aggregator_distinct ();
   Aggregator_type Aggrtype() { return DISTINCT_AGGREGATOR; }
 
diff -Nru percona-xtrabackup-2.2.3/sql/item_timefunc.h percona-xtrabackup-2.3.7/sql/item_timefunc.h
--- percona-xtrabackup-2.2.3/sql/item_timefunc.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/item_timefunc.h	2017-02-27 07:47:02.000000000 +0000
@@ -896,6 +896,7 @@
   bool basic_const_item() const { return true; }
   bool const_item() const { return true; }
   table_map used_tables() const { return (table_map) 0L; }
+  table_map not_null_tables() const { return used_tables(); }
   void cleanup()
   {
     // See Item_basic_const::cleanup()
@@ -953,6 +954,7 @@
   bool basic_const_item() const { return true; }
   bool const_item() const { return true; }
   table_map used_tables() const { return (table_map) 0L; }
+  table_map not_null_tables() const { return used_tables(); }
   void cleanup()
   {
     // See Item_basic_const::cleanup()
@@ -1010,6 +1012,7 @@
   bool basic_const_item() const { return true; }
   bool const_item() const { return true; }
   table_map used_tables() const { return (table_map) 0L; }
+  table_map not_null_tables() const { return used_tables(); }
   void cleanup()
   {
     // See Item_basic_const::cleanup()
diff -Nru percona-xtrabackup-2.2.3/sql/key.cc percona-xtrabackup-2.3.7/sql/key.cc
--- percona-xtrabackup-2.2.3/sql/key.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/key.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -493,6 +493,7 @@
     -   0		Key is equal to range or 'range' == 0 (no range)
     -  -1		Key is less than range
     -   1		Key is larger than range
+  @note: keep this function and key_cmp2() in sync
 */
 
 int key_cmp(KEY_PART_INFO *key_part, const uchar *key, uint key_length)
@@ -532,6 +533,87 @@
 
 
 /**
+  Compare two given keys
+
+  @param key_part		Key part handler
+  @param key1			Key to be compared with key2
+  @param key1_length		length of 'key1'
+  @param key2                   Key to be compared with key1
+  @param key2_length		length of 'key2'
+
+  @return
+    The return value is an integral value indicating the
+    relationship between the two keys:
+    -   0                       key1 = key2
+    -  -1                       Key1 < Key2
+    -   1                       Key1 > Key2
+  @note: keep this function and key_cmp() in sync
+
+  Below comparison code is under the assumption
+  that key1_length and key2_length are same and
+  key1_length, key2_length are non zero value.
+*/
+int key_cmp2(KEY_PART_INFO *key_part,
+                 const uchar *key1, uint key1_length,
+                 const uchar *key2, uint key2_length)
+{
+  DBUG_ASSERT(key_part && key1 && key2);
+  DBUG_ASSERT((key1_length == key2_length) && key1_length != 0 );
+  uint store_length;
+
+  /* Compare all the subkeys (if it is a composite key) */
+  for (const uchar *end= key1 + key1_length; key1 < end;
+       key1+= store_length, key2+= store_length, key_part++)
+  {
+    store_length= key_part->store_length;
+    /* This key part allows null values; NULL is lower than everything */
+    if (key_part->null_bit)
+    {
+      if (*key1 != *key2)
+      {
+        /*
+          Key Format= "1 byte (NULL Indicator flag) + Key value"
+          If NULL Indicator flag is '1' that means the key is NULL value
+          and If the flag is '0' that means the key is Non-NULL value.
+
+          If null indicating flag in key1 and key2 are not same, then
+            > if key1's null flag is '1' (i.e., key1 is NULL), return -1
+            > if key1's null flag is '0' (i.e., key1 is NOT NULL), then
+              key2's null flag is '1' (since *key1 != *key2) then return 1;
+        */
+        return (*key1) ? -1 : 1;
+      }
+      else
+      {
+        /*
+          If null indicating flag in key1 and key2 are same and
+            > if it is '1' , both are NULLs and both are same, continue with
+              next key in key_part.
+            > if it is '0', then go ahead and compare the content using
+              field->key_cmp.
+        */
+        if (*key1)
+          continue;
+      }
+      /*
+        Increment the key1 and key2 pointers to point them to the actual
+        key values
+      */
+      key1++;
+      key2++;
+      store_length--;
+    }
+    /* Compare two keys using field->key_cmp */
+    int cmp;
+    if ((cmp= key_part->field->key_cmp(key1, key2)) < 0)
+      return -1;
+    if (cmp > 0)
+      return 1;
+  }
+  return 0; /* Keys are equal */
+}
+
+/**
   Compare two records in index order.
 
   This method is set-up such that it can be called directly from the
diff -Nru percona-xtrabackup-2.2.3/sql/key.h percona-xtrabackup-2.3.7/sql/key.h
--- percona-xtrabackup-2.2.3/sql/key.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/key.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2014, 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
@@ -36,6 +36,9 @@
                   bool prefix_key);
 bool is_key_used(TABLE *table, uint idx, const MY_BITMAP *fields);
 int key_cmp(KEY_PART_INFO *key_part, const uchar *key, uint key_length);
+int key_cmp2(KEY_PART_INFO *key_part,
+             const uchar *key1, uint key1_length,
+             const uchar *key2, uint key2_length);
 extern "C" int key_rec_cmp(void *key_info, uchar *a, uchar *b);
 
 #endif /* KEY_INCLUDED */
diff -Nru percona-xtrabackup-2.2.3/sql/log.cc percona-xtrabackup-2.3.7/sql/log.cc
--- percona-xtrabackup-2.2.3/sql/log.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/log.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -1054,7 +1054,7 @@
 
     /* fill in user_host value: the format is "%s[%s] @ %s [%s]" */
     user_host_len= (strxnmov(user_host_buff, MAX_USER_HOST_SIZE,
-                             sctx->priv_user ? sctx->priv_user : "", "[",
+                             sctx->priv_user, "[",
                              sctx->user ? sctx->user : "", "] @ ",
                              sctx->get_host()->length() ?
                              sctx->get_host()->ptr() : "", " [",
@@ -1114,12 +1114,6 @@
 
   current_time= my_time(0);
 
-  mysql_audit_general_log(thd, current_time,
-                          user_host_buff, user_host_len,
-                          command_name[(uint) command].str,
-                          command_name[(uint) command].length,
-                          query, query_length);
-                        
   while (*current_handler)
     error|= (*current_handler++)->
       log_general(thd, current_time, user_host_buff,
@@ -1529,6 +1523,7 @@
                      const char *new_name, enum cache_type io_cache_type_arg)
 {
   char buff[FN_REFLEN];
+  MY_STAT f_stat;
   File file= -1;
   my_off_t pos= 0;
   int open_flags= O_CREAT | O_BINARY;
@@ -1544,7 +1539,12 @@
   }
 
   if (init_and_set_log_file_name(name, new_name,
-                                 log_type_arg, io_cache_type_arg))
+                                 log_type_arg, io_cache_type_arg) ||
+      DBUG_EVALUATE_IF("fault_injection_init_name", log_type == LOG_BIN, 0))
+    goto err;
+
+  /* File is regular writable file */
+  if (my_stat(log_file_name, &f_stat, MYF(0)) && !MY_S_ISREG(f_stat.st_mode))
     goto err;
 
   if (io_cache_type == SEQ_READ_APPEND)
@@ -1605,10 +1605,28 @@
   DBUG_RETURN(0);
 
 err:
-  sql_print_error("Could not use %s for logging (error %d). \
-Turning logging off for the whole duration of the MySQL server process. \
-To turn it on again: fix the cause, \
-shutdown the MySQL server and restart it.", name, errno);
+  if (log_type == LOG_BIN && binlog_error_action == ABORT_SERVER)
+  {
+    THD *thd= current_thd;
+    /*
+      On fatal error when code enters here we should forcefully clear the
+      previous errors so that a new critical error message can be pushed
+      to the client side.
+     */
+    thd->clear_error();
+    my_error(ER_BINLOG_LOGGING_IMPOSSIBLE, MYF(0), "Either disk is full or "
+             "file system is read only while opening the binlog. Aborting the "
+             "server");
+    thd->protocol->end_statement();
+    _exit(EXIT_FAILURE);
+  }
+  else
+    sql_print_error("Could not open %s for logging (error %d). "
+                    "Turning logging off for the whole duration "
+                    "of the MySQL server process. To turn it on "
+                    "again: fix the cause, shutdown the MySQL "
+                    "server and restart it.",
+                    name, errno);
   if (file >= 0)
     mysql_file_close(file, MYF(0));
   end_io_cache(&log_file);
@@ -2065,7 +2083,8 @@
 }
 
 
-bool LOGGER::log_command(THD *thd, enum enum_server_command command)
+bool LOGGER::log_command(THD *thd, enum enum_server_command command,
+                         const char *query_str, size_t query_length)
 {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   Security_context *sctx= thd->security_ctx;
@@ -2074,6 +2093,12 @@
     Log command if we have at least one log event handler enabled and want
     to log this king of commands
   */
+
+  /* Audit notification when no general log handler present */
+  mysql_audit_general_log(thd, command_name[(uint) command].str,
+                          command_name[(uint) command].length,
+                          query_str, query_length);
+
   if (*general_log_handler_list && (what_to_log & (1L << (uint) command)))
   {
     if ((thd->variables.option_bits & OPTION_LOG_OFF)
@@ -2100,7 +2125,7 @@
   uint error= 0;
 
   /* Print the message to the buffer if we want to log this king of commands */
-  if (! logger.log_command(thd, command))
+  if (! logger.log_command(thd, command, "", 0))
     return FALSE;
 
   va_start(args, format);
@@ -2114,7 +2139,7 @@
                        const char *query, uint query_length)
 {
   /* Write the message to the log if we want to log this king of commands */
-  if (logger.log_command(thd, command))
+  if (logger.log_command(thd, command, query, query_length))
     return logger.general_log_write(thd, command, query, query_length);
 
   return FALSE;
@@ -2187,11 +2212,20 @@
 extern "C" my_bool reopen_fstreams(const char *filename,
                                    FILE *outstream, FILE *errstream)
 {
-  if (outstream && !my_freopen(filename, "a", outstream))
-    return TRUE;
+  int retries= 2, errors= 0;
 
-  if (errstream && !my_freopen(filename, "a", errstream))
-    return TRUE;
+  do
+  {
+    errors= 0;
+    if (errstream && !my_freopen(filename, "a", errstream))
+      errors++;
+    if (outstream && !my_freopen(filename, "a", outstream))
+      errors++;
+  }
+  while (retries-- && errors);
+
+  if (errors)
+    return true;
 
   /* The error stream must be unbuffered. */
   if (errstream)
diff -Nru percona-xtrabackup-2.2.3/sql/log_event.cc percona-xtrabackup-2.3.7/sql/log_event.cc
--- percona-xtrabackup-2.2.3/sql/log_event.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/log_event.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -30,7 +30,6 @@
 #include "sql_base.h"                           // close_thread_tables
 #include "sql_cache.h"                       // QUERY_CACHE_FLAGS_SIZE
 #include "sql_locale.h" // MY_LOCALE, my_locale_by_number, my_locale_en_US
-#include "key.h"        // key_copy
 #include "lock.h"       // mysql_unlock_tables
 #include "sql_parse.h"  // mysql_test_parse_for_slave
 #include "tztime.h"     // struct Time_zone
@@ -59,9 +58,14 @@
 #include <my_bitmap.h>
 #include "rpl_utility.h"
 
+#include "sql_digest.h"
+
 using std::min;
 using std::max;
 
+/* The number of event types need to be permuted. */
+static const uint EVENT_TYPE_PERMUTATION_NUM= 23;
+
 /**
   BINLOG_CHECKSUM variable.
 */
@@ -1259,15 +1263,22 @@
     }
     else
     {
-      /* Corrupt the event for Dump thread*/
+      /*
+        Corrupt the event for Dump thread.
+        We also need to exclude Previous_gtids_log_event and Gtid_log_event
+        events from injected corruption to allow dump thread to move forward
+        on binary log until the missing transactions from slave when
+        MASTER_AUTO_POSITION= 1.
+      */
       DBUG_EXECUTE_IF("corrupt_read_log_event",
 	uchar *debug_event_buf_c = (uchar*) packet->ptr() + ev_offset;
-        if (debug_event_buf_c[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT)
+        if (debug_event_buf_c[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
+            debug_event_buf_c[EVENT_TYPE_OFFSET] != PREVIOUS_GTIDS_LOG_EVENT &&
+            debug_event_buf_c[EVENT_TYPE_OFFSET] != GTID_LOG_EVENT)
         {
           int debug_cor_pos = rand() % (data_len + sizeof(buf) - BINLOG_CHECKSUM_LEN);
           debug_event_buf_c[debug_cor_pos] =~ debug_event_buf_c[debug_cor_pos];
           DBUG_PRINT("info", ("Corrupt the event at Log_event::read_log_event: byte on position %d", debug_cor_pos));
-          DBUG_SET("-d,corrupt_read_log_event");
 	}
       );                                                                                           
       /*
@@ -1430,7 +1441,6 @@
 
   /* Check the integrity */
   if (event_len < EVENT_LEN_OFFSET ||
-      buf[EVENT_TYPE_OFFSET] >= ENUM_END_EVENT ||
       (uint) event_len != uint4korr(buf+EVENT_LEN_OFFSET))
   {
     DBUG_PRINT("error", ("event_len=%u EVENT_LEN_OFFSET=%d "
@@ -1447,6 +1457,22 @@
   // all following START events in the current file are without checksum
   if (event_type == START_EVENT_V3)
     (const_cast< Format_description_log_event *>(description_event))->checksum_alg= BINLOG_CHECKSUM_ALG_OFF;
+  // Sanity check for Format description event
+  if (event_type == FORMAT_DESCRIPTION_EVENT)
+  {
+    if (event_len < LOG_EVENT_MINIMAL_HEADER_LEN +
+        ST_COMMON_HEADER_LEN_OFFSET)
+    {
+      *error= "Found invalid Format description event in binary log";
+      DBUG_RETURN(0);
+    }
+    uint tmp_header_len= buf[LOG_EVENT_MINIMAL_HEADER_LEN + ST_COMMON_HEADER_LEN_OFFSET];
+    if (event_len < tmp_header_len + ST_SERVER_VER_OFFSET + ST_SERVER_VER_LEN)
+    {
+      *error= "Found invalid Format description event in binary log";
+      DBUG_RETURN(0);
+    }
+  }
   /*
     CRC verification by SQL and Show-Binlog-Events master side.
     The caller has to provide @description_event->checksum_alg to
@@ -1478,9 +1504,11 @@
       DBUG_PRINT("info", ("Corrupt the event at Log_event::read_log_event(char*,...): byte on position %d", debug_cor_pos));
       DBUG_SET("");
     }
-  );                                                 
+  );
   if (crc_check &&
-      event_checksum_test((uchar *) buf, event_len, alg))
+      event_checksum_test((uchar *) buf, event_len, alg) &&
+      /* Skip the crc check when simulating an unknown ignorable log event. */
+      !DBUG_EVALUATE_IF("simulate_unknown_ignorable_log_event", 1, 0))
   {
     *error= "Event crc check failed! Most likely there is event corruption.";
 #ifdef MYSQL_CLIENT
@@ -1494,7 +1522,12 @@
   }
 
   if (event_type > description_event->number_of_event_types &&
-      event_type != FORMAT_DESCRIPTION_EVENT)
+      event_type != FORMAT_DESCRIPTION_EVENT &&
+      /*
+        Skip the event type check when simulating an
+        unknown ignorable log event.
+      */
+      !DBUG_EVALUATE_IF("simulate_unknown_ignorable_log_event", 1, 0))
   {
     /*
       It is unsafe to use the description_event if its post_header_len
@@ -1520,10 +1553,16 @@
     */
     if (description_event->event_type_permutation)
     {
-      int new_event_type= description_event->event_type_permutation[event_type];
+      uint new_event_type;
+      if (event_type >= EVENT_TYPE_PERMUTATION_NUM)
+        /* Safe guard for read out of bounds of event_type_permutation. */
+        new_event_type= UNKNOWN_EVENT;
+      else
+        new_event_type= description_event->event_type_permutation[event_type];
+
       DBUG_PRINT("info", ("converting event type %d to %d (%s)",
-                   event_type, new_event_type,
-                   get_type_str((Log_event_type)new_event_type)));
+                 event_type, new_event_type,
+                 get_type_str((Log_event_type)new_event_type)));
       event_type= new_event_type;
     }
 
@@ -1558,7 +1597,7 @@
       ev = new Execute_load_log_event(buf, event_len, description_event);
       break;
     case START_EVENT_V3: /* this is sent only by MySQL <=4.x */
-      ev = new Start_log_event_v3(buf, description_event);
+      ev = new Start_log_event_v3(buf, event_len, description_event);
       break;
     case STOP_EVENT:
       ev = new Stop_log_event(buf, description_event);
@@ -2559,13 +2598,8 @@
   */
   time_t ts_tmp= ts ? *ts : (ulong)when.tv_sec;
   DBUG_ENTER("Log_event::print_timestamp");
-#ifdef MYSQL_SERVER				// This is always false
   struct tm tm_tmp;
   localtime_r(&ts_tmp, (res= &tm_tmp));
-#else
-  res= localtime(&ts_tmp);
-#endif
-
   my_b_printf(file,"%02d%02d%02d %2d:%02d:%02d",
               res->tm_year % 100,
               res->tm_mon+1,
@@ -2699,7 +2733,7 @@
   {
     if (!rli->curr_group_seen_gtid && !rli->curr_group_seen_begin)
     {
-      ulong gaq_idx;
+      ulong gaq_idx __attribute__((unused));
       rli->mts_groups_assigned++;
 
       rli->curr_group_isolated= FALSE;
@@ -2858,9 +2892,9 @@
       if (!(get_type_code() == INTVAR_EVENT ||
             get_type_code() == RAND_EVENT ||
             get_type_code() == USER_VAR_EVENT ||
-            get_type_code() == ROWS_QUERY_LOG_EVENT ||
             get_type_code() == BEGIN_LOAD_QUERY_EVENT ||
-            get_type_code() == APPEND_BLOCK_EVENT))
+            get_type_code() == APPEND_BLOCK_EVENT ||
+            is_ignorable_event()))
       {
         DBUG_ASSERT(!ret_worker);
 
@@ -3390,26 +3424,23 @@
       }
     }
 
-    if (user.length > 0)
-    {
-      *start++= Q_INVOKER;
+    *start++= Q_INVOKER;
 
-      /*
-        Store user length and user. The max length of use is 16, so 1 byte is
-        enough to store the user's length.
-       */
-      *start++= (uchar)user.length;
-      memcpy(start, user.str, user.length);
-      start+= user.length;
+    /*
+      Store user length and user. The max length of use is 16, so 1 byte is
+      enough to store the user's length.
+     */
+    *start++= (uchar)user.length;
+    memcpy(start, user.str, user.length);
+    start+= user.length;
 
-      /*
-        Store host length and host. The max length of host is 60, so 1 byte is
-        enough to store the host's length.
-       */
-      *start++= (uchar)host.length;
-      memcpy(start, host.str, host.length);
-      start+= host.length;
-    }
+    /*
+      Store host length and host. The max length of host is 60, so 1 byte is
+      enough to store the host's length.
+     */
+    *start++= (uchar)host.length;
+    memcpy(start, host.str, host.length);
+    start+= host.length;
   }
 
   if (thd && thd->get_binlog_accessed_db_names() != NULL)
@@ -4061,12 +4092,16 @@
       user.length= *pos++;
       CHECK_SPACE(pos, end, user.length);
       user.str= (char *)pos;
+      if (user.length == 0)
+        user.str= (char *)"";
       pos+= user.length;
 
       CHECK_SPACE(pos, end, 1);
       host.length= *pos++;
       CHECK_SPACE(pos, end, host.length);
       host.str= (char *)pos;
+      if (host.length == 0)
+        host.str= (char *)"";
       pos+= host.length;
       break;
     }
@@ -4573,6 +4608,7 @@
 int Query_log_event::do_apply_event(Relay_log_info const *rli,
                                       const char *query_arg, uint32 q_len_arg)
 {
+  DBUG_ENTER("Query_log_event::do_apply_event");
   int expected_error,actual_error= 0;
   HA_CREATE_INFO db_options;
 
@@ -4655,7 +4691,6 @@
             ::do_apply_event(), then the companion SET also have so
             we don't need to reset_one_shot_variables().
   */
-  if (is_trans_keyword() || rpl_filter->db_ok(thd->db))
   {
     thd->set_time(&when);
     thd->set_query_and_id((char*)query_arg, q_len_arg,
@@ -4784,12 +4819,17 @@
       Parser_state parser_state;
       if (!parser_state.init(thd, thd->query(), thd->query_length()))
       {
+        DBUG_ASSERT(thd->m_digest == NULL);
+        thd->m_digest= & thd->m_digest_state;
+        DBUG_ASSERT(thd->m_statement_psi == NULL);
         thd->m_statement_psi= MYSQL_START_STATEMENT(&thd->m_statement_state,
                                                     stmt_info_rpl.m_key,
                                                     thd->db, thd->db_length,
                                                     thd->charset());
         THD_STAGE_INFO(thd, stage_init);
         MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi, thd->query(), thd->query_length());
+        if (thd->m_digest != NULL)
+          thd->m_digest->reset(thd->m_token_array, max_digest_length);
 
         mysql_parse(thd, thd->query(), thd->query_length(), &parser_state);
         /* Finalize server status flags after executing a statement. */
@@ -5001,6 +5041,7 @@
   /* Mark the statement completed. */
   MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
   thd->m_statement_psi= NULL;
+  thd->m_digest= NULL;
 
   /*
     As a disk space optimization, future masters will not log an event for
@@ -5013,7 +5054,7 @@
   thd->first_successful_insert_id_in_prev_stmt= 0;
   thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt= 0;
   free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
-  return thd->is_slave_error;
+  DBUG_RETURN(thd->is_slave_error);
 }
 
 int Query_log_event::do_update_pos(Relay_log_info *rli)
@@ -5139,8 +5180,19 @@
     my_b_printf(head,"RESET CONNECTION%s\n", print_event_info->delimiter);
 #else
     my_b_printf(head,"ROLLBACK%s\n", print_event_info->delimiter);
+    if (print_event_info->is_gtid_next_set)
+      print_event_info->is_gtid_next_valid= false;
 #endif
   }
+  // set gtid_next=automatic if we have previously set it to uuid:number
+  if (!print_event_info->is_gtid_next_valid)
+  {
+    my_b_printf(head, "%sAUTOMATIC'%s\n",
+                Gtid_log_event::SET_STRING_PREFIX,
+                print_event_info->delimiter);
+    print_event_info->is_gtid_next_set= false;
+    print_event_info->is_gtid_next_valid= true;
+  }
   if (temp_buf &&
       print_event_info->base64_output_mode != BASE64_OUTPUT_NEVER &&
       !print_event_info->short_form)
@@ -5158,11 +5210,17 @@
   Start_log_event_v3::Start_log_event_v3()
 */
 
-Start_log_event_v3::Start_log_event_v3(const char* buf,
+Start_log_event_v3::Start_log_event_v3(const char* buf, uint event_len,
                                        const Format_description_log_event
                                        *description_event)
-  :Log_event(buf, description_event)
+  :Log_event(buf, description_event), binlog_version(BINLOG_VERSION)
 {
+  if (event_len < (uint)description_event->common_header_len +
+      ST_COMMON_HEADER_LEN_OFFSET)
+  {
+    server_version[0]= 0;
+    return;
+  }
   buf+= description_event->common_header_len;
   binlog_version= uint2korr(buf+ST_BINLOG_VER_OFFSET);
   memcpy(server_version, buf+ST_SERVER_VER_OFFSET,
@@ -5464,10 +5522,13 @@
                              const
                              Format_description_log_event*
                              description_event)
-  :Start_log_event_v3(buf, description_event), event_type_permutation(0)
+  :Start_log_event_v3(buf, event_len, description_event),
+   common_header_len(0), post_header_len(NULL), event_type_permutation(0)
 {
   ulong ver_calc;
   DBUG_ENTER("Format_description_log_event::Format_description_log_event(char*,...)");
+  if (!Start_log_event_v3::is_valid())
+    DBUG_VOID_RETURN; /* sanity check */
   buf+= LOG_EVENT_MINIMAL_HEADER_LEN;
   if ((common_header_len=buf[ST_COMMON_HEADER_LEN_OFFSET]) < OLD_HEADER_LEN)
     DBUG_VOID_RETURN; /* sanity check */
@@ -5576,7 +5637,7 @@
       post_header_len= NULL;
       DBUG_VOID_RETURN;
     }
-    static const uint8 perm[23]=
+    static const uint8 perm[EVENT_TYPE_PERMUTATION_NUM]=
       {
         UNKNOWN_EVENT, START_EVENT_V3, QUERY_EVENT, STOP_EVENT, ROTATE_EVENT,
         INTVAR_EVENT, LOAD_EVENT, SLAVE_EVENT, CREATE_FILE_EVENT,
@@ -5597,10 +5658,10 @@
       Since we use (permuted) event id's to index the post_header_len
       array, we need to permute the post_header_len array too.
     */
-    uint8 post_header_len_temp[23];
-    for (int i= 1; i < 23; i++)
+    uint8 post_header_len_temp[EVENT_TYPE_PERMUTATION_NUM];
+    for (uint i= 1; i < EVENT_TYPE_PERMUTATION_NUM; i++)
       post_header_len_temp[perm[i] - 1]= post_header_len[i - 1];
-    for (int i= 0; i < 22; i++)
+    for (uint i= 0; i < EVENT_TYPE_PERMUTATION_NUM - 1; i++)
       post_header_len[i] = post_header_len_temp[i];
   }
   DBUG_VOID_RETURN;
@@ -5682,7 +5743,8 @@
     original place when it comes to us; we'll know this by checking
     log_pos ("artificial" events have log_pos == 0).
   */
-  if (!is_artificial_event() && created && thd->transaction.all.ha_list)
+  if (!thd->rli_fake && !is_artificial_event() && created
+      && thd->transaction.all.ha_list)
   {
     /* This is not an error (XA is safe), just an information */
     rli->report(INFORMATION_LEVEL, 0,
@@ -5845,7 +5907,7 @@
   return
     //the DB name may double if we escape the quote character
     5 + 2*db_len + 3 +
-    18 + fname_len + 2 +                    // "LOAD DATA INFILE 'file''"
+    18 + fname_len*4 + 2 +                    // "LOAD DATA INFILE 'file''"
     11 +                                    // "CONCURRENT "
     7 +					    // LOCAL
     9 +                                     // " REPLACE or IGNORE "
@@ -5891,9 +5953,9 @@
 
   if (check_fname_outside_temp_buf())
     pos= strmov(pos, "LOCAL ");
-  pos= strmov(pos, "INFILE '");
-  memcpy(pos, fname, fname_len);
-  pos= strmov(pos+fname_len, "' ");
+  pos= strmov(pos, "INFILE ");
+  pos= pretty_print_str(pos, fname, fname_len);
+  pos= strmov(pos, " ");
 
   if (sql_ex.opt_flags & REPLACE_FLAG)
     pos= strmov(pos, "REPLACE ");
@@ -6829,10 +6891,18 @@
     5.0.0, there also are some rotates from the slave itself, in the
     relay log, which shall not change the group positions.
   */
+
+  /*
+    The way we check if SQL thread is currently in a group is different
+    for STS and MTS.
+  */
+  bool in_group = rli->is_parallel_exec() ?
+    (rli->mts_group_status == Relay_log_info::MTS_IN_GROUP) :
+    rli->is_in_group();
+
   if ((server_id != ::server_id || rli->replicate_same_server_id) &&
       !is_relay_log_event() &&
-      ((!rli->is_parallel_exec() && !rli->is_in_group()) ||
-       rli->mts_group_status != Relay_log_info::MTS_IN_GROUP))
+      !in_group)
   {
     if (rli->is_parallel_exec())
     {
@@ -6868,7 +6938,8 @@
                         (ulong) rli->get_group_master_log_pos()));
     mysql_mutex_unlock(&rli->data_lock);
     if (rli->is_parallel_exec())
-      rli->reset_notified_checkpoint(0, when.tv_sec + (time_t) exec_time,
+      rli->reset_notified_checkpoint(0,
+                                     server_id ? when.tv_sec + (time_t) exec_time : 0,
                                      true/*need_data_lock=true*/);
 
     /*
@@ -7306,6 +7377,8 @@
 int Xid_log_event::do_apply_event_worker(Slave_worker *w)
 {
   int error= 0;
+  lex_start(thd);
+  mysql_reset_thd_for_next_command(thd);
   Slave_committed_queue *coordinator_gaq= w->c_rli->gaq;
 
   /* For a slave Xid_log_event is COMMIT */
@@ -7344,13 +7417,26 @@
                   DBUG_SUICIDE(););
 
   error= do_commit(thd);
+  if (error)
+    w->rollback_positions(ptr_group);
 err:
   return error;
 }
 
 int Xid_log_event::do_apply_event(Relay_log_info const *rli)
 {
+  DBUG_ENTER("Xid_log_event::do_apply_event");
   int error= 0;
+  char saved_group_master_log_name[FN_REFLEN];
+  char saved_group_relay_log_name[FN_REFLEN];
+  volatile my_off_t saved_group_master_log_pos;
+  volatile my_off_t saved_group_relay_log_pos;
+
+  char new_group_master_log_name[FN_REFLEN];
+  char new_group_relay_log_name[FN_REFLEN];
+  volatile my_off_t new_group_master_log_pos;
+  volatile my_off_t new_group_relay_log_pos;
+
   lex_start(thd);
   mysql_reset_thd_for_next_command(thd);
   Relay_log_info *rli_ptr= const_cast<Relay_log_info *>(rli);
@@ -7361,6 +7447,17 @@
 
   mysql_mutex_lock(&rli_ptr->data_lock);
 
+  /*
+    Save the rli positions. We need them to temporarily reset the positions
+    just before the commit.
+   */
+  strmake(saved_group_master_log_name, rli_ptr->get_group_master_log_name(),
+          FN_REFLEN - 1);
+  saved_group_master_log_pos= rli_ptr->get_group_master_log_pos();
+  strmake(saved_group_relay_log_name, rli_ptr->get_group_relay_log_name(),
+          FN_REFLEN - 1);
+  saved_group_relay_log_pos= rli_ptr->get_group_relay_log_pos();
+
   DBUG_PRINT("info", ("do_apply group master %s %llu  group relay %s %llu event %s %llu\n",
     rli_ptr->get_group_master_log_name(),
     rli_ptr->get_group_master_log_pos(),
@@ -7384,17 +7481,25 @@
 
   if (log_pos) // 3.23 binlogs don't have log_posx
     rli_ptr->set_group_master_log_pos(log_pos);
-  
-  if ((error= rli_ptr->flush_info(rli_ptr->is_transactional())))
-    goto err;
+
+  /*
+    rli repository being transactional means replication is crash safe.
+    Positions are written into transactional tables ahead of commit and the
+    changes are made permanent during commit.
+   */
+  if (rli_ptr->is_transactional())
+  {
+    if ((error= rli_ptr->flush_info(true)))
+      goto err;
+  }
 
   DBUG_PRINT("info", ("do_apply group master %s %llu  group relay %s %llu event %s %llu\n",
-    rli_ptr->get_group_master_log_name(),
-    rli_ptr->get_group_master_log_pos(),
-    rli_ptr->get_group_relay_log_name(),
-    rli_ptr->get_group_relay_log_pos(),
-    rli_ptr->get_event_relay_log_name(),
-    rli_ptr->get_event_relay_log_pos()));
+                      rli_ptr->get_group_master_log_name(),
+                      rli_ptr->get_group_master_log_pos(),
+                      rli_ptr->get_group_relay_log_name(),
+                      rli_ptr->get_group_relay_log_pos(),
+                      rli_ptr->get_event_relay_log_name(),
+                      rli_ptr->get_event_relay_log_pos()));
 
   DBUG_EXECUTE_IF("crash_after_update_pos_before_apply",
                   sql_print_information("Crashing crash_after_update_pos_before_apply.");
@@ -7410,16 +7515,76 @@
                   {
                   thd->transaction.xid_state.xa_state = XA_IDLE;
                   });
+
+  /*
+    Save the new rli positions. These positions will be set back to group*
+    positions on successful completion of the commit operation.
+   */
+  strmake(new_group_master_log_name, rli_ptr->get_group_master_log_name(),
+          FN_REFLEN - 1);
+  new_group_master_log_pos= rli_ptr->get_group_master_log_pos();
+  strmake(new_group_relay_log_name, rli_ptr->get_group_relay_log_name(),
+          FN_REFLEN - 1);
+  new_group_relay_log_pos= rli_ptr->get_group_relay_log_pos();
+  /*
+    Rollback positions in memory just before commit. Position values will be
+    reset to their new values only on successful commit operation.
+   */
+  rli_ptr->set_group_master_log_name(saved_group_master_log_name);
+  rli_ptr->notify_group_master_log_name_update();
+  rli_ptr->set_group_master_log_pos(saved_group_master_log_pos);
+  rli_ptr->set_group_relay_log_name(saved_group_relay_log_name);
+  rli_ptr->notify_group_relay_log_name_update();
+  rli_ptr->set_group_relay_log_pos(saved_group_relay_log_pos);
+
+  DBUG_PRINT("info", ("Rolling back to group master %s %llu  group relay %s"
+                      " %llu\n", rli_ptr->get_group_master_log_name(),
+                      rli_ptr->get_group_master_log_pos(),
+                      rli_ptr->get_group_relay_log_name(),
+                      rli_ptr->get_group_relay_log_pos()));
+  mysql_mutex_unlock(&rli_ptr->data_lock);
   error= do_commit(thd);
-  if(error)
+  mysql_mutex_lock(&rli_ptr->data_lock);
+  if (error)
+  {
     rli->report(ERROR_LEVEL, thd->get_stmt_da()->sql_errno(),
                 "Error in Xid_log_event: Commit could not be completed, '%s'",
                 thd->get_stmt_da()->message());
+  }
+  else
+  {
+    DBUG_EXECUTE_IF("crash_after_commit_before_update_pos",
+                    sql_print_information("Crashing "
+                                          "crash_after_commit_before_update_pos.");
+                    DBUG_SUICIDE(););
+    /* Update positions on successful commit */
+    rli_ptr->set_group_master_log_name(new_group_master_log_name);
+    rli_ptr->notify_group_master_log_name_update();
+    rli_ptr->set_group_master_log_pos(new_group_master_log_pos);
+    rli_ptr->set_group_relay_log_name(new_group_relay_log_name);
+    rli_ptr->notify_group_relay_log_name_update();
+    rli_ptr->set_group_relay_log_pos(new_group_relay_log_pos);
+
+    DBUG_PRINT("info", ("Updating positions on succesful commit to group master"
+                        " %s %llu  group relay %s %llu\n",
+                        rli_ptr->get_group_master_log_name(),
+                        rli_ptr->get_group_master_log_pos(),
+                        rli_ptr->get_group_relay_log_name(),
+                        rli_ptr->get_group_relay_log_pos()));
+
+    /*
+      For transactional repository the positions are flushed ahead of commit.
+      Where as for non transactional rli repository the positions are flushed
+      only on succesful commit.
+     */
+    if (!rli_ptr->is_transactional())
+      rli_ptr->flush_info(false);
+  }
 err:
   mysql_cond_broadcast(&rli_ptr->data_cond);
   mysql_mutex_unlock(&rli_ptr->data_lock);
 
-  return error;
+  DBUG_RETURN(error);
 }
 
 Log_event::enum_skip_reason
@@ -8902,9 +9067,9 @@
   if (local_fname)
   {
     my_b_write(head, (uchar*) query, fn_pos_start);
-    my_b_printf(head, " LOCAL INFILE \'");
-    my_b_printf(head, "%s", local_fname);
-    my_b_printf(head, "\'");
+    my_b_printf(head, " LOCAL INFILE ");
+    pretty_print_str(head, local_fname, strlen(local_fname));
+
     if (dup_handling == LOAD_DUP_REPLACE)
       my_b_printf(head, " REPLACE");
     my_b_printf(head, " INTO");
@@ -9181,7 +9346,8 @@
     m_rows_buf(0), m_rows_cur(0), m_rows_end(0), m_flags(0),
     m_type(event_type), m_extra_row_data(0)
 #ifdef HAVE_REPLICATION
-    , m_curr_row(NULL), m_curr_row_end(NULL), m_key(NULL), last_hashed_key(NULL)
+    , m_curr_row(NULL), m_curr_row_end(NULL), m_key(NULL), m_key_info(NULL),
+    m_distinct_keys(Key_compare(&m_key_info)), m_distinct_key_spare_buf(NULL)
 #endif
 {
   DBUG_ASSERT(tbl_arg && tbl_arg->s && tid.is_valid());
@@ -9243,7 +9409,8 @@
     m_table_id(0), m_rows_buf(0), m_rows_cur(0), m_rows_end(0),
     m_extra_row_data(0)
 #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
-    , m_curr_row(NULL), m_curr_row_end(NULL), m_key(NULL), last_hashed_key(NULL)
+    , m_curr_row(NULL), m_curr_row_end(NULL), m_key(NULL), m_key_info(NULL),
+    m_distinct_keys(Key_compare(&m_key_info)), m_distinct_key_spare_buf(NULL)
 #endif
 {
   DBUG_ENTER("Rows_log_event::Rows_log_event(const char*,...)");
@@ -9778,6 +9945,7 @@
   MY_BITMAP *cols= &this->m_cols;
   this->m_rows_lookup_algorithm= ROW_LOOKUP_NOT_NEEDED;
   this->m_key_index= MAX_KEY;
+  this->m_key_info= NULL;
 
   if (event_type == WRITE_ROWS_EVENT)  // row lookup not needed
     DBUG_VOID_RETURN;
@@ -9807,6 +9975,8 @@
   /* search for a key to see if we can narrow the lookup domain further. */
   this->m_key_index= search_key_in_table(table, cols, (PRI_KEY_FLAG | UNIQUE_KEY_FLAG | MULTIPLE_KEY_FLAG));
   this->m_rows_lookup_algorithm= ROW_LOOKUP_HASH_SCAN;
+  if (m_key_index < MAX_KEY)
+    m_distinct_key_spare_buf= (uchar*) thd->alloc(table->key_info[m_key_index].key_length);
   DBUG_PRINT("info", ("decide_row_lookup_algorithm_and_key: decided - HASH_SCAN"));
   goto end;
 
@@ -9830,6 +10000,15 @@
   }
 
 end:
+
+  /* m_key_index is ready, set m_key_info now. */
+  m_key_info= m_table->key_info + m_key_index;
+  /*
+    m_key_info will influence key comparison code in HASH_SCAN mode,
+    so the m_distinct_keys set should still be empty.
+  */
+  DBUG_ASSERT(m_distinct_keys.empty());
+
 #ifndef DBUG_OFF
   const char* s= ((m_rows_lookup_algorithm == Rows_log_event::ROW_LOOKUP_TABLE_SCAN) ? "TABLE_SCAN" :
                   ((m_rows_lookup_algorithm == Rows_log_event::ROW_LOOKUP_HASH_SCAN) ? "HASH_SCAN" :
@@ -9919,6 +10098,7 @@
         my_free(m_key); // Free for multi_malloc
         m_key= NULL;
         m_key_index= MAX_KEY;
+        m_key_info= NULL;
       }
      goto err;
     }
@@ -10143,7 +10323,6 @@
 
 /**
    Does the cleanup
-     -  deallocates all the elements in m_distinct_key_list if any
      -  closes the index if opened by open_record_scan
      -  closes the table if opened for scanning.
 */
@@ -10158,15 +10337,6 @@
   {
     if (m_table->file->inited)
       error= m_table->file->ha_index_end();
-
-    if(m_rows_lookup_algorithm == ROW_LOOKUP_HASH_SCAN)
-    {
-      uchar *key_val;
-      /* free the allocated memory for each key values */
-      List_iterator_fast<uchar> it(m_distinct_key_list);
-      while((key_val= it++) && (key_val))
-        my_free(key_val);
-    }
   }
   else if (m_table->file->inited)
     error= m_table->file->ha_rnd_end();
@@ -10198,7 +10368,6 @@
     error= table->file->ha_rnd_next(table->record[0]);
   else
   {
-    KEY *keyinfo= m_table->key_info + m_key_index;
     /*
       We need to set the null bytes to ensure that the filler bit are
       all set when returning.  There are storage engines that just set
@@ -10225,10 +10394,14 @@
           list.
          */
         if ((error) ||
-            (key_cmp(keyinfo->key_part, m_key, keyinfo->key_length) != 0))
+            (key_cmp(m_key_info->key_part, m_key, m_key_info->key_length) != 0))
         {
-          if ((m_key= m_itr++))
+          if (m_itr != m_distinct_keys.end())
+          {
+            m_key= *m_itr;
+            m_itr++;
             first_read= true;
+          }
           else
             error= HA_ERR_KEY_NOT_FOUND;
         }
@@ -10250,7 +10423,7 @@
 
 /**
   Initializes scanning of rows. Opens an index and initializes an iterator
-  over a list of distinct keys (m_distinct_key_list) if it is a HASH_SCAN
+  over a list of distinct keys (m_distinct_keys) if it is a HASH_SCAN
   over an index or the table if its a HASH_SCAN over the table.
 */
 int
@@ -10262,21 +10435,21 @@
 
   if (m_key_index < MAX_KEY )
   {
-    KEY *keyinfo= m_table->key_info + m_key_index;
     if(m_rows_lookup_algorithm == ROW_LOOKUP_HASH_SCAN)
     {
       /* initialize the iterator over the list of distinct keys that we have */
-      m_itr.init(m_distinct_key_list);
+      m_itr= m_distinct_keys.begin();
 
       /* get the first element from the list of keys and increment the
          iterator
        */
-      m_key= m_itr++;
+      m_key= *m_itr;
+      m_itr++;
     }
     else {
       /* this is an INDEX_SCAN we need to store the key in m_key */
       DBUG_ASSERT((m_rows_lookup_algorithm == ROW_LOOKUP_INDEX_SCAN) && m_key);
-      key_copy(m_key, m_table->record[0], keyinfo, 0);
+      key_copy(m_key, m_table->record[0], m_key_info, 0);
     }
 
     /*
@@ -10299,7 +10472,7 @@
       trigger false warnings.
      */
 #ifndef HAVE_purify
-    DBUG_DUMP("key data", m_key, keyinfo->key_length);
+    DBUG_DUMP("key data", m_key, m_key_info->key_length);
 #endif
   }
   else
@@ -10317,7 +10490,7 @@
 }
 
 /**
-  Populates the m_distinct_key_list with unique keys to be modified
+  Populates the m_distinct_keys with unique keys to be modified
   during HASH_SCAN over keys.
   @return_value -0 success
                 -Err_code
@@ -10326,29 +10499,21 @@
 Rows_log_event::add_key_to_distinct_keyset()
 {
   int error= 0;
-  bool distinct= true;
   DBUG_ENTER("Rows_log_event::add_key_to_distinct_keyset");
   DBUG_ASSERT(m_key_index < MAX_KEY);
-  KEY *cur_key_info= m_table->key_info + m_key_index;
-
-  if ((last_hashed_key))
-    distinct= key_cmp(cur_key_info->key_part, last_hashed_key,
-                      cur_key_info->key_length);
-
-  if (distinct)
-  {
-    uchar *cur_key= (uchar *)my_malloc(cur_key_info->key_length,
-                                       MYF(MY_WME));
-    if (!cur_key )
+  key_copy(m_distinct_key_spare_buf, m_table->record[0], m_key_info, 0);
+  std::pair<std::set<uchar *, Key_compare>::iterator,bool> ret=
+    m_distinct_keys.insert(m_distinct_key_spare_buf);
+  if (ret.second)
+  {
+    /* Insert is successful, so allocate a new buffer for next key */
+    m_distinct_key_spare_buf= (uchar*) thd->alloc(m_key_info->key_length);
+    if (!m_distinct_key_spare_buf)
     {
       error= HA_ERR_OUT_OF_MEM;
       goto err;
     }
-    m_distinct_key_list.push_back(cur_key);
-    last_hashed_key= cur_key;
-    key_copy(cur_key, m_table->record[0], cur_key_info, 0);
   }
-
 err:
   DBUG_RETURN(error);
 }
@@ -10359,8 +10524,6 @@
   DBUG_ENTER("Rows_log_event::do_index_scan_and_update");
   DBUG_ASSERT(m_table && m_table->in_use != NULL);
 
-  KEY *keyinfo= NULL;
-  TABLE *table= m_table;
   int error= 0;
   const uchar *saved_m_curr_row= m_curr_row;
 
@@ -10371,7 +10534,7 @@
     Todo: fix wl3228 hld that requires defaults for all types of events
   */
 
-  prepare_record(table, &m_cols, FALSE);
+  prepare_record(m_table, &m_cols, FALSE);
   if ((error= unpack_current_row(rli, &m_cols)))
     goto end;
 
@@ -10394,14 +10557,14 @@
 
 #ifndef DBUG_OFF
   DBUG_PRINT("info",("looking for the following record"));
-  DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
+  DBUG_DUMP("record[0]", m_table->record[0], m_table->s->reclength);
 #endif
 
   if (m_key_index != m_table->s->primary_key)
     /* we dont have a PK, or PK is not usable */
     goto INDEX_SCAN;
 
-  if ((table->file->ha_table_flags() & HA_READ_BEFORE_WRITE_REMOVAL))
+  if ((m_table->file->ha_table_flags() & HA_READ_BEFORE_WRITE_REMOVAL))
   {
     /*
       Read removal is possible since the engine supports write without
@@ -10414,12 +10577,12 @@
       Tell the handler to ignore if key exists or not, since it's
       not yet known if the key does exist(when using rbwr)
     */
-    table->file->extra(HA_EXTRA_IGNORE_NO_KEY);
+    m_table->file->extra(HA_EXTRA_IGNORE_NO_KEY);
 
     goto end;
   }
 
-  if ((table->file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION))
+  if ((m_table->file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION))
   {
     /*
       Use a more efficient method to fetch the record given by
@@ -10441,15 +10604,15 @@
     */
 
     DBUG_PRINT("info",("locating record using primary key (position)"));
-    if (table->file->inited && (error= table->file->ha_index_end()))
+    if (m_table->file->inited && (error= m_table->file->ha_index_end()))
       goto end;
 
-    if ((error= table->file->ha_rnd_init(FALSE)))
+    if ((error= m_table->file->ha_rnd_init(FALSE)))
       goto end;
 
-    error= table->file->rnd_pos_by_record(table->record[0]);
+    error= m_table->file->rnd_pos_by_record(m_table->record[0]);
 
-    table->file->ha_rnd_end();
+    m_table->file->ha_rnd_end();
     if (error)
     {
       DBUG_PRINT("info",("rnd_pos returns error %d",error));
@@ -10465,7 +10628,6 @@
 INDEX_SCAN:
 
   /* Use the m_key_index'th key */
-  keyinfo= table->key_info + m_key_index;
 
   if ((error= open_record_scan()))
     goto end;
@@ -10486,7 +10648,7 @@
    */
 #ifndef HAVE_purify
   DBUG_PRINT("info",("found first matching record"));
-  DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
+  DBUG_DUMP("record[0]", m_table->record[0], m_table->s->reclength);
 #endif
   /*
     Below is a minor "optimization".  If the key (i.e., key number
@@ -10502,10 +10664,10 @@
     found.  I can see no scenario where it would be incorrect to
     chose the row to change only using a PK or an UNNI.
   */
-  if (keyinfo->flags & HA_NOSAME || m_key_index == table->s->primary_key)
+  if (m_key_info->flags & HA_NOSAME || m_key_index == m_table->s->primary_key)
   {
     /* Unique does not have non nullable part */
-    if (!(keyinfo->flags & (HA_NULL_PART_KEY)))
+    if (!(m_key_info->flags & (HA_NULL_PART_KEY)))
       goto end;  // record found
     else
     {
@@ -10514,10 +10676,10 @@
         BI image that is null and part of UNNI.
       */
       bool null_found= FALSE;
-      for (uint i=0; i < keyinfo->user_defined_key_parts && !null_found; i++)
+      for (uint i=0; i < m_key_info->user_defined_key_parts && !null_found; i++)
       {
-        uint fieldnr= keyinfo->key_part[i].fieldnr - 1;
-        Field **f= table->field+fieldnr;
+        uint fieldnr= m_key_info->key_part[i].fieldnr - 1;
+        Field **f= m_table->field+fieldnr;
         null_found= (*f)->is_null();
       }
 
@@ -10535,7 +10697,7 @@
    */
   DBUG_PRINT("info",("non-unique index, scanning it to find matching record"));
 
-  while (record_compare(table, &m_cols))
+  while (record_compare(m_table, &m_cols))
   {
     while((error= next_record_scan(false)))
     {
@@ -10552,7 +10714,7 @@
   DBUG_ASSERT(error != HA_ERR_RECORD_DELETED);
 
   if (error && error != HA_ERR_RECORD_DELETED)
-    table->file->print_error(error, MYF(0));
+    m_table->file->print_error(error, MYF(0));
   else
     error= do_apply_row(rli);
 
@@ -10572,7 +10734,7 @@
     m_curr_row= m_curr_row_end;
     unpack_current_row(rli, &m_cols);
   }
-  table->default_column_bitmaps();
+  m_table->default_column_bitmaps();
   DBUG_RETURN(error);
 
 }
@@ -10864,6 +11026,7 @@
     /* Continue until we find the right record or have made a full loop */
     do
     {
+  restart_ha_rnd_next:
       error= m_table->file->ha_rnd_next(m_table->record[0]);
       if (error)
         DBUG_PRINT("info", ("error: %s", HA_ERR(error)));
@@ -10871,11 +11034,16 @@
       case HA_ERR_END_OF_FILE:
         // restart scan from top
         if (++restart_count < 2)
-          error= m_table->file->ha_rnd_init(1);
+        {
+          if ((error= m_table->file->ha_rnd_init(1)))
+            goto end;
+          goto restart_ha_rnd_next;
+        }
         break;
 
       case HA_ERR_RECORD_DELETED:
         // fetch next
+        goto restart_ha_rnd_next;
       case 0:
         // we're good, check if record matches
         break;
@@ -10885,9 +11053,7 @@
         goto end;
       }
     }
-    while ((error == HA_ERR_END_OF_FILE && restart_count < 2) ||
-           (error == HA_ERR_RECORD_DELETED) ||
-           (!error && record_compare(m_table, &m_cols)));
+    while (restart_count < 2 && record_compare(m_table, &m_cols));
   }
 
 end:
@@ -11331,13 +11497,26 @@
     DBUG_RETURN(error);
   }
 
-  if (get_flags(STMT_END_F) && (error= rows_event_stmt_cleanup(rli, thd)))
+  if (get_flags(STMT_END_F))
+  {
+   if((error= rows_event_stmt_cleanup(rli, thd)))
     slave_rows_error_report(ERROR_LEVEL,
                             thd->is_error() ? 0 : error,
                             rli, thd, table,
                             get_type_str(),
                             const_cast<Relay_log_info*>(rli)->get_rpl_log_name(),
                             (ulong) log_pos);
+   /* We are at end of the statement (STMT_END_F flag), lets clean
+     the memory which was used from thd's mem_root now.
+     This needs to be done only if we are here in SQL thread context.
+     In other flow ( in case of a regular thread which can happen
+     when the thread is applying BINLOG'...' row event) we should
+     *not* try to free the memory here. It will be done latter
+     in dispatch_command() after command execution is completed.
+    */
+   if (thd->slave_thread)
+     free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
+  }
   DBUG_RETURN(error);
 }
 
@@ -13381,14 +13560,58 @@
   DBUG_ENTER("Gtid_log_event::do_apply_event");
   DBUG_ASSERT(rli->info_thd == thd);
 
-  // Gtid_log_events should be filtered out at earlier stages if gtid_mode == 0
-  DBUG_ASSERT(gtid_mode > 0);
+  if (get_type_code() == ANONYMOUS_GTID_LOG_EVENT)
+  {
+    if (gtid_mode == GTID_MODE_ON)
+    {
+      my_error(ER_CANT_SET_GTID_NEXT_TO_ANONYMOUS_WHEN_GTID_MODE_IS_ON, MYF(0));
+      DBUG_RETURN(1);
+    }
+    thd->variables.gtid_next.set_anonymous();
+    /*
+      We do not need to write the anonymous gtid log event into binary log,
+      since we should not add new fields to include logical timestamps used
+      for applying transactions in parallel in the GA version.
+    */
+    DBUG_RETURN(0);
+  }
+
+  /* Applying Gtid_log_event should report an error when GTID_MODE is OFF */
+  if (gtid_mode == GTID_MODE_OFF)
+  {
+    my_error(ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF, MYF(0));
+    DBUG_RETURN(1);
+  }
 
   rpl_sidno sidno= get_sidno(true);
   if (sidno < 0)
     DBUG_RETURN(1); // out of memory
   if (thd->owned_gtid.sidno)
   {
+    /*
+      Slave will execute this code if a previous Gtid_log_event was applied
+      but the GTID wasn't consumed yet (the transaction was not committed
+      nor rolled back).
+      On a client session we cannot do consecutive SET GTID_NEXT without
+      a COMMIT or a ROLLBACK in the middle.
+      Applying this event without rolling back the current transaction may
+      lead to problems, as a "BEGIN" event following this GTID will
+      implicitly commit the "partial transaction" and will consume the
+      GTID. If this "partial transaction" was left in the relay log by the
+      IO thread restarting in the middle of a transaction, you could have
+      the partial transaction being logged with the GTID on the slave,
+      causing data corruption on replication.
+    */
+    if (thd->transaction.all.ha_list)
+    {
+      /* This is not an error (XA is safe), just an information */
+      rli->report(INFORMATION_LEVEL, 0,
+                  "Rolling back unfinished transaction (no COMMIT "
+                  "or ROLLBACK in relay log). A probable cause is partial "
+                  "transaction left on relay log because of restarting IO "
+                  "thread with auto-positioning protocol.");
+      const_cast<Relay_log_info*>(rli)->cleanup_context(thd, 1);
+    }
     gtid_rollback(thd);
   }
   thd->variables.gtid_next.set(sidno, spec.gtid.gno);
@@ -13560,7 +13783,8 @@
    charset_database_number(ILLEGAL_CHARSET_INFO_NUMBER),
    thread_id(0), thread_id_printed(false),
    base64_output_mode(BASE64_OUTPUT_UNSPEC), printed_fd_event(FALSE),
-   have_unflushed_events(FALSE), skipped_event_in_transaction(false)
+   have_unflushed_events(false), skipped_event_in_transaction(false),
+   is_gtid_next_set(false), is_gtid_next_valid(true)
 {
   /*
     Currently we only use static PRINT_EVENT_INFO objects, so zeroed at
diff -Nru percona-xtrabackup-2.2.3/sql/log_event.h percona-xtrabackup-2.3.7/sql/log_event.h
--- percona-xtrabackup-2.2.3/sql/log_event.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/log_event.h	2017-02-27 07:47:02.000000000 +0000
@@ -31,6 +31,7 @@
 #include <my_bitmap.h>
 #include "rpl_constants.h"
 #include "table_id.h"
+#include <set>
 
 #ifdef MYSQL_CLIENT
 #include "sql_const.h"
@@ -45,6 +46,7 @@
 #include "sql_class.h"                          /* THD */
 #include "rpl_utility.h"                        /* Hash_slave_rows */
 #include "rpl_filter.h"
+#include "key.h"                                /* key_copy, compare_keys */
 #endif
 
 /* Forward declarations */
@@ -834,6 +836,23 @@
      False, otherwise.
    */
   bool skipped_event_in_transaction;
+
+  /* true if gtid_next is set with a value */
+  bool is_gtid_next_set;
+
+  /*
+    Determines if the current value of gtid_next needs to be restored
+    to AUTOMATIC if the binary log would end after the current event.
+
+    If the log ends after a transaction, then this should be false.
+    If the log ends in the middle of a transaction, then this should
+    be true; this can happen for relay logs where transactions are
+    split over multiple logs.
+
+    Set to true initially, and after a Gtid_log_event is processed.
+    Set to false if is_gtid_next_set is true.
+   */
+  bool is_gtid_next_valid;
 } PRINT_EVENT_INFO;
 #endif
 
@@ -2624,14 +2643,14 @@
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
 #endif
 
-  Start_log_event_v3(const char* buf,
+  Start_log_event_v3(const char* buf, uint event_len,
                      const Format_description_log_event* description_event);
   ~Start_log_event_v3() {}
   Log_event_type get_type_code() { return START_EVENT_V3;}
 #ifdef MYSQL_SERVER
   bool write(IO_CACHE* file);
 #endif
-  bool is_valid() const { return 1; }
+  bool is_valid() const { return server_version[0] != 0; }
   int get_data_size()
   {
     return START_V3_HEADER_LEN; //no variable-sized part
@@ -4217,10 +4236,39 @@
   const uchar *m_curr_row;     /* Start of the row being processed */
   const uchar *m_curr_row_end; /* One-after the end of the current row */
   uchar    *m_key;      /* Buffer to keep key value during searches */
-  uchar    *last_hashed_key;
   uint     m_key_index;
-  List<uchar> m_distinct_key_list;
-  List_iterator_fast<uchar> m_itr;
+  KEY      *m_key_info; /* Points to description of index #m_key_index */
+  class Key_compare
+  {
+public:
+    /**
+       @param  ki  Where to find KEY description
+       @note m_distinct_keys is instantiated when Rows_log_event is constructed; it
+       stores a Key_compare object internally. However at that moment, the
+       index (KEY*) to use for comparisons, is not yet known. So, at
+       instantiation, we indicate the Key_compare the place where it can
+       find the KEY* when needed (this place is Rows_log_event::m_key_info),
+       Key_compare remembers the place in member m_key_info.
+       Before we need to do comparisons - i.e. before we need to insert
+       elements, we update Rows_log_event::m_key_info once for all.
+    */
+    Key_compare(KEY **ki= NULL) : m_key_info(ki) {}
+    bool operator()(uchar *k1, uchar *k2) const
+    {
+      return key_cmp2((*m_key_info)->key_part,
+                      k1, (*m_key_info)->key_length,
+                      k2, (*m_key_info)->key_length) < 0 ;
+    }
+private:
+    KEY **m_key_info;
+  };
+  std::set<uchar *, Key_compare> m_distinct_keys;
+  std::set<uchar *, Key_compare>::iterator m_itr;
+  /**
+    A spare buffer which will be used when saving the distinct keys
+    for doing an index scan with HASH_SCAN search algorithm.
+  */
+  uchar *m_distinct_key_spare_buf;
 
   // Unpack the current row into m_table->record[0]
   int unpack_current_row(const Relay_log_info *const rli,
@@ -4378,14 +4426,13 @@
 
   /**
     Initializes scanning of rows. Opens an index and initailizes an iterator
-    over a list of distinct keys (m_distinct_key_list) if it is a HASH_SCAN
+    over a list of distinct keys (m_distinct_keys) if it is a HASH_SCAN
     over an index or the table if its a HASH_SCAN over the table.
   */
   int open_record_scan();
 
   /**
     Does the cleanup
-    - deallocates all the elements in m_distinct_key_list if any
     - closes the index if opened by open_record_scan
     - closes the table if opened for scanning.
   */
@@ -4406,7 +4453,7 @@
   int next_record_scan(bool first_read);
 
   /**
-    Populates the m_distinct_key_list with unique keys to be modified
+    Populates the m_distinct_keys with unique keys to be modified
     during HASH_SCAN over keys.
     @return_value -0 success
                   -Err_code
@@ -5010,9 +5057,9 @@
   /// Return true if this is the last group of the transaction, else false.
   bool get_commit_flag() const { return commit_flag; }
 
-private:
   /// string holding the text "SET @@GLOBAL.GTID_NEXT = '"
   static const char *SET_STRING_PREFIX;
+private:
   /// Length of SET_STRING_PREFIX
   static const size_t SET_STRING_PREFIX_LENGTH= 26;
   /// The maximal length of the entire "SET ..." query.
@@ -5103,6 +5150,18 @@
                 const Gtid_set::String_format *string_format) const;
   /// Add all GTIDs from this event to the given Gtid_set.
   int add_to_set(Gtid_set *gtid_set) const;
+  /*
+    Previous Gtid Log events should always be skipped
+    there is nothing to apply there, whether it is
+    relay log's (generated on Slave) or it is binary log's
+    (generated on Master, copied to slave as relay log).
+    Also, we should not increment slave_skip_counter
+    for this event, hence return EVENT_SKIP_IGNORE.
+   */
+  enum_skip_reason do_shall_skip(Relay_log_info *rli)
+  {
+    return EVENT_SKIP_IGNORE;
+  }
 
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
   int do_apply_event(Relay_log_info const *rli) { return 0; }
diff -Nru percona-xtrabackup-2.2.3/sql/log_event_old.cc percona-xtrabackup-2.3.7/sql/log_event_old.cc
--- percona-xtrabackup-2.2.3/sql/log_event_old.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/log_event_old.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2015, 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
@@ -1688,7 +1688,7 @@
 	rli->report(ERROR_LEVEL, thd->net.last_errno,
                     "Error in %s event: row application failed. %s",
                     get_type_str(),
-                    thd->net.last_error ? thd->net.last_error : "");
+                    thd->net.last_error);
        thd->is_slave_error= 1;
 	break;
       }
@@ -1728,7 +1728,7 @@
                 "on table %s.%s. %s",
                 get_type_str(), table->s->db.str,
                 table->s->table_name.str,
-                thd->net.last_error ? thd->net.last_error : "");
+                thd->net.last_error);
 
     /*
       If one day we honour --skip-slave-errors in row-based replication, and
@@ -2455,6 +2455,7 @@
             table->file->print_error(error, MYF(0));
             DBUG_RETURN(error);
           }
+          goto restart_ha_rnd_next;
         }
         break;
 
diff -Nru percona-xtrabackup-2.2.3/sql/log.h percona-xtrabackup-2.3.7/sql/log.h
--- percona-xtrabackup-2.2.3/sql/log.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/log.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2015, 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
@@ -484,7 +484,8 @@
   void lock_exclusive() { mysql_rwlock_wrlock(&LOCK_logger); }
   void unlock() { mysql_rwlock_unlock(&LOCK_logger); }
   bool is_log_table_enabled(uint log_table_type);
-  bool log_command(THD *thd, enum enum_server_command command);
+  bool log_command(THD *thd, enum enum_server_command command,
+                   const char *query_str, size_t query_length);
 
   /*
     We want to initialize all log mutexes as soon as possible,
diff -Nru percona-xtrabackup-2.2.3/sql/mdl.cc percona-xtrabackup-2.3.7/sql/mdl.cc
--- percona-xtrabackup-2.2.3/sql/mdl.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/mdl.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2015, 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
@@ -1930,7 +1930,7 @@
 bool
 MDL_context::try_acquire_lock(MDL_request *mdl_request)
 {
-  MDL_ticket *ticket;
+  MDL_ticket *ticket= NULL;
 
   if (try_acquire_lock_impl(mdl_request, &ticket))
     return TRUE;
@@ -2184,7 +2184,7 @@
 MDL_context::acquire_lock(MDL_request *mdl_request, ulong lock_wait_timeout)
 {
   MDL_lock *lock;
-  MDL_ticket *ticket;
+  MDL_ticket *ticket= NULL;
   struct timespec abs_timeout;
   MDL_wait::enum_wait_status wait_status;
   /* Do some work outside the critical section. */
diff -Nru percona-xtrabackup-2.2.3/sql/mysqld.cc percona-xtrabackup-2.3.7/sql/mysqld.cc
--- percona-xtrabackup-2.2.3/sql/mysqld.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/mysqld.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights
    reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -345,10 +345,6 @@
 #endif
 #endif /* HAVE_PSI_INTERFACE */
 
-#ifdef HAVE_NPTL
-volatile sig_atomic_t ld_assume_kernel_is_set= 0;
-#endif
-
 /**
   Statement instrumentation key for replication.
 */
@@ -488,6 +484,9 @@
 my_bool opt_slave_sql_verify_checksum= 1;
 const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS};
 my_bool enforce_gtid_consistency;
+my_bool binlog_gtid_simple_recovery;
+ulong binlog_error_action;
+const char *binlog_error_action_list[]= {"IGNORE_ERROR", "ABORT_SERVER", NullS};
 ulong gtid_mode;
 const char *gtid_mode_names[]=
 {"OFF", "UPGRADE_STEP_1", "UPGRADE_STEP_2", "ON", NullS};
@@ -544,6 +543,7 @@
 ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
 ulong binlog_stmt_cache_use= 0, binlog_stmt_cache_disk_use= 0;
 ulong max_connections, max_connect_errors;
+ulong max_digest_length= 0;
 ulong rpl_stop_slave_timeout= LONG_TIMEOUT;
 my_bool log_bin_use_v1_row_events= 0;
 bool thread_cache_size_specified= false;
@@ -583,6 +583,11 @@
   in the sp_cache for one connection.
 */
 ulong stored_program_cache_size= 0;
+/**
+  Compatibility option to prevent auto upgrade of old temporals
+  during certain ALTER TABLE operations.
+*/
+my_bool avoid_temporal_upgrade;
 
 const double log_10[] = {
   1e000, 1e001, 1e002, 1e003, 1e004, 1e005, 1e006, 1e007, 1e008, 1e009,
@@ -709,7 +714,7 @@
 pthread_key(MEM_ROOT**,THR_MALLOC);
 pthread_key(THD*, THR_THD);
 mysql_mutex_t LOCK_thread_created;
-mysql_mutex_t LOCK_thread_count;
+mysql_mutex_t LOCK_thread_count, LOCK_thd_remove;
 mysql_mutex_t
   LOCK_status, LOCK_error_log, LOCK_uuid_generator,
   LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create,
@@ -830,6 +835,14 @@
   return global_thread_list->end();
 }
 
+void copy_global_thread_list(std::set<THD*> *new_copy)
+{
+  mysql_mutex_assert_owner(&LOCK_thd_remove);
+  mysql_mutex_lock(&LOCK_thread_count);
+  *new_copy= *global_thread_list;
+  mysql_mutex_unlock(&LOCK_thread_count);
+}
+
 void add_global_thread(THD *thd)
 {
   DBUG_PRINT("info", ("add_global_thread %p", thd));
@@ -849,8 +862,16 @@
 {
   DBUG_PRINT("info", ("remove_global_thread %p current_linfo %p",
                       thd, thd->current_linfo));
-  mysql_mutex_assert_owner(&LOCK_thread_count);
+  mysql_mutex_lock(&LOCK_thd_remove);
+  mysql_mutex_lock(&LOCK_thread_count);
   DBUG_ASSERT(thd->release_resources_done());
+  /*
+    Used by binlog_reset_master.  It would be cleaner to use
+    DEBUG_SYNC here, but that's not possible because the THD's debug
+    sync feature has been shut down at this point.
+   */
+  DBUG_EXECUTE_IF("sleep_after_lock_thread_count_before_delete_thd",
+                  sleep(5););
 
   const size_t num_erased= global_thread_list->erase(thd);
   if (num_erased == 1)
@@ -858,7 +879,9 @@
   // Removing a THD that was never added is an error.
   DBUG_ASSERT(1 == num_erased);
 
+  mysql_mutex_unlock(&LOCK_thd_remove);
   mysql_cond_broadcast(&COND_thread_count);
+  mysql_mutex_unlock(&LOCK_thread_count);
 }
 
 uint get_thread_count()
@@ -1233,7 +1256,7 @@
 static unsigned long openssl_id_function();
 #endif
 char *des_key_file;
-#ifndef EMBEDDED_LIBRARY
+#if !defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP)
 struct st_VioSSLFd *ssl_acceptor_fd;
 #endif
 #endif /* HAVE_OPENSSL */
@@ -1994,6 +2017,7 @@
   mysql_mutex_destroy(&LOCK_slave_net_timeout);
   mysql_mutex_destroy(&LOCK_error_messages);
   mysql_cond_destroy(&COND_thread_count);
+  mysql_mutex_destroy(&LOCK_thd_remove);
   mysql_cond_destroy(&COND_thread_cache);
   mysql_cond_destroy(&COND_flush_thread_cache);
   mysql_cond_destroy(&COND_manager);
@@ -2727,14 +2751,6 @@
 
   thd->release_resources();
   dec_connection_count();
-
-  mysql_mutex_lock(&LOCK_thread_count);
-  /*
-    Used by binlog_reset_master.  It would be cleaner to use
-    DEBUG_SYNC here, but that's not possible because the THD's debug
-    sync feature has been shut down at this point.
-  */
-  DBUG_EXECUTE_IF("sleep_after_lock_thread_count_before_delete_thd", sleep(5););
   remove_global_thread(thd);
   if (kill_blocked_pthreads_flag)
   {
@@ -2747,11 +2763,6 @@
   ERR_remove_state(0);
 #endif
 
-  /*
-    Using global resources (like mutexes) is unsafe once we have released
-    the mutex here: the server may be shutting down.
-   */
-  mysql_mutex_unlock(&LOCK_thread_count);
   delete thd;
 
 #ifdef HAVE_PSI_THREAD_INTERFACE
@@ -3052,8 +3063,7 @@
 #ifdef SIGTSTP
   sigaddset(&set,SIGTSTP);
 #endif
-  if (thd_lib_detected != THD_LIB_LT)
-    sigaddset(&set,THR_SERVER_ALARM);
+  sigaddset(&set,THR_SERVER_ALARM);
   if (test_flags & TEST_SIGINT)
   {
     my_sigset(thr_kill_signal, end_thread_signal);
@@ -3125,7 +3135,7 @@
   */
   init_thr_alarm(thread_scheduler->max_threads +
      global_system_variables.max_insert_delayed_threads + 10);
-  if (thd_lib_detected != THD_LIB_LT && (test_flags & TEST_SIGINT))
+  if (test_flags & TEST_SIGINT)
   {
     (void) sigemptyset(&set);     // Setup up SIGINT for debug
     (void) sigaddset(&set,SIGINT);    // For debugging
@@ -3852,6 +3862,9 @@
     return 1;
   set_server_version();
 
+  sql_print_information("%s (mysqld %s) starting as process %lu ...",
+                        my_progname, server_version, (ulong) getpid());
+
 #ifndef EMBEDDED_LIBRARY
   if (opt_help && !opt_verbose)
     unireg_abort(0);
@@ -4182,6 +4195,8 @@
                    &LOCK_thread_created, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_thread_count, &LOCK_thread_count, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_status, &LOCK_status, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_LOCK_thd_remove,
+                   &LOCK_thd_remove, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_delayed_insert,
                    &LOCK_delayed_insert, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_delayed_status,
@@ -4334,7 +4349,7 @@
   CRYPTO_malloc_init();
 #endif
   ssl_start();
-#ifndef EMBEDDED_LIBRARY
+#if !defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP)
   if (opt_use_ssl)
   {
     enum enum_ssl_init_error error= SSL_INITERR_NOERROR;
@@ -4360,7 +4375,7 @@
   }
 #else
   have_ssl= SHOW_OPTION_DISABLED;
-#endif /* ! EMBEDDED_LIBRARY */
+#endif /* ! EMBEDDED_LIBRARY || XTRABACKUP */
   if (des_key_file)
     load_des_key_file(des_key_file);
 #ifndef HAVE_YASSL
@@ -4499,6 +4514,17 @@
   /* load_defaults require argv[0] is not null */
   char **argv= &name;
   int argc= 1;
+  if (!check_file_permissions(fname))
+  {
+    /*
+      Found a world writable file hence removing it as it is dangerous to write
+      a new UUID into the same file.
+     */
+    my_delete(fname,MYF(MY_WME));
+    sql_print_warning("World-writable config file '%s' has been removed.\n",
+                      fname);
+  }
+
   /* load all options in 'auto.cnf'. */
   if (my_load_defaults(fname, groups, &argc, &argv, NULL))
     DBUG_RETURN(1);
@@ -5178,9 +5204,7 @@
     to be able to read defaults files and parse options.
   */
   my_progname= argv[0];
-#ifdef HAVE_NPTL
-  ld_assume_kernel_is_set= (getenv("LD_ASSUME_KERNEL") != 0);
-#endif
+
 #ifndef _WIN32
   // For windows, my_init() is called from the win specific mysqld_main
   if (my_init())                 // init my_sys library & pthreads
@@ -5232,6 +5256,8 @@
         pfs_param.m_hints.m_table_open_cache= table_cache_size;
         pfs_param.m_hints.m_max_connections= max_connections;
 	pfs_param.m_hints.m_open_files_limit= requested_open_files;
+        /* the performance schema digest size is the same as the SQL layer */
+        pfs_param.m_max_digest_length= max_digest_length;
         PSI_hook= initialize_performance_schema(&pfs_param);
         if (PSI_hook == NULL)
         {
@@ -5290,7 +5316,7 @@
 
   /* Set signal used to kill MySQL */
 #if defined(SIGUSR2)
-  thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;
+  thr_kill_signal= SIGUSR2;
 #else
   thr_kill_signal= SIGINT;
 #endif
@@ -5465,7 +5491,7 @@
             const_cast<Gtid_set *>(gtid_state->get_lost_gtids()),
             NULL,
             opt_master_verify_checksum,
-            true/*true=need lock*/))
+            true/*true=need lock*/, true))
         unireg_abort(1);
 
       /*
@@ -6920,7 +6946,7 @@
     char msg[1024];
 
     snprintf(msg, sizeof(msg),
-             "Changed limits: table_cache: %lu (requested %lu)",
+             "Changed limits: table_open_cache: %lu (requested %lu)",
              limit, table_cache_size);
     buffered_logs.buffer(WARNING_LEVEL, msg);
 
@@ -8388,6 +8414,14 @@
   case OPT_BINLOG_FORMAT:
     binlog_format_used= true;
     break;
+  case OPT_BINLOGGING_IMPOSSIBLE_MODE:
+    WARN_DEPRECATED(NULL, "--binlogging_impossible_mode",
+                    "'--binlog_error_action'");
+    break;
+  case OPT_SIMPLIFIED_BINLOG_GTID_RECOVERY:
+    WARN_DEPRECATED(NULL, "--simplified_binlog_gtid_recovery",
+                    "'--binlog_gtid_simple_recovery'");
+    break;
 #include <sslopt-case.h>
 #ifndef EMBEDDED_LIBRARY
   case 'V':
@@ -8406,6 +8440,9 @@
     test_flags= argument ? (uint) atoi(argument) : 0;
     opt_endinfo=1;
     break;
+  case OPT_THREAD_CONCURRENCY:
+    WARN_DEPRECATED_NO_REPLACEMENT(NULL, "THREAD_CONCURRENCY");
+    break;
   case (int) OPT_ISAM_LOG:
     opt_myisam_log=1;
     break;
@@ -8728,6 +8765,12 @@
   case OPT_TABLE_DEFINITION_CACHE:
     table_definition_cache_specified= true;
     break;
+  case OPT_AVOID_TEMPORAL_UPGRADE:
+    WARN_DEPRECATED_NO_REPLACEMENT(NULL, "avoid_temporal_upgrade");
+    break;
+  case OPT_SHOW_OLD_TEMPORALS:
+    WARN_DEPRECATED_NO_REPLACEMENT(NULL, "show_old_temporals");
+    break;
   }
   return 0;
 }
@@ -9357,6 +9400,7 @@
   key_structure_guard_mutex, key_TABLE_SHARE_LOCK_ha_data,
   key_LOCK_error_messages, key_LOG_INFO_lock, key_LOCK_thread_count,
   key_LOCK_log_throttle_qni;
+PSI_mutex_key key_LOCK_thd_remove;
 PSI_mutex_key key_RELAYLOG_LOCK_commit;
 PSI_mutex_key key_RELAYLOG_LOCK_commit_queue;
 PSI_mutex_key key_RELAYLOG_LOCK_done;
@@ -9441,6 +9485,7 @@
   { &key_LOCK_error_messages, "LOCK_error_messages", PSI_FLAG_GLOBAL},
   { &key_LOG_INFO_lock, "LOG_INFO::lock", 0},
   { &key_LOCK_thread_count, "LOCK_thread_count", PSI_FLAG_GLOBAL},
+  { &key_LOCK_thd_remove, "LOCK_thd_remove", PSI_FLAG_GLOBAL},
   { &key_LOCK_log_throttle_qni, "LOCK_log_throttle_qni", PSI_FLAG_GLOBAL},
   { &key_gtid_ensure_index_mutex, "Gtid_state", PSI_FLAG_GLOBAL},
   { &key_LOCK_thread_created, "LOCK_thread_created", PSI_FLAG_GLOBAL }
diff -Nru percona-xtrabackup-2.2.3/sql/mysqld.h percona-xtrabackup-2.3.7/sql/mysqld.h
--- percona-xtrabackup-2.2.3/sql/mysqld.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/mysqld.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -108,7 +108,7 @@
 extern bool opt_skip_name_resolve;
 extern bool opt_ignore_builtin_innodb;
 extern my_bool opt_character_set_client_handshake;
-extern bool volatile abort_loop;
+extern MYSQL_PLUGIN_IMPORT bool volatile abort_loop;
 extern bool in_bootstrap;
 extern my_bool opt_bootstrap;
 extern uint connection_count;
@@ -191,6 +191,7 @@
 extern ulong table_cache_size, table_def_size;
 extern ulong table_cache_size_per_instance, table_cache_instances;
 extern MYSQL_PLUGIN_IMPORT ulong max_connections;
+extern ulong max_digest_length;
 extern ulong max_connect_errors, connect_timeout;
 extern my_bool opt_slave_allow_batching;
 extern my_bool allow_slave_start;
@@ -216,6 +217,16 @@
 extern my_bool opt_master_verify_checksum;
 extern my_bool opt_slave_sql_verify_checksum;
 extern my_bool enforce_gtid_consistency;
+extern my_bool binlog_gtid_simple_recovery;
+extern ulong binlog_error_action;
+enum enum_binlog_error_action
+{
+  /// Ignore the error and let server continue without binlogging
+  IGNORE_ERROR= 0,
+  /// Abort the server
+  ABORT_SERVER= 1
+};
+extern const char *binlog_error_action_list[];
 enum enum_gtid_mode
 {
   /// Support only anonymous groups, not GTIDs.
@@ -272,6 +283,7 @@
 extern pthread_attr_t connection_attrib;
 extern MYSQL_FILE *bootstrap_file;
 extern my_bool old_mode;
+extern my_bool avoid_temporal_upgrade;
 extern LEX_STRING opt_init_connect, opt_init_slave;
 extern int bootstrap_error;
 extern char err_shared_dir[];
@@ -333,7 +345,7 @@
   key_mutex_slave_parallel_pend_jobs, key_mutex_mts_temp_tables_lock,
   key_mutex_slave_parallel_worker,
   key_structure_guard_mutex, key_TABLE_SHARE_LOCK_ha_data,
-  key_LOCK_error_messages, key_LOCK_thread_count,
+  key_LOCK_error_messages, key_LOCK_thread_count, key_LOCK_thd_remove,
   key_LOCK_log_throttle_qni;
 extern PSI_mutex_key key_RELAYLOG_LOCK_commit;
 extern PSI_mutex_key key_RELAYLOG_LOCK_commit_queue;
@@ -606,6 +618,8 @@
   OPT_BINLOG_FORMAT,
   OPT_BINLOG_IGNORE_DB,
   OPT_BIN_LOG,
+  OPT_BINLOGGING_IMPOSSIBLE_MODE,
+  OPT_SIMPLIFIED_BINLOG_GTID_RECOVERY,
   OPT_BOOTSTRAP,
   OPT_CONSOLE,
   OPT_DEBUG_SYNC_TIMEOUT,
@@ -641,6 +655,7 @@
   OPT_SSL_CERT,
   OPT_SSL_CIPHER,
   OPT_SSL_KEY,
+  OPT_THREAD_CONCURRENCY,
   OPT_UPDATE_LOG,
   OPT_WANT_CORE,
   OPT_ENGINE_CONDITION_PUSHDOWN,
@@ -655,7 +670,9 @@
   OPT_SECURE_AUTH,
   OPT_THREAD_CACHE_SIZE,
   OPT_HOST_CACHE_SIZE,
-  OPT_TABLE_DEFINITION_CACHE
+  OPT_TABLE_DEFINITION_CACHE,
+  OPT_AVOID_TEMPORAL_UPGRADE,
+  OPT_SHOW_OLD_TEMPORALS
 };
 
 
diff -Nru percona-xtrabackup-2.2.3/sql/opt_range.cc percona-xtrabackup-2.3.7/sql/opt_range.cc
--- percona-xtrabackup-2.2.3/sql/opt_range.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/opt_range.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -419,31 +420,54 @@
   {
     DBUG_ASSERT(type_arg == MAYBE_KEY || type_arg == IMPOSSIBLE);
   }
-  inline bool is_same(SEL_ARG *arg)
+  /**
+    returns true if a range predicate is equal. Use all_same()
+    to check for equality of all the predicates on this keypart.
+  */
+  inline bool is_same(const SEL_ARG *arg) const
   {
     if (type != arg->type || part != arg->part)
-      return 0;
+      return false;
     if (type != KEY_RANGE)
-      return 1;
+      return true;
     return cmp_min_to_min(arg) == 0 && cmp_max_to_max(arg) == 0;
   }
+  /**
+    returns true if all the predicates in the keypart tree are equal
+  */
+  bool all_same(const SEL_ARG *arg) const
+  {
+    if (type != arg->type || part != arg->part)
+      return false;
+    if (type != KEY_RANGE)
+      return true;
+    if (arg == this)
+      return true;
+    const SEL_ARG *cmp_arg= arg->first();
+    const SEL_ARG *cur_arg= first();
+    for (; cur_arg && cmp_arg && cur_arg->is_same(cmp_arg);
+         cur_arg= cur_arg->next, cmp_arg= cmp_arg->next) ;
+    if (cur_arg || cmp_arg)
+      return false;
+    return true;
+  }
   inline void merge_flags(SEL_ARG *arg) { maybe_flag|=arg->maybe_flag; }
   inline void maybe_smaller() { maybe_flag=1; }
   /* Return true iff it's a single-point null interval */
   inline bool is_null_interval() { return maybe_null && max_value[0] == 1; } 
-  inline int cmp_min_to_min(SEL_ARG* arg)
+  inline int cmp_min_to_min(const SEL_ARG* arg) const
   {
     return sel_cmp(field,min_value, arg->min_value, min_flag, arg->min_flag);
   }
-  inline int cmp_min_to_max(SEL_ARG* arg)
+  inline int cmp_min_to_max(const SEL_ARG* arg) const
   {
     return sel_cmp(field,min_value, arg->max_value, min_flag, arg->max_flag);
   }
-  inline int cmp_max_to_max(SEL_ARG* arg)
+  inline int cmp_max_to_max(const SEL_ARG* arg) const
   {
     return sel_cmp(field,max_value, arg->max_value, max_flag, arg->max_flag);
   }
-  inline int cmp_max_to_min(SEL_ARG* arg)
+  inline int cmp_max_to_min(const SEL_ARG* arg) const
   {
     return sel_cmp(field,max_value, arg->min_value, max_flag, arg->min_flag);
   }
@@ -622,6 +646,7 @@
   void test_use_count(SEL_ARG *root);
 #endif
   SEL_ARG *first();
+  const SEL_ARG *first() const;
   SEL_ARG *last();
   void make_root();
   inline bool simple_key()
@@ -697,6 +722,18 @@
   SEL_ARG *clone_tree(RANGE_OPT_PARAM *param);
 };
 
+/**
+  Helper function to compare two SEL_ARG's.
+*/
+static bool all_same(const SEL_ARG *sa1, const SEL_ARG *sa2)
+{
+  if (sa1 == NULL && sa2 == NULL)
+    return true;
+  if ((sa1 != NULL && sa2 == NULL) || (sa1 == NULL && sa2 != NULL))
+    return false;
+  return sa1->all_same(sa2);
+}
+
 class SEL_IMERGE;
 
 
@@ -2013,6 +2050,13 @@
   return tmp;
 }
 
+/**
+  This gives the first SEL_ARG in the interval list, and the minimal element
+  in the red-black tree
+
+  @return
+  SEL_ARG   first SEL_ARG in the interval list
+*/
 SEL_ARG *SEL_ARG::first()
 {
   SEL_ARG *next_arg=this;
@@ -2023,6 +2067,11 @@
   return next_arg;
 }
 
+const SEL_ARG *SEL_ARG::first() const
+{
+  return const_cast<SEL_ARG*>(this)->first();
+}
+
 SEL_ARG *SEL_ARG::last()
 {
   SEL_ARG *next_arg=this;
@@ -8725,7 +8774,6 @@
   }
   return -1;					// Error, no more warnings
 }
-#endif
 
 
 /**
@@ -8787,7 +8835,6 @@
 }
 
 
-#ifndef DBUG_OFF
 /*
   Check if SEL_ARG::use_count value is correct
 
@@ -11205,6 +11252,8 @@
 static inline uint get_field_keypart(KEY *index, Field *field);
 static inline SEL_ARG * get_index_range_tree(uint index, SEL_TREE* range_tree,
                                              PARAM *param, uint *param_idx);
+static bool get_sel_arg_for_keypart(Field *field, SEL_ARG *index_range_tree,
+                                    SEL_ARG **cur_range);
 static bool get_constant_key_infix(KEY *index_info, SEL_ARG *index_range_tree,
                        KEY_PART_INFO *first_non_group_part,
                        KEY_PART_INFO *min_max_arg_part,
@@ -11269,6 +11318,16 @@
          never stored after a unique key lookup in the clustered index and
          furhter index_next/prev calls can not be used. So loose index scan
          optimization can not be used in this case.
+    SA7. If Q has both AGG_FUNC(DISTINCT ...) and MIN/MAX() functions then this
+         access method is not used.
+         For above queries MIN/MAX() aggregation has to be done at
+         nested_loops_join (end_send_group). But with current design MIN/MAX()
+         is always set as part of loose index scan. Because of this mismatch
+         MIN() and MAX() values will be set incorrectly. For such queries to
+         work we need a new interface for loose index scan. This new interface
+         should only fetch records with min and max values and let
+         end_send_group to do aggregation. Until then do not use
+         loose_index_scan.
     GA1. If Q has a GROUP BY clause, then GA is a prefix of I. That is, if
          G_i = A_j => i = j.
     GA2. If Q has a DISTINCT clause, then there is a permutation of SA that
@@ -11300,6 +11359,8 @@
          above tests. By transitivity then it also follows that each WA_i
          participates in the index I (if this was already tested for GA, NGA
          and C).
+    WA2. If there is a predicate on C, then it must be in conjunction
+         to all predicates on all earlier keyparts in I.
 
     C) Overall query form:
        SELECT EXPR([A_1,...,A_k], [B_1,...,B_m], [MIN(C)], [MAX(C)])
@@ -11457,6 +11518,14 @@
     }
   }
 
+  /* Check (SA7). */
+  if (is_agg_distinct && (have_max || have_min))
+  {
+    trace_group.add("chosen", false).
+      add_alnum("cause", "have_both_agg_distinct_and_min_max");
+    DBUG_RETURN(NULL);
+  }
+
   select_items_it= List_iterator<Item>(join->fields_list);
   /* Check (SA5). */
   if (join->select_distinct)
@@ -11770,6 +11839,26 @@
       }
     }
 
+    /**
+      Test WA2:If there are conditions on a column C participating in
+      MIN/MAX, those conditions must be conjunctions to all earlier
+      keyparts. Otherwise, Loose Index Scan cannot be used.
+    */
+    if (tree && min_max_arg_item)
+    {
+      uint dummy;
+      SEL_ARG *index_range_tree= get_index_range_tree(cur_index, tree, param,
+                                                      &dummy);
+      SEL_ARG *cur_range= NULL;
+      if (get_sel_arg_for_keypart(min_max_arg_part->field,
+                                  index_range_tree, &cur_range) ||
+          (cur_range && cur_range->type != SEL_ARG::KEY_RANGE))
+      {
+        cause= "minmax_keypart_in_disjunctive_query";
+        goto next_index;
+      }
+    }
+
     /* If we got to this point, cur_index_info passes the test. */
     key_infix_parts= cur_key_infix_len ? (uint) 
       (first_non_infix_part - first_non_group_part) : 0;
@@ -12038,35 +12127,44 @@
 
 
 /*
-  Get SEL_ARG tree, if any, for the keypart covering non grouping
-  attribute (NGA) field 'nga_field'.
+  Get the SEL_ARG tree 'tree' for the keypart covering 'field', if
+  any. 'tree' must be a unique conjunction to ALL predicates in earlier
+  keyparts of 'keypart_tree'.
+
+  E.g., if 'keypart_tree' is for a composite index (kp1,kp2) and kp2
+  covers 'field', all these conditions satisfies the requirement:
+
+   1. "(kp1=2 OR kp1=3) AND kp2=10"    => returns "kp2=10"
+   2. "(kp1=2 AND kp2=10) OR (kp1=3 AND kp2=10)"  => returns "kp2=10"
+   3. "(kp1=2 AND (kp2=10 OR kp2=11)) OR (kp1=3 AND (kp2=10 OR kp2=11))"
+                                       => returns "kp2=10  OR kp2=11"
+
+   whereas these do not
+   1. "(kp1=2 AND kp2=10) OR kp1=3"
+   2. "(kp1=2 AND kp2=10) OR (kp1=3 AND kp2=11)"
+   3. "(kp1=2 AND kp2=10) OR (kp1=3 AND (kp2=10 OR kp2=11))"
+
+   This function effectively tests requirement WA2. In combination with
+   a test that the returned tree has no more than one range it is also
+   a test of NGA3.
 
-  This function enforces the NGA3 test: If 'keypart_tree' contains a
-  condition for 'nga_field', there can only be one range. In the
-  opposite case, this function returns with error and 'cur_range'
-  should not be used.
-
-  Note that the NGA1 and NGA2 requirements, like whether or not the
-  range predicate for 'nga_field' is equality, is not tested by this
-  function.
-
-  @param[in]   nga_field      The NGA field we want the SEL_ARG tree for
+  @param[in]   field          The field we want the SEL_ARG tree for
   @param[in]   keypart_tree   Root node of the SEL_ARG* tree for the index
   @param[out]  cur_range      The SEL_ARG tree, if any, for the keypart
                               covering field 'keypart_field'
-  @retval true   'keypart_tree' contained a predicate for 'nga_field' but
-                  multiple ranges exists. 'cur_range' should not be used.
+  @retval true   'keypart_tree' contained a predicate for 'field' that
+                  is not conjunction to all predicates on earlier keyparts
   @retval false  otherwise
 */
 
 static bool
-get_sel_arg_for_keypart(Field *nga_field,
+get_sel_arg_for_keypart(Field *field,
                         SEL_ARG *keypart_tree,
                         SEL_ARG **cur_range)
 {
-  if(keypart_tree == NULL)
+  if (keypart_tree == NULL)
     return false;
-  if(keypart_tree->type != SEL_ARG::KEY_RANGE)
+  if (keypart_tree->type != SEL_ARG::KEY_RANGE)
   {
     /*
       A range predicate not usable by Loose Index Scan is found.
@@ -12076,45 +12174,38 @@
     *cur_range= keypart_tree;
     return false;
   }
-  if(keypart_tree->field->eq(nga_field))
+  if (keypart_tree->field->eq(field))
   {
-    /*
-      Enforce NGA3: If a condition for nga_field has been found, only
-      a single range is allowed.
-    */
-    if (keypart_tree->prev || keypart_tree->next)
-      return true; // There are multiple ranges
-
     *cur_range= keypart_tree;
     return false;
   }
 
-  SEL_ARG *found_tree= NULL;
+  SEL_ARG *tree_first_range= NULL;
   SEL_ARG *first_kp=  keypart_tree->first();
 
-  for (SEL_ARG *cur_kp= first_kp; cur_kp && !found_tree;
-       cur_kp= cur_kp->next)
+  for (SEL_ARG *cur_kp= first_kp; cur_kp; cur_kp= cur_kp->next)
   {
+    SEL_ARG *curr_tree= NULL;
     if (cur_kp->next_key_part)
     {
-      if (get_sel_arg_for_keypart(nga_field,
+      if (get_sel_arg_for_keypart(field,
                                   cur_kp->next_key_part,
-                                  &found_tree))
+                                  &curr_tree))
         return true;
-
     }
-    /*
-       Enforce NGA3: If a condition for nga_field has been found,only
-       a single range is allowed.
-    */
-    if (found_tree && found_tree->type == SEL_ARG::KEY_RANGE && first_kp->next)
-      return true; // There are multiple ranges
+    /**
+      Check if the SEL_ARG tree for 'field' is identical for all ranges in
+      'keypart_tree
+     */
+    if (cur_kp == first_kp)
+      tree_first_range= curr_tree;
+    else if (!all_same(tree_first_range, curr_tree))
+      return true;
   }
-  *cur_range= found_tree;
+  *cur_range= tree_first_range;
   return false;
 }
 
-
 /*
   Extract a sequence of constants from a conjunction of equality predicates.
 
@@ -12136,7 +12227,8 @@
     constant equality predicate among conds with the form (NGF_i = const_ci) or
     (const_ci = NGF_i).
     Thus all the NGF_i attributes must fill the 'gap' between the last group-by
-    attribute and the MIN/MAX attribute in the index (if present). If these
+    attribute and the MIN/MAX attribute in the index (if present).  Also ensure
+    that there is only a single range on NGF_i (NGA3). If these
     conditions hold, copy each constant from its corresponding predicate into
     key_infix, in the order its NG_i attribute appears in the index, and update
     key_infix_len with the total length of the key parts in key_infix.
@@ -12145,7 +12237,6 @@
     TRUE  if the index passes the test
     FALSE o/w
 */
-
 static bool
 get_constant_key_infix(KEY *index_info, SEL_ARG *index_range_tree,
                        KEY_PART_INFO *first_non_group_part,
@@ -12165,32 +12256,42 @@
   {
     cur_range= NULL;
     /*
-      Find the range tree for the current keypart. We assume that
-      index_range_tree points to the leftmost keypart in the index.
+      Check NGA3:
+      1. get_sel_arg_for_keypart gets the range tree for the 'field' and also
+         checks for a unique conjunction of this tree with all the predicates
+         on the earlier keyparts in the index.
+      2. Check for multiple ranges on the found keypart tree.
+
+      We assume that index_range_tree points to the leftmost keypart in
+      the index.
     */
-    if(get_sel_arg_for_keypart(cur_part->field, index_range_tree, &cur_range))
+    if (get_sel_arg_for_keypart(cur_part->field, index_range_tree,
+                                &cur_range))
+      return false;
+
+    if (cur_range && cur_range->elements > 1)
       return false;
 
     if (!cur_range || cur_range->type != SEL_ARG::KEY_RANGE)
     {
       if (min_max_arg_part)
-        return FALSE; /* The current keypart has no range predicates at all. */
+        return false; /* The current keypart has no range predicates at all. */
       else
       {
         *first_non_infix_part= cur_part;
-        return TRUE;
+        return true;
       }
     }
 
     if ((cur_range->min_flag & NO_MIN_RANGE) ||
         (cur_range->max_flag & NO_MAX_RANGE) ||
         (cur_range->min_flag & NEAR_MIN) || (cur_range->max_flag & NEAR_MAX))
-      return FALSE;
+      return false;
 
     uint field_length= cur_part->store_length;
     if (cur_range->maybe_null &&
          cur_range->min_value[0] && cur_range->max_value[0])
-    { 
+    {
       /*
         cur_range specifies 'IS NULL'. In this case the argument points
         to a "null value" (a copy of is_null_string) that we do not
@@ -12208,7 +12309,7 @@
       *key_infix_len+= field_length;
     }
     else
-      return FALSE;
+      return false;
   }
 
   if (!min_max_arg_part && (cur_part == last_part))
diff -Nru percona-xtrabackup-2.2.3/sql/parse_file.h percona-xtrabackup-2.3.7/sql/parse_file.h
--- percona-xtrabackup-2.2.3/sql/parse_file.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/parse_file.h	2017-02-27 07:47:02.000000000 +0000
@@ -42,7 +42,7 @@
 struct File_option
 {
   LEX_STRING name;		/**< Name of the option */
-  int offset;			/**< offset to base address of value */
+  size_t offset;		/**< offset to base address of value */
   file_opt_type type;		/**< Option type */
 };
 
diff -Nru percona-xtrabackup-2.2.3/sql/partition_info.cc percona-xtrabackup-2.3.7/sql/partition_info.cc
--- percona-xtrabackup-2.2.3/sql/partition_info.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/partition_info.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2015, 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
@@ -34,8 +34,6 @@
 partition_info *partition_info::get_clone()
 {
   DBUG_ENTER("partition_info::get_clone");
-  if (!this)
-    DBUG_RETURN(NULL);
   List_iterator<partition_element> part_it(partitions);
   partition_element *part;
   partition_info *clone= new partition_info();
@@ -49,6 +47,7 @@
   memset(&(clone->lock_partitions), 0, sizeof(clone->lock_partitions));
   clone->bitmaps_are_initialized= FALSE;
   clone->partitions.empty();
+  clone->temp_partitions.empty();
 
   while ((part= (part_it++)))
   {
@@ -78,6 +77,18 @@
   DBUG_RETURN(clone);
 }
 
+partition_info *partition_info::get_full_clone()
+{
+  partition_info *clone;
+  DBUG_ENTER("partition_info::get_full_clone");
+  clone= get_clone();
+  if (!clone)
+    DBUG_RETURN(NULL);
+  memcpy(&clone->read_partitions, &read_partitions, sizeof(read_partitions));
+  memcpy(&clone->lock_partitions, &lock_partitions, sizeof(lock_partitions));
+  clone->bitmaps_are_initialized= bitmaps_are_initialized;
+  DBUG_RETURN(clone);
+}
 
 /**
   Mark named [sub]partition to be used/locked.
diff -Nru percona-xtrabackup-2.2.3/sql/partition_info.h percona-xtrabackup-2.3.7/sql/partition_info.h
--- percona-xtrabackup-2.2.3/sql/partition_info.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/partition_info.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef PARTITION_INFO_INCLUDED
 #define PARTITION_INFO_INCLUDED
 
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2015, 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
@@ -287,6 +287,7 @@
   ~partition_info() {}
 
   partition_info *get_clone();
+  partition_info *get_full_clone();
   bool set_named_partition_bitmap(const char *part_name, uint length);
   bool set_partition_bitmaps(TABLE_LIST *table_list);
   /* Answers the question if subpartitioning is used for a certain table */
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_constants.h percona-xtrabackup-2.3.7/sql/rpl_constants.h
--- percona-xtrabackup-2.2.3/sql/rpl_constants.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_constants.h	2017-02-27 07:47:02.000000000 +0000
@@ -45,6 +45,8 @@
 const int BINLOG_SERVER_ID_INFO_SIZE= 4;
 const int BINLOG_NAME_SIZE_INFO_SIZE= 4;
 
+const int BINLOG_DUMP_NON_BLOCK= 1<<0;
+
 /**
    Enumeration of the reserved formats of Binlog extra row information
 */
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_gtid.h percona-xtrabackup-2.3.7/sql/rpl_gtid.h
--- percona-xtrabackup-2.2.3/sql/rpl_gtid.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_gtid.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2015, 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
@@ -1032,6 +1032,24 @@
   enum_return_status ensure_sidno(rpl_sidno sidno);
   /// Returns true if this Gtid_set is a subset of the other Gtid_set.
   bool is_subset(const Gtid_set *super) const;
+
+  /**
+    Returns true if this Gtid_set is a subset of the given gtid_set
+    on the given superset_sidno and subset_sidno.
+
+    @param super          Gtid_set with which 'this'::gtid_set needs to be
+                           compared
+    @param superset_sidno The sidno that will be compared, relative to
+                           super->sid_map.
+    @param subset_sidno   The sidno that will be compared, relative to
+                           this->sid_map.
+    @return true          If 'this' Gtid_set is subset of given
+                           'super' Gtid_set.
+            false         If 'this' Gtid_set is *not* subset of given
+                           'super' Gtid_set.
+  */
+  bool is_subset_for_sid(const Gtid_set *super, rpl_sidno superset_sidno,
+                         rpl_sidno subset_sidno) const;
   /// Returns true if there is a least one element of this Gtid_set in
   /// the other Gtid_set.
   bool is_intersection_nonempty(const Gtid_set *other) const;
@@ -2266,6 +2284,11 @@
   const Owned_gtids *get_owned_gtids() const { return &owned_gtids; }
   /// Return the server's SID's SIDNO
   rpl_sidno get_server_sidno() const { return server_sidno; }
+  /// Return the server's SID
+  const rpl_sid &get_server_sid() const
+  {
+    return global_sid_map->sidno_to_sid(server_sidno);
+  }
 #ifndef DBUG_OFF
   /**
     Debug only: Returns an upper bound on the length of the string
@@ -2401,6 +2424,9 @@
   { type= GTID_GROUP; gtid.sidno= sidno; gtid.gno= gno; }
   /// Set the type to GTID_GROUP and SID, GNO to the given Gtid.
   void set(const Gtid &gtid_param) { set(gtid_param.sidno, gtid_param.gno); }
+  /// Set the type to ANONYMOUS_GROUP and SID, GNO to 0, 0.
+  void set_anonymous()
+  { type= ANONYMOUS_GROUP; gtid.sidno= 0; gtid.gno= 0; }
   /// Set the type to AUTOMATIC_GROUP.
   void set_automatic()
   {
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_gtid_set.cc percona-xtrabackup-2.3.7/sql/rpl_gtid_set.cc
--- percona-xtrabackup-2.2.3/sql/rpl_gtid_set.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_gtid_set.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2015, 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
@@ -229,6 +229,7 @@
 void Gtid_set::clear()
 {
   DBUG_ENTER("Gtid_set::clear");
+  cached_string_length= -1;
   rpl_sidno max_sidno= get_max_sidno();
   if (max_sidno == 0)
     DBUG_VOID_RETURN;
@@ -1053,6 +1054,49 @@
   DBUG_RETURN(true);
 }
 
+bool Gtid_set::is_subset_for_sid(const Gtid_set *super,
+                                 rpl_sidno superset_sidno,
+                                 rpl_sidno subset_sidno) const
+{
+  DBUG_ENTER("Gtid_set::is_subset_for_sidno");
+  /*
+    The following assert code is to see that caller acquired
+    either write or read lock on global_sid_lock.
+    Note that if it is read lock, then it should also
+    acquire lock on sidno.
+    i.e., the caller must acquire lock either A1 way or A2 way.
+        A1. global_sid_lock.wrlock()
+        A2. global_sid_lock.rdlock(); gtid_state.lock_sidno(sidno)
+  */
+  if (sid_lock != NULL)
+    super->sid_lock->assert_some_lock();
+  if (super->sid_lock != NULL)
+    super->sid_lock->assert_some_lock();
+  /*
+    If subset(i.e, this object) does not have required sid in it, i.e.,
+    subset_sidno is zero, then it means it is subset of any given
+    super set. Hence return true.
+  */
+  if (subset_sidno == 0)
+    DBUG_RETURN(true);
+  /*
+    If superset (i.e., the passed gtid_set) does not have given sid in it,
+    i.e., superset_sidno is zero, then it means it cannot be superset
+    to any given subset. Hence return false.
+  */
+  if (superset_sidno == 0)
+    DBUG_RETURN(false);
+  /*
+    Once we have valid(non-zero) subset's and superset's sid numbers, call
+    is_interval_subset().
+  */
+  Const_interval_iterator subset_ivit(this, subset_sidno);
+  Const_interval_iterator superset_ivit(super, superset_sidno);
+  if (!is_interval_subset(&subset_ivit, &superset_ivit))
+    DBUG_RETURN(false);
+
+  DBUG_RETURN(true);
+}
 
 bool Gtid_set::is_subset(const Gtid_set *super) const
 {
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_info_table_access.cc percona-xtrabackup-2.3.7/sql/rpl_info_table_access.cc
--- percona-xtrabackup-2.2.3/sql/rpl_info_table_access.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_info_table_access.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, 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
@@ -162,7 +162,7 @@
        */
       ha_commit_trans(thd, FALSE, TRUE);
     }
-    if (saved_current_thd != current_thd)
+    if (thd_created)
     {
       if (error)
         ha_rollback_trans(thd, TRUE);
@@ -441,19 +441,17 @@
 */
 THD *Rpl_info_table_access::create_thd()
 {
-  THD *thd= NULL;
-  saved_current_thd= current_thd;
+  THD *thd= current_thd;
 
-  if (!current_thd)
+  if (!thd)
   {
     thd= new THD;
     thd->thread_stack= (char*) &thd;
     thd->store_globals();
     thd->security_ctx->skip_grants();
     thd->system_thread= SYSTEM_THREAD_INFO_REPOSITORY;
+    thd_created= true;
   }
-  else
-    thd= current_thd;
 
   return(thd);
 }
@@ -472,10 +470,11 @@
 {
   DBUG_ENTER("Rpl_info::drop_thd");
 
-  if (saved_current_thd != current_thd)
+  if (thd_created)
   {
     delete thd;
     my_pthread_setspecific_ptr(THR_THD,  NULL);
+    thd_created= false;
   }
 
   DBUG_RETURN(FALSE);
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_info_table_access.h percona-xtrabackup-2.3.7/sql/rpl_info_table_access.h
--- percona-xtrabackup-2.2.3/sql/rpl_info_table_access.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_info_table_access.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, 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
@@ -28,7 +28,7 @@
 class Rpl_info_table_access
 {
 public:
-  Rpl_info_table_access() { };
+  Rpl_info_table_access(): thd_created(false) { };
   virtual ~Rpl_info_table_access() { };
 
   bool open_table(THD* thd, const LEX_STRING dbstr, const LEX_STRING tbstr,
@@ -47,7 +47,7 @@
   bool drop_thd(THD* thd);
 
 private:
-  THD *saved_current_thd;
+  bool thd_created;
 
   Rpl_info_table_access& operator=(const Rpl_info_table_access& info);
   Rpl_info_table_access(const Rpl_info_table_access& info);
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_master.cc percona-xtrabackup-2.3.7/sql/rpl_master.cc
--- percona-xtrabackup-2.2.3/sql/rpl_master.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_master.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -739,6 +739,7 @@
   DBUG_ENTER("com_binlog_dump");
   ulong pos;
   String slave_uuid;
+  ushort flags= 0;
   const uchar* packet_position= (uchar *) packet;
   uint packet_bytes_todo= packet_length;
 
@@ -753,15 +754,17 @@
     com_binlog_dump_gtid().
   */
   READ_INT(pos, 4);
-  SKIP(2); /* flags field is unused */
+  READ_INT(flags, 2);
   READ_INT(thd->server_id, 4);
 
+  DBUG_PRINT("info", ("pos=%lu flags=%d server_id=%d", pos, flags, thd->server_id));
+
   get_slave_uuid(thd, &slave_uuid);
   kill_zombie_dump_threads(&slave_uuid);
 
   general_log_print(thd, thd->get_command(), "Log: '%s'  Pos: %ld",
                     packet + 10, (long) pos);
-  mysql_binlog_send(thd, thd->strdup(packet + 10), (my_off_t) pos, NULL);
+  mysql_binlog_send(thd, thd->strdup(packet + 10), (my_off_t) pos, NULL, flags);
 
   unregister_slave(thd, true, true/*need_lock_slave_list=true*/);
   /*  fake COM_QUIT -- if we get here, the thread needs to terminate */
@@ -781,6 +784,7 @@
     breaking compatitibilty. /Alfranio.
   */
   String slave_uuid;
+  ushort flags= 0;
   uint32 data_size= 0;
   uint64 pos= 0;
   char name[FN_REFLEN + 1];
@@ -796,11 +800,12 @@
   if (check_global_access(thd, REPL_SLAVE_ACL))
     DBUG_RETURN(false);
 
-  SKIP(2); /* flags field is unused */
+  READ_INT(flags, 2);
   READ_INT(thd->server_id, 4);
   READ_INT(name_size, 4);
   READ_STRING(name, name_size, sizeof(name));
   READ_INT(pos, 8);
+  DBUG_PRINT("info", ("pos=%llu flags=%d server_id=%d", pos, flags, thd->server_id));
   READ_INT(data_size, 4);
   CHECK_PACKET_SIZE(data_size);
   if (slave_gtid_executed.add_gtid_encoding(packet_position, data_size) !=
@@ -815,7 +820,7 @@
   general_log_print(thd, thd->get_command(), "Log: '%s' Pos: %llu GTIDs: '%s'",
                     name, pos, gtid_string);
   my_free(gtid_string);
-  mysql_binlog_send(thd, name, (my_off_t) pos, &slave_gtid_executed);
+  mysql_binlog_send(thd, name, (my_off_t) pos, &slave_gtid_executed, flags);
 
   unregister_slave(thd, true, true/*need_lock_slave_list=true*/);
   /*  fake COM_QUIT -- if we get here, the thread needs to terminate */
@@ -828,7 +833,7 @@
 
 
 void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
-                       const Gtid_set* slave_gtid_executed)
+                       const Gtid_set* slave_gtid_executed, int flags)
 {
   /**
     @todo: Clean up loop so that, among other things, we only have one
@@ -849,12 +854,15 @@
   bool searching_first_gtid= using_gtid_protocol;
   bool skip_group= false;
   bool binlog_has_previous_gtids_log_event= false;
+  bool has_transmit_started= false;
   Sid_map *sid_map= slave_gtid_executed ? slave_gtid_executed->get_sid_map() : NULL;
 
   IO_CACHE log;
   File file = -1;
   String* packet = &thd->packet;
-  int error;
+  time_t last_event_sent_ts= time(0);
+  bool time_for_hb_event= false;
+  int error= 0;
   const char *errmsg = "Unknown error";
   char error_text[MAX_SLAVE_ERRMSG]; // to be send to slave via my_message()
   NET* net = &thd->net;
@@ -862,6 +870,7 @@
   mysql_cond_t *log_cond;
   uint8 current_checksum_alg= BINLOG_CHECKSUM_ALG_UNDEF;
   Format_description_log_event fdle(BINLOG_VERSION), *p_fdle= &fdle;
+  Gtid first_gtid;
 
 #ifndef DBUG_OFF
   int left_events = max_binlog_dump_events;
@@ -907,23 +916,12 @@
   LOG_POS_COORD last_skip_coord_buf= {last_skip_log_name, BIN_LOG_HEADER_SIZE},
                 *p_last_skip_coord= &last_skip_coord_buf;
   bool observe_transmission= false;
-  const uint32 NO_FLAG= 0;
 
   if (heartbeat_period != LL(0))
   {
     heartbeat_ts= &heartbeat_buf;
     set_timespec_nsec(*heartbeat_ts, 0);
   }
-  if (log_warnings > 1)
-    sql_print_information("Start binlog_dump to master_thread_id(%lu) slave_server(%u), pos(%s, %lu)",
-                        thd->thread_id, thd->server_id, log_ident, (ulong)pos);
-  if (RUN_HOOK(binlog_transmit, transmit_start,
-               (thd, NO_FLAG, log_ident, pos, &observe_transmission)))
-  {
-    errmsg= "Failed to run hook 'transmit_start'";
-    my_errno= ER_UNKNOWN_ERROR;
-    GOTO_ERR;
-  }
 
 #ifndef DBUG_OFF
   if (opt_sporadic_binlog_dump_fail && (binlog_dump_count++ % 2))
@@ -954,8 +952,72 @@
   {
     if (using_gtid_protocol)
     {
+      /*
+        In normal scenarios, it is not possible that Slave will
+        contain more gtids than Master with resepctive to Master's
+        UUID. But it could be possible case if Master's binary log
+        is truncated(due to raid failure) or Master's binary log is
+        deleted but GTID_PURGED was not set properly. That scenario
+        needs to be validated, i.e., it should *always* be the case that
+        Slave's gtid executed set (+retrieved set) is a subset of
+        Master's gtid executed set with respective to Master's UUID.
+        If it happens, dump thread will be stopped during the handshake
+        with Slave (thus the Slave's I/O thread will be stopped with the
+        error. Otherwise, it can lead to data inconsistency between Master
+        and Slave.
+      */
+      Sid_map* slave_sid_map= slave_gtid_executed->get_sid_map();
+      DBUG_ASSERT(slave_sid_map);
+      global_sid_lock->wrlock();
+      const rpl_sid &server_sid= gtid_state->get_server_sid();
+      rpl_sidno subset_sidno= slave_sid_map->sid_to_sidno(server_sid);
+      if (!slave_gtid_executed->is_subset_for_sid(gtid_state->get_logged_gtids(),
+                                                  gtid_state->get_server_sidno(),
+                                                  subset_sidno))
+      {
+        errmsg= ER(ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER);
+        my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
+        global_sid_lock->unlock();
+        GOTO_ERR;
+      }
+      /*
+        Setting GTID_PURGED (when GTID_EXECUTED set is empty i.e., when
+        previous_gtids are also empty) will make binlog rotate. That
+        leaves first binary log with empty previous_gtids and second
+        binary log's previous_gtids with the value of gtid_purged.
+        In find_first_log_not_in_gtid_set() while we search for a binary
+        log whose previous_gtid_set is subset of slave_gtid_executed,
+        in this particular case, server will always find the first binary
+        log with empty previous_gtids which is subset of any given
+        slave_gtid_executed. Thus Master thinks that it found the first
+        binary log which is actually not correct and unable to catch
+        this error situation. Hence adding below extra if condition
+        to check the situation. Slave should know about Master's purged GTIDs.
+        If Slave's GTID executed + retrieved set does not contain Master's
+        complete purged GTID list, that means Slave is requesting(expecting)
+        GTIDs which were purged by Master. We should let Slave know about the
+        situation. i.e., throw error if slave's GTID executed set is not
+        a superset of Master's purged GTID set.
+        The other case, where user deleted binary logs manually
+        (without using 'PURGE BINARY LOGS' command) but gtid_purged
+        is not set by the user, the following if condition cannot catch it.
+        But that is not a problem because in find_first_log_not_in_gtid_set()
+        while checking for subset previous_gtids binary log, the logic
+        will not find one and an error ER_MASTER_HAS_PURGED_REQUIRED_GTIDS
+        is thrown from there.
+      */
+      if (!gtid_state->get_lost_gtids()->is_subset(slave_gtid_executed))
+      {
+        errmsg= ER(ER_MASTER_HAS_PURGED_REQUIRED_GTIDS);
+        my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
+        global_sid_lock->unlock();
+        GOTO_ERR;
+      }
+      global_sid_lock->unlock();
+      first_gtid.clear();
       if (mysql_bin_log.find_first_log_not_in_gtid_set(name,
                                                        slave_gtid_executed,
+                                                       &first_gtid,
                                                        &errmsg))
       {
          my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
@@ -997,8 +1059,19 @@
     GOTO_ERR;
   }
 
+  if (log_warnings > 1)
+    sql_print_information("Start binlog_dump to master_thread_id(%lu) slave_server(%u), pos(%s, %lu)",
+                          thd->thread_id, thd->server_id, log_ident, (ulong)pos);
+  if (RUN_HOOK(binlog_transmit, transmit_start,
+               (thd, flags, log_ident, pos, &observe_transmission)))
+  {
+    errmsg= "Failed to run hook 'transmit_start'";
+    my_errno= ER_UNKNOWN_ERROR;
+    GOTO_ERR;
+  }
+  has_transmit_started= true;
   /* reset transmit packet for the fake rotate event below */
-  if (reset_transmit_packet(thd, NO_FLAG, &ev_offset, &errmsg,
+  if (reset_transmit_packet(thd, flags, &ev_offset, &errmsg,
                             observe_transmission))
     GOTO_ERR;
 
@@ -1061,7 +1134,7 @@
   {
     /* reset transmit packet for the event read from binary log
        file */
-    if (reset_transmit_packet(thd, NO_FLAG, &ev_offset, &errmsg,
+    if (reset_transmit_packet(thd, flags, &ev_offset, &errmsg,
                               observe_transmission))
       GOTO_ERR;
 
@@ -1159,21 +1232,32 @@
 
     /* reset the transmit packet for the event read from binary log
        file */
-    if (reset_transmit_packet(thd, NO_FLAG, &ev_offset, &errmsg,
+    if (reset_transmit_packet(thd, flags, &ev_offset, &errmsg,
                               observe_transmission))
       GOTO_ERR;
     DBUG_EXECUTE_IF("semi_sync_3-way_deadlock",
                     {
-                      const char act[]= "now wait_for signal.rotate_finished";
+                      const char act[]= "now wait_for signal.rotate_finished no_clear_event";
                       DBUG_ASSERT(!debug_sync_set_action(current_thd,
                                                          STRING_WITH_LEN(act)));
                     };);
     bool is_active_binlog= false;
-    while (!(error= Log_event::read_log_event(&log, packet, log_lock,
+    while (!thd->killed &&
+           !(error= Log_event::read_log_event(&log, packet, log_lock,
                                               current_checksum_alg,
                                               log_file_name,
                                               &is_active_binlog)))
     {
+      DBUG_EXECUTE_IF("hold_dump_thread_inside_inner_loop",
+                    {
+                      const char act[]= "now "
+                                        "signal signal_inside_inner_loop "
+                                        "wait_for signal_continue";
+                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
+                                                         STRING_WITH_LEN(act)));
+                      DBUG_ASSERT(thd->killed);
+                    };);
+      time_t created;
       DBUG_PRINT("info", ("read_log_event returned 0 on line %d", __LINE__));
 #ifndef DBUG_OFF
       if (max_binlog_dump_events && !left_events--)
@@ -1226,6 +1310,33 @@
           GOTO_ERR;
         }
         (*packet)[FLAGS_OFFSET+ev_offset] &= ~LOG_EVENT_BINLOG_IN_USE_F;
+
+        created= uint4korr(packet->ptr()+LOG_EVENT_MINIMAL_HEADER_LEN+
+                           ST_CREATED_OFFSET+ev_offset);
+
+        if (using_gtid_protocol && created > 0)
+        {
+          if (first_gtid.sidno >= 1 && first_gtid.gno >= 1 &&
+              slave_gtid_executed->contains_gtid(first_gtid.sidno,
+                                                 first_gtid.gno))
+          {
+            /*
+              As we are skipping at least the first transaction of the binlog,
+              we must clear the "created" field of the FD event (set it to 0)
+              to avoid cleaning up temp tables on slave.
+            */
+            DBUG_PRINT("info",("setting 'created' to 0 before sending FD event"));
+            int4store((char*) packet->ptr()+LOG_EVENT_MINIMAL_HEADER_LEN+
+                      ST_CREATED_OFFSET+ev_offset, (ulong) 0);
+
+            /* Fix the checksum due to latest changes in header */
+            if (current_checksum_alg != BINLOG_CHECKSUM_ALG_OFF &&
+                current_checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF)
+              fix_checksum(packet, ev_offset);
+
+            first_gtid.clear();
+          }
+        }
         /*
           Fixes the information on the checksum algorithm when a new
           format description is read. Notice that this only necessary
@@ -1319,7 +1430,7 @@
       pos = my_b_tell(&log);
       if (observe_transmission &&
           RUN_HOOK(binlog_transmit, before_send_event,
-                   (thd, NO_FLAG, packet, log_file_name, pos)))
+                   (thd, flags, packet, log_file_name, pos)))
       {
         my_errno= ER_UNKNOWN_ERROR;
         errmsg= "run 'before_send_event' hook failed";
@@ -1331,14 +1442,28 @@
       {
         p_last_skip_coord->pos= p_coord->pos;
         strcpy(p_last_skip_coord->file_name, p_coord->file_name);
+        /*
+          If we have not send any event from past 'heartbeat_period' time
+          period, then it is time to send a packet before skipping this group.
+         */
+        DBUG_EXECUTE_IF("inject_2sec_sleep_when_skipping_an_event",
+                        {
+                          my_sleep(2000000);
+                        });
+        time_t now= time(0);
+        DBUG_ASSERT(now >= last_event_sent_ts);
+        time_for_hb_event= ((ulonglong)(now - last_event_sent_ts) >=
+                            (ulonglong)(heartbeat_period/1000000000UL));
       }
 
-      if (!skip_group && last_skip_group
-          && event_type != FORMAT_DESCRIPTION_EVENT)
+      if ((!skip_group && last_skip_group
+           && event_type != FORMAT_DESCRIPTION_EVENT) || time_for_hb_event)
       {
         /*
           Dump thread is ready to send it's first transaction after
-          one or more skipped transactions. Send a heart beat event
+          one or more skipped transactions or dump thread did not
+          send any event from past 'heartbeat_period' time frame
+          (busy skipping gtid groups). Send a heart beat event
           to update slave IO thread coordinates before that happens.
 
           Notice that for a new binary log file, FORMAT_DESCRIPTION_EVENT
@@ -1353,18 +1478,24 @@
         {
           GOTO_ERR;
         }
+        last_event_sent_ts= time(0);
+        last_skip_group= time_for_hb_event= false;
       }
-
-      /* save this flag for next iteration */
-      last_skip_group= skip_group;
-
-      if (skip_group == false && my_net_write(net, (uchar*) packet->ptr(), packet->length()))
+      else
       {
-        errmsg = "Failed on my_net_write()";
-        my_errno= ER_UNKNOWN_ERROR;
-        GOTO_ERR;
+        last_skip_group= skip_group;
       }
 
+      if (skip_group == false)
+      {
+        if (my_net_write(net, (uchar*) packet->ptr(), packet->length()))
+        {
+          errmsg = "Failed on my_net_write()";
+          my_errno= ER_UNKNOWN_ERROR;
+          GOTO_ERR;
+        }
+        last_event_sent_ts= time(0);
+      }
 
       DBUG_EXECUTE_IF("dump_thread_wait_before_send_xid",
                       {
@@ -1387,7 +1518,7 @@
 
       if (observe_transmission &&
           RUN_HOOK(binlog_transmit, after_send_event,
-                   (thd, NO_FLAG, packet, log_file_name, skip_group ? pos : 0)))
+                   (thd, flags, packet, log_file_name, skip_group ? pos : 0)))
       {
         errmsg= "Failed to run hook 'after_send_event'";
         my_errno= ER_UNKNOWN_ERROR;
@@ -1395,14 +1526,14 @@
       }
 
       /* reset transmit packet for next loop */
-      if (reset_transmit_packet(thd, NO_FLAG, &ev_offset, &errmsg,
+      if (reset_transmit_packet(thd, flags, &ev_offset, &errmsg,
                                 observe_transmission))
         GOTO_ERR;
     }
 
     DBUG_EXECUTE_IF("wait_after_binlog_EOF",
                     {
-                      const char act[]= "now wait_for signal.rotate_finished";
+                      const char act[]= "now wait_for signal.rotate_finished no_clear_event";
                       DBUG_ASSERT(!debug_sync_set_action(current_thd,
                                                          STRING_WITH_LEN(act)));
                     };);
@@ -1453,7 +1584,7 @@
 
         /* reset the transmit packet for the event read from binary log
            file */
-        if (reset_transmit_packet(thd, NO_FLAG, &ev_offset, &errmsg,
+        if (reset_transmit_packet(thd, flags, &ev_offset, &errmsg,
                                   observe_transmission))
           GOTO_ERR;
         
@@ -1486,8 +1617,42 @@
           int ret;
           ulong signal_cnt;
 	  DBUG_PRINT("wait",("waiting for data in binary log"));
-	  if (thd->server_id==0) // for mysqlbinlog (mysqlbinlog.server_id==0)
+          /*
+            There are two ways to tell the server to not block:
+
+            - Set the BINLOG_DUMP_NON_BLOCK flag.
+              This is official, documented, not used by any mysql
+              client, but used by some external users.
+
+            - Set server_id=0.
+              This is unofficial, undocumented, and used by
+              mysqlbinlog -R since the beginning of time.
+
+            When mysqlbinlog --stop-never is used, it sets a 'fake'
+            server_id that defaults to 1 but can be set to anything
+            else using stop-never-slave-server-id. This has the
+            drawback that if the server_id conflicts with any other
+            running slave, or with any other instance of mysqlbinlog
+            --stop-never, then that other instance will be killed.  It
+            is also an unnecessary burden on the user to have to
+            specify a server_id different from all other server_ids
+            just to avoid conflicts.
+
+            As of MySQL 5.6.20 and 5.7.5, mysqlbinlog redundantly sets
+            the BINLOG_DUMP_NONBLOCK flag when one or both of the
+            following holds:
+            - the --stop-never option is *not* specified
+
+            In a far future, this means we can remove the unofficial
+            functionality that server_id=0 implies nonblocking
+            behavior. That will allow mysqlbinlog to use server_id=0
+            always. That has the advantage that mysqlbinlog
+            --stop-never cannot cause any running dump threads to be
+            killed.
+          */
+          if (thd->server_id == 0 || ((flags & BINLOG_DUMP_NON_BLOCK) != 0))
 	  {
+            DBUG_PRINT("info", ("stopping dump thread because server_id==0 or the BINLOG_DUMP_NON_BLOCK flag is set: server_id=%u flags=%d", thd->server_id, flags));
             mysql_mutex_unlock(log_lock);
             DBUG_EXECUTE_IF("inject_hb_event_on_mysqlbinlog_dump_thread",
             {
@@ -1498,7 +1663,7 @@
                 Suicide on failure, since if it happens the entire purpose of the
                 test is comprimised.
                */
-              if (reset_transmit_packet(thd, NO_FLAG, &ev_offset, &errmsg,
+              if (reset_transmit_packet(thd, flags, &ev_offset, &errmsg,
                                         observe_transmission) ||
                   send_heartbeat_event(net, packet, p_coord, current_checksum_alg))
                 DBUG_SUICIDE();
@@ -1532,6 +1697,11 @@
             */
             if (skip_group)
             {
+              /*
+                TODO: Number of HB events sent from here can be reduced
+               by checking whehter it is time to send a HB event or not.
+               (i.e., using the flag time_for_hb_event)
+              */
               if (send_last_skip_group_heartbeat(thd, net, packet,
                                                  p_coord, &ev_offset,
                                                  current_checksum_alg, &errmsg,
@@ -1557,7 +1727,7 @@
               }
 #endif
               /* reset transmit packet for the heartbeat event */
-              if (reset_transmit_packet(thd, NO_FLAG, &ev_offset, &errmsg,
+              if (reset_transmit_packet(thd, flags, &ev_offset, &errmsg,
                                         observe_transmission))
               {
                 thd->EXIT_COND(&old_stage);
@@ -1675,7 +1845,7 @@
             pos = my_b_tell(&log);
             if (observe_transmission &&
                 RUN_HOOK(binlog_transmit, before_send_event,
-                         (thd, NO_FLAG, packet, log_file_name, pos)))
+                         (thd, flags, packet, log_file_name, pos)))
             {
               my_errno= ER_UNKNOWN_ERROR;
               errmsg= "run 'before_send_event' hook failed";
@@ -1688,6 +1858,7 @@
              my_errno= ER_UNKNOWN_ERROR;
              GOTO_ERR;
             }
+            last_event_sent_ts= time(0);
 
             if (event_type == LOAD_EVENT)
             {
@@ -1704,7 +1875,7 @@
           {
             if (observe_transmission &&
                 RUN_HOOK(binlog_transmit, after_send_event,
-                         (thd, NO_FLAG, packet, log_file_name,
+                         (thd, flags, packet, log_file_name,
                           skip_group ? pos : 0)))
             {
               my_errno= ER_UNKNOWN_ERROR;
@@ -1741,7 +1912,7 @@
       mysql_file_close(file, MYF(MY_WME));
 
       /* reset transmit packet for the possible fake rotate event */
-      if (reset_transmit_packet(thd, NO_FLAG, &ev_offset, &errmsg,
+      if (reset_transmit_packet(thd, flags, &ev_offset, &errmsg,
                                 observe_transmission))
         GOTO_ERR;
       
@@ -1778,7 +1949,8 @@
   end_io_cache(&log);
   mysql_file_close(file, MYF(MY_WME));
 
-  (void) RUN_HOOK(binlog_transmit, transmit_stop, (thd, NO_FLAG));
+  if (has_transmit_started)
+    (void) RUN_HOOK(binlog_transmit, transmit_stop, (thd, flags));
   my_eof(thd);
   THD_STAGE_INFO(thd, stage_waiting_to_finalize_termination);
   mysql_mutex_lock(&LOCK_thread_count);
@@ -1810,7 +1982,8 @@
     error_text[sizeof(error_text) - 1]= '\0';
   }
   end_io_cache(&log);
-  (void) RUN_HOOK(binlog_transmit, transmit_stop, (thd, NO_FLAG));
+  if (has_transmit_started)
+    (void) RUN_HOOK(binlog_transmit, transmit_stop, (thd, flags));
   /*
     Exclude  iteration through thread list
     this is needed for purge_logs() - it will iterate through
@@ -1909,6 +2082,11 @@
       it will be slow because it will iterate through the list
       again. We just to do kill the thread ourselves.
     */
+    if (log_warnings > 1)
+      sql_print_information("While initializing dump thread for slave with "
+                            "UUID <%s>, found a zombie dump thread with "
+                            "the same UUID. Master is killing the zombie dump "
+                            "thread(%lu).", slave_uuid->c_ptr(), tmp->thread_id);
     tmp->awake(THD::KILL_QUERY);
     mysql_mutex_unlock(&tmp->LOCK_thd_data);
   }
@@ -2042,6 +2220,7 @@
     DBUG_RETURN(TRUE);
   
   mysql_mutex_lock(mysql_bin_log.get_log_lock());
+  DEBUG_SYNC(thd, "show_binlogs_after_lock_log_before_lock_index");
   mysql_bin_log.lock_index();
   index_file=mysql_bin_log.get_index_file();
   
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_master.h percona-xtrabackup-2.3.7/sql/rpl_master.h
--- percona-xtrabackup-2.2.3/sql/rpl_master.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_master.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 #ifndef RPL_MASTER_H_INCLUDED
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, 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
@@ -96,7 +96,7 @@
   events in that set.
 */
 void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
-                       const Gtid_set* gtid_set);
+                       const Gtid_set* gtid_set, int flags);
 
 int reset_master(THD* thd);
 
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_reporting.cc percona-xtrabackup-2.3.7/sql/rpl_reporting.cc
--- percona-xtrabackup-2.2.3/sql/rpl_reporting.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_reporting.cc	2017-02-27 07:47:02.000000000 +0000
@@ -161,8 +161,8 @@
   }
   curr_buff= pbuff;
   if (prefix_msg)
-    curr_buff += sprintf(curr_buff, "%s; ", prefix_msg);
-  my_vsnprintf(curr_buff, pbuffsize, msg, args);
+    curr_buff += my_snprintf(curr_buff, pbuffsize, "%s; ", prefix_msg);
+  my_vsnprintf(curr_buff, pbuffsize - (curr_buff - pbuff), msg, args);
 
   mysql_mutex_unlock(&err_lock);
 
@@ -172,7 +172,7 @@
                     m_thread_name, pbuff,
                     (curr_buff[0] && *(strend(curr_buff)-1) == '.') ? "" : ",",
                     err_code);
-#endif  
+#endif
 }
 
 Slave_reporting_capability::~Slave_reporting_capability()
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_rli.cc percona-xtrabackup-2.3.7/sql/rpl_rli.cc
--- percona-xtrabackup-2.2.3/sql/rpl_rli.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_rli.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2014, 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
@@ -1183,9 +1183,8 @@
       if (ev && ev->server_id == (uint32) ::server_id && !replicate_same_server_id)
         DBUG_RETURN(false);
       log_name= group_master_log_name;
-      log_pos= (!ev)? group_master_log_pos :
-        ((thd->variables.option_bits & OPTION_BEGIN || !ev->log_pos) ?
-         group_master_log_pos : ev->log_pos - ev->data_written);
+      log_pos= (!ev || is_in_group() || !ev->log_pos) ?
+        group_master_log_pos : ev->log_pos - ev->data_written;
     }
     else
     { /* until_condition == UNTIL_RELAY_POS */
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_rli.h percona-xtrabackup-2.3.7/sql/rpl_rli.h
--- percona-xtrabackup-2.2.3/sql/rpl_rli.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_rli.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2014, 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
@@ -710,13 +710,16 @@
      Replication is inside a group if either:
      - The OPTION_BEGIN flag is set, meaning we're inside a transaction
      - The RLI_IN_STMT flag is set, meaning we're inside a statement
+     - There is an GTID owned by the thd, meaning we've passed a SET GTID_NEXT
 
      @retval true Replication thread is currently inside a group
      @retval false Replication thread is currently not inside a group
    */
   bool is_in_group() const {
     return (info_thd->variables.option_bits & OPTION_BEGIN) ||
-      (m_flags & (1UL << IN_STMT));
+      (m_flags & (1UL << IN_STMT)) ||
+      /* If a SET GTID_NEXT was issued we are inside of a group */
+      info_thd->owned_gtid.sidno;
   }
 
   int count_relay_log_space();
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_rli_pdb.cc percona-xtrabackup-2.3.7/sql/rpl_rli_pdb.cc
--- percona-xtrabackup-2.2.3/sql/rpl_rli_pdb.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_rli_pdb.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,18 @@
+/* Copyright (c) 2011, 2015, 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 */
+
 #include "my_global.h"                          /* NO_EMBEDDED_ACCESS_CHECKS */
 #include "sql_priv.h"
 #include "unireg.h"
@@ -490,6 +505,15 @@
   DBUG_RETURN(flush_info(force));
 }
 
+void Slave_worker::rollback_positions(Slave_job_group* ptr_g)
+{
+  if (!is_transactional())
+  {
+    bitmap_clear_bit(&group_executed, ptr_g->checkpoint_seqno);
+    flush_info(false);
+  }
+}
+
 static HASH mapping_db_to_worker;
 static bool inited_hash_workers= FALSE;
 
@@ -1360,7 +1384,7 @@
     Slave_worker *w_i;
     Slave_job_group *ptr_g, g;
     char grl_name[FN_REFLEN];
-    ulong ind;
+    ulong ind __attribute__((unused));
 
 #ifndef DBUG_OFF
     if (DBUG_EVALUATE_IF("check_slave_debug_group", 1, 0) &&
@@ -1491,11 +1515,11 @@
   {
     buff_gtid[0]= 0;
   }
- 
-  sprintf(buff_coord,
-          "Worker %lu failed executing transaction '%s' at "
-          "master log %s, end_log_pos %llu",
-          id, buff_gtid, log_name, log_pos);
+
+  my_snprintf(buff_coord, sizeof(buff_coord),
+           "Worker %lu failed executing transaction '%s' at "
+           "master log %s, end_log_pos %llu",
+           id, buff_gtid, log_name, log_pos);
   c_rli->va_report(level, err_code, buff_coord, msg, args);
 }
 
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_rli_pdb.h percona-xtrabackup-2.3.7/sql/rpl_rli_pdb.h
--- percona-xtrabackup-2.2.3/sql/rpl_rli_pdb.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_rli_pdb.h	2017-02-27 07:47:02.000000000 +0000
@@ -378,6 +378,14 @@
   ulonglong get_master_log_pos() { return master_log_pos; };
   ulonglong set_master_log_pos(ulong val) { return master_log_pos= val; };
   bool commit_positions(Log_event *evt, Slave_job_group *ptr_g, bool force);
+  /*
+    When commit fails clear bitmap for executed worker group. Revert back the
+    positions to the old positions that existed before commit using the checkpoint.
+
+    @param Slave_job_group a pointer to Slave_job_group struct instance which
+    holds group master log pos, group relay log pos and checkpoint positions.
+  */
+  void rollback_positions(Slave_job_group *ptr_g);
   bool reset_recovery_info();
   /**
      Different from the parent method in that this does not delete
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_slave.cc percona-xtrabackup-2.3.7/sql/rpl_slave.cc
--- percona-xtrabackup-2.2.3/sql/rpl_slave.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_slave.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -414,6 +414,191 @@
   DBUG_RETURN(error);
 }
 
+/**
+   Parse the given relay log and identify the rotate event from the master.
+   Ignore the Format description event, Previous_gtid log event and ignorable
+   events within the relay log. When a rotate event is found check if it is a
+   rotate that is originated from the master or not based on the server_id. If
+   the rotate is from slave or if it is a fake rotate event ignore the event.
+   If any other events are encountered apart from the above events generate an
+   error. From the rotate event extract the master's binary log name and
+   position.
+
+   @param filename
+          Relay log name which needs to be parsed.
+
+   @param[OUT] master_log_file
+          Set the master_log_file to the log file name that is extracted from
+          rotate event. The master_log_file should contain string of len
+          FN_REFLEN.
+
+   @param[OUT] master_log_pos
+          Set the master_log_pos to the log position extracted from rotate
+          event.
+
+   @retval FOUND_ROTATE: When rotate event is found in the relay log
+   @retval NOT_FOUND_ROTATE: When rotate event is not found in the relay log
+   @retval ERROR: On error
+ */
+enum enum_read_rotate_from_relay_log_status
+{ FOUND_ROTATE, NOT_FOUND_ROTATE, ERROR };
+
+static enum_read_rotate_from_relay_log_status
+read_rotate_from_relay_log(char *filename, char *master_log_file,
+                           my_off_t *master_log_pos)
+{
+  DBUG_ENTER("read_rotate_from_relay_log");
+  /*
+    Create a Format_description_log_event that is used to read the
+    first event of the log.
+   */
+  Format_description_log_event fd_ev(BINLOG_VERSION), *fd_ev_p= &fd_ev;
+  DBUG_ASSERT(fd_ev.is_valid());
+  IO_CACHE log;
+  const char *errmsg= NULL;
+  File file= open_binlog_file(&log, filename, &errmsg);
+  if (file < 0)
+  {
+    sql_print_error("Error during --relay-log-recovery: %s", errmsg);
+    DBUG_RETURN(ERROR);
+  }
+  my_b_seek(&log, BIN_LOG_HEADER_SIZE);
+  Log_event *ev= NULL;
+  bool done= false;
+  enum_read_rotate_from_relay_log_status ret= NOT_FOUND_ROTATE;
+  while (!done &&
+         (ev= Log_event::read_log_event(&log, 0, fd_ev_p, opt_slave_sql_verify_checksum)) !=
+         NULL)
+  {
+    DBUG_PRINT("info", ("Read event of type %s", ev->get_type_str()));
+    switch (ev->get_type_code())
+    {
+    case FORMAT_DESCRIPTION_EVENT:
+      if (fd_ev_p != &fd_ev)
+        delete fd_ev_p;
+      fd_ev_p= (Format_description_log_event *)ev;
+      break;
+    case ROTATE_EVENT:
+      /*
+        Check for rotate event from the master. Ignore the ROTATE event if it
+        is a fake rotate event with server_id=0.
+       */
+      if (ev->server_id && ev->server_id != ::server_id)
+      {
+        Rotate_log_event *rotate_ev= (Rotate_log_event *)ev;
+        DBUG_ASSERT(FN_REFLEN >= rotate_ev->ident_len + 1);
+        memcpy(master_log_file, rotate_ev->new_log_ident, rotate_ev->ident_len + 1);
+        *master_log_pos= rotate_ev->pos;
+        ret= FOUND_ROTATE;
+        done= true;
+      }
+      break;
+    case PREVIOUS_GTIDS_LOG_EVENT:
+      break;
+    case IGNORABLE_LOG_EVENT:
+      break;
+    default:
+      sql_print_error("Error during --relay-log-recovery: Could not locate "
+                      "rotate event from the master.");
+      ret= ERROR;
+      done= true;
+      break;
+    }
+    if (ev != fd_ev_p)
+      delete ev;
+  }
+  if (log.error < 0)
+  {
+    sql_print_error("Error during --relay-log-recovery: Error reading events from relay log: %d",
+                    log.error);
+    DBUG_RETURN(ERROR);
+  }
+
+  if (fd_ev_p != &fd_ev)
+  {
+    delete fd_ev_p;
+    fd_ev_p= &fd_ev;
+  }
+
+  if (mysql_file_close(file, MYF(MY_WME)))
+    DBUG_RETURN(ERROR);
+  if (end_io_cache(&log))
+  {
+    sql_print_error("Error during --relay-log-recovery: Error while freeing "
+                    "IO_CACHE object");
+    DBUG_RETURN(ERROR);
+  }
+  DBUG_RETURN(ret);
+}
+
+/**
+   Reads relay logs one by one starting from the first relay log. Looks for
+   the first rotate event from the master. If rotate is not found in the relay
+   log search continues to next relay log. If rotate event from master is
+   found then the extracted master_log_file and master_log_pos are used to set
+   rli->group_master_log_name and rli->group_master_log_pos. If an error has
+   occurred the error code is retuned back.
+
+   @param rli
+          Relay_log_info object to read relay log files and to set
+          group_master_log_name and group_master_log_pos.
+
+   @retval 0 On success
+   @retval 1 On failure
+ */
+static int
+find_first_relay_log_with_rotate_from_master(Relay_log_info* rli)
+{
+  DBUG_ENTER("find_first_relay_log_with_rotate_from_master");
+  int error= 0;
+  LOG_INFO linfo;
+  bool got_rotate_from_master= false;
+  int pos;
+  char master_log_file[FN_REFLEN];
+  my_off_t master_log_pos= 0;
+
+  for (pos= rli->relay_log.find_log_pos(&linfo, NULL, true);
+       !pos;
+       pos= rli->relay_log.find_next_log(&linfo, true))
+  {
+    switch (read_rotate_from_relay_log(linfo.log_file_name, master_log_file,
+                                       &master_log_pos))
+    {
+    case ERROR:
+      error= 1;
+      break;
+    case FOUND_ROTATE:
+      got_rotate_from_master= true;
+      break;
+    case NOT_FOUND_ROTATE:
+      break;
+    }
+    if (error || got_rotate_from_master)
+      break;
+  }
+  if (pos== LOG_INFO_IO)
+  {
+    error= 1;
+    sql_print_error("Error during --relay-log-recovery: Could not read "
+                    "relay log index file due to an IO error.");
+    goto err;
+  }
+  if (pos== LOG_INFO_EOF)
+  {
+    error= 1;
+    sql_print_error("Error during --relay-log-recovery: Could not locate "
+                    "rotate event from master in relay log file.");
+    goto err;
+  }
+  if (!error && got_rotate_from_master)
+  {
+    rli->set_group_master_log_name(master_log_file);
+    rli->set_group_master_log_pos(master_log_pos);
+  }
+err:
+  DBUG_RETURN(error);
+}
+
 /*
   Updates the master info based on the information stored in the
   relay info and ignores relay logs previously retrieved by the IO
@@ -421,6 +606,14 @@
   master_log_pos and master_log_name. Eventually, the old
   relay logs will be purged by the normal purge mechanism.
 
+  There can be a special case where rli->group_master_log_name and
+  rli->group_master_log_pos are not intialized, as the sql thread was never
+  started at all. In those cases all the existing relay logs are parsed
+  starting from the first one and the initial rotate event that was received
+  from the master is identified. From the rotate event master_log_name and
+  master_log_pos are extracted and they are set to rli->group_master_log_name
+  and rli->group_master_log_pos.
+
   In the feature, we should improve this routine in order to avoid throwing
   away logs that are safely stored in the disk. Note also that this recovery
   routine relies on the correctness of the relay-log.info and only tolerates
@@ -475,8 +668,23 @@
   }
 
   group_master_log_name= const_cast<char *>(rli->get_group_master_log_name());
-  if (!error && group_master_log_name[0])
+  if (!error)
   {
+    if (!group_master_log_name[0])
+    {
+      if (rli->replicate_same_server_id)
+      {
+        error= 1;
+        sql_print_error("Error during --relay-log-recovery: "
+                        "replicate_same_server_id is in use and sql thread's "
+                        "positions are not initialized, hence relay log "
+                        "recovery cannot happen.");
+        DBUG_RETURN(error);
+      }
+      error= find_first_relay_log_with_rotate_from_master(rli);
+      if (error)
+        DBUG_RETURN(error);
+    }
     mi->set_master_log_pos(max<ulonglong>(BIN_LOG_HEADER_SIZE,
                                                rli->get_group_master_log_pos()));
     mi->set_master_log_name(rli->get_group_master_log_name());
@@ -1025,7 +1233,7 @@
 
   while (*slave_running)                        // Should always be true
   {
-    int error;
+    int error __attribute__((unused));
     DBUG_PRINT("loop", ("killing slave thread"));
 
     mysql_mutex_lock(&thd->LOCK_thd_data);
@@ -1801,6 +2009,15 @@
     goto err;
   }
 
+  if (mi->get_mi_description_event()->binlog_version < 4 &&
+      opt_slave_sql_verify_checksum)
+  {
+    sql_print_warning("Found a master with MySQL server version older than "
+                      "5.0. With checksums enabled on the slave, replication "
+                      "might not work correctly. To ensure correct "
+                      "replication, restart the slave server with "
+                      "--slave_sql_verify_checksum=0.");
+  }
   /*
     FD_q's (A) is set initially from RL's (A): FD_q.(A) := RL.(A).
     It's necessary to adjust FD_q.(A) at this point because in the following
@@ -3275,9 +3492,13 @@
   /* Check if eof packet */
   if (len < 8 && mysql->net.read_pos[0] == 254)
   {
-    sql_print_information("Slave: received end packet from server, apparent "
-                          "master shutdown: %s",
-                     mysql_error(mysql));
+     sql_print_information("Slave: received end packet from server due to dump "
+                           "thread being killed on master. Dump threads are "
+                           "killed for example during master shutdown, "
+                           "explicitly by a user, or when the master receives "
+                           "a binlog send request from a duplicate server "
+                           "UUID <%s> : Error %s", ::server_uuid,
+                           mysql_error(mysql));
      DBUG_RETURN(packet_error);
   }
 
@@ -3754,6 +3975,88 @@
                        : SLAVE_APPLY_EVENT_AND_UPDATE_POS_OK);
 }
 
+/**
+  Let the worker applying the current group to rollback and gracefully
+  finish its work before.
+
+  @param rli The slave's relay log info.
+
+  @param ev a pointer to the event on hold before applying this rollback
+  procedure.
+
+  @retval false The rollback succeeded.
+
+  @retval true  There was an error while injecting events.
+*/
+static bool coord_handle_partial_binlogged_transaction(Relay_log_info *rli,
+                                                       const Log_event *ev)
+{
+  DBUG_ENTER("coord_handle_partial_binlogged_transaction");
+  /*
+    This function is called holding the rli->data_lock.
+    We must return it still holding this lock, except in the case of returning
+    error.
+  */
+  mysql_mutex_assert_owner(&rli->data_lock);
+  THD *thd= rli->info_thd;
+
+  if (!rli->curr_group_seen_begin)
+  {
+    DBUG_PRINT("info",("Injecting QUERY(BEGIN) to rollback worker"));
+    Log_event *begin_event= new Query_log_event(thd,
+                                                STRING_WITH_LEN("BEGIN"),
+                                                true, /* using_trans */
+                                                false, /* immediate */
+                                                true, /* suppress_use */
+                                                0, /* error */
+                                                true /* ignore_command */);
+    ((Query_log_event*) begin_event)->db= "";
+    begin_event->data_written= 0;
+    begin_event->server_id= ev->server_id;
+    /*
+      We must be careful to avoid SQL thread increasing its position
+      farther than the event that triggered this QUERY(BEGIN).
+    */
+    begin_event->log_pos= ev->log_pos;
+    begin_event->future_event_relay_log_pos= ev->future_event_relay_log_pos;
+
+    if (apply_event_and_update_pos(&begin_event, thd, rli) !=
+        SLAVE_APPLY_EVENT_AND_UPDATE_POS_OK)
+    {
+      delete begin_event;
+      DBUG_RETURN(true);
+    }
+    mysql_mutex_lock(&rli->data_lock);
+  }
+
+  DBUG_PRINT("info",("Injecting QUERY(ROLLBACK) to rollback worker"));
+  Log_event *rollback_event= new Query_log_event(thd,
+                                                 STRING_WITH_LEN("ROLLBACK"),
+                                                 true, /* using_trans */
+                                                 false, /* immediate */
+                                                 true, /* suppress_use */
+                                                 0, /* error */
+                                                 true /* ignore_command */);
+  ((Query_log_event*) rollback_event)->db= "";
+  rollback_event->data_written= 0;
+  rollback_event->server_id= ev->server_id;
+  /*
+    We must be careful to avoid SQL thread increasing its position
+    farther than the event that triggered this QUERY(ROLLBACK).
+  */
+  rollback_event->log_pos= ev->log_pos;
+  rollback_event->future_event_relay_log_pos= ev->future_event_relay_log_pos;
+
+  if (apply_event_and_update_pos(&rollback_event, thd, rli) !=
+      SLAVE_APPLY_EVENT_AND_UPDATE_POS_OK)
+  {
+    delete rollback_event;
+    DBUG_RETURN(true);
+  }
+  mysql_mutex_lock(&rli->data_lock);
+
+  DBUG_RETURN(false);
+}
 
 /**
   Top-level function for executing the next event in the relay log.
@@ -3832,12 +4135,13 @@
       that are not replayed, so we keep falling behind).
 
       If it is an artificial event, or a relay log event (IO thread generated
-      event) or ev->when is set to 0, or a FD from master, we don't update the
-      last_master_timestamp.
+      event) or ev->when is set to 0, or a FD from master, or a heartbeat
+      event with server_id '0' then  we don't update the last_master_timestamp.
     */
     if (!(rli->is_parallel_exec() ||
           ev->is_artificial_event() || ev->is_relay_log_event() ||
-          (ev->when.tv_sec == 0) || ev->get_type_code() == FORMAT_DESCRIPTION_EVENT))
+          ev->when.tv_sec == 0 || ev->get_type_code() == FORMAT_DESCRIPTION_EVENT ||
+          ev->server_id == 0))
     {
       rli->last_master_timestamp= ev->when.tv_sec + (time_t) ev->exec_time;
       DBUG_ASSERT(rli->last_master_timestamp >= 0);
@@ -3885,6 +4189,28 @@
                       };);
     }
 
+    /*
+      GTID protocol will put a FORMAT_DESCRIPTION_EVENT from the master with
+      log_pos != 0 after each (re)connection if auto positioning is enabled.
+      This means that the SQL thread might have already started to apply the
+      current group but, as the IO thread had to reconnect, it left this
+      group incomplete and will start it again from the beginning.
+      So, before applying this FORMAT_DESCRIPTION_EVENT, we must let the
+      worker roll back the current group and gracefully finish its work,
+      before starting to apply the new (complete) copy of the group.
+    */
+    if (ev->get_type_code() == FORMAT_DESCRIPTION_EVENT &&
+        ev->server_id != ::server_id && ev->log_pos != 0 &&
+        rli->is_parallel_exec() && rli->curr_group_seen_gtid)
+    {
+      if (coord_handle_partial_binlogged_transaction(rli, ev))
+        /*
+          In the case of an error, coord_handle_partial_binlogged_transaction
+          will not try to get the rli->data_lock again.
+        */
+        DBUG_RETURN(1);
+    }
+
     /* ptr_ev can change to NULL indicating MTS coorinator passed to a Worker */
     exec_res= apply_event_and_update_pos(ptr_ev, thd, rli);
     /*
@@ -3901,6 +4227,15 @@
     {
       DBUG_ASSERT(*ptr_ev == ev); // event remains to belong to Coordinator
 
+      DBUG_EXECUTE_IF("dbug.calculate_sbm_after_previous_gtid_log_event",
+                    {
+                      if (ev->get_type_code() == PREVIOUS_GTIDS_LOG_EVENT)
+                      {
+                        const char act[]= "now signal signal.reached wait_for signal.done_sbm_calculation";
+                        DBUG_ASSERT(opt_debug_sync_timeout > 0);
+                        DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
+                      }
+                    };);
       /*
         Format_description_log_event should not be deleted because it will be
         used to read info about the relay log's format; it will be deleted when
@@ -4226,6 +4561,11 @@
                       DBUG_ASSERT(!debug_sync_set_action(thd, 
                                                          STRING_WITH_LEN(act)));
                     };);
+    DBUG_EXECUTE_IF("dbug.calculate_sbm_after_previous_gtid_log_event",
+                    {
+                      /* Fake that thread started 3 mints ago */
+                      thd->start_time.tv_sec-=180;
+                    };);
   mysql_mutex_lock(&mi->run_lock);
   mi->slave_running= MYSQL_SLAVE_RUN_CONNECT;
   mysql_mutex_unlock(&mi->run_lock);
@@ -4452,15 +4792,27 @@
         }
       DBUG_EXECUTE_IF("stop_io_after_reading_gtid_log_event",
         if (event_buf[EVENT_TYPE_OFFSET] == GTID_LOG_EVENT)
-           thd->killed= THD::KILLED_NO_VALUE;
+          thd->killed= THD::KILLED_NO_VALUE;
       );
       DBUG_EXECUTE_IF("stop_io_after_reading_query_log_event",
         if (event_buf[EVENT_TYPE_OFFSET] == QUERY_EVENT)
-           thd->killed= THD::KILLED_NO_VALUE;
+          thd->killed= THD::KILLED_NO_VALUE;
+      );
+      DBUG_EXECUTE_IF("stop_io_after_reading_user_var_log_event",
+        if (event_buf[EVENT_TYPE_OFFSET] == USER_VAR_EVENT)
+          thd->killed= THD::KILLED_NO_VALUE;
+      );
+      DBUG_EXECUTE_IF("stop_io_after_reading_table_map_event",
+        if (event_buf[EVENT_TYPE_OFFSET] == TABLE_MAP_EVENT)
+          thd->killed= THD::KILLED_NO_VALUE;
       );
       DBUG_EXECUTE_IF("stop_io_after_reading_xid_log_event",
         if (event_buf[EVENT_TYPE_OFFSET] == XID_EVENT)
-           thd->killed= THD::KILLED_NO_VALUE;
+          thd->killed= THD::KILLED_NO_VALUE;
+      );
+      DBUG_EXECUTE_IF("stop_io_after_reading_write_rows_log_event",
+        if (event_buf[EVENT_TYPE_OFFSET] == WRITE_ROWS_EVENT)
+          thd->killed= THD::KILLED_NO_VALUE;
       );
     }
   }
@@ -4508,11 +4860,9 @@
   net_end(&thd->net); // destructor will not free it, because net.vio is 0
 
   thd->release_resources();
-  mysql_mutex_lock(&LOCK_thread_count);
   THD_CHECK_SENTRY(thd);
   if (thd_added)
     remove_global_thread(thd);
-  mysql_mutex_unlock(&LOCK_thread_count);
   delete thd;
 
   mi->abort_slave= 0;
@@ -4712,12 +5062,9 @@
     */
     thd->system_thread= NON_SYSTEM_THREAD;
     thd->release_resources();
-
-    mysql_mutex_lock(&LOCK_thread_count);
     THD_CHECK_SENTRY(thd);
     if (thd_added)
       remove_global_thread(thd);
-    mysql_mutex_unlock(&LOCK_thread_count);
     delete thd;
   }
 
@@ -5840,11 +6187,9 @@
   set_thd_in_use_temporary_tables(rli);  // (re)set info_thd in use for saved temp tables
 
   thd->release_resources();
-  mysql_mutex_lock(&LOCK_thread_count);
   THD_CHECK_SENTRY(thd);
   if (thd_added)
     remove_global_thread(thd);
-  mysql_mutex_unlock(&LOCK_thread_count);
   delete thd;
  /*
   Note: the order of the broadcast and unlock calls below (first broadcast, then unlock)
@@ -6571,11 +6916,6 @@
 
   case PREVIOUS_GTIDS_LOG_EVENT:
   {
-    if (gtid_mode == 0)
-    {
-      error= ER_FOUND_GTID_EVENT_WHEN_GTID_MODE_IS_OFF;
-      goto err;
-    }
     /*
       This event does not have any meaning for the slave and
       was just sent to show the slave the master is making
@@ -6624,6 +6964,23 @@
   }
 
   /*
+    Simulate an unknown ignorable log event by rewriting the write_rows log
+    event and previous_gtids log event before writing them in relay log.
+  */
+  DBUG_EXECUTE_IF("simulate_unknown_ignorable_log_event",
+    if (event_type == WRITE_ROWS_EVENT ||
+        event_type == PREVIOUS_GTIDS_LOG_EVENT)
+    {
+      char *event_buf= const_cast<char*>(buf);
+      /* Overwrite the log event type with an unknown type. */
+      event_buf[EVENT_TYPE_OFFSET]= ENUM_END_EVENT + 1;
+      /* Set LOG_EVENT_IGNORABLE_F for the log event. */
+      int2store(event_buf + FLAGS_OFFSET,
+                uint2korr(event_buf + FLAGS_OFFSET) | LOG_EVENT_IGNORABLE_F);
+    }
+  );
+
+  /*
      If this event is originating from this server, don't queue it.
      We don't check this for 3.23 events because it's simpler like this; 3.23
      will be filtered anyway by the SQL slave thread which also tests the
@@ -6806,7 +7163,7 @@
 #endif
   ulong client_flag= CLIENT_REMEMBER_OPTIONS;
   if (opt_slave_compressed_protocol)
-    client_flag=CLIENT_COMPRESS;                /* We will use compression */
+    client_flag|= CLIENT_COMPRESS;              /* We will use compression */
 
   mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *) &slave_net_timeout);
   mysql_options(mysql, MYSQL_OPT_READ_TIMEOUT, (char *) &slave_net_timeout);
@@ -6839,7 +7196,24 @@
   }
 #endif
 
-  mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset_info->csname);
+  /*
+    If server's default charset is not supported (like utf16, utf32) as client
+    charset, then set client charset to 'latin1' (default client charset).
+  */
+  if (is_supported_parser_charset(default_charset_info))
+    mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset_info->csname);
+  else
+  {
+    sql_print_information("'%s' can not be used as client character set. "
+                          "'%s' will be used as default client character set "
+                          "while connecting to master.",
+                          default_charset_info->csname,
+                          default_client_charset_info->csname);
+    mysql_options(mysql, MYSQL_SET_CHARSET_NAME,
+                  default_client_charset_info->csname);
+  }
+
+
   /* This one is not strictly needed but we have it here for completeness */
   mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir);
 
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_utility.cc percona-xtrabackup-2.3.7/sql/rpl_utility.cc
--- percona-xtrabackup-2.2.3/sql/rpl_utility.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_utility.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2014, 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
@@ -559,6 +559,48 @@
 
 
 /**
+  Check if the types are criss cross means type1 is MYSQL_TYPE_TIMESTAMP
+  and type2 as MYSQL_TYPE_TIMESTAMP2 or vice versa.
+*/
+inline bool timestamp_cross_check(enum_field_types type1,
+                                  enum_field_types type2)
+{
+  return ((type1 == MYSQL_TYPE_TIMESTAMP &&
+          type2 == MYSQL_TYPE_TIMESTAMP2) ||
+          (type1 == MYSQL_TYPE_TIMESTAMP2 &&
+          type2 == MYSQL_TYPE_TIMESTAMP));
+}
+
+
+/**
+  Check if the types are criss cross means type1 is MYSQL_TYPE_DATETIME
+  and type2 as MYSQL_TYPE_DATETIME or vice versa.
+*/
+inline bool datetime_cross_check(enum_field_types type1,
+                                 enum_field_types type2)
+{
+  return ((type1 == MYSQL_TYPE_DATETIME &&
+          type2 == MYSQL_TYPE_DATETIME2) ||
+          (type1 == MYSQL_TYPE_DATETIME2 &&
+          type2 == MYSQL_TYPE_DATETIME));
+}
+
+
+/**
+  Check if the types are criss cross means type1 is MYSQL_TYPE_TIME
+  and type2 as MYSQL_TYPE_TIME2 or vice versa.
+*/
+inline bool time_cross_check(enum_field_types type1,
+                             enum_field_types type2)
+{
+  return ((type1 == MYSQL_TYPE_TIME&&
+          type2 == MYSQL_TYPE_TIME2) ||
+          (type1 == MYSQL_TYPE_TIME2 &&
+          type2 == MYSQL_TYPE_TIME));
+}
+
+
+/**
    Can a type potentially be converted to another type?
 
    This function check if the types are convertible and what
@@ -629,14 +671,27 @@
       DBUG_RETURN(false);
   }
   else if (metadata == 0 &&
-           ((field->real_type() == MYSQL_TYPE_TIMESTAMP2 &&
-             source_type == MYSQL_TYPE_TIMESTAMP) ||
-            (field->real_type() == MYSQL_TYPE_TIME2 &&
-             source_type == MYSQL_TYPE_TIME) ||
-            (field->real_type() == MYSQL_TYPE_DATETIME2 &&
-             source_type == MYSQL_TYPE_DATETIME)))
+           (timestamp_cross_check(field->real_type(), source_type) ||
+           datetime_cross_check(field->real_type(), source_type) ||
+           time_cross_check(field->real_type(), source_type)))
   {
     /*
+      In the above condition, we are taking care
+      of case where
+      1) Master having old TIME, TIMESTAMP, DATETIME
+      and slave have new TIME2, TIMESTAMP2, DATETIME2
+      or
+      2) Master having new TIMESTAMP2, DATETIME2, TIME2
+      with fraction part zero and slave have TIME,
+      TIMESTAMP, DATETIME.
+      We need second condition, as when we are
+      upgrading from 5.5 to 5.6 TIME, TIMESTAMP,
+      DATETIME columns are not upgraded to TIME(0),
+      TIMESTAMP(0), DATETIME(0).
+      So to support these conversion we are putting this
+      condition.
+    */
+    /*
       TS-TODO: conversion from FSP1>FSP2.
       Can do non-lossy conversion
       from old TIME, TIMESTAMP, DATETIME
diff -Nru percona-xtrabackup-2.2.3/sql/rpl_utility.h percona-xtrabackup-2.3.7/sql/rpl_utility.h
--- percona-xtrabackup-2.2.3/sql/rpl_utility.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/rpl_utility.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/sql/scheduler.cc percona-xtrabackup-2.3.7/sql/scheduler.cc
--- percona-xtrabackup-2.2.3/sql/scheduler.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/scheduler.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2014, 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
@@ -34,11 +34,8 @@
 {
   thd_release_resources(thd);
   dec_connection_count();
-
-  // THD is an incomplete type here, so use destroy_thd() to delete it.
-  mysql_mutex_lock(&LOCK_thread_count);
   remove_global_thread(thd);
-  mysql_mutex_unlock(&LOCK_thread_count);
+  // THD is an incomplete type here, so use destroy_thd() to delete it.
   destroy_thd(thd);
 
   return 1;                                     // Abort handle_one_connection
diff -Nru percona-xtrabackup-2.2.3/sql/share/errmsg-utf8.txt percona-xtrabackup-2.3.7/sql/share/errmsg-utf8.txt
--- percona-xtrabackup-2.2.3/sql/share/errmsg-utf8.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/share/errmsg-utf8.txt	2017-02-27 07:47:02.000000000 +0000
@@ -7100,6 +7100,15 @@
 ER_AES_INVALID_IV
   eng "The initialization vector supplied to %s is too short. Must be at least %d bytes long"
   bg "Инициализационни� вектор подаден на %s е прекалено къ�. Тр�бва да е поне %d байта"
+
+ER_PLUGIN_CANNOT_BE_UNINSTALLED
+  eng "Plugin '%s' cannot be uninstalled now. %s"
+
+ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP
+  eng "Cannot execute statement because it needs to be written to the binary log as multiple statements, and this is not allowed when @@SESSION.GTID_NEXT == 'UUID:NUMBER'."
+
+ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER
+  eng "Slave has more GTIDs than the master has, using the master's SERVER_UUID. This may indicate that the end of the binary log was truncated or that the last binary log file was lost, e.g., after a power or disk failure when sync_binlog != 1. The master may or may not have rolled back transactions that were already replicated to the slave. Suggest to replicate any transactions that master has rolled back from slave to master, and/or commit empty transactions on master to account for transactions that have been committed on master but are not included in GTID_EXECUTED."
 #
 #  End of 5.6 error messages.
 #
diff -Nru percona-xtrabackup-2.2.3/sql/signal_handler.cc percona-xtrabackup-2.3.7/sql/signal_handler.cc
--- percona-xtrabackup-2.2.3/sql/signal_handler.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/signal_handler.cc	2017-02-27 07:47:02.000000000 +0000
@@ -35,9 +35,6 @@
 static volatile sig_atomic_t segfaulted= 0;
 extern ulong max_used_connections;
 extern volatile sig_atomic_t calling_initgroups;
-#ifdef HAVE_NPTL
-extern volatile sig_atomic_t ld_assume_kernel_is_set;
-#endif
 
 /**
  * Handler for fatal signals
@@ -89,65 +86,18 @@
   my_safe_itoa(10, mins, &mins_buf[2]);
   my_safe_itoa(10, secs, &secs_buf[2]);
 
-  my_safe_printf_stderr("%s:%s:%s UTC - mysqld got " SIGNAL_FMT " ;\n",
+  my_safe_printf_stderr("%s:%s:%s UTC - xtrabackup got " SIGNAL_FMT " ;\n",
                         hrs_buf, mins_buf, secs_buf, sig);
 
   my_safe_printf_stderr("%s",
-    "This could be because you hit a bug. It is also possible that this binary\n"
-    "or one of the libraries it was linked against is corrupt, improperly built,\n"
-    "or misconfigured. This error can also be caused by malfunctioning hardware.\n");
+    "This could be because you hit a bug or data is corrupted.\n"
+    "This error can also be caused by malfunctioning hardware.\n");
 
   my_safe_printf_stderr("%s",
     "We will try our best to scrape up some info that will hopefully help\n"
     "diagnose the problem, but since we have already crashed, \n"
     "something is definitely wrong and this may fail.\n\n");
 
-  my_safe_printf_stderr("key_buffer_size=%lu\n",
-                        (ulong) dflt_key_cache->key_cache_mem_size);
-
-  my_safe_printf_stderr("read_buffer_size=%ld\n",
-                        (long) global_system_variables.read_buff_size);
-
-  my_safe_printf_stderr("max_used_connections=%lu\n",
-                        (ulong) max_used_connections);
-
-  my_safe_printf_stderr("max_threads=%u\n",
-                        (uint) thread_scheduler->max_threads);
-
-  my_safe_printf_stderr("thread_count=%u\n", get_thread_count());
-
-  my_safe_printf_stderr("connection_count=%u\n", (uint) connection_count);
-
-  my_safe_printf_stderr("It is possible that mysqld could use up to \n"
-                        "key_buffer_size + "
-                        "(read_buffer_size + sort_buffer_size)*max_threads = "
-                        "%lu K  bytes of memory\n",
-                        ((ulong) dflt_key_cache->key_cache_mem_size +
-                         (global_system_variables.read_buff_size +
-                          global_system_variables.sortbuff_size) *
-                         thread_scheduler->max_threads +
-                         max_connections * sizeof(THD)) / 1024);
-
-  my_safe_printf_stderr("%s",
-    "Hope that's ok; if not, decrease some variables in the equation.\n\n");
-
-#if defined(HAVE_LINUXTHREADS)
-#define UNSAFE_DEFAULT_LINUX_THREADS 200
-  if (sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS)
-  {
-    my_safe_printf_stderr(
-      "You seem to be running 32-bit Linux and have "
-      "%d concurrent connections.\n"
-      "If you have not changed STACK_SIZE in LinuxThreads "
-      "and built the binary \n"
-      "yourself, LinuxThreads is quite likely to steal "
-      "a part of the global heap for\n"
-      "the thread stack. Please read "
-      "http://dev.mysql.com/doc/mysql/en/linux-installation.html\n\n"
-      thread_count);
-  }
-#endif /* HAVE_LINUXTHREADS */
-
 #ifdef HAVE_STACKTRACE
   THD *thd=current_thd;
 
@@ -162,40 +112,8 @@
     my_print_stacktrace(thd ? (uchar*) thd->thread_stack : NULL,
                         my_thread_stack_size);
   }
-  if (thd)
-  {
-    const char *kreason= "UNKNOWN";
-    switch (thd->killed) {
-    case THD::NOT_KILLED:
-      kreason= "NOT_KILLED";
-      break;
-    case THD::KILL_BAD_DATA:
-      kreason= "KILL_BAD_DATA";
-      break;
-    case THD::KILL_CONNECTION:
-      kreason= "KILL_CONNECTION";
-      break;
-    case THD::KILL_QUERY:
-      kreason= "KILL_QUERY";
-      break;
-    case THD::KILLED_NO_VALUE:
-      kreason= "KILLED_NO_VALUE";
-      break;
-    }
-    my_safe_printf_stderr("%s", "\n"
-      "Trying to get some variables.\n"
-      "Some pointers may be invalid and cause the dump to abort.\n");
-
-    my_safe_printf_stderr("Query (%p): ", thd->query());
-    my_safe_print_str(thd->query(), MY_MIN(1024U, thd->query_length()));
-    my_safe_printf_stderr("Connection ID (thread ID): %lu\n",
-                          (ulong) thd->thread_id);
-    my_safe_printf_stderr("Status: %s\n\n", kreason);
-  }
-  my_safe_printf_stderr("%s",
-    "The manual page at "
-    "http://dev.mysql.com/doc/mysql/en/crashing.html contains\n"
-    "information that should help you find out what is causing the crash.\n");
+  my_safe_printf_stderr("%s", "\n"
+    "Please report a bug at https://bugs.launchpad.net/percona-xtrabackup\n");
 
 #endif /* HAVE_STACKTRACE */
 
@@ -213,21 +131,6 @@
   }
 #endif
 
-#ifdef HAVE_NPTL
-  if (thd_lib_detected == THD_LIB_LT && !ld_assume_kernel_is_set)
-  {
-    my_safe_printf_stderr("%s",
-      "You are running a statically-linked LinuxThreads binary on an NPTL\n"
-      "system. This can result in crashes on some distributions due to "
-      "LT/NPTL conflicts.\n"
-      "You should either build a dynamically-linked binary, "
-      "or force LinuxThreads\n"
-      "to be used with the LD_ASSUME_KERNEL environment variable.\n"
-      "Please consult the documentation for your distribution "
-      "on how to do that.\n");
-  }
-#endif
-
   if (locked_in_memory)
   {
     my_safe_printf_stderr("%s", "\n"
diff -Nru percona-xtrabackup-2.2.3/sql/sp.cc percona-xtrabackup-2.3.7/sql/sp.cc
--- percona-xtrabackup-2.2.3/sql/sp.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sp.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2015, 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
@@ -754,6 +754,7 @@
   sp_rcontext *sp_runtime_ctx_saved= thd->sp_runtime_ctx;
   Silence_deprecated_warning warning_handler;
   Parser_state parser_state;
+  sql_digest_state *parent_digest= thd->m_digest;
   PSI_statement_locker *parent_locker= thd->m_statement_psi;
 
   thd->variables.sql_mode= sql_mode;
@@ -770,6 +771,7 @@
   thd->push_internal_handler(&warning_handler);
   thd->sp_runtime_ctx= NULL;
 
+  thd->m_digest= NULL;
   thd->m_statement_psi= NULL;
   if (parse_sql(thd, & parser_state, creation_ctx) || thd->lex == NULL)
   {
@@ -781,6 +783,7 @@
   {
     sp= thd->lex->sphead;
   }
+  thd->m_digest= parent_digest;
   thd->m_statement_psi= parent_locker;
 
   thd->pop_internal_handler();
@@ -1512,6 +1515,14 @@
     {
       char *sp_name= get_field(thd->mem_root,
                                table->field[MYSQL_PROC_FIELD_NAME]);
+      if (sp_name == NULL)
+      {
+        table->file->ha_index_end();
+        my_error(ER_SP_WRONG_NAME, MYF(0), "");
+        close_system_tables(thd, &open_tables_state_backup);
+        DBUG_RETURN(true);
+      }
+
       longlong sp_type= table->field[MYSQL_PROC_MYSQL_TYPE]->val_int();
       MDL_request *mdl_request= new (thd->mem_root) MDL_request;
       mdl_request->init(sp_type == SP_TYPE_FUNCTION ?
diff -Nru percona-xtrabackup-2.2.3/sql/sp_head.cc percona-xtrabackup-2.3.7/sql/sp_head.cc
--- percona-xtrabackup-2.2.3/sql/sp_head.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sp_head.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2015, 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
@@ -642,8 +642,13 @@
     if (thd->locked_tables_mode <= LTM_LOCK_TABLES)
       thd->user_var_events_alloc= thd->mem_root;
 
+    sql_digest_state *parent_digest= thd->m_digest;
+    thd->m_digest= NULL;
+
     err_status= i->execute(thd, &ip);
 
+    thd->m_digest= parent_digest;
+
     if (i->free_list)
       cleanup_items(i->free_list);
 
@@ -1610,6 +1615,23 @@
 {
   m_parser_data.process_new_sp_instr(thd, instr);
 
+  if (m_type == SP_TYPE_TRIGGER && m_cur_instr_trig_field_items.elements)
+  {
+    SQL_I_List<Item_trigger_field> *instr_trig_fld_list;
+    /*
+      Move all the Item_trigger_field from "sp_head::
+      m_cur_instr_trig_field_items" to the per instruction Item_trigger_field
+      list "sp_lex_instr::m_trig_field_list" and clear "sp_head::
+      m_cur_instr_trig_field_items".
+    */
+    if ((instr_trig_fld_list= instr->get_instr_trig_field_list()) != NULL)
+    {
+      m_cur_instr_trig_field_items.save_and_clear(instr_trig_fld_list);
+      m_list_of_trig_fields_item_lists.link_in_list(instr_trig_fld_list,
+        &instr_trig_fld_list->first->next_trig_field_list);
+    }
+  }
+
   /*
     Memory root of every instruction is designated for permanent
     transformations (optimizations) made on the parsed tree during
diff -Nru percona-xtrabackup-2.2.3/sql/sp_head.h percona-xtrabackup-2.3.7/sql/sp_head.h
--- percona-xtrabackup-2.2.3/sql/sp_head.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sp_head.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2014, 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
@@ -568,13 +568,20 @@
   /////////////////////////////////////////////////////////////////////////
 
   /**
-    List of all items (Item_trigger_field objects) representing fields in
-    old/new version of row in trigger. We use this list for checking whenever
-    all such fields are valid at trigger creation time and for binding these
-    fields to TABLE object at table open (although for latter pointer to table
-    being opened is probably enough).
+    List of item (Item_trigger_field objects)'s lists representing fields
+    in old/new version of row in trigger. We use this list for checking
+    whether all such fields are valid or not at trigger creation time and
+    for binding these fields to TABLE object at table open (although for
+    latter pointer to table being opened is probably enough).
+  */
+  SQL_I_List<SQL_I_List<Item_trigger_field> > m_list_of_trig_fields_item_lists;
+  /**
+    List of all the Item_trigger_field items created while parsing
+    sp instruction. After parsing, in add_instr method this list
+    is moved to per instruction Item_trigger_field list
+    "sp_lex_instr::m_trig_field_list".
   */
-  SQL_I_List<Item_trigger_field> m_trg_table_fields;
+  SQL_I_List<Item_trigger_field> m_cur_instr_trig_field_items;
 
   /// Trigger characteristics.
   st_trg_chistics m_trg_chistics;
diff -Nru percona-xtrabackup-2.2.3/sql/sp_instr.cc percona-xtrabackup-2.3.7/sql/sp_instr.cc
--- percona-xtrabackup-2.2.3/sql/sp_instr.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sp_instr.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2015, 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
@@ -451,7 +451,9 @@
 LEX *sp_lex_instr::parse_expr(THD *thd, sp_head *sp)
 {
   String sql_query;
+  sql_digest_state *parent_digest= thd->m_digest;
   PSI_statement_locker *parent_locker= thd->m_statement_psi;
+  SQL_I_List<Item_trigger_field> *next_trig_list_bkp= NULL;
   sql_query.set_charset(system_charset_info);
 
   get_query(&sql_query);
@@ -466,6 +468,8 @@
     return NULL;
   }
 
+  if (m_trig_field_list.elements)
+    next_trig_list_bkp= m_trig_field_list.first->next_trig_field_list;
   // Cleanup current THD from previously held objects before new parsing.
   cleanup_before_parsing(thd);
 
@@ -480,7 +484,7 @@
     initiated. Also set the statement query arena to the lex mem_root.
   */
   MEM_ROOT *execution_mem_root= thd->mem_root;
-  Query_arena parse_arena(&m_lex_mem_root, thd->stmt_arena->state);
+  Query_arena parse_arena(&m_lex_mem_root, STMT_INITIALIZED_FOR_SP);
 
   thd->mem_root= &m_lex_mem_root;
   thd->stmt_arena->set_query_arena(&parse_arena);
@@ -512,14 +516,19 @@
 
   // Parse the just constructed SELECT-statement.
 
+  thd->m_digest= NULL;
   thd->m_statement_psi= NULL;
   bool parsing_failed= parse_sql(thd, &parser_state, NULL);
+  thd->m_digest= parent_digest;
   thd->m_statement_psi= parent_locker;
 
   if (!parsing_failed)
   {
     thd->lex->set_trg_event_type_for_tables();
 
+    // Call after-parsing callback.
+    parsing_failed= on_after_expr_parsing(thd);
+
     if (sp->m_type == SP_TYPE_TRIGGER)
     {
       /*
@@ -536,21 +545,27 @@
       int action_time= sp->m_trg_chistics.action_time;
       GRANT_INFO *grant_table= &ttl->subject_table_grants[event][action_time];
 
-      for (Item_trigger_field *trg_field= sp->m_trg_table_fields.first;
+      for (Item_trigger_field *trg_field=
+             sp->m_cur_instr_trig_field_items.first;
            trg_field;
            trg_field= trg_field->next_trg_field)
       {
         trg_field->setup_field(thd, ttl->trigger_table, grant_table);
       }
+     
+      /**
+        Move Item_trigger_field's list to instruction's Item_trigger_field
+        list.
+      */
+      if (sp->m_cur_instr_trig_field_items.elements)
+      {
+        sp->m_cur_instr_trig_field_items.save_and_clear(&m_trig_field_list);
+        m_trig_field_list.first->next_trig_field_list= next_trig_list_bkp;
+      }
     }
 
-    // Call after-parsing callback.
-
-    parsing_failed= on_after_expr_parsing(thd);
-
     // Append newly created Items to the list of Items, owned by this
     // instruction.
-
     free_list= thd->free_list;
   }
 
@@ -703,7 +718,7 @@
   sp_head *sp= thd->sp_runtime_ctx->sp;
 
   if (sp->m_type == SP_TYPE_TRIGGER)
-    sp->m_trg_table_fields.empty();
+    m_trig_field_list.empty();
 }
 
 
@@ -984,6 +999,14 @@
                                            UPDATE_ACL,
                                            false);
 
+  if (m_trigger_field)
+  {
+    /* Adding m_trigger_field to the list of all Item_trigger_field objects */
+    sp_head *sp= thd->sp_runtime_ctx->sp;
+    sp->m_cur_instr_trig_field_items.
+      link_in_list(m_trigger_field, &m_trigger_field->next_trg_field);
+  }
+
   return m_value_item == NULL || m_trigger_field == NULL;
 }
 
diff -Nru percona-xtrabackup-2.2.3/sql/sp_instr.h percona-xtrabackup-2.3.7/sql/sp_instr.h
--- percona-xtrabackup-2.2.3/sql/sp_instr.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sp_instr.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2014, 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
@@ -137,6 +137,9 @@
   bool opt_is_marked() const
   { return m_marked; }
 
+  virtual SQL_I_List<Item_trigger_field>* get_instr_trig_field_list()
+  { return NULL; }
+
 protected:
   /// Show if this instruction is reachable within the SP
   /// (used by SP-optimizer).
@@ -214,6 +217,9 @@
   */
   bool validate_lex_and_execute_core(THD *thd, uint *nextp, bool open_tables);
 
+  virtual SQL_I_List<Item_trigger_field>* get_instr_trig_field_list()
+  { return &m_trig_field_list; }
+
 private:
   /**
     Prepare LEX and thread for execution of instruction, if requested open
@@ -385,6 +391,11 @@
     statement enters/leaves prelocked mode on its own.
   */
   TABLE_LIST **m_lex_query_tables_own_last;
+
+  /**
+    List of all the Item_trigger_field's of instruction.
+  */
+  SQL_I_List<Item_trigger_field> m_trig_field_list;
 };
 
 ///////////////////////////////////////////////////////////////////////////
diff -Nru percona-xtrabackup-2.2.3/sql/sql_acl.cc percona-xtrabackup-2.3.7/sql/sql_acl.cc
--- percona-xtrabackup-2.2.3/sql/sql_acl.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_acl.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -183,221 +183,9 @@
   }
 };
 
-static const
-TABLE_FIELD_TYPE mysql_user_table_fields[MYSQL_USER_FIELD_COUNT] = {
-  {
-    { C_STRING_WITH_LEN("Host") },            
-    { C_STRING_WITH_LEN("char(60)") },
-    { NULL, 0 }
-  },
-  {
-    { C_STRING_WITH_LEN("User") },            
-    { C_STRING_WITH_LEN("char(16)") },
-    { NULL, 0 }
-  },
-  {
-    { C_STRING_WITH_LEN("Password") },            
-    { C_STRING_WITH_LEN("char(41)") },
-    { C_STRING_WITH_LEN("latin1") }
-  }, 
-  {
-    { C_STRING_WITH_LEN("Select_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  {
-    { C_STRING_WITH_LEN("Insert_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  {
-    { C_STRING_WITH_LEN("Update_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  {
-    { C_STRING_WITH_LEN("Delete_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  {
-    { C_STRING_WITH_LEN("Create_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  {
-    { C_STRING_WITH_LEN("Drop_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  {
-    { C_STRING_WITH_LEN("Reload_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  {
-    { C_STRING_WITH_LEN("Shutdown_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Process_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("File_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Grant_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("References_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Index_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Alter_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Show_db_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Super_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Create_tmp_table_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Lock_tables_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Execute_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Repl_slave_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Repl_client_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Create_view_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Show_view_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Create_routine_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Alter_routine_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Create_user_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Event_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Trigger_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("Create_tablespace_priv") },
-    { C_STRING_WITH_LEN("enum('N','Y')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("ssl_type") },
-    { C_STRING_WITH_LEN("enum('','ANY','X509','SPECIFIED')") },
-    { C_STRING_WITH_LEN("utf8") }
-  },
-  { 
-    { C_STRING_WITH_LEN("ssl_cipher") },
-    { C_STRING_WITH_LEN("blob") },
-    { NULL, 0 }
-  },
-  { 
-    { C_STRING_WITH_LEN("x509_issuer") },
-    { C_STRING_WITH_LEN("blob") },
-    { NULL, 0 }
-  },
-  { 
-    { C_STRING_WITH_LEN("x509_subject") },
-    { C_STRING_WITH_LEN("blob") },
-    { NULL, 0 }
-  },
-  { 
-    { C_STRING_WITH_LEN("max_questions") },
-    { C_STRING_WITH_LEN("int(11)") },
-    { NULL, 0 }
-  },
-  { 
-    { C_STRING_WITH_LEN("max_updates") },
-    { C_STRING_WITH_LEN("int(11)") },
-    { NULL, 0 }
-  },
-  { 
-    { C_STRING_WITH_LEN("max_connections") },
-    { C_STRING_WITH_LEN("int(11)") },
-    { NULL, 0 }
-  },
-  { 
-    { C_STRING_WITH_LEN("plugin") },
-    { C_STRING_WITH_LEN("char(64)") },
-    { NULL, 0 }
-  },
-  { 
-    { C_STRING_WITH_LEN("authentication_string") },
-    { C_STRING_WITH_LEN("text") },
-    { NULL, 0 }
-  } 
-};
-
 const TABLE_FIELD_DEF
   mysql_db_table_def= {MYSQL_DB_FIELD_COUNT, mysql_db_table_fields};
 
-const TABLE_FIELD_DEF
-  mysql_user_table_def= {MYSQL_USER_FIELD_COUNT, mysql_user_table_fields};
-
 static LEX_STRING native_password_plugin_name= {
   C_STRING_WITH_LEN("mysql_native_password")
 };
@@ -551,6 +339,7 @@
   LEX_STRING plugin;
   LEX_STRING auth_string;
   bool password_expired;
+  bool can_authenticate;
 
   ACL_USER *copy(MEM_ROOT *root)
   {
@@ -1065,6 +854,16 @@
                                         table->field[MYSQL_USER_FIELD_HOST]));
     user.user= get_field(&global_acl_memory,
                          table->field[MYSQL_USER_FIELD_USER]);
+
+    /*
+      All accounts can authenticate per default. This will change when
+      we add a new field to the user table.
+
+      Currently this flag is only set to false when authentication is attempted
+      using an unknown user name.
+    */
+    user.can_authenticate= true;
+
     if (check_no_resolve && hostname_requires_resolving(user.host.get_host()))
     {
       sql_print_warning("'user' entry '%s@%s' "
@@ -1959,6 +1758,14 @@
   int hash_not_ok;
 
   mysql_mutex_assert_owner(&acl_cache->lock);
+  /*
+     All accounts can authenticate per default. This will change when
+     we add a new field to the user table.
+
+     Currently this flag is only set to false when authentication is attempted
+     using an unknown user name.
+  */
+  acl_user.can_authenticate= true;
 
   acl_user.user= *user ? strdup_root(&global_acl_memory,user) : 0;
   acl_user.host.update_hostname(*host ? strdup_root(&global_acl_memory, host) : 0);
@@ -2879,8 +2686,14 @@
   */
   if (!password_expired)
   {
-    table->field[(int) password_field]->store(new_password, new_password_len,
-                                              system_charset_info);
+    if (table->s->fields >= (uint) password_field)
+      table->field[(uint) password_field]->store(new_password, new_password_len,
+                                                 system_charset_info);
+    else
+    {
+      my_error(ER_BAD_FIELD_ERROR, MYF(0), "authentication string", "mysql.user");
+      DBUG_RETURN(1);
+    }
     if (new_password_len == SCRAMBLED_PASSWORD_CHAR_LENGTH_323 &&
         password_field == MYSQL_USER_FIELD_PASSWORD)
     {
@@ -3084,17 +2897,24 @@
       /* Use the authentication_string field */
       combo->auth.str= password;
       combo->auth.length= password_len;
-      if (password_len > 0)
+      if (table->s->fields >= MYSQL_USER_FIELD_AUTHENTICATION_STRING)
+      {
+        if (password_len > 0)
+          table->
+            field[MYSQL_USER_FIELD_AUTHENTICATION_STRING]->
+              store(password, password_len, &my_charset_utf8_bin);
+        /* Assert that the proper plugin is set */
         table->
-          field[MYSQL_USER_FIELD_AUTHENTICATION_STRING]->
-            store(password, password_len, &my_charset_utf8_bin);
-      /* Assert that the proper plugin is set */
-      table->
-        field[MYSQL_USER_FIELD_PLUGIN]->
-          store(sha256_password_plugin_name.str,
-                sha256_password_plugin_name.length,
-                system_charset_info);
-
+          field[MYSQL_USER_FIELD_PLUGIN]->
+            store(sha256_password_plugin_name.str,
+                  sha256_password_plugin_name.length,
+                  system_charset_info);
+      }
+      else
+      {
+        my_error(ER_BAD_FIELD_ERROR, MYF(0), "plugin", "mysql.user");
+        goto end;
+      }
     }
     else
 #endif
@@ -3102,8 +2922,9 @@
       /* Use the legacy Password field */
       table->field[MYSQL_USER_FIELD_PASSWORD]->store(password, password_len,
                                                      system_charset_info);
-      table->field[MYSQL_USER_FIELD_AUTHENTICATION_STRING]->store("\0", 0,
-                                                     &my_charset_utf8_bin);
+      if (table->s->fields >= MYSQL_USER_FIELD_AUTHENTICATION_STRING)
+        table->field[MYSQL_USER_FIELD_AUTHENTICATION_STRING]->store("\0", 0,
+                                                       &my_charset_utf8_bin);
     }
   }
   else // if (table->file->ha_index_read_idx_map [..]
@@ -3256,7 +3077,6 @@
       else
         combo->auth.length= 0;
     }
-    
     /* 2. Digest password if needed (plugin must have been resolved */
     if (combo->uses_identified_by_clause)
     {
@@ -6184,7 +6004,7 @@
   bool error= TRUE;
   size_t copy_length;
 
-  copy_length= (size_t) (strlen(sctx->priv_user ? sctx->priv_user : "") +
+  copy_length= (size_t) (strlen(sctx->priv_user) +
                  strlen(db ? db : "")) + 1; /* Added 1 at the end to avoid  
                                                buffer overflow at strmov()*/
 
@@ -6533,24 +6353,34 @@
 		  system_charset_info);
     global.append ('\'');
 #if defined(HAVE_OPENSSL)
-    if (acl_user->plugin.str == sha256_password_plugin_name.str)
+    if (acl_user->plugin.str == sha256_password_plugin_name.str &&
+        acl_user->auth_string.length > 0)
     {
-      global.append(STRING_WITH_LEN(" IDENTIFIED BY PASSWORD '"));
-      global.append((const char *) &acl_user->auth_string.str[0]);
-      global.append('\'');
+      global.append(STRING_WITH_LEN(" IDENTIFIED BY PASSWORD"));
+      if ((thd->security_ctx->master_access & SUPER_ACL) == SUPER_ACL)
+      {
+        global.append(" \'");
+        global.append((const char *) &acl_user->auth_string.str[0]);
+        global.append('\'');
+      }
     }
     else
 #endif
     if (acl_user->salt_len)
     {
-      char passwd_buff[SCRAMBLED_PASSWORD_CHAR_LENGTH+1];
-      if (acl_user->salt_len == SCRAMBLE_LENGTH)
-        make_password_from_salt(passwd_buff, acl_user->salt);
-      else
-        make_password_from_salt_323(passwd_buff, (ulong *) acl_user->salt);
-      global.append(STRING_WITH_LEN(" IDENTIFIED BY PASSWORD '"));
-      global.append(passwd_buff);
-      global.append('\'');
+      global.append(STRING_WITH_LEN(" IDENTIFIED BY PASSWORD"));
+      if ((thd->security_ctx->master_access & SUPER_ACL) == SUPER_ACL)
+      {
+        char passwd_buff[SCRAMBLED_PASSWORD_CHAR_LENGTH+1];
+        if (acl_user->salt_len == SCRAMBLE_LENGTH)
+          make_password_from_salt(passwd_buff, acl_user->salt);
+        else
+          make_password_from_salt_323(passwd_buff, (ulong *) acl_user->salt);
+
+        global.append(" \'");
+        global.append(passwd_buff);
+        global.append('\'');
+      }
     }
     /* "show grants" SSL related stuff */
     if (acl_user->ssl_type == SSL_TYPE_ANY)
@@ -9270,7 +9100,7 @@
   DBUG_PRINT("enter", ("Host: '%s', Ip: '%s', User: '%s', table: `%s`.`%s`",
                        sctx->priv_host, (sctx->get_ip()->length() ?
                        sctx->get_ip()->ptr() : "(NULL)"),
-                       (sctx->priv_user ? sctx->priv_user : "(NULL)"),
+                       sctx->priv_user,
                        db, table));
   /* --skip-grants */
   if (!initialized)
@@ -9437,7 +9267,9 @@
 
 /* few defines to have less ifdef's in the code below */
 #ifdef EMBEDDED_LIBRARY
+#ifndef XTRABACKUP
 #undef HAVE_OPENSSL
+#endif
 #ifdef NO_EMBEDDED_ACCESS_CHECKS
 #define initialized 0
 #endif
@@ -9503,6 +9335,10 @@
   Thd_charset_adapter *charset_adapter;
   LEX_STRING acl_user_plugin;
   int vio_is_encrypted;
+  bool can_authenticate()
+  {
+    return (acl_user && acl_user->can_authenticate);
+  }
 };
 
 bool auth_plugin_is_built_in(const char *plugin_name)
@@ -9884,6 +9720,34 @@
 }
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
+
+/**
+  When authentication is attempted using an unknown username a dummy user
+  account with no authentication capabilites is assigned to the connection.
+  This is done increase the cost of enumerating user accounts based on
+  authentication protocol.
+*/
+
+ACL_USER *decoy_user(const LEX_STRING &username,
+                      MEM_ROOT *mem)
+{
+  ACL_USER *user= (ACL_USER *) alloc_root(mem, sizeof(ACL_USER));
+  user->can_authenticate= false;
+  user->user= strmake_root(mem, username.str, username.length);
+  user->auth_string= empty_lex_str;
+  user->ssl_cipher= empty_c_string;
+  user->x509_issuer= empty_c_string;
+  user->x509_subject= empty_c_string;
+  user->salt_len= 0;
+
+  /*
+    For now the common default account is used. Improvements might involve
+    mapping a consistent hash of a username to a range of plugins.
+  */
+  user->plugin= default_auth_plugin_name;
+  return user;
+}
+
 /**
    Finds acl entry in user database for authentication purposes.
    
@@ -9929,8 +9793,14 @@
 
   if (!mpvio->acl_user)
   {
-    login_failed_error(mpvio, mpvio->auth_info.password_used);
-    DBUG_RETURN (1);
+    /*
+      Pretend the user exists; let the plugin decide how to handle
+      bad credentials.
+    */
+    LEX_STRING usr= { mpvio->auth_info.user_name,
+                      mpvio->auth_info.user_name_length };
+    mpvio->acl_user= decoy_user(usr, mpvio->mem_root);
+    mpvio->acl_user_plugin= mpvio->acl_user->plugin;
   }
 
   if (my_strcasecmp(system_charset_info, mpvio->acl_user->plugin.str,
@@ -10057,13 +9927,6 @@
     if (mpvio->charset_adapter->init_client_charset(uint2korr(ptr)))
       DBUG_RETURN(1);
   }
-  else
-  {
-    sql_print_warning("Client failed to provide its character set. "
-                      "'%s' will be used as client character set.",
-                      mpvio->charset_adapter->charset()->csname);
-  }
-
 
   /* Convert database and user names to utf8 */
   db_len= copy_and_convert(db_buff, sizeof(db_buff) - 1, system_charset_info,
@@ -10098,7 +9961,9 @@
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (find_mpvio_user(mpvio))
+  {
     DBUG_RETURN(1);
+  }
 
   char *client_plugin;
   if (mpvio->client_capabilities & CLIENT_PLUGIN_AUTH)
@@ -10390,9 +10255,6 @@
     mpvio->client_capabilities= uint4korr(end);
     mpvio->max_client_packet_length= 0xfffff;
     charset_code= global_system_variables.character_set_client->number;
-    sql_print_warning("Client failed to provide its character set. "
-                      "'%s' will be used as client character set.",
-                      global_system_variables.character_set_client->csname);
     if (mpvio->charset_adapter->init_client_charset(charset_code))
       return packet_error;
     goto skip_to_ssl;
@@ -10430,9 +10292,6 @@
       was that they used what ever the server used.
     */
     charset_code= global_system_variables.character_set_client->number;
-    sql_print_warning("Client failed to provide its character set. "
-                      "'%s' will be used as client character set.",
-                      global_system_variables.character_set_client->csname);
   }
 
   DBUG_PRINT("info", ("client_character_set: %u", charset_code));
@@ -11170,6 +11029,8 @@
 
     if (parse_com_change_user_packet(&mpvio, com_change_user_pkt_len))
     {
+      if (!thd->is_error())
+        login_failed_error(&mpvio, mpvio.auth_info.password_used);
       server_mpvio_update_thd(thd, &mpvio);
       DBUG_RETURN(1);
     }
@@ -11234,8 +11095,7 @@
     {
       general_log_print(thd, command, "%s@%s as %s on %s",
                         mpvio.auth_info.user_name, mpvio.auth_info.host_or_ip,
-                        mpvio.auth_info.authenticated_as ? 
-                          mpvio.auth_info.authenticated_as : "anonymous",
+                        mpvio.auth_info.authenticated_as,
                         mpvio.db.str ? mpvio.db.str : (char*) "");
     }
     else
@@ -11244,6 +11104,11 @@
                         mpvio.db.str ? mpvio.db.str : (char*) "");
   }
 
+  if (res == CR_OK && !mpvio.can_authenticate())
+  {
+    res= CR_ERROR;
+  }
+
   if (res > CR_OK && mpvio.status != MPVIO_EXT::SUCCESS)
   {
     Host_errors errors;
@@ -11352,7 +11217,7 @@
       DBUG_RETURN(1);
     }
 
-    if (unlikely(acl_user && acl_user->password_expired
+    if (unlikely(mpvio.acl_user && mpvio.acl_user->password_expired
         && !(mpvio.client_capabilities & CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS)
         && disconnect_on_expired_password))
     {
@@ -11383,7 +11248,13 @@
           &acl_user->user_resource))
       DBUG_RETURN(1); // The error is set by get_or_create_user_conn()
 
-    sctx->password_expired= acl_user->password_expired;
+    /*
+      We are copying the connected user's password expired flag to the security
+      context.
+      This allows proxy user to execute queries even if proxied user password
+      expires.
+    */
+    sctx->password_expired= mpvio.acl_user->password_expired;
 #endif
   }
   else
diff -Nru percona-xtrabackup-2.2.3/sql/sql_admin.cc percona-xtrabackup-2.3.7/sql/sql_admin.cc
--- percona-xtrabackup-2.2.3/sql/sql_admin.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_admin.cc	2017-02-27 07:47:02.000000000 +0000
@@ -815,9 +815,10 @@
       if (!result_code) // recreation went ok
       {
         DEBUG_SYNC(thd, "ha_admin_open_ltable");
-        table->mdl_request.set_type(MDL_SHARED_WRITE);
+        table->mdl_request.set_type(MDL_SHARED_READ);
         if (!open_temporary_tables(thd, table) &&
-            (table->table= open_n_lock_single_table(thd, table, lock_type, 0)))
+            (table->table= open_n_lock_single_table(thd, table,
+                                                    TL_READ_NO_INSERT, 0)))
         {
           /*
            Reset the ALTER_ADMIN_PARTITION bit in alter_info->flags
diff -Nru percona-xtrabackup-2.2.3/sql/sql_audit.cc percona-xtrabackup-2.3.7/sql/sql_audit.cc
--- percona-xtrabackup-2.2.3/sql/sql_audit.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_audit.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2015, 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
@@ -120,8 +120,10 @@
   general_class_handler, connection_class_handler
 };
 
+#ifndef DBUG_OFF
 static const uint audit_handlers_count=
   (sizeof(audit_handlers) / sizeof(audit_handler_t));
+#endif /* DBUG_OFF */
 
 
 /**
@@ -342,8 +344,7 @@
 {
   st_mysql_audit *data= (st_mysql_audit*) plugin->plugin->info;
   
-  if (!data->class_mask || !data->event_notify ||
-      !data->class_mask[0])
+  if (!data->event_notify || !data->class_mask[0])
   {
     sql_print_error("Plugin '%s' has invalid data.",
                     plugin->name.str);
diff -Nru percona-xtrabackup-2.2.3/sql/sql_audit.h percona-xtrabackup-2.3.7/sql/sql_audit.h
--- percona-xtrabackup-2.2.3/sql/sql_audit.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_audit.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,4 @@
-#ifndef SQL_AUDIT_INCLUDED
-#define SQL_AUDIT_INCLUDED
-
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2015, 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
@@ -16,6 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#ifndef SQL_AUDIT_INCLUDED
+#define SQL_AUDIT_INCLUDED
 
 #include <my_global.h>
 
@@ -59,29 +58,47 @@
   Call audit plugins of GENERAL audit class, MYSQL_AUDIT_GENERAL_LOG subtype.
   
   @param[in] thd
-  @param[in] time             time that event occurred
-  @param[in] user             User name
-  @param[in] userlen          User name length
   @param[in] cmd              Command name
   @param[in] cmdlen           Command name length
-  @param[in] query            Query string
-  @param[in] querylen         Query string length
-*/
+  @param[in] query_str        query text. Leave empty to fetch it from THD
+  @param[in] query_len        query text length. 0 to fetch it from THD
+  */
  
 static inline
-void mysql_audit_general_log(THD *thd, time_t time,
-                             const char *user, uint userlen,
-                             const char *cmd, uint cmdlen,
-                             const char *query, uint querylen)
+void mysql_audit_general_log(THD *thd, const char *cmd, uint cmdlen,
+                             const char *query_str, size_t query_len)
 {
 #ifndef EMBEDDED_LIBRARY
   if (mysql_global_audit_mask[0] & MYSQL_AUDIT_GENERAL_CLASSMASK)
   {
     MYSQL_LEX_STRING sql_command, ip, host, external_user;
+    MYSQL_LEX_STRING query={ (char *)query_str, query_len };
     static MYSQL_LEX_STRING empty= { C_STRING_WITH_LEN("") };
+    ha_rows rows= 0;
+    int error_code= 0; 
+    char user_buff[MAX_USER_HOST_SIZE + 1];
+    const char *user= user_buff;
+    uint userlen= make_user_name(thd, user_buff);
+    time_t time= (time_t) thd->start_time.tv_sec;
 
     if (thd)
     {
+      if (!query_len)
+      {
+        /* no query specified, fetch from THD */
+        if (!thd->rewritten_query.length())
+          mysql_rewrite_query(thd);
+        if (thd->rewritten_query.length())
+        {
+          query.str= (char *) thd->rewritten_query.ptr();
+          query.length= thd->rewritten_query.length();
+        }
+        else
+        {
+          query.str= thd->query();
+          query.length= thd->query_length();
+        }
+      }
       ip.str= (char *) thd->security_ctx->get_ip()->ptr();
       ip.length= thd->security_ctx->get_ip()->length();
       host.str= (char *) thd->security_ctx->get_host()->ptr();
@@ -102,8 +119,9 @@
       : global_system_variables.character_set_client;
 
     mysql_audit_notify(thd, MYSQL_AUDIT_GENERAL_CLASS, MYSQL_AUDIT_GENERAL_LOG,
-                       0, time, user, userlen, cmd, cmdlen, query, querylen,
-                       clientcs, 0, sql_command, host, external_user, ip);
+                       error_code, time, user, userlen, cmd, cmdlen, query.str,
+                       query.length, clientcs, rows, sql_command, host,
+                       external_user, ip);
   }
 #endif
 }
@@ -197,7 +215,18 @@
 #define MYSQL_AUDIT_NOTIFY_CONNECTION_DISCONNECT(thd, errcode)\
   mysql_audit_notify(\
   (thd), MYSQL_AUDIT_CONNECTION_CLASS, MYSQL_AUDIT_CONNECTION_DISCONNECT,\
-  (errcode), (thd)->thread_id, "", 0, "", 0, "", 0, "", 0, "", 0, "", 0, "", 0)
+  (errcode), (thd)->thread_id,\
+  (thd)->security_ctx->user,\
+  (thd)->security_ctx->user ? strlen((thd)->security_ctx->user) : 0,\
+  (thd)->security_ctx->priv_user, strlen((thd)->security_ctx->priv_user),\
+  (thd)->security_ctx->get_external_user()->ptr(),\
+  (thd)->security_ctx->get_external_user()->length(),\
+  (thd)->security_ctx->proxy_user, strlen((thd)->security_ctx->proxy_user),\
+  (thd)->security_ctx->get_host()->ptr(),\
+  (thd)->security_ctx->get_host()->length(),\
+  (thd)->security_ctx->get_ip()->ptr(),\
+  (thd)->security_ctx->get_ip()->length(),\
+  (thd)->db, (thd)->db ? strlen((thd)->db) : 0)
 
 #define MYSQL_AUDIT_NOTIFY_CONNECTION_CHANGE_USER(thd) mysql_audit_notify(\
   (thd), MYSQL_AUDIT_CONNECTION_CLASS, MYSQL_AUDIT_CONNECTION_CHANGE_USER,\
diff -Nru percona-xtrabackup-2.2.3/sql/sql_base.cc percona-xtrabackup-2.3.7/sql/sql_base.cc
--- percona-xtrabackup-2.2.3/sql/sql_base.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_base.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -1535,7 +1535,14 @@
 
 /*
   Close all temporary tables created by 'CREATE TEMPORARY TABLE' for thread
-  creates one DROP TEMPORARY TABLE binlog event for each pseudo-thread 
+  creates one DROP TEMPORARY TABLE binlog event for each pseudo-thread.
+
+  TODO: In future, we should have temporary_table= 0 and
+        modify_slave_open_temp_tables() at one place instead of repeating
+        it all across the function. An alternative would be to use
+        close_temporary_table() instead of close_temporary() that maintains
+        the correct invariant regarding empty list of temporary tables
+        and zero slave_open_temp_tables already.
 */
 
 bool close_temporary_tables(THD *thd)
@@ -1551,6 +1558,9 @@
   if (!thd->temporary_tables)
     DBUG_RETURN(FALSE);
 
+  DBUG_ASSERT(!thd->slave_thread ||
+              thd->system_thread != SYSTEM_THREAD_SLAVE_WORKER);
+
   if (!mysql_bin_log.is_open())
   {
     TABLE *tmp_next;
@@ -1560,17 +1570,38 @@
       close_temporary(table, 1, 1);
     }
     thd->temporary_tables= 0;
+    if (thd->slave_thread)
+      modify_slave_open_temp_tables(thd, -slave_open_temp_tables);
+
     DBUG_RETURN(FALSE);
   }
+  /* We are about to generate DROP TEMPORARY TABLE statements for all
+    the left out temporary tables. If this part of the code is reached
+    when GTIDs are enabled, we must make sure that it will be able to
+    generate GTIDs for the statements with this server's UUID. Thence
+    gtid_next is set to AUTOMATIC_GROUP below.
+  */
+  if (gtid_mode > 0)
+    thd->variables.gtid_next.set_automatic();
+
+  /*
+    We must separate transactional temp tables and
+    non-transactional temp tables in two distinct DROP statements
+    to avoid the splitting if a slave server reads from this binlog.
+  */
 
   /* Better add "if exists", in case a RESET MASTER has been done */
   const char stub[]= "DROP /*!40005 TEMPORARY */ TABLE IF EXISTS ";
   uint stub_len= sizeof(stub) - 1;
-  char buf[256];
-  String s_query= String(buf, sizeof(buf), system_charset_info);
+  char buf_trans[256], buf_non_trans[256];
+  String s_query_trans= String(buf_trans, sizeof(buf_trans), system_charset_info);
+  String s_query_non_trans= String(buf_non_trans, sizeof(buf_non_trans), system_charset_info);
   bool found_user_tables= FALSE;
+  bool found_trans_table= FALSE;
+  bool found_non_trans_table= FALSE;
 
-  memcpy(buf, stub, stub_len);
+  memcpy(buf_trans, stub, stub_len);
+  memcpy(buf_non_trans, stub, stub_len);
 
   /*
     Insertion sort of temp tables by pseudo_thread_id to build ordered list
@@ -1632,20 +1663,38 @@
          within the sublist of common pseudo_thread_id to create single
          DROP query 
       */
-      for (s_query.length(stub_len);
+      for (s_query_trans.length(stub_len), s_query_non_trans.length(stub_len),
+           found_trans_table= false, found_non_trans_table= false;
            table && is_user_table(table) &&
              tmpkeyval(thd, table) == thd->variables.pseudo_thread_id &&
              table->s->db.length == db.length() &&
              strcmp(table->s->db.str, db.ptr()) == 0;
            table= next)
       {
-        /*
-          We are going to add ` around the table names and possible more
-          due to special characters
-        */
-        append_identifier(thd, &s_query, table->s->table_name.str,
-                          strlen(table->s->table_name.str));
-        s_query.append(',');
+        /* Separate transactional from non-transactional temp tables */
+        if (table->s->tmp_table == TRANSACTIONAL_TMP_TABLE)
+        {
+          found_trans_table= true;
+          /*
+            We are going to add ` around the table names and possible more
+            due to special characters
+          */
+          append_identifier(thd, &s_query_trans, table->s->table_name.str,
+                            strlen(table->s->table_name.str));
+          s_query_trans.append(',');
+        }
+        else if (table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)
+        {
+          found_non_trans_table= true;
+          /*
+            We are going to add ` around the table names and possible more
+            due to special characters
+          */
+          append_identifier(thd, &s_query_non_trans, table->s->table_name.str,
+                            strlen(table->s->table_name.str));
+          s_query_non_trans.append(',');
+        }
+
         next= table->next;
         close_temporary(table, 1, 1);
       }
@@ -1653,34 +1702,70 @@
       const CHARSET_INFO *cs_save= thd->variables.character_set_client;
       thd->variables.character_set_client= system_charset_info;
       thd->thread_specific_used= TRUE;
-      Query_log_event qinfo(thd, s_query.ptr(),
-                            s_query.length() - 1 /* to remove trailing ',' */,
-                            FALSE, TRUE, FALSE, 0);
-      qinfo.db= db.ptr();
-      qinfo.db_len= db.length();
-      thd->variables.character_set_client= cs_save;
-
-      thd->get_stmt_da()->set_overwrite_status(true);
-      if ((error= (mysql_bin_log.write_event(&qinfo) ||
-                   mysql_bin_log.commit(thd, true) ||
-                   error)))
+
+      if (found_trans_table)
       {
-        /*
-          If we're here following THD::cleanup, thence the connection
-          has been closed already. So lets print a message to the
-          error log instead of pushing yet another error into the
-          Diagnostics_area.
-
-          Also, we keep the error flag so that we propagate the error
-          up in the stack. This way, if we're the SQL thread we notice
-          that close_temporary_tables failed. (Actually, the SQL
-          thread only calls close_temporary_tables while applying old
-          Start_log_event_v3 events.)
-        */
-        sql_print_error("Failed to write the DROP statement for "
+        Query_log_event qinfo(thd, s_query_trans.ptr(),
+                              s_query_trans.length() - 1,
+                              FALSE, TRUE, FALSE, 0);
+        qinfo.db= db.ptr();
+        qinfo.db_len= db.length();
+        thd->variables.character_set_client= cs_save;
+
+        thd->get_stmt_da()->set_overwrite_status(true);
+        if ((error= (mysql_bin_log.write_event(&qinfo) ||
+                     mysql_bin_log.commit(thd, true) ||
+                     error)))
+        {
+          /*
+            If we're here following THD::cleanup, thence the connection
+            has been closed already. So lets print a message to the
+            error log instead of pushing yet another error into the
+            Diagnostics_area.
+
+            Also, we keep the error flag so that we propagate the error
+            up in the stack. This way, if we're the SQL thread we notice
+            that close_temporary_tables failed. (Actually, the SQL
+            thread only calls close_temporary_tables while applying old
+            Start_log_event_v3 events.)
+          */
+          sql_print_error("Failed to write the DROP statement for "
+                        "temporary tables to binary log");
+        }
+        thd->get_stmt_da()->set_overwrite_status(false);
+      }
+
+      if (found_non_trans_table)
+      {
+        Query_log_event qinfo(thd, s_query_non_trans.ptr(),
+                              s_query_non_trans.length() - 1,
+                              FALSE, TRUE, FALSE, 0);
+        qinfo.db= db.ptr();
+        qinfo.db_len= db.length();
+        thd->variables.character_set_client= cs_save;
+
+        thd->get_stmt_da()->set_overwrite_status(true);
+        if ((error= (mysql_bin_log.write_event(&qinfo) ||
+                     mysql_bin_log.commit(thd, true) ||
+                     error)))
+        {
+          /*
+            If we're here following THD::cleanup, thence the connection
+            has been closed already. So lets print a message to the
+            error log instead of pushing yet another error into the
+            Diagnostics_area.
+
+            Also, we keep the error flag so that we propagate the error
+            up in the stack. This way, if we're the SQL thread we notice
+            that close_temporary_tables failed. (Actually, the SQL
+            thread only calls close_temporary_tables while applying old
+            Start_log_event_v3 events.)
+          */
+          sql_print_error("Failed to write the DROP statement for "
                         "temporary tables to binary log");
+        }
+        thd->get_stmt_da()->set_overwrite_status(false);
       }
-      thd->get_stmt_da()->set_overwrite_status(false);
 
       thd->variables.pseudo_thread_id= save_pseudo_thread_id;
       thd->thread_specific_used= save_thread_specific_used;
@@ -1694,6 +1779,8 @@
   if (!was_quote_show)
     thd->variables.option_bits&= ~OPTION_QUOTE_SHOW_CREATE; /* restore option */
   thd->temporary_tables=0;
+  if (thd->slave_thread)
+    modify_slave_open_temp_tables(thd, -slave_open_temp_tables);
 
   DBUG_RETURN(error);
 }
@@ -4031,7 +4118,7 @@
   if (action_arg != OT_REOPEN_TABLES && m_has_locks)
   {
     my_error(ER_LOCK_DEADLOCK, MYF(0));
-    mark_transaction_to_rollback(m_thd, true);
+    m_thd->mark_transaction_to_rollback(true);
     return TRUE;
   }
   /*
@@ -4152,8 +4239,8 @@
           do not modify data but only read it, since in this case nothing is
           written to the binary log. Argument routine_modifies_data
           denotes the same. So effectively, if the statement is not a
-          update query and routine_modifies_data is false, then
-          prelocking_placeholder does not take importance.
+          LOCK TABLE, not a update query and routine_modifies_data is false
+          then prelocking_placeholder does not take importance.
 
           Furthermore, this does not apply to I_S and log tables as it's
           always unsafe to replicate such tables under statement-based
@@ -4180,17 +4267,37 @@
     at THD::variables::sql_log_bin member.
   */
   bool log_on= mysql_bin_log.is_open() && thd->variables.sql_log_bin;
-  ulong binlog_format= thd->variables.binlog_format;
-  if ((log_on == FALSE) || (binlog_format == BINLOG_FORMAT_ROW) ||
-      (table_list->table->s->table_category == TABLE_CATEGORY_LOG) ||
+
+  /*
+    When we do not write to binlog or when we use row based replication,
+    it is safe to use a weaker lock.
+  */
+  if (log_on == false ||
+      thd->variables.binlog_format == BINLOG_FORMAT_ROW)
+    return TL_READ;
+
+  if ((table_list->table->s->table_category == TABLE_CATEGORY_LOG) ||
       (table_list->table->s->table_category == TABLE_CATEGORY_RPL_INFO) ||
-      (table_list->table->s->table_category == TABLE_CATEGORY_PERFORMANCE) ||
-      !(is_update_query(prelocking_ctx->sql_command) ||
-        (routine_modifies_data && table_list->prelocking_placeholder) ||
-        (thd->locked_tables_mode > LTM_LOCK_TABLES)))
+      (table_list->table->s->table_category == TABLE_CATEGORY_PERFORMANCE))
     return TL_READ;
-  else
+
+  // SQL queries which updates data need a stronger lock.
+  if (is_update_query(prelocking_ctx->sql_command))
+    return TL_READ_NO_INSERT;
+
+  /*
+    table_list is placeholder for prelocking.
+    Ignore prelocking_placeholder status for non "LOCK TABLE" statement's
+    table_list objects when routine_modifies_data is false.
+  */
+  if (table_list->prelocking_placeholder &&
+      (routine_modifies_data || thd->in_lock_tables))
+    return TL_READ_NO_INSERT;
+
+  if (thd->locked_tables_mode > LTM_LOCK_TABLES)
     return TL_READ_NO_INSERT;
+
+  return TL_READ;
 }
 
 
@@ -4397,10 +4504,16 @@
       obtain proper metadata locks and do other necessary steps like
       stored routine processing.
     */
-    tables->db= tables->view_db.str;
-    tables->db_length= tables->view_db.length;
-    tables->table_name= tables->view_name.str;
-    tables->table_name_length= tables->view_name.length;
+    if (tables->db != tables->view_db.str)
+    {
+      tables->db= tables->view_db.str;
+      tables->db_length= tables->view_db.length;
+    }
+    if (tables->table_name != tables->view_name.str)
+    {
+      tables->table_name= tables->view_name.str;
+      tables->table_name_length= tables->view_name.length;
+    }
   }
   /*
     If this TABLE_LIST object is a placeholder for an information_schema
@@ -4881,16 +4994,9 @@
   bool error= FALSE;
   bool some_routine_modifies_data= FALSE;
   bool has_prelocking_list;
+  enum xa_states xa_state;
   DBUG_ENTER("open_tables");
 
-  /* Accessing data in XA_IDLE or XA_PREPARED is not allowed. */
-  enum xa_states xa_state= thd->transaction.xid_state.xa_state;
-  if (*start && (xa_state == XA_IDLE || xa_state == XA_PREPARED))
-  {
-    my_error(ER_XAER_RMFAIL, MYF(0), xa_state_names[xa_state]);
-    DBUG_RETURN(true);
-  }
-
   thd->current_tablenr= 0;
 restart:
   /*
@@ -5090,6 +5196,15 @@
     }
   }
 
+  /* Accessing data in XA_IDLE or XA_PREPARED is not allowed. */
+  xa_state= thd->transaction.xid_state.xa_state;
+  if (*start && (xa_state == XA_IDLE || xa_state == XA_PREPARED))
+  {
+    my_error(ER_XAER_RMFAIL, MYF(0), xa_state_names[xa_state]);
+    error= true;
+    goto err;
+  }
+
   /*
     After successful open of all tables, including MERGE parents and
     children, attach the children to their parents. At end of statement,
diff -Nru percona-xtrabackup-2.2.3/sql/sql_class.cc percona-xtrabackup-2.3.7/sql/sql_class.cc
--- percona-xtrabackup-2.2.3/sql/sql_class.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_class.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -898,13 +898,14 @@
    first_successful_insert_id_in_cur_stmt(0),
    stmt_depends_on_first_successful_insert_id_in_prev_stmt(FALSE),
    m_examined_row_count(0),
+   m_digest(NULL),
    m_statement_psi(NULL),
    m_idle_psi(NULL),
    m_server_idle(false),
    next_to_commit(NULL),
    is_fatal_error(0),
    transaction_rollback_request(0),
-   is_fatal_sub_stmt_error(0),
+   is_fatal_sub_stmt_error(false),
    rand_used(0),
    time_zone_used(0),
    in_lock_tables(0),
@@ -1044,6 +1045,13 @@
 #ifndef DBUG_OFF
   gis_debug= 0;
 #endif
+
+  m_token_array= NULL;
+  if (max_digest_length > 0)
+  {
+    m_token_array= (unsigned char*) my_malloc(max_digest_length,
+                                              MYF(MY_WME));
+  }
 }
 
 
@@ -1502,8 +1510,6 @@
 
   delete_dynamic(&user_var_events);
   my_hash_free(&user_vars);
-  if (gtid_mode > 0)
-    variables.gtid_next.set_automatic();
   close_temporary_tables(this);
   sp_cache_clear(&sp_proc_cache);
   sp_cache_clear(&sp_func_cache);
@@ -1628,6 +1634,11 @@
 #endif
 
   free_root(&main_mem_root, MYF(0));
+
+  if (m_token_array != NULL)
+  {
+    my_free(m_token_array);
+  }
   DBUG_VOID_RETURN;
 }
 
@@ -1792,6 +1803,13 @@
     */
     if (mysys_var->current_cond && mysys_var->current_mutex)
     {
+      DBUG_EXECUTE_IF("before_dump_thread_acquires_current_mutex",
+                      {
+                      const char act[]=
+                      "now signal dump_thread_signal wait_for go_dump_thread";
+                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
+                                                         STRING_WITH_LEN(act)));
+                      };);
       mysql_mutex_lock(mysys_var->current_mutex);
       mysql_cond_broadcast(mysys_var->current_cond);
       mysql_mutex_unlock(mysys_var->current_mutex);
@@ -4051,6 +4069,8 @@
 bool Error_log_throttle::log(THD *thd)
 {
   ulonglong end_utime_of_query= thd->current_utime();
+  DBUG_EXECUTE_IF("simulate_error_throttle_expiry",
+                  end_utime_of_query+=Log_throttle::LOG_THROTTLE_WINDOW_SIZE;);
 
   /*
     If the window has expired, we'll try to write a summary line.
@@ -4209,7 +4229,8 @@
 
 extern "C" void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all)
 {
-  mark_transaction_to_rollback(thd, all);
+  DBUG_ASSERT(thd);
+  thd->mark_transaction_to_rollback(all);
 }
 
 extern "C" bool thd_binlog_filter_ok(const MYSQL_THD thd)
@@ -4439,9 +4460,12 @@
     If we've left sub-statement mode, reset the fatal error flag.
     Otherwise keep the current value, to propagate it up the sub-statement
     stack.
+
+    NOTE: is_fatal_sub_stmt_error can be set only if we've been in the
+    sub-statement mode.
   */
   if (!in_sub_stmt)
-    is_fatal_sub_stmt_error= FALSE;
+    is_fatal_sub_stmt_error= false;
 
   if ((variables.option_bits & OPTION_BIN_LOG) && is_update_query(lex->sql_command) &&
        !is_current_stmt_binlog_format_row())
@@ -4694,27 +4718,29 @@
 /**
   Mark transaction to rollback and mark error as fatal to a sub-statement.
 
-  @param  thd   Thread handle
   @param  all   TRUE <=> rollback main transaction.
 */
 
-void mark_transaction_to_rollback(THD *thd, bool all)
+void THD::mark_transaction_to_rollback(bool all)
 {
-  if (thd)
-  {
-    thd->is_fatal_sub_stmt_error= TRUE;
-    thd->transaction_rollback_request= all;
-    /*
-      Aborted transactions can not be IGNOREd.
-      Switch off the IGNORE flag for the current
-      SELECT_LEX. This should allow my_error()
-      to report the error and abort the execution
-      flow, even in presence
-      of IGNORE clause.
-    */
-    if (thd->lex->current_select)
-      thd->lex->current_select->no_error= FALSE;
-  }
+  /*
+    There is no point in setting is_fatal_sub_stmt_error unless
+    we are actually in_sub_stmt.
+  */
+  if (in_sub_stmt)
+    is_fatal_sub_stmt_error= true;
+
+  transaction_rollback_request= all;
+  /*
+    Aborted transactions can not be IGNOREd.
+    Switch off the IGNORE flag for the current
+    SELECT_LEX. This should allow my_error()
+    to report the error and abort the execution
+    flow, even in presence
+    of IGNORE clause.
+  */
+  if (lex->current_select)
+    lex->current_select->no_error= false;
 }
 /***************************************************************************
   Handling of XA id cacheing
diff -Nru percona-xtrabackup-2.2.3/sql/sql_class.h percona-xtrabackup-2.3.7/sql/sql_class.h
--- percona-xtrabackup-2.2.3/sql/sql_class.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_class.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights
    reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -38,6 +38,8 @@
 #include "opt_trace_context.h"    /* Opt_trace_context */
 #include "rpl_gtid.h"
 
+#include "sql_digest_stream.h"            // sql_digest_state
+
 #include <mysql/psi/mysql_stage.h>
 #include <mysql/psi/mysql_statement.h>
 #include <mysql/psi/mysql_idle.h>
@@ -553,6 +555,12 @@
 
   Gtid_specification gtid_next;
   Gtid_set_or_null gtid_next_list;
+  /**
+    Compatibility option to mark the pre MySQL-5.6.4 temporals columns using
+    the old format using comments for SHOW CREATE TABLE and in I_S.COLUMNS
+    'COLUMN_TYPE' field.
+  */
+  my_bool show_old_temporals;
 } SV;
 
 
@@ -641,8 +649,6 @@
 
 #define last_system_status_var questions
 
-void mark_transaction_to_rollback(THD *thd, bool all);
-
 
 /**
   Get collation by name, send error to client on failure.
@@ -1261,6 +1267,10 @@
   const char *host_or_ip;
   ulong master_access;                 /* Global privileges from mysql.user */
   ulong db_access;                     /* Privileges for current db */
+  /*
+    This flag is set according to connecting user's context and not the
+    effective user.
+  */
   bool password_expired;               /* password expiration flag */
 
   void init();
@@ -2826,6 +2836,13 @@
   PROFILING  profiling;
 #endif
 
+  /** Current statement digest. */
+  sql_digest_state *m_digest;
+  /** Current statement digest token array. */
+  unsigned char *m_token_array;
+  /** Top level statement digest. */
+  sql_digest_state m_digest_state;
+
   /** Current statement instrumentation. */
   PSI_statement_locker *m_statement_psi;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
@@ -3155,9 +3172,7 @@
     so when destroying a global thread, do:
 
     thd->release_resources()
-    mysql_mutex_lock(&LOCK_thread_count);
     remove_global_thread(thd);
-    mysql_mutex_unlock(&LOCK_thread_count);
     delete thd;
    */
   ~THD();
@@ -4059,7 +4074,9 @@
   }
   LEX_STRING get_invoker_user() { return invoker_user; }
   LEX_STRING get_invoker_host() { return invoker_host; }
-  bool has_invoker() { return invoker_user.length > 0; }
+  bool has_invoker() { return invoker_user.str != NULL; }
+
+  void mark_transaction_to_rollback(bool all);
 
 #ifndef DBUG_OFF
 private:
@@ -5296,7 +5313,6 @@
 
 void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
                         STATUS_VAR *dec_var);
-void mark_transaction_to_rollback(THD *thd, bool all);
 
 /* Inline functions */
 
diff -Nru percona-xtrabackup-2.2.3/sql/sql_connect.cc percona-xtrabackup-2.3.7/sql/sql_connect.cc
--- percona-xtrabackup-2.2.3/sql/sql_connect.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_connect.cc	2017-02-27 07:47:02.000000000 +0000
@@ -40,7 +40,7 @@
 using std::min;
 using std::max;
 
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+#if defined(HAVE_OPENSSL) && (!defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP))
 /*
   Without SSL the handshake consists of one packet. This packet
   has both client capabilites and scrambled password.
@@ -56,7 +56,7 @@
 #define MIN_HANDSHAKE_SIZE      2
 #else
 #define MIN_HANDSHAKE_SIZE      6
-#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
+#endif /* HAVE_OPENSSL && (!EMBEDDED_LIBRARY || XTRABACKUP) */
 
 /*
   Get structure for logging connection data for the current user
diff -Nru percona-xtrabackup-2.2.3/sql/sql_cursor.cc percona-xtrabackup-2.3.7/sql/sql_cursor.cc
--- percona-xtrabackup-2.2.3/sql/sql_cursor.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_cursor.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2015, 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
@@ -19,6 +19,7 @@
 #include "probes_mysql.h"
 #include "sql_parse.h"                        // mysql_execute_command
 #include "sql_tmp_table.h"                   // tmp tables
+#include "debug_sync.h"
 
 /****************************************************************************
   Declarations.
@@ -94,6 +95,7 @@
 bool mysql_open_cursor(THD *thd, select_result *result,
                        Server_side_cursor **pcursor)
 {
+  sql_digest_state *parent_digest;
   PSI_statement_locker *parent_locker;
   select_result *save_result;
   Select_materialize *result_materialize;
@@ -112,9 +114,13 @@
                          &thd->security_ctx->priv_user[0],
                          (char *) thd->security_ctx->host_or_ip,
                          2);
+  parent_digest= thd->m_digest;
   parent_locker= thd->m_statement_psi;
+  thd->m_digest= NULL;
   thd->m_statement_psi= NULL;
   bool rc= mysql_execute_command(thd);
+  thd->m_digest= parent_digest;
+  DEBUG_SYNC(thd, "after_table_close");
   thd->m_statement_psi= parent_locker;
   MYSQL_QUERY_EXEC_DONE(rc);
 
@@ -414,6 +420,14 @@
     return TRUE;
   }
 
+  /*
+    close_thread_tables() will be called in mysql_execute_command() which
+    will close all tables except the cursor temporary table. Hence set the
+    orig_table in the field definition to NULL.
+  */
+  for (Field **fld= this->table->field; *fld; fld++)
+     (*fld)->orig_table= NULL;
+
   return FALSE;
 }
 
diff -Nru percona-xtrabackup-2.2.3/sql/sql_db.cc percona-xtrabackup-2.3.7/sql/sql_db.cc
--- percona-xtrabackup-2.2.3/sql/sql_db.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_db.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/sql/sql_delete.cc percona-xtrabackup-2.3.7/sql/sql_delete.cc
--- percona-xtrabackup-2.2.3/sql/sql_delete.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_delete.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -351,6 +351,7 @@
 
   if ((table->file->ha_table_flags() & HA_READ_BEFORE_WRITE_REMOVAL) &&
       !using_limit &&
+      !(table->triggers && table->triggers->has_delete_triggers()) &&
       select && select->quick && select->quick->index != MAX_KEY)
     read_removal= table->check_read_removal(select->quick->index);
 
diff -Nru percona-xtrabackup-2.2.3/sql/sql_digest.cc percona-xtrabackup-2.3.7/sql/sql_digest.cc
--- percona-xtrabackup-2.2.3/sql/sql_digest.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_digest.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,684 @@
+/* Copyright (c) 2008, 2015, 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,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+/*
+  This code needs extra visibility in the lexer structures
+*/
+
+#include "my_global.h"
+#include "my_md5.h"
+#include "mysqld_error.h"
+#include "sql_data_change.h"
+
+#include "sql_string.h"
+#include "sql_class.h"
+#include "sql_lex.h"
+#include "sql_digest.h"
+#include "sql_digest_stream.h"
+
+#include "sql_get_diagnostics.h"
+
+#ifdef NEVER
+#include "my_sys.h"
+#include "sql_signal.h"
+#endif
+
+/* Generated code */
+#include "sql_yacc.h"
+#define LEX_TOKEN_WITH_DEFINITION
+#include "lex_token.h"
+
+/* Name pollution from sql/sql_lex.h */
+#ifdef LEX_YYSTYPE
+#undef LEX_YYSTYPE
+#endif
+
+#define LEX_YYSTYPE YYSTYPE*
+
+#define SIZE_OF_A_TOKEN 2
+
+/**
+  Read a single token from token array.
+*/
+inline uint read_token(const sql_digest_storage *digest_storage,
+                       uint index, uint *tok)
+{
+  uint safe_byte_count= digest_storage->m_byte_count;
+
+  if (index + SIZE_OF_A_TOKEN <= safe_byte_count &&
+      safe_byte_count <= digest_storage->m_token_array_length)
+  {
+    const unsigned char *src= & digest_storage->m_token_array[index];
+    *tok= src[0] | (src[1] << 8);
+    return index + SIZE_OF_A_TOKEN;
+  }
+
+  /* The input byte stream is exhausted. */
+  *tok= 0;
+  return MAX_DIGEST_STORAGE_SIZE + 1;
+}
+
+/**
+  Store a single token in token array.
+*/
+inline void store_token(sql_digest_storage* digest_storage, uint token)
+{
+  DBUG_ASSERT(digest_storage->m_byte_count <= digest_storage->m_token_array_length);
+
+  if (digest_storage->m_byte_count + SIZE_OF_A_TOKEN <= digest_storage->m_token_array_length)
+  {
+    unsigned char* dest= & digest_storage->m_token_array[digest_storage->m_byte_count];
+    dest[0]= token & 0xff;
+    dest[1]= (token >> 8) & 0xff;
+    digest_storage->m_byte_count+= SIZE_OF_A_TOKEN;
+  }
+  else
+  {
+    digest_storage->m_full= true;
+  }
+}
+
+/**
+  Read an identifier from token array.
+*/
+inline uint read_identifier(const sql_digest_storage* digest_storage,
+                            uint index, char ** id_string, int *id_length)
+{
+  uint new_index;
+  uint safe_byte_count= digest_storage->m_byte_count;
+
+  DBUG_ASSERT(index <= safe_byte_count);
+  DBUG_ASSERT(safe_byte_count <= digest_storage->m_token_array_length);
+
+  /*
+    token + length + string are written in an atomic way,
+    so we do always expect a length + string here
+  */
+
+  uint bytes_needed= SIZE_OF_A_TOKEN;
+  /* If we can read token and identifier length */
+  if ((index + bytes_needed) <= safe_byte_count)
+  {
+    const unsigned char *src= & digest_storage->m_token_array[index];
+    /* Read the length of identifier */
+    uint length= src[0] | (src[1] << 8);
+    bytes_needed+= length;
+    /* If we can read entire identifier from token array */
+    if ((index + bytes_needed) <= safe_byte_count)
+    {
+      *id_string= (char *) (src + 2);
+      *id_length= length;
+
+      new_index= index + bytes_needed;
+      DBUG_ASSERT(new_index <= safe_byte_count);
+      return new_index;
+    }
+  }
+
+  /* The input byte stream is exhausted. */
+  return MAX_DIGEST_STORAGE_SIZE + 1;
+}
+
+/**
+  Store an identifier in token array.
+*/
+inline void store_token_identifier(sql_digest_storage* digest_storage,
+                                   uint token,
+                                   size_t id_length, const char *id_name)
+{
+  DBUG_ASSERT(digest_storage->m_byte_count <= digest_storage->m_token_array_length);
+
+  size_t bytes_needed= 2 * SIZE_OF_A_TOKEN + id_length;
+  if (digest_storage->m_byte_count + bytes_needed <= (unsigned int)digest_storage->m_token_array_length)
+  {
+    unsigned char* dest= & digest_storage->m_token_array[digest_storage->m_byte_count];
+    /* Write the token */
+    dest[0]= token & 0xff;
+    dest[1]= (token >> 8) & 0xff;
+    /* Write the string length */
+    dest[2]= id_length & 0xff;
+    dest[3]= (id_length >> 8) & 0xff;
+    /* Write the string data */
+    if (id_length > 0)
+      memcpy((char *)(dest + 4), id_name, id_length);
+    digest_storage->m_byte_count+= bytes_needed;
+  }
+  else
+  {
+    digest_storage->m_full= true;
+  }
+}
+
+void compute_digest_md5(const sql_digest_storage *digest_storage, unsigned char *md5)
+{
+  compute_md5_hash((char *) md5,
+                   (const char *) digest_storage->m_token_array,
+                   digest_storage->m_byte_count);
+}
+
+/*
+  Iterate token array and updates digest_text.
+*/
+void compute_digest_text(const sql_digest_storage* digest_storage,
+                         String *digest_text)
+{
+  DBUG_ASSERT(digest_storage != NULL);
+  uint byte_count= digest_storage->m_byte_count;
+  String *digest_output= digest_text;
+  uint tok= 0;
+  uint current_byte= 0;
+  lex_token_string *tok_data;
+
+  /* Reset existing data */
+  digest_output->length(0);
+
+  if (byte_count > digest_storage->m_token_array_length)
+  {
+    digest_output->append("\0", 1);
+    return;
+  }
+
+  /* Convert text to utf8 */
+  const CHARSET_INFO *from_cs= get_charset(digest_storage->m_charset_number, MYF(0));
+  const CHARSET_INFO *to_cs= &my_charset_utf8_bin;
+
+  if (from_cs == NULL)
+  {
+    /*
+      Can happen, as we do dirty reads on digest_storage,
+      which can be written to in another thread.
+    */
+    digest_output->append("\0", 1);
+    return;
+  }
+
+  char id_buffer[NAME_LEN + 1]= {'\0'};
+  char *id_string;
+  size_t id_length;
+  bool convert_text= !my_charset_same(from_cs, to_cs);
+
+  while (current_byte < byte_count)
+  {
+    current_byte= read_token(digest_storage, current_byte, &tok);
+
+    if (tok <= 0 || tok >= array_elements(lex_token_array)
+        || current_byte > max_digest_length)
+      return;
+
+    tok_data= &lex_token_array[tok];
+
+    switch (tok)
+    {
+    /* All identifiers are printed with their name. */
+    case IDENT:
+    case IDENT_QUOTED:
+      {
+        char *id_ptr= NULL;
+        int id_len= 0;
+        uint err_cs= 0;
+
+        /* Get the next identifier from the storage buffer. */
+        current_byte= read_identifier(digest_storage, current_byte,
+                                      &id_ptr, &id_len);
+        if (current_byte > max_digest_length)
+          return;
+
+        if (convert_text)
+        {
+          /* Verify that the converted text will fit. */
+          if (to_cs->mbmaxlen*id_len > NAME_LEN)
+          {
+            digest_output->append("...", 3);
+            break;
+          }
+          /* Convert identifier string into the storage character set. */
+          id_length= my_convert(id_buffer, NAME_LEN, to_cs,
+                                id_ptr, id_len, from_cs, &err_cs);
+          id_string= id_buffer;
+        }
+        else
+        {
+          id_string= id_ptr;
+          id_length= id_len;
+        }
+
+        if (id_length == 0 || err_cs != 0)
+        {
+          break;
+        }
+        /* Copy the converted identifier into the digest string. */
+        if (tok == IDENT_QUOTED)
+          digest_output->append("`", 1);
+        if (id_length > 0)
+          digest_output->append(id_string, id_length);
+        if (tok == IDENT_QUOTED)
+          digest_output->append("`", 1);
+        digest_output->append(" ", 1);
+      }
+      break;
+
+    /* Everything else is printed as is. */
+    default:
+      /*
+        Make sure not to overflow digest_text buffer.
+        +1 is to make sure extra space for ' '.
+      */
+      int tok_length= tok_data->m_token_length;
+
+      digest_output->append(tok_data->m_token_string, tok_length);
+      if (tok_data->m_append_space)
+        digest_output->append(" ", 1);
+      break;
+    }
+  }
+}
+
+static inline uint peek_token(const sql_digest_storage *digest, uint index)
+{
+  uint token;
+  DBUG_ASSERT(index + SIZE_OF_A_TOKEN <= digest->m_byte_count);
+  DBUG_ASSERT(digest->m_byte_count <=  digest->m_token_array_length);
+
+  token= ((digest->m_token_array[index + 1])<<8) | digest->m_token_array[index];
+  return token;
+}
+
+/**
+  Function to read last two tokens from token array. If an identifier
+  is found, do not look for token before that.
+*/
+static inline void peek_last_two_tokens(const sql_digest_storage* digest_storage,
+                                        uint last_id_index, uint *t1, uint *t2)
+{
+  uint byte_count= digest_storage->m_byte_count;
+  uint peek_index= byte_count;
+
+  if (last_id_index + SIZE_OF_A_TOKEN <= peek_index)
+  {
+    /* Take last token. */
+    peek_index-= SIZE_OF_A_TOKEN;
+    *t1= peek_token(digest_storage, peek_index);
+
+    if (last_id_index + SIZE_OF_A_TOKEN <= peek_index)
+    {
+      /* Take 2nd token from last. */
+      peek_index-= SIZE_OF_A_TOKEN;
+      *t2= peek_token(digest_storage, peek_index);
+    }
+    else
+    {
+      *t2= TOK_UNUSED;
+    }
+  }
+  else
+  {
+    *t1= TOK_UNUSED;
+    *t2= TOK_UNUSED;
+  }
+}
+
+/**
+  Function to read last three tokens from token array. If an identifier
+  is found, do not look for token before that.
+*/
+static inline void peek_last_three_tokens(const sql_digest_storage* digest_storage,
+                                          uint last_id_index, uint *t1, uint *t2, uint *t3)
+{
+  uint byte_count= digest_storage->m_byte_count;
+  uint peek_index= byte_count;
+
+  if (last_id_index + SIZE_OF_A_TOKEN <= peek_index)
+  {
+    /* Take last token. */
+    peek_index-= SIZE_OF_A_TOKEN;
+    *t1= peek_token(digest_storage, peek_index);
+
+    if (last_id_index + SIZE_OF_A_TOKEN <= peek_index)
+    {
+      /* Take 2nd token from last. */
+      peek_index-= SIZE_OF_A_TOKEN;
+      *t2= peek_token(digest_storage, peek_index);
+
+      if (last_id_index + SIZE_OF_A_TOKEN <= peek_index)
+      {
+        /* Take 3rd token from last. */
+        peek_index-= SIZE_OF_A_TOKEN;
+        *t3= peek_token(digest_storage, peek_index);
+      }
+      else
+      {
+        *t3= TOK_UNUSED;
+      }
+    }
+    else
+    {
+      *t2= TOK_UNUSED;
+      *t3= TOK_UNUSED;
+    }
+  }
+  else
+  {
+    *t1= TOK_UNUSED;
+    *t2= TOK_UNUSED;
+    *t3= TOK_UNUSED;
+  }
+}
+
+sql_digest_state* digest_add_token(sql_digest_state *state,
+                                   uint token,
+                                   LEX_YYSTYPE yylval)
+{
+  sql_digest_storage *digest_storage= NULL;
+
+  digest_storage= &state->m_digest_storage;
+
+  /*
+    Stop collecting further tokens if digest storage is full or
+    if END token is received.
+  */
+  if (digest_storage->m_full || token == END_OF_INPUT)
+    return NULL;
+
+  /*
+    Take last_token 2 tokens collected till now. These tokens will be used
+    in reduce for normalisation. Make sure not to consider ID tokens in reduce.
+  */
+  uint last_token;
+  uint last_token2;
+
+  switch (token)
+  {
+    case NUM:
+    case LONG_NUM:
+    case ULONGLONG_NUM:
+    case DECIMAL_NUM:
+    case FLOAT_NUM:
+    case BIN_NUM:
+    case HEX_NUM:
+    {
+      bool found_unary;
+      do
+      {
+        found_unary= false;
+        peek_last_two_tokens(digest_storage, state->m_last_id_index,
+                             &last_token, &last_token2);
+
+        if ((last_token == '-') || (last_token == '+'))
+        {
+          /*
+            We need to differentiate:
+            - a <unary minus> operator
+            - a <unary plus> operator
+            from
+            - a <binary minus> operator
+            - a <binary plus> operator
+            to only reduce "a = -1" to "a = ?", and not change "b - 1" to "b ?"
+
+            Binary operators are found inside an expression,
+            while unary operators are found at the beginning of an expression, or after operators.
+
+            To achieve this, every token that is followed by an <expr> expression
+            in the SQL grammar is flagged.
+            See sql/sql_yacc.yy
+            See sql/gen_lex_token.cc
+
+            For example,
+            "(-1)" is parsed as "(", "-", NUM, ")", and lex_token_array["("].m_start_expr is true,
+            so reduction of the "-" NUM is done, the result is "(?)".
+            "(a-1)" is parsed as "(", ID, "-", NUM, ")", and lex_token_array[ID].m_start_expr is false,
+            so the operator is binary, no reduction is done, and the result is "(a-?)".
+          */
+          if (lex_token_array[last_token2].m_start_expr)
+          {
+            /*
+              REDUCE:
+              TOK_GENERIC_VALUE := (UNARY_PLUS | UNARY_MINUS) (NUM | LOG_NUM | ... | FLOAT_NUM)
+
+              REDUCE:
+              TOK_GENERIC_VALUE := (UNARY_PLUS | UNARY_MINUS) TOK_GENERIC_VALUE
+            */
+            token= TOK_GENERIC_VALUE;
+            digest_storage->m_byte_count-= SIZE_OF_A_TOKEN;
+            found_unary= true;
+          }
+        }
+      } while (found_unary);
+    }
+    /* fall through, for case NULL_SYM below */
+    case LEX_HOSTNAME:
+    case TEXT_STRING:
+    case NCHAR_STRING:
+    case PARAM_MARKER:
+    {
+      /*
+        REDUCE:
+        TOK_GENERIC_VALUE := BIN_NUM | DECIMAL_NUM | ... | ULONGLONG_NUM
+      */
+      token= TOK_GENERIC_VALUE;
+
+      peek_last_two_tokens(digest_storage, state->m_last_id_index,
+                           &last_token, &last_token2);
+
+      if ((last_token2 == TOK_GENERIC_VALUE ||
+           last_token2 == TOK_GENERIC_VALUE_LIST) &&
+          (last_token == ','))
+      {
+        /*
+          REDUCE:
+          TOK_GENERIC_VALUE_LIST :=
+            TOK_GENERIC_VALUE ',' TOK_GENERIC_VALUE
+
+          REDUCE:
+          TOK_GENERIC_VALUE_LIST :=
+            TOK_GENERIC_VALUE_LIST ',' TOK_GENERIC_VALUE
+        */
+        digest_storage->m_byte_count-= 2*SIZE_OF_A_TOKEN;
+        token= TOK_GENERIC_VALUE_LIST;
+      }
+      /*
+        Add this token or the resulting reduce to digest storage.
+      */
+      store_token(digest_storage, token);
+      break;
+    }
+    case ')':
+    {
+      peek_last_two_tokens(digest_storage, state->m_last_id_index,
+                           &last_token, &last_token2);
+
+      if (last_token == TOK_GENERIC_VALUE &&
+          last_token2 == '(')
+      {
+        /*
+          REDUCE:
+          TOK_ROW_SINGLE_VALUE :=
+            '(' TOK_GENERIC_VALUE ')'
+        */
+        digest_storage->m_byte_count-= 2*SIZE_OF_A_TOKEN;
+        token= TOK_ROW_SINGLE_VALUE;
+
+        /* Read last two tokens again */
+        peek_last_two_tokens(digest_storage, state->m_last_id_index,
+                             &last_token, &last_token2);
+
+        if ((last_token2 == TOK_ROW_SINGLE_VALUE ||
+             last_token2 == TOK_ROW_SINGLE_VALUE_LIST) &&
+            (last_token == ','))
+        {
+          /*
+            REDUCE:
+            TOK_ROW_SINGLE_VALUE_LIST :=
+              TOK_ROW_SINGLE_VALUE ',' TOK_ROW_SINGLE_VALUE
+
+            REDUCE:
+            TOK_ROW_SINGLE_VALUE_LIST :=
+              TOK_ROW_SINGLE_VALUE_LIST ',' TOK_ROW_SINGLE_VALUE
+          */
+          digest_storage->m_byte_count-= 2*SIZE_OF_A_TOKEN;
+          token= TOK_ROW_SINGLE_VALUE_LIST;
+        }
+      }
+      else if (last_token == TOK_GENERIC_VALUE_LIST &&
+               last_token2 == '(')
+      {
+        /*
+          REDUCE:
+          TOK_ROW_MULTIPLE_VALUE :=
+            '(' TOK_GENERIC_VALUE_LIST ')'
+        */
+        digest_storage->m_byte_count-= 2*SIZE_OF_A_TOKEN;
+        token= TOK_ROW_MULTIPLE_VALUE;
+
+        /* Read last two tokens again */
+        peek_last_two_tokens(digest_storage, state->m_last_id_index,
+                             &last_token, &last_token2);
+
+        if ((last_token2 == TOK_ROW_MULTIPLE_VALUE ||
+             last_token2 == TOK_ROW_MULTIPLE_VALUE_LIST) &&
+            (last_token == ','))
+        {
+          /*
+            REDUCE:
+            TOK_ROW_MULTIPLE_VALUE_LIST :=
+              TOK_ROW_MULTIPLE_VALUE ',' TOK_ROW_MULTIPLE_VALUE
+
+            REDUCE:
+            TOK_ROW_MULTIPLE_VALUE_LIST :=
+              TOK_ROW_MULTIPLE_VALUE_LIST ',' TOK_ROW_MULTIPLE_VALUE
+          */
+          digest_storage->m_byte_count-= 2*SIZE_OF_A_TOKEN;
+          token= TOK_ROW_MULTIPLE_VALUE_LIST;
+        }
+      }
+      /*
+        Add this token or the resulting reduce to digest storage.
+      */
+      store_token(digest_storage, token);
+      break;
+    }
+    case IDENT:
+    case IDENT_QUOTED:
+    {
+      YYSTYPE *lex_token= yylval;
+      char *yytext= lex_token->lex_str.str;
+      size_t yylen= lex_token->lex_str.length;
+
+      /* Add this token and identifier string to digest storage. */
+      store_token_identifier(digest_storage, token, yylen, yytext);
+
+      /* Update the index of last identifier found. */
+      state->m_last_id_index= digest_storage->m_byte_count;
+      break;
+    }
+    default:
+    {
+      /* Add this token to digest storage. */
+      store_token(digest_storage, token);
+      break;
+    }
+  }
+
+  return state;
+}
+
+sql_digest_state* digest_reduce_token(sql_digest_state *state,
+                                      uint token_left, uint token_right)
+{
+  sql_digest_storage *digest_storage= NULL;
+
+  digest_storage= &state->m_digest_storage;
+
+  /*
+    Stop collecting further tokens if digest storage is full.
+  */
+  if (digest_storage->m_full)
+    return NULL;
+
+  uint last_token;
+  uint last_token2;
+  uint last_token3;
+  uint token_to_push= TOK_UNUSED;
+
+  peek_last_two_tokens(digest_storage, state->m_last_id_index,
+                       &last_token, &last_token2);
+
+  /*
+    There is only one caller of digest_reduce_token(),
+    see sql/sql_yacc.yy, rule literal := NULL_SYM.
+    REDUCE:
+      token_left := token_right
+    Used for:
+      TOK_GENERIC_VALUE := NULL_SYM
+  */
+
+  if (last_token == token_right)
+  {
+    /*
+      Current stream is like:
+        TOKEN_X TOKEN_RIGHT .
+      REDUCE to
+        TOKEN_X TOKEN_LEFT .
+    */
+    digest_storage->m_byte_count-= SIZE_OF_A_TOKEN;
+    store_token(digest_storage, token_left);
+  }
+  else
+  {
+    /*
+      Current stream is like:
+        TOKEN_X TOKEN_RIGHT TOKEN_Y .
+      Pop TOKEN_Y
+        TOKEN_X TOKEN_RIGHT . TOKEN_Y
+      REDUCE to
+        TOKEN_X TOKEN_LEFT . TOKEN_Y
+    */
+    DBUG_ASSERT(last_token2 == token_right);
+    digest_storage->m_byte_count-= 2 * SIZE_OF_A_TOKEN;
+    store_token(digest_storage, token_left);
+    token_to_push= last_token;
+  }
+
+  peek_last_three_tokens(digest_storage, state->m_last_id_index,
+                         &last_token, &last_token2, &last_token3);
+
+  if ((last_token3 == TOK_GENERIC_VALUE ||
+       last_token3 == TOK_GENERIC_VALUE_LIST) &&
+      (last_token2 == ',') &&
+      (last_token == TOK_GENERIC_VALUE))
+  {
+    /*
+      REDUCE:
+      TOK_GENERIC_VALUE_LIST :=
+        TOK_GENERIC_VALUE ',' TOK_GENERIC_VALUE
+
+      REDUCE:
+      TOK_GENERIC_VALUE_LIST :=
+        TOK_GENERIC_VALUE_LIST ',' TOK_GENERIC_VALUE
+    */
+    digest_storage->m_byte_count-= 3*SIZE_OF_A_TOKEN;
+    store_token(digest_storage, TOK_GENERIC_VALUE_LIST);
+  }
+
+  if (token_to_push != TOK_UNUSED)
+  {
+    /*
+      Push TOKEN_Y
+    */
+    store_token(digest_storage, token_to_push);
+  }
+
+  return state;
+}
+
diff -Nru percona-xtrabackup-2.2.3/sql/sql_digest.h percona-xtrabackup-2.3.7/sql/sql_digest.h
--- percona-xtrabackup-2.2.3/sql/sql_digest.h	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_digest.h	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,130 @@
+/* Copyright (c) 2008, 2015, 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,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#ifndef SQL_DIGEST_H
+#define SQL_DIGEST_H
+
+#include <string.h>
+class String;
+#include "my_md5.h"
+
+#define MAX_DIGEST_STORAGE_SIZE (1024*1024)
+
+/**
+  Structure to store token count/array for a statement
+  on which digest is to be calculated.
+*/
+struct sql_digest_storage
+{
+  bool m_full;
+  uint m_byte_count;
+  unsigned char m_md5[MD5_HASH_SIZE];
+  /** Character set number. */
+  uint m_charset_number;
+  /**
+    Token array.
+    Token array is an array of bytes to store tokens received during parsing.
+    Following is the way token array is formed.
+    ... &lt;non-id-token&gt; &lt;non-id-token&gt; &lt;id-token&gt; &lt;id_len&gt; &lt;id_text&gt; ...
+    For Example:
+    SELECT * FROM T1;
+    &lt;SELECT_TOKEN&gt; &lt;*&gt; &lt;FROM_TOKEN&gt; &lt;ID_TOKEN&gt; &lt;2&gt; &lt;T1&gt;
+  */
+  unsigned char *m_token_array;
+  /* Length of the token array to be considered for DIGEST_TEXT calculation. */
+  uint m_token_array_length;
+
+  sql_digest_storage()
+  {
+    reset(NULL, 0);
+  }
+
+  inline void reset(unsigned char *token_array, uint length)
+  {
+    m_token_array= token_array;
+    m_token_array_length= length;
+    reset();
+  }
+
+  inline void reset()
+  {
+    m_full= false;
+    m_byte_count= 0;
+    m_charset_number= 0;
+    if (m_token_array_length > 0)
+    {
+      memset(m_token_array, 0, m_token_array_length);
+    }
+    memset(m_md5, 0, MD5_HASH_SIZE);
+  }
+
+  inline bool is_empty()
+  {
+    return (m_byte_count == 0);
+  }
+
+  inline void copy(const sql_digest_storage *from)
+  {
+    /*
+      Keep in mind this is a dirty copy of something that may change,
+      as the thread producing the digest is executing concurrently,
+      without any lock enforced.
+    */
+    uint byte_count_copy= m_token_array_length < from->m_byte_count ?
+                          m_token_array_length : from->m_byte_count;
+
+    if (byte_count_copy > 0)
+    {
+      m_full= from->m_full;
+      m_byte_count= byte_count_copy;
+      m_charset_number= from->m_charset_number;
+      memcpy(m_token_array, from->m_token_array, m_byte_count);
+      memcpy(m_md5, from->m_md5, MD5_HASH_SIZE);
+    }
+    else
+    {
+      m_full= false;
+      m_byte_count= 0;
+      m_charset_number= 0;
+    }
+  }
+};
+typedef struct sql_digest_storage sql_digest_storage;
+
+/**
+  Compute a digest hash.
+  @param digest_storage The digest
+  @param [out] md5 The computed digest hash. This parameter is a buffer of size @c MD5_HASH_SIZE.
+*/
+void compute_digest_md5(const sql_digest_storage *digest_storage, unsigned char *md5);
+
+/**
+  Compute a digest text.
+  A 'digest text' is a textual representation of a query,
+  where:
+  - comments are removed,
+  - non significant spaces are removed,
+  - literal values are replaced with a special '?' marker,
+  - lists of values are collapsed using a shorter notation
+  @param digest_storage The digest
+  @param [out] digest_text
+  @param digest_text_length Size of @c digest_text.
+  @param [out] truncated true if the text representation was truncated
+*/
+void compute_digest_text(const sql_digest_storage *digest_storage,
+                         String *digest_text);
+
+#endif
+
diff -Nru percona-xtrabackup-2.2.3/sql/sql_digest_stream.h percona-xtrabackup-2.3.7/sql/sql_digest_stream.h
--- percona-xtrabackup-2.2.3/sql/sql_digest_stream.h	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_digest_stream.h	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,51 @@
+/* Copyright (c) 2008, 2015, 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,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#ifndef SQL_DIGEST_STREAM_H
+#define SQL_DIGEST_STREAM_H
+
+#include "sql_digest.h"
+
+/**
+  State data storage for @c digest_start, @c digest_add_token.
+  This structure extends the @c sql_digest_storage structure
+  with temporary state used only during parsing.
+*/
+struct sql_digest_state
+{
+  /**
+    Index, in the digest token array, of the last identifier seen.
+    Reduce rules used in the digest computation can not
+    apply to tokens seen before an identifier.
+    @sa digest_add_token
+  */
+  int m_last_id_index;
+  sql_digest_storage m_digest_storage;
+
+  inline void reset(unsigned char *token_array, uint length)
+  {
+    m_last_id_index= 0;
+    m_digest_storage.reset(token_array, length);
+  }
+
+  inline bool is_empty()
+  {
+    return m_digest_storage.is_empty();
+  }
+};
+typedef struct sql_digest_state sql_digest_state;
+
+#endif
+
diff -Nru percona-xtrabackup-2.2.3/sql/sql_executor.cc percona-xtrabackup-2.3.7/sql/sql_executor.cc
--- percona-xtrabackup-2.2.3/sql/sql_executor.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_executor.cc	2017-02-27 07:47:02.000000000 +0000
@@ -3395,6 +3395,8 @@
 {
   bool error;
   ulong reclength,offset;
+  uint field_count;
+  List<Item> *field_list= (this-1)->fields;
   DBUG_ENTER("remove_duplicates");
 
   DBUG_ASSERT(join->tmp_tables > 0 && table->s->tmp_table != NO_TMP_TABLE);
@@ -3402,7 +3404,15 @@
 
   table->reginfo.lock_type=TL_WRITE;
 
-  uint field_count= (this-1)->fields->elements;
+  /* Calculate how many saved fields there is in list */
+  field_count=0;
+  List_iterator<Item> it(*field_list);
+  Item *item;
+  while ((item=it++))
+  {
+    if (item->get_tmp_table_field() && ! item->const_item())
+      field_count++;
+  }
 
   if (!field_count && !(join->select_options & OPTION_FOUND_ROWS) && !having) 
   {                    // only const items with no OPTION_FOUND_ROWS
@@ -4284,8 +4294,11 @@
 QEP_tmp_table::put_record(bool end_of_records)
 {
   // Lasy tmp table creation/initialization
-  if (!join_tab->table->file->inited)
-    prepare_tmp_table();
+  if (!join_tab->table->file->inited )
+  {
+    if (prepare_tmp_table())
+      return NESTED_LOOP_ERROR;
+  }
   enum_nested_loop_state rc= (*write_func)(join_tab->join, join_tab,
                                            end_of_records);
   return rc;
diff -Nru percona-xtrabackup-2.2.3/sql/sql_executor.h percona-xtrabackup-2.3.7/sql/sql_executor.h
--- percona-xtrabackup-2.2.3/sql/sql_executor.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_executor.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,8 @@
 #ifndef SQL_EXECUTOR_INCLUDED
 #define SQL_EXECUTOR_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -257,6 +258,7 @@
   /** Write function that would be used for saving records in tmp table. */
   Next_select_func write_func;
   enum_nested_loop_state put_record(bool end_of_records);
+  __attribute__((warn_unused_result))
   bool prepare_tmp_table();
 };
 
diff -Nru percona-xtrabackup-2.2.3/sql/sql_insert.cc percona-xtrabackup-2.3.7/sql/sql_insert.cc
--- percona-xtrabackup-2.2.3/sql/sql_insert.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_insert.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -2242,14 +2242,14 @@
       thd.mdl_context.release_transactional_locks();
     }
     thd.release_resources();
-    mysql_mutex_lock(&LOCK_thread_count);
+    remove_global_thread(&thd);
     mysql_mutex_destroy(&mutex);
     mysql_cond_destroy(&cond);
     mysql_cond_destroy(&cond_client);
-    remove_global_thread(&thd);         // Must be removed under lock
     my_free(table_list.table_name);
     thd.security_ctx->set_host("");
     thd.security_ctx->user= 0;
+    mysql_mutex_lock(&LOCK_thread_count);
     delayed_insert_threads--;
     mysql_mutex_unlock(&LOCK_thread_count);
   }
diff -Nru percona-xtrabackup-2.2.3/sql/sql_lex.cc percona-xtrabackup-2.3.7/sql/sql_lex.cc
--- percona-xtrabackup-2.2.3/sql/sql_lex.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_lex.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -34,7 +34,7 @@
 #include "sql_optimizer.h"             // JOIN
 #include <mysql/psi/mysql_statement.h>
 
-static int lex_one_token(void *arg, void *yythd);
+static int lex_one_token(YYSTYPE *yylval, THD *thd);
 
 /*
   We are using pointer to this variable for distinguishing between assignment
@@ -384,6 +384,21 @@
   m_cpp_utf8_processed_ptr= end_ptr;
 }
 
+void Lex_input_stream::add_digest_token(uint token, LEX_YYSTYPE yylval)
+{
+  if (m_digest != NULL)
+  {
+    m_digest= digest_add_token(m_digest, token, yylval);
+  }
+}
+
+void Lex_input_stream::reduce_digest_token(uint token_left, uint token_right)
+{
+  if (m_digest != NULL)
+  {
+    m_digest= digest_reduce_token(m_digest, token_left, token_right);
+  }
+}
 
 /*
   This is called before every query that is to be parsed.
@@ -901,16 +916,17 @@
 /*
   MYSQLlex remember the following states from the following MYSQLlex()
 
+  @param yylval         [out]  semantic value of the token being parsed (yylval)
+  @param thd            THD
+
   - MY_LEX_EOQ			Found end of query
   - MY_LEX_OPERATOR_OR_IDENT	Last state was an ident, text or number
 				(which can't be followed by a signed number)
 */
 
-int MYSQLlex(void *arg, void *yythd)
+int MYSQLlex(YYSTYPE *yylval, THD *thd)
 {
-  THD *thd= (THD *)yythd;
   Lex_input_stream *lip= & thd->m_parser_state->m_lip;
-  YYSTYPE *yylval=(YYSTYPE*) arg;
   int token;
 
   if (lip->lookahead_token >= 0)
@@ -923,11 +939,11 @@
     lip->lookahead_token= -1;
     *yylval= *(lip->lookahead_yylval);
     lip->lookahead_yylval= NULL;
-    lip->m_digest_psi= MYSQL_ADD_TOKEN(lip->m_digest_psi, token, yylval);
+    lip->add_digest_token(token, yylval);
     return token;
   }
 
-  token= lex_one_token(arg, yythd);
+  token= lex_one_token(yylval, thd);
 
   switch(token) {
   case WITH:
@@ -938,15 +954,13 @@
       to transform the grammar into a LALR(1) grammar,
       which sql_yacc.yy can process.
     */
-    token= lex_one_token(arg, yythd);
+    token= lex_one_token(yylval, thd);
     switch(token) {
     case CUBE_SYM:
-      lip->m_digest_psi= MYSQL_ADD_TOKEN(lip->m_digest_psi, WITH_CUBE_SYM,
-                                         yylval);
+      lip->add_digest_token(WITH_CUBE_SYM, yylval);
       return WITH_CUBE_SYM;
     case ROLLUP_SYM:
-      lip->m_digest_psi= MYSQL_ADD_TOKEN(lip->m_digest_psi, WITH_ROLLUP_SYM,
-                                         yylval);
+      lip->add_digest_token(WITH_ROLLUP_SYM, yylval);
       return WITH_ROLLUP_SYM;
     default:
       /*
@@ -955,7 +969,7 @@
       lip->lookahead_yylval= lip->yylval;
       lip->yylval= NULL;
       lip->lookahead_token= token;
-      lip->m_digest_psi= MYSQL_ADD_TOKEN(lip->m_digest_psi, WITH, yylval);
+      lip->add_digest_token(WITH, yylval);
       return WITH;
     }
     break;
@@ -963,21 +977,19 @@
     break;
   }
 
-  lip->m_digest_psi= MYSQL_ADD_TOKEN(lip->m_digest_psi, token, yylval);
+  lip->add_digest_token(token, yylval);
   return token;
 }
 
-int lex_one_token(void *arg, void *yythd)
+static int lex_one_token(YYSTYPE *yylval, THD *thd)
 {
   reg1	uchar c= 0;
   bool comment_closed;
   int	tokval, result_state;
   uint length;
   enum my_lex_states state;
-  THD *thd= (THD *)yythd;
   Lex_input_stream *lip= & thd->m_parser_state->m_lip;
   LEX *lex= thd->lex;
-  YYSTYPE *yylval=(YYSTYPE*) arg;
   const CHARSET_INFO *cs= thd->charset();
   uchar *state_map= cs->state_map;
   uchar *ident_map= cs->ident_map;
@@ -2253,6 +2265,28 @@
   // find_order_in_list() may need some extra space, so multiply by two.
   order_group_num*= 2;
 
+  // create_distinct_group() may need some extra space
+  const bool select_distinct= MY_TEST(options & SELECT_DISTINCT);
+  if (select_distinct)
+  {
+    uint bitcount= 0;
+    Item *item;
+    List_iterator<Item> li(item_list);
+    while ((item= li++))
+    {
+      /*
+        Same test as in create_distinct_group, when it pushes new items to the
+        end of ref_pointer_array. An extra test for 'fixed' which, at this
+        stage, will be true only for columns inserted for a '*' wildcard.
+      */
+      if (item->fixed &&
+          item->type() == Item::FIELD_ITEM &&
+          item->field_type() == MYSQL_TYPE_BIT)
+        ++bitcount;
+    }
+    order_group_num+= bitcount;
+  }
+
   /*
     We have to create array in prepared statement memory if it is
     prepared statement
@@ -2276,22 +2310,13 @@
   if (!ref_pointer_array.is_null())
   {
     /*
-      The Query may have been permanently transformed by removal of
-      ORDER BY or GROUP BY. Memory has already been allocated, but by
-      reducing the size of ref_pointer_array a tight bound is
-      maintained by Bounds_checked_array
-    */
-    if (ref_pointer_array.size() > n_elems)
-      ref_pointer_array.resize(n_elems);
-
-    /*
       We need to take 'n_sum_items' into account when allocating the array,
       and this may actually increase during the optimization phase due to
       MIN/MAX rewrite in Item_in_subselect::single_value_transformer.
       In the usual case we can reuse the array from the prepare phase.
       If we need a bigger array, we must allocate a new one.
      */
-    if (ref_pointer_array.size() == n_elems)
+    if (ref_pointer_array.size() >= n_elems)
       return false;
   }
   Item **array= static_cast<Item**>(arena->alloc(sizeof(Item*) * n_elems));
@@ -2678,6 +2703,18 @@
   else
     str->append(STRING_WITH_LEN("select "));
 
+  if (thd->is_error())
+  {
+    /*
+      It is possible that this query block had an optimization error, but the
+      caller didn't notice (caller evaluted this as a subquery and
+      Item::val*() don't have an error status). In this case the query block
+      may be broken and printing it may crash.
+    */
+    str->append(STRING_WITH_LEN("had some error"));
+    return;
+  }
+
   if (!thd->lex->describe && join && join->need_tmp)
   {
     /*
@@ -2795,9 +2832,8 @@
   }
 
   // having
-  Item *cur_having= having;
-  if (join)
-    cur_having= join->having_for_explain;
+  Item *cur_having= (join && join->optimized) ?
+    join->having_for_explain : having;
 
   if (cur_having || having_value != Item::COND_UNDEF)
   {
diff -Nru percona-xtrabackup-2.2.3/sql/sql_lex.h percona-xtrabackup-2.3.7/sql/sql_lex.h
--- percona-xtrabackup-2.2.3/sql/sql_lex.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_lex.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. reserved.
-   reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -47,6 +46,7 @@
 class Item_func_match;
 class File_parser;
 class Key_part_spec;
+struct sql_digest_state;
 
 #ifdef MYSQL_SERVER
 /*
@@ -2100,6 +2100,10 @@
   /** LALR(2) resolution, value of the look ahead token.*/
   LEX_YYSTYPE lookahead_yylval;
 
+  void add_digest_token(uint token, LEX_YYSTYPE yylval);
+
+  void reduce_digest_token(uint token_left, uint token_right);
+
 private:
   /** Pointer to the current position in the raw input stream. */
   char *m_ptr;
@@ -2219,7 +2223,7 @@
   /**
     Current statement digest instrumentation. 
   */
-  PSI_digest_locker* m_digest_psi;
+  sql_digest_state* m_digest;
 };
 
 
@@ -2788,6 +2792,18 @@
 };
 
 /**
+  Input parameters to the parser.
+*/
+struct Parser_input
+{
+  bool m_compute_digest;
+
+  Parser_input()
+    : m_compute_digest(false)
+  {}
+};
+
+/**
   Internal state of the parser.
   The complete state consist of:
   - state data used during lexical parsing,
@@ -2814,9 +2830,15 @@
   ~Parser_state()
   {}
 
+  Parser_input m_input;
   Lex_input_stream m_lip;
   Yacc_state m_yacc;
 
+  /**
+    Current performance digest instrumentation. 
+  */
+  PSI_digest_locker* m_digest_psi;
+
   void reset(char *found_semicolon, unsigned int length)
   {
     m_lip.reset(found_semicolon, length);
@@ -2824,6 +2846,11 @@
   }
 };
 
+extern sql_digest_state *
+digest_add_token(sql_digest_state *state, uint token, LEX_YYSTYPE yylval);
+
+extern sql_digest_state *
+digest_reduce_token(sql_digest_state *state, uint token_left, uint token_right);
 
 struct st_lex_local: public LEX
 {
@@ -2845,7 +2872,7 @@
 extern void lex_free(void);
 extern void lex_start(THD *thd);
 extern void lex_end(LEX *lex);
-extern int MYSQLlex(void *arg, void *yythd);
+extern int MYSQLlex(union YYSTYPE *yylval, class THD *thd);
 
 extern void trim_whitespace(const CHARSET_INFO *cs, LEX_STRING *str);
 
diff -Nru percona-xtrabackup-2.2.3/sql/sql_load.cc percona-xtrabackup-2.3.7/sql/sql_load.cc
--- percona-xtrabackup-2.2.3/sql/sql_load.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_load.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -61,13 +61,17 @@
 }
 
 
+#define GET (stack_pos != stack ? *--stack_pos : my_b_get(&cache))
+#define PUSH(A) *(stack_pos++)=(A)
+
 class READ_INFO {
   File	file;
   uchar	*buffer,			/* Buffer for read text */
 	*end_of_buff;			/* Data in bufferts ends here */
   uint	buff_length,			/* Length of buffert */
 	max_length;			/* Max length of row */
-  const char *field_term_ptr, *line_term_ptr, *line_start_ptr, *line_start_end;
+  const uchar *field_term_ptr, *line_term_ptr;
+  const char *line_start_ptr, *line_start_end;
   uint	field_term_length,line_term_length,enclosed_length;
   int	field_term_char,line_term_char,enclosed_char,escape_char;
   int	*stack,*stack_pos;
@@ -94,7 +98,7 @@
   int read_fixed_length(void);
   int next_line(void);
   char unescape(char chr);
-  int terminator(const char *ptr,uint length);
+  int terminator(const uchar *ptr, uint length);
   bool find_start_of_fields();
   /* load xml */
   List<XML_TAG> taglist;
@@ -118,6 +122,15 @@
     either the table or THD value
   */
   void set_io_cache_arg(void* arg) { cache.arg = arg; }
+
+  /**
+    skip all data till the eof.
+  */
+  void skip_data_till_eof()
+  {
+    while (GET != my_b_EOF)
+      ;
+  }
 };
 
 static int read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
@@ -196,7 +209,7 @@
   */
   char *tdb= thd->db ? thd->db : db;		// Result is never null
   ulong skip_lines= ex->skip_lines;
-  bool transactional_table;
+  bool transactional_table __attribute__((unused));
   DBUG_ENTER("mysql_load");
 
   /*
@@ -541,8 +554,7 @@
   if (error)
   {
     if (read_file_from_client)
-      while (!read_info.next_line())
-	;
+      read_info.skip_data_till_eof();
 
 #ifndef EMBEDDED_LIBRARY
     if (mysql_bin_log.is_open())
@@ -751,7 +763,7 @@
                         strlen(item->item_name.ptr()));
       // Extract exact Item value
       str->copy();
-      pfields.append((char *)str->ptr());
+      pfields.append(str->ptr());
       str->free();
     }
     /*
@@ -767,17 +779,17 @@
   if (!(load_data_query= (char *)thd->alloc(lle.get_query_buffer_length() + 1 + pl)))
     return TRUE;
 
-  lle.print_query(FALSE, (const char *) ex->cs?ex->cs->csname:NULL,
+  lle.print_query(FALSE, ex->cs ? ex->cs->csname : NULL,
                   load_data_query, &end,
-                  (char **)&fname_start, (char **)&fname_end);
+                  &fname_start, &fname_end);
 
   strcpy(end, p);
   end += pl;
 
   Execute_load_query_log_event
     e(thd, load_data_query, end-load_data_query,
-      (uint) ((char*) fname_start - load_data_query - 1),
-      (uint) ((char*) fname_end - load_data_query),
+      static_cast<uint>(fname_start - load_data_query - 1),
+      static_cast<uint>(fname_end - load_data_query),
       (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE :
       (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR),
       transactional_table, FALSE, FALSE, errcode);
@@ -1358,10 +1370,18 @@
    found_end_of_line(false), eof(false), need_end_io_cache(false),
    error(false), line_cuted(false), found_null(false), read_charset(cs)
 {
-  field_term_ptr= field_term.ptr();
+  /*
+    Field and line terminators must be interpreted as sequence of unsigned char.
+    Otherwise, non-ascii terminators will be negative on some platforms,
+    and positive on others (depending on the implementation of char).
+  */
+  field_term_ptr=
+    static_cast<const uchar*>(static_cast<const void*>(field_term.ptr()));
   field_term_length= field_term.length();
-  line_term_ptr= line_term.ptr();
+  line_term_ptr=
+    static_cast<const uchar*>(static_cast<const void*>(line_term.ptr()));
   line_term_length= line_term.length();
+
   level= 0; /* for load xml */
   if (line_start.length() == 0)
   {
@@ -1370,7 +1390,7 @@
   }
   else
   {
-    line_start_ptr=(char*) line_start.ptr();
+    line_start_ptr= line_start.ptr();
     line_start_end=line_start_ptr+line_start.length();
     start_of_line= 1;
   }
@@ -1379,12 +1399,12 @@
       !memcmp(field_term_ptr,line_term_ptr,field_term_length))
   {
     line_term_length=0;
-    line_term_ptr=(char*) "";
+    line_term_ptr= NULL;
   }
   enclosed_char= (enclosed_length=enclosed_par.length()) ?
     (uchar) enclosed_par[0] : INT_MAX;
-  field_term_char= field_term_length ? (uchar) field_term_ptr[0] : INT_MAX;
-  line_term_char= line_term_length ? (uchar) line_term_ptr[0] : INT_MAX;
+  field_term_char= field_term_length ? field_term_ptr[0] : INT_MAX;
+  line_term_char= line_term_length ? line_term_ptr[0] : INT_MAX;
 
 
   /* Set of a stack for unget if long terminators */
@@ -1442,17 +1462,14 @@
 }
 
 
-#define GET (stack_pos != stack ? *--stack_pos : my_b_get(&cache))
-#define PUSH(A) *(stack_pos++)=(A)
-
-
-inline int READ_INFO::terminator(const char *ptr,uint length)
+inline int READ_INFO::terminator(const uchar *ptr, uint length)
 {
   int chr=0;					// Keep gcc happy
   uint i;
   for (i=1 ; i < length ; i++)
   {
-    if ((chr=GET) != *++ptr)
+    chr= GET;
+    if (chr != *++ptr)
     {
       break;
     }
@@ -1461,7 +1478,7 @@
     return 1;
   PUSH(chr);
   while (i-- > 1)
-    PUSH((uchar) *--ptr);
+    PUSH(*--ptr);
   return 0;
 }
 
@@ -1592,7 +1609,7 @@
       if (my_mbcharlen(read_charset, chr) > 1 &&
           to + my_mbcharlen(read_charset, chr) <= end_of_buff)
       {
-        uchar* p= (uchar*) to;
+        uchar* p= to;
         int ml, i;
         *to++ = chr;
 
@@ -1617,7 +1634,7 @@
                         (const char *)to))
           continue;
         for (i= 0; i < ml; i++)
-          PUSH((uchar) *--to);
+          PUSH(*--to);
         chr= GET;
       }
 #endif
@@ -1779,7 +1796,7 @@
       PUSH(chr);
       while (--ptr != line_start_ptr)
       {						// Restart with next char
-	PUSH((uchar) *ptr);
+	PUSH( *ptr);
       }
       goto try_again;
     }
@@ -1975,7 +1992,7 @@
       
       // row tag should be in ROWS IDENTIFIED BY '<row>' - stored in line_term 
       if((tag.length() == line_term_length -2) &&
-         (strncmp(tag.c_ptr_safe(), line_term_ptr + 1, tag.length()) == 0))
+         (memcmp(tag.ptr(), line_term_ptr + 1, tag.length()) == 0))
       {
         DBUG_PRINT("read_xml", ("start-of-row: %i %s %s", 
                                 level,tag.c_ptr_safe(), line_term_ptr));
@@ -2037,7 +2054,7 @@
       }
       
       if((tag.length() == line_term_length -2) &&
-         (strncmp(tag.c_ptr_safe(), line_term_ptr + 1, tag.length()) == 0))
+         (memcmp(tag.ptr(), line_term_ptr + 1, tag.length()) == 0))
       {
          DBUG_PRINT("read_xml", ("found end-of-row %i %s", 
                                  level, tag.c_ptr_safe()));
diff -Nru percona-xtrabackup-2.2.3/sql/sql_optimizer.cc percona-xtrabackup-2.3.7/sql/sql_optimizer.cc
--- percona-xtrabackup-2.2.3/sql/sql_optimizer.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_optimizer.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -2060,8 +2060,9 @@
         As noted in Item_equal::get_subst_item(), subquery materialization
         does not have this problem.
       */
-      if (!sj_is_materialize_strategy(
-            item_field->field->table->reginfo.join_tab->get_sj_strategy()))
+      JOIN_TAB *const tab= item_field->field->table->reginfo.join_tab;
+
+      if (!(tab && sj_is_materialize_strategy(tab->get_sj_strategy())))
       {
         Item_field *item_match;
         Item_equal_iterator li(*item_equal);
@@ -6807,15 +6808,24 @@
        Item_direct_view_ref::fix_fields.
     */
 
-    for (uint i= 0; i < in_subq_pred->left_expr->cols(); i++)
+    if (in_subq_pred->left_expr->type() == Item::SUBSELECT_ITEM)
     {
-      nested_join->sj_outer_exprs.push_back(in_subq_pred->left_expr->
-                                            element_index(i));
-      nested_join->sj_inner_exprs.push_back(subq_lex->ref_pointer_array[i]);
-
-      Item_func_eq *item_eq= 
-        new Item_func_eq(in_subq_pred->left_expr->element_index(i), 
-                         subq_lex->ref_pointer_array[i]);
+      List<Item> ref_list;
+      uint i;
+
+      Item *header= subq_lex->ref_pointer_array[0];
+      for (i= 1; i < in_subq_pred->left_expr->cols(); i++)
+      {
+        ref_list.push_back(subq_lex->ref_pointer_array[i]);
+      }
+
+      Item_row *right_expr= new Item_row(header, ref_list);
+
+      nested_join->sj_outer_exprs.push_back(in_subq_pred->left_expr);
+      nested_join->sj_inner_exprs.push_back(right_expr);
+      Item_func_eq *item_eq=
+        new Item_func_eq(in_subq_pred->left_expr,
+                         right_expr);
       if (item_eq == NULL)
         DBUG_RETURN(TRUE);
 
@@ -6823,6 +6833,25 @@
       if (sj_nest->sj_on_expr == NULL)
         DBUG_RETURN(TRUE);
     }
+    else
+    {
+      for (uint i= 0; i < in_subq_pred->left_expr->cols(); i++)
+      {
+        nested_join->sj_outer_exprs.push_back(in_subq_pred->left_expr->
+                                              element_index(i));
+        nested_join->sj_inner_exprs.push_back(subq_lex->ref_pointer_array[i]);
+
+        Item_func_eq *item_eq= 
+          new Item_func_eq(in_subq_pred->left_expr->element_index(i), 
+                           subq_lex->ref_pointer_array[i]);
+        if (item_eq == NULL)
+          DBUG_RETURN(TRUE);
+
+        sj_nest->sj_on_expr= and_items(sj_nest->sj_on_expr, item_eq);
+        if (sj_nest->sj_on_expr == NULL)
+          DBUG_RETURN(TRUE);
+      }
+    }
     /* Fix the created equality and AND */
 
     Opt_trace_array sj_on_trace(&thd->opt_trace,
@@ -8918,6 +8947,7 @@
           additional hidden field for grouping because later it will be
           converted to a LONG field. Original field will remain of the
           BIT type and will be returned to a client.
+          @note setup_ref_array() needs to account for the extra space.
         */
         Item_field *new_item= new Item_field(thd, (Item_field*)item);
         int el= all_fields.elements;
diff -Nru percona-xtrabackup-2.2.3/sql/sql_parse.cc percona-xtrabackup-2.3.7/sql/sql_parse.cc
--- percona-xtrabackup-2.2.3/sql/sql_parse.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_parse.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -101,6 +101,8 @@
 #include "sql_analyse.h"
 #include "table_cache.h" // table_cache_manager
 
+#include "sql_digest.h"
+
 #include <algorithm>
 using std::max;
 using std::min;
@@ -842,9 +844,7 @@
 
   if (thd_added)
   {
-    mysql_mutex_lock(&LOCK_thread_count);
     remove_global_thread(thd);
-    mysql_mutex_unlock(&LOCK_thread_count);
   }
   /*
     For safety we delete the thd before signalling that bootstrap is done,
@@ -989,6 +989,7 @@
     /* Mark the statement completed. */
     MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
     thd->m_statement_psi= NULL;
+    thd->m_digest= NULL;
 
     if (net->error != 3)
     {
@@ -1037,6 +1038,7 @@
 
 out:
   /* The statement instrumentation must be closed in all cases. */
+  DBUG_ASSERT(thd->m_digest == NULL);
   DBUG_ASSERT(thd->m_statement_psi == NULL);
   DBUG_RETURN(return_value);
 }
@@ -1308,6 +1310,10 @@
   }
   case COM_QUERY:
   {
+    DBUG_ASSERT(thd->m_digest == NULL);
+    thd->m_digest= & thd->m_digest_state;
+    thd->m_digest->reset(thd->m_token_array, max_digest_length);
+
     if (alloc_query(thd, packet, packet_length))
       break;					// fatal error is set
     MYSQL_QUERY_START(thd->query(), thd->thread_id,
@@ -1365,6 +1371,7 @@
 /* PSI end */
       MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
       thd->m_statement_psi= NULL;
+      thd->m_digest= NULL;
 
 /* DTRACE end */
       if (MYSQL_QUERY_DONE_ENABLED())
@@ -1390,6 +1397,8 @@
                         (char *) thd->security_ctx->host_or_ip);
 
 /* PSI begin */
+      thd->m_digest= & thd->m_digest_state;
+
       thd->m_statement_psi= MYSQL_START_STATEMENT(&thd->m_statement_state,
                                                   com_statement_info[command].m_key,
                                                   thd->db, thd->db_length,
@@ -1779,6 +1788,7 @@
   /* Performance Schema Interface instrumentation, end */
   MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
   thd->m_statement_psi= NULL;
+  thd->m_digest= NULL;
 
   dec_thread_running();
   thd->packet.shrink(thd->variables.net_buffer_length);	// Reclaim some memory
@@ -2363,6 +2373,15 @@
 #ifdef HAVE_REPLICATION
   if (unlikely(thd->slave_thread))
   {
+    // Database filters.
+    if (lex->sql_command != SQLCOM_BEGIN &&
+        lex->sql_command != SQLCOM_COMMIT &&
+        lex->sql_command != SQLCOM_SAVEPOINT &&
+        lex->sql_command != SQLCOM_ROLLBACK &&
+        lex->sql_command != SQLCOM_ROLLBACK_TO_SAVEPOINT &&
+        !rpl_filter->db_ok(thd->db))
+      DBUG_RETURN(0);
+
     if (lex->sql_command == SQLCOM_DROP_TRIGGER)
     {
       /*
@@ -3007,6 +3026,8 @@
              table= table->next_global)
           if (table->lock_type >= TL_WRITE_ALLOW_WRITE)
           {
+            lex->link_first_table_back(create_table, link_to_local);
+
             res= 1;
             my_error(ER_CANT_UPDATE_TABLE_IN_CREATE_TABLE_SELECT, MYF(0),
                      table->table_name, create_info.alias);
@@ -4238,8 +4259,7 @@
     LEX_USER *grant_user= get_current_user(thd, lex->grant_user);
     if (!grant_user)
       goto error;
-    if ((thd->security_ctx->priv_user &&
-	 !strcmp(thd->security_ctx->priv_user, grant_user->user.str)) ||
+    if (!strcmp(thd->security_ctx->priv_user, grant_user->user.str) ||
         !check_access(thd, SELECT_ACL, "mysql", NULL, NULL, 1, 0))
     {
       res = mysql_show_grants(thd, grant_user);
@@ -4377,6 +4397,12 @@
     if (sp_process_definer(thd))
       goto create_sp_error;
 
+    /*
+      Record the CURRENT_USER in binlog. The CURRENT_USER is used on slave to
+      grant default privileges when sp_automatic_privileges variable is set.
+    */
+    thd->binlog_invoker();
+
     res= (sp_result= sp_create_routine(thd, lex->sphead));
     switch (sp_result) {
     case SP_OK: {
@@ -4386,7 +4412,6 @@
       Security_context security_context;
       bool restore_backup_context= false;
       Security_context *backup= NULL;
-      LEX_USER *definer= thd->lex->definer;
       /*
         We're going to issue an implicit GRANT statement so we close all
         open tables. We have to keep metadata locks as this ensures that
@@ -4405,21 +4430,41 @@
       DBUG_ASSERT(thd->transaction.stmt.is_empty());
       close_thread_tables(thd);
       /*
-        Check if the definer exists on slave, 
+        Check if invoker exists on slave, then use invoker privilege to
+        insert routine privileges to mysql.procs_priv. If invoker is not
+        available then consider using definer.
+
+        Check if the definer exists on slave,
         then use definer privilege to insert routine privileges to mysql.procs_priv.
 
-        For current user of SQL thread has GLOBAL_ACL privilege, 
-        which doesn't any check routine privileges, 
+        For current user of SQL thread has GLOBAL_ACL privilege,
+        which doesn't any check routine privileges,
         so no routine privilege record  will insert into mysql.procs_priv.
       */
-      if (thd->slave_thread && is_acl_user(definer->host.str, definer->user.str))
+
+      if (thd->slave_thread)
       {
-        security_context.change_security_context(thd, 
-                                                 &thd->lex->definer->user,
-                                                 &thd->lex->definer->host,
-                                                 &thd->lex->sphead->m_db,
-                                                 &backup);
-        restore_backup_context= true;
+        LEX_STRING current_user;
+        LEX_STRING current_host;
+        if (thd->has_invoker())
+        {
+          current_host= thd->get_invoker_host();
+          current_user= thd->get_invoker_user();
+        }
+        else
+        {
+          current_host= lex->definer->host;
+          current_user= lex->definer->user;
+        }
+        if (is_acl_user(current_host.str, current_user.str))
+        {
+          security_context.change_security_context(thd,
+                                                   &current_user,
+                                                   &current_host,
+                                                   &thd->lex->sphead->m_db,
+                                                   &backup);
+          restore_backup_context= true;
+        }
       }
 
       if (sp_automatic_privileges && !opt_noacl &&
@@ -5097,6 +5142,7 @@
         delete save_result;
     }
   }
+  DEBUG_SYNC(thd, "after_table_open");
   return res;
 }
 
@@ -5741,6 +5787,118 @@
 #endif
 }
 
+
+/**
+  Checks foreign key's parent table access.
+
+  @param thd	       [in]	Thread handler
+  @param create_info   [in]     Create information (like MAX_ROWS, ENGINE or
+                                temporary table flag)
+  @param alter_info    [in]     Initial list of columns and indexes for the
+                                table to be created
+
+  @retval
+   false  ok.
+  @retval
+   true	  error or access denied. Error is sent to client in this case.
+*/
+bool check_fk_parent_table_access(THD *thd,
+                                  HA_CREATE_INFO *create_info,
+                                  Alter_info *alter_info)
+{
+  Key *key;
+  List_iterator<Key> key_iterator(alter_info->key_list);
+  handlerton *db_type= create_info->db_type ? create_info->db_type :
+                                             ha_default_handlerton(thd);
+
+  // Return if engine does not support Foreign key Constraint.
+  if (!ha_check_storage_engine_flag(db_type, HTON_SUPPORTS_FOREIGN_KEYS))
+    return false;
+
+  while ((key= key_iterator++))
+  {
+    if (key->type == Key::FOREIGN_KEY)
+    {
+      TABLE_LIST parent_table;
+      bool is_qualified_table_name;
+      Foreign_key *fk_key= (Foreign_key *)key;
+      LEX_STRING db_name;
+      LEX_STRING table_name= { fk_key->ref_table.str,
+                               fk_key->ref_table.length };
+      const ulong privileges= (SELECT_ACL | INSERT_ACL | UPDATE_ACL |
+                               DELETE_ACL | REFERENCES_ACL);
+
+      // Check if tablename is valid or not.
+      DBUG_ASSERT(table_name.str != NULL);
+      if (check_table_name(table_name.str, table_name.length, false))
+      {
+        my_error(ER_WRONG_TABLE_NAME, MYF(0), table_name.str);
+        return true;
+      }
+
+      if (fk_key->ref_db.str)
+      {
+        is_qualified_table_name= true;
+        db_name.str= (char *) thd->memdup(fk_key->ref_db.str,
+                                          fk_key->ref_db.length+1);
+        db_name.length= fk_key->ref_db.length;
+
+        // Check if database name is valid or not.
+        if (fk_key->ref_db.str && check_and_convert_db_name(&db_name, false))
+          return true;
+      }
+      else if (thd->lex->copy_db_to(&db_name.str, &db_name.length))
+        return true;
+      else
+        is_qualified_table_name= false;
+
+      // if lower_case_table_names is set then convert tablename to lower case.
+      if (lower_case_table_names)
+      {
+        table_name.str= (char *) thd->memdup(fk_key->ref_table.str,
+                                             fk_key->ref_table.length+1);
+        table_name.length= my_casedn_str(files_charset_info, table_name.str);
+      }
+
+      parent_table.init_one_table(db_name.str, db_name.length,
+                                  table_name.str, table_name.length,
+                                  table_name.str, TL_IGNORE);
+
+      /*
+       Check if user has any of the "privileges" at table level on
+       "parent_table".
+       Having privilege on any of the parent_table column is not
+       enough so checking whether user has any of the "privileges"
+       at table level only here.
+      */
+      if (check_some_access(thd, privileges, &parent_table) ||
+          parent_table.grant.want_privilege)
+      {
+        if (is_qualified_table_name)
+        {
+          const size_t qualified_table_name_len= NAME_LEN + 1 + NAME_LEN + 1;
+          char *qualified_table_name= (char *) thd->alloc(qualified_table_name_len);
+
+          my_snprintf(qualified_table_name, qualified_table_name_len, "%s.%s",
+                      db_name.str, table_name.str);
+          table_name.str= qualified_table_name;
+        }
+
+        my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
+                 "REFERENCES",
+                 thd->security_ctx->priv_user,
+                 thd->security_ctx->host_or_ip,
+                 table_name.str);
+
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+
 /****************************************************************************
 	Check stack size; Send error if there isn't enough stack to continue
 ****************************************************************************/
@@ -6160,9 +6318,7 @@
         no logging happens at all. If rewriting does not happen here,
         thd->rewritten_query is still empty from being reset in alloc_query().
       */
-      bool general= (opt_log && ! (opt_log_raw || thd->slave_thread));
-
-      if (general || opt_slow_log || opt_bin_log)
+      if (!(opt_log_raw || thd->slave_thread) || opt_slow_log || opt_bin_log)
       {
         mysql_rewrite_query(thd);
 
@@ -6170,7 +6326,7 @@
           lex->safe_to_cache_query= false; // see comments below
       }
 
-      if (general)
+      if (!(opt_log_raw || thd->slave_thread))
       {
         if (thd->rewritten_query.length())
           general_log_write(thd, COM_QUERY, thd->rewritten_query.c_ptr_safe(),
@@ -6237,11 +6393,29 @@
               thd->variables.gtid_next.type == GTID_GROUP &&
               thd->owned_gtid.sidno != 0 &&
               (thd->lex->sql_command == SQLCOM_COMMIT ||
-               stmt_causes_implicit_commit(thd, CF_IMPLICIT_COMMIT_END)))
+               stmt_causes_implicit_commit(thd, CF_IMPLICIT_COMMIT_END) ||
+               thd->lex->sql_command == SQLCOM_CREATE_TABLE ||
+               thd->lex->sql_command == SQLCOM_DROP_TABLE))
           {
-            // This is executed at the end of a DDL statement or after
-            // COMMIT.  It ensures that an empty group is logged if
-            // needed.
+            /*
+              This ensures that an empty transaction is logged if
+              needed. It is executed at the end of an implicitly or
+              explicitly committing statement, or after CREATE
+              TEMPORARY TABLE or DROP TEMPORARY TABLE.
+
+              CREATE/DROP TEMPORARY do not count as implicitly
+              committing according to stmt_causes_implicit_commit(),
+              but are written to the binary log as DDL (not between
+              BEGIN/COMMIT). Thus we need special cases for these
+              statements in the condition above. Hence the clauses for
+              for SQLCOM_CREATE_TABLE and SQLCOM_DROP_TABLE above.
+
+              Thus, for base tables, SQLCOM_[CREATE|DROP]_TABLE match
+              both the stmt_causes_implicit_commit clause and the
+              thd->lex->sql_command == SQLCOM_* clause; for temporary
+              tables they match only thd->lex->sql_command ==
+              SQLCOM_*.
+            */
             error= gtid_empty_group_log_and_cleanup(thd);
           }
           MYSQL_QUERY_EXEC_DONE(error);
@@ -6292,7 +6466,7 @@
 
 
 #ifdef HAVE_REPLICATION
-/*
+/**
   Usable by the replication SQL thread only: just parse a query to know if it
   can be ignored because of replicate-*-table rules.
 
@@ -6305,25 +6479,39 @@
 bool mysql_test_parse_for_slave(THD *thd, char *rawbuf, uint length)
 {
   LEX *lex= thd->lex;
-  bool error= 0;
+  bool ignorable= false;
+  sql_digest_state *parent_digest= thd->m_digest;
   PSI_statement_locker *parent_locker= thd->m_statement_psi;
   DBUG_ENTER("mysql_test_parse_for_slave");
 
+  DBUG_ASSERT(thd->slave_thread);
+
   Parser_state parser_state;
-  if (!(error= parser_state.init(thd, rawbuf, length)))
+  if (parser_state.init(thd, rawbuf, length) == 0)
   {
     lex_start(thd);
     mysql_reset_thd_for_next_command(thd);
 
+    thd->m_digest= NULL;
     thd->m_statement_psi= NULL;
-    if (!parse_sql(thd, & parser_state, NULL) &&
-        all_tables_not_ok(thd, lex->select_lex.table_list.first))
-      error= 1;                  /* Ignore question */
+    if (parse_sql(thd, & parser_state, NULL) == 0)
+    {
+      if (all_tables_not_ok(thd, lex->select_lex.table_list.first))
+        ignorable= true;
+      else if (lex->sql_command != SQLCOM_BEGIN &&
+               lex->sql_command != SQLCOM_COMMIT &&
+               lex->sql_command != SQLCOM_SAVEPOINT &&
+               lex->sql_command != SQLCOM_ROLLBACK &&
+               lex->sql_command != SQLCOM_ROLLBACK_TO_SAVEPOINT &&
+               !rpl_filter->db_ok(thd->db))
+        ignorable= true;
+    }
+    thd->m_digest= parent_digest;
     thd->m_statement_psi= parent_locker;
     thd->end_statement();
   }
   thd->cleanup_after_query();
-  DBUG_RETURN(error);
+  DBUG_RETURN(ignorable);
 }
 #endif
 
@@ -7764,8 +7952,11 @@
     if (check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE))
       goto err;
   }
-  error= FALSE;
 
+  if (check_fk_parent_table_access(thd, &lex->create_info, &lex->alter_info))
+    goto err;
+
+  error= FALSE;
 err:
   DBUG_RETURN(error);
 }
@@ -8111,7 +8302,7 @@
 }
 
 
-extern int MYSQLparse(void *thd); // from sql_yacc.cc
+extern int MYSQLparse(class THD *thd); // from sql_yacc.cc
 
 
 /**
@@ -8147,10 +8338,27 @@
 
   thd->m_parser_state= parser_state;
 
-#ifdef HAVE_PSI_STATEMENT_DIGEST_INTERFACE
-  /* Start Digest */
-  thd->m_parser_state->m_lip.m_digest_psi= MYSQL_DIGEST_START(thd->m_statement_psi);
-#endif
+  parser_state->m_digest_psi= NULL;
+  parser_state->m_lip.m_digest= NULL;
+
+  if (thd->m_digest != NULL)
+  {
+    /* Start Digest */
+    parser_state->m_digest_psi= MYSQL_DIGEST_START(thd->m_statement_psi);
+
+    if (parser_state->m_input.m_compute_digest ||
+       (parser_state->m_digest_psi != NULL))
+    {
+      /*
+        If either:
+        - the caller wants to compute a digest
+        - the performance schema wants to compute a digest
+        set the digest listener in the lexer.
+      */
+      parser_state->m_lip.m_digest= thd->m_digest;
+      parser_state->m_lip.m_digest->m_digest_storage.m_charset_number= thd->charset()->number;
+    }
+  }
 
   /* Parse the query. */
 
@@ -8183,6 +8391,18 @@
   /* That's it. */
 
   ret_value= mysql_parse_status || thd->is_fatal_error;
+
+  if ((ret_value == 0) &&
+      (parser_state->m_digest_psi != NULL))
+  {
+    /*
+      On parsing success, record the digest in the performance schema.
+    */
+    DBUG_ASSERT(thd->m_digest != NULL);
+    MYSQL_DIGEST_END(parser_state->m_digest_psi,
+                     & thd->m_digest->m_digest_storage);
+  }
+
   MYSQL_QUERY_PARSE_DONE(ret_value);
   return ret_value;
 }
diff -Nru percona-xtrabackup-2.2.3/sql/sql_parse.h percona-xtrabackup-2.3.7/sql/sql_parse.h
--- percona-xtrabackup-2.2.3/sql/sql_parse.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_parse.h	2017-02-27 07:47:02.000000000 +0000
@@ -49,6 +49,9 @@
 bool insert_precheck(THD *thd, TABLE_LIST *tables);
 bool create_table_precheck(THD *thd, TABLE_LIST *tables,
                            TABLE_LIST *create_table);
+bool check_fk_parent_table_access(THD *thd,
+                                  HA_CREATE_INFO *create_info,
+                                  Alter_info *alter_info);
 
 bool parse_sql(THD *thd,
                Parser_state *parser_state,
diff -Nru percona-xtrabackup-2.2.3/sql/sql_partition.cc percona-xtrabackup-2.3.7/sql/sql_partition.cc
--- percona-xtrabackup-2.2.3/sql/sql_partition.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_partition.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2015, 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
@@ -3239,19 +3239,28 @@
   uint num_columns= part_info->part_field_list.elements;
   uint list_index;
   uint min_list_index= 0;
+  int cmp;
+  /* Notice that max_list_index = last_index + 1 here! */
   uint max_list_index= part_info->num_list_values;
   DBUG_ENTER("get_partition_id_cols_list_for_endpoint");
 
   /* Find the matching partition (including taking endpoint into account). */
   do
   {
-    /* Midpoint, adjusted down, so it can never be > last index. */
+    /* Midpoint, adjusted down, so it can never be >= max_list_index. */
     list_index= (max_list_index + min_list_index) >> 1;
-    if (cmp_rec_and_tuple_prune(list_col_array + list_index*num_columns,
-                                nparts, left_endpoint, include_endpoint) > 0)
+    cmp= cmp_rec_and_tuple_prune(list_col_array + list_index*num_columns,
+                                 nparts, left_endpoint, include_endpoint);
+    if (cmp > 0)
+    {
       min_list_index= list_index + 1;
+    }
     else
+    {
       max_list_index= list_index;
+      if (cmp == 0)
+        break;
+    }
   } while (max_list_index > min_list_index);
   list_index= max_list_index;
 
@@ -3268,12 +3277,10 @@
                                            nparts, left_endpoint,
                                            include_endpoint)));
 
-  if (!left_endpoint)
-  {
-    /* Set the end after this list tuple if not already after the last. */
-    if (list_index < part_info->num_parts)
-      list_index++;
-  }
+  /* Include the right endpoint if not already passed end of array. */
+  if (!left_endpoint && include_endpoint && cmp == 0 &&
+      list_index < part_info->num_list_values)
+    list_index++;
 
   DBUG_RETURN(list_index);
 }
@@ -4361,6 +4368,7 @@
     thd->variables.character_set_client;
   LEX *old_lex= thd->lex;
   LEX lex;
+  sql_digest_state *parent_digest= thd->m_digest;
   PSI_statement_locker *parent_locker= thd->m_statement_psi;
   DBUG_ENTER("mysql_unpack_partition");
 
@@ -4392,14 +4400,17 @@
   part_info= lex.part_info;
   DBUG_PRINT("info", ("Parse: %s", part_buf));
 
+  thd->m_digest= NULL;
   thd->m_statement_psi= NULL;
   if (parse_sql(thd, & parser_state, NULL) ||
       part_info->fix_parser_data(thd))
   {
     thd->free_items();
+    thd->m_digest= parent_digest;
     thd->m_statement_psi= parent_locker;
     goto end;
   }
+  thd->m_digest= parent_digest;
   thd->m_statement_psi= parent_locker;
   /*
     The parsed syntax residing in the frm file can still contain defaults.
@@ -4637,6 +4648,27 @@
 
 
 /**
+  Set part_state for all partitions to given state.
+
+  @param tab_part_info  partition_info holding all partitions.
+  @param part_state     Which state to set for the named partitions.
+*/
+
+void set_all_part_state(partition_info *tab_part_info,
+                        enum partition_state part_state)
+{
+  uint part_count= 0;
+  List_iterator<partition_element> part_it(tab_part_info->partitions);
+
+  do
+  {
+    partition_element *part_elem= part_it++;
+    part_elem->part_state= part_state;
+  } while (++part_count < tab_part_info->num_parts);
+}
+
+
+/**
   Sets which partitions to be used in the command.
 
   @param alter_info     Alter_info pointer holding partition names and flags.
@@ -4680,13 +4712,7 @@
       !(alter_info->flags & Alter_info::ALTER_ALL_PARTITION))
   {
     /* Not all given partitions found, revert and return failure */
-    part_it.rewind();
-    part_count= 0;
-    do
-    {
-      partition_element *part_elem= part_it++;
-      part_elem->part_state= PART_NORMAL;
-    } while (++part_count < tab_part_info->num_parts);
+    set_all_part_state(tab_part_info, PART_NORMAL);
     return true;
   }
   return false;
@@ -4746,8 +4772,8 @@
   @param[in,out] create_info     Create info for CREATE TABLE
   @param[in]  alter_ctx          ALTER TABLE runtime context
   @param[out] partition_changed  Boolean indicating whether partition changed
-  @param[out] fast_alter_table   Boolean indicating if fast partition alter is
-                                 possible.
+  @param[out] new_part_info      New partition_info object if fast partition
+                                 alter is possible. (NULL if not possible).
 
   @return Operation status
     @retval TRUE                 Error
@@ -4767,9 +4793,10 @@
                            HA_CREATE_INFO *create_info,
                            Alter_table_ctx *alter_ctx,
                            bool *partition_changed,
-                           bool *fast_alter_table)
+                           partition_info **new_part_info)
 {
   DBUG_ENTER("prep_alter_part_table");
+  DBUG_ASSERT(new_part_info);
 
   /* Foreign keys on partitioned tables are not supported, waits for WL#148 */
   if (table->part_info && (alter_info->flags & Alter_info::ADD_FOREIGN_KEY ||
@@ -4817,18 +4844,28 @@
       DBUG_RETURN(TRUE);
     }
 
-    /*
-      Open our intermediate table, we will operate on a temporary instance
-      of the original table, to be able to skip copying all partitions.
-      Open it as a copy of the original table, and modify its partition_info
-      object to allow fast_alter_partition_table to perform the changes.
-    */
     DBUG_ASSERT(thd->mdl_context.is_lock_owner(MDL_key::TABLE,
                                                alter_ctx->db,
                                                alter_ctx->table_name,
                                                MDL_INTENTION_EXCLUSIVE));
 
-    tab_part_info= table->part_info;
+    /*
+      We will operate on a cached instance of the original table,
+      to be able to skip copying all non-changed partitions
+      while allowing concurrent access.
+
+      We create a new partition_info object which will carry
+      the new state of the partitions. It will only be temporary
+      attached to the handler when needed and then detached afterwards
+      (through handler::set_part_info()). That way it will not get reused
+      by next statement, even if the table object is reused due to LOCK TABLE.
+    */
+    tab_part_info= table->part_info->get_full_clone();
+    if (!tab_part_info)
+    {
+      mem_alloc_error(sizeof(partition_info));
+      DBUG_RETURN(true);
+    }
 
     if (alter_info->flags & Alter_info::ALTER_TABLE_REORG)
     {
@@ -4857,21 +4894,13 @@
           without any changes at all.
         */
         flags= table->file->alter_table_flags(alter_info->flags);
+        DBUG_ASSERT(flags & (HA_FAST_CHANGE_PARTITION | HA_PARTITION_ONE_PHASE));
         if (flags & (HA_FAST_CHANGE_PARTITION | HA_PARTITION_ONE_PHASE))
         {
-          *fast_alter_table= true;
+          *new_part_info= tab_part_info;
           /* Force table re-open for consistency with the main case. */
           table->m_needs_reopen= true;
         }
-        else
-        {
-          /*
-            Create copy of partition_info to avoid modifying original
-            TABLE::part_info, to keep it safe for later use.
-          */
-          if (!(tab_part_info= tab_part_info->get_clone()))
-            DBUG_RETURN(TRUE);
-        }
 
         thd->work_part_info= tab_part_info;
         DBUG_RETURN(FALSE);
@@ -4900,6 +4929,7 @@
       my_error(ER_PARTITION_FUNCTION_FAILURE, MYF(0));
       goto err;
     }
+    DBUG_ASSERT((flags & (HA_FAST_CHANGE_PARTITION | HA_PARTITION_ONE_PHASE)) != 0);
     if ((flags & (HA_FAST_CHANGE_PARTITION | HA_PARTITION_ONE_PHASE)) != 0)
     {
       /*
@@ -4908,21 +4938,9 @@
         information to storage engine in this case), so the table
         must be reopened.
       */
-      *fast_alter_table= true;
+      *new_part_info= tab_part_info;
       table->m_needs_reopen= true;
     }
-    else
-    {
-      /*
-        "Fast" changing of partitioning is not supported. Create
-        a copy of TABLE::part_info object, so we can modify it safely.
-        Modifying original TABLE::part_info will cause problems when
-        we read data from old version of table using this TABLE object
-        while copying them to new version of table.
-      */
-      if (!(tab_part_info= tab_part_info->get_clone()))
-        DBUG_RETURN(TRUE);
-    }
     DBUG_PRINT("info", ("*fast_alter_table flags: 0x%x", flags));
     if ((alter_info->flags & Alter_info::ALTER_ADD_PARTITION) ||
         (alter_info->flags & Alter_info::ALTER_REORGANIZE_PARTITION))
@@ -5111,7 +5129,7 @@
 and copying and finally the third line after also dropping the partitions
 that are reorganised.
 */
-      if (*fast_alter_table &&
+      if (*new_part_info &&
           tab_part_info->part_type == HASH_PARTITION)
       {
         uint part_no= 0, start_part= 1, start_sec_part= 1;
@@ -5216,7 +5234,7 @@
         do
         {
           partition_element *part_elem= alt_it++;
-          if (*fast_alter_table)
+          if (*new_part_info)
             part_elem->part_state= PART_TO_BE_ADDED;
           if (tab_part_info->partitions.push_back(part_elem))
           {
@@ -5303,7 +5321,7 @@
         my_error(ER_DROP_PARTITION_NON_EXISTENT, MYF(0), "REBUILD");
         goto err;
       }
-      if (!(*fast_alter_table))
+      if (!(*new_part_info))
       {
         table->file->print_error(HA_ERR_WRONG_COMMAND, MYF(0));
         goto err;
@@ -5366,7 +5384,7 @@
         uint part_count= 0, start_part= 1, start_sec_part= 1;
         uint end_part= 0, end_sec_part= 0;
         bool all_parts= TRUE;
-        if (*fast_alter_table &&
+        if (*new_part_info &&
             tab_part_info->linear_hash_ind)
         {
           uint upper_2n= tab_part_info->linear_hash_mask + 1;
@@ -5392,14 +5410,14 @@
         do
         {
           partition_element *p_elem= part_it++;
-          if (*fast_alter_table &&
+          if (*new_part_info &&
               (all_parts ||
               (part_count >= start_part && part_count <= end_part) ||
               (part_count >= start_sec_part && part_count <= end_sec_part)))
             p_elem->part_state= PART_CHANGED;
           if (++part_count > num_parts_remain)
           {
-            if (*fast_alter_table)
+            if (*new_part_info)
               p_elem->part_state= PART_REORGED_DROPPED;
             else
               part_it.remove();
@@ -5526,13 +5544,13 @@
             }
             else
               tab_max_range= part_elem->range_value;
-            if (*fast_alter_table &&
+            if (*new_part_info &&
                 tab_part_info->temp_partitions.push_back(part_elem))
             {
               mem_alloc_error(1);
               goto err;
             }
-            if (*fast_alter_table)
+            if (*new_part_info)
               part_elem->part_state= PART_TO_BE_REORGED;
             if (!found_first)
             {
@@ -5552,7 +5570,7 @@
                 else
                   alt_max_range= alt_part_elem->range_value;
 
-                if (*fast_alter_table)
+                if (*new_part_info)
                   alt_part_elem->part_state= PART_TO_BE_ADDED;
                 if (alt_part_count == 0)
                   tab_it.replace(alt_part_elem);
@@ -5800,7 +5818,7 @@
   }
   DBUG_RETURN(FALSE);
 err:
-  *fast_alter_table= false;
+  *new_part_info= NULL;
   DBUG_RETURN(TRUE);
 }
 
@@ -5837,6 +5855,7 @@
   int error;
   handler *file= lpt->table->file;
   THD *thd= lpt->thd;
+  partition_info *old_part_info= lpt->table->part_info;
   DBUG_ENTER("mysql_change_partitions");
 
   build_table_filename(path, sizeof(path) - 1, lpt->db, lpt->table_name, "", 0);
@@ -5846,9 +5865,12 @@
 
   /* TODO: test if bulk_insert would increase the performance */
 
-  if ((error= file->ha_change_partitions(lpt->create_info, path, &lpt->copied,
-                                         &lpt->deleted, lpt->pack_frm_data,
-                                         lpt->pack_frm_len)))
+  file->set_part_info(lpt->part_info, false);
+  error= file->ha_change_partitions(lpt->create_info, path, &lpt->copied,
+                                    &lpt->deleted, lpt->pack_frm_data,
+                                    lpt->pack_frm_len);
+  file->set_part_info(old_part_info, false);
+  if (error)
   {
     file->print_error(error, MYF(error != ER_OUTOFMEMORY ? 0 : ME_FATALERROR));
   }
@@ -5883,10 +5905,14 @@
 {
   char path[FN_REFLEN+1];
   int error;
+  partition_info *old_part_info= lpt->table->part_info;
   DBUG_ENTER("mysql_rename_partitions");
 
   build_table_filename(path, sizeof(path) - 1, lpt->db, lpt->table_name, "", 0);
-  if ((error= lpt->table->file->ha_rename_partitions(path)))
+  lpt->table->file->set_part_info(lpt->part_info, false);
+  error= lpt->table->file->ha_rename_partitions(path);
+  lpt->table->file->set_part_info(old_part_info, false);
+  if (error)
   {
     if (error != 1)
       lpt->table->file->print_error(error, MYF(0));
@@ -5919,7 +5945,8 @@
 static bool mysql_drop_partitions(ALTER_PARTITION_PARAM_TYPE *lpt)
 {
   char path[FN_REFLEN+1];
-  partition_info *part_info= lpt->table->part_info;
+  partition_info *old_part_info= lpt->table->part_info;
+  partition_info *part_info= lpt->part_info;
   List_iterator<partition_element> part_it(part_info->partitions);
   uint i= 0;
   uint remove_count= 0;
@@ -5932,7 +5959,10 @@
                                                 MDL_EXCLUSIVE));
 
   build_table_filename(path, sizeof(path) - 1, lpt->db, lpt->table_name, "", 0);
-  if ((error= lpt->table->file->ha_drop_partitions(path)))
+  lpt->table->file->set_part_info(part_info, false);
+  error= lpt->table->file->ha_drop_partitions(path);
+  lpt->table->file->set_part_info(old_part_info, false);
+  if (error)
   {
     lpt->table->file->print_error(error, MYF(0));
     DBUG_RETURN(TRUE);
@@ -6702,7 +6732,6 @@
       }
     }
     /* Ensure the share is destroyed and reopened. */
-    part_info= lpt->part_info->get_clone();
     close_all_tables_for_name(thd, table->s, false, NULL);
   }
   else
@@ -6720,7 +6749,6 @@
       the table cache.
     */
     mysql_lock_remove(thd, thd->lock, table);
-    part_info= lpt->part_info->get_clone();
     close_thread_table(thd, &thd->open_tables);
     lpt->table_list->table= NULL;
   }
@@ -6867,12 +6895,13 @@
   previously prepared.
 
   @param thd                           Thread object
-  @param table                         Original table object with new part_info
+  @param table                         Original table object
   @param alter_info                    ALTER TABLE info
   @param create_info                   Create info for CREATE TABLE
   @param table_list                    List of the table involved
   @param db                            Database name of new table
   @param table_name                    Table name of new table
+  @param new_part_info                 New partition_info to use
 
   @return Operation status
     @retval TRUE                          Error
@@ -6888,7 +6917,8 @@
                                 HA_CREATE_INFO *create_info,
                                 TABLE_LIST *table_list,
                                 char *db,
-                                const char *table_name)
+                                const char *table_name,
+                                partition_info *new_part_info)
 {
   /* Set-up struct used to write frm files */
   partition_info *part_info;
@@ -6901,7 +6931,7 @@
   DBUG_ENTER("fast_alter_partition_table");
   DBUG_ASSERT(table->m_needs_reopen);
 
-  part_info= table->part_info;
+  part_info= new_part_info;
   lpt->thd= thd;
   lpt->table_list= table_list;
   lpt->part_info= part_info;
@@ -7653,15 +7683,13 @@
   field= val->part_info->part_field_array + n_vals_in_rec;
   if (!(*field))
   {
-    /*
-      Full match, if right endpoint and not including the endpoint,
-      (rec < part) return lesser.
-    */
-    if (!is_left_endpoint && !include_endpoint)
-      return -4;
-
-    /* Otherwise they are equal! */
-    return 0;
+    /* Full match. Only equal if including endpoint. */
+    if (include_endpoint)
+      return 0;
+
+    if (is_left_endpoint)
+      return +4;     /* Start of range, part_tuple < rec, return higher. */
+    return -4;     /* End of range, rec < part_tupe, return lesser. */
   }
   /*
     The prefix is equal and there are more partition columns to compare.
diff -Nru percona-xtrabackup-2.2.3/sql/sql_partition.h percona-xtrabackup-2.3.7/sql/sql_partition.h
--- percona-xtrabackup-2.2.3/sql/sql_partition.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_partition.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_PARTITION_INCLUDED
 #define SQL_PARTITION_INCLUDED
 
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2015, 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
@@ -248,14 +248,17 @@
                                 HA_CREATE_INFO *create_info,
                                 TABLE_LIST *table_list,
                                 char *db,
-                                const char *table_name);
+                                const char *table_name,
+                                partition_info *new_part_info);
+void set_all_part_state(partition_info *tab_part_info,
+                        enum partition_state part_state);
 bool set_part_state(Alter_info *alter_info, partition_info *tab_part_info,
                     enum partition_state part_state);
 uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
                            HA_CREATE_INFO *create_info,
                            Alter_table_ctx *alter_ctx,
                            bool *partition_changed,
-                           bool *fast_alter_table);
+                           partition_info **new_part_info);
 char *generate_partition_syntax(partition_info *part_info,
                                 uint *buf_length, bool use_sql_alloc,
                                 bool show_partition_options,
diff -Nru percona-xtrabackup-2.2.3/sql/sql_plugin.cc percona-xtrabackup-2.3.7/sql/sql_plugin.cc
--- percona-xtrabackup-2.2.3/sql/sql_plugin.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_plugin.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2015, 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
@@ -35,6 +35,7 @@
 #include "lock.h"                               // MYSQL_LOCK_IGNORE_TIMEOUT
 #include <mysql/plugin_validate_password.h>
 #include "my_default.h"
+#include "debug_sync.h"
 
 #include <algorithm>
 
@@ -145,6 +146,12 @@
 #include "sql_plugin_services.h"
 
 /*
+  A mutex LOCK_plugin_delete must be acquired before calling plugin_del
+  function. 
+*/
+mysql_mutex_t LOCK_plugin_delete;
+
+/*
   A mutex LOCK_plugin must be acquired before accessing the
   following variables/structures.
   We are always manipulating ref count, so a rwlock here is unneccessary.
@@ -964,6 +971,7 @@
 {
   DBUG_ENTER("plugin_del(plugin)");
   mysql_mutex_assert_owner(&LOCK_plugin);
+  mysql_mutex_assert_owner(&LOCK_plugin_delete);
   /* Free allocated strings before deleting the plugin. */
   mysql_rwlock_wrlock(&LOCK_system_variables_hash);
   mysql_del_sys_var_chain(plugin->system_vars);
@@ -1015,11 +1023,14 @@
     plugin_deinitialize(plugin, true);
   }
 
+  mysql_mutex_lock(&LOCK_plugin_delete);
   mysql_mutex_lock(&LOCK_plugin);
 
   while ((plugin= *(--reap)))
     plugin_del(plugin);
 
+  mysql_mutex_unlock(&LOCK_plugin_delete);
+
   my_afree(reap);
 }
 
@@ -1236,10 +1247,12 @@
 
 #ifdef HAVE_PSI_INTERFACE
 static PSI_mutex_key key_LOCK_plugin;
+static PSI_mutex_key key_LOCK_plugin_delete;
 
 static PSI_mutex_info all_plugin_mutexes[]=
 {
-  { &key_LOCK_plugin, "LOCK_plugin", PSI_FLAG_GLOBAL}
+  { &key_LOCK_plugin, "LOCK_plugin", PSI_FLAG_GLOBAL},
+  { &key_LOCK_plugin_delete, "LOCK_plugin_delete", PSI_FLAG_GLOBAL}
 };
 
 static void init_plugin_psi_keys(void)
@@ -1287,6 +1300,7 @@
 
 
   mysql_mutex_init(key_LOCK_plugin, &LOCK_plugin, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_LOCK_plugin_delete, &LOCK_plugin_delete, MY_MUTEX_INIT_FAST);
 
   if (my_init_dynamic_array(&plugin_dl_array,
                             sizeof(struct st_plugin_dl *),16,16) ||
@@ -1432,8 +1446,10 @@
         plugin_ptr->load_option == PLUGIN_FORCE_PLUS_PERMANENT)
       reaped_mandatory_plugin= TRUE;
     plugin_deinitialize(plugin_ptr, true);
+    mysql_mutex_lock(&LOCK_plugin_delete);
     mysql_mutex_lock(&LOCK_plugin);
     plugin_del(plugin_ptr);
+    mysql_mutex_unlock(&LOCK_plugin_delete);
   }
 
   mysql_mutex_unlock(&LOCK_plugin);
@@ -1658,6 +1674,7 @@
   struct st_plugin_int *plugin;
   if (initialized)
   {
+
     for (uint i= 0; i < plugin_array.elements; i++)
     {
       plugin= *dynamic_element(&plugin_array, i, struct st_plugin_int **);
@@ -1666,10 +1683,14 @@
 	  && strcmp(plugin->name.str, "daemon_memcached") == 0)
       {
 	plugin_deinitialize(plugin, true);
+
+        mysql_mutex_lock(&LOCK_plugin);
 	plugin->state= PLUGIN_IS_DYING;
 	plugin_del(plugin);
+        mysql_mutex_unlock(&LOCK_plugin);
       }
     }
+
   }
 }
 
@@ -1754,10 +1775,11 @@
       }
 
     /*
-      It's perfectly safe not to lock LOCK_plugin, as there're no
-      concurrent threads anymore. But some functions called from here
-      use mysql_mutex_assert_owner(), so we lock the mutex to satisfy it
+      It's perfectly safe not to lock LOCK_plugin, LOCK_plugin_delete, as
+      there're no concurrent threads anymore. But some functions called from
+      here use mysql_mutex_assert_owner(), so we lock the mutex to satisfy it
     */
+    mysql_mutex_lock(&LOCK_plugin_delete);
     mysql_mutex_lock(&LOCK_plugin);
 
     /*
@@ -1780,9 +1802,11 @@
     cleanup_variables(NULL, &global_system_variables);
     cleanup_variables(NULL, &max_system_variables);
     mysql_mutex_unlock(&LOCK_plugin);
+    mysql_mutex_unlock(&LOCK_plugin_delete);
 
     initialized= 0;
     mysql_mutex_destroy(&LOCK_plugin);
+    mysql_mutex_destroy(&LOCK_plugin_delete);
 
     my_afree(plugins);
   }
@@ -1857,6 +1881,7 @@
   mysql_audit_acquire_plugins(thd, MYSQL_AUDIT_GENERAL_CLASS);
 
   mysql_mutex_lock(&LOCK_plugin);
+  DEBUG_SYNC(thd, "acquired_LOCK_plugin");
   mysql_rwlock_wrlock(&LOCK_system_variables_hash);
 
   if (my_load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv, NULL))
@@ -2000,6 +2025,45 @@
     goto err;
   }
 
+#ifdef HAVE_REPLICATION
+  /* Block Uninstallation of semi_sync plugins (Master/Slave)
+     when they are busy
+   */
+  char buff[20];
+  /*
+    Master: If there are active semi sync slaves for this Master,
+    then that means it is busy and rpl_semi_sync_master plugin
+    cannot be uninstalled. To check whether the master
+    has any semi sync slaves or not, check Rpl_semi_sync_master_cliens
+    status variable value, if it is not 0, that means it is busy.
+  */
+  if (!strcmp(name->str, "rpl_semi_sync_master") &&
+      get_status_var(thd,
+                     plugin->plugin->status_vars,
+                     "Rpl_semi_sync_master_clients",buff) &&
+      strcmp(buff,"0") )
+  {
+    my_error(ER_PLUGIN_CANNOT_BE_UNINSTALLED, MYF(0), name->str,
+             "Stop any active semisynchronous slaves of this master first.");
+    goto err;
+  }
+  /* Slave: If there is semi sync enabled IO thread active on this Slave,
+    then that means plugin is busy and rpl_semi_sync_slave plugin
+    cannot be uninstalled. To check whether semi sync
+    IO thread is active or not, check Rpl_semi_sync_slave_status status
+    variable value, if it is ON, that means it is busy.
+  */
+  if (!strcmp(name->str, "rpl_semi_sync_slave") &&
+      get_status_var(thd, plugin->plugin->status_vars,
+                     "Rpl_semi_sync_slave_status", buff) &&
+      !strcmp(buff,"ON") )
+  {
+    my_error(ER_PLUGIN_CANNOT_BE_UNINSTALLED, MYF(0), name->str,
+             "Stop any active semisynchronous I/O threads on this slave first.");
+    goto err;
+  }
+#endif
+
   plugin->state= PLUGIN_IS_DELETED;
   if (plugin->ref_count)
     push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
@@ -3658,6 +3722,12 @@
   {
     WARN_DEPRECATED(NULL, opt->name, (opt->name + strlen("plugin-")));
   }
+  else if (!my_strcasecmp(&my_charset_latin1, opt->name, "innodb"))
+  {
+    sql_print_warning("The option innodb (skip-innodb) is deprecated and "
+                      "will be removed in a future release");
+  }
+
   return 0;
 }
 
diff -Nru percona-xtrabackup-2.2.3/sql/sql_plugin.h percona-xtrabackup-2.3.7/sql/sql_plugin.h
--- percona-xtrabackup-2.2.3/sql/sql_plugin.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_plugin.h	2017-02-27 07:47:02.000000000 +0000
@@ -40,6 +40,7 @@
 enum enum_plugin_load_option { PLUGIN_OFF, PLUGIN_ON, PLUGIN_FORCE,
   PLUGIN_FORCE_PLUS_PERMANENT };
 extern const char *global_plugin_typelib_names[];
+extern mysql_mutex_t LOCK_plugin_delete;
 
 #include <my_sys.h>
 #include "sql_list.h"
diff -Nru percona-xtrabackup-2.2.3/sql/sql_prepare.cc percona-xtrabackup-2.3.7/sql/sql_prepare.cc
--- percona-xtrabackup-2.2.3/sql/sql_prepare.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_prepare.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2015, 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
@@ -306,11 +306,11 @@
     return;
 
   if (thd->rewritten_query.length())
-    logger.general_log_write(thd, COM_STMT_EXECUTE,
+    general_log_write(thd, COM_STMT_EXECUTE,
                              thd->rewritten_query.c_ptr_safe(),
                              thd->rewritten_query.length());
   else
-    logger.general_log_write(thd, COM_STMT_EXECUTE,
+    general_log_write(thd, COM_STMT_EXECUTE,
                              thd->query(), thd->query_length());
 }
 
@@ -3137,6 +3137,7 @@
 bool
 Execute_sql_statement::execute_server_code(THD *thd)
 {
+  sql_digest_state *parent_digest;
   PSI_statement_locker *parent_locker;
   bool error;
 
@@ -3150,9 +3151,12 @@
   parser_state.m_lip.multi_statements= FALSE;
   lex_start(thd);
 
+  parent_digest= thd->m_digest;
   parent_locker= thd->m_statement_psi;
+  thd->m_digest= NULL;
   thd->m_statement_psi= NULL;
   error= parse_sql(thd, &parser_state, NULL) || thd->is_error();
+  thd->m_digest= parent_digest;
   thd->m_statement_psi= parent_locker;
 
   if (error)
@@ -3162,19 +3166,18 @@
 
   parent_locker= thd->m_statement_psi;
   thd->m_statement_psi= NULL;
+
   /*
     Rewrite first (if needed); execution might replace passwords
     with hashes in situ without flagging it, and then we'd make
     a hash of that hash.
   */
   rewrite_query_if_needed(thd);
+  log_execute_line(thd);
+
   error= mysql_execute_command(thd) ;
   thd->m_statement_psi= parent_locker;
 
-  /* report error issued during command execution */
-  if (error == 0)
-    log_execute_line(thd);
-
 end:
   lex_end(thd->lex);
 
@@ -3354,7 +3357,10 @@
   bool error;
   Statement stmt_backup;
   Query_arena *old_stmt_arena;
+  sql_digest_state *parent_digest= thd->m_digest;
   PSI_statement_locker *parent_locker= thd->m_statement_psi;
+  unsigned char *token_array= NULL;
+
   DBUG_ENTER("Prepared_statement::prepare");
   /*
     If this is an SQLCOM_PREPARE, we also increase Com_prepare_sql.
@@ -3383,6 +3389,11 @@
     DBUG_RETURN(TRUE);
   }
 
+  if (max_digest_length > 0)
+  {
+    token_array= (unsigned char*) thd->alloc(max_digest_length);
+  }
+
   old_stmt_arena= thd->stmt_arena;
   thd->stmt_arena= this;
 
@@ -3401,10 +3412,18 @@
   lex_start(thd);
   lex->context_analysis_only|= CONTEXT_ANALYSIS_ONLY_PREPARE;
 
+  thd->m_digest= NULL;
   thd->m_statement_psi= NULL;
+
+  sql_digest_state digest;
+  digest.reset(token_array, max_digest_length);
+  thd->m_digest= &digest;
+
   error= parse_sql(thd, & parser_state, NULL) ||
     thd->is_error() ||
     init_param_array(this);
+
+  thd->m_digest= parent_digest;
   thd->m_statement_psi= parent_locker;
 
   lex->set_trg_event_type_for_tables();
@@ -3515,12 +3534,15 @@
     if (thd->sp_runtime_ctx == NULL)
     {
       if (thd->rewritten_query.length())
-        logger.general_log_write(thd, COM_STMT_PREPARE,
+        general_log_write(thd, COM_STMT_PREPARE,
                                  thd->rewritten_query.c_ptr_safe(),
                                  thd->rewritten_query.length());
       else
-        logger.general_log_write(thd, COM_STMT_PREPARE,
+        general_log_write(thd, COM_STMT_PREPARE,
                                  query(), query_length());
+
+      /* audit plugins can return an error */
+      error |= thd->is_error();
     }
   }
   DBUG_RETURN(error);
@@ -4005,12 +4027,28 @@
                              1);
       parent_locker= thd->m_statement_psi;
       thd->m_statement_psi= NULL;
+
       /*
+        Log COM_STMT_EXECUTE to the general log. Note, that in case of SQL
+        prepared statements this causes two records to be output:
+
+        Query       EXECUTE <statement name>
+        Execute     <statement SQL text>
+
+        This is considered user-friendly, since in the
+        second log entry we output values of parameter markers.
+
+        Rewriting/password obfuscation:
+
+        - Any passwords in the "Execute" line should be substituted with
+        their hashes, or a notice.
+
         Rewrite first (if needed); execution might replace passwords
         with hashes in situ without flagging it, and then we'd make
         a hash of that hash.
       */
       rewrite_query_if_needed(thd);
+      log_execute_line(thd);
 
       error= mysql_execute_command(thd);
       thd->m_statement_psi= parent_locker;
@@ -4049,25 +4087,6 @@
       thd->protocol->send_out_parameters(&this->lex->param_list);
   }
 
-  /*
-    Log COM_STMT_EXECUTE to the general log. Note, that in case of SQL
-    prepared statements this causes two records to be output:
-
-    Query       EXECUTE <statement name>
-    Execute     <statement SQL text>
-
-    This is considered user-friendly, since in the
-    second log entry we output values of parameter markers.
-
-    Rewriting/password obfuscation:
-
-    - Any passwords in the "Execute" line should be substituted with
-      their hashes, or a notice.
-
-  */
-  if (error == 0)
-    log_execute_line(thd);
-
 error:
   flags&= ~ (uint) IS_IN_USE;
   return error;
diff -Nru percona-xtrabackup-2.2.3/sql/sql_priv.h percona-xtrabackup-2.3.7/sql/sql_priv.h
--- percona-xtrabackup-2.2.3/sql/sql_priv.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_priv.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -55,6 +55,33 @@
                         (Old), (New));                                      \
   } while(0)
 
+
+/*
+  Generates a warning that a feature is deprecated and there is no replacement.
+
+  Using it as
+
+  WARN_DEPRECATED_NO_REPLACEMENT(thd, "BAD");
+
+  Will result in a warning
+ 
+  "'BAD' is deprecated and will be removed in a future release."
+
+   Note that in macro arguments BAD is not quoted.
+*/
+
+#define WARN_DEPRECATED_NO_REPLACEMENT(Thd,Old)                             \
+  do {                                                                      \
+    if (((THD *) Thd) != NULL)                                              \
+      push_warning_printf(((THD *) Thd), Sql_condition::WARN_LEVEL_WARN,    \
+                        ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,           \
+                        ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),       \
+                        (Old));                                             \
+    else                                                                    \
+      sql_print_warning("'%s' is deprecated and will be removed "           \
+                        "in a future release.", (Old));                     \
+  } while(0)
+
 /*************************************************************************/
 
 #endif
diff -Nru percona-xtrabackup-2.2.3/sql/sql_reload.cc percona-xtrabackup-2.3.7/sql/sql_reload.cc
--- percona-xtrabackup-2.2.3/sql/sql_reload.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_reload.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, 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
@@ -139,35 +139,55 @@
   if (options & REFRESH_ENGINE_LOG)
     if (ha_flush_logs(NULL))
       result= 1;
-
-  if (options & REFRESH_BINARY_LOG)
+  if ((options & REFRESH_BINARY_LOG) || (options & REFRESH_RELAY_LOG ))
   {
     /*
-      Writing this command to the binlog may result in infinite loops
-      when doing mysqlbinlog|mysql, and anyway it does not really make
-      sense to log it automatically (would cause more trouble to users
-      than it would help them)
-    */
-    tmp_write_to_binlog= 0;
-    if (mysql_bin_log.is_open())
+      If reload_acl_and_cache() is called from SIGHUP handler we have to
+      allocate temporary THD for execution of binlog/relay log rotation.
+     */
+    THD *tmp_thd= 0;
+    if (!thd && (thd= (tmp_thd= new THD)))
     {
-      if (mysql_bin_log.rotate_and_purge(true))
-        *write_to_binlog= -1;
+      thd->thread_stack= (char *) (&tmp_thd);
+      thd->store_globals();
     }
-  }
-  if (options & REFRESH_RELAY_LOG)
-  {
-#ifdef HAVE_REPLICATION
-    mysql_mutex_lock(&LOCK_active_mi);
-    if (active_mi != NULL)
+
+    if (options & REFRESH_BINARY_LOG)
     {
-      mysql_mutex_lock(&active_mi->data_lock);
-      if (rotate_relay_log(active_mi))
-        *write_to_binlog= -1;
-      mysql_mutex_unlock(&active_mi->data_lock);
+      /*
+        Writing this command to the binlog may result in infinite loops
+        when doing mysqlbinlog|mysql, and anyway it does not really make
+        sense to log it automatically (would cause more trouble to users
+        than it would help them)
+       */
+      tmp_write_to_binlog= 0;
+      if (mysql_bin_log.is_open())
+      {
+        if (mysql_bin_log.rotate_and_purge(thd, true))
+          *write_to_binlog= -1;
+      }
     }
-    mysql_mutex_unlock(&LOCK_active_mi);
+    if (options & REFRESH_RELAY_LOG)
+    {
+#ifdef HAVE_REPLICATION
+      mysql_mutex_lock(&LOCK_active_mi);
+      if (active_mi != NULL)
+      {
+        mysql_mutex_lock(&active_mi->data_lock);
+        if (rotate_relay_log(active_mi))
+          *write_to_binlog= -1;
+        mysql_mutex_unlock(&active_mi->data_lock);
+      }
+      mysql_mutex_unlock(&LOCK_active_mi);
 #endif
+    }
+    if (tmp_thd)
+    {
+      delete tmp_thd;
+      /* Remember that we don't have a THD */
+      my_pthread_setspecific_ptr(THR_THD,  0);
+      thd= 0;
+    }
   }
 #ifdef HAVE_QUERY_CACHE
   if (options & REFRESH_QUERY_CACHE_FREE)
diff -Nru percona-xtrabackup-2.2.3/sql/sql_resolver.cc percona-xtrabackup-2.3.7/sql/sql_resolver.cc
--- percona-xtrabackup-2.2.3/sql/sql_resolver.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_resolver.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -206,7 +206,7 @@
                          (having->fix_fields(thd, &having) ||
                           having->check_cols(1)));
     select_lex->having_fix_field= 0;
-    select_lex->having= having;
+    having_for_explain= select_lex->having= having;
 
     select_lex->resolve_place= st_select_lex::RESOLVE_NONE;
     if (having_fix_rc || thd->is_error())
@@ -1170,6 +1170,17 @@
   all_fields.push_front(order_item); /* Add new field to field list. */
   ref_pointer_array[el]= order_item;
   /*
+    If the order_item is a SUM_FUNC_ITEM, when fix_fields is called
+    ref_by is set to order->item which is the address of order_item.
+    But this needs to be address of order_item in the all_fields list.
+    As a result, when it gets replaced with Item_aggregate_ref
+    object in Item::split_sum_func2, we will be able to retrieve the
+    newly created object.
+  */
+  if (order_item->type() == Item::SUM_FUNC_ITEM)
+    ((Item_sum *)order_item)->ref_by= all_fields.head_ref();
+
+  /*
     Currently, we assume that this assertion holds. If it turns out
     that it fails for some query, order->item has changed and the old
     item is removed from the query. In that case, we must call walk()
diff -Nru percona-xtrabackup-2.2.3/sql/sql_select.cc percona-xtrabackup-2.3.7/sql/sql_select.cc
--- percona-xtrabackup-2.2.3/sql/sql_select.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_select.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/sql/sql_show.cc percona-xtrabackup-2.3.7/sql/sql_show.cc
--- percona-xtrabackup-2.2.3/sql/sql_show.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_show.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -1430,6 +1430,7 @@
   for (ptr=table->field ; (field= *ptr); ptr++)
   {
     uint flags = field->flags;
+    enum_field_types field_type= field->real_type();
 
     if (ptr != table->field)
       packet->append(STRING_WITH_LEN(",\n"));
@@ -1444,6 +1445,14 @@
       type.set_charset(system_charset_info);
 
     field->sql_type(type);
+    /*
+      If the session variable 'show_old_temporals' is enabled and the field
+      is a temporal type of old format, add a comment to indicate the same.
+    */
+    if (thd->variables.show_old_temporals &&
+        (field_type == MYSQL_TYPE_TIME || field_type == MYSQL_TYPE_DATETIME ||
+         field_type == MYSQL_TYPE_TIMESTAMP))
+      type.append(" /* 5.5 binary format */");
     packet->append(type.ptr(), type.length(), system_charset_info);
 
     if (field->has_charset() && 
@@ -2063,17 +2072,30 @@
 
   if (!thd->killed)
   {
-    mysql_mutex_lock(&LOCK_thread_count);
+    /* take copy of global_thread_list */
+    std::set<THD*> global_thread_list_copy;
+    DEBUG_SYNC(thd,"before_copying_threads");
+    /*
+      Allow inserts to global_thread_list. Newly added thd
+      will not be accounted for `show processlist` and
+      removal from global_thread_list is blocked as LOCK_thd_remove
+      mutex is not released yet
+     */
+    mysql_mutex_lock(&LOCK_thd_remove);
+    copy_global_thread_list(&global_thread_list_copy);
+
+    DEBUG_SYNC(thd,"after_copying_threads");
     thread_infos.reserve(get_thread_count());
-    Thread_iterator it= global_thread_list_begin();
-    Thread_iterator end= global_thread_list_end();
+    Thread_iterator it= global_thread_list_copy.begin();
+    Thread_iterator end= global_thread_list_copy.end();
     for (; it != end; ++it)
     {
       THD *tmp= *it;
       Security_context *tmp_sctx= tmp->security_ctx;
       struct st_my_thread_var *mysys_var;
       if ((tmp->vio_ok() || tmp->system_thread) &&
-          (!user || (tmp_sctx->user && !strcmp(tmp_sctx->user, user))))
+          (!user || (!tmp->system_thread && tmp_sctx->user &&
+                     !strcmp(tmp_sctx->user, user))))
       {
         thread_info *thd_info= new thread_info;
 
@@ -2094,6 +2116,12 @@
                                       tmp_sctx->get_host()->length() ?
                                       tmp_sctx->get_host()->ptr() : "");
         thd_info->command=(int) tmp->get_command();
+        DBUG_EXECUTE_IF("processlist_acquiring_dump_threads_LOCK_thd_data",
+                        {
+                         if (thd_info->command == COM_BINLOG_DUMP ||
+                             thd_info->command == COM_BINLOG_DUMP_GTID)
+                           DEBUG_SYNC(thd, "processlist_after_LOCK_thd_count_before_LOCK_thd_data");
+                        });
         mysql_mutex_lock(&tmp->LOCK_thd_data);
         if ((thd_info->db= tmp->db))             // Safe test
           thd_info->db= thd->strdup(thd_info->db);
@@ -2118,7 +2146,7 @@
         thread_infos.push_back(thd_info);
       }
     }
-    mysql_mutex_unlock(&LOCK_thread_count);
+    mysql_mutex_unlock(&LOCK_thd_remove);
   }
 
   // Return list sorted by thread_id.
@@ -2164,9 +2192,19 @@
 
   if (!thd->killed)
   {
-    mysql_mutex_lock(&LOCK_thread_count);
-    Thread_iterator it= global_thread_list_begin();
-    Thread_iterator end= global_thread_list_end();
+    /* take copy of global_thread_list */
+    std::set<THD*> global_thread_list_copy;
+    /*
+      Allow inserts to global_thread_list. Newly added thd
+      will not be accounted for `fill schema processlist` and
+      removal from global_thread_list is blocked as LOCK_thd_remove
+      mutex is not released yet
+     */
+    mysql_mutex_lock(&LOCK_thd_remove);
+    copy_global_thread_list(&global_thread_list_copy);
+
+    Thread_iterator it= global_thread_list_copy.begin();
+    Thread_iterator end= global_thread_list_copy.end();
     for (; it != end; ++it)
     {
       THD* tmp= *it;
@@ -2175,7 +2213,8 @@
       const char *val, *db;
 
       if ((!tmp->vio_ok() && !tmp->system_thread) ||
-          (user && (!tmp_sctx->user || strcmp(tmp_sctx->user, user))))
+          (user && (tmp->system_thread || !tmp_sctx->user ||
+                    strcmp(tmp_sctx->user, user))))
         continue;
 
       restore_record(table, s->default_values);
@@ -2198,6 +2237,12 @@
       else
         table->field[2]->store(tmp_sctx->host_or_ip,
                                strlen(tmp_sctx->host_or_ip), cs);
+      DBUG_EXECUTE_IF("processlist_acquiring_dump_threads_LOCK_thd_data",
+                      {
+                      if (tmp->get_command() == COM_BINLOG_DUMP ||
+                          tmp->get_command() == COM_BINLOG_DUMP_GTID)
+                      DEBUG_SYNC(thd, "processlist_after_LOCK_thd_count_before_LOCK_thd_data");
+                      });
       /* DB */
       mysql_mutex_lock(&tmp->LOCK_thd_data);
       if ((db= tmp->db))
@@ -2226,11 +2271,7 @@
 
       if (mysys_var)
         mysql_mutex_unlock(&mysys_var->mutex);
-      mysql_mutex_unlock(&tmp->LOCK_thd_data);
-
       /* INFO */
-      /* Lock THD mutex that protects its data when looking at it. */
-      mysql_mutex_lock(&tmp->LOCK_thd_data);
       if (tmp->query())
       {
         size_t const width=
@@ -2242,11 +2283,11 @@
 
       if (schema_table_store_record(thd, table))
       {
-        mysql_mutex_unlock(&LOCK_thread_count);
+        mysql_mutex_unlock(&LOCK_thd_remove);
         DBUG_RETURN(1);
       }
     }
-    mysql_mutex_unlock(&LOCK_thread_count);
+    mysql_mutex_unlock(&LOCK_thd_remove);
   }
 
   DBUG_RETURN(0);
@@ -2369,6 +2410,59 @@
   delete_dynamic(&all_status_vars);
 }
 
+/**
+  @brief           Get the value of given status variable
+
+  @param[in]       thd        thread handler
+  @param[in]       list       list of SHOW_VAR objects in which function should
+                              search
+  @param[in]       name       name of the status variable
+  @param[in/out]   value      buffer in which value of the status variable
+                              needs to be filled in
+
+  @return          status
+    @retval        FALSE      if variable is not found in the list
+    @retval        TRUE       if variable is found in the list
+  NOTE: Currently this function is implemented just to support 'bool' status
+  variables and 'long' status variables *only*. It can be extended very easily
+  for further show_types in future if required.
+  TODO: Currently show_status_arary switch case is tightly coupled with
+  pos, end, buff, value variables and also it stores the values in a 'table'.
+  Decouple the switch case to fill the buffer value so that it can be used
+  in show_status_array() and get_status_var() to avoid duplicate code.
+ */
+
+bool get_status_var(THD* thd, SHOW_VAR *list, const char * name, char * const value)
+{
+  for (; list->name; list++)
+  {
+    int res= strcmp(list->name, name);
+    if (res == 0)
+    {
+      /*
+        if var->type is SHOW_FUNC, call the function.
+        Repeat as necessary, if new var is again SHOW_FUNC
+      */
+      SHOW_VAR tmp;
+      for (; list->type == SHOW_FUNC; list= &tmp)
+        ((mysql_show_var_func)(list->value))(thd, &tmp, value);
+      switch (list->type) {
+      case SHOW_BOOL:
+        strmov(value, *(bool*) list->value ? "ON" : "OFF");
+        break;
+      case SHOW_LONG:
+        int10_to_str(*(long*) list->value, value, 10);
+        break;
+      default:
+        /* not supported type */
+        DBUG_ASSERT(0);
+      }
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
 /*
   Removes an array of SHOW_VAR entries from the output of SHOW STATUS
 
@@ -2647,10 +2741,38 @@
 /* This is only used internally, but we need it here as a forward reference */
 extern ST_SCHEMA_TABLE schema_tables[];
 
+/**
+  Condition pushdown used for INFORMATION_SCHEMA / SHOW queries.
+  This structure is to implement an optimization when
+  accessing data dictionary data in the INFORMATION_SCHEMA
+  or SHOW commands.
+  When the query contain a TABLE_SCHEMA or TABLE_NAME clause,
+  narrow the search for data based on the constraints given.
+*/
 typedef struct st_lookup_field_values
 {
-  LEX_STRING db_value, table_value;
-  bool wild_db_value, wild_table_value;
+  /**
+    Value of a TABLE_SCHEMA clause.
+    Note that this value length may exceed @c NAME_LEN.
+    @sa wild_db_value
+  */
+  LEX_STRING db_value;
+  /**
+    Value of a TABLE_NAME clause.
+    Note that this value length may exceed @c NAME_LEN.
+    @sa wild_table_value
+  */
+  LEX_STRING table_value;
+  /**
+    True when @c db_value is a LIKE clause,
+    false when @c db_value is an '=' clause.
+  */
+  bool wild_db_value;
+  /**
+    True when @c table_value is a LIKE clause,
+    false when @c table_value is an '=' clause.
+  */
+  bool wild_table_value;
 } LOOKUP_FIELD_VALUES;
 
 
@@ -3055,14 +3177,22 @@
 
 
   /*
-    If we have db lookup vaule we just add it to list and
+    If we have db lookup value we just add it to list and
     exit from the function.
     We don't do this for database names longer than the maximum
-    path length.
+    name length.
   */
-  if (lookup_field_vals->db_value.str && 
-      lookup_field_vals->db_value.length < FN_REFLEN)
+  if (lookup_field_vals->db_value.str)
   {
+    if (lookup_field_vals->db_value.length > NAME_LEN)
+    {
+      /*
+        Impossible value for a database name,
+        found in a WHERE DATABASE_NAME = 'xxx' clause.
+      */
+      return 0;
+    }
+
     if (is_infoschema_db(lookup_field_vals->db_value.str,
                          lookup_field_vals->db_value.length))
     {
@@ -3199,6 +3329,15 @@
   if (!lookup_field_vals->wild_table_value &&
       lookup_field_vals->table_value.str)
   {
+    if (lookup_field_vals->table_value.length > NAME_LEN)
+    {
+      /*
+        Impossible value for a table name,
+        found in a WHERE TABLE_NAME = 'xxx' clause.
+      */
+      return 0;
+    }
+
     if (with_i_schema)
     {
       LEX_STRING *name;
@@ -3672,6 +3811,9 @@
   memset(&table_list, 0, sizeof(TABLE_LIST));
   memset(&tbl, 0, sizeof(TABLE));
 
+  DBUG_ASSERT(db_name->length <= NAME_LEN);
+  DBUG_ASSERT(table_name->length <= NAME_LEN);
+
   if (lower_case_table_names)
   {
     /*
@@ -3998,6 +4140,7 @@
   it.rewind(); /* To get access to new elements in basis list */
   while ((db_name= it++))
   {
+    DBUG_ASSERT(db_name->length <= NAME_LEN);
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
     if (!(check_access(thd, SELECT_ACL, db_name->str,
                        &thd->col_access, NULL, 0, 1) ||
@@ -4019,6 +4162,7 @@
       List_iterator_fast<LEX_STRING> it_files(table_names);
       while ((table_name= it_files++))
       {
+        DBUG_ASSERT(table_name->length <= NAME_LEN);
 	restore_record(table, s->default_values);
         table->field[schema_table->idx_field1]->
           store(db_name->str, db_name->length, system_charset_info);
@@ -4165,6 +4309,7 @@
   List_iterator_fast<LEX_STRING> it(db_names);
   while ((db_name=it++))
   {
+    DBUG_ASSERT(db_name->length <= NAME_LEN);
     if (with_i_schema)       // information schema name is always first in list
     {
       if (store_schema_shemata(thd, table, db_name,
@@ -4460,16 +4605,16 @@
   @brief    Store field characteristics into appropriate I_S table columns
             starting from DATA_TYPE column till DTD_IDENTIFIER column.
 
+  @param[in]      thd               Thread context.
   @param[in]      table             I_S table
   @param[in]      field             processed field
   @param[in]      cs                I_S table charset
   @param[in]      offset            offset from beginning of table
                                     to DATE_TYPE column in I_S table
-                                    
   @return         void
 */
 
-void store_column_type(TABLE *table, Field *field, CHARSET_INFO *cs,
+void store_column_type(THD *thd, TABLE *table, Field *field, CHARSET_INFO *cs,
                        uint offset)
 {
   bool is_blob;
@@ -4477,10 +4622,25 @@
   const char *tmp_buff;
   char column_type_buff[MAX_FIELD_WIDTH];
   String column_type(column_type_buff, sizeof(column_type_buff), cs);
+  enum_field_types field_type= field->real_type();
+  uint32 orig_column_type_length;
 
   field->sql_type(column_type);
+  orig_column_type_length= column_type.length();
+
+  /*
+    If the session variable 'show_old_temporals' is enabled and the field
+    is a temporal type of old format, add a comment to the COLUMN_TYPE
+    indicate the same.
+  */
+  if (thd->variables.show_old_temporals &&
+      (field_type == MYSQL_TYPE_TIME || field_type == MYSQL_TYPE_DATETIME ||
+       field_type == MYSQL_TYPE_TIMESTAMP))
+    column_type.append(" /* 5.5 binary format */");
+
   /* DTD_IDENTIFIER column */
   table->field[offset + 8]->store(column_type.ptr(), column_type.length(), cs);
+  column_type.length(orig_column_type_length);
   table->field[offset + 8]->set_notnull();
   /*
     DATA_TYPE column:
@@ -4685,7 +4845,7 @@
     pos=(uchar*) ((field->flags & NOT_NULL_FLAG) ?  "NO" : "YES");
     table->field[IS_COLUMNS_IS_NULLABLE]->store((const char*) pos,
                            strlen((const char*) pos), cs);
-    store_column_type(table, field, cs, IS_COLUMNS_DATA_TYPE);
+    store_column_type(thd, table, field, cs, IS_COLUMNS_DATA_TYPE);
     pos=(uchar*) ((field->flags & PRI_KEY_FLAG) ? "PRI" :
                  (field->flags & UNIQUE_KEY_FLAG) ? "UNI" :
                  (field->flags & MULTIPLE_KEY_FLAG) ? "MUL":"");
@@ -5000,7 +5160,7 @@
 
       field->table= &tbl;
       tbl.in_use= thd;
-      store_column_type(table, field, cs, IS_PARAMETERS_DATA_TYPE);
+      store_column_type(thd, table, field, cs, IS_PARAMETERS_DATA_TYPE);
       if (schema_table_store_record(thd, table))
       {
         free_table_share(&share);
@@ -5060,7 +5220,7 @@
 
       field->table= &tbl;
       tbl.in_use= thd;
-      store_column_type(table, field, cs, IS_PARAMETERS_DATA_TYPE);
+      store_column_type(thd, table, field, cs, IS_PARAMETERS_DATA_TYPE);
       if (schema_table_store_record(thd, table))
       {
         free_table_share(&share);
@@ -5160,7 +5320,7 @@
 
           field->table= &tbl;
           tbl.in_use= thd;
-          store_column_type(table, field, cs, IS_ROUTINES_DATA_TYPE);
+          store_column_type(thd, table, field, cs, IS_ROUTINES_DATA_TYPE);
           free_table_share(&share);
           if (free_sp_head)
             delete sp;
@@ -6453,6 +6613,7 @@
 int fill_variables(THD *thd, TABLE_LIST *tables, Item *cond)
 {
   DBUG_ENTER("fill_variables");
+  SHOW_VAR *sys_var_array;
   int res= 0;
   LEX *lex= thd->lex;
   const char *wild= lex->wild ? lex->wild->ptr() : NullS;
@@ -6466,10 +6627,21 @@
       schema_table_idx == SCH_GLOBAL_VARIABLES)
     option_type= OPT_GLOBAL;
 
+  /*
+    Lock LOCK_plugin_delete to avoid deletion of any plugins while creating
+    SHOW_VAR array and hold it until all variables are stored in the table.
+  */
+  mysql_mutex_lock(&LOCK_plugin_delete);
+  // Lock LOCK_system_variables_hash to prepare SHOW_VARs array.
   mysql_rwlock_rdlock(&LOCK_system_variables_hash);
-  res= show_status_array(thd, wild, enumerate_sys_vars(thd, sorted_vars, option_type),
-                         option_type, NULL, "", tables->table, upper_case_names, cond);
+  DEBUG_SYNC(thd, "acquired_LOCK_system_variables_hash");
+  sys_var_array= enumerate_sys_vars(thd, sorted_vars, option_type);
   mysql_rwlock_unlock(&LOCK_system_variables_hash);
+
+  res= show_status_array(thd, wild, sys_var_array, option_type, NULL, "",
+                         tables->table, upper_case_names, cond);
+
+  mysql_mutex_unlock(&LOCK_plugin_delete);
   DBUG_RETURN(res);
 }
 
diff -Nru percona-xtrabackup-2.2.3/sql/sql_show.h percona-xtrabackup-2.3.7/sql/sql_show.h
--- percona-xtrabackup-2.2.3/sql/sql_show.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_show.h	2017-02-27 07:47:02.000000000 +0000
@@ -188,6 +188,7 @@
 void remove_status_vars(SHOW_VAR *list);
 void init_status_vars();
 void free_status_vars();
+bool get_status_var(THD* thd, SHOW_VAR *list, const char *name, char * const buff);
 void reset_status_vars();
 bool show_create_trigger(THD *thd, const sp_name *trg_name);
 void view_store_options(THD *thd, TABLE_LIST *table, String *buff);
diff -Nru percona-xtrabackup-2.2.3/sql/sql_signal.cc percona-xtrabackup-2.3.7/sql/sql_signal.cc
--- percona-xtrabackup-2.2.3/sql/sql_signal.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_signal.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -61,21 +61,6 @@
   { C_STRING_WITH_LEN("TRIGGER_SCHEMA") }
 };
 
-const LEX_STRING Diag_statement_item_names[]=
-{
-  { C_STRING_WITH_LEN("NUMBER") },
-  { C_STRING_WITH_LEN("MORE") },
-  { C_STRING_WITH_LEN("COMMAND_FUNCTION") },
-  { C_STRING_WITH_LEN("COMMAND_FUNCTION_CODE") },
-  { C_STRING_WITH_LEN("DYNAMIC_FUNCTION") },
-  { C_STRING_WITH_LEN("DYNAMIC_FUNCTION_CODE") },
-  { C_STRING_WITH_LEN("ROW_COUNT") },
-  { C_STRING_WITH_LEN("TRANSACTIONS_COMMITTED") },
-  { C_STRING_WITH_LEN("TRANSACTIONS_ROLLED_BACK") },
-  { C_STRING_WITH_LEN("TRANSACTION_ACTIVE") }
-};
-
-
 Set_signal_information::Set_signal_information(
   const Set_signal_information& set)
 {
diff -Nru percona-xtrabackup-2.2.3/sql/sql_string.cc percona-xtrabackup-2.3.7/sql/sql_string.cc
--- percona-xtrabackup-2.2.3/sql/sql_string.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_string.cc	2017-02-27 07:47:02.000000000 +0000
@@ -226,6 +226,42 @@
 
 
 /*
+  Checks that the source string can just be copied to the destination string
+  without conversion.
+  Unlike needs_conversion it will require conversion on incoming binary data
+  to ensure the data are verified for vailidity first.
+
+  @param arg_length   Length of string to copy.
+  @param from_cs      Character set to copy from
+  @param to_cs        Character set to copy to
+
+  @return conversion needed
+*/
+bool String::needs_conversion_on_storage(uint32 arg_length,
+                                         const CHARSET_INFO *cs_from,
+                                         const CHARSET_INFO *cs_to)
+{
+  uint32 offset;
+  return (needs_conversion(arg_length, cs_from, cs_to, &offset) ||
+          /* force conversion when storing a binary string */
+          (cs_from == &my_charset_bin &&
+          /* into a non-binary destination */
+           cs_to != &my_charset_bin &&
+           /* and any of the following is true :*/
+           (
+            /* it's a variable length encoding */
+            cs_to->mbminlen != cs_to->mbmaxlen ||
+            /* longer than 2 bytes : neither 1 byte nor ucs2 */
+            cs_to->mbminlen > 2 ||
+            /* and is not a multiple of the char byte size */
+            0 != (arg_length % cs_to->mbmaxlen)
+           )
+          )
+         );
+}
+
+
+/*
   Copy a multi-byte character sets with adding leading zeros.
 
   SYNOPSIS
diff -Nru percona-xtrabackup-2.2.3/sql/sql_string.h percona-xtrabackup-2.3.7/sql/sql_string.h
--- percona-xtrabackup-2.2.3/sql/sql_string.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_string.h	2017-02-27 07:47:02.000000000 +0000
@@ -392,6 +392,9 @@
   static bool needs_conversion(uint32 arg_length,
   			       const CHARSET_INFO *cs_from, const CHARSET_INFO *cs_to,
 			       uint32 *offset);
+  static bool needs_conversion_on_storage(uint32 arg_length,
+                                          const CHARSET_INFO *cs_from,
+                                          const CHARSET_INFO *cs_to);
   bool copy_aligned(const char *s, uint32 arg_length, uint32 offset,
 		    const CHARSET_INFO *cs);
   bool set_or_copy_aligned(const char *s, uint32 arg_length,
diff -Nru percona-xtrabackup-2.2.3/sql/sql_table.cc percona-xtrabackup-2.3.7/sql/sql_table.cc
--- percona-xtrabackup-2.2.3/sql/sql_table.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_table.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -1851,6 +1851,7 @@
 #ifdef WITH_PARTITION_STORAGE_ENGINE
   char *part_syntax_buf;
   uint syntax_len;
+  partition_info *old_part_info= lpt->table->part_info;
 #endif
   DBUG_ENTER("mysql_write_frm");
 
@@ -1874,7 +1875,7 @@
     }
 #ifdef WITH_PARTITION_STORAGE_ENGINE
     {
-      partition_info *part_info= lpt->table->part_info;
+      partition_info *part_info= lpt->part_info;
       if (part_info)
       {
         if (!(part_syntax_buf= generate_partition_syntax(part_info,
@@ -1888,6 +1889,7 @@
         }
         part_info->part_info_string= part_syntax_buf;
         part_info->part_info_len= syntax_len;
+        lpt->table->file->set_part_info(part_info, false);
       }
     }
 #endif
@@ -1931,6 +1933,10 @@
   {
 #ifdef WITH_PARTITION_STORAGE_ENGINE
     partition_info *part_info= lpt->part_info;
+    if (part_info)
+    {
+      lpt->table->file->set_part_info(part_info, false);
+    }
 #endif
     /*
       Build frm file name
@@ -2011,6 +2017,10 @@
   }
 
 end:
+  if (old_part_info)
+  {
+    lpt->table->file->set_part_info(old_part_info, false);
+  }
   DBUG_RETURN(error);
 }
 
@@ -2082,6 +2092,12 @@
   bool error;
   Drop_table_error_handler err_handler;
   TABLE_LIST *table;
+  /*
+    The following flags will be used to check if this statement will be split
+  */
+  uint have_non_tmp_table= 0;
+  uint have_trans_tmp_table= 0;
+  uint have_non_trans_tmp_table= 0;
 
   DBUG_ENTER("mysql_rm_table");
 
@@ -2094,6 +2110,17 @@
       my_error(ER_BAD_LOG_STATEMENT, MYF(0), "DROP");
       DBUG_RETURN(true);
     }
+    /*
+      Here we are sure that the tmp table exists and will set the flag based on
+      table transactional type.
+    */
+    if (is_temporary_table(table))
+    {
+      if (table->table->s->tmp_table == TRANSACTIONAL_TMP_TABLE)
+        have_trans_tmp_table= 1;
+      else if (table->table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)
+        have_non_trans_tmp_table= 1;
+    }
   }
 
   if (!drop_temporary)
@@ -2110,6 +2137,8 @@
 
         tdc_remove_table(thd, TDC_RT_REMOVE_ALL, table->db, table->table_name,
                          false);
+        /* Here we are sure that a non-tmp table exists */
+        have_non_tmp_table= 1;
       }
     }
     else
@@ -2146,10 +2175,31 @@
           if (!table->table)
             DBUG_RETURN(true);
           table->mdl_request.ticket= table->table->mdl_ticket;
+          /* Here we are sure that a non-tmp table exists */
+          have_non_tmp_table= 1;
         }
     }
   }
 
+  /*
+    DROP TABLE statements mixing non-temporary and temporary tables or
+    transactional and non-transactional temporary tables are unsafe to execute
+    if GTID_NEXT is set to GTID_GROUP because these statements will be split to
+    be sent to binlog and there is only one GTID is available to log multiple
+    statements.
+    See comments in the beginning of mysql_rm_table_no_locks() for more info.
+  */
+  if (thd->variables.gtid_next.type == GTID_GROUP &&
+      (have_non_tmp_table + have_trans_tmp_table +
+       have_non_trans_tmp_table > 1))
+  {
+    DBUG_PRINT("err",("have_non_tmp_table: %d, have_trans_tmp_table: %d, "
+                      "have_non_trans_tmp_table: %d", have_non_tmp_table,
+                      have_trans_tmp_table, have_non_trans_tmp_table));
+    my_error(ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP, MYF(0));
+    DBUG_RETURN(true);
+  }
+
   /* mark for close and remove all cached entries */
   thd->push_internal_handler(&err_handler);
   error= mysql_rm_table_no_locks(thd, tables, if_exists, drop_temporary,
@@ -2208,9 +2258,11 @@
   bool non_tmp_error= 0;
   bool trans_tmp_table_deleted= 0, non_trans_tmp_table_deleted= 0;
   bool non_tmp_table_deleted= 0;
+  bool have_nonexistent_tmp_table= 0;
   bool is_drop_tmp_if_exists_added= 0;
   String built_query;
   String built_trans_tmp_query, built_non_trans_tmp_query;
+  String nonexistent_tmp_tables;
   DBUG_ENTER("mysql_rm_table_no_locks");
 
   /*
@@ -2273,6 +2325,7 @@
       built_non_trans_tmp_query.set_charset(system_charset_info);
       built_non_trans_tmp_query.append("DROP TEMPORARY TABLE ");
     }
+    nonexistent_tmp_tables.set_charset(system_charset_info);
   }
 
   for (table= tables; table; table= table->next_local)
@@ -2329,16 +2382,18 @@
       {
         /*
           If there is an error, we don't know the type of the engine
-          at this point. So, we keep it in the trx-cache.
+          at this point. So, we keep it in the nonexistent_tmp_table list.
         */
-        is_trans= error ? TRUE : is_trans;
-        if (is_trans)
+        if (error == 1)
+          have_nonexistent_tmp_table= true;
+        else if (is_trans)
           trans_tmp_table_deleted= TRUE;
         else
           non_trans_tmp_table_deleted= TRUE;
 
         String *built_ptr_query=
-          (is_trans ? &built_trans_tmp_query : &built_non_trans_tmp_query);
+          (error == 1 ? &nonexistent_tmp_tables :
+           (is_trans ? &built_trans_tmp_query : &built_non_trans_tmp_query));
         /*
           Write the database name if it is not the current one or if
           thd->db is NULL or 'IF EXISTS' clause is present in 'DROP TEMPORARY'
@@ -2544,74 +2599,105 @@
     error= 1;
   }
 
-  if (non_trans_tmp_table_deleted ||
+  if (have_nonexistent_tmp_table || non_trans_tmp_table_deleted ||
       trans_tmp_table_deleted || non_tmp_table_deleted)
   {
     query_cache_invalidate3(thd, tables, 0);
 
-    if (non_trans_tmp_table_deleted ||
+    if (have_nonexistent_tmp_table || non_trans_tmp_table_deleted ||
         trans_tmp_table_deleted)
       thd->transaction.stmt.mark_dropped_temp_table();
 
+    /*
+      The statement may contain up to three types of temporary tables:
+      transactional, non-transactional, and non-existent tables.
+
+      The statement is logged using up to two statements: non-transactional
+      and transactional tables are logged in different statements.
+
+      The non-existing tables are logged together with transactional ones, if
+      any transactional tables exist or if there is only non-existing tables;
+      otherwise are logged together with non-transactional ones.
+
+      This logic ensures that:
+      - On master, transactional and non-transactional tables are written to
+        different statements.
+      - Therefore, slave will never see statements containing both transactional
+        and non-transactional tables.
+      - Since non-existing temporary tables are logged together with whatever
+        type of temporary tables that exist, the slave thus writes any statement
+        as just one statement. I.e., the slave never splits a statement into two.
+        This is crucial when GTIDs are enabled, since otherwise the statement,
+        which already has a GTID, would need two different GTIDs.
+    */
     if (!dont_log_query && mysql_bin_log.is_open())
     {
       if (non_trans_tmp_table_deleted)
       {
-          /* Chop of the last comma */
-          built_non_trans_tmp_query.chop();
-          built_non_trans_tmp_query.append(" /* generated by server */");
-          error |= thd->binlog_query(THD::STMT_QUERY_TYPE,
-                                     built_non_trans_tmp_query.ptr(),
-                                     built_non_trans_tmp_query.length(),
-                                     FALSE, FALSE,
-                                     is_drop_tmp_if_exists_added,
-                                     0);
-          /*
-            When temporary and regular tables or temporary tables with
-            different storage engines are dropped on a single
-            statement, the original statement is split in two.
-            These two statements are logged in two events to binary
-            logs, when gtid_mode is ON each DDL event must have its own
-            GTID. Since drop temporary table does not implicitly
-            commit, in these cases we must force a commit.
-          */
-          if (gtid_mode > 0 && (trans_tmp_table_deleted || non_tmp_table_deleted))
-            error |= mysql_bin_log.commit(thd, true);
+        /*
+          Add the list of nonexistent tmp tables here only if there is no
+          trans tmp table deleted.
+        */
+        if (!trans_tmp_table_deleted && have_nonexistent_tmp_table)
+          built_non_trans_tmp_query.append(nonexistent_tmp_tables);
+        /* Chop of the last comma */
+        built_non_trans_tmp_query.chop();
+        built_non_trans_tmp_query.append(" /* generated by server */");
+        error |= thd->binlog_query(THD::STMT_QUERY_TYPE,
+                                   built_non_trans_tmp_query.ptr(),
+                                   built_non_trans_tmp_query.length(),
+                                   FALSE, FALSE,
+                                   is_drop_tmp_if_exists_added,
+                                   0);
+        /*
+          When temporary and regular tables or temporary tables with
+          different storage engines are dropped on a single
+          statement, the original statement is split in two or more.
+          These statements are logged in distinct events to binary
+          logs, when gtid_mode is ON each DDL event must have its own
+          GTID. Since drop temporary table does not implicitly
+          commit, in these cases we must force a commit.
+        */
+        if (gtid_mode > 0 && (trans_tmp_table_deleted || non_tmp_table_deleted))
+          error |= mysql_bin_log.commit(thd, true);
       }
-      if (trans_tmp_table_deleted)
+      if (trans_tmp_table_deleted ||
+          (have_nonexistent_tmp_table && !non_trans_tmp_table_deleted))
       {
-          /* Chop of the last comma */
-          built_trans_tmp_query.chop();
-          built_trans_tmp_query.append(" /* generated by server */");
-          error |= thd->binlog_query(THD::STMT_QUERY_TYPE,
-                                     built_trans_tmp_query.ptr(),
-                                     built_trans_tmp_query.length(),
-                                     TRUE, FALSE,
-                                     is_drop_tmp_if_exists_added,
-                                     0);
-          /*
-            When temporary and regular tables are dropped on a single
-            statement, the original statement is split in two.
-            These two statements are logged in two events to binary
-            logs, when gtid_mode is ON each DDL event must have its own
-            GTID. Since drop temporary table does not implicitly
-            commit, in these cases we must force a commit.
-          */
-          if (gtid_mode > 0 && non_tmp_table_deleted)
-            error |= mysql_bin_log.commit(thd, true);
+        if (have_nonexistent_tmp_table)
+          built_trans_tmp_query.append(nonexistent_tmp_tables);
+        /* Chop of the last comma */
+        built_trans_tmp_query.chop();
+        built_trans_tmp_query.append(" /* generated by server */");
+        error |= thd->binlog_query(THD::STMT_QUERY_TYPE,
+                                   built_trans_tmp_query.ptr(),
+                                   built_trans_tmp_query.length(),
+                                   TRUE, FALSE,
+                                   is_drop_tmp_if_exists_added,
+                                   0);
+        /*
+          When temporary and regular tables are dropped on a single
+          statement, the original statement is split in two or more.
+          These statements are logged in distinct events to binary
+          logs, when gtid_mode is ON each DDL event must have its own
+          GTID. Since drop temporary table does not implicitly
+          commit, in these cases we must force a commit.
+        */
+        if (gtid_mode > 0 && non_tmp_table_deleted)
+          error |= mysql_bin_log.commit(thd, true);
       }
       if (non_tmp_table_deleted)
       {
-          /* Chop of the last comma */
-          built_query.chop();
-          built_query.append(" /* generated by server */");
-          int error_code = (non_tmp_error ?
-            (foreign_key_error ? ER_ROW_IS_REFERENCED : ER_BAD_TABLE_ERROR) : 0);
-          error |= thd->binlog_query(THD::STMT_QUERY_TYPE,
-                                     built_query.ptr(),
-                                     built_query.length(),
-                                     TRUE, FALSE, FALSE,
-                                     error_code);
+        /* Chop of the last comma */
+        built_query.chop();
+        built_query.append(" /* generated by server */");
+        int error_code = (non_tmp_error ?
+          (foreign_key_error ? ER_ROW_IS_REFERENCED : ER_BAD_TABLE_ERROR) : 0);
+        error |= thd->binlog_query(THD::STMT_QUERY_TYPE,
+                                   built_query.ptr(),
+                                   built_query.length(),
+                                   TRUE, FALSE, FALSE,
+                                   error_code);
       }
     }
   }
@@ -3928,7 +4014,7 @@
 	  }
           if (f_is_geom(sql_field->pack_flag) && sql_field->geom_type ==
               Field::GEOM_POINT)
-            column->length= 25;
+            column->length= MAX_LEN_GEOM_POINT_FIELD;
 	  if (!column->length)
 	  {
 	    my_error(ER_BLOB_KEY_WITHOUT_LENGTH, MYF(0), column->field_name.str);
@@ -5702,9 +5788,21 @@
         ha_alter_info->handler_flags|= Alter_inplace_info::ALTER_COLUMN_TYPE;
       }
 
+      bool field_renamed;
+      /*
+        InnoDB data dictionary is case sensitive so we should use
+        string case sensitive comparison between fields.
+        Note: strcmp branch is to be removed in future when we fix it
+        in InnoDB.
+      */
+      if (ha_alter_info->create_info->db_type->db_type == DB_TYPE_INNODB)
+        field_renamed= strcmp(field->field_name, new_field->field_name);
+      else
+	field_renamed= my_strcasecmp(system_charset_info, field->field_name,
+                                     new_field->field_name);
+
       /* Check if field was renamed */
-      if (my_strcasecmp(system_charset_info, field->field_name,
-                        new_field->field_name))
+      if (field_renamed)
       {
         field->flags|= FIELD_IS_RENAMED;
         ha_alter_info->handler_flags|= Alter_inplace_info::ALTER_COLUMN_NAME;
@@ -6866,6 +6964,10 @@
   if (create_info->storage_media == HA_SM_DEFAULT)
     create_info->storage_media= table->s->default_storage_media;
 
+  /* Creation of federated table with LIKE clause needs connection string */
+  if (!(used_fields & HA_CREATE_USED_CONNECTION))
+    create_info->connect_string= table->s->connect_string;
+
   restore_record(table, s->default_values);     // Empty record for DEFAULT
   Create_field *def;
 
@@ -7921,6 +8023,18 @@
   }
 
   /*
+   If foreign key is added then check permission to access parent table.
+
+   In function "check_fk_parent_table_access", create_info->db_type is used
+   to identify whether engine supports FK constraint or not. Since
+   create_info->db_type is set here, check to parent table access is delayed
+   till this point for the alter operation.
+  */
+  if ((alter_info->flags & Alter_info::ADD_FOREIGN_KEY) &&
+      check_fk_parent_table_access(thd, create_info, alter_info))
+    DBUG_RETURN(true);
+
+  /*
    If this is an ALTER TABLE and no explicit row type specified reuse
    the table's row type.
    Note : this is the same as if the row type was specified explicitly.
@@ -7971,11 +8085,11 @@
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE
   bool partition_changed= false;
-  bool fast_alter_partition= false;
+  partition_info *new_part_info= NULL;
   {
     if (prep_alter_part_table(thd, table, alter_info, create_info,
                               &alter_ctx, &partition_changed,
-                              &fast_alter_partition))
+                              &new_part_info))
     {
       DBUG_RETURN(true);
     }
@@ -7991,7 +8105,7 @@
   set_table_default_charset(thd, create_info, alter_ctx.db);
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE
-  if (fast_alter_partition)
+  if (new_part_info)
   {
     /*
       ALGORITHM and LOCK clauses are generally not allowed by the
@@ -8033,7 +8147,8 @@
     DBUG_RETURN(fast_alter_partition_table(thd, table, alter_info,
                                            create_info, table_list,
                                            alter_ctx.db,
-                                           alter_ctx.table_name));
+                                           alter_ctx.table_name,
+                                           new_part_info));
   }
 #endif
 
@@ -8067,8 +8182,21 @@
     alter_info->requested_algorithm= Alter_info::ALTER_TABLE_ALGORITHM_COPY;
   }
 
-  if (upgrade_old_temporal_types(thd, alter_info))
-    DBUG_RETURN(true);
+  /*
+    If 'avoid_temporal_upgrade' mode is not enabled, then the
+    pre MySQL 5.6.4 old temporal types if present is upgraded to the
+    current format.
+  */
+
+  mysql_mutex_lock(&LOCK_global_system_variables);
+  bool check_temporal_upgrade= !avoid_temporal_upgrade;
+  mysql_mutex_unlock(&LOCK_global_system_variables);
+
+  if (check_temporal_upgrade)
+  {
+    if (upgrade_old_temporal_types(thd, alter_info))
+      DBUG_RETURN(true);
+  }
 
   /*
     ALTER TABLE ... ENGINE to the same engine is a common way to
diff -Nru percona-xtrabackup-2.2.3/sql/sql_table.h percona-xtrabackup-2.3.7/sql/sql_table.h
--- percona-xtrabackup-2.2.3/sql/sql_table.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_table.h	2017-02-27 07:47:02.000000000 +0000
@@ -118,6 +118,9 @@
   EXPLAIN_PARTITIONS_AS_COMMENT
 };
 
+/* Maximum length of GEOM_POINT Field */
+#define MAX_LEN_GEOM_POINT_FIELD   25
+
 /* depends on errmsg.txt Database `db`, Table `t` ... */
 #define EXPLAIN_FILENAME_MAX_EXTRA_LENGTH 63
 
diff -Nru percona-xtrabackup-2.2.3/sql/sql_tmp_table.cc percona-xtrabackup-2.3.7/sql/sql_tmp_table.cc
--- percona-xtrabackup-2.2.3/sql/sql_tmp_table.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_tmp_table.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2014, 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
@@ -648,6 +648,8 @@
           goto update_hidden;
         }
       }
+      if (item->const_item() && (int) hidden_field_count <= 0)
+        continue; // We don't have to store this
     }
     if (type == Item::SUM_FUNC_ITEM && !group && !save_sum_fields)
     {						/* Can't calc group yet */
@@ -1153,8 +1155,6 @@
 err:
   thd->mem_root= mem_root_save;
   free_tmp_table(thd,table);                    /* purecov: inspected */
-  if (temp_pool_slot != MY_BIT_NONE)
-    bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
   DBUG_RETURN(NULL);				/* purecov: inspected */
 }
 
@@ -1452,8 +1452,6 @@
 err:
   thd->mem_root= mem_root_save;
   free_tmp_table(thd,table);                    /* purecov: inspected */
-  if (temp_pool_slot != MY_BIT_NONE)
-    bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
   DBUG_RETURN(NULL);				/* purecov: inspected */
 }
 
@@ -1757,6 +1755,17 @@
                        )))
   {
     table->file->print_error(error,MYF(0));	/* purecov: inspected */
+    /*
+      Table name which was allocated from temp-pool is already occupied
+      in SE. Probably we hit a bug in server or some problem with system
+      configuration. Prevent problem from re-occurring by marking temp-pool
+      slot for this name as permanently busy, to do this we only need to set
+      TABLE::temp_pool_slot to MY_BIT_NONE in order to avoid freeing it
+      in free_tmp_table().
+    */
+    if (error == EEXIST)
+      table->temp_pool_slot= MY_BIT_NONE;
+
     table->db_stat=0;
     goto err;
   }
@@ -1831,8 +1840,12 @@
     // Make empty record so random data is not written to disk
     empty_record(table);
   }
+
   if (open_tmp_table(table))
+  {
+    table->file->ha_delete_table(table->s->table_name.str);
     return TRUE;
+  }
 
   if (unlikely(trace->is_started()))
   {
diff -Nru percona-xtrabackup-2.2.3/sql/sql_tmp_table.h percona-xtrabackup-2.3.7/sql/sql_tmp_table.h
--- percona-xtrabackup-2.2.3/sql/sql_tmp_table.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_tmp_table.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_TMP_TABLE_INCLUDED
 #define SQL_TMP_TABLE_INCLUDED
 
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/sql/sql_trigger.cc percona-xtrabackup-2.3.7/sql/sql_trigger.cc
--- percona-xtrabackup-2.2.3/sql/sql_trigger.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_trigger.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2015, 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
@@ -735,18 +735,24 @@
   */
   old_field= new_field= table->field;
 
-  for (Item_trigger_field *trg_field= lex->sphead->m_trg_table_fields.first;
-       trg_field; trg_field= trg_field->next_trg_field)
+  for (SQL_I_List<Item_trigger_field> *trig_field_list=
+         lex->sphead->m_list_of_trig_fields_item_lists.first;
+      trig_field_list;
+      trig_field_list= trig_field_list->first->next_trig_field_list)
   {
-    /*
-      NOTE: now we do not check privileges at CREATE TRIGGER time. This will
-      be changed in the future.
-    */
-    trg_field->setup_field(thd, table, NULL);
+    for (Item_trigger_field *trg_field= trig_field_list->first;
+         trg_field; trg_field= trg_field->next_trg_field)
+    {
+      /*
+        NOTE: now we do not check privileges at CREATE TRIGGER time. This will
+        be changed in the future.
+      */
+      trg_field->setup_field(thd, table, NULL);
 
-    if (!trg_field->fixed &&
-        trg_field->fix_fields(thd, (Item **)0))
-      return 1;
+      if (!trg_field->fixed &&
+          trg_field->fix_fields(thd, (Item **)0))
+        return 1;
+    }
   }
 
   /*
@@ -1168,6 +1174,7 @@
   LEX_STRING path;
   File_parser *parser;
   LEX_STRING save_db;
+  sql_digest_state *parent_digest= thd->m_digest;
   PSI_statement_locker *parent_locker= thd->m_statement_psi;
 
   DBUG_ENTER("Table_triggers_list::check_n_load");
@@ -1404,8 +1411,10 @@
 
         Deprecated_trigger_syntax_handler error_handler;
         thd->push_internal_handler(&error_handler);
+        thd->m_digest= NULL;
         thd->m_statement_psi= NULL;
         bool parse_error= parse_sql(thd, & parser_state, creation_ctx);
+        thd->m_digest= parent_digest;
         thd->m_statement_psi= parent_locker;
         thd->pop_internal_handler();
 
@@ -1555,12 +1564,18 @@
           SELECT)...
           Anyway some things can be checked only during trigger execution.
         */
-        for (Item_trigger_field *trg_field= sp->m_trg_table_fields.first;
-             trg_field;
-             trg_field= trg_field->next_trg_field)
+        for (SQL_I_List<Item_trigger_field> *trig_field_list=
+               sp->m_list_of_trig_fields_item_lists.first;
+             trig_field_list;
+             trig_field_list= trig_field_list->first->next_trig_field_list)
         {
-          trg_field->setup_field(thd, table,
-            &triggers->subject_table_grants[trg_event][trg_action_time]);
+          for (Item_trigger_field *trg_field= trig_field_list->first;
+               trg_field;
+               trg_field= trg_field->next_trg_field)
+          {
+            trg_field->setup_field(thd, table,
+              &triggers->subject_table_grants[trg_event][trg_action_time]);
+          }
         }
 
         lex_end(&lex);
@@ -2243,15 +2258,21 @@
   sp_head *sp= bodies[event_type][action_time];
   DBUG_ASSERT(used_fields->n_bits == trigger_table->s->fields);
 
-  for (trg_field= sp->m_trg_table_fields.first; trg_field;
-       trg_field= trg_field->next_trg_field)
+  for (SQL_I_List<Item_trigger_field> *trig_field_list=
+         sp->m_list_of_trig_fields_item_lists.first;
+      trig_field_list;
+      trig_field_list= trig_field_list->first->next_trig_field_list)
   {
-    /* We cannot check fields which does not present in table. */
-    if (trg_field->field_idx != (uint)-1)
+    for (trg_field= trig_field_list->first; trg_field;
+         trg_field= trg_field->next_trg_field)
     {
-      if (bitmap_is_set(used_fields, trg_field->field_idx) &&
-          trg_field->get_settable_routine_parameter())
-        return true;
+      /* We cannot check fields which does not present in table. */
+      if (trg_field->field_idx != (uint)-1)
+      {
+        if (bitmap_is_set(used_fields, trg_field->field_idx) &&
+            trg_field->get_settable_routine_parameter())
+          return true;
+      }
     }
   }
   return false;
@@ -2282,15 +2303,21 @@
     if (!sp)
       continue;
 
-    for (trg_field= sp->m_trg_table_fields.first; trg_field;
-         trg_field= trg_field->next_trg_field)
+    for (SQL_I_List<Item_trigger_field> *trig_field_list=
+           sp->m_list_of_trig_fields_item_lists.first;
+         trig_field_list;
+         trig_field_list= trig_field_list->first->next_trig_field_list)
     {
-      /* We cannot mark fields which does not present in table. */
-      if (trg_field->field_idx != (uint)-1)
+      for (trg_field= trig_field_list->first; trg_field;
+           trg_field= trg_field->next_trg_field)
       {
-        bitmap_set_bit(trigger_table->read_set, trg_field->field_idx);
-        if (trg_field->get_settable_routine_parameter())
-          bitmap_set_bit(trigger_table->write_set, trg_field->field_idx);
+        /* We cannot mark fields which does not present in table. */
+        if (trg_field->field_idx != (uint)-1)
+        {
+          bitmap_set_bit(trigger_table->read_set, trg_field->field_idx);
+          if (trg_field->get_settable_routine_parameter())
+            bitmap_set_bit(trigger_table->write_set, trg_field->field_idx);
+        }
       }
     }
   }
diff -Nru percona-xtrabackup-2.2.3/sql/sql_trigger.h percona-xtrabackup-2.3.7/sql/sql_trigger.h
--- percona-xtrabackup-2.2.3/sql/sql_trigger.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_trigger.h	2017-02-27 07:47:02.000000000 +0000
@@ -2,7 +2,7 @@
 #define SQL_TRIGGER_INCLUDED
 
 /*
-   Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2014, 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
@@ -198,6 +198,11 @@
     return (bodies[TRG_EVENT_DELETE][TRG_ACTION_BEFORE] ||
             bodies[TRG_EVENT_DELETE][TRG_ACTION_AFTER]);
   }
+  bool has_update_triggers()
+  {
+    return (bodies[TRG_EVENT_UPDATE][TRG_ACTION_BEFORE] ||
+            bodies[TRG_EVENT_UPDATE][TRG_ACTION_AFTER]);
+  }
 
   void set_table(TABLE *new_table);
 
diff -Nru percona-xtrabackup-2.2.3/sql/sql_truncate.cc percona-xtrabackup-2.3.7/sql/sql_truncate.cc
--- percona-xtrabackup-2.2.3/sql/sql_truncate.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_truncate.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -180,11 +180,18 @@
   @param  table_ref     Table list element for the table to be truncated.
   @param  is_tmp_table  True if element refers to a temp table.
 
-  @retval  0    Success.
-  @retval  > 0  Error code.
+  @retval TRUNCATE_OK   Truncate was successful and statement can be safely
+                        binlogged.
+  @retval TRUNCATE_FAILED_BUT_BINLOG Truncate failed but still go ahead with
+                        binlogging as in case of non transactional tables
+                        partial truncation is possible.
+
+  @retval TRUNCATE_FAILED_SKIP_BINLOG Truncate was not successful hence donot
+                        binlong the statement.
 */
 
-int Sql_cmd_truncate_table::handler_truncate(THD *thd, TABLE_LIST *table_ref,
+enum Sql_cmd_truncate_table::truncate_result
+Sql_cmd_truncate_table::handler_truncate(THD *thd, TABLE_LIST *table_ref,
                                              bool is_tmp_table)
 {
   int error= 0;
@@ -225,16 +232,30 @@
 
   /* Open the table as it will handle some required preparations. */
   if (open_and_lock_tables(thd, table_ref, FALSE, flags))
-    DBUG_RETURN(1);
+    DBUG_RETURN(TRUNCATE_FAILED_SKIP_BINLOG);
 
   /* Whether to truncate regardless of foreign keys. */
   if (! (thd->variables.option_bits & OPTION_NO_FOREIGN_KEY_CHECKS))
-    error= fk_truncate_illegal_if_parent(thd, table_ref->table);
+    if (fk_truncate_illegal_if_parent(thd, table_ref->table))
+      DBUG_RETURN(TRUNCATE_FAILED_SKIP_BINLOG);
 
-  if (!error && (error= table_ref->table->file->ha_truncate()))
+  error= table_ref->table->file->ha_truncate();
+  if (error)
+  {
     table_ref->table->file->print_error(error, MYF(0));
-
-  DBUG_RETURN(error);
+    /*
+      If truncate method is not implemented then we don't binlog the
+      statement. If truncation has failed in a transactional engine then also we
+      donot binlog the statment. Only in non transactional engine we binlog
+      inspite of errors.
+     */
+    if (error == HA_ERR_WRONG_COMMAND ||
+        table_ref->table->file->has_transactions())
+      DBUG_RETURN(TRUNCATE_FAILED_SKIP_BINLOG);
+    else
+      DBUG_RETURN(TRUNCATE_FAILED_BUT_BINLOG);
+  }
+  DBUG_RETURN(TRUNCATE_OK);
 }
 
 
@@ -262,6 +283,12 @@
 
   table->file->info(HA_STATUS_AUTO | HA_STATUS_NO_LOCK);
 
+  /*
+    If LOCK TABLES list is not empty and contains this table
+    then unlock the table and remove it from this list.
+  */
+  mysql_lock_remove(thd, thd->lock, table);
+
   /* Don't free share. */
   close_temporary_table(thd, table, FALSE, FALSE);
 
@@ -467,10 +494,14 @@
 
       /*
         All effects of a TRUNCATE TABLE operation are committed even if
-        truncation fails. Thus, the query must be written to the binary
-        log. The only exception is a unimplemented truncate method.
+        truncation fails in the case of non transactional tables. Thus, the
+        query must be written to the binary log. The only exception is a
+        unimplemented truncate method.
       */
-      binlog_stmt= !error || error != HA_ERR_WRONG_COMMAND;
+      if (error == TRUNCATE_OK || error == TRUNCATE_FAILED_BUT_BINLOG)
+        binlog_stmt= true;
+      else
+        binlog_stmt= false;
     }
 
     /*
diff -Nru percona-xtrabackup-2.2.3/sql/sql_truncate.h percona-xtrabackup-2.3.7/sql/sql_truncate.h
--- percona-xtrabackup-2.2.3/sql/sql_truncate.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_truncate.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 #ifndef SQL_TRUNCATE_INCLUDED
 #define SQL_TRUNCATE_INCLUDED
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, 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
@@ -50,11 +50,17 @@
   }
 
 protected:
+  enum truncate_result{
+    TRUNCATE_OK=0,
+    TRUNCATE_FAILED_BUT_BINLOG,
+    TRUNCATE_FAILED_SKIP_BINLOG
+  };
+
   /** Handle locking a base table for truncate. */
   bool lock_table(THD *, TABLE_LIST *, bool *);
 
   /** Truncate table via the handler method. */
-  int handler_truncate(THD *, TABLE_LIST *, bool);
+  enum truncate_result handler_truncate(THD *, TABLE_LIST *, bool);
 
   /**
     Optimized delete of all rows by doing a full regenerate of the table.
diff -Nru percona-xtrabackup-2.2.3/sql/sql_union.cc percona-xtrabackup-2.3.7/sql/sql_union.cc
--- percona-xtrabackup-2.2.3/sql/sql_union.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_union.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2014, 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
@@ -570,11 +570,15 @@
 
       saved_error= sl->join->optimize();
       /*
-        Accumulate estimated number of rows. Notice that an implicitly grouped
-        query has one row (with HAVING it has zero or one rows).
+        Accumulate estimated number of rows.
+        1. Implicitly grouped query has one row (with HAVING it has zero or one
+           rows).
+        2. If GROUP BY clause is optimized away because it was a constant then
+           query produces at most one row.
       */
       result->estimated_rowcount+=
-        sl->with_sum_func && sl->group_list.elements == 0 ?
+        (sl->with_sum_func && sl->group_list.elements == 0) ||
+        sl->join->group_optimized_away ?
           1 : sl->join->best_rowcount;
 
       thd->lex->current_select= lex_select_save;
@@ -725,7 +729,14 @@
                                     0);
         if (!saved_error)
         {
+          /*
+            Save the current examined row count locally and clear the global
+            counter, so that we can accumulate the number of evaluated rows for
+            the current query block.
+          */
 	  examined_rows+= thd->get_examined_row_count();
+          thd->set_examined_row_count(0);
+
           if (union_result->flush())
           {
             thd->lex->current_select= lex_select_save;
diff -Nru percona-xtrabackup-2.2.3/sql/sql_update.cc percona-xtrabackup-2.3.7/sql/sql_update.cc
--- percona-xtrabackup-2.2.3/sql/sql_update.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_update.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -734,6 +734,7 @@
 
   if ((table->file->ha_table_flags() & HA_READ_BEFORE_WRITE_REMOVAL) &&
       !ignore && !using_limit &&
+      !(table->triggers && table->triggers->has_update_triggers()) &&
       select && select->quick && select->quick->index != MAX_KEY &&
       check_constant_expressions(values))
     read_removal= table->check_read_removal(select->quick->index);
diff -Nru percona-xtrabackup-2.2.3/sql/sql_view.cc percona-xtrabackup-2.3.7/sql/sql_view.cc
--- percona-xtrabackup-2.2.3/sql/sql_view.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_view.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2015, 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
@@ -161,28 +161,62 @@
   Check if auto generated column names are conforming and
   possibly generate a conforming name for them if not.
 
-  @param item_list  List of Items which should be checked
+  @param lex  Lex for this thread.
+
+  @retval false Operation was a success.
+  @retval true  An error occurred.
 */
 
-static void make_valid_column_names(List<Item> &item_list)
+static bool make_valid_column_names(LEX *lex)
 {
   Item *item;
   uint name_len;
-  List_iterator_fast<Item> it(item_list);
   char buff[NAME_LEN];
+  uint column_no= 1;
   DBUG_ENTER("make_valid_column_names");
 
-  for (uint column_no= 1; (item= it++); column_no++)
+  for (SELECT_LEX *sl= &lex->select_lex; sl; sl= sl->next_select())
   {
-    if (!item->item_name.is_autogenerated() ||
-        !check_column_name(item->item_name.ptr()))
-      continue;
-    name_len= my_snprintf(buff, NAME_LEN, "Name_exp_%u", column_no);
-    item->orig_name= item->item_name;
-    item->item_name.copy(buff, name_len);
+    for (List_iterator_fast<Item> it(sl->item_list); (item= it++); column_no++)
+    {
+      if (!item->item_name.is_autogenerated() ||
+          !check_column_name(item->item_name.ptr()))
+        continue;
+      name_len= my_snprintf(buff, NAME_LEN, "Name_exp_%u", column_no);
+      item->orig_name= item->item_name;
+      item->item_name.copy(buff, name_len);
+    }
+
+    /*
+      There is a possibility of generating same name for column in more than
+      one SELECT_LEX. For Example:
+
+       CREATE TABLE t1 (Name_exp_1 INT, Name_exp_2 INT, Name_exp_3 INT);
+       CREATE TABLE t2 (Name_exp_1 INT, Name_exp_2 INT, Name_exp_3 INT);
+
+       CREATE VIEW v1 AS SELECT '', t1.Name_exp_2 AS Name_exp_2 FROM t1
+                         UNION
+                         SELECT '', t2.Name_exp_1 AS Name_exp_1 from t2;
+
+      But, column names of the first SELECT_LEX is considered
+      for the output.
+
+        mysql> SELECT * FROM v1;
+        +------------+------------+
+        | Name_exp_1 | Name_exp_2 |
+        +------------+------------+
+        |            |          2 |
+        |            |          3 |
+        +------------+------------+
+
+      So, checking for duplicate names in only "sl", current
+      SELECT_LEX.
+    */
+    if (check_duplicate_names(sl->item_list, 1))
+      DBUG_RETURN(true);
   }
 
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(false);
 }
 
 
@@ -601,9 +635,7 @@
   }
 
   /* Check if the auto generated column names are conforming. */
-  make_valid_column_names(select_lex->item_list);
-
-  if (check_duplicate_names(select_lex->item_list, 1))
+  if (make_valid_column_names(lex))
   {
     res= TRUE;
     goto err;
@@ -1368,6 +1400,9 @@
     thd->variables.sql_mode&= ~(MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
                                 MODE_IGNORE_SPACE | MODE_NO_BACKSLASH_ESCAPES);
 
+    if (thd->m_digest != NULL)
+      thd->m_digest->reset(thd->m_token_array, max_digest_length);
+
     /* Parse the query. */
 
     parse_status= parse_sql(thd, & parser_state, table->view_creation_ctx);
diff -Nru percona-xtrabackup-2.2.3/sql/sql_yacc.cc percona-xtrabackup-2.3.7/sql/sql_yacc.cc
--- percona-xtrabackup-2.2.3/sql/sql_yacc.cc	2014-07-22 17:14:03.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_yacc.cc	2017-02-27 07:49:21.000000000 +0000
@@ -1,8 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Bison implementation for Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    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
@@ -44,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.5"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -73,14 +75,12 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 268 of yacc.c  */
-#line 24 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 189 of yacc.c  */
+#line 24 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
 
-/* thd is passed as an argument to yyparse(), and subsequently to yylex().
-** The type will be void*, so it must be  cast to (THD*) when used.
-** Use the YYTHD macro for this.
+/*
+Note: YYTHD is passed as an argument to yyparse(), and subsequently to yylex().
 */
-#define YYTHD ((THD *)yythd)
 #define YYLIP (& YYTHD->m_parser_state->m_lip)
 #define YYPS (& YYTHD->m_parser_state->m_yacc)
 #define YYCSCL  YYTHD->variables.character_set_client
@@ -120,6 +120,7 @@
 #include "set_var.h"
 #include "opt_explain_traditional.h"
 #include "opt_explain_json.h"
+#include "lex_token.h"
 
 /* this is to get the bison compilation windows warnings out */
 #ifdef _MSC_VER
@@ -137,7 +138,7 @@
     ulong val= *(F);                          \
     if (my_yyoverflow((B), (D), &val))        \
     {                                         \
-      yyerror(yythd, (char*) (A));            \
+      yyerror(YYTHD, (char*) (A));            \
       return 2;                               \
     }                                         \
     else                                      \
@@ -235,10 +236,8 @@
   to abort from the parser.
 */
 
-void MYSQLerror(void *yythd, const char *s)
+void MYSQLerror(THD *thd, const char *s)
 {
-  THD *thd= current_thd;
-
   /*
     Restore the original LEX if it was replaced when parsing
     a stored procedure. We must ensure that a parsing error
@@ -523,7 +522,8 @@
     Let us add this item to list of all Item_trigger_field
     objects in trigger.
   */
-  sp->m_trg_table_fields.link_in_list(trg_fld, &trg_fld->next_trg_field);
+  sp->m_cur_instr_trig_field_items.link_in_list(trg_fld,
+                                                &trg_fld->next_trg_field);
 
   return sp->add_instr(thd, i);
 }
@@ -1022,8 +1022,8 @@
 
 
 
-/* Line 268 of yacc.c  */
-#line 1027 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.cc"
+/* Line 189 of yacc.c  */
+#line 1027 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.cc"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -2297,8 +2297,8 @@
 typedef union YYSTYPE
 {
 
-/* Line 293 of yacc.c  */
-#line 970 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 214 of yacc.c  */
+#line 968 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
 
   int  num;
   ulong ulong_num;
@@ -2358,8 +2358,8 @@
 
 
 
-/* Line 293 of yacc.c  */
-#line 2363 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.cc"
+/* Line 214 of yacc.c  */
+#line 2363 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -2369,14 +2369,14 @@
 
 /* Copy the second part of user declarations.  */
 
-/* Line 343 of yacc.c  */
-#line 1028 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 264 of yacc.c  */
+#line 1026 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
 
 bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 
 
-/* Line 343 of yacc.c  */
-#line 2380 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.cc"
+/* Line 264 of yacc.c  */
+#line 2380 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.cc"
 
 #ifdef short
 # undef short
@@ -2426,7 +2426,7 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -2479,11 +2479,11 @@
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -2506,24 +2506,24 @@
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -2552,7 +2552,23 @@
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -2572,26 +2588,6 @@
 
 #endif
 
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  597
 /* YYLAST -- Last index in YYTABLE.  */
@@ -3764,138 +3760,138 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,  1971,  1971,  1984,  1983,  2008,  2015,  2017,  2021,  2022,
-    2027,  2028,  2029,  2030,  2031,  2032,  2033,  2034,  2035,  2036,
-    2037,  2038,  2039,  2040,  2041,  2042,  2043,  2044,  2045,  2046,
-    2047,  2048,  2049,  2050,  2051,  2052,  2053,  2054,  2055,  2056,
-    2057,  2058,  2059,  2060,  2061,  2062,  2063,  2064,  2065,  2066,
-    2067,  2068,  2069,  2070,  2071,  2072,  2073,  2074,  2075,  2076,
-    2077,  2078,  2082,  2092,  2093,  2097,  2117,  2124,  2135,  2134,
-    2145,  2147,  2151,  2152,  2156,  2169,  2168,  2188,  2187,  2205,
-    2206,  2210,  2214,  2218,  2222,  2227,  2231,  2235,  2240,  2253,
-    2258,  2262,  2266,  2270,  2274,  2278,  2283,  2287,  2292,  2323,
-    2328,  2335,  2338,  2340,  2341,  2345,  2359,  2363,  2379,  2383,
-    2396,  2395,  2441,  2446,  2440,  2453,  2458,  2451,  2465,  2470,
-    2463,  2476,  2475,  2488,  2487,  2495,  2499,  2503,  2507,  2514,
-    2527,  2528,  2532,  2536,  2540,  2544,  2548,  2553,  2557,  2565,
-    2564,  2596,  2595,  2602,  2609,  2610,  2616,  2622,  2632,  2638,
-    2644,  2646,  2653,  2654,  2658,  2664,  2673,  2674,  2682,  2682,
-    2737,  2738,  2739,  2740,  2741,  2742,  2743,  2744,  2745,  2746,
-    2747,  2748,  2749,  2754,  2768,  2782,  2801,  2802,  2806,  2807,
-    2812,  2814,  2816,  2818,  2820,  2822,  2824,  2830,  2831,  2832,
-    2836,  2840,  2848,  2847,  2860,  2862,  2865,  2867,  2871,  2875,
-    2882,  2884,  2888,  2889,  2894,  2913,  2943,  2945,  2949,  2950,
-    2954,  2983,  2984,  2985,  2986,  2990,  2991,  2995,  2996,  3001,
-    3004,  3031,  3030,  3114,  3131,  3130,  3205,  3204,  3277,  3278,
-    3283,  3285,  3290,  3313,  3324,  3328,  3350,  3351,  3355,  3359,
-    3372,  3378,  3384,  3393,  3408,  3434,  3440,  3441,  3447,  3450,
-    3454,  3462,  3482,  3484,  3502,  3508,  3510,  3512,  3514,  3516,
-    3518,  3520,  3522,  3524,  3526,  3528,  3530,  3535,  3551,  3567,
-    3568,  3573,  3579,  3588,  3594,  3603,  3611,  3640,  3649,  3651,
-    3660,  3665,  3671,  3680,  3688,  3690,  3692,  3694,  3696,  3698,
-    3700,  3702,  3704,  3706,  3708,  3710,  3712,  3717,  3737,  3761,
-    3763,  3762,  3769,  3770,  3771,  3772,  3773,  3774,  3775,  3776,
-    3777,  3778,  3779,  3780,  3781,  3786,  3785,  3796,  3796,  3853,
-    3852,  3909,  3909,  3931,  3990,  4040,  4065,  4064,  4090,  4113,
-    4115,  4116,  4120,  4138,  4159,  4168,  4204,  4159,  4233,  4235,
-    4236,  4240,  4241,  4246,  4257,  4245,  4308,  4307,  4321,  4322,
-    4326,  4327,  4332,  4341,  4331,  4390,  4399,  4389,  4443,  4456,
-    4461,  4460,  4498,  4499,  4504,  4503,  4537,  4537,  4556,  4555,
-    4605,  4622,  4631,  4621,  4685,  4694,  4684,  4734,  4736,  4741,
-    4743,  4745,  4762,  4767,  4773,  4780,  4781,  4789,  4795,  4804,
-    4810,  4816,  4817,  4821,  4821,  4826,  4827,  4828,  4832,  4833,
-    4834,  4837,  4839,  4843,  4844,  4845,  4849,  4850,  4851,  4852,
-    4853,  4854,  4855,  4856,  4859,  4861,  4865,  4866,  4867,  4871,
-    4872,  4873,  4874,  4875,  4878,  4880,  4884,  4885,  4886,  4890,
-    4891,  4892,  4893,  4894,  4895,  4896,  4899,  4901,  4905,  4906,
-    4907,  4911,  4912,  4913,  4918,  4926,  4934,  4942,  4954,  4966,
-    4971,  4976,  4984,  4992,  5000,  5008,  5016,  5024,  5032,  5045,
-    5058,  5072,  5077,  5090,  5091,  5142,  5143,  5146,  5161,  5179,
-    5184,  5182,  5189,  5191,  5190,  5194,  5193,  5199,  5236,  5237,
-    5242,  5241,  5260,  5279,  5278,  5295,  5299,  5307,  5306,  5309,
-    5311,  5313,  5315,  5320,  5321,  5327,  5328,  5345,  5346,  5350,
-    5351,  5355,  5374,  5384,  5395,  5404,  5405,  5421,  5423,  5422,
-    5427,  5425,  5436,  5437,  5441,  5459,  5475,  5476,  5492,  5507,
-    5529,  5530,  5535,  5534,  5558,  5568,  5590,  5589,  5607,  5606,
-    5626,  5648,  5652,  5681,  5693,  5694,  5699,  5710,  5698,  5735,
-    5736,  5740,  5753,  5774,  5787,  5813,  5814,  5819,  5818,  5855,
-    5860,  5861,  5865,  5866,  5870,  5872,  5878,  5880,  5882,  5884,
-    5886,  5888,  5898,  5913,  5897,  5927,  5928,  5932,  5933,  5937,
-    5938,  5942,  5943,  5947,  5948,  5952,  5953,  5957,  5961,  5962,
-    5965,  5967,  5971,  5972,  5976,  5977,  5978,  5982,  5987,  5992,
-    5997,  6002,  6007,  6012,  6017,  6032,  6038,  6053,  6058,  6073,
-    6079,  6097,  6102,  6107,  6112,  6117,  6123,  6122,  6148,  6149,
-    6150,  6155,  6160,  6165,  6167,  6169,  6171,  6177,  6185,  6203,
-    6220,  6246,  6264,  6265,  6266,  6267,  6268,  6269,  6273,  6274,
-    6275,  6279,  6280,  6284,  6285,  6286,  6287,  6292,  6299,  6300,
-    6304,  6305,  6309,  6310,  6317,  6322,  6328,  6334,  6340,  6359,
-    6365,  6367,  6371,  6375,  6376,  6380,  6385,  6384,  6407,  6408,
-    6409,  6410,  6415,  6419,  6424,  6429,  6433,  6438,  6443,  6449,
-    6454,  6460,  6464,  6469,  6474,  6492,  6494,  6496,  6512,  6514,
-    6519,  6524,  6536,  6541,  6546,  6551,  6553,  6555,  6557,  6559,
-    6561,  6563,  6565,  6568,  6567,  6572,  6571,  6575,  6577,  6586,
-    6587,  6588,  6593,  6594,  6595,  6596,  6597,  6601,  6605,  6606,
-    6610,  6611,  6615,  6616,  6617,  6618,  6619,  6623,  6624,  6625,
-    6626,  6627,  6631,  6636,  6638,  6644,  6645,  6647,  6652,  6662,
-    6663,  6667,  6668,  6669,  6677,  6678,  6682,  6683,  6687,  6688,
-    6689,  6693,  6694,  6695,  6696,  6699,  6700,  6704,  6705,  6709,
-    6710,  6714,  6715,  6719,  6720,  6721,  6722,  6723,  6724,  6730,
-    6736,  6742,  6748,  6749,  6762,  6768,  6774,  6780,  6785,  6790,
-    6799,  6820,  6828,  6829,  6834,  6835,  6839,  6847,  6851,  6852,
-    6856,  6857,  6861,  6870,  6874,  6875,  6879,  6887,  6888,  6892,
-    6893,  6897,  6898,  6903,  6904,  6908,  6915,  6924,  6929,  6937,
-    6938,  6939,  6940,  6941,  6942,  6947,  6955,  6956,  6961,  6960,
-    6973,  6974,  6978,  6981,  6982,  6983,  6984,  6988,  6996,  7003,
-    7004,  7008,  7018,  7019,  7023,  7024,  7027,  7029,  7033,  7045,
-    7046,  7050,  7057,  7070,  7071,  7073,  7075,  7081,  7086,  7092,
-    7098,  7105,  7115,  7116,  7117,  7118,  7119,  7123,  7127,  7128,
-    7132,  7133,  7137,  7138,  7142,  7143,  7144,  7148,  7149,  7153,
-    7157,  7170,  7182,  7183,  7187,  7188,  7192,  7193,  7197,  7198,
-    7202,  7203,  7207,  7208,  7212,  7213,  7217,  7218,  7222,  7224,
-    7228,  7229,  7233,  7237,  7238,  7251,  7252,  7253,  7257,  7258,
-    7262,  7268,  7282,  7283,  7287,  7288,  7292,  7293,  7301,  7300,
-    7346,  7345,  7359,  7371,  7370,  7389,  7388,  7407,  7406,  7425,
-    7419,  7439,  7438,  7471,  7476,  7481,  7486,  7491,  7498,  7505,
-    7510,  7518,  7519,  7520,  7521,  7525,  7526,  7538,  7539,  7543,
-    7544,  7547,  7549,  7557,  7565,  7567,  7569,  7570,  7578,  7579,
-    7583,  7592,  7590,  7604,  7618,  7617,  7631,  7629,  7643,  7650,
-    7661,  7662,  7690,  7697,  7701,  7706,  7705,  7721,  7723,  7728,
-    7736,  7735,  7751,  7755,  7754,  7766,  7767,  7771,  7786,  7787,
-    7791,  7800,  7804,  7809,  7815,  7814,  7825,  7834,  7824,  7849,
-    7858,  7867,  7876,  7885,  7891,  7897,  7906,  7915,  7943,  7964,
-    7974,  7978,  7983,  7984,  7987,  7989,  7990,  7991,  7992,  7995,
-    8000,  8011,  8016,  8027,  8028,  8032,  8033,  8037,  8038,  8039,
-    8043,  8044,  8049,  8057,  8058,  8059,  8060,  8065,  8064,  8093,
-    8103,  8120,  8123,  8130,  8134,  8141,  8145,  8149,  8156,  8161,
-    8164,  8171,  8174,  8181,  8184,  8191,  8194,  8202,  8205,  8212,
-    8216,  8223,  8227,  8234,  8235,  8260,  8261,  8262,  8267,  8272,
-    8280,  8279,  8291,  8292,  8293,  8298,  8297,  8319,  8320,  8324,
-    8325,  8329,  8330,  8331,  8336,  8335,  8357,  8366,  8365,  8392,
-    8393,  8397,  8398,  8402,  8403,  8404,  8405,  8406,  8407,  8412,
-    8411,  8433,  8434,  8435,  8440,  8439,  8445,  8452,  8457,  8465,
-    8466,  8470,  8484,  8483,  8496,  8497,  8501,  8502,  8506,  8516,
-    8526,  8527,  8532,  8531,  8542,  8543,  8547,  8548,  8552,  8562,
-    8573,  8572,  8580,  8580,  8591,  8592,  8597,  8598,  8607,  8616,
-    8617,  8621,  8626,  8631,  8636,  8641,  8640,  8660,  8668,  8660,
-    8675,  8676,  8677,  8678,  8679,  8683,  8690,  8697,  8699,  8710,
-    8711,  8715,  8716,  8744,  8774,  8776,  8782,  8792,  8793,  8794,
-    8809,  8816,  8841,  8847,  8853,  8854,  8855,  8856,  8857,  8861,
-    8862,  8867,  8918,  8925,  8968,  8974,  8980,  8986,  8992,  8998,
-    9004,  9010,  9014,  9020,  9026,  9032,  9038,  9044,  9048,  9054,
-    9064,  9070,  9078,  9084,  9094,  9100,  9109,  9119,  9125,  9135,
-    9141,  9150,  9154,  9160,  9166,  9172,  9178,  9184,  9190,  9196,
-    9202,  9208,  9214,  9220,  9226,  9232,  9238,  9242,  9243,  9247,
-    9248,  9252,  9253,  9257,  9258,  9262,  9263,  9264,  9265,  9266,
-    9267,  9271,  9272,  9276,  9277,  9278,  9279,  9280,  9281,  9293,
-    9294,  9295,  9296,  9297,  9303,  9307,  9313,  9319,  9325,  9331,
-    9333,  9340,  9347,  9353,  9394,  9403,  9410,  9418,  9424,  9431,
-    9437,  9451,  9458,  9474,  9480,  9486,  9494,  9500,  9506,  9512,
-    9518,  9533,  9545,  9551,  9557,  9563,  9569,  9575,  9581,  9587,
-    9593,  9599,  9605,  9611,  9617,  9623,  9629,  9635,  9641,  9649,
-    9670,  9677,  9683,  9690,  9697,  9704,  9711,  9717,  9723,  9728,
-    9734,  9741,  9747,  9753,  9759,  9765,  9771,  9789,  9795,  9801,
-    9808,  9815,  9830,  9836,  9842,  9848,  9854,  9861,  9867,  9873,
-    9879,  9885,  9891,  9898,  9911,  9917,  9923,  9929,  9935,  9943,
+       0,  1969,  1969,  1982,  1981,  2006,  2013,  2015,  2019,  2020,
+    2025,  2026,  2027,  2028,  2029,  2030,  2031,  2032,  2033,  2034,
+    2035,  2036,  2037,  2038,  2039,  2040,  2041,  2042,  2043,  2044,
+    2045,  2046,  2047,  2048,  2049,  2050,  2051,  2052,  2053,  2054,
+    2055,  2056,  2057,  2058,  2059,  2060,  2061,  2062,  2063,  2064,
+    2065,  2066,  2067,  2068,  2069,  2070,  2071,  2072,  2073,  2074,
+    2075,  2076,  2080,  2090,  2091,  2095,  2115,  2122,  2133,  2132,
+    2143,  2145,  2149,  2150,  2154,  2167,  2166,  2186,  2185,  2203,
+    2204,  2208,  2212,  2216,  2220,  2225,  2229,  2233,  2238,  2251,
+    2256,  2260,  2264,  2268,  2272,  2276,  2281,  2285,  2290,  2321,
+    2326,  2333,  2336,  2338,  2339,  2343,  2357,  2361,  2377,  2381,
+    2394,  2393,  2439,  2444,  2438,  2451,  2456,  2449,  2463,  2468,
+    2461,  2474,  2473,  2486,  2485,  2493,  2497,  2501,  2505,  2512,
+    2525,  2526,  2530,  2534,  2538,  2542,  2546,  2551,  2555,  2563,
+    2562,  2594,  2593,  2600,  2607,  2608,  2614,  2620,  2630,  2636,
+    2642,  2644,  2651,  2652,  2656,  2662,  2671,  2672,  2680,  2680,
+    2735,  2736,  2737,  2738,  2739,  2740,  2741,  2742,  2743,  2744,
+    2745,  2746,  2747,  2752,  2766,  2780,  2799,  2800,  2804,  2805,
+    2810,  2812,  2814,  2816,  2818,  2820,  2822,  2828,  2829,  2830,
+    2834,  2838,  2846,  2845,  2858,  2860,  2863,  2865,  2869,  2873,
+    2880,  2882,  2886,  2887,  2892,  2911,  2941,  2943,  2947,  2948,
+    2952,  2981,  2982,  2983,  2984,  2988,  2989,  2993,  2994,  2999,
+    3002,  3029,  3028,  3112,  3129,  3128,  3203,  3202,  3275,  3276,
+    3281,  3283,  3288,  3311,  3322,  3326,  3348,  3349,  3353,  3357,
+    3370,  3376,  3382,  3391,  3406,  3432,  3438,  3439,  3445,  3448,
+    3452,  3460,  3480,  3482,  3500,  3506,  3508,  3510,  3512,  3514,
+    3516,  3518,  3520,  3522,  3524,  3526,  3528,  3533,  3549,  3565,
+    3566,  3571,  3577,  3586,  3592,  3601,  3609,  3638,  3647,  3649,
+    3658,  3663,  3669,  3678,  3686,  3688,  3690,  3692,  3694,  3696,
+    3698,  3700,  3702,  3704,  3706,  3708,  3710,  3715,  3735,  3759,
+    3761,  3760,  3767,  3768,  3769,  3770,  3771,  3772,  3773,  3774,
+    3775,  3776,  3777,  3778,  3779,  3784,  3783,  3794,  3794,  3851,
+    3850,  3907,  3907,  3929,  3988,  4038,  4063,  4062,  4088,  4111,
+    4113,  4114,  4118,  4136,  4157,  4166,  4202,  4157,  4231,  4233,
+    4234,  4238,  4239,  4244,  4255,  4243,  4306,  4305,  4319,  4320,
+    4324,  4325,  4330,  4339,  4329,  4388,  4397,  4387,  4441,  4454,
+    4459,  4458,  4496,  4497,  4502,  4501,  4535,  4535,  4554,  4553,
+    4603,  4620,  4629,  4619,  4683,  4692,  4682,  4732,  4734,  4739,
+    4741,  4743,  4760,  4765,  4771,  4778,  4779,  4787,  4793,  4802,
+    4808,  4814,  4815,  4819,  4819,  4824,  4825,  4826,  4830,  4831,
+    4832,  4835,  4837,  4841,  4842,  4843,  4847,  4848,  4849,  4850,
+    4851,  4852,  4853,  4854,  4857,  4859,  4863,  4864,  4865,  4869,
+    4870,  4871,  4872,  4873,  4876,  4878,  4882,  4883,  4884,  4888,
+    4889,  4890,  4891,  4892,  4893,  4894,  4897,  4899,  4903,  4904,
+    4905,  4909,  4910,  4911,  4916,  4924,  4932,  4940,  4952,  4964,
+    4969,  4974,  4982,  4990,  4998,  5006,  5014,  5022,  5030,  5043,
+    5056,  5070,  5075,  5088,  5089,  5140,  5141,  5144,  5159,  5177,
+    5182,  5180,  5187,  5189,  5188,  5192,  5191,  5197,  5234,  5235,
+    5240,  5239,  5258,  5277,  5276,  5293,  5297,  5305,  5304,  5307,
+    5309,  5311,  5313,  5318,  5319,  5325,  5326,  5343,  5344,  5348,
+    5349,  5353,  5372,  5382,  5393,  5402,  5403,  5419,  5421,  5420,
+    5425,  5423,  5434,  5435,  5439,  5457,  5473,  5474,  5490,  5505,
+    5527,  5528,  5533,  5532,  5556,  5566,  5588,  5587,  5605,  5604,
+    5624,  5646,  5650,  5679,  5691,  5692,  5697,  5708,  5696,  5733,
+    5734,  5738,  5751,  5772,  5785,  5811,  5812,  5817,  5816,  5853,
+    5858,  5859,  5863,  5864,  5868,  5870,  5876,  5878,  5880,  5882,
+    5884,  5886,  5896,  5911,  5895,  5925,  5926,  5930,  5931,  5935,
+    5936,  5940,  5941,  5945,  5946,  5950,  5951,  5955,  5959,  5960,
+    5963,  5965,  5969,  5970,  5974,  5975,  5976,  5980,  5985,  5990,
+    5995,  6000,  6005,  6010,  6015,  6030,  6036,  6051,  6056,  6071,
+    6077,  6095,  6100,  6105,  6110,  6115,  6121,  6120,  6146,  6147,
+    6148,  6153,  6158,  6163,  6165,  6167,  6169,  6175,  6183,  6201,
+    6218,  6244,  6262,  6263,  6264,  6265,  6266,  6267,  6271,  6272,
+    6273,  6277,  6278,  6282,  6283,  6284,  6285,  6290,  6297,  6298,
+    6302,  6303,  6307,  6308,  6315,  6320,  6326,  6332,  6338,  6357,
+    6363,  6365,  6369,  6373,  6374,  6378,  6383,  6382,  6405,  6406,
+    6407,  6408,  6413,  6417,  6422,  6427,  6431,  6436,  6441,  6447,
+    6452,  6458,  6462,  6467,  6472,  6490,  6492,  6494,  6510,  6512,
+    6517,  6522,  6534,  6539,  6544,  6549,  6551,  6553,  6555,  6557,
+    6559,  6561,  6563,  6566,  6565,  6570,  6569,  6573,  6575,  6584,
+    6585,  6586,  6592,  6593,  6594,  6595,  6596,  6600,  6604,  6605,
+    6609,  6610,  6614,  6615,  6616,  6617,  6618,  6622,  6623,  6624,
+    6625,  6626,  6630,  6635,  6637,  6643,  6644,  6646,  6651,  6661,
+    6662,  6666,  6667,  6668,  6676,  6677,  6681,  6682,  6686,  6687,
+    6688,  6692,  6693,  6694,  6695,  6698,  6699,  6703,  6704,  6708,
+    6709,  6713,  6714,  6718,  6719,  6720,  6721,  6722,  6723,  6729,
+    6735,  6741,  6747,  6748,  6761,  6767,  6773,  6779,  6784,  6789,
+    6798,  6819,  6827,  6828,  6833,  6834,  6838,  6846,  6850,  6851,
+    6855,  6856,  6860,  6869,  6873,  6874,  6878,  6886,  6887,  6891,
+    6892,  6896,  6897,  6902,  6903,  6907,  6914,  6923,  6928,  6936,
+    6937,  6938,  6939,  6940,  6941,  6946,  6954,  6955,  6960,  6959,
+    6972,  6973,  6977,  6980,  6981,  6982,  6983,  6987,  6995,  7002,
+    7003,  7007,  7017,  7018,  7022,  7023,  7026,  7028,  7032,  7044,
+    7045,  7049,  7056,  7069,  7070,  7072,  7074,  7080,  7085,  7091,
+    7097,  7104,  7114,  7115,  7116,  7117,  7118,  7122,  7126,  7127,
+    7131,  7132,  7136,  7137,  7141,  7142,  7143,  7147,  7148,  7152,
+    7156,  7169,  7181,  7182,  7186,  7187,  7191,  7192,  7196,  7197,
+    7201,  7202,  7206,  7207,  7211,  7212,  7216,  7217,  7221,  7223,
+    7227,  7228,  7232,  7236,  7237,  7250,  7251,  7252,  7256,  7257,
+    7261,  7267,  7281,  7282,  7286,  7287,  7291,  7292,  7300,  7299,
+    7345,  7344,  7358,  7370,  7369,  7388,  7387,  7406,  7405,  7424,
+    7418,  7438,  7437,  7470,  7475,  7480,  7485,  7490,  7497,  7504,
+    7509,  7517,  7518,  7519,  7520,  7524,  7525,  7537,  7538,  7542,
+    7543,  7546,  7548,  7556,  7564,  7566,  7568,  7569,  7577,  7578,
+    7582,  7591,  7589,  7603,  7617,  7616,  7630,  7628,  7642,  7649,
+    7660,  7661,  7689,  7696,  7700,  7705,  7704,  7720,  7722,  7727,
+    7735,  7734,  7750,  7754,  7753,  7765,  7766,  7770,  7785,  7786,
+    7790,  7799,  7803,  7808,  7814,  7813,  7824,  7833,  7823,  7848,
+    7857,  7866,  7875,  7884,  7890,  7896,  7905,  7914,  7942,  7963,
+    7973,  7977,  7982,  7983,  7986,  7988,  7989,  7990,  7991,  7994,
+    7999,  8010,  8015,  8026,  8027,  8031,  8032,  8036,  8037,  8038,
+    8042,  8043,  8048,  8056,  8057,  8058,  8059,  8064,  8063,  8092,
+    8102,  8119,  8122,  8129,  8133,  8140,  8144,  8148,  8155,  8160,
+    8163,  8170,  8173,  8180,  8183,  8190,  8193,  8201,  8204,  8211,
+    8215,  8222,  8226,  8233,  8234,  8259,  8260,  8261,  8266,  8271,
+    8279,  8278,  8290,  8291,  8292,  8297,  8296,  8318,  8319,  8323,
+    8324,  8328,  8329,  8330,  8335,  8334,  8356,  8365,  8364,  8391,
+    8392,  8396,  8397,  8401,  8402,  8403,  8404,  8405,  8406,  8411,
+    8410,  8432,  8433,  8434,  8439,  8438,  8444,  8451,  8456,  8464,
+    8465,  8469,  8483,  8482,  8495,  8496,  8500,  8501,  8505,  8515,
+    8525,  8526,  8531,  8530,  8541,  8542,  8546,  8547,  8551,  8561,
+    8572,  8571,  8579,  8579,  8590,  8591,  8596,  8597,  8606,  8615,
+    8616,  8620,  8625,  8630,  8635,  8640,  8639,  8659,  8667,  8659,
+    8674,  8675,  8676,  8677,  8678,  8682,  8689,  8696,  8698,  8709,
+    8710,  8714,  8715,  8743,  8773,  8775,  8781,  8791,  8792,  8793,
+    8808,  8815,  8840,  8846,  8852,  8853,  8854,  8855,  8856,  8860,
+    8861,  8866,  8917,  8924,  8967,  8973,  8979,  8985,  8991,  8997,
+    9003,  9009,  9013,  9019,  9025,  9031,  9037,  9043,  9047,  9053,
+    9063,  9069,  9077,  9083,  9093,  9099,  9108,  9118,  9124,  9134,
+    9140,  9149,  9153,  9159,  9165,  9171,  9177,  9183,  9189,  9195,
+    9201,  9207,  9213,  9219,  9225,  9231,  9237,  9241,  9242,  9246,
+    9247,  9251,  9252,  9256,  9257,  9261,  9262,  9263,  9264,  9265,
+    9266,  9270,  9271,  9275,  9276,  9277,  9278,  9279,  9280,  9292,
+    9293,  9294,  9295,  9296,  9302,  9306,  9312,  9318,  9324,  9330,
+    9332,  9339,  9346,  9352,  9393,  9402,  9409,  9417,  9423,  9430,
+    9436,  9450,  9457,  9473,  9479,  9485,  9493,  9499,  9505,  9511,
+    9517,  9532,  9544,  9550,  9556,  9562,  9568,  9574,  9580,  9586,
+    9592,  9598,  9604,  9610,  9616,  9622,  9628,  9634,  9640,  9648,
+    9669,  9676,  9682,  9689,  9696,  9703,  9710,  9716,  9722,  9727,
+    9733,  9740,  9746,  9752,  9758,  9764,  9770,  9788,  9794,  9800,
+    9807,  9814,  9829,  9835,  9841,  9847,  9853,  9860,  9866,  9872,
+    9878,  9884,  9890,  9898,  9911,  9917,  9923,  9929,  9935,  9943,
     9949,  9961,  9967,  9973,  9981,  9991,  9997, 10013, 10019, 10026,
    10033, 10040, 10047, 10054, 10058, 10078, 10077, 10150, 10190, 10192,
    10197, 10198, 10202, 10203, 10207, 10208, 10212, 10219, 10227, 10253,
@@ -3957,81 +3953,81 @@
    13173, 13177, 13182, 13190, 13191, 13194, 13196, 13204, 13206, 13210,
    13211, 13212, 13216, 13218, 13223, 13224, 13233, 13234, 13238, 13239,
    13243, 13263, 13287, 13299, 13310, 13329, 13337, 13349, 13364, 13385,
-   13386, 13387, 13396, 13397, 13398, 13399, 13406, 13412, 13418, 13424,
-   13430, 13459, 13490, 13500, 13510, 13516, 13525, 13537, 13543, 13549,
-   13565, 13566, 13570, 13579, 13595, 13599, 13650, 13654, 13672, 13676,
-   13756, 13781, 13812, 13813, 13829, 13839, 13843, 13849, 13855, 13865,
-   13871, 13880, 13890, 13891, 13921, 13934, 13950, 13966, 13983, 13984,
-   13995, 13996, 14007, 14008, 14009, 14013, 14040, 14073, 14088, 14089,
-   14090, 14091, 14092, 14093, 14094, 14095, 14096, 14097, 14098, 14099,
-   14100, 14101, 14102, 14103, 14104, 14105, 14106, 14107, 14108, 14109,
-   14110, 14111, 14112, 14113, 14114, 14115, 14116, 14117, 14118, 14119,
-   14120, 14121, 14122, 14123, 14124, 14125, 14126, 14127, 14128, 14129,
-   14130, 14131, 14132, 14133, 14134, 14135, 14136, 14137, 14147, 14148,
-   14149, 14150, 14151, 14152, 14153, 14154, 14155, 14156, 14157, 14158,
-   14159, 14160, 14161, 14162, 14163, 14164, 14165, 14166, 14167, 14168,
-   14169, 14170, 14171, 14172, 14173, 14174, 14175, 14176, 14177, 14178,
-   14179, 14180, 14181, 14182, 14183, 14184, 14185, 14186, 14187, 14188,
-   14189, 14190, 14191, 14196, 14197, 14198, 14199, 14200, 14201, 14202,
-   14203, 14204, 14205, 14206, 14207, 14208, 14209, 14210, 14211, 14212,
-   14213, 14214, 14215, 14216, 14217, 14218, 14219, 14220, 14221, 14222,
-   14223, 14224, 14225, 14226, 14227, 14228, 14229, 14230, 14231, 14232,
-   14233, 14234, 14235, 14236, 14237, 14238, 14239, 14240, 14241, 14242,
-   14243, 14244, 14245, 14246, 14247, 14248, 14249, 14250, 14251, 14252,
-   14253, 14254, 14255, 14256, 14257, 14258, 14259, 14260, 14261, 14262,
-   14263, 14264, 14265, 14266, 14267, 14268, 14269, 14270, 14271, 14272,
-   14273, 14274, 14275, 14276, 14277, 14278, 14279, 14280, 14281, 14282,
-   14283, 14284, 14285, 14286, 14287, 14288, 14289, 14290, 14291, 14292,
-   14293, 14294, 14295, 14296, 14297, 14298, 14299, 14300, 14301, 14302,
-   14303, 14304, 14305, 14306, 14307, 14308, 14309, 14310, 14311, 14312,
-   14313, 14314, 14315, 14316, 14317, 14318, 14319, 14320, 14321, 14322,
-   14323, 14324, 14325, 14326, 14327, 14328, 14329, 14330, 14331, 14332,
-   14333, 14334, 14335, 14336, 14337, 14338, 14339, 14340, 14341, 14342,
-   14343, 14344, 14345, 14346, 14347, 14348, 14349, 14350, 14351, 14352,
-   14353, 14354, 14355, 14356, 14357, 14358, 14359, 14360, 14361, 14362,
-   14363, 14364, 14365, 14366, 14367, 14368, 14369, 14370, 14371, 14372,
-   14373, 14374, 14375, 14376, 14377, 14378, 14379, 14380, 14381, 14382,
-   14383, 14384, 14385, 14386, 14387, 14388, 14389, 14390, 14391, 14392,
-   14393, 14394, 14395, 14396, 14397, 14398, 14399, 14400, 14401, 14402,
-   14403, 14404, 14405, 14406, 14407, 14408, 14409, 14410, 14411, 14412,
-   14413, 14414, 14415, 14416, 14417, 14418, 14419, 14420, 14421, 14422,
-   14423, 14424, 14425, 14426, 14427, 14428, 14429, 14430, 14431, 14432,
-   14433, 14434, 14435, 14436, 14437, 14438, 14439, 14440, 14441, 14442,
-   14443, 14444, 14445, 14446, 14447, 14448, 14449, 14450, 14451, 14463,
-   14462, 14482, 14481, 14488, 14487, 14497, 14496, 14507, 14506, 14512,
-   14520, 14522, 14527, 14527, 14536, 14535, 14549, 14548, 14553, 14557,
-   14558, 14559, 14563, 14564, 14565, 14566, 14570, 14571, 14572, 14573,
-   14578, 14604, 14603, 14703, 14714, 14727, 14743, 14756, 14778, 14813,
-   14855, 14883, 14929, 14943, 14944, 14945, 14946, 14950, 14968, 14986,
-   14987, 14991, 14992, 14993, 14994, 14998, 14999, 15017, 15030, 15031,
-   15032, 15038, 15044, 15056, 15055, 15071, 15072, 15076, 15077, 15081,
-   15094, 15095, 15096, 15101, 15106, 15105, 15125, 15141, 15158, 15157,
-   15196, 15197, 15201, 15202, 15206, 15207, 15208, 15209, 15211, 15210,
-   15224, 15225, 15226, 15227, 15228, 15234, 15234, 15239, 15244, 15254,
-   15264, 15268, 15277, 15277, 15282, 15288, 15299, 15310, 15318, 15320,
-   15324, 15331, 15338, 15340, 15344, 15345, 15350, 15349, 15353, 15352,
-   15356, 15355, 15359, 15358, 15361, 15362, 15363, 15364, 15365, 15366,
-   15367, 15368, 15369, 15370, 15371, 15372, 15373, 15374, 15375, 15376,
-   15377, 15378, 15379, 15380, 15381, 15382, 15383, 15384, 15385, 15386,
-   15390, 15391, 15395, 15396, 15400, 15410, 15420, 15433, 15448, 15461,
-   15474, 15486, 15491, 15499, 15504, 15512, 15530, 15550, 15562, 15575,
-   15584, 15588, 15592, 15593, 15597, 15624, 15626, 15630, 15634, 15638,
-   15645, 15646, 15650, 15651, 15655, 15656, 15660, 15661, 15667, 15673,
-   15679, 15689, 15688, 15698, 15699, 15704, 15705, 15706, 15711, 15712,
-   15713, 15717, 15718, 15722, 15734, 15743, 15753, 15762, 15776, 15777,
-   15782, 15781, 15797, 15798, 15799, 15803, 15804, 15808, 15808, 15832,
-   15833, 15837, 15838, 15839, 15843, 15847, 15854, 15857, 15855, 15871,
-   15878, 15899, 15916, 15918, 15922, 15923, 15927, 15928, 15936, 15937,
-   15938, 15939, 15945, 15951, 15961, 15963, 15965, 15970, 15971, 15972,
-   15973, 15974, 15978, 15979, 15980, 15981, 15982, 15983, 15993, 15994,
-   15999, 16012, 16025, 16027, 16029, 16034, 16039, 16041, 16043, 16049,
-   16050, 16052, 16058, 16057, 16075, 16076, 16080, 16085, 16093, 16093,
-   16119, 16118, 16135, 16139, 16144, 16149, 16148, 16160, 16161, 16163,
-   16165, 16183, 16189, 16194, 16176, 16257, 16275, 16300, 16332, 16337,
-   16345, 16368, 16296, 16434, 16454, 16467, 16477, 16433, 16498, 16502,
-   16506, 16510, 16514, 16518, 16525, 16532, 16539, 16549, 16550, 16554,
-   16555, 16556, 16560, 16561, 16566, 16568, 16567, 16573, 16574, 16578,
-   16588
+   13386, 13387, 13396, 13397, 13398, 13399, 13414, 13420, 13426, 13432,
+   13438, 13467, 13498, 13508, 13518, 13524, 13533, 13545, 13551, 13557,
+   13573, 13574, 13578, 13587, 13603, 13607, 13658, 13662, 13680, 13684,
+   13764, 13789, 13820, 13821, 13837, 13847, 13851, 13857, 13863, 13873,
+   13879, 13888, 13898, 13899, 13929, 13942, 13958, 13974, 13991, 13992,
+   14003, 14004, 14015, 14016, 14017, 14021, 14048, 14081, 14096, 14097,
+   14098, 14099, 14100, 14101, 14102, 14103, 14104, 14105, 14106, 14107,
+   14108, 14109, 14110, 14111, 14112, 14113, 14114, 14115, 14116, 14117,
+   14118, 14119, 14120, 14121, 14122, 14123, 14124, 14125, 14126, 14127,
+   14128, 14129, 14130, 14131, 14132, 14133, 14134, 14135, 14136, 14137,
+   14138, 14139, 14140, 14141, 14142, 14143, 14144, 14145, 14155, 14156,
+   14157, 14158, 14159, 14160, 14161, 14162, 14163, 14164, 14165, 14166,
+   14167, 14168, 14169, 14170, 14171, 14172, 14173, 14174, 14175, 14176,
+   14177, 14178, 14179, 14180, 14181, 14182, 14183, 14184, 14185, 14186,
+   14187, 14188, 14189, 14190, 14191, 14192, 14193, 14194, 14195, 14196,
+   14197, 14198, 14199, 14204, 14205, 14206, 14207, 14208, 14209, 14210,
+   14211, 14212, 14213, 14214, 14215, 14216, 14217, 14218, 14219, 14220,
+   14221, 14222, 14223, 14224, 14225, 14226, 14227, 14228, 14229, 14230,
+   14231, 14232, 14233, 14234, 14235, 14236, 14237, 14238, 14239, 14240,
+   14241, 14242, 14243, 14244, 14245, 14246, 14247, 14248, 14249, 14250,
+   14251, 14252, 14253, 14254, 14255, 14256, 14257, 14258, 14259, 14260,
+   14261, 14262, 14263, 14264, 14265, 14266, 14267, 14268, 14269, 14270,
+   14271, 14272, 14273, 14274, 14275, 14276, 14277, 14278, 14279, 14280,
+   14281, 14282, 14283, 14284, 14285, 14286, 14287, 14288, 14289, 14290,
+   14291, 14292, 14293, 14294, 14295, 14296, 14297, 14298, 14299, 14300,
+   14301, 14302, 14303, 14304, 14305, 14306, 14307, 14308, 14309, 14310,
+   14311, 14312, 14313, 14314, 14315, 14316, 14317, 14318, 14319, 14320,
+   14321, 14322, 14323, 14324, 14325, 14326, 14327, 14328, 14329, 14330,
+   14331, 14332, 14333, 14334, 14335, 14336, 14337, 14338, 14339, 14340,
+   14341, 14342, 14343, 14344, 14345, 14346, 14347, 14348, 14349, 14350,
+   14351, 14352, 14353, 14354, 14355, 14356, 14357, 14358, 14359, 14360,
+   14361, 14362, 14363, 14364, 14365, 14366, 14367, 14368, 14369, 14370,
+   14371, 14372, 14373, 14374, 14375, 14376, 14377, 14378, 14379, 14380,
+   14381, 14382, 14383, 14384, 14385, 14386, 14387, 14388, 14389, 14390,
+   14391, 14392, 14393, 14394, 14395, 14396, 14397, 14398, 14399, 14400,
+   14401, 14402, 14403, 14404, 14405, 14406, 14407, 14408, 14409, 14410,
+   14411, 14412, 14413, 14414, 14415, 14416, 14417, 14418, 14419, 14420,
+   14421, 14422, 14423, 14424, 14425, 14426, 14427, 14428, 14429, 14430,
+   14431, 14432, 14433, 14434, 14435, 14436, 14437, 14438, 14439, 14440,
+   14441, 14442, 14443, 14444, 14445, 14446, 14447, 14448, 14449, 14450,
+   14451, 14452, 14453, 14454, 14455, 14456, 14457, 14458, 14459, 14471,
+   14470, 14490, 14489, 14496, 14495, 14505, 14504, 14515, 14514, 14520,
+   14528, 14530, 14535, 14535, 14544, 14543, 14557, 14556, 14561, 14565,
+   14566, 14567, 14571, 14572, 14573, 14574, 14578, 14579, 14580, 14581,
+   14586, 14612, 14611, 14711, 14722, 14735, 14751, 14764, 14786, 14821,
+   14863, 14891, 14937, 14951, 14952, 14953, 14954, 14958, 14976, 14994,
+   14995, 14999, 15000, 15001, 15002, 15006, 15007, 15025, 15039, 15040,
+   15041, 15047, 15053, 15065, 15064, 15080, 15081, 15085, 15086, 15090,
+   15103, 15104, 15105, 15110, 15115, 15114, 15134, 15150, 15167, 15166,
+   15205, 15206, 15210, 15211, 15215, 15216, 15217, 15218, 15220, 15219,
+   15233, 15234, 15235, 15236, 15237, 15243, 15243, 15248, 15253, 15263,
+   15273, 15277, 15286, 15286, 15291, 15297, 15308, 15319, 15327, 15329,
+   15333, 15340, 15347, 15349, 15353, 15354, 15359, 15358, 15362, 15361,
+   15365, 15364, 15368, 15367, 15370, 15371, 15372, 15373, 15374, 15375,
+   15376, 15377, 15378, 15379, 15380, 15381, 15382, 15383, 15384, 15385,
+   15386, 15387, 15388, 15389, 15390, 15391, 15392, 15393, 15394, 15395,
+   15399, 15400, 15404, 15405, 15409, 15419, 15429, 15442, 15457, 15470,
+   15483, 15495, 15500, 15508, 15513, 15521, 15539, 15559, 15571, 15584,
+   15593, 15597, 15601, 15602, 15606, 15633, 15635, 15639, 15643, 15647,
+   15654, 15655, 15659, 15660, 15664, 15665, 15669, 15670, 15676, 15682,
+   15688, 15698, 15697, 15707, 15708, 15713, 15714, 15715, 15720, 15721,
+   15722, 15726, 15727, 15731, 15743, 15752, 15762, 15771, 15785, 15786,
+   15791, 15790, 15806, 15807, 15808, 15812, 15813, 15817, 15817, 15841,
+   15842, 15846, 15847, 15848, 15852, 15856, 15863, 15866, 15864, 15880,
+   15887, 15908, 15932, 15934, 15938, 15939, 15943, 15944, 15952, 15953,
+   15954, 15955, 15961, 15967, 15977, 15979, 15981, 15986, 15987, 15988,
+   15989, 15990, 15994, 15995, 15996, 15997, 15998, 15999, 16009, 16010,
+   16015, 16028, 16041, 16043, 16045, 16050, 16055, 16057, 16059, 16065,
+   16066, 16068, 16074, 16073, 16091, 16092, 16096, 16101, 16109, 16109,
+   16135, 16134, 16151, 16155, 16160, 16165, 16164, 16176, 16177, 16179,
+   16181, 16199, 16205, 16210, 16192, 16273, 16291, 16316, 16348, 16353,
+   16361, 16384, 16312, 16450, 16470, 16483, 16493, 16449, 16514, 16518,
+   16522, 16526, 16530, 16534, 16541, 16548, 16555, 16565, 16566, 16570,
+   16571, 16572, 16576, 16577, 16582, 16584, 16583, 16589, 16590, 16594,
+   16604
 };
 #endif
 
@@ -5036,8 +5032,8 @@
        3
 };
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
@@ -6160,7 +6156,8 @@
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -2610
 static const yytype_int16 yytable[] =
 {
@@ -11722,12 +11719,6 @@
        0,     0,   488
 };
 
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-3874))
-
-#define yytable_value_is_error(yytable_value) \
-  YYID (0)
-
 static const yytype_int16 yycheck[] =
 {
        6,   638,   647,   648,   594,   575,   574,   575,   953,  1137,
@@ -17759,18 +17750,9 @@
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
+   Once GCC version 2 has supplanted version 1, this can go.  */
 
 #define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -17780,12 +17762,13 @@
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
     {								\
-      yyerror (yythd, YY_("syntax error: cannot back up")); \
+      yyerror (YYTHD, YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (YYID (0))
@@ -17821,10 +17804,19 @@
 #endif
 
 
-/* This macro is provided for backward compatibility. */
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
 
@@ -17833,7 +17825,7 @@
 #ifdef YYLEX_PARAM
 # define YYLEX yylex (&yylval, YYLEX_PARAM)
 #else
-# define YYLEX yylex (&yylval, yythd)
+# define YYLEX yylex (&yylval, YYTHD)
 #endif
 
 /* Enable debugging if requested.  */
@@ -17856,7 +17848,7 @@
     {									  \
       YYFPRINTF (stderr, "%s ", Title);					  \
       yy_symbol_print (stderr,						  \
-		  Type, Value, yythd); \
+		  Type, Value, YYTHD); \
       YYFPRINTF (stderr, "\n");						  \
     }									  \
 } while (YYID (0))
@@ -17870,19 +17862,19 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, void *yythd)
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, class THD *YYTHD)
 #else
 static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep, yythd)
+yy_symbol_value_print (yyoutput, yytype, yyvaluep, YYTHD)
     FILE *yyoutput;
     int yytype;
     YYSTYPE const * const yyvaluep;
-    void *yythd;
+    class THD *YYTHD;
 #endif
 {
   if (!yyvaluep)
     return;
-  YYUSE (yythd);
+  YYUSE (YYTHD);
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
@@ -17904,14 +17896,14 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, void *yythd)
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, class THD *YYTHD)
 #else
 static void
-yy_symbol_print (yyoutput, yytype, yyvaluep, yythd)
+yy_symbol_print (yyoutput, yytype, yyvaluep, YYTHD)
     FILE *yyoutput;
     int yytype;
     YYSTYPE const * const yyvaluep;
-    void *yythd;
+    class THD *YYTHD;
 #endif
 {
   if (yytype < YYNTOKENS)
@@ -17919,7 +17911,7 @@
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yythd);
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, YYTHD);
   YYFPRINTF (yyoutput, ")");
 }
 
@@ -17962,13 +17954,13 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule, void *yythd)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule, class THD *YYTHD)
 #else
 static void
-yy_reduce_print (yyvsp, yyrule, yythd)
+yy_reduce_print (yyvsp, yyrule, YYTHD)
     YYSTYPE *yyvsp;
     int yyrule;
-    void *yythd;
+    class THD *YYTHD;
 #endif
 {
   int yynrhs = yyr2[yyrule];
@@ -17982,7 +17974,7 @@
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       , yythd);
+		       		       , YYTHD);
       YYFPRINTF (stderr, "\n");
     }
 }
@@ -17990,7 +17982,7 @@
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule, yythd); \
+    yy_reduce_print (yyvsp, Rule, YYTHD); \
 } while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
@@ -18020,6 +18012,7 @@
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -18122,142 +18115,115 @@
 }
 # endif
 
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = 0;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
-              }
-        }
-    }
+  int yyn = yypact[yystate];
 
-  switch (yycount)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
 
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
 }
 #endif /* YYERROR_VERBOSE */
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -18267,18 +18233,18 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, void *yythd)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, class THD *YYTHD)
 #else
 static void
-yydestruct (yymsg, yytype, yyvaluep, yythd)
+yydestruct (yymsg, yytype, yyvaluep, YYTHD)
     const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
-    void *yythd;
+    class THD *YYTHD;
 #endif
 {
   YYUSE (yyvaluep);
-  YYUSE (yythd);
+  YYUSE (YYTHD);
 
   if (!yymsg)
     yymsg = "Deleting";
@@ -18292,7 +18258,6 @@
     }
 }
 
-
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@@ -18302,16 +18267,19 @@
 #endif
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int yyparse (void *yythd);
+int yyparse (class THD *YYTHD);
 #else
 int yyparse ();
 #endif
 #endif /* ! YYPARSE_PARAM */
 
 
-/*----------.
-| yyparse.  |
-`----------*/
+
+
+
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -18327,11 +18295,11 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 int
-yyparse (void *yythd)
+yyparse (class THD *YYTHD)
 #else
 int
-yyparse (yythd)
-    void *yythd;
+yyparse (YYTHD)
+    class THD *YYTHD;
 #endif
 #endif
 {
@@ -18498,7 +18466,7 @@
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -18529,8 +18497,8 @@
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -18585,8 +18553,8 @@
     {
         case 2:
 
-/* Line 1806 of yacc.c  */
-#line 1972 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 1970 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             if (!thd->bootstrap &&
@@ -18602,8 +18570,8 @@
 
   case 3:
 
-/* Line 1806 of yacc.c  */
-#line 1984 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 1982 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex_input_stream *lip = YYLIP;
 
@@ -18630,8 +18598,8 @@
 
   case 5:
 
-/* Line 1806 of yacc.c  */
-#line 2009 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2007 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* Single query, not terminated. */
             YYLIP->found_semicolon= NULL;
@@ -18640,8 +18608,8 @@
 
   case 62:
 
-/* Line 1806 of yacc.c  */
-#line 2083 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2081 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -18652,8 +18620,8 @@
 
   case 65:
 
-/* Line 1806 of yacc.c  */
-#line 2098 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2096 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -18674,8 +18642,8 @@
 
   case 66:
 
-/* Line 1806 of yacc.c  */
-#line 2118 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2116 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -18686,8 +18654,8 @@
 
   case 67:
 
-/* Line 1806 of yacc.c  */
-#line 2125 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2123 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -18698,8 +18666,8 @@
 
   case 68:
 
-/* Line 1806 of yacc.c  */
-#line 2135 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2133 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -18710,15 +18678,15 @@
 
   case 69:
 
-/* Line 1806 of yacc.c  */
-#line 2142 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2140 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 74:
 
-/* Line 1806 of yacc.c  */
-#line 2157 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2155 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             LEX_STRING *lexstr= (LEX_STRING*)sql_memdup(&(yyvsp[(2) - (2)].lex_str), sizeof(LEX_STRING));
@@ -18729,8 +18697,8 @@
 
   case 75:
 
-/* Line 1806 of yacc.c  */
-#line 2169 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2167 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->sphead)
             {
@@ -18742,8 +18710,8 @@
 
   case 76:
 
-/* Line 1806 of yacc.c  */
-#line 2177 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2175 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_HELP;
@@ -18753,8 +18721,8 @@
 
   case 77:
 
-/* Line 1806 of yacc.c  */
-#line 2188 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2186 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex = Lex;
             lex->sql_command = SQLCOM_CHANGE_MASTER;
@@ -18771,15 +18739,15 @@
 
   case 78:
 
-/* Line 1806 of yacc.c  */
-#line 2201 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2199 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 81:
 
-/* Line 1806 of yacc.c  */
-#line 2211 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2209 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.host = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18787,8 +18755,8 @@
 
   case 82:
 
-/* Line 1806 of yacc.c  */
-#line 2215 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2213 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.bind_addr = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18796,8 +18764,8 @@
 
   case 83:
 
-/* Line 1806 of yacc.c  */
-#line 2219 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2217 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.user = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18805,8 +18773,8 @@
 
   case 84:
 
-/* Line 1806 of yacc.c  */
-#line 2223 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2221 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.password = (yyvsp[(3) - (3)].lex_str).str;
             Lex->contains_plaintext_password= true;
@@ -18815,8 +18783,8 @@
 
   case 85:
 
-/* Line 1806 of yacc.c  */
-#line 2228 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2226 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.port = (yyvsp[(3) - (3)].ulong_num);
           }
@@ -18824,8 +18792,8 @@
 
   case 86:
 
-/* Line 1806 of yacc.c  */
-#line 2232 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2230 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.connect_retry = (yyvsp[(3) - (3)].ulong_num);
           }
@@ -18833,8 +18801,8 @@
 
   case 87:
 
-/* Line 1806 of yacc.c  */
-#line 2236 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2234 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.retry_count= (yyvsp[(3) - (3)].ulong_num);
             Lex->mi.retry_count_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
@@ -18843,8 +18811,8 @@
 
   case 88:
 
-/* Line 1806 of yacc.c  */
-#line 2241 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2239 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((yyvsp[(3) - (3)].ulong_num) > MASTER_DELAY_MAX)
             {
@@ -18861,8 +18829,8 @@
 
   case 89:
 
-/* Line 1806 of yacc.c  */
-#line 2254 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2252 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.ssl= (yyvsp[(3) - (3)].ulong_num) ? 
               LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
@@ -18871,8 +18839,8 @@
 
   case 90:
 
-/* Line 1806 of yacc.c  */
-#line 2259 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2257 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_ca= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18880,8 +18848,8 @@
 
   case 91:
 
-/* Line 1806 of yacc.c  */
-#line 2263 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2261 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_capath= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18889,8 +18857,8 @@
 
   case 92:
 
-/* Line 1806 of yacc.c  */
-#line 2267 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2265 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_cert= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18898,8 +18866,8 @@
 
   case 93:
 
-/* Line 1806 of yacc.c  */
-#line 2271 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2269 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_cipher= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18907,8 +18875,8 @@
 
   case 94:
 
-/* Line 1806 of yacc.c  */
-#line 2275 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2273 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_key= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18916,8 +18884,8 @@
 
   case 95:
 
-/* Line 1806 of yacc.c  */
-#line 2279 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2277 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_verify_server_cert= (yyvsp[(3) - (3)].ulong_num) ?
               LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
@@ -18926,8 +18894,8 @@
 
   case 96:
 
-/* Line 1806 of yacc.c  */
-#line 2284 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2282 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_crl= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18935,8 +18903,8 @@
 
   case 97:
 
-/* Line 1806 of yacc.c  */
-#line 2288 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2286 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_crlpath= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -18944,8 +18912,8 @@
 
   case 98:
 
-/* Line 1806 of yacc.c  */
-#line 2293 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2291 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.heartbeat_period= (float) (yyvsp[(3) - (3)].item_num)->val_real();
             if (Lex->mi.heartbeat_period > SLAVE_MAX_HEARTBEAT_PERIOD ||
@@ -18980,8 +18948,8 @@
 
   case 99:
 
-/* Line 1806 of yacc.c  */
-#line 2324 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2322 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
            }
@@ -18989,8 +18957,8 @@
 
   case 100:
 
-/* Line 1806 of yacc.c  */
-#line 2329 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2327 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.auto_position= (yyvsp[(3) - (3)].ulong_num) ?
               LEX_MASTER_INFO::LEX_MI_ENABLE :
@@ -19000,8 +18968,8 @@
 
   case 105:
 
-/* Line 1806 of yacc.c  */
-#line 2346 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2344 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->mi.repl_ignore_server_ids.elements == 0)
             {
@@ -19017,8 +18985,8 @@
 
   case 106:
 
-/* Line 1806 of yacc.c  */
-#line 2360 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2358 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.log_file_name = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -19026,8 +18994,8 @@
 
   case 107:
 
-/* Line 1806 of yacc.c  */
-#line 2364 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2362 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.pos = (yyvsp[(3) - (3)].ulonglong_number);
             /* 
@@ -19047,8 +19015,8 @@
 
   case 108:
 
-/* Line 1806 of yacc.c  */
-#line 2380 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2378 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.relay_log_name = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -19056,8 +19024,8 @@
 
   case 109:
 
-/* Line 1806 of yacc.c  */
-#line 2384 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2382 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.relay_log_pos = (yyvsp[(3) - (3)].ulong_num);
             /* Adjust if < BIN_LOG_HEADER_SIZE (same comment as Lex->mi.pos) */
@@ -19068,8 +19036,8 @@
 
   case 110:
 
-/* Line 1806 of yacc.c  */
-#line 2396 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2394 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -19099,8 +19067,8 @@
 
   case 111:
 
-/* Line 1806 of yacc.c  */
-#line 2422 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2420 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -19123,8 +19091,8 @@
 
   case 112:
 
-/* Line 1806 of yacc.c  */
-#line 2441 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2439 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table)))
               MYSQL_YYABORT;
@@ -19133,8 +19101,8 @@
 
   case 113:
 
-/* Line 1806 of yacc.c  */
-#line 2446 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2444 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str)))
               MYSQL_YYABORT;
@@ -19143,15 +19111,15 @@
 
   case 114:
 
-/* Line 1806 of yacc.c  */
-#line 2450 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2448 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 115:
 
-/* Line 1806 of yacc.c  */
-#line 2453 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2451 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table)))
               MYSQL_YYABORT;
@@ -19160,8 +19128,8 @@
 
   case 116:
 
-/* Line 1806 of yacc.c  */
-#line 2458 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2456 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str)))
               MYSQL_YYABORT;
@@ -19170,15 +19138,15 @@
 
   case 117:
 
-/* Line 1806 of yacc.c  */
-#line 2462 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2460 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 118:
 
-/* Line 1806 of yacc.c  */
-#line 2465 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2463 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table)))
               MYSQL_YYABORT;
@@ -19187,8 +19155,8 @@
 
   case 119:
 
-/* Line 1806 of yacc.c  */
-#line 2470 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2468 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str)))
               MYSQL_YYABORT;
@@ -19197,15 +19165,15 @@
 
   case 120:
 
-/* Line 1806 of yacc.c  */
-#line 2474 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2472 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 121:
 
-/* Line 1806 of yacc.c  */
-#line 2476 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2474 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.default_table_charset= NULL;
             Lex->create_info.used_fields= 0;
@@ -19214,8 +19182,8 @@
 
   case 122:
 
-/* Line 1806 of yacc.c  */
-#line 2481 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2479 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_CREATE_DB;
@@ -19226,8 +19194,8 @@
 
   case 123:
 
-/* Line 1806 of yacc.c  */
-#line 2488 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2486 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_view_mode= VIEW_CREATE_NEW;
             Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED;
@@ -19237,15 +19205,15 @@
 
   case 124:
 
-/* Line 1806 of yacc.c  */
-#line 2494 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2492 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 125:
 
-/* Line 1806 of yacc.c  */
-#line 2496 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2494 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_CREATE_USER;
           }
@@ -19253,8 +19221,8 @@
 
   case 126:
 
-/* Line 1806 of yacc.c  */
-#line 2500 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2498 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_tablespace_info->ts_cmd_type= CREATE_LOGFILE_GROUP;
           }
@@ -19262,8 +19230,8 @@
 
   case 127:
 
-/* Line 1806 of yacc.c  */
-#line 2504 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2502 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_tablespace_info->ts_cmd_type= CREATE_TABLESPACE;
           }
@@ -19271,8 +19239,8 @@
 
   case 128:
 
-/* Line 1806 of yacc.c  */
-#line 2508 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2506 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command= SQLCOM_CREATE_SERVER;
           }
@@ -19280,8 +19248,8 @@
 
   case 129:
 
-/* Line 1806 of yacc.c  */
-#line 2519 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2517 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->server_options.server_name= (yyvsp[(2) - (10)].lex_str).str;
             Lex->server_options.server_name_length= (yyvsp[(2) - (10)].lex_str).length;
@@ -19291,8 +19259,8 @@
 
   case 132:
 
-/* Line 1806 of yacc.c  */
-#line 2533 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2531 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->server_options.username= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -19300,8 +19268,8 @@
 
   case 133:
 
-/* Line 1806 of yacc.c  */
-#line 2537 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2535 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->server_options.host= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -19309,8 +19277,8 @@
 
   case 134:
 
-/* Line 1806 of yacc.c  */
-#line 2541 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2539 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->server_options.db= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -19318,8 +19286,8 @@
 
   case 135:
 
-/* Line 1806 of yacc.c  */
-#line 2545 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2543 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->server_options.owner= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -19327,8 +19295,8 @@
 
   case 136:
 
-/* Line 1806 of yacc.c  */
-#line 2549 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2547 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->server_options.password= (yyvsp[(2) - (2)].lex_str).str;
             Lex->contains_plaintext_password= true;
@@ -19337,8 +19305,8 @@
 
   case 137:
 
-/* Line 1806 of yacc.c  */
-#line 2554 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2552 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->server_options.socket= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -19346,8 +19314,8 @@
 
   case 138:
 
-/* Line 1806 of yacc.c  */
-#line 2558 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2556 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->server_options.port= (yyvsp[(2) - (2)].ulong_num);
           }
@@ -19355,8 +19323,8 @@
 
   case 139:
 
-/* Line 1806 of yacc.c  */
-#line 2565 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2563 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex=Lex;
@@ -19376,8 +19344,8 @@
 
   case 140:
 
-/* Line 1806 of yacc.c  */
-#line 2585 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2583 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               sql_command is set here because some rules in ev_sql_stmt
@@ -19389,8 +19357,8 @@
 
   case 141:
 
-/* Line 1806 of yacc.c  */
-#line 2596 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2594 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->item_expression= (yyvsp[(2) - (3)].item);
             Lex->event_parse_data->interval= (yyvsp[(3) - (3)].interval);
@@ -19399,8 +19367,8 @@
 
   case 143:
 
-/* Line 1806 of yacc.c  */
-#line 2603 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2601 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->item_execute_at= (yyvsp[(2) - (2)].item);
           }
@@ -19408,15 +19376,15 @@
 
   case 144:
 
-/* Line 1806 of yacc.c  */
-#line 2609 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2607 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 145:
 
-/* Line 1806 of yacc.c  */
-#line 2611 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2609 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->status= Event_parse_data::ENABLED;
             Lex->event_parse_data->status_changed= true;
@@ -19426,8 +19394,8 @@
 
   case 146:
 
-/* Line 1806 of yacc.c  */
-#line 2617 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2615 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->status= Event_parse_data::SLAVESIDE_DISABLED;
             Lex->event_parse_data->status_changed= true; 
@@ -19437,8 +19405,8 @@
 
   case 147:
 
-/* Line 1806 of yacc.c  */
-#line 2623 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2621 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->status= Event_parse_data::DISABLED;
             Lex->event_parse_data->status_changed= true;
@@ -19448,8 +19416,8 @@
 
   case 148:
 
-/* Line 1806 of yacc.c  */
-#line 2632 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2630 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_func_now_local(0);
             if (item == NULL)
@@ -19460,8 +19428,8 @@
 
   case 149:
 
-/* Line 1806 of yacc.c  */
-#line 2639 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2637 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->item_starts= (yyvsp[(2) - (2)].item);
           }
@@ -19469,8 +19437,8 @@
 
   case 151:
 
-/* Line 1806 of yacc.c  */
-#line 2647 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2645 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->item_ends= (yyvsp[(2) - (2)].item);
           }
@@ -19478,15 +19446,15 @@
 
   case 152:
 
-/* Line 1806 of yacc.c  */
-#line 2653 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2651 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 154:
 
-/* Line 1806 of yacc.c  */
-#line 2659 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2657 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->on_completion=
                                   Event_parse_data::ON_COMPLETION_PRESERVE;
@@ -19496,8 +19464,8 @@
 
   case 155:
 
-/* Line 1806 of yacc.c  */
-#line 2665 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2663 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->on_completion=
                                   Event_parse_data::ON_COMPLETION_DROP;
@@ -19507,15 +19475,15 @@
 
   case 156:
 
-/* Line 1806 of yacc.c  */
-#line 2673 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2671 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 157:
 
-/* Line 1806 of yacc.c  */
-#line 2675 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2673 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->comment= Lex->event_parse_data->comment= (yyvsp[(2) - (2)].lex_str);
             (yyval.num)= 1;
@@ -19524,8 +19492,8 @@
 
   case 158:
 
-/* Line 1806 of yacc.c  */
-#line 2682 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2680 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -19572,8 +19540,8 @@
 
   case 159:
 
-/* Line 1806 of yacc.c  */
-#line 2725 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2723 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -19587,8 +19555,8 @@
 
   case 173:
 
-/* Line 1806 of yacc.c  */
-#line 2754 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2752 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
            LEX *lex=Lex;
            lex->users_list.empty();
@@ -19604,8 +19572,8 @@
 
   case 174:
 
-/* Line 1806 of yacc.c  */
-#line 2769 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2767 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!(yyvsp[(1) - (3)].lex_str).str ||
                 (check_and_convert_db_name(&(yyvsp[(1) - (3)].lex_str), FALSE) != IDENT_NAME_OK))
@@ -19623,8 +19591,8 @@
 
   case 175:
 
-/* Line 1806 of yacc.c  */
-#line 2783 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2781 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -19644,106 +19612,106 @@
 
   case 176:
 
-/* Line 1806 of yacc.c  */
-#line 2801 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2799 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 177:
 
-/* Line 1806 of yacc.c  */
-#line 2802 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2800 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 178:
 
-/* Line 1806 of yacc.c  */
-#line 2806 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2804 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 179:
 
-/* Line 1806 of yacc.c  */
-#line 2807 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2805 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 180:
 
-/* Line 1806 of yacc.c  */
-#line 2813 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2811 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sp_chistics.comment= (yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 181:
 
-/* Line 1806 of yacc.c  */
-#line 2815 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2813 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* Just parse it, we only have one language for now. */ }
     break;
 
   case 182:
 
-/* Line 1806 of yacc.c  */
-#line 2817 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2815 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sp_chistics.daccess= SP_NO_SQL; }
     break;
 
   case 183:
 
-/* Line 1806 of yacc.c  */
-#line 2819 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2817 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sp_chistics.daccess= SP_CONTAINS_SQL; }
     break;
 
   case 184:
 
-/* Line 1806 of yacc.c  */
-#line 2821 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2819 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sp_chistics.daccess= SP_READS_SQL_DATA; }
     break;
 
   case 185:
 
-/* Line 1806 of yacc.c  */
-#line 2823 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2821 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sp_chistics.daccess= SP_MODIFIES_SQL_DATA; }
     break;
 
   case 186:
 
-/* Line 1806 of yacc.c  */
-#line 2825 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2823 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 187:
 
-/* Line 1806 of yacc.c  */
-#line 2830 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2828 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 188:
 
-/* Line 1806 of yacc.c  */
-#line 2831 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2829 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sp_chistics.detistic= TRUE; }
     break;
 
   case 189:
 
-/* Line 1806 of yacc.c  */
-#line 2832 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2830 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sp_chistics.detistic= FALSE; }
     break;
 
   case 190:
 
-/* Line 1806 of yacc.c  */
-#line 2837 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2835 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sp_chistics.suid= SP_IS_SUID;
           }
@@ -19751,8 +19719,8 @@
 
   case 191:
 
-/* Line 1806 of yacc.c  */
-#line 2841 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2839 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sp_chistics.suid= SP_IS_NOT_SUID;
           }
@@ -19760,8 +19728,8 @@
 
   case 192:
 
-/* Line 1806 of yacc.c  */
-#line 2848 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2846 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex = Lex;
 
@@ -19774,15 +19742,15 @@
 
   case 193:
 
-/* Line 1806 of yacc.c  */
-#line 2856 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2854 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 198:
 
-/* Line 1806 of yacc.c  */
-#line 2872 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2870 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
            Lex->value_list.push_back((yyvsp[(3) - (3)].item));
           }
@@ -19790,8 +19758,8 @@
 
   case 199:
 
-/* Line 1806 of yacc.c  */
-#line 2876 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2874 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->value_list.push_back((yyvsp[(1) - (1)].item));
           }
@@ -19799,8 +19767,8 @@
 
   case 204:
 
-/* Line 1806 of yacc.c  */
-#line 2894 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2892 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -19821,8 +19789,8 @@
 
   case 205:
 
-/* Line 1806 of yacc.c  */
-#line 2914 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2912 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -19853,8 +19821,8 @@
 
   case 210:
 
-/* Line 1806 of yacc.c  */
-#line 2955 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2953 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -19884,50 +19852,50 @@
 
   case 211:
 
-/* Line 1806 of yacc.c  */
-#line 2983 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2981 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= sp_variable::MODE_IN; }
     break;
 
   case 212:
 
-/* Line 1806 of yacc.c  */
-#line 2984 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2982 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= sp_variable::MODE_IN; }
     break;
 
   case 213:
 
-/* Line 1806 of yacc.c  */
-#line 2985 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2983 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= sp_variable::MODE_OUT; }
     break;
 
   case 214:
 
-/* Line 1806 of yacc.c  */
-#line 2986 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2984 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= sp_variable::MODE_INOUT; }
     break;
 
   case 215:
 
-/* Line 1806 of yacc.c  */
-#line 2990 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2988 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 217:
 
-/* Line 1806 of yacc.c  */
-#line 2995 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2993 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 219:
 
-/* Line 1806 of yacc.c  */
-#line 3001 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 2999 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.spblock).vars= (yyval.spblock).conds= (yyval.spblock).hndlrs= (yyval.spblock).curs= 0;
           }
@@ -19935,8 +19903,8 @@
 
   case 220:
 
-/* Line 1806 of yacc.c  */
-#line 3005 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3003 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* We check for declarations out of (standard) order this way
               because letting the grammar rules reflect it caused tricky
@@ -19963,8 +19931,8 @@
 
   case 221:
 
-/* Line 1806 of yacc.c  */
-#line 3031 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3029 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -19978,8 +19946,8 @@
 
   case 222:
 
-/* Line 1806 of yacc.c  */
-#line 3042 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3040 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -20056,8 +20024,8 @@
 
   case 223:
 
-/* Line 1806 of yacc.c  */
-#line 3115 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3113 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -20077,8 +20045,8 @@
 
   case 224:
 
-/* Line 1806 of yacc.c  */
-#line 3131 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3129 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -20122,8 +20090,8 @@
 
   case 225:
 
-/* Line 1806 of yacc.c  */
-#line 3171 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3169 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -20161,8 +20129,8 @@
 
   case 226:
 
-/* Line 1806 of yacc.c  */
-#line 3205 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3203 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -20175,8 +20143,8 @@
 
   case 227:
 
-/* Line 1806 of yacc.c  */
-#line 3214 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3212 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *cursor_lex= Lex;
@@ -20241,36 +20209,36 @@
 
   case 228:
 
-/* Line 1806 of yacc.c  */
-#line 3277 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3275 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= sp_handler::EXIT; }
     break;
 
   case 229:
 
-/* Line 1806 of yacc.c  */
-#line 3278 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3276 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= sp_handler::CONTINUE; }
     break;
 
   case 230:
 
-/* Line 1806 of yacc.c  */
-#line 3284 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3282 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 231:
 
-/* Line 1806 of yacc.c  */
-#line 3286 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3284 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)+= 1; }
     break;
 
   case 232:
 
-/* Line 1806 of yacc.c  */
-#line 3291 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3289 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -20294,8 +20262,8 @@
 
   case 233:
 
-/* Line 1806 of yacc.c  */
-#line 3314 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3312 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* mysql errno */
             if ((yyvsp[(1) - (1)].ulong_num) == 0)
             {
@@ -20310,8 +20278,8 @@
 
   case 235:
 
-/* Line 1806 of yacc.c  */
-#line 3329 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3327 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* SQLSTATE */
 
             /*
@@ -20334,22 +20302,22 @@
 
   case 236:
 
-/* Line 1806 of yacc.c  */
-#line 3350 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3348 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 237:
 
-/* Line 1806 of yacc.c  */
-#line 3351 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3349 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 238:
 
-/* Line 1806 of yacc.c  */
-#line 3356 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3354 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.spcondvalue)= (yyvsp[(1) - (1)].spcondvalue);
           }
@@ -20357,8 +20325,8 @@
 
   case 239:
 
-/* Line 1806 of yacc.c  */
-#line 3360 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3358 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
@@ -20375,8 +20343,8 @@
 
   case 240:
 
-/* Line 1806 of yacc.c  */
-#line 3373 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3371 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.spcondvalue)= new (YYTHD->mem_root) sp_condition_value(sp_condition_value::WARNING);
             if ((yyval.spcondvalue) == NULL)
@@ -20386,8 +20354,8 @@
 
   case 241:
 
-/* Line 1806 of yacc.c  */
-#line 3379 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3377 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.spcondvalue)= new (YYTHD->mem_root) sp_condition_value(sp_condition_value::NOT_FOUND);
             if ((yyval.spcondvalue) == NULL)
@@ -20397,8 +20365,8 @@
 
   case 242:
 
-/* Line 1806 of yacc.c  */
-#line 3385 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3383 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.spcondvalue)= new (YYTHD->mem_root) sp_condition_value(sp_condition_value::EXCEPTION);
             if ((yyval.spcondvalue) == NULL)
@@ -20408,8 +20376,8 @@
 
   case 243:
 
-/* Line 1806 of yacc.c  */
-#line 3394 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3392 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -20425,8 +20393,8 @@
 
   case 244:
 
-/* Line 1806 of yacc.c  */
-#line 3409 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3407 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
@@ -20456,29 +20424,29 @@
 
   case 245:
 
-/* Line 1806 of yacc.c  */
-#line 3435 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3433 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.spcondvalue)= (yyvsp[(1) - (1)].spcondvalue); }
     break;
 
   case 246:
 
-/* Line 1806 of yacc.c  */
-#line 3440 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3438 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.spcondvalue)= NULL; }
     break;
 
   case 247:
 
-/* Line 1806 of yacc.c  */
-#line 3442 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3440 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.spcondvalue)= (yyvsp[(1) - (1)].spcondvalue); }
     break;
 
   case 248:
 
-/* Line 1806 of yacc.c  */
-#line 3447 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3445 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             YYTHD->m_parser_state->m_yacc.m_set_signal_info.clear();
           }
@@ -20486,8 +20454,8 @@
 
   case 250:
 
-/* Line 1806 of yacc.c  */
-#line 3455 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3453 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Set_signal_information *info;
             info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
@@ -20499,8 +20467,8 @@
 
   case 251:
 
-/* Line 1806 of yacc.c  */
-#line 3464 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3462 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Set_signal_information *info;
             info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
@@ -20517,15 +20485,15 @@
 
   case 252:
 
-/* Line 1806 of yacc.c  */
-#line 3483 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3481 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 253:
 
-/* Line 1806 of yacc.c  */
-#line 3485 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3483 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((yyvsp[(1) - (1)].item)->type() == Item::FUNC_ITEM)
             {
@@ -20547,99 +20515,99 @@
 
   case 254:
 
-/* Line 1806 of yacc.c  */
-#line 3503 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3501 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 255:
 
-/* Line 1806 of yacc.c  */
-#line 3509 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3507 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CLASS_ORIGIN; }
     break;
 
   case 256:
 
-/* Line 1806 of yacc.c  */
-#line 3511 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3509 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_SUBCLASS_ORIGIN; }
     break;
 
   case 257:
 
-/* Line 1806 of yacc.c  */
-#line 3513 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3511 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_CATALOG; }
     break;
 
   case 258:
 
-/* Line 1806 of yacc.c  */
-#line 3515 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3513 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_SCHEMA; }
     break;
 
   case 259:
 
-/* Line 1806 of yacc.c  */
-#line 3517 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3515 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_NAME; }
     break;
 
   case 260:
 
-/* Line 1806 of yacc.c  */
-#line 3519 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3517 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CATALOG_NAME; }
     break;
 
   case 261:
 
-/* Line 1806 of yacc.c  */
-#line 3521 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3519 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_SCHEMA_NAME; }
     break;
 
   case 262:
 
-/* Line 1806 of yacc.c  */
-#line 3523 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3521 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_TABLE_NAME; }
     break;
 
   case 263:
 
-/* Line 1806 of yacc.c  */
-#line 3525 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3523 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_COLUMN_NAME; }
     break;
 
   case 264:
 
-/* Line 1806 of yacc.c  */
-#line 3527 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3525 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CURSOR_NAME; }
     break;
 
   case 265:
 
-/* Line 1806 of yacc.c  */
-#line 3529 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3527 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_MESSAGE_TEXT; }
     break;
 
   case 266:
 
-/* Line 1806 of yacc.c  */
-#line 3531 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3529 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_MYSQL_ERRNO; }
     break;
 
   case 267:
 
-/* Line 1806 of yacc.c  */
-#line 3536 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3534 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -20656,8 +20624,8 @@
 
   case 268:
 
-/* Line 1806 of yacc.c  */
-#line 3552 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3550 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Diagnostics_information *info= (yyvsp[(4) - (4)].diag_info);
 
@@ -20673,22 +20641,22 @@
 
   case 269:
 
-/* Line 1806 of yacc.c  */
-#line 3567 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3565 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_area)= Diagnostics_information::CURRENT_AREA; }
     break;
 
   case 270:
 
-/* Line 1806 of yacc.c  */
-#line 3569 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3567 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.diag_area)= Diagnostics_information::CURRENT_AREA; }
     break;
 
   case 271:
 
-/* Line 1806 of yacc.c  */
-#line 3574 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3572 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.diag_info)= new (YYTHD->mem_root) Statement_information((yyvsp[(1) - (1)].stmt_info_list));
             if ((yyval.diag_info) == NULL)
@@ -20698,8 +20666,8 @@
 
   case 272:
 
-/* Line 1806 of yacc.c  */
-#line 3580 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3578 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.diag_info)= new (YYTHD->mem_root) Condition_information((yyvsp[(2) - (3)].item), (yyvsp[(3) - (3)].cond_info_list));
             if ((yyval.diag_info) == NULL)
@@ -20709,8 +20677,8 @@
 
   case 273:
 
-/* Line 1806 of yacc.c  */
-#line 3589 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3587 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.stmt_info_list)= new (YYTHD->mem_root) List<Statement_information_item>;
             if ((yyval.stmt_info_list) == NULL || (yyval.stmt_info_list)->push_back((yyvsp[(1) - (1)].stmt_info_item)))
@@ -20720,8 +20688,8 @@
 
   case 274:
 
-/* Line 1806 of yacc.c  */
-#line 3595 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3593 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((yyvsp[(1) - (3)].stmt_info_list)->push_back((yyvsp[(3) - (3)].stmt_info_item)))
               MYSQL_YYABORT;
@@ -20731,8 +20699,8 @@
 
   case 275:
 
-/* Line 1806 of yacc.c  */
-#line 3604 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3602 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.stmt_info_item)= new (YYTHD->mem_root) Statement_information_item((yyvsp[(3) - (3)].stmt_info_item_name), (yyvsp[(1) - (3)].item));
             if ((yyval.stmt_info_item) == NULL)
@@ -20742,8 +20710,8 @@
 
   case 276:
 
-/* Line 1806 of yacc.c  */
-#line 3612 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3610 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -20776,8 +20744,8 @@
 
   case 277:
 
-/* Line 1806 of yacc.c  */
-#line 3641 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3639 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_get_user_var((yyvsp[(2) - (2)].lex_str));
             if ((yyval.item) == NULL)
@@ -20787,29 +20755,29 @@
 
   case 278:
 
-/* Line 1806 of yacc.c  */
-#line 3650 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3648 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.stmt_info_item_name)= Statement_information_item::NUMBER; }
     break;
 
   case 279:
 
-/* Line 1806 of yacc.c  */
-#line 3652 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3650 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.stmt_info_item_name)= Statement_information_item::ROW_COUNT; }
     break;
 
   case 280:
 
-/* Line 1806 of yacc.c  */
-#line 3661 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3659 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 281:
 
-/* Line 1806 of yacc.c  */
-#line 3666 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3664 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.cond_info_list)= new (YYTHD->mem_root) List<Condition_information_item>;
             if ((yyval.cond_info_list) == NULL || (yyval.cond_info_list)->push_back((yyvsp[(1) - (1)].cond_info_item)))
@@ -20819,8 +20787,8 @@
 
   case 282:
 
-/* Line 1806 of yacc.c  */
-#line 3672 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3670 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((yyvsp[(1) - (3)].cond_info_list)->push_back((yyvsp[(3) - (3)].cond_info_item)))
               MYSQL_YYABORT;
@@ -20830,8 +20798,8 @@
 
   case 283:
 
-/* Line 1806 of yacc.c  */
-#line 3681 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3679 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.cond_info_item)= new (YYTHD->mem_root) Condition_information_item((yyvsp[(3) - (3)].cond_info_item_name), (yyvsp[(1) - (3)].item));
             if ((yyval.cond_info_item) == NULL)
@@ -20841,99 +20809,99 @@
 
   case 284:
 
-/* Line 1806 of yacc.c  */
-#line 3689 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3687 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::CLASS_ORIGIN; }
     break;
 
   case 285:
 
-/* Line 1806 of yacc.c  */
-#line 3691 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3689 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::SUBCLASS_ORIGIN; }
     break;
 
   case 286:
 
-/* Line 1806 of yacc.c  */
-#line 3693 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3691 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::CONSTRAINT_CATALOG; }
     break;
 
   case 287:
 
-/* Line 1806 of yacc.c  */
-#line 3695 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3693 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::CONSTRAINT_SCHEMA; }
     break;
 
   case 288:
 
-/* Line 1806 of yacc.c  */
-#line 3697 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3695 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::CONSTRAINT_NAME; }
     break;
 
   case 289:
 
-/* Line 1806 of yacc.c  */
-#line 3699 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3697 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::CATALOG_NAME; }
     break;
 
   case 290:
 
-/* Line 1806 of yacc.c  */
-#line 3701 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3699 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::SCHEMA_NAME; }
     break;
 
   case 291:
 
-/* Line 1806 of yacc.c  */
-#line 3703 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3701 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::TABLE_NAME; }
     break;
 
   case 292:
 
-/* Line 1806 of yacc.c  */
-#line 3705 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3703 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::COLUMN_NAME; }
     break;
 
   case 293:
 
-/* Line 1806 of yacc.c  */
-#line 3707 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3705 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::CURSOR_NAME; }
     break;
 
   case 294:
 
-/* Line 1806 of yacc.c  */
-#line 3709 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3707 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::MESSAGE_TEXT; }
     break;
 
   case 295:
 
-/* Line 1806 of yacc.c  */
-#line 3711 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3709 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::MYSQL_ERRNO; }
     break;
 
   case 296:
 
-/* Line 1806 of yacc.c  */
-#line 3713 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3711 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cond_info_item_name)= Condition_information_item::RETURNED_SQLSTATE; }
     break;
 
   case 297:
 
-/* Line 1806 of yacc.c  */
-#line 3718 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3716 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* NOTE: field definition is filled in sp_decl section. */
 
@@ -20957,8 +20925,8 @@
 
   case 298:
 
-/* Line 1806 of yacc.c  */
-#line 3738 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3736 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* NOTE: field definition is filled in sp_decl section. */
 
@@ -20982,36 +20950,36 @@
 
   case 299:
 
-/* Line 1806 of yacc.c  */
-#line 3761 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3759 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item) = NULL; }
     break;
 
   case 300:
 
-/* Line 1806 of yacc.c  */
-#line 3763 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3761 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sphead->m_parser_data.push_expr_start_ptr(YY_TOKEN_END); }
     break;
 
   case 301:
 
-/* Line 1806 of yacc.c  */
-#line 3765 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3763 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(3) - (3)].item); }
     break;
 
   case 315:
 
-/* Line 1806 of yacc.c  */
-#line 3786 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3784 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sphead->m_parser_data.new_cont_backpatch(); }
     break;
 
   case 316:
 
-/* Line 1806 of yacc.c  */
-#line 3788 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3786 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             sp_head *sp= Lex->sphead;
 
@@ -21021,8 +20989,8 @@
 
   case 317:
 
-/* Line 1806 of yacc.c  */
-#line 3796 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3794 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21036,8 +21004,8 @@
 
   case 318:
 
-/* Line 1806 of yacc.c  */
-#line 3806 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3804 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21085,8 +21053,8 @@
 
   case 319:
 
-/* Line 1806 of yacc.c  */
-#line 3853 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3851 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21100,8 +21068,8 @@
 
   case 320:
 
-/* Line 1806 of yacc.c  */
-#line 3863 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3861 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21149,8 +21117,8 @@
 
   case 321:
 
-/* Line 1806 of yacc.c  */
-#line 3909 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3907 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* Unlabeled controls get a secret label. */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21165,8 +21133,8 @@
 
   case 322:
 
-/* Line 1806 of yacc.c  */
-#line 3920 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3918 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -21179,8 +21147,8 @@
 
   case 323:
 
-/* Line 1806 of yacc.c  */
-#line 3932 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3930 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21240,8 +21208,8 @@
 
   case 324:
 
-/* Line 1806 of yacc.c  */
-#line 3991 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 3989 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21292,8 +21260,8 @@
 
   case 325:
 
-/* Line 1806 of yacc.c  */
-#line 4041 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4039 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21318,8 +21286,8 @@
 
   case 326:
 
-/* Line 1806 of yacc.c  */
-#line 4065 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4063 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21344,15 +21312,15 @@
 
   case 327:
 
-/* Line 1806 of yacc.c  */
-#line 4086 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4084 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 328:
 
-/* Line 1806 of yacc.c  */
-#line 4091 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4089 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21377,8 +21345,8 @@
 
   case 332:
 
-/* Line 1806 of yacc.c  */
-#line 4121 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4119 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -21400,8 +21368,8 @@
 
   case 333:
 
-/* Line 1806 of yacc.c  */
-#line 4139 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4137 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -21423,8 +21391,8 @@
 
   case 334:
 
-/* Line 1806 of yacc.c  */
-#line 4159 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4157 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21437,8 +21405,8 @@
 
   case 335:
 
-/* Line 1806 of yacc.c  */
-#line 4168 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4166 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21478,8 +21446,8 @@
 
   case 336:
 
-/* Line 1806 of yacc.c  */
-#line 4204 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4202 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21502,8 +21470,8 @@
 
   case 337:
 
-/* Line 1806 of yacc.c  */
-#line 4223 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4221 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -21516,8 +21484,8 @@
 
   case 343:
 
-/* Line 1806 of yacc.c  */
-#line 4246 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4244 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21532,8 +21500,8 @@
 
   case 344:
 
-/* Line 1806 of yacc.c  */
-#line 4257 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4255 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21578,8 +21546,8 @@
 
   case 345:
 
-/* Line 1806 of yacc.c  */
-#line 4301 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4299 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             case_stmt_action_end_case(Lex, true);
           }
@@ -21587,8 +21555,8 @@
 
   case 346:
 
-/* Line 1806 of yacc.c  */
-#line 4308 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4306 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             case_stmt_action_case(YYTHD);
           }
@@ -21596,8 +21564,8 @@
 
   case 347:
 
-/* Line 1806 of yacc.c  */
-#line 4315 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4313 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             case_stmt_action_end_case(Lex, false);
           }
@@ -21605,8 +21573,8 @@
 
   case 352:
 
-/* Line 1806 of yacc.c  */
-#line 4332 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4330 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21619,8 +21587,8 @@
 
   case 353:
 
-/* Line 1806 of yacc.c  */
-#line 4341 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4339 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* Simple case: <caseval> = <whenval> */
 
@@ -21664,8 +21632,8 @@
 
   case 354:
 
-/* Line 1806 of yacc.c  */
-#line 4382 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4380 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (case_stmt_action_then(YYTHD, Lex))
               MYSQL_YYABORT;
@@ -21674,8 +21642,8 @@
 
   case 355:
 
-/* Line 1806 of yacc.c  */
-#line 4390 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4388 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21688,8 +21656,8 @@
 
   case 356:
 
-/* Line 1806 of yacc.c  */
-#line 4399 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4397 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21728,8 +21696,8 @@
 
   case 357:
 
-/* Line 1806 of yacc.c  */
-#line 4435 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4433 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (case_stmt_action_then(YYTHD, Lex))
               MYSQL_YYABORT;
@@ -21738,8 +21706,8 @@
 
   case 358:
 
-/* Line 1806 of yacc.c  */
-#line 4443 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4441 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21757,8 +21725,8 @@
 
   case 360:
 
-/* Line 1806 of yacc.c  */
-#line 4461 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4459 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -21780,8 +21748,8 @@
 
   case 361:
 
-/* Line 1806 of yacc.c  */
-#line 4479 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4477 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -21802,22 +21770,22 @@
 
   case 362:
 
-/* Line 1806 of yacc.c  */
-#line 4498 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4496 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= null_lex_str; }
     break;
 
   case 363:
 
-/* Line 1806 of yacc.c  */
-#line 4499 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4497 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 364:
 
-/* Line 1806 of yacc.c  */
-#line 4504 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4502 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -21837,8 +21805,8 @@
 
   case 365:
 
-/* Line 1806 of yacc.c  */
-#line 4520 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4518 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
@@ -21857,8 +21825,8 @@
 
   case 366:
 
-/* Line 1806 of yacc.c  */
-#line 4537 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4535 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* Unlabeled blocks get a secret label. */
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -21873,8 +21841,8 @@
 
   case 367:
 
-/* Line 1806 of yacc.c  */
-#line 4548 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4546 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->get_sp_current_parsing_ctx()->pop_label();
@@ -21883,8 +21851,8 @@
 
   case 368:
 
-/* Line 1806 of yacc.c  */
-#line 4556 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4554 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* QQ This is just a dummy for grouping declarations and statements
               together. No [[NOT] ATOMIC] yet, and we need to figure out how
               make it coexist with the existing BEGIN COMMIT/ROLLBACK. */
@@ -21901,8 +21869,8 @@
 
   case 369:
 
-/* Line 1806 of yacc.c  */
-#line 4571 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4569 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21938,8 +21906,8 @@
 
   case 370:
 
-/* Line 1806 of yacc.c  */
-#line 4607 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4605 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -21958,8 +21926,8 @@
 
   case 371:
 
-/* Line 1806 of yacc.c  */
-#line 4622 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4620 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -21972,8 +21940,8 @@
 
   case 372:
 
-/* Line 1806 of yacc.c  */
-#line 4631 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4629 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -22013,8 +21981,8 @@
 
   case 373:
 
-/* Line 1806 of yacc.c  */
-#line 4669 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4667 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -22034,8 +22002,8 @@
 
   case 374:
 
-/* Line 1806 of yacc.c  */
-#line 4685 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4683 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -22048,8 +22016,8 @@
 
   case 375:
 
-/* Line 1806 of yacc.c  */
-#line 4694 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4692 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -22090,50 +22058,50 @@
 
   case 377:
 
-/* Line 1806 of yacc.c  */
-#line 4735 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4733 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= TRG_ACTION_BEFORE; }
     break;
 
   case 378:
 
-/* Line 1806 of yacc.c  */
-#line 4737 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4735 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= TRG_ACTION_AFTER; }
     break;
 
   case 379:
 
-/* Line 1806 of yacc.c  */
-#line 4742 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4740 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= TRG_EVENT_INSERT; }
     break;
 
   case 380:
 
-/* Line 1806 of yacc.c  */
-#line 4744 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4742 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= TRG_EVENT_UPDATE; }
     break;
 
   case 381:
 
-/* Line 1806 of yacc.c  */
-#line 4746 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4744 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= TRG_EVENT_DELETE; }
     break;
 
   case 385:
 
-/* Line 1806 of yacc.c  */
-#line 4780 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4778 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 386:
 
-/* Line 1806 of yacc.c  */
-#line 4782 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4780 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->logfile_group_name= (yyvsp[(4) - (4)].lex_str).str;
@@ -22142,8 +22110,8 @@
 
   case 387:
 
-/* Line 1806 of yacc.c  */
-#line 4792 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4790 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_ADD_FILE; 
           }
@@ -22151,8 +22119,8 @@
 
   case 388:
 
-/* Line 1806 of yacc.c  */
-#line 4798 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4796 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_DROP_FILE; 
           }
@@ -22160,15 +22128,15 @@
 
   case 393:
 
-/* Line 1806 of yacc.c  */
-#line 4821 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4819 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 444:
 
-/* Line 1806 of yacc.c  */
-#line 4919 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4917 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->data_file_name= (yyvsp[(2) - (2)].lex_str).str;
@@ -22177,8 +22145,8 @@
 
   case 445:
 
-/* Line 1806 of yacc.c  */
-#line 4927 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4925 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->undo_file_name= (yyvsp[(2) - (2)].lex_str).str;
@@ -22187,8 +22155,8 @@
 
   case 446:
 
-/* Line 1806 of yacc.c  */
-#line 4935 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4933 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->redo_file_name= (yyvsp[(2) - (2)].lex_str).str;
@@ -22197,8 +22165,8 @@
 
   case 447:
 
-/* Line 1806 of yacc.c  */
-#line 4943 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4941 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info= new st_alter_tablespace();
@@ -22211,8 +22179,8 @@
 
   case 448:
 
-/* Line 1806 of yacc.c  */
-#line 4955 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4953 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info= new st_alter_tablespace();
@@ -22225,8 +22193,8 @@
 
   case 449:
 
-/* Line 1806 of yacc.c  */
-#line 4967 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4965 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_access_mode= TS_READ_ONLY;
@@ -22235,8 +22203,8 @@
 
   case 450:
 
-/* Line 1806 of yacc.c  */
-#line 4972 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4970 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_access_mode= TS_READ_WRITE;
@@ -22245,8 +22213,8 @@
 
   case 451:
 
-/* Line 1806 of yacc.c  */
-#line 4977 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4975 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_access_mode= TS_NOT_ACCESSIBLE;
@@ -22255,8 +22223,8 @@
 
   case 452:
 
-/* Line 1806 of yacc.c  */
-#line 4985 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4983 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->initial_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -22265,8 +22233,8 @@
 
   case 453:
 
-/* Line 1806 of yacc.c  */
-#line 4993 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4991 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->autoextend_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -22275,8 +22243,8 @@
 
   case 454:
 
-/* Line 1806 of yacc.c  */
-#line 5001 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 4999 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->max_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -22285,8 +22253,8 @@
 
   case 455:
 
-/* Line 1806 of yacc.c  */
-#line 5009 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5007 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->extent_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -22295,8 +22263,8 @@
 
   case 456:
 
-/* Line 1806 of yacc.c  */
-#line 5017 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5015 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->undo_buffer_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -22305,8 +22273,8 @@
 
   case 457:
 
-/* Line 1806 of yacc.c  */
-#line 5025 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5023 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->redo_buffer_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -22315,8 +22283,8 @@
 
   case 458:
 
-/* Line 1806 of yacc.c  */
-#line 5033 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5031 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->alter_tablespace_info->nodegroup_id != UNDEF_NODEGROUP)
@@ -22330,8 +22298,8 @@
 
   case 459:
 
-/* Line 1806 of yacc.c  */
-#line 5046 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5044 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->alter_tablespace_info->ts_comment != NULL)
@@ -22345,8 +22313,8 @@
 
   case 460:
 
-/* Line 1806 of yacc.c  */
-#line 5059 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5057 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->alter_tablespace_info->storage_engine != NULL)
@@ -22361,8 +22329,8 @@
 
   case 461:
 
-/* Line 1806 of yacc.c  */
-#line 5073 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5071 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->wait_until_completed= TRUE;
@@ -22371,8 +22339,8 @@
 
   case 462:
 
-/* Line 1806 of yacc.c  */
-#line 5078 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5076 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!(lex->alter_tablespace_info->wait_until_completed))
@@ -22386,15 +22354,15 @@
 
   case 463:
 
-/* Line 1806 of yacc.c  */
-#line 5090 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5088 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulonglong_number)= (yyvsp[(1) - (1)].ulonglong_number);}
     break;
 
   case 464:
 
-/* Line 1806 of yacc.c  */
-#line 5092 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5090 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             ulonglong number;
             uint text_shift_number= 0;
@@ -22442,22 +22410,22 @@
 
   case 465:
 
-/* Line 1806 of yacc.c  */
-#line 5142 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5140 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 466:
 
-/* Line 1806 of yacc.c  */
-#line 5145 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5143 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 467:
 
-/* Line 1806 of yacc.c  */
-#line 5147 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5145 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             TABLE_LIST *src_table;
@@ -22476,8 +22444,8 @@
 
   case 468:
 
-/* Line 1806 of yacc.c  */
-#line 5162 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5160 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             TABLE_LIST *src_table;
@@ -22496,64 +22464,64 @@
 
   case 469:
 
-/* Line 1806 of yacc.c  */
-#line 5181 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5179 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 470:
 
-/* Line 1806 of yacc.c  */
-#line 5184 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5182 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->set_braces(1);}
     break;
 
   case 471:
 
-/* Line 1806 of yacc.c  */
-#line 5185 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5183 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 472:
 
-/* Line 1806 of yacc.c  */
-#line 5189 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5187 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 473:
 
-/* Line 1806 of yacc.c  */
-#line 5191 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5189 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->set_braces(0);}
     break;
 
   case 474:
 
-/* Line 1806 of yacc.c  */
-#line 5192 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5190 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 475:
 
-/* Line 1806 of yacc.c  */
-#line 5194 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5192 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->set_braces(1);}
     break;
 
   case 476:
 
-/* Line 1806 of yacc.c  */
-#line 5195 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5193 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 477:
 
-/* Line 1806 of yacc.c  */
-#line 5200 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5198 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               Remove all tables used in PARTITION clause from the global table
@@ -22567,15 +22535,15 @@
 
   case 478:
 
-/* Line 1806 of yacc.c  */
-#line 5236 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5234 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 480:
 
-/* Line 1806 of yacc.c  */
-#line 5242 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5240 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->part_info= new partition_info();
@@ -22593,8 +22561,8 @@
 
   case 482:
 
-/* Line 1806 of yacc.c  */
-#line 5260 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5258 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
 #ifdef WITH_PARTITION_STORAGE_ENGINE
             LEX_STRING partition_name={C_STRING_WITH_LEN("partition")};
@@ -22614,8 +22582,8 @@
 
   case 483:
 
-/* Line 1806 of yacc.c  */
-#line 5279 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5277 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!lex->part_info)
@@ -22632,15 +22600,15 @@
 
   case 484:
 
-/* Line 1806 of yacc.c  */
-#line 5291 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5289 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 486:
 
-/* Line 1806 of yacc.c  */
-#line 5300 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5298 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->list_of_part_fields= TRUE;
@@ -22651,71 +22619,71 @@
 
   case 487:
 
-/* Line 1806 of yacc.c  */
-#line 5307 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5305 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->part_type= HASH_PARTITION; }
     break;
 
   case 488:
 
-/* Line 1806 of yacc.c  */
-#line 5308 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5306 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 489:
 
-/* Line 1806 of yacc.c  */
-#line 5310 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5308 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->part_type= RANGE_PARTITION; }
     break;
 
   case 490:
 
-/* Line 1806 of yacc.c  */
-#line 5312 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5310 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->part_type= RANGE_PARTITION; }
     break;
 
   case 491:
 
-/* Line 1806 of yacc.c  */
-#line 5314 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5312 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->part_type= LIST_PARTITION; }
     break;
 
   case 492:
 
-/* Line 1806 of yacc.c  */
-#line 5316 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5314 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->part_type= LIST_PARTITION; }
     break;
 
   case 493:
 
-/* Line 1806 of yacc.c  */
-#line 5320 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5318 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 494:
 
-/* Line 1806 of yacc.c  */
-#line 5322 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5320 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->linear_hash_ind= TRUE;}
     break;
 
   case 495:
 
-/* Line 1806 of yacc.c  */
-#line 5327 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5325 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->key_algorithm= partition_info::KEY_ALGORITHM_NONE;}
     break;
 
   case 496:
 
-/* Line 1806 of yacc.c  */
-#line 5329 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5327 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             switch ((yyvsp[(3) - (3)].ulong_num)) {
             case 1:
@@ -22733,36 +22701,36 @@
 
   case 497:
 
-/* Line 1806 of yacc.c  */
-#line 5345 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5343 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 498:
 
-/* Line 1806 of yacc.c  */
-#line 5346 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5344 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 499:
 
-/* Line 1806 of yacc.c  */
-#line 5350 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5348 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 500:
 
-/* Line 1806 of yacc.c  */
-#line 5351 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5349 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 501:
 
-/* Line 1806 of yacc.c  */
-#line 5356 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5354 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->num_columns++;
@@ -22782,8 +22750,8 @@
 
   case 502:
 
-/* Line 1806 of yacc.c  */
-#line 5375 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5373 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->column_list= TRUE;
@@ -22793,8 +22761,8 @@
 
   case 503:
 
-/* Line 1806 of yacc.c  */
-#line 5385 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5383 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->set_part_expr((yyvsp[(2) - (5)].simple_string)+1, (yyvsp[(3) - (5)].item), (yyvsp[(4) - (5)].simple_string), FALSE))
@@ -22806,8 +22774,8 @@
 
   case 504:
 
-/* Line 1806 of yacc.c  */
-#line 5396 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5394 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->part_info->set_part_expr((yyvsp[(2) - (5)].simple_string)+1, (yyvsp[(3) - (5)].item), (yyvsp[(4) - (5)].simple_string), TRUE))
             { MYSQL_YYABORT; }
@@ -22816,15 +22784,15 @@
 
   case 505:
 
-/* Line 1806 of yacc.c  */
-#line 5404 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5402 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 506:
 
-/* Line 1806 of yacc.c  */
-#line 5406 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5404 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             uint num_parts= (yyvsp[(2) - (2)].ulong_num);
             partition_info *part_info= Lex->part_info;
@@ -22841,29 +22809,29 @@
 
   case 507:
 
-/* Line 1806 of yacc.c  */
-#line 5421 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5419 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 508:
 
-/* Line 1806 of yacc.c  */
-#line 5423 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5421 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->subpart_type= HASH_PARTITION; }
     break;
 
   case 509:
 
-/* Line 1806 of yacc.c  */
-#line 5424 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5422 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 510:
 
-/* Line 1806 of yacc.c  */
-#line 5427 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5425 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->subpart_type= HASH_PARTITION;
@@ -22873,29 +22841,29 @@
 
   case 511:
 
-/* Line 1806 of yacc.c  */
-#line 5432 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5430 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 512:
 
-/* Line 1806 of yacc.c  */
-#line 5436 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5434 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 513:
 
-/* Line 1806 of yacc.c  */
-#line 5437 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5435 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 514:
 
-/* Line 1806 of yacc.c  */
-#line 5442 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5440 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->subpart_field_list.push_back((yyvsp[(1) - (1)].lex_str).str))
@@ -22914,8 +22882,8 @@
 
   case 515:
 
-/* Line 1806 of yacc.c  */
-#line 5460 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5458 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             bool not_corr_func;
@@ -22932,15 +22900,15 @@
 
   case 516:
 
-/* Line 1806 of yacc.c  */
-#line 5475 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5473 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 517:
 
-/* Line 1806 of yacc.c  */
-#line 5477 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5475 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             uint num_parts= (yyvsp[(2) - (2)].ulong_num);
             LEX *lex= Lex;
@@ -22956,8 +22924,8 @@
 
   case 518:
 
-/* Line 1806 of yacc.c  */
-#line 5492 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5490 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->part_type == RANGE_PARTITION)
@@ -22977,8 +22945,8 @@
 
   case 519:
 
-/* Line 1806 of yacc.c  */
-#line 5508 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5506 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             uint count_curr_parts= part_info->partitions.elements;
@@ -23001,22 +22969,22 @@
 
   case 520:
 
-/* Line 1806 of yacc.c  */
-#line 5529 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5527 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 521:
 
-/* Line 1806 of yacc.c  */
-#line 5530 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5528 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 522:
 
-/* Line 1806 of yacc.c  */
-#line 5535 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5533 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             partition_element *p_elem= new partition_element();
@@ -23036,15 +23004,15 @@
 
   case 523:
 
-/* Line 1806 of yacc.c  */
-#line 5554 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5552 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 524:
 
-/* Line 1806 of yacc.c  */
-#line 5559 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5557 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             partition_element *p_elem= part_info->curr_part_elem;
@@ -23054,8 +23022,8 @@
 
   case 525:
 
-/* Line 1806 of yacc.c  */
-#line 5568 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5566 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -23081,8 +23049,8 @@
 
   case 526:
 
-/* Line 1806 of yacc.c  */
-#line 5590 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5588 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -23102,15 +23070,15 @@
 
   case 527:
 
-/* Line 1806 of yacc.c  */
-#line 5605 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5603 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 528:
 
-/* Line 1806 of yacc.c  */
-#line 5607 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5605 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -23130,15 +23098,15 @@
 
   case 529:
 
-/* Line 1806 of yacc.c  */
-#line 5622 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5620 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 530:
 
-/* Line 1806 of yacc.c  */
-#line 5627 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5625 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
 
@@ -23164,15 +23132,15 @@
 
   case 531:
 
-/* Line 1806 of yacc.c  */
-#line 5648 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5646 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 532:
 
-/* Line 1806 of yacc.c  */
-#line 5653 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5651 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -23205,8 +23173,8 @@
 
   case 533:
 
-/* Line 1806 of yacc.c  */
-#line 5682 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5680 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->num_columns < 2U)
@@ -23219,22 +23187,22 @@
 
   case 534:
 
-/* Line 1806 of yacc.c  */
-#line 5693 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5691 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 535:
 
-/* Line 1806 of yacc.c  */
-#line 5694 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5692 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 536:
 
-/* Line 1806 of yacc.c  */
-#line 5699 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5697 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->print_debug("( part_value_item", NULL);
@@ -23250,15 +23218,15 @@
 
   case 537:
 
-/* Line 1806 of yacc.c  */
-#line 5710 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5708 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 538:
 
-/* Line 1806 of yacc.c  */
-#line 5712 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5710 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->print_debug(") part_value_item", NULL);
@@ -23283,22 +23251,22 @@
 
   case 539:
 
-/* Line 1806 of yacc.c  */
-#line 5735 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5733 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 540:
 
-/* Line 1806 of yacc.c  */
-#line 5736 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5734 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 541:
 
-/* Line 1806 of yacc.c  */
-#line 5741 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5739 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->part_type == LIST_PARTITION)
@@ -23315,8 +23283,8 @@
 
   case 542:
 
-/* Line 1806 of yacc.c  */
-#line 5754 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5752 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -23336,8 +23304,8 @@
 
   case 543:
 
-/* Line 1806 of yacc.c  */
-#line 5774 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5772 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->num_subparts != 0 &&
@@ -23355,8 +23323,8 @@
 
   case 544:
 
-/* Line 1806 of yacc.c  */
-#line 5788 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5786 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->num_subparts != 0)
@@ -23383,22 +23351,22 @@
 
   case 545:
 
-/* Line 1806 of yacc.c  */
-#line 5813 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5811 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 546:
 
-/* Line 1806 of yacc.c  */
-#line 5814 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5812 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 547:
 
-/* Line 1806 of yacc.c  */
-#line 5819 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5817 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             partition_element *curr_part= part_info->current_partition;
@@ -23435,57 +23403,57 @@
 
   case 548:
 
-/* Line 1806 of yacc.c  */
-#line 5851 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5849 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 549:
 
-/* Line 1806 of yacc.c  */
-#line 5856 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5854 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->partition_name= (yyvsp[(1) - (1)].lex_str).str; }
     break;
 
   case 550:
 
-/* Line 1806 of yacc.c  */
-#line 5860 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5858 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 551:
 
-/* Line 1806 of yacc.c  */
-#line 5861 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5859 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 552:
 
-/* Line 1806 of yacc.c  */
-#line 5865 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5863 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 553:
 
-/* Line 1806 of yacc.c  */
-#line 5866 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5864 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 554:
 
-/* Line 1806 of yacc.c  */
-#line 5871 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5869 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->tablespace_name= (yyvsp[(3) - (3)].lex_str).str; }
     break;
 
   case 555:
 
-/* Line 1806 of yacc.c  */
-#line 5873 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5871 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->curr_part_elem->engine_type= (yyvsp[(4) - (4)].db_type);
@@ -23495,50 +23463,50 @@
 
   case 556:
 
-/* Line 1806 of yacc.c  */
-#line 5879 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5877 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->nodegroup_id= (uint16) (yyvsp[(3) - (3)].ulong_num); }
     break;
 
   case 557:
 
-/* Line 1806 of yacc.c  */
-#line 5881 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5879 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->part_max_rows= (ha_rows) (yyvsp[(3) - (3)].ulonglong_number); }
     break;
 
   case 558:
 
-/* Line 1806 of yacc.c  */
-#line 5883 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5881 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->part_min_rows= (ha_rows) (yyvsp[(3) - (3)].ulonglong_number); }
     break;
 
   case 559:
 
-/* Line 1806 of yacc.c  */
-#line 5885 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5883 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->data_file_name= (yyvsp[(4) - (4)].lex_str).str; }
     break;
 
   case 560:
 
-/* Line 1806 of yacc.c  */
-#line 5887 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5885 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->index_file_name= (yyvsp[(4) - (4)].lex_str).str; }
     break;
 
   case 561:
 
-/* Line 1806 of yacc.c  */
-#line 5889 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5887 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->part_comment= (yyvsp[(3) - (3)].lex_str).str; }
     break;
 
   case 562:
 
-/* Line 1806 of yacc.c  */
-#line 5898 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5896 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->sql_command == SQLCOM_INSERT)
@@ -23557,8 +23525,8 @@
 
   case 563:
 
-/* Line 1806 of yacc.c  */
-#line 5913 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5911 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -23566,8 +23534,8 @@
 
   case 564:
 
-/* Line 1806 of yacc.c  */
-#line 5917 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5915 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               The following work only with the local list, the global list
@@ -23579,113 +23547,113 @@
 
   case 565:
 
-/* Line 1806 of yacc.c  */
-#line 5927 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5925 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 566:
 
-/* Line 1806 of yacc.c  */
-#line 5928 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5926 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 567:
 
-/* Line 1806 of yacc.c  */
-#line 5932 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5930 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 568:
 
-/* Line 1806 of yacc.c  */
-#line 5933 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5931 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 569:
 
-/* Line 1806 of yacc.c  */
-#line 5937 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5935 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 570:
 
-/* Line 1806 of yacc.c  */
-#line 5938 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5936 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 571:
 
-/* Line 1806 of yacc.c  */
-#line 5942 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5940 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 572:
 
-/* Line 1806 of yacc.c  */
-#line 5943 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5941 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 573:
 
-/* Line 1806 of yacc.c  */
-#line 5947 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5945 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 574:
 
-/* Line 1806 of yacc.c  */
-#line 5948 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5946 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= (yyvsp[(1) - (1)].num);}
     break;
 
   case 575:
 
-/* Line 1806 of yacc.c  */
-#line 5952 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5950 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=(yyvsp[(1) - (1)].num); }
     break;
 
   case 576:
 
-/* Line 1806 of yacc.c  */
-#line 5953 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5951 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); }
     break;
 
   case 577:
 
-/* Line 1806 of yacc.c  */
-#line 5957 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5955 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=HA_LEX_CREATE_TMP_TABLE; }
     break;
 
   case 578:
 
-/* Line 1806 of yacc.c  */
-#line 5961 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5959 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 579:
 
-/* Line 1806 of yacc.c  */
-#line 5962 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5960 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=HA_LEX_CREATE_IF_NOT_EXISTS; }
     break;
 
   case 587:
 
-/* Line 1806 of yacc.c  */
-#line 5983 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5981 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.db_type= (yyvsp[(3) - (3)].db_type);
             Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
@@ -23694,8 +23662,8 @@
 
   case 588:
 
-/* Line 1806 of yacc.c  */
-#line 5988 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5986 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.max_rows= (yyvsp[(3) - (3)].ulonglong_number);
             Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;
@@ -23704,8 +23672,8 @@
 
   case 589:
 
-/* Line 1806 of yacc.c  */
-#line 5993 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5991 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.min_rows= (yyvsp[(3) - (3)].ulonglong_number);
             Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;
@@ -23714,8 +23682,8 @@
 
   case 590:
 
-/* Line 1806 of yacc.c  */
-#line 5998 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 5996 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.avg_row_length=(yyvsp[(3) - (3)].ulong_num);
             Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;
@@ -23724,8 +23692,8 @@
 
   case 591:
 
-/* Line 1806 of yacc.c  */
-#line 6003 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6001 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.password=(yyvsp[(3) - (3)].lex_str).str;
             Lex->create_info.used_fields|= HA_CREATE_USED_PASSWORD;
@@ -23734,8 +23702,8 @@
 
   case 592:
 
-/* Line 1806 of yacc.c  */
-#line 6008 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6006 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.comment=(yyvsp[(3) - (3)].lex_str);
             Lex->create_info.used_fields|= HA_CREATE_USED_COMMENT;
@@ -23744,8 +23712,8 @@
 
   case 593:
 
-/* Line 1806 of yacc.c  */
-#line 6013 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6011 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.auto_increment_value=(yyvsp[(3) - (3)].ulonglong_number);
             Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;
@@ -23754,8 +23722,8 @@
 
   case 594:
 
-/* Line 1806 of yacc.c  */
-#line 6018 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6016 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             switch((yyvsp[(3) - (3)].ulong_num)) {
             case 0:
@@ -23774,8 +23742,8 @@
 
   case 595:
 
-/* Line 1806 of yacc.c  */
-#line 6033 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6031 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.table_options&=
               ~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS);
@@ -23785,8 +23753,8 @@
 
   case 596:
 
-/* Line 1806 of yacc.c  */
-#line 6039 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6037 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             switch((yyvsp[(3) - (3)].ulong_num)) {
             case 0:
@@ -23805,8 +23773,8 @@
 
   case 597:
 
-/* Line 1806 of yacc.c  */
-#line 6054 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6052 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.stats_auto_recalc= HA_STATS_AUTO_RECALC_DEFAULT;
             Lex->create_info.used_fields|= HA_CREATE_USED_STATS_AUTO_RECALC;
@@ -23815,8 +23783,8 @@
 
   case 598:
 
-/* Line 1806 of yacc.c  */
-#line 6059 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6057 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             switch((yyvsp[(3) - (3)].ulong_num)) {
             case 0:
@@ -23835,8 +23803,8 @@
 
   case 599:
 
-/* Line 1806 of yacc.c  */
-#line 6074 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6072 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.table_options&=
               ~(HA_OPTION_STATS_PERSISTENT | HA_OPTION_NO_STATS_PERSISTENT);
@@ -23846,8 +23814,8 @@
 
   case 600:
 
-/* Line 1806 of yacc.c  */
-#line 6080 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6078 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* From user point of view STATS_SAMPLE_PAGES can be specified as
             STATS_SAMPLE_PAGES=N (where 0<N<=65535, it does not make sense to
@@ -23869,8 +23837,8 @@
 
   case 601:
 
-/* Line 1806 of yacc.c  */
-#line 6098 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6096 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.stats_sample_pages=0;
             Lex->create_info.used_fields|= HA_CREATE_USED_STATS_SAMPLE_PAGES;
@@ -23879,8 +23847,8 @@
 
   case 602:
 
-/* Line 1806 of yacc.c  */
-#line 6103 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6101 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.table_options|= (yyvsp[(3) - (3)].ulong_num) ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM;
             Lex->create_info.used_fields|= HA_CREATE_USED_CHECKSUM;
@@ -23889,8 +23857,8 @@
 
   case 603:
 
-/* Line 1806 of yacc.c  */
-#line 6108 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6106 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
              Lex->create_info.table_options|= (yyvsp[(3) - (3)].ulong_num) ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM;
              Lex->create_info.used_fields|= HA_CREATE_USED_CHECKSUM;
@@ -23899,8 +23867,8 @@
 
   case 604:
 
-/* Line 1806 of yacc.c  */
-#line 6113 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6111 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.table_options|= (yyvsp[(3) - (3)].ulong_num) ? HA_OPTION_DELAY_KEY_WRITE : HA_OPTION_NO_DELAY_KEY_WRITE;
             Lex->create_info.used_fields|= HA_CREATE_USED_DELAY_KEY_WRITE;
@@ -23909,8 +23877,8 @@
 
   case 605:
 
-/* Line 1806 of yacc.c  */
-#line 6118 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6116 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.row_type= (yyvsp[(3) - (3)].row_type);
             Lex->create_info.used_fields|= HA_CREATE_USED_ROW_FORMAT;
@@ -23919,8 +23887,8 @@
 
   case 606:
 
-/* Line 1806 of yacc.c  */
-#line 6123 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6121 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->select_lex.table_list.save_and_clear(&Lex->save_list);
           }
@@ -23928,8 +23896,8 @@
 
   case 607:
 
-/* Line 1806 of yacc.c  */
-#line 6127 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6125 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               Move the union list to the merge_list and exclude its tables
@@ -23955,8 +23923,8 @@
 
   case 610:
 
-/* Line 1806 of yacc.c  */
-#line 6151 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6149 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.merge_insert_method= (yyvsp[(3) - (3)].ulong_num);
             Lex->create_info.used_fields|= HA_CREATE_USED_INSERT_METHOD;
@@ -23965,8 +23933,8 @@
 
   case 611:
 
-/* Line 1806 of yacc.c  */
-#line 6156 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6154 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.data_file_name= (yyvsp[(4) - (4)].lex_str).str;
             Lex->create_info.used_fields|= HA_CREATE_USED_DATADIR;
@@ -23975,8 +23943,8 @@
 
   case 612:
 
-/* Line 1806 of yacc.c  */
-#line 6161 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6159 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.index_file_name= (yyvsp[(4) - (4)].lex_str).str;
             Lex->create_info.used_fields|= HA_CREATE_USED_INDEXDIR;
@@ -23985,29 +23953,29 @@
 
   case 613:
 
-/* Line 1806 of yacc.c  */
-#line 6166 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6164 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {Lex->create_info.tablespace= (yyvsp[(2) - (2)].lex_str).str;}
     break;
 
   case 614:
 
-/* Line 1806 of yacc.c  */
-#line 6168 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6166 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {Lex->create_info.storage_media= HA_SM_DISK;}
     break;
 
   case 615:
 
-/* Line 1806 of yacc.c  */
-#line 6170 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6168 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {Lex->create_info.storage_media= HA_SM_MEMORY;}
     break;
 
   case 616:
 
-/* Line 1806 of yacc.c  */
-#line 6172 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6170 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.connect_string.str= (yyvsp[(3) - (3)].lex_str).str;
             Lex->create_info.connect_string.length= (yyvsp[(3) - (3)].lex_str).length;
@@ -24017,8 +23985,8 @@
 
   case 617:
 
-/* Line 1806 of yacc.c  */
-#line 6178 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6176 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.used_fields|= HA_CREATE_USED_KEY_BLOCK_SIZE;
             Lex->create_info.key_block_size= (yyvsp[(3) - (3)].ulong_num);
@@ -24027,8 +23995,8 @@
 
   case 618:
 
-/* Line 1806 of yacc.c  */
-#line 6186 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6184 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             HA_CREATE_INFO *cinfo= &Lex->create_info;
             if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) &&
@@ -24047,8 +24015,8 @@
 
   case 619:
 
-/* Line 1806 of yacc.c  */
-#line 6204 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6202 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             HA_CREATE_INFO *cinfo= &Lex->create_info;
             if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) &&
@@ -24066,8 +24034,8 @@
 
   case 620:
 
-/* Line 1806 of yacc.c  */
-#line 6221 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6219 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             plugin_ref plugin=
@@ -24094,8 +24062,8 @@
 
   case 621:
 
-/* Line 1806 of yacc.c  */
-#line 6247 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6245 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -24114,106 +24082,106 @@
 
   case 622:
 
-/* Line 1806 of yacc.c  */
-#line 6264 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6262 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_DEFAULT; }
     break;
 
   case 623:
 
-/* Line 1806 of yacc.c  */
-#line 6265 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6263 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_FIXED; }
     break;
 
   case 624:
 
-/* Line 1806 of yacc.c  */
-#line 6266 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6264 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_DYNAMIC; }
     break;
 
   case 625:
 
-/* Line 1806 of yacc.c  */
-#line 6267 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6265 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_COMPRESSED; }
     break;
 
   case 626:
 
-/* Line 1806 of yacc.c  */
-#line 6268 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6266 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_REDUNDANT; }
     break;
 
   case 627:
 
-/* Line 1806 of yacc.c  */
-#line 6269 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6267 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_COMPACT; }
     break;
 
   case 628:
 
-/* Line 1806 of yacc.c  */
-#line 6273 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6271 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= MERGE_INSERT_DISABLED; }
     break;
 
   case 629:
 
-/* Line 1806 of yacc.c  */
-#line 6274 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6272 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= MERGE_INSERT_TO_FIRST; }
     break;
 
   case 630:
 
-/* Line 1806 of yacc.c  */
-#line 6275 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6273 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= MERGE_INSERT_TO_LAST; }
     break;
 
   case 631:
 
-/* Line 1806 of yacc.c  */
-#line 6279 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6277 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 633:
 
-/* Line 1806 of yacc.c  */
-#line 6284 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6282 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {(yyval.num) = (int) STRING_RESULT; }
     break;
 
   case 634:
 
-/* Line 1806 of yacc.c  */
-#line 6285 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6283 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {(yyval.num) = (int) REAL_RESULT; }
     break;
 
   case 635:
 
-/* Line 1806 of yacc.c  */
-#line 6286 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6284 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {(yyval.num) = (int) DECIMAL_RESULT; }
     break;
 
   case 636:
 
-/* Line 1806 of yacc.c  */
-#line 6287 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6285 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {(yyval.num) = (int) INT_RESULT; }
     break;
 
   case 637:
 
-/* Line 1806 of yacc.c  */
-#line 6293 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6291 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           Lex->create_last_non_select_table= Lex->last_table();
         }
@@ -24221,8 +24189,8 @@
 
   case 643:
 
-/* Line 1806 of yacc.c  */
-#line 6311 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6309 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->col_list.empty(); /* Alloced by sql_alloc */
           }
@@ -24230,8 +24198,8 @@
 
   case 644:
 
-/* Line 1806 of yacc.c  */
-#line 6318 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6316 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index (Lex, (yyvsp[(1) - (7)].key_type), (yyvsp[(2) - (7)].lex_str)))
               MYSQL_YYABORT;
@@ -24240,8 +24208,8 @@
 
   case 645:
 
-/* Line 1806 of yacc.c  */
-#line 6324 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6322 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index (Lex, (yyvsp[(1) - (8)].key_type), (yyvsp[(3) - (8)].lex_str)))
               MYSQL_YYABORT;
@@ -24250,8 +24218,8 @@
 
   case 646:
 
-/* Line 1806 of yacc.c  */
-#line 6330 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6328 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index (Lex, (yyvsp[(1) - (8)].key_type), (yyvsp[(3) - (8)].lex_str)))
               MYSQL_YYABORT;
@@ -24260,8 +24228,8 @@
 
   case 647:
 
-/* Line 1806 of yacc.c  */
-#line 6336 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6334 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_create_index (Lex, (yyvsp[(2) - (8)].key_type), (yyvsp[(3) - (8)].lex_str).str ? (yyvsp[(3) - (8)].lex_str) : (yyvsp[(1) - (8)].lex_str)))
               MYSQL_YYABORT;
@@ -24270,8 +24238,8 @@
 
   case 648:
 
-/* Line 1806 of yacc.c  */
-#line 6341 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6339 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Key *key= new Foreign_key((yyvsp[(4) - (8)].lex_str).str ? (yyvsp[(4) - (8)].lex_str) : (yyvsp[(1) - (8)].lex_str), lex->col_list,
@@ -24294,8 +24262,8 @@
 
   case 649:
 
-/* Line 1806 of yacc.c  */
-#line 6360 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6358 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->col_list.empty(); /* Alloced by sql_alloc */
           }
@@ -24303,29 +24271,29 @@
 
   case 653:
 
-/* Line 1806 of yacc.c  */
-#line 6375 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6373 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= null_lex_str; }
     break;
 
   case 654:
 
-/* Line 1806 of yacc.c  */
-#line 6376 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6374 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 655:
 
-/* Line 1806 of yacc.c  */
-#line 6380 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6378 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 656:
 
-/* Line 1806 of yacc.c  */
-#line 6385 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6383 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->length=lex->dec=0;
@@ -24338,8 +24306,8 @@
 
   case 657:
 
-/* Line 1806 of yacc.c  */
-#line 6394 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6392 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (add_field_to_list(lex->thd, &(yyvsp[(1) - (4)].lex_str), (enum enum_field_types) (yyvsp[(3) - (4)].num),
@@ -24354,29 +24322,29 @@
 
   case 658:
 
-/* Line 1806 of yacc.c  */
-#line 6407 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6405 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=(yyvsp[(1) - (3)].num); }
     break;
 
   case 659:
 
-/* Line 1806 of yacc.c  */
-#line 6408 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6406 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=(yyvsp[(1) - (3)].num); }
     break;
 
   case 660:
 
-/* Line 1806 of yacc.c  */
-#line 6409 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6407 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_FLOAT; }
     break;
 
   case 661:
 
-/* Line 1806 of yacc.c  */
-#line 6411 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6409 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_BIT;
@@ -24385,8 +24353,8 @@
 
   case 662:
 
-/* Line 1806 of yacc.c  */
-#line 6416 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6414 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)=MYSQL_TYPE_BIT;
           }
@@ -24394,8 +24362,8 @@
 
   case 663:
 
-/* Line 1806 of yacc.c  */
-#line 6420 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6418 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_TINY;
@@ -24404,8 +24372,8 @@
 
   case 664:
 
-/* Line 1806 of yacc.c  */
-#line 6425 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6423 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_TINY;
@@ -24414,8 +24382,8 @@
 
   case 665:
 
-/* Line 1806 of yacc.c  */
-#line 6430 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6428 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)=MYSQL_TYPE_STRING;
           }
@@ -24423,8 +24391,8 @@
 
   case 666:
 
-/* Line 1806 of yacc.c  */
-#line 6434 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6432 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_STRING;
@@ -24433,8 +24401,8 @@
 
   case 667:
 
-/* Line 1806 of yacc.c  */
-#line 6439 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6437 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)=MYSQL_TYPE_STRING;
             Lex->charset=national_charset_info;
@@ -24443,8 +24411,8 @@
 
   case 668:
 
-/* Line 1806 of yacc.c  */
-#line 6444 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6442 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_STRING;
@@ -24454,8 +24422,8 @@
 
   case 669:
 
-/* Line 1806 of yacc.c  */
-#line 6450 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6448 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_STRING;
@@ -24464,8 +24432,8 @@
 
   case 670:
 
-/* Line 1806 of yacc.c  */
-#line 6455 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6453 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             Lex->charset=&my_charset_bin;
@@ -24475,8 +24443,8 @@
 
   case 671:
 
-/* Line 1806 of yacc.c  */
-#line 6461 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6459 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= MYSQL_TYPE_VARCHAR;
           }
@@ -24484,8 +24452,8 @@
 
   case 672:
 
-/* Line 1806 of yacc.c  */
-#line 6465 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6463 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= MYSQL_TYPE_VARCHAR;
             Lex->charset=national_charset_info;
@@ -24494,8 +24462,8 @@
 
   case 673:
 
-/* Line 1806 of yacc.c  */
-#line 6470 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6468 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)= MYSQL_TYPE_VARCHAR;
@@ -24504,8 +24472,8 @@
 
   case 674:
 
-/* Line 1806 of yacc.c  */
-#line 6475 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6473 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->length)
             {
@@ -24527,22 +24495,22 @@
 
   case 675:
 
-/* Line 1806 of yacc.c  */
-#line 6493 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6491 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_DATE; }
     break;
 
   case 676:
 
-/* Line 1806 of yacc.c  */
-#line 6495 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6493 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= MYSQL_TYPE_TIME2; }
     break;
 
   case 677:
 
-/* Line 1806 of yacc.c  */
-#line 6497 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6495 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (YYTHD->variables.sql_mode & MODE_MAXDB)
               (yyval.num)=MYSQL_TYPE_DATETIME2;
@@ -24562,15 +24530,15 @@
 
   case 678:
 
-/* Line 1806 of yacc.c  */
-#line 6513 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6511 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= MYSQL_TYPE_DATETIME2; }
     break;
 
   case 679:
 
-/* Line 1806 of yacc.c  */
-#line 6515 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6513 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_TINY_BLOB;
@@ -24579,8 +24547,8 @@
 
   case 680:
 
-/* Line 1806 of yacc.c  */
-#line 6520 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6518 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_BLOB;
@@ -24589,8 +24557,8 @@
 
   case 681:
 
-/* Line 1806 of yacc.c  */
-#line 6525 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6523 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
 #ifdef HAVE_SPATIAL
             Lex->charset=&my_charset_bin;
@@ -24606,8 +24574,8 @@
 
   case 682:
 
-/* Line 1806 of yacc.c  */
-#line 6537 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6535 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB;
@@ -24616,8 +24584,8 @@
 
   case 683:
 
-/* Line 1806 of yacc.c  */
-#line 6542 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6540 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_LONG_BLOB;
@@ -24626,8 +24594,8 @@
 
   case 684:
 
-/* Line 1806 of yacc.c  */
-#line 6547 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6545 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB;
@@ -24636,99 +24604,99 @@
 
   case 685:
 
-/* Line 1806 of yacc.c  */
-#line 6552 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6550 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
     break;
 
   case 686:
 
-/* Line 1806 of yacc.c  */
-#line 6554 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6552 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_TINY_BLOB; }
     break;
 
   case 687:
 
-/* Line 1806 of yacc.c  */
-#line 6556 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6554 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_BLOB; }
     break;
 
   case 688:
 
-/* Line 1806 of yacc.c  */
-#line 6558 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6556 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
     break;
 
   case 689:
 
-/* Line 1806 of yacc.c  */
-#line 6560 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6558 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_LONG_BLOB; }
     break;
 
   case 690:
 
-/* Line 1806 of yacc.c  */
-#line 6562 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6560 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
     break;
 
   case 691:
 
-/* Line 1806 of yacc.c  */
-#line 6564 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6562 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
     break;
 
   case 692:
 
-/* Line 1806 of yacc.c  */
-#line 6566 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6564 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
     break;
 
   case 693:
 
-/* Line 1806 of yacc.c  */
-#line 6568 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6566 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {Lex->interval_list.empty();}
     break;
 
   case 694:
 
-/* Line 1806 of yacc.c  */
-#line 6570 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6568 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_ENUM; }
     break;
 
   case 695:
 
-/* Line 1806 of yacc.c  */
-#line 6572 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6570 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->interval_list.empty();}
     break;
 
   case 696:
 
-/* Line 1806 of yacc.c  */
-#line 6574 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6572 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_SET; }
     break;
 
   case 697:
 
-/* Line 1806 of yacc.c  */
-#line 6576 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6574 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
     break;
 
   case 698:
 
-/* Line 1806 of yacc.c  */
-#line 6578 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6576 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)=MYSQL_TYPE_LONGLONG;
             Lex->type|= (AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNSIGNED_FLAG |
@@ -24738,172 +24706,173 @@
 
   case 699:
 
-/* Line 1806 of yacc.c  */
-#line 6586 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6584 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_GEOMETRY; }
     break;
 
   case 700:
 
-/* Line 1806 of yacc.c  */
-#line 6587 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6585 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_GEOMETRYCOLLECTION; }
     break;
 
   case 701:
 
-/* Line 1806 of yacc.c  */
-#line 6589 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6587 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
-            Lex->length= (char*)"25";
+            Lex->length= const_cast<char*>(STRINGIFY_ARG
+                                           (MAX_LEN_GEOM_POINT_FIELD));
             (yyval.num)= Field::GEOM_POINT;
           }
     break;
 
   case 702:
 
-/* Line 1806 of yacc.c  */
-#line 6593 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6592 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_MULTIPOINT; }
     break;
 
   case 703:
 
-/* Line 1806 of yacc.c  */
-#line 6594 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6593 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_LINESTRING; }
     break;
 
   case 704:
 
-/* Line 1806 of yacc.c  */
-#line 6595 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6594 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_MULTILINESTRING; }
     break;
 
   case 705:
 
-/* Line 1806 of yacc.c  */
-#line 6596 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6595 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_POLYGON; }
     break;
 
   case 706:
 
-/* Line 1806 of yacc.c  */
-#line 6597 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6596 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_MULTIPOLYGON; }
     break;
 
   case 707:
 
-/* Line 1806 of yacc.c  */
-#line 6601 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6600 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 708:
 
-/* Line 1806 of yacc.c  */
-#line 6605 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6604 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 709:
 
-/* Line 1806 of yacc.c  */
-#line 6606 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6605 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 710:
 
-/* Line 1806 of yacc.c  */
-#line 6610 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6609 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 711:
 
-/* Line 1806 of yacc.c  */
-#line 6611 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6610 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 712:
 
-/* Line 1806 of yacc.c  */
-#line 6615 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6614 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 713:
 
-/* Line 1806 of yacc.c  */
-#line 6616 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6615 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 714:
 
-/* Line 1806 of yacc.c  */
-#line 6617 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6616 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 715:
 
-/* Line 1806 of yacc.c  */
-#line 6618 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6617 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 716:
 
-/* Line 1806 of yacc.c  */
-#line 6619 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6618 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 717:
 
-/* Line 1806 of yacc.c  */
-#line 6623 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6622 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_LONG; }
     break;
 
   case 718:
 
-/* Line 1806 of yacc.c  */
-#line 6624 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6623 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_TINY; }
     break;
 
   case 719:
 
-/* Line 1806 of yacc.c  */
-#line 6625 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6624 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_SHORT; }
     break;
 
   case 720:
 
-/* Line 1806 of yacc.c  */
-#line 6626 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6625 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_INT24; }
     break;
 
   case 721:
 
-/* Line 1806 of yacc.c  */
-#line 6627 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6626 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_LONGLONG; }
     break;
 
   case 722:
 
-/* Line 1806 of yacc.c  */
-#line 6632 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6631 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ?
               MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE;
@@ -24912,43 +24881,43 @@
 
   case 723:
 
-/* Line 1806 of yacc.c  */
-#line 6637 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6636 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_DOUBLE; }
     break;
 
   case 724:
 
-/* Line 1806 of yacc.c  */
-#line 6639 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6638 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_DOUBLE; }
     break;
 
   case 725:
 
-/* Line 1806 of yacc.c  */
-#line 6644 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6643 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 726:
 
-/* Line 1806 of yacc.c  */
-#line 6646 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6645 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->dec= (char*)0; }
     break;
 
   case 727:
 
-/* Line 1806 of yacc.c  */
-#line 6648 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6647 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 728:
 
-/* Line 1806 of yacc.c  */
-#line 6653 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6652 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->length=(yyvsp[(2) - (5)].lex_str).str;
@@ -24958,36 +24927,36 @@
 
   case 729:
 
-/* Line 1806 of yacc.c  */
-#line 6662 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6661 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->dec= (char *) 0; }
     break;
 
   case 730:
 
-/* Line 1806 of yacc.c  */
-#line 6663 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6662 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->dec= (yyvsp[(2) - (3)].lex_str).str; }
     break;
 
   case 731:
 
-/* Line 1806 of yacc.c  */
-#line 6667 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6666 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= 0; }
     break;
 
   case 732:
 
-/* Line 1806 of yacc.c  */
-#line 6668 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6667 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= 0; }
     break;
 
   case 733:
 
-/* Line 1806 of yacc.c  */
-#line 6670 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6669 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
              int error;
              (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(2) - (3)].lex_str).str, NULL, &error);
@@ -24996,169 +24965,169 @@
 
   case 734:
 
-/* Line 1806 of yacc.c  */
-#line 6677 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6676 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 735:
 
-/* Line 1806 of yacc.c  */
-#line 6678 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6677 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 736:
 
-/* Line 1806 of yacc.c  */
-#line 6682 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6681 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 737:
 
-/* Line 1806 of yacc.c  */
-#line 6683 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6682 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 738:
 
-/* Line 1806 of yacc.c  */
-#line 6687 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6686 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 739:
 
-/* Line 1806 of yacc.c  */
-#line 6688 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6687 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= UNSIGNED_FLAG;}
     break;
 
   case 740:
 
-/* Line 1806 of yacc.c  */
-#line 6689 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6688 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= UNSIGNED_FLAG | ZEROFILL_FLAG; }
     break;
 
   case 741:
 
-/* Line 1806 of yacc.c  */
-#line 6693 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6692 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
     break;
 
   case 742:
 
-/* Line 1806 of yacc.c  */
-#line 6694 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6693 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
     break;
 
   case 743:
 
-/* Line 1806 of yacc.c  */
-#line 6695 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6694 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
     break;
 
   case 744:
 
-/* Line 1806 of yacc.c  */
-#line 6696 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6695 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
     break;
 
   case 745:
 
-/* Line 1806 of yacc.c  */
-#line 6699 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6698 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->length=(char*) 0; /* use default length */ }
     break;
 
   case 746:
 
-/* Line 1806 of yacc.c  */
-#line 6700 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6699 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 747:
 
-/* Line 1806 of yacc.c  */
-#line 6704 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6703 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 748:
 
-/* Line 1806 of yacc.c  */
-#line 6705 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6704 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 749:
 
-/* Line 1806 of yacc.c  */
-#line 6709 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6708 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 750:
 
-/* Line 1806 of yacc.c  */
-#line 6710 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6709 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 751:
 
-/* Line 1806 of yacc.c  */
-#line 6714 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6713 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 753:
 
-/* Line 1806 of yacc.c  */
-#line 6719 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6718 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type&= ~ NOT_NULL_FLAG; }
     break;
 
   case 754:
 
-/* Line 1806 of yacc.c  */
-#line 6720 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6719 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= NOT_NULL_FLAG; }
     break;
 
   case 755:
 
-/* Line 1806 of yacc.c  */
-#line 6721 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6720 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->default_value=(yyvsp[(2) - (2)].item); }
     break;
 
   case 756:
 
-/* Line 1806 of yacc.c  */
-#line 6722 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6721 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->on_update_value= (yyvsp[(3) - (3)].item); }
     break;
 
   case 757:
 
-/* Line 1806 of yacc.c  */
-#line 6723 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6722 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG; }
     break;
 
   case 758:
 
-/* Line 1806 of yacc.c  */
-#line 6725 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6724 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             LEX *lex=Lex;
             lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNIQUE_FLAG;
@@ -25168,8 +25137,8 @@
 
   case 759:
 
-/* Line 1806 of yacc.c  */
-#line 6731 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6730 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->type|= PRI_KEY_FLAG | NOT_NULL_FLAG;
@@ -25179,8 +25148,8 @@
 
   case 760:
 
-/* Line 1806 of yacc.c  */
-#line 6737 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6736 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->type|= UNIQUE_FLAG; 
@@ -25190,8 +25159,8 @@
 
   case 761:
 
-/* Line 1806 of yacc.c  */
-#line 6743 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6742 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->type|= UNIQUE_KEY_FLAG; 
@@ -25201,15 +25170,15 @@
 
   case 762:
 
-/* Line 1806 of yacc.c  */
-#line 6748 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6747 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->comment= (yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 763:
 
-/* Line 1806 of yacc.c  */
-#line 6750 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6749 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->charset && !my_charset_same(Lex->charset,(yyvsp[(2) - (2)].charset)))
             {
@@ -25226,8 +25195,8 @@
 
   case 764:
 
-/* Line 1806 of yacc.c  */
-#line 6763 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6762 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->type&= ~(FIELD_FLAGS_COLUMN_FORMAT_MASK);
             Lex->type|=
@@ -25237,8 +25206,8 @@
 
   case 765:
 
-/* Line 1806 of yacc.c  */
-#line 6769 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6768 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->type&= ~(FIELD_FLAGS_COLUMN_FORMAT_MASK);
             Lex->type|=
@@ -25248,8 +25217,8 @@
 
   case 766:
 
-/* Line 1806 of yacc.c  */
-#line 6775 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6774 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->type&= ~(FIELD_FLAGS_COLUMN_FORMAT_MASK);
             Lex->type|=
@@ -25259,8 +25228,8 @@
 
   case 767:
 
-/* Line 1806 of yacc.c  */
-#line 6781 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6780 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->type&= ~(FIELD_FLAGS_STORAGE_MEDIA_MASK);
             Lex->type|= (HA_SM_DEFAULT << FIELD_FLAGS_STORAGE_MEDIA);
@@ -25269,8 +25238,8 @@
 
   case 768:
 
-/* Line 1806 of yacc.c  */
-#line 6786 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6785 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->type&= ~(FIELD_FLAGS_STORAGE_MEDIA_MASK);
             Lex->type|= (HA_SM_DISK << FIELD_FLAGS_STORAGE_MEDIA);
@@ -25279,8 +25248,8 @@
 
   case 769:
 
-/* Line 1806 of yacc.c  */
-#line 6791 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6790 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->type&= ~(FIELD_FLAGS_STORAGE_MEDIA_MASK);
             Lex->type|= (HA_SM_MEMORY << FIELD_FLAGS_STORAGE_MEDIA);
@@ -25289,8 +25258,8 @@
 
   case 770:
 
-/* Line 1806 of yacc.c  */
-#line 6800 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6799 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           (yyval.num)= (yyvsp[(1) - (2)].num);
 
@@ -25311,8 +25280,8 @@
 
   case 771:
 
-/* Line 1806 of yacc.c  */
-#line 6821 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6820 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_now_local((yyvsp[(2) - (2)].ulong_num));
             if ((yyval.item) == NULL)
@@ -25322,29 +25291,29 @@
 
   case 773:
 
-/* Line 1806 of yacc.c  */
-#line 6830 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6829 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 774:
 
-/* Line 1806 of yacc.c  */
-#line 6834 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6833 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 775:
 
-/* Line 1806 of yacc.c  */
-#line 6835 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6834 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 776:
 
-/* Line 1806 of yacc.c  */
-#line 6840 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6839 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyval.charset)=get_charset_by_csname((yyvsp[(1) - (1)].lex_str).str,MY_CS_PRIMARY,MYF(0))))
             {
@@ -25356,43 +25325,43 @@
 
   case 777:
 
-/* Line 1806 of yacc.c  */
-#line 6847 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6846 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)= &my_charset_bin; }
     break;
 
   case 778:
 
-/* Line 1806 of yacc.c  */
-#line 6851 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6850 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)=(yyvsp[(1) - (1)].charset);   }
     break;
 
   case 779:
 
-/* Line 1806 of yacc.c  */
-#line 6852 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6851 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)=NULL; }
     break;
 
   case 780:
 
-/* Line 1806 of yacc.c  */
-#line 6856 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6855 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)= NULL; }
     break;
 
   case 781:
 
-/* Line 1806 of yacc.c  */
-#line 6857 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6856 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)= (yyvsp[(2) - (2)].charset); }
     break;
 
   case 782:
 
-/* Line 1806 of yacc.c  */
-#line 6862 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6861 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyval.charset)=get_charset_by_csname((yyvsp[(1) - (1)].lex_str).str,MY_CS_PRIMARY,MYF(0))) &&
                 !((yyval.charset)=get_old_charset_by_name((yyvsp[(1) - (1)].lex_str).str)))
@@ -25405,29 +25374,29 @@
 
   case 783:
 
-/* Line 1806 of yacc.c  */
-#line 6870 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6869 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)= &my_charset_bin; }
     break;
 
   case 784:
 
-/* Line 1806 of yacc.c  */
-#line 6874 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6873 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)=(yyvsp[(1) - (1)].charset);   }
     break;
 
   case 785:
 
-/* Line 1806 of yacc.c  */
-#line 6875 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6874 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)=NULL; }
     break;
 
   case 786:
 
-/* Line 1806 of yacc.c  */
-#line 6880 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6879 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyval.charset)= mysqld_collation_get_by_name((yyvsp[(1) - (1)].lex_str).str)))
               MYSQL_YYABORT;
@@ -25436,57 +25405,57 @@
 
   case 787:
 
-/* Line 1806 of yacc.c  */
-#line 6887 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6886 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)=NULL; }
     break;
 
   case 788:
 
-/* Line 1806 of yacc.c  */
-#line 6888 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6887 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)=(yyvsp[(2) - (2)].charset); }
     break;
 
   case 789:
 
-/* Line 1806 of yacc.c  */
-#line 6892 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6891 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)=(yyvsp[(1) - (1)].charset); }
     break;
 
   case 790:
 
-/* Line 1806 of yacc.c  */
-#line 6893 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6892 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.charset)=NULL; }
     break;
 
   case 791:
 
-/* Line 1806 of yacc.c  */
-#line 6897 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6896 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 792:
 
-/* Line 1806 of yacc.c  */
-#line 6898 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6897 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 793:
 
-/* Line 1806 of yacc.c  */
-#line 6903 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6902 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->charset= &my_charset_latin1; }
     break;
 
   case 794:
 
-/* Line 1806 of yacc.c  */
-#line 6905 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6904 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset= &my_charset_latin1_bin;
           }
@@ -25494,8 +25463,8 @@
 
   case 795:
 
-/* Line 1806 of yacc.c  */
-#line 6909 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6908 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset= &my_charset_latin1_bin;
           }
@@ -25503,8 +25472,8 @@
 
   case 796:
 
-/* Line 1806 of yacc.c  */
-#line 6916 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6915 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!(Lex->charset=get_charset_by_csname("ucs2",
                                                      MY_CS_PRIMARY,MYF(0))))
@@ -25517,8 +25486,8 @@
 
   case 797:
 
-/* Line 1806 of yacc.c  */
-#line 6925 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6924 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!(Lex->charset= mysqld_collation_get_by_name("ucs2_bin")))
               MYSQL_YYABORT;
@@ -25527,8 +25496,8 @@
 
   case 798:
 
-/* Line 1806 of yacc.c  */
-#line 6930 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6929 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!(Lex->charset= mysqld_collation_get_by_name("ucs2_bin")))
               my_error(ER_UNKNOWN_COLLATION, MYF(0), "ucs2_bin");
@@ -25537,29 +25506,29 @@
 
   case 799:
 
-/* Line 1806 of yacc.c  */
-#line 6937 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6936 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->charset=NULL; }
     break;
 
   case 802:
 
-/* Line 1806 of yacc.c  */
-#line 6940 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6939 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->charset=&my_charset_bin; }
     break;
 
   case 803:
 
-/* Line 1806 of yacc.c  */
-#line 6941 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6940 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->charset=(yyvsp[(2) - (3)].charset); }
     break;
 
   case 804:
 
-/* Line 1806 of yacc.c  */
-#line 6943 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6942 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset= NULL;
             Lex->type|= BINCMP_FLAG;
@@ -25568,8 +25537,8 @@
 
   case 805:
 
-/* Line 1806 of yacc.c  */
-#line 6948 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6947 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->charset= (yyvsp[(3) - (3)].charset);
             Lex->type|= BINCMP_FLAG;
@@ -25578,22 +25547,22 @@
 
   case 806:
 
-/* Line 1806 of yacc.c  */
-#line 6955 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6954 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 807:
 
-/* Line 1806 of yacc.c  */
-#line 6956 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6955 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= BINCMP_FLAG; }
     break;
 
   case 808:
 
-/* Line 1806 of yacc.c  */
-#line 6961 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6960 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           if ((yyvsp[(2) - (2)].ulong_num) == 0)
           {
@@ -25605,64 +25574,64 @@
 
   case 809:
 
-/* Line 1806 of yacc.c  */
-#line 6969 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6968 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (yyvsp[(2) - (4)].ulong_num); }
     break;
 
   case 810:
 
-/* Line 1806 of yacc.c  */
-#line 6973 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6972 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= 0; }
     break;
 
   case 811:
 
-/* Line 1806 of yacc.c  */
-#line 6974 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6973 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= 1 << MY_STRXFRM_DESC_SHIFT; }
     break;
 
   case 812:
 
-/* Line 1806 of yacc.c  */
-#line 6978 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6977 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= 1 << MY_STRXFRM_REVERSE_SHIFT; }
     break;
 
   case 813:
 
-/* Line 1806 of yacc.c  */
-#line 6981 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6980 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= 0; }
     break;
 
   case 814:
 
-/* Line 1806 of yacc.c  */
-#line 6982 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6981 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num); }
     break;
 
   case 815:
 
-/* Line 1806 of yacc.c  */
-#line 6983 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6982 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (yyvsp[(1) - (2)].ulong_num) | (yyvsp[(2) - (2)].ulong_num); }
     break;
 
   case 816:
 
-/* Line 1806 of yacc.c  */
-#line 6984 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6983 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num) ; }
     break;
 
   case 817:
 
-/* Line 1806 of yacc.c  */
-#line 6989 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6988 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num) < 1 ? 1 : ((yyvsp[(1) - (1)].ulong_num) > MY_STRXFRM_NLEVELS ? MY_STRXFRM_NLEVELS : (yyvsp[(1) - (1)].ulong_num));
           (yyval.ulong_num)--;
@@ -25671,8 +25640,8 @@
 
   case 818:
 
-/* Line 1806 of yacc.c  */
-#line 6997 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 6996 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           (yyval.ulong_num)= (1 | (yyvsp[(2) - (2)].ulong_num)) << (yyvsp[(1) - (2)].ulong_num);
         }
@@ -25680,22 +25649,22 @@
 
   case 819:
 
-/* Line 1806 of yacc.c  */
-#line 7003 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7002 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num); }
     break;
 
   case 820:
 
-/* Line 1806 of yacc.c  */
-#line 7004 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7003 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)|= (yyvsp[(3) - (3)].ulong_num); }
     break;
 
   case 821:
 
-/* Line 1806 of yacc.c  */
-#line 7009 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7008 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           uint start= (yyvsp[(1) - (3)].ulong_num);
           uint end= (yyvsp[(3) - (3)].ulong_num);
@@ -25706,36 +25675,36 @@
 
   case 822:
 
-/* Line 1806 of yacc.c  */
-#line 7018 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7017 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num); }
     break;
 
   case 823:
 
-/* Line 1806 of yacc.c  */
-#line 7019 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7018 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num); }
     break;
 
   case 824:
 
-/* Line 1806 of yacc.c  */
-#line 7023 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7022 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= 0; }
     break;
 
   case 825:
 
-/* Line 1806 of yacc.c  */
-#line 7024 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7023 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (yyvsp[(2) - (2)].ulong_num); }
     break;
 
   case 828:
 
-/* Line 1806 of yacc.c  */
-#line 7038 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7037 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.table)=(yyvsp[(2) - (5)].table);
           }
@@ -25743,15 +25712,15 @@
 
   case 829:
 
-/* Line 1806 of yacc.c  */
-#line 7045 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7044 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->ref_list.empty(); }
     break;
 
   case 831:
 
-/* Line 1806 of yacc.c  */
-#line 7051 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7050 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Key_part_spec *key= new Key_part_spec((yyvsp[(3) - (3)].lex_str), 0);
             if (key == NULL)
@@ -25762,8 +25731,8 @@
 
   case 832:
 
-/* Line 1806 of yacc.c  */
-#line 7058 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7057 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Key_part_spec *key= new Key_part_spec((yyvsp[(1) - (1)].lex_str), 0);
             if (key == NULL)
@@ -25776,36 +25745,36 @@
 
   case 833:
 
-/* Line 1806 of yacc.c  */
-#line 7070 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7069 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->fk_match_option= Foreign_key::FK_MATCH_UNDEF; }
     break;
 
   case 834:
 
-/* Line 1806 of yacc.c  */
-#line 7072 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7071 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->fk_match_option= Foreign_key::FK_MATCH_FULL; }
     break;
 
   case 835:
 
-/* Line 1806 of yacc.c  */
-#line 7074 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7073 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->fk_match_option= Foreign_key::FK_MATCH_PARTIAL; }
     break;
 
   case 836:
 
-/* Line 1806 of yacc.c  */
-#line 7076 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7075 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->fk_match_option= Foreign_key::FK_MATCH_SIMPLE; }
     break;
 
   case 837:
 
-/* Line 1806 of yacc.c  */
-#line 7081 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7080 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF;
@@ -25815,8 +25784,8 @@
 
   case 838:
 
-/* Line 1806 of yacc.c  */
-#line 7087 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7086 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= (yyvsp[(3) - (3)].m_fk_option);
@@ -25826,8 +25795,8 @@
 
   case 839:
 
-/* Line 1806 of yacc.c  */
-#line 7093 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7092 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF;
@@ -25837,8 +25806,8 @@
 
   case 840:
 
-/* Line 1806 of yacc.c  */
-#line 7100 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7099 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= (yyvsp[(3) - (6)].m_fk_option);
@@ -25848,8 +25817,8 @@
 
   case 841:
 
-/* Line 1806 of yacc.c  */
-#line 7107 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7106 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= (yyvsp[(6) - (6)].m_fk_option);
@@ -25859,127 +25828,127 @@
 
   case 842:
 
-/* Line 1806 of yacc.c  */
-#line 7115 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7114 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_RESTRICT; }
     break;
 
   case 843:
 
-/* Line 1806 of yacc.c  */
-#line 7116 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7115 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_CASCADE; }
     break;
 
   case 844:
 
-/* Line 1806 of yacc.c  */
-#line 7117 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7116 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_SET_NULL; }
     break;
 
   case 845:
 
-/* Line 1806 of yacc.c  */
-#line 7118 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7117 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_NO_ACTION; }
     break;
 
   case 846:
 
-/* Line 1806 of yacc.c  */
-#line 7119 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7118 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_DEFAULT;  }
     break;
 
   case 847:
 
-/* Line 1806 of yacc.c  */
-#line 7123 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7122 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::MULTIPLE; }
     break;
 
   case 848:
 
-/* Line 1806 of yacc.c  */
-#line 7127 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7126 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::PRIMARY; }
     break;
 
   case 849:
 
-/* Line 1806 of yacc.c  */
-#line 7128 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7127 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::UNIQUE; }
     break;
 
   case 850:
 
-/* Line 1806 of yacc.c  */
-#line 7132 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7131 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 851:
 
-/* Line 1806 of yacc.c  */
-#line 7133 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7132 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 852:
 
-/* Line 1806 of yacc.c  */
-#line 7137 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7136 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 854:
 
-/* Line 1806 of yacc.c  */
-#line 7142 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7141 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 855:
 
-/* Line 1806 of yacc.c  */
-#line 7143 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7142 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 856:
 
-/* Line 1806 of yacc.c  */
-#line 7144 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7143 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 857:
 
-/* Line 1806 of yacc.c  */
-#line 7148 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7147 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::MULTIPLE; }
     break;
 
   case 858:
 
-/* Line 1806 of yacc.c  */
-#line 7149 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7148 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::UNIQUE; }
     break;
 
   case 859:
 
-/* Line 1806 of yacc.c  */
-#line 7153 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7152 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::FULLTEXT;}
     break;
 
   case 860:
 
-/* Line 1806 of yacc.c  */
-#line 7158 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7157 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
 #ifdef HAVE_SPATIAL
             (yyval.key_type)= Key::SPATIAL;
@@ -25993,8 +25962,8 @@
 
   case 861:
 
-/* Line 1806 of yacc.c  */
-#line 7170 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7169 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->key_create_info= default_key_create_info;
           }
@@ -26002,57 +25971,57 @@
 
   case 864:
 
-/* Line 1806 of yacc.c  */
-#line 7187 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7186 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 866:
 
-/* Line 1806 of yacc.c  */
-#line 7192 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7191 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 868:
 
-/* Line 1806 of yacc.c  */
-#line 7197 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7196 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 876:
 
-/* Line 1806 of yacc.c  */
-#line 7217 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7216 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->key_create_info.algorithm= (yyvsp[(2) - (2)].key_alg); }
     break;
 
   case 877:
 
-/* Line 1806 of yacc.c  */
-#line 7218 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7217 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->key_create_info.algorithm= (yyvsp[(2) - (2)].key_alg); }
     break;
 
   case 878:
 
-/* Line 1806 of yacc.c  */
-#line 7223 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7222 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->key_create_info.block_size= (yyvsp[(3) - (3)].ulong_num); }
     break;
 
   case 879:
 
-/* Line 1806 of yacc.c  */
-#line 7224 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7223 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->key_create_info.comment= (yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 884:
 
-/* Line 1806 of yacc.c  */
-#line 7239 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7238 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (plugin_is_ready(&(yyvsp[(3) - (3)].lex_str), MYSQL_FTPARSER_PLUGIN))
               Lex->key_create_info.parser_name= (yyvsp[(3) - (3)].lex_str);
@@ -26066,43 +26035,43 @@
 
   case 885:
 
-/* Line 1806 of yacc.c  */
-#line 7251 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7250 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.key_alg)= HA_KEY_ALG_BTREE; }
     break;
 
   case 886:
 
-/* Line 1806 of yacc.c  */
-#line 7252 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7251 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.key_alg)= HA_KEY_ALG_RTREE; }
     break;
 
   case 887:
 
-/* Line 1806 of yacc.c  */
-#line 7253 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7252 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.key_alg)= HA_KEY_ALG_HASH; }
     break;
 
   case 888:
 
-/* Line 1806 of yacc.c  */
-#line 7257 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7256 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->col_list.push_back((yyvsp[(3) - (4)].key_part)); }
     break;
 
   case 889:
 
-/* Line 1806 of yacc.c  */
-#line 7258 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7257 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->col_list.push_back((yyvsp[(1) - (2)].key_part)); }
     break;
 
   case 890:
 
-/* Line 1806 of yacc.c  */
-#line 7263 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7262 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.key_part)= new Key_part_spec((yyvsp[(1) - (1)].lex_str), 0);
             if ((yyval.key_part) == NULL)
@@ -26112,8 +26081,8 @@
 
   case 891:
 
-/* Line 1806 of yacc.c  */
-#line 7269 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7268 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             int key_part_len= atoi((yyvsp[(3) - (4)].lex_str).str);
             if (!key_part_len)
@@ -26128,50 +26097,50 @@
 
   case 892:
 
-/* Line 1806 of yacc.c  */
-#line 7282 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7281 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= null_lex_str; }
     break;
 
   case 893:
 
-/* Line 1806 of yacc.c  */
-#line 7283 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7282 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 894:
 
-/* Line 1806 of yacc.c  */
-#line 7287 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7286 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= null_lex_str; }
     break;
 
   case 895:
 
-/* Line 1806 of yacc.c  */
-#line 7288 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7287 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 896:
 
-/* Line 1806 of yacc.c  */
-#line 7292 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7291 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->interval_list.push_back((yyvsp[(1) - (1)].string)); }
     break;
 
   case 897:
 
-/* Line 1806 of yacc.c  */
-#line 7293 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7292 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->interval_list.push_back((yyvsp[(3) - (3)].string)); }
     break;
 
   case 898:
 
-/* Line 1806 of yacc.c  */
-#line 7301 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7300 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26208,8 +26177,8 @@
 
   case 899:
 
-/* Line 1806 of yacc.c  */
-#line 7334 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7333 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26225,8 +26194,8 @@
 
   case 900:
 
-/* Line 1806 of yacc.c  */
-#line 7346 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7345 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_info.default_table_charset= NULL;
             Lex->create_info.used_fields= 0;
@@ -26235,8 +26204,8 @@
 
   case 901:
 
-/* Line 1806 of yacc.c  */
-#line 7351 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7350 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_ALTER_DB;
@@ -26249,8 +26218,8 @@
 
   case 902:
 
-/* Line 1806 of yacc.c  */
-#line 7360 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7359 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->sphead)
@@ -26265,8 +26234,8 @@
 
   case 903:
 
-/* Line 1806 of yacc.c  */
-#line 7371 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7370 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -26281,8 +26250,8 @@
 
   case 904:
 
-/* Line 1806 of yacc.c  */
-#line 7382 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7381 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
 
@@ -26293,8 +26262,8 @@
 
   case 905:
 
-/* Line 1806 of yacc.c  */
-#line 7389 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7388 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -26309,8 +26278,8 @@
 
   case 906:
 
-/* Line 1806 of yacc.c  */
-#line 7400 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7399 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
 
@@ -26321,8 +26290,8 @@
 
   case 907:
 
-/* Line 1806 of yacc.c  */
-#line 7407 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7406 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -26337,15 +26306,15 @@
 
   case 908:
 
-/* Line 1806 of yacc.c  */
-#line 7418 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7417 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 909:
 
-/* Line 1806 of yacc.c  */
-#line 7425 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7424 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -26361,15 +26330,15 @@
 
   case 910:
 
-/* Line 1806 of yacc.c  */
-#line 7437 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7436 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 911:
 
-/* Line 1806 of yacc.c  */
-#line 7439 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7438 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* 
               It is safe to use Lex->spname because
@@ -26389,8 +26358,8 @@
 
   case 912:
 
-/* Line 1806 of yacc.c  */
-#line 7459 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7458 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyvsp[(6) - (10)].num) || (yyvsp[(7) - (10)].num) || (yyvsp[(8) - (10)].num) || (yyvsp[(9) - (10)].num) || (yyvsp[(10) - (10)].num)))
             {
@@ -26407,8 +26376,8 @@
 
   case 913:
 
-/* Line 1806 of yacc.c  */
-#line 7472 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7471 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= ALTER_TABLESPACE;
@@ -26417,8 +26386,8 @@
 
   case 914:
 
-/* Line 1806 of yacc.c  */
-#line 7477 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7476 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= ALTER_LOGFILE_GROUP;
@@ -26427,8 +26396,8 @@
 
   case 915:
 
-/* Line 1806 of yacc.c  */
-#line 7482 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7481 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= CHANGE_FILE_TABLESPACE;
@@ -26437,8 +26406,8 @@
 
   case 916:
 
-/* Line 1806 of yacc.c  */
-#line 7487 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7486 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= ALTER_ACCESS_MODE_TABLESPACE;
@@ -26447,8 +26416,8 @@
 
   case 917:
 
-/* Line 1806 of yacc.c  */
-#line 7492 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7491 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_ALTER_SERVER;
@@ -26459,8 +26428,8 @@
 
   case 918:
 
-/* Line 1806 of yacc.c  */
-#line 7499 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7498 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command= SQLCOM_ALTER_USER;
           }
@@ -26468,8 +26437,8 @@
 
   case 919:
 
-/* Line 1806 of yacc.c  */
-#line 7506 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7505 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(1) - (3)].lex_user)))
               MYSQL_YYABORT;
@@ -26478,8 +26447,8 @@
 
   case 920:
 
-/* Line 1806 of yacc.c  */
-#line 7511 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7510 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(3) - (5)].lex_user)))
               MYSQL_YYABORT;
@@ -26488,43 +26457,43 @@
 
   case 921:
 
-/* Line 1806 of yacc.c  */
-#line 7518 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7517 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0;}
     break;
 
   case 922:
 
-/* Line 1806 of yacc.c  */
-#line 7519 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7518 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 923:
 
-/* Line 1806 of yacc.c  */
-#line 7520 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7519 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 924:
 
-/* Line 1806 of yacc.c  */
-#line 7521 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7520 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 925:
 
-/* Line 1806 of yacc.c  */
-#line 7525 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7524 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0;}
     break;
 
   case 926:
 
-/* Line 1806 of yacc.c  */
-#line 7527 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7526 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               Use lex's spname to hold the new name.
@@ -26537,36 +26506,36 @@
 
   case 927:
 
-/* Line 1806 of yacc.c  */
-#line 7538 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7537 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0;}
     break;
 
   case 928:
 
-/* Line 1806 of yacc.c  */
-#line 7539 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7538 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 929:
 
-/* Line 1806 of yacc.c  */
-#line 7543 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7542 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str).str= 0; (yyval.lex_str).length= 0; }
     break;
 
   case 930:
 
-/* Line 1806 of yacc.c  */
-#line 7544 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7543 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 932:
 
-/* Line 1806 of yacc.c  */
-#line 7550 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7549 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->m_sql_cmd= new (YYTHD->mem_root)
               Sql_cmd_discard_import_tablespace(
@@ -26578,8 +26547,8 @@
 
   case 933:
 
-/* Line 1806 of yacc.c  */
-#line 7558 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7557 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->m_sql_cmd= new (YYTHD->mem_root)
               Sql_cmd_discard_import_tablespace(
@@ -26591,8 +26560,8 @@
 
   case 939:
 
-/* Line 1806 of yacc.c  */
-#line 7580 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7579 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= Alter_info::ALTER_DROP_PARTITION;
           }
@@ -26600,8 +26569,8 @@
 
   case 940:
 
-/* Line 1806 of yacc.c  */
-#line 7585 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7584 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_info.flags|= Alter_info::ALTER_REBUILD_PARTITION;
@@ -26611,8 +26580,8 @@
 
   case 941:
 
-/* Line 1806 of yacc.c  */
-#line 7592 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7591 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26628,8 +26597,8 @@
 
   case 943:
 
-/* Line 1806 of yacc.c  */
-#line 7606 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7605 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26645,8 +26614,8 @@
 
   case 944:
 
-/* Line 1806 of yacc.c  */
-#line 7618 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7617 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26661,8 +26630,8 @@
 
   case 946:
 
-/* Line 1806 of yacc.c  */
-#line 7631 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7630 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26678,8 +26647,8 @@
 
   case 948:
 
-/* Line 1806 of yacc.c  */
-#line 7644 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7643 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_info.flags|= Alter_info::ALTER_COALESCE_PARTITION;
@@ -26690,8 +26659,8 @@
 
   case 949:
 
-/* Line 1806 of yacc.c  */
-#line 7651 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7650 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26706,8 +26675,8 @@
 
   case 951:
 
-/* Line 1806 of yacc.c  */
-#line 7664 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7663 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26735,8 +26704,8 @@
 
   case 952:
 
-/* Line 1806 of yacc.c  */
-#line 7691 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7690 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= Alter_info::ALTER_REMOVE_PARTITIONING;
           }
@@ -26744,8 +26713,8 @@
 
   case 953:
 
-/* Line 1806 of yacc.c  */
-#line 7698 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7697 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= Alter_info::ALTER_ALL_PARTITION;
           }
@@ -26753,8 +26722,8 @@
 
   case 955:
 
-/* Line 1806 of yacc.c  */
-#line 7706 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7705 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->part_info= new partition_info();
@@ -26770,15 +26739,15 @@
 
   case 956:
 
-/* Line 1806 of yacc.c  */
-#line 7718 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7717 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 958:
 
-/* Line 1806 of yacc.c  */
-#line 7724 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7723 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->part_info->num_parts= lex->part_info->partitions.elements;
@@ -26787,8 +26756,8 @@
 
   case 959:
 
-/* Line 1806 of yacc.c  */
-#line 7729 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7728 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->part_info->num_parts= (yyvsp[(2) - (2)].ulong_num);
           }
@@ -26796,8 +26765,8 @@
 
   case 960:
 
-/* Line 1806 of yacc.c  */
-#line 7736 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7735 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->part_info= new partition_info();
@@ -26812,8 +26781,8 @@
 
   case 962:
 
-/* Line 1806 of yacc.c  */
-#line 7751 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7750 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= Alter_info::ALTER_TABLE_REORG;
           }
@@ -26821,8 +26790,8 @@
 
   case 963:
 
-/* Line 1806 of yacc.c  */
-#line 7755 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7754 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= Alter_info::ALTER_REORGANIZE_PARTITION;
           }
@@ -26830,8 +26799,8 @@
 
   case 964:
 
-/* Line 1806 of yacc.c  */
-#line 7759 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7758 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->num_parts= part_info->partitions.elements;
@@ -26840,22 +26809,22 @@
 
   case 965:
 
-/* Line 1806 of yacc.c  */
-#line 7766 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7765 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 966:
 
-/* Line 1806 of yacc.c  */
-#line 7767 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7766 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 967:
 
-/* Line 1806 of yacc.c  */
-#line 7772 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7771 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->alter_info.partition_names.push_back((yyvsp[(1) - (1)].lex_str).str))
             {
@@ -26867,8 +26836,8 @@
 
   case 970:
 
-/* Line 1806 of yacc.c  */
-#line 7792 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7791 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->change=0;
@@ -26878,8 +26847,8 @@
 
   case 971:
 
-/* Line 1806 of yacc.c  */
-#line 7801 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7800 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_last_non_select_table= Lex->last_table();
           }
@@ -26887,8 +26856,8 @@
 
   case 972:
 
-/* Line 1806 of yacc.c  */
-#line 7805 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7804 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_last_non_select_table= Lex->last_table();
             Lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX;
@@ -26897,8 +26866,8 @@
 
   case 973:
 
-/* Line 1806 of yacc.c  */
-#line 7810 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7809 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= Alter_info::ALTER_ADD_COLUMN |
                                     Alter_info::ALTER_ADD_INDEX;
@@ -26907,8 +26876,8 @@
 
   case 974:
 
-/* Line 1806 of yacc.c  */
-#line 7815 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7814 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->change= (yyvsp[(3) - (3)].lex_str).str;
@@ -26918,8 +26887,8 @@
 
   case 975:
 
-/* Line 1806 of yacc.c  */
-#line 7821 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7820 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_last_non_select_table= Lex->last_table();
           }
@@ -26927,8 +26896,8 @@
 
   case 976:
 
-/* Line 1806 of yacc.c  */
-#line 7825 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7824 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->length=lex->dec=0; lex->type=0;
@@ -26941,8 +26910,8 @@
 
   case 977:
 
-/* Line 1806 of yacc.c  */
-#line 7834 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7833 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (add_field_to_list(lex->thd,&(yyvsp[(3) - (6)].lex_str),
@@ -26958,8 +26927,8 @@
 
   case 978:
 
-/* Line 1806 of yacc.c  */
-#line 7846 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7845 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->create_last_non_select_table= Lex->last_table();
           }
@@ -26967,8 +26936,8 @@
 
   case 979:
 
-/* Line 1806 of yacc.c  */
-#line 7850 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7849 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_drop *ad= new Alter_drop(Alter_drop::COLUMN, (yyvsp[(3) - (4)].lex_str).str);
@@ -26981,8 +26950,8 @@
 
   case 980:
 
-/* Line 1806 of yacc.c  */
-#line 7859 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7858 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_drop *ad= new Alter_drop(Alter_drop::FOREIGN_KEY, (yyvsp[(4) - (4)].lex_str).str);
@@ -26995,8 +26964,8 @@
 
   case 981:
 
-/* Line 1806 of yacc.c  */
-#line 7868 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7867 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_drop *ad= new Alter_drop(Alter_drop::KEY, primary_key_name);
@@ -27009,8 +26978,8 @@
 
   case 982:
 
-/* Line 1806 of yacc.c  */
-#line 7877 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7876 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[(3) - (3)].lex_str).str);
@@ -27023,8 +26992,8 @@
 
   case 983:
 
-/* Line 1806 of yacc.c  */
-#line 7886 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7885 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->alter_info.keys_onoff= Alter_info::DISABLE;
@@ -27034,8 +27003,8 @@
 
   case 984:
 
-/* Line 1806 of yacc.c  */
-#line 7892 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7891 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->alter_info.keys_onoff= Alter_info::ENABLE;
@@ -27045,8 +27014,8 @@
 
   case 985:
 
-/* Line 1806 of yacc.c  */
-#line 7898 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7897 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_column *ac= new Alter_column((yyvsp[(3) - (6)].lex_str).str,(yyvsp[(6) - (6)].item));
@@ -27059,8 +27028,8 @@
 
   case 986:
 
-/* Line 1806 of yacc.c  */
-#line 7907 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7906 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_column *ac= new Alter_column((yyvsp[(3) - (5)].lex_str).str, (Item*) 0);
@@ -27073,8 +27042,8 @@
 
   case 987:
 
-/* Line 1806 of yacc.c  */
-#line 7916 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7915 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             size_t dummy;
@@ -27106,8 +27075,8 @@
 
   case 988:
 
-/* Line 1806 of yacc.c  */
-#line 7944 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7943 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!(yyvsp[(4) - (5)].charset))
             {
@@ -27132,8 +27101,8 @@
 
   case 989:
 
-/* Line 1806 of yacc.c  */
-#line 7965 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7964 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->alter_info.flags|= Alter_info::ALTER_OPTIONS;
@@ -27147,8 +27116,8 @@
 
   case 990:
 
-/* Line 1806 of yacc.c  */
-#line 7975 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7974 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= Alter_info::ALTER_RECREATE;
           }
@@ -27156,8 +27125,8 @@
 
   case 991:
 
-/* Line 1806 of yacc.c  */
-#line 7979 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7978 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->alter_info.flags|= Alter_info::ALTER_ORDER;
@@ -27166,8 +27135,8 @@
 
   case 999:
 
-/* Line 1806 of yacc.c  */
-#line 7996 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 7995 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.requested_algorithm=
               Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT;
@@ -27176,8 +27145,8 @@
 
   case 1000:
 
-/* Line 1806 of yacc.c  */
-#line 8001 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8000 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->alter_info.set_requested_algorithm(&(yyvsp[(3) - (3)].lex_str)))
             {
@@ -27189,8 +27158,8 @@
 
   case 1001:
 
-/* Line 1806 of yacc.c  */
-#line 8012 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8011 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.requested_lock=
               Alter_info::ALTER_TABLE_LOCK_DEFAULT;
@@ -27199,8 +27168,8 @@
 
   case 1002:
 
-/* Line 1806 of yacc.c  */
-#line 8017 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8016 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->alter_info.set_requested_lock(&(yyvsp[(3) - (3)].lex_str)))
             {
@@ -27212,64 +27181,64 @@
 
   case 1003:
 
-/* Line 1806 of yacc.c  */
-#line 8027 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8026 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1004:
 
-/* Line 1806 of yacc.c  */
-#line 8028 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8027 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1005:
 
-/* Line 1806 of yacc.c  */
-#line 8032 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8031 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->ignore= 0;}
     break;
 
   case 1006:
 
-/* Line 1806 of yacc.c  */
-#line 8033 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8032 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->ignore= 1;}
     break;
 
   case 1007:
 
-/* Line 1806 of yacc.c  */
-#line 8037 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8036 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->drop_mode= DROP_DEFAULT; }
     break;
 
   case 1008:
 
-/* Line 1806 of yacc.c  */
-#line 8038 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8037 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->drop_mode= DROP_RESTRICT; }
     break;
 
   case 1009:
 
-/* Line 1806 of yacc.c  */
-#line 8039 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8038 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->drop_mode= DROP_CASCADE; }
     break;
 
   case 1010:
 
-/* Line 1806 of yacc.c  */
-#line 8043 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8042 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1011:
 
-/* Line 1806 of yacc.c  */
-#line 8045 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8044 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             store_position_for_column((yyvsp[(2) - (2)].lex_str).str);
             Lex->alter_info.flags |= Alter_info::ALTER_COLUMN_ORDER;
@@ -27278,8 +27247,8 @@
 
   case 1012:
 
-/* Line 1806 of yacc.c  */
-#line 8050 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8049 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             store_position_for_column(first_keyword);
             Lex->alter_info.flags |= Alter_info::ALTER_COLUMN_ORDER;
@@ -27288,36 +27257,36 @@
 
   case 1013:
 
-/* Line 1806 of yacc.c  */
-#line 8057 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8056 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1014:
 
-/* Line 1806 of yacc.c  */
-#line 8058 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8057 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1015:
 
-/* Line 1806 of yacc.c  */
-#line 8059 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8058 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1016:
 
-/* Line 1806 of yacc.c  */
-#line 8060 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8059 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1017:
 
-/* Line 1806 of yacc.c  */
-#line 8065 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8064 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             /* Clean previous slave connection values */
@@ -27332,8 +27301,8 @@
 
   case 1018:
 
-/* Line 1806 of yacc.c  */
-#line 8077 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8076 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               It is not possible to set user's information when
@@ -27354,8 +27323,8 @@
 
   case 1019:
 
-/* Line 1806 of yacc.c  */
-#line 8094 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8093 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_SLAVE_STOP;
@@ -27366,8 +27335,8 @@
 
   case 1020:
 
-/* Line 1806 of yacc.c  */
-#line 8104 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8103 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_BEGIN;
@@ -27384,8 +27353,8 @@
 
   case 1021:
 
-/* Line 1806 of yacc.c  */
-#line 8120 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8119 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= 0;
           }
@@ -27393,8 +27362,8 @@
 
   case 1022:
 
-/* Line 1806 of yacc.c  */
-#line 8124 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8123 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= (yyvsp[(1) - (1)].num);
           }
@@ -27402,8 +27371,8 @@
 
   case 1023:
 
-/* Line 1806 of yacc.c  */
-#line 8131 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8130 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= (yyvsp[(1) - (1)].num);
           }
@@ -27411,8 +27380,8 @@
 
   case 1024:
 
-/* Line 1806 of yacc.c  */
-#line 8135 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8134 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= (yyvsp[(1) - (3)].num) | (yyvsp[(3) - (3)].num);
           }
@@ -27420,8 +27389,8 @@
 
   case 1025:
 
-/* Line 1806 of yacc.c  */
-#line 8142 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8141 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT;
           }
@@ -27429,8 +27398,8 @@
 
   case 1026:
 
-/* Line 1806 of yacc.c  */
-#line 8146 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8145 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= MYSQL_START_TRANS_OPT_READ_ONLY;
           }
@@ -27438,8 +27407,8 @@
 
   case 1027:
 
-/* Line 1806 of yacc.c  */
-#line 8150 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8149 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= MYSQL_START_TRANS_OPT_READ_WRITE;
           }
@@ -27447,8 +27416,8 @@
 
   case 1029:
 
-/* Line 1806 of yacc.c  */
-#line 8161 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8160 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* empty */
           }
@@ -27456,8 +27425,8 @@
 
   case 1030:
 
-/* Line 1806 of yacc.c  */
-#line 8165 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8164 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->slave_connection.user= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -27465,8 +27434,8 @@
 
   case 1031:
 
-/* Line 1806 of yacc.c  */
-#line 8171 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8170 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* empty */
           }
@@ -27474,8 +27443,8 @@
 
   case 1032:
 
-/* Line 1806 of yacc.c  */
-#line 8175 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8174 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->slave_connection.password= (yyvsp[(3) - (3)].lex_str).str;
             Lex->contains_plaintext_password= true;
@@ -27484,8 +27453,8 @@
 
   case 1033:
 
-/* Line 1806 of yacc.c  */
-#line 8181 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8180 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* empty */
           }
@@ -27493,8 +27462,8 @@
 
   case 1034:
 
-/* Line 1806 of yacc.c  */
-#line 8185 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8184 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->slave_connection.plugin_auth= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -27502,8 +27471,8 @@
 
   case 1035:
 
-/* Line 1806 of yacc.c  */
-#line 8191 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8190 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* empty */
           }
@@ -27511,8 +27480,8 @@
 
   case 1036:
 
-/* Line 1806 of yacc.c  */
-#line 8195 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8194 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->slave_connection.plugin_dir= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -27520,8 +27489,8 @@
 
   case 1037:
 
-/* Line 1806 of yacc.c  */
-#line 8202 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8201 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= 0;
           }
@@ -27529,8 +27498,8 @@
 
   case 1038:
 
-/* Line 1806 of yacc.c  */
-#line 8206 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8205 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= (yyvsp[(1) - (1)].num);
           }
@@ -27538,8 +27507,8 @@
 
   case 1039:
 
-/* Line 1806 of yacc.c  */
-#line 8213 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8212 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= (yyvsp[(1) - (1)].num);
           }
@@ -27547,8 +27516,8 @@
 
   case 1040:
 
-/* Line 1806 of yacc.c  */
-#line 8217 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8216 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= (yyvsp[(1) - (3)].num) | (yyvsp[(3) - (3)].num);
           }
@@ -27556,8 +27525,8 @@
 
   case 1041:
 
-/* Line 1806 of yacc.c  */
-#line 8224 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8223 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= SLAVE_SQL;
           }
@@ -27565,8 +27534,8 @@
 
   case 1042:
 
-/* Line 1806 of yacc.c  */
-#line 8228 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8227 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= SLAVE_IO;
           }
@@ -27574,15 +27543,15 @@
 
   case 1043:
 
-/* Line 1806 of yacc.c  */
-#line 8234 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8233 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1044:
 
-/* Line 1806 of yacc.c  */
-#line 8236 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8235 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (((lex->mi.log_file_name || lex->mi.pos) &&
@@ -27608,8 +27577,8 @@
 
   case 1047:
 
-/* Line 1806 of yacc.c  */
-#line 8263 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8262 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.gtid= (yyvsp[(3) - (3)].lex_str).str;
             Lex->mi.gtid_until_condition= LEX_MASTER_INFO::UNTIL_SQL_BEFORE_GTIDS;
@@ -27618,8 +27587,8 @@
 
   case 1048:
 
-/* Line 1806 of yacc.c  */
-#line 8268 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8267 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.gtid= (yyvsp[(3) - (3)].lex_str).str;
             Lex->mi.gtid_until_condition= LEX_MASTER_INFO::UNTIL_SQL_AFTER_GTIDS;
@@ -27628,8 +27597,8 @@
 
   case 1049:
 
-/* Line 1806 of yacc.c  */
-#line 8273 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8272 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->mi.until_after_gaps= true;
           }
@@ -27637,8 +27606,8 @@
 
   case 1050:
 
-/* Line 1806 of yacc.c  */
-#line 8280 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8279 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_CHECKSUM;
@@ -27649,36 +27618,36 @@
 
   case 1051:
 
-/* Line 1806 of yacc.c  */
-#line 8287 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8286 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1052:
 
-/* Line 1806 of yacc.c  */
-#line 8291 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8290 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags= 0; }
     break;
 
   case 1053:
 
-/* Line 1806 of yacc.c  */
-#line 8292 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8291 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags= T_QUICK; }
     break;
 
   case 1054:
 
-/* Line 1806 of yacc.c  */
-#line 8293 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8292 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags= T_EXTEND; }
     break;
 
   case 1055:
 
-/* Line 1806 of yacc.c  */
-#line 8298 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8297 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_REPAIR;
@@ -27692,8 +27661,8 @@
 
   case 1056:
 
-/* Line 1806 of yacc.c  */
-#line 8308 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8307 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -27706,57 +27675,57 @@
 
   case 1057:
 
-/* Line 1806 of yacc.c  */
-#line 8319 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8318 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags = T_MEDIUM; }
     break;
 
   case 1058:
 
-/* Line 1806 of yacc.c  */
-#line 8320 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8319 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1059:
 
-/* Line 1806 of yacc.c  */
-#line 8324 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8323 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1060:
 
-/* Line 1806 of yacc.c  */
-#line 8325 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8324 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1061:
 
-/* Line 1806 of yacc.c  */
-#line 8329 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8328 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_QUICK; }
     break;
 
   case 1062:
 
-/* Line 1806 of yacc.c  */
-#line 8330 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8329 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_EXTEND; }
     break;
 
   case 1063:
 
-/* Line 1806 of yacc.c  */
-#line 8331 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8330 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.sql_flags|= TT_USEFRM; }
     break;
 
   case 1064:
 
-/* Line 1806 of yacc.c  */
-#line 8336 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8335 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_ANALYZE;
@@ -27770,8 +27739,8 @@
 
   case 1065:
 
-/* Line 1806 of yacc.c  */
-#line 8346 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8345 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -27784,8 +27753,8 @@
 
   case 1066:
 
-/* Line 1806 of yacc.c  */
-#line 8358 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8357 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_BINLOG_BASE64_EVENT;
             Lex->comment= (yyvsp[(2) - (2)].lex_str);
@@ -27794,8 +27763,8 @@
 
   case 1067:
 
-/* Line 1806 of yacc.c  */
-#line 8366 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8365 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
 
@@ -27814,8 +27783,8 @@
 
   case 1068:
 
-/* Line 1806 of yacc.c  */
-#line 8381 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8380 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -27828,78 +27797,78 @@
 
   case 1069:
 
-/* Line 1806 of yacc.c  */
-#line 8392 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8391 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags = T_MEDIUM; }
     break;
 
   case 1070:
 
-/* Line 1806 of yacc.c  */
-#line 8393 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8392 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1071:
 
-/* Line 1806 of yacc.c  */
-#line 8397 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8396 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1072:
 
-/* Line 1806 of yacc.c  */
-#line 8398 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8397 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1073:
 
-/* Line 1806 of yacc.c  */
-#line 8402 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8401 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_QUICK; }
     break;
 
   case 1074:
 
-/* Line 1806 of yacc.c  */
-#line 8403 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8402 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_FAST; }
     break;
 
   case 1075:
 
-/* Line 1806 of yacc.c  */
-#line 8404 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8403 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_MEDIUM; }
     break;
 
   case 1076:
 
-/* Line 1806 of yacc.c  */
-#line 8405 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8404 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_EXTEND; }
     break;
 
   case 1077:
 
-/* Line 1806 of yacc.c  */
-#line 8406 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8405 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_CHECK_ONLY_CHANGED; }
     break;
 
   case 1078:
 
-/* Line 1806 of yacc.c  */
-#line 8407 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8406 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
     break;
 
   case 1079:
 
-/* Line 1806 of yacc.c  */
-#line 8412 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8411 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_OPTIMIZE;
@@ -27913,8 +27882,8 @@
 
   case 1080:
 
-/* Line 1806 of yacc.c  */
-#line 8422 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8421 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -27927,29 +27896,29 @@
 
   case 1081:
 
-/* Line 1806 of yacc.c  */
-#line 8433 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8432 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 1082:
 
-/* Line 1806 of yacc.c  */
-#line 8434 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8433 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 1083:
 
-/* Line 1806 of yacc.c  */
-#line 8435 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8434 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 1084:
 
-/* Line 1806 of yacc.c  */
-#line 8440 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8439 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command= SQLCOM_RENAME_TABLE;
           }
@@ -27957,15 +27926,15 @@
 
   case 1085:
 
-/* Line 1806 of yacc.c  */
-#line 8444 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8443 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1086:
 
-/* Line 1806 of yacc.c  */
-#line 8446 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8445 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_RENAME_USER;
           }
@@ -27973,8 +27942,8 @@
 
   case 1087:
 
-/* Line 1806 of yacc.c  */
-#line 8453 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8452 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(1) - (3)].lex_user)) || Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
               MYSQL_YYABORT;
@@ -27983,8 +27952,8 @@
 
   case 1088:
 
-/* Line 1806 of yacc.c  */
-#line 8458 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8457 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(3) - (5)].lex_user)) || Lex->users_list.push_back((yyvsp[(5) - (5)].lex_user)))
               MYSQL_YYABORT;
@@ -27993,8 +27962,8 @@
 
   case 1091:
 
-/* Line 1806 of yacc.c  */
-#line 8471 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8470 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             SELECT_LEX *sl= lex->current_select;
@@ -28008,8 +27977,8 @@
 
   case 1092:
 
-/* Line 1806 of yacc.c  */
-#line 8484 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8483 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.reset();
           }
@@ -28017,8 +27986,8 @@
 
   case 1093:
 
-/* Line 1806 of yacc.c  */
-#line 8488 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8487 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_ASSIGN_TO_KEYCACHE;
@@ -28028,8 +27997,8 @@
 
   case 1098:
 
-/* Line 1806 of yacc.c  */
-#line 8507 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8506 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (2)].table), NULL, 0, TL_READ,
                                            MDL_SHARED_READ,
@@ -28040,8 +28009,8 @@
 
   case 1099:
 
-/* Line 1806 of yacc.c  */
-#line 8517 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8516 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (3)].table), NULL, 0, TL_READ, 
                                            MDL_SHARED_READ,
@@ -28052,22 +28021,22 @@
 
   case 1100:
 
-/* Line 1806 of yacc.c  */
-#line 8526 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8525 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1101:
 
-/* Line 1806 of yacc.c  */
-#line 8527 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8526 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str) = default_key_cache_base; }
     break;
 
   case 1102:
 
-/* Line 1806 of yacc.c  */
-#line 8532 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8531 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_PRELOAD_KEYS;
@@ -28077,15 +28046,15 @@
 
   case 1103:
 
-/* Line 1806 of yacc.c  */
-#line 8538 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8537 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1108:
 
-/* Line 1806 of yacc.c  */
-#line 8553 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8552 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (3)].table), NULL, (yyvsp[(3) - (3)].num), TL_READ,
                                            MDL_SHARED_READ,
@@ -28096,8 +28065,8 @@
 
   case 1109:
 
-/* Line 1806 of yacc.c  */
-#line 8563 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8562 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (4)].table), NULL, (yyvsp[(4) - (4)].num), TL_READ,
                                            MDL_SHARED_READ,
@@ -28108,8 +28077,8 @@
 
   case 1110:
 
-/* Line 1806 of yacc.c  */
-#line 8573 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8572 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= Alter_info::ALTER_ADMIN_PARTITION;
           }
@@ -28117,8 +28086,8 @@
 
   case 1112:
 
-/* Line 1806 of yacc.c  */
-#line 8580 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8579 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->select_lex.alloc_index_hints(YYTHD);
             Select->set_index_hint_type(INDEX_HINT_USE, 
@@ -28130,29 +28099,29 @@
 
   case 1114:
 
-/* Line 1806 of yacc.c  */
-#line 8591 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8590 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 1116:
 
-/* Line 1806 of yacc.c  */
-#line 8597 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8596 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 1117:
 
-/* Line 1806 of yacc.c  */
-#line 8598 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8597 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= TL_OPTION_IGNORE_LEAVES; }
     break;
 
   case 1118:
 
-/* Line 1806 of yacc.c  */
-#line 8608 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8607 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SELECT;
@@ -28161,8 +28130,8 @@
 
   case 1121:
 
-/* Line 1806 of yacc.c  */
-#line 8622 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8621 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (setup_select_in_parentheses(Lex))
               MYSQL_YYABORT;
@@ -28171,8 +28140,8 @@
 
   case 1123:
 
-/* Line 1806 of yacc.c  */
-#line 8632 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8631 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (setup_select_in_parentheses(Lex))
               MYSQL_YYABORT;
@@ -28181,8 +28150,8 @@
 
   case 1125:
 
-/* Line 1806 of yacc.c  */
-#line 8641 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8640 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX * sel= lex->current_select;
@@ -28202,8 +28171,8 @@
 
   case 1127:
 
-/* Line 1806 of yacc.c  */
-#line 8660 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8659 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -28215,8 +28184,8 @@
 
   case 1128:
 
-/* Line 1806 of yacc.c  */
-#line 8668 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8667 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -28224,15 +28193,15 @@
 
   case 1130:
 
-/* Line 1806 of yacc.c  */
-#line 8675 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8674 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1135:
 
-/* Line 1806 of yacc.c  */
-#line 8685 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8684 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->context.table_list=
               Select->context.first_name_resolution_table=
@@ -28242,8 +28211,8 @@
 
   case 1138:
 
-/* Line 1806 of yacc.c  */
-#line 8700 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8699 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Select->options & SELECT_DISTINCT && Select->options & SELECT_ALL)
             {
@@ -28255,8 +28224,8 @@
 
   case 1142:
 
-/* Line 1806 of yacc.c  */
-#line 8717 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8716 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* 
               Allow this flag only on the first top-level SELECT statement, if
@@ -28288,8 +28257,8 @@
 
   case 1143:
 
-/* Line 1806 of yacc.c  */
-#line 8745 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8744 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* 
               Allow this flag only on the first top-level SELECT statement, if
@@ -28321,8 +28290,8 @@
 
   case 1145:
 
-/* Line 1806 of yacc.c  */
-#line 8777 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8776 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->current_select->set_lock_for_tables(TL_WRITE);
@@ -28332,8 +28301,8 @@
 
   case 1146:
 
-/* Line 1806 of yacc.c  */
-#line 8783 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8782 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->current_select->
@@ -28344,8 +28313,8 @@
 
   case 1149:
 
-/* Line 1806 of yacc.c  */
-#line 8795 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8794 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item *item= new (thd->mem_root)
@@ -28361,8 +28330,8 @@
 
   case 1150:
 
-/* Line 1806 of yacc.c  */
-#line 8810 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8809 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -28373,8 +28342,8 @@
 
   case 1151:
 
-/* Line 1806 of yacc.c  */
-#line 8817 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8816 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             DBUG_ASSERT((yyvsp[(1) - (4)].simple_string) < (yyvsp[(3) - (4)].simple_string));
@@ -28400,8 +28369,8 @@
 
   case 1152:
 
-/* Line 1806 of yacc.c  */
-#line 8841 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8840 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.simple_string)= (char*) YYLIP->get_cpp_tok_start();
           }
@@ -28409,8 +28378,8 @@
 
   case 1153:
 
-/* Line 1806 of yacc.c  */
-#line 8847 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8846 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.simple_string)= (char*) YYLIP->get_cpp_tok_end();
           }
@@ -28418,57 +28387,57 @@
 
   case 1154:
 
-/* Line 1806 of yacc.c  */
-#line 8853 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8852 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=null_lex_str;}
     break;
 
   case 1155:
 
-/* Line 1806 of yacc.c  */
-#line 8854 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8853 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 1156:
 
-/* Line 1806 of yacc.c  */
-#line 8855 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8854 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 1157:
 
-/* Line 1806 of yacc.c  */
-#line 8856 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8855 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1158:
 
-/* Line 1806 of yacc.c  */
-#line 8857 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8856 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1159:
 
-/* Line 1806 of yacc.c  */
-#line 8861 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8860 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1160:
 
-/* Line 1806 of yacc.c  */
-#line 8862 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8861 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1161:
 
-/* Line 1806 of yacc.c  */
-#line 8868 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8867 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               Design notes:
@@ -28523,8 +28492,8 @@
 
   case 1162:
 
-/* Line 1806 of yacc.c  */
-#line 8919 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8918 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* XOR is a proprietary extension */
             (yyval.item) = new (YYTHD->mem_root) Item_func_xor((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item));
@@ -28535,8 +28504,8 @@
 
   case 1163:
 
-/* Line 1806 of yacc.c  */
-#line 8926 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8925 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* See comments in rule expr: expr or expr */
             Item_cond_and *item1;
@@ -28583,8 +28552,8 @@
 
   case 1164:
 
-/* Line 1806 of yacc.c  */
-#line 8969 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8968 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item));
             if ((yyval.item) == NULL)
@@ -28594,8 +28563,8 @@
 
   case 1165:
 
-/* Line 1806 of yacc.c  */
-#line 8975 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8974 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_istrue((yyvsp[(1) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28605,8 +28574,8 @@
 
   case 1166:
 
-/* Line 1806 of yacc.c  */
-#line 8981 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8980 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnottrue((yyvsp[(1) - (4)].item));
             if ((yyval.item) == NULL)
@@ -28616,8 +28585,8 @@
 
   case 1167:
 
-/* Line 1806 of yacc.c  */
-#line 8987 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8986 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isfalse((yyvsp[(1) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28627,8 +28596,8 @@
 
   case 1168:
 
-/* Line 1806 of yacc.c  */
-#line 8993 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8992 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnotfalse((yyvsp[(1) - (4)].item));
             if ((yyval.item) == NULL)
@@ -28638,8 +28607,8 @@
 
   case 1169:
 
-/* Line 1806 of yacc.c  */
-#line 8999 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 8998 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28649,8 +28618,8 @@
 
   case 1170:
 
-/* Line 1806 of yacc.c  */
-#line 9005 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9004 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item));
             if ((yyval.item) == NULL)
@@ -28660,8 +28629,8 @@
 
   case 1172:
 
-/* Line 1806 of yacc.c  */
-#line 9015 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9014 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28671,8 +28640,8 @@
 
   case 1173:
 
-/* Line 1806 of yacc.c  */
-#line 9021 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9020 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item));
             if ((yyval.item) == NULL)
@@ -28682,8 +28651,8 @@
 
   case 1174:
 
-/* Line 1806 of yacc.c  */
-#line 9027 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9026 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_equal((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28693,8 +28662,8 @@
 
   case 1175:
 
-/* Line 1806 of yacc.c  */
-#line 9033 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9032 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= (*(yyvsp[(2) - (3)].boolfunc2creator))(0)->create((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28704,8 +28673,8 @@
 
   case 1176:
 
-/* Line 1806 of yacc.c  */
-#line 9039 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9038 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= all_any_subquery_creator((yyvsp[(1) - (6)].item), (yyvsp[(2) - (6)].boolfunc2creator), (yyvsp[(3) - (6)].num), (yyvsp[(5) - (6)].select_lex));
             if ((yyval.item) == NULL)
@@ -28715,8 +28684,8 @@
 
   case 1178:
 
-/* Line 1806 of yacc.c  */
-#line 9049 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9048 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_in_subselect((yyvsp[(1) - (5)].item), (yyvsp[(4) - (5)].select_lex));
             if ((yyval.item) == NULL)
@@ -28726,8 +28695,8 @@
 
   case 1179:
 
-/* Line 1806 of yacc.c  */
-#line 9055 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9054 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item *item= new (thd->mem_root) Item_in_subselect((yyvsp[(1) - (6)].item), (yyvsp[(5) - (6)].select_lex));
@@ -28741,8 +28710,8 @@
 
   case 1180:
 
-/* Line 1806 of yacc.c  */
-#line 9065 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9064 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (5)].item), true, (yyvsp[(4) - (5)].item));
             if ((yyval.item) == NULL)
@@ -28752,8 +28721,8 @@
 
   case 1181:
 
-/* Line 1806 of yacc.c  */
-#line 9071 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9070 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             (yyvsp[(6) - (7)].item_list)->push_front((yyvsp[(4) - (7)].item));
             (yyvsp[(6) - (7)].item_list)->push_front((yyvsp[(1) - (7)].item));
@@ -28765,8 +28734,8 @@
 
   case 1182:
 
-/* Line 1806 of yacc.c  */
-#line 9079 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9078 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (6)].item), false, (yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -28776,8 +28745,8 @@
 
   case 1183:
 
-/* Line 1806 of yacc.c  */
-#line 9085 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9084 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(5) - (8)].item));
             (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(1) - (8)].item));
@@ -28791,8 +28760,8 @@
 
   case 1184:
 
-/* Line 1806 of yacc.c  */
-#line 9095 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9094 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_between((yyvsp[(1) - (5)].item),(yyvsp[(3) - (5)].item),(yyvsp[(5) - (5)].item));
             if ((yyval.item) == NULL)
@@ -28802,8 +28771,8 @@
 
   case 1185:
 
-/* Line 1806 of yacc.c  */
-#line 9101 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9100 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item_func_between *item;
             item= new (YYTHD->mem_root) Item_func_between((yyvsp[(1) - (6)].item),(yyvsp[(4) - (6)].item),(yyvsp[(6) - (6)].item));
@@ -28816,8 +28785,8 @@
 
   case 1186:
 
-/* Line 1806 of yacc.c  */
-#line 9110 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9109 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *item1= new (YYTHD->mem_root) Item_func_soundex((yyvsp[(1) - (4)].item));
             Item *item4= new (YYTHD->mem_root) Item_func_soundex((yyvsp[(4) - (4)].item));
@@ -28831,8 +28800,8 @@
 
   case 1187:
 
-/* Line 1806 of yacc.c  */
-#line 9120 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9119 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_like((yyvsp[(1) - (4)].item),(yyvsp[(3) - (4)].item),(yyvsp[(4) - (4)].item),Lex->escape_used);
             if ((yyval.item) == NULL)
@@ -28842,8 +28811,8 @@
 
   case 1188:
 
-/* Line 1806 of yacc.c  */
-#line 9126 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9125 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_func_like((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].item),
                                                              Lex->escape_used);
@@ -28857,8 +28826,8 @@
 
   case 1189:
 
-/* Line 1806 of yacc.c  */
-#line 9136 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9135 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_regex((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28868,8 +28837,8 @@
 
   case 1190:
 
-/* Line 1806 of yacc.c  */
-#line 9142 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9141 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_func_regex((yyvsp[(1) - (4)].item),(yyvsp[(4) - (4)].item));
             if (item == NULL)
@@ -28882,8 +28851,8 @@
 
   case 1192:
 
-/* Line 1806 of yacc.c  */
-#line 9155 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9154 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_bit_or((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28893,8 +28862,8 @@
 
   case 1193:
 
-/* Line 1806 of yacc.c  */
-#line 9161 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9160 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_bit_and((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28904,8 +28873,8 @@
 
   case 1194:
 
-/* Line 1806 of yacc.c  */
-#line 9167 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9166 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_shift_left((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28915,8 +28884,8 @@
 
   case 1195:
 
-/* Line 1806 of yacc.c  */
-#line 9173 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9172 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_shift_right((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28926,8 +28895,8 @@
 
   case 1196:
 
-/* Line 1806 of yacc.c  */
-#line 9179 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9178 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_plus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28937,8 +28906,8 @@
 
   case 1197:
 
-/* Line 1806 of yacc.c  */
-#line 9185 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9184 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_minus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28948,8 +28917,8 @@
 
   case 1198:
 
-/* Line 1806 of yacc.c  */
-#line 9191 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9190 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),0);
             if ((yyval.item) == NULL)
@@ -28959,8 +28928,8 @@
 
   case 1199:
 
-/* Line 1806 of yacc.c  */
-#line 9197 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9196 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),1);
             if ((yyval.item) == NULL)
@@ -28970,8 +28939,8 @@
 
   case 1200:
 
-/* Line 1806 of yacc.c  */
-#line 9203 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9202 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_mul((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28981,8 +28950,8 @@
 
   case 1201:
 
-/* Line 1806 of yacc.c  */
-#line 9209 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9208 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -28992,8 +28961,8 @@
 
   case 1202:
 
-/* Line 1806 of yacc.c  */
-#line 9215 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9214 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -29003,8 +28972,8 @@
 
   case 1203:
 
-/* Line 1806 of yacc.c  */
-#line 9221 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9220 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_int_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -29014,8 +28983,8 @@
 
   case 1204:
 
-/* Line 1806 of yacc.c  */
-#line 9227 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9226 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -29025,8 +28994,8 @@
 
   case 1205:
 
-/* Line 1806 of yacc.c  */
-#line 9233 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9232 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_bit_xor((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -29036,64 +29005,64 @@
 
   case 1215:
 
-/* Line 1806 of yacc.c  */
-#line 9262 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9261 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_eq_creator; }
     break;
 
   case 1216:
 
-/* Line 1806 of yacc.c  */
-#line 9263 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9262 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_ge_creator; }
     break;
 
   case 1217:
 
-/* Line 1806 of yacc.c  */
-#line 9264 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9263 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_gt_creator; }
     break;
 
   case 1218:
 
-/* Line 1806 of yacc.c  */
-#line 9265 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9264 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_le_creator; }
     break;
 
   case 1219:
 
-/* Line 1806 of yacc.c  */
-#line 9266 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9265 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_lt_creator; }
     break;
 
   case 1220:
 
-/* Line 1806 of yacc.c  */
-#line 9267 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9266 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_ne_creator; }
     break;
 
   case 1221:
 
-/* Line 1806 of yacc.c  */
-#line 9271 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9270 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num) = 1; }
     break;
 
   case 1222:
 
-/* Line 1806 of yacc.c  */
-#line 9272 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9271 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num) = 0; }
     break;
 
   case 1228:
 
-/* Line 1806 of yacc.c  */
-#line 9282 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9281 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item *i1= new (thd->mem_root) Item_string((yyvsp[(3) - (3)].lex_str).str,
@@ -29109,8 +29078,8 @@
 
   case 1233:
 
-/* Line 1806 of yacc.c  */
-#line 9298 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9297 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_concat((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -29120,8 +29089,8 @@
 
   case 1234:
 
-/* Line 1806 of yacc.c  */
-#line 9304 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9303 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= (yyvsp[(2) - (2)].item);
           }
@@ -29129,8 +29098,8 @@
 
   case 1235:
 
-/* Line 1806 of yacc.c  */
-#line 9308 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9307 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_neg((yyvsp[(2) - (2)].item));
             if ((yyval.item) == NULL)
@@ -29140,8 +29109,8 @@
 
   case 1236:
 
-/* Line 1806 of yacc.c  */
-#line 9314 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9313 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_bit_neg((yyvsp[(2) - (2)].item));
             if ((yyval.item) == NULL)
@@ -29151,8 +29120,8 @@
 
   case 1237:
 
-/* Line 1806 of yacc.c  */
-#line 9320 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9319 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item));
             if ((yyval.item) == NULL)
@@ -29162,8 +29131,8 @@
 
   case 1238:
 
-/* Line 1806 of yacc.c  */
-#line 9326 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9325 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             (yyval.item)= new (YYTHD->mem_root) Item_singlerow_subselect((yyvsp[(2) - (3)].select_lex));
             if ((yyval.item) == NULL)
@@ -29173,15 +29142,15 @@
 
   case 1239:
 
-/* Line 1806 of yacc.c  */
-#line 9332 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9331 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(2) - (3)].item); }
     break;
 
   case 1240:
 
-/* Line 1806 of yacc.c  */
-#line 9334 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9333 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(4) - (5)].item_list)->push_front((yyvsp[(2) - (5)].item));
             (yyval.item)= new (YYTHD->mem_root) Item_row(*(yyvsp[(4) - (5)].item_list));
@@ -29192,8 +29161,8 @@
 
   case 1241:
 
-/* Line 1806 of yacc.c  */
-#line 9341 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9340 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(5) - (6)].item_list)->push_front((yyvsp[(3) - (6)].item));
             (yyval.item)= new (YYTHD->mem_root) Item_row(*(yyvsp[(5) - (6)].item_list));
@@ -29204,8 +29173,8 @@
 
   case 1242:
 
-/* Line 1806 of yacc.c  */
-#line 9348 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9347 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_exists_subselect((yyvsp[(3) - (4)].select_lex));
             if ((yyval.item) == NULL)
@@ -29215,8 +29184,8 @@
 
   case 1243:
 
-/* Line 1806 of yacc.c  */
-#line 9354 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9353 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item_string *item;
             (yyval.item)= NULL;
@@ -29261,8 +29230,8 @@
 
   case 1244:
 
-/* Line 1806 of yacc.c  */
-#line 9395 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9394 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(2) - (7)].item_list)->push_front((yyvsp[(5) - (7)].item));
             Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*(yyvsp[(2) - (7)].item_list), (yyvsp[(6) - (7)].num));
@@ -29275,8 +29244,8 @@
 
   case 1245:
 
-/* Line 1806 of yacc.c  */
-#line 9404 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9403 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= create_func_cast(YYTHD, (yyvsp[(2) - (2)].item), ITEM_CAST_CHAR, NULL, NULL,
                                  &my_charset_bin);
@@ -29287,8 +29256,8 @@
 
   case 1246:
 
-/* Line 1806 of yacc.c  */
-#line 9411 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9410 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             (yyval.item)= create_func_cast(YYTHD, (yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].cast_type), lex->length, lex->dec,
@@ -29300,8 +29269,8 @@
 
   case 1247:
 
-/* Line 1806 of yacc.c  */
-#line 9419 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9418 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_case(* (yyvsp[(3) - (5)].item_list), (yyvsp[(2) - (5)].item), (yyvsp[(4) - (5)].item) );
             if ((yyval.item) == NULL)
@@ -29311,8 +29280,8 @@
 
   case 1248:
 
-/* Line 1806 of yacc.c  */
-#line 9425 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9424 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= create_func_cast(YYTHD, (yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].cast_type), Lex->length, Lex->dec,
                                  Lex->charset);
@@ -29323,8 +29292,8 @@
 
   case 1249:
 
-/* Line 1806 of yacc.c  */
-#line 9432 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9431 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_conv_charset((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].charset));
             if ((yyval.item) == NULL)
@@ -29334,8 +29303,8 @@
 
   case 1250:
 
-/* Line 1806 of yacc.c  */
-#line 9438 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9437 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((yyvsp[(3) - (4)].item)->is_splocal())
             {
@@ -29353,8 +29322,8 @@
 
   case 1251:
 
-/* Line 1806 of yacc.c  */
-#line 9452 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9451 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(),
                                                         (yyvsp[(3) - (4)].item));
@@ -29365,8 +29334,8 @@
 
   case 1252:
 
-/* Line 1806 of yacc.c  */
-#line 9460 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9459 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(5) - (5)].item),(yyvsp[(2) - (5)].item),(yyvsp[(3) - (5)].interval),0);
             if ((yyval.item) == NULL)
@@ -29376,8 +29345,8 @@
 
   case 1253:
 
-/* Line 1806 of yacc.c  */
-#line 9475 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9474 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_char(*(yyvsp[(3) - (4)].item_list));
             if ((yyval.item) == NULL)
@@ -29387,8 +29356,8 @@
 
   case 1254:
 
-/* Line 1806 of yacc.c  */
-#line 9481 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9480 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_char(*(yyvsp[(3) - (6)].item_list), (yyvsp[(5) - (6)].charset));
             if ((yyval.item) == NULL)
@@ -29398,8 +29367,8 @@
 
   case 1255:
 
-/* Line 1806 of yacc.c  */
-#line 9487 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9486 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context());
             if ((yyval.item) == NULL)
@@ -29411,8 +29380,8 @@
 
   case 1256:
 
-/* Line 1806 of yacc.c  */
-#line 9495 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9494 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_typecast((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29422,8 +29391,8 @@
 
   case 1257:
 
-/* Line 1806 of yacc.c  */
-#line 9501 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9500 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_dayofmonth((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29433,8 +29402,8 @@
 
   case 1258:
 
-/* Line 1806 of yacc.c  */
-#line 9507 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9506 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_hour((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29444,8 +29413,8 @@
 
   case 1259:
 
-/* Line 1806 of yacc.c  */
-#line 9513 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9512 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_insert((yyvsp[(3) - (10)].item),(yyvsp[(5) - (10)].item),(yyvsp[(7) - (10)].item),(yyvsp[(9) - (10)].item));
             if ((yyval.item) == NULL)
@@ -29455,8 +29424,8 @@
 
   case 1260:
 
-/* Line 1806 of yacc.c  */
-#line 9519 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9518 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             List<Item> *list= new (thd->mem_root) List<Item>;
@@ -29475,8 +29444,8 @@
 
   case 1261:
 
-/* Line 1806 of yacc.c  */
-#line 9534 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9533 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(5) - (8)].item));
@@ -29492,8 +29461,8 @@
 
   case 1262:
 
-/* Line 1806 of yacc.c  */
-#line 9546 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9545 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_left((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29503,8 +29472,8 @@
 
   case 1263:
 
-/* Line 1806 of yacc.c  */
-#line 9552 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9551 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_minute((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29514,8 +29483,8 @@
 
   case 1264:
 
-/* Line 1806 of yacc.c  */
-#line 9558 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9557 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_month((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29525,8 +29494,8 @@
 
   case 1265:
 
-/* Line 1806 of yacc.c  */
-#line 9564 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9563 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_right((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29536,8 +29505,8 @@
 
   case 1266:
 
-/* Line 1806 of yacc.c  */
-#line 9570 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9569 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_second((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29547,8 +29516,8 @@
 
   case 1267:
 
-/* Line 1806 of yacc.c  */
-#line 9576 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9575 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_time_typecast((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29558,8 +29527,8 @@
 
   case 1268:
 
-/* Line 1806 of yacc.c  */
-#line 9582 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9581 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_datetime_typecast((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29569,8 +29538,8 @@
 
   case 1269:
 
-/* Line 1806 of yacc.c  */
-#line 9588 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9587 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_add_time((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), 1, 0);
             if ((yyval.item) == NULL)
@@ -29580,8 +29549,8 @@
 
   case 1270:
 
-/* Line 1806 of yacc.c  */
-#line 9594 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9593 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29591,8 +29560,8 @@
 
   case 1271:
 
-/* Line 1806 of yacc.c  */
-#line 9600 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9599 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_ltrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
             if ((yyval.item) == NULL)
@@ -29602,8 +29571,8 @@
 
   case 1272:
 
-/* Line 1806 of yacc.c  */
-#line 9606 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9605 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_rtrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
             if ((yyval.item) == NULL)
@@ -29613,8 +29582,8 @@
 
   case 1273:
 
-/* Line 1806 of yacc.c  */
-#line 9612 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9611 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
             if ((yyval.item) == NULL)
@@ -29624,8 +29593,8 @@
 
   case 1274:
 
-/* Line 1806 of yacc.c  */
-#line 9618 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9617 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_ltrim((yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29635,8 +29604,8 @@
 
   case 1275:
 
-/* Line 1806 of yacc.c  */
-#line 9624 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9623 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_rtrim((yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29646,8 +29615,8 @@
 
   case 1276:
 
-/* Line 1806 of yacc.c  */
-#line 9630 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9629 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29657,8 +29626,8 @@
 
   case 1277:
 
-/* Line 1806 of yacc.c  */
-#line 9636 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9635 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29668,8 +29637,8 @@
 
   case 1278:
 
-/* Line 1806 of yacc.c  */
-#line 9642 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9641 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_user();
             if ((yyval.item) == NULL)
@@ -29681,8 +29650,8 @@
 
   case 1279:
 
-/* Line 1806 of yacc.c  */
-#line 9650 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9649 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_year((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29692,8 +29661,8 @@
 
   case 1280:
 
-/* Line 1806 of yacc.c  */
-#line 9671 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9670 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item),
                                                              INTERVAL_DAY, 0);
@@ -29704,8 +29673,8 @@
 
   case 1281:
 
-/* Line 1806 of yacc.c  */
-#line 9678 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9677 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 0);
             if ((yyval.item) == NULL)
@@ -29715,8 +29684,8 @@
 
   case 1282:
 
-/* Line 1806 of yacc.c  */
-#line 9684 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9683 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_curdate_local();
             if ((yyval.item) == NULL)
@@ -29727,8 +29696,8 @@
 
   case 1283:
 
-/* Line 1806 of yacc.c  */
-#line 9691 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9690 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_local((yyvsp[(2) - (2)].ulong_num));
             if ((yyval.item) == NULL)
@@ -29739,8 +29708,8 @@
 
   case 1284:
 
-/* Line 1806 of yacc.c  */
-#line 9699 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9698 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item),(yyvsp[(6) - (8)].item),(yyvsp[(7) - (8)].interval),0);
             if ((yyval.item) == NULL)
@@ -29750,8 +29719,8 @@
 
   case 1285:
 
-/* Line 1806 of yacc.c  */
-#line 9706 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9705 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item),(yyvsp[(6) - (8)].item),(yyvsp[(7) - (8)].interval),1);
             if ((yyval.item) == NULL)
@@ -29761,8 +29730,8 @@
 
   case 1286:
 
-/* Line 1806 of yacc.c  */
-#line 9712 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9711 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)=new (YYTHD->mem_root) Item_extract( (yyvsp[(3) - (6)].interval), (yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29772,8 +29741,8 @@
 
   case 1287:
 
-/* Line 1806 of yacc.c  */
-#line 9718 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9717 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_get_format((yyvsp[(3) - (6)].date_time_type), (yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29783,8 +29752,8 @@
 
   case 1288:
 
-/* Line 1806 of yacc.c  */
-#line 9724 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9723 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= (yyvsp[(1) - (1)].item);
             Lex->safe_to_cache_query= 0;
@@ -29793,8 +29762,8 @@
 
   case 1289:
 
-/* Line 1806 of yacc.c  */
-#line 9729 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9728 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item) = new (YYTHD->mem_root) Item_func_locate((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29804,8 +29773,8 @@
 
   case 1290:
 
-/* Line 1806 of yacc.c  */
-#line 9735 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9734 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item),
                                                              INTERVAL_DAY, 1);
@@ -29816,8 +29785,8 @@
 
   case 1291:
 
-/* Line 1806 of yacc.c  */
-#line 9742 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9741 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 1);
             if ((yyval.item) == NULL)
@@ -29827,8 +29796,8 @@
 
   case 1292:
 
-/* Line 1806 of yacc.c  */
-#line 9748 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9747 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
             if ((yyval.item) == NULL)
@@ -29838,8 +29807,8 @@
 
   case 1293:
 
-/* Line 1806 of yacc.c  */
-#line 9754 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9753 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29849,8 +29818,8 @@
 
   case 1294:
 
-/* Line 1806 of yacc.c  */
-#line 9760 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9759 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
             if ((yyval.item) == NULL)
@@ -29860,8 +29829,8 @@
 
   case 1295:
 
-/* Line 1806 of yacc.c  */
-#line 9766 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9765 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -29871,8 +29840,8 @@
 
   case 1296:
 
-/* Line 1806 of yacc.c  */
-#line 9772 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9771 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               Unlike other time-related functions, SYSDATE() is
@@ -29894,8 +29863,8 @@
 
   case 1297:
 
-/* Line 1806 of yacc.c  */
-#line 9790 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9789 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(7) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(3) - (8)].interval_time_st),0);
             if ((yyval.item) == NULL)
@@ -29905,8 +29874,8 @@
 
   case 1298:
 
-/* Line 1806 of yacc.c  */
-#line 9796 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9795 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_timestamp_diff((yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item),(yyvsp[(3) - (8)].interval_time_st));
             if ((yyval.item) == NULL)
@@ -29916,8 +29885,8 @@
 
   case 1299:
 
-/* Line 1806 of yacc.c  */
-#line 9802 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9801 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_curdate_utc();
             if ((yyval.item) == NULL)
@@ -29928,8 +29897,8 @@
 
   case 1300:
 
-/* Line 1806 of yacc.c  */
-#line 9809 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9808 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_utc((yyvsp[(2) - (2)].ulong_num));
             if ((yyval.item) == NULL)
@@ -29940,8 +29909,8 @@
 
   case 1301:
 
-/* Line 1806 of yacc.c  */
-#line 9816 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9815 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_now_utc((yyvsp[(2) - (2)].ulong_num));
             if ((yyval.item) == NULL)
@@ -29952,8 +29921,8 @@
 
   case 1302:
 
-/* Line 1806 of yacc.c  */
-#line 9831 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9830 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_ascii((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29963,8 +29932,8 @@
 
   case 1303:
 
-/* Line 1806 of yacc.c  */
-#line 9837 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9836 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_charset((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29974,8 +29943,8 @@
 
   case 1304:
 
-/* Line 1806 of yacc.c  */
-#line 9843 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9842 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_coalesce(* (yyvsp[(3) - (4)].item_list));
             if ((yyval.item) == NULL)
@@ -29985,8 +29954,8 @@
 
   case 1305:
 
-/* Line 1806 of yacc.c  */
-#line 9849 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9848 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_collation((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -29996,8 +29965,8 @@
 
   case 1306:
 
-/* Line 1806 of yacc.c  */
-#line 9855 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9854 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_database();
             if ((yyval.item) == NULL)
@@ -30008,8 +29977,8 @@
 
   case 1307:
 
-/* Line 1806 of yacc.c  */
-#line 9862 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9861 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_if((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
             if ((yyval.item) == NULL)
@@ -30019,8 +29988,8 @@
 
   case 1308:
 
-/* Line 1806 of yacc.c  */
-#line 9868 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9867 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_format((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -30030,8 +29999,8 @@
 
   case 1309:
 
-/* Line 1806 of yacc.c  */
-#line 9874 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9873 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_format((yyvsp[(3) - (8)].item), (yyvsp[(5) - (8)].item), (yyvsp[(7) - (8)].item));
             if ((yyval.item) == NULL)
@@ -30041,8 +30010,8 @@
 
   case 1310:
 
-/* Line 1806 of yacc.c  */
-#line 9880 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9879 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_microsecond((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -30052,8 +30021,8 @@
 
   case 1311:
 
-/* Line 1806 of yacc.c  */
-#line 9886 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9885 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item) = new (YYTHD->mem_root) Item_func_mod((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -30063,9 +30032,10 @@
 
   case 1312:
 
-/* Line 1806 of yacc.c  */
-#line 9892 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9891 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
+            WARN_DEPRECATED(YYTHD, "OLD_PASSWORD", "PASSWORD");
             (yyval.item)=  new (YYTHD->mem_root) Item_func_old_password((yyvsp[(3) - (4)].item));
             Lex->contains_plaintext_password= true;
             if ((yyval.item) == NULL)
@@ -30075,8 +30045,8 @@
 
   case 1313:
 
-/* Line 1806 of yacc.c  */
-#line 9899 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9899 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item* i1;
@@ -30093,8 +30063,8 @@
 
   case 1314:
 
-/* Line 1806 of yacc.c  */
-#line 9912 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9912 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item) = new (YYTHD->mem_root) Item_func_quarter((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -30104,8 +30074,8 @@
 
   case 1315:
 
-/* Line 1806 of yacc.c  */
-#line 9918 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9918 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_repeat((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -30115,8 +30085,8 @@
 
   case 1316:
 
-/* Line 1806 of yacc.c  */
-#line 9924 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9924 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_replace((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
             if ((yyval.item) == NULL)
@@ -30126,8 +30096,8 @@
 
   case 1317:
 
-/* Line 1806 of yacc.c  */
-#line 9930 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9930 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_reverse((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -30137,8 +30107,8 @@
 
   case 1318:
 
-/* Line 1806 of yacc.c  */
-#line 9936 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9936 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_row_count();
             if ((yyval.item) == NULL)
@@ -30150,8 +30120,8 @@
 
   case 1319:
 
-/* Line 1806 of yacc.c  */
-#line 9944 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9944 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_round((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item),1);
             if ((yyval.item) == NULL)
@@ -30161,8 +30131,8 @@
 
   case 1320:
 
-/* Line 1806 of yacc.c  */
-#line 9950 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9950 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item *i1= new (thd->mem_root) Item_int(NAME_STRING("0"),
@@ -30178,8 +30148,8 @@
 
   case 1321:
 
-/* Line 1806 of yacc.c  */
-#line 9962 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9962 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_week((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -30189,8 +30159,8 @@
 
   case 1322:
 
-/* Line 1806 of yacc.c  */
-#line 9968 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9968 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_weight_string((yyvsp[(3) - (5)].item), 0, 0, (yyvsp[(4) - (5)].ulong_num));
             if ((yyval.item) == NULL)
@@ -30200,8 +30170,8 @@
 
   case 1323:
 
-/* Line 1806 of yacc.c  */
-#line 9974 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9974 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root)
                 Item_func_weight_string((yyvsp[(3) - (8)].item), 0, (yyvsp[(6) - (8)].ulong_num),
@@ -30213,8 +30183,8 @@
 
   case 1324:
 
-/* Line 1806 of yacc.c  */
-#line 9982 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9982 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_char_typecast((yyvsp[(3) - (7)].item), (yyvsp[(6) - (7)].ulong_num), &my_charset_bin);
             if (item == NULL)
@@ -30228,8 +30198,8 @@
 
   case 1325:
 
-/* Line 1806 of yacc.c  */
-#line 9992 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9992 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_weight_string((yyvsp[(3) - (10)].item), (yyvsp[(5) - (10)].ulong_num), (yyvsp[(7) - (10)].ulong_num), (yyvsp[(9) - (10)].ulong_num));
             if ((yyval.item) == NULL)
@@ -30239,8 +30209,8 @@
 
   case 1326:
 
-/* Line 1806 of yacc.c  */
-#line 9998 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 9998 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
 #ifdef HAVE_SPATIAL
             (yyval.item)= (yyvsp[(1) - (1)].item);
@@ -30257,8 +30227,8 @@
 
   case 1327:
 
-/* Line 1806 of yacc.c  */
-#line 10014 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10014 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_mbr_rel((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item),
@@ -30268,8 +30238,8 @@
 
   case 1328:
 
-/* Line 1806 of yacc.c  */
-#line 10020 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10020 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -30280,8 +30250,8 @@
 
   case 1329:
 
-/* Line 1806 of yacc.c  */
-#line 10027 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10027 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -30292,8 +30262,8 @@
 
   case 1330:
 
-/* Line 1806 of yacc.c  */
-#line 10034 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10034 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -30304,8 +30274,8 @@
 
   case 1331:
 
-/* Line 1806 of yacc.c  */
-#line 10041 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10041 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -30316,8 +30286,8 @@
 
   case 1332:
 
-/* Line 1806 of yacc.c  */
-#line 10048 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10048 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -30328,8 +30298,8 @@
 
   case 1333:
 
-/* Line 1806 of yacc.c  */
-#line 10055 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10055 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD, Item_func_point((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)));
           }
@@ -30337,8 +30307,8 @@
 
   case 1334:
 
-/* Line 1806 of yacc.c  */
-#line 10059 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10059 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -30349,8 +30319,8 @@
 
   case 1335:
 
-/* Line 1806 of yacc.c  */
-#line 10078 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10078 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
 #ifdef HAVE_DLOPEN
             udf_func *udf= 0;
@@ -30373,8 +30343,8 @@
 
   case 1336:
 
-/* Line 1806 of yacc.c  */
-#line 10097 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10097 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Create_func *builder;
@@ -30432,8 +30402,8 @@
 
   case 1337:
 
-/* Line 1806 of yacc.c  */
-#line 10151 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10151 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Create_qfunc *builder;
@@ -30474,64 +30444,64 @@
 
   case 1338:
 
-/* Line 1806 of yacc.c  */
-#line 10191 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10191 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); }
     break;
 
   case 1339:
 
-/* Line 1806 of yacc.c  */
-#line 10193 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10193 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= FT_BOOL; }
     break;
 
   case 1340:
 
-/* Line 1806 of yacc.c  */
-#line 10197 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10197 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= FT_NL; }
     break;
 
   case 1341:
 
-/* Line 1806 of yacc.c  */
-#line 10198 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10198 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= FT_NL; }
     break;
 
   case 1342:
 
-/* Line 1806 of yacc.c  */
-#line 10202 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10202 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0;         }
     break;
 
   case 1343:
 
-/* Line 1806 of yacc.c  */
-#line 10203 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10203 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= FT_EXPAND; }
     break;
 
   case 1344:
 
-/* Line 1806 of yacc.c  */
-#line 10207 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10207 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item_list)= NULL; }
     break;
 
   case 1345:
 
-/* Line 1806 of yacc.c  */
-#line 10208 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10208 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item_list)= (yyvsp[(1) - (1)].item_list); }
     break;
 
   case 1346:
 
-/* Line 1806 of yacc.c  */
-#line 10213 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10213 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item_list)= new (YYTHD->mem_root) List<Item>;
             if ((yyval.item_list) == NULL)
@@ -30542,8 +30512,8 @@
 
   case 1347:
 
-/* Line 1806 of yacc.c  */
-#line 10220 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10220 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item));
             (yyval.item_list)= (yyvsp[(1) - (3)].item_list);
@@ -30552,8 +30522,8 @@
 
   case 1348:
 
-/* Line 1806 of yacc.c  */
-#line 10228 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10228 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
              Use Item::name as a storage for the attribute value of user
@@ -30580,8 +30550,8 @@
 
   case 1349:
 
-/* Line 1806 of yacc.c  */
-#line 10254 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10254 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_avg((yyvsp[(3) - (4)].item), FALSE);
             if ((yyval.item) == NULL)
@@ -30591,8 +30561,8 @@
 
   case 1350:
 
-/* Line 1806 of yacc.c  */
-#line 10260 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10260 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_avg((yyvsp[(4) - (5)].item), TRUE);
             if ((yyval.item) == NULL)
@@ -30602,8 +30572,8 @@
 
   case 1351:
 
-/* Line 1806 of yacc.c  */
-#line 10266 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10266 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_and((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -30613,8 +30583,8 @@
 
   case 1352:
 
-/* Line 1806 of yacc.c  */
-#line 10272 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10272 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_or((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -30624,8 +30594,8 @@
 
   case 1353:
 
-/* Line 1806 of yacc.c  */
-#line 10278 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10278 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_xor((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -30635,8 +30605,8 @@
 
   case 1354:
 
-/* Line 1806 of yacc.c  */
-#line 10284 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10284 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1);
             if (item == NULL)
@@ -30649,8 +30619,8 @@
 
   case 1355:
 
-/* Line 1806 of yacc.c  */
-#line 10293 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10293 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_count((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -30660,22 +30630,22 @@
 
   case 1356:
 
-/* Line 1806 of yacc.c  */
-#line 10299 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10299 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->in_sum_expr++; }
     break;
 
   case 1357:
 
-/* Line 1806 of yacc.c  */
-#line 10301 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10301 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->in_sum_expr--; }
     break;
 
   case 1358:
 
-/* Line 1806 of yacc.c  */
-#line 10303 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10303 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_count(* (yyvsp[(5) - (7)].item_list));
             if ((yyval.item) == NULL)
@@ -30685,8 +30655,8 @@
 
   case 1359:
 
-/* Line 1806 of yacc.c  */
-#line 10309 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10309 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_min((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -30696,8 +30666,8 @@
 
   case 1360:
 
-/* Line 1806 of yacc.c  */
-#line 10320 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10320 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_min((yyvsp[(4) - (5)].item));
             if ((yyval.item) == NULL)
@@ -30707,8 +30677,8 @@
 
   case 1361:
 
-/* Line 1806 of yacc.c  */
-#line 10326 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10326 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_max((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -30718,8 +30688,8 @@
 
   case 1362:
 
-/* Line 1806 of yacc.c  */
-#line 10332 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10332 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_max((yyvsp[(4) - (5)].item));
             if ((yyval.item) == NULL)
@@ -30729,8 +30699,8 @@
 
   case 1363:
 
-/* Line 1806 of yacc.c  */
-#line 10338 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10338 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 0);
             if ((yyval.item) == NULL)
@@ -30740,8 +30710,8 @@
 
   case 1364:
 
-/* Line 1806 of yacc.c  */
-#line 10344 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10344 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 0);
             if ((yyval.item) == NULL)
@@ -30751,8 +30721,8 @@
 
   case 1365:
 
-/* Line 1806 of yacc.c  */
-#line 10350 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10350 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 1);
             if ((yyval.item) == NULL)
@@ -30762,8 +30732,8 @@
 
   case 1366:
 
-/* Line 1806 of yacc.c  */
-#line 10356 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10356 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 1);
             if ((yyval.item) == NULL)
@@ -30773,8 +30743,8 @@
 
   case 1367:
 
-/* Line 1806 of yacc.c  */
-#line 10362 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10362 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_sum((yyvsp[(3) - (4)].item), FALSE);
             if ((yyval.item) == NULL)
@@ -30784,8 +30754,8 @@
 
   case 1368:
 
-/* Line 1806 of yacc.c  */
-#line 10368 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10368 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_sum((yyvsp[(4) - (5)].item), TRUE);
             if ((yyval.item) == NULL)
@@ -30795,15 +30765,15 @@
 
   case 1369:
 
-/* Line 1806 of yacc.c  */
-#line 10374 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10374 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->in_sum_expr++; }
     break;
 
   case 1370:
 
-/* Line 1806 of yacc.c  */
-#line 10378 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10378 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->in_sum_expr--;
@@ -30819,8 +30789,8 @@
 
   case 1371:
 
-/* Line 1806 of yacc.c  */
-#line 10393 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10393 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (! Lex->parsing_options.allows_variable)
             {
@@ -30832,8 +30802,8 @@
 
   case 1372:
 
-/* Line 1806 of yacc.c  */
-#line 10401 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10401 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= (yyvsp[(3) - (3)].item);
           }
@@ -30841,8 +30811,8 @@
 
   case 1373:
 
-/* Line 1806 of yacc.c  */
-#line 10408 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10408 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item_func_set_user_var *item;
             (yyval.item)= item=
@@ -30857,8 +30827,8 @@
 
   case 1374:
 
-/* Line 1806 of yacc.c  */
-#line 10419 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10419 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_get_user_var((yyvsp[(1) - (1)].lex_str));
             if ((yyval.item) == NULL)
@@ -30870,8 +30840,8 @@
 
   case 1375:
 
-/* Line 1806 of yacc.c  */
-#line 10427 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10427 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* disallow "SELECT @@global.global.variable" */
             if ((yyvsp[(3) - (4)].lex_str).str && (yyvsp[(4) - (4)].lex_str).str && check_reserved_words(&(yyvsp[(3) - (4)].lex_str)))
@@ -30888,22 +30858,22 @@
 
   case 1376:
 
-/* Line 1806 of yacc.c  */
-#line 10442 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10442 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num) = 0; }
     break;
 
   case 1377:
 
-/* Line 1806 of yacc.c  */
-#line 10443 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10443 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num) = 1; }
     break;
 
   case 1378:
 
-/* Line 1806 of yacc.c  */
-#line 10448 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10448 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.string)= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1);
             if ((yyval.string) == NULL)
@@ -30913,15 +30883,15 @@
 
   case 1379:
 
-/* Line 1806 of yacc.c  */
-#line 10453 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10453 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.string) = (yyvsp[(2) - (2)].string); }
     break;
 
   case 1381:
 
-/* Line 1806 of yacc.c  */
-#line 10459 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10459 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -30938,22 +30908,22 @@
 
   case 1383:
 
-/* Line 1806 of yacc.c  */
-#line 10476 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10476 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { if (add_gorder_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
     break;
 
   case 1384:
 
-/* Line 1806 of yacc.c  */
-#line 10478 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10478 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { if (add_gorder_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
     break;
 
   case 1385:
 
-/* Line 1806 of yacc.c  */
-#line 10483 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10483 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->current_select->inc_in_sum_expr())
@@ -30966,8 +30936,8 @@
 
   case 1386:
 
-/* Line 1806 of yacc.c  */
-#line 10492 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10492 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->in_sum_expr--;
             (yyval.item)= (yyvsp[(3) - (3)].item);
@@ -30976,99 +30946,99 @@
 
   case 1387:
 
-/* Line 1806 of yacc.c  */
-#line 10500 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10500 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= &my_charset_bin; Lex->dec= 0; }
     break;
 
   case 1388:
 
-/* Line 1806 of yacc.c  */
-#line 10502 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10502 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->dec= 0; }
     break;
 
   case 1389:
 
-/* Line 1806 of yacc.c  */
-#line 10504 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10504 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= national_charset_info; Lex->dec=0; }
     break;
 
   case 1390:
 
-/* Line 1806 of yacc.c  */
-#line 10506 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10506 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1391:
 
-/* Line 1806 of yacc.c  */
-#line 10508 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10508 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1392:
 
-/* Line 1806 of yacc.c  */
-#line 10510 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10510 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1393:
 
-/* Line 1806 of yacc.c  */
-#line 10512 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10512 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1394:
 
-/* Line 1806 of yacc.c  */
-#line 10514 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10514 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)= ITEM_CAST_DATE; Lex->charset= NULL; Lex->dec= Lex->length= (char *) 0; }
     break;
 
   case 1395:
 
-/* Line 1806 of yacc.c  */
-#line 10516 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10516 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)= ITEM_CAST_TIME; Lex->charset= NULL; Lex->length= (char *) 0; }
     break;
 
   case 1396:
 
-/* Line 1806 of yacc.c  */
-#line 10518 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10518 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)= ITEM_CAST_DATETIME; Lex->charset= NULL; Lex->length= (char *) 0; }
     break;
 
   case 1397:
 
-/* Line 1806 of yacc.c  */
-#line 10520 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10520 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_DECIMAL; Lex->charset= NULL; }
     break;
 
   case 1398:
 
-/* Line 1806 of yacc.c  */
-#line 10524 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10524 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item_list)= NULL; }
     break;
 
   case 1399:
 
-/* Line 1806 of yacc.c  */
-#line 10525 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10525 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item_list)= (yyvsp[(1) - (1)].item_list);}
     break;
 
   case 1400:
 
-/* Line 1806 of yacc.c  */
-#line 10530 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10530 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item_list)= new (YYTHD->mem_root) List<Item>;
             if ((yyval.item_list) == NULL)
@@ -31079,8 +31049,8 @@
 
   case 1401:
 
-/* Line 1806 of yacc.c  */
-#line 10537 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10537 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item));
             (yyval.item_list)= (yyvsp[(1) - (3)].item_list);
@@ -31089,22 +31059,22 @@
 
   case 1402:
 
-/* Line 1806 of yacc.c  */
-#line 10544 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10544 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item_list)= (yyvsp[(1) - (1)].item_list); }
     break;
 
   case 1403:
 
-/* Line 1806 of yacc.c  */
-#line 10545 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10545 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item_list)= (yyvsp[(2) - (3)].item_list); }
     break;
 
   case 1404:
 
-/* Line 1806 of yacc.c  */
-#line 10550 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10550 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item_list)= new (YYTHD->mem_root) List<Item>;
             if ((yyval.item_list) == NULL)
@@ -31115,8 +31085,8 @@
 
   case 1405:
 
-/* Line 1806 of yacc.c  */
-#line 10557 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10557 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item));
             (yyval.item_list)= (yyvsp[(1) - (3)].item_list);
@@ -31125,36 +31095,36 @@
 
   case 1406:
 
-/* Line 1806 of yacc.c  */
-#line 10564 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10564 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= NULL; }
     break;
 
   case 1407:
 
-/* Line 1806 of yacc.c  */
-#line 10565 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10565 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 1408:
 
-/* Line 1806 of yacc.c  */
-#line 10569 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10569 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= NULL; }
     break;
 
   case 1409:
 
-/* Line 1806 of yacc.c  */
-#line 10570 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10570 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(2) - (2)].item); }
     break;
 
   case 1410:
 
-/* Line 1806 of yacc.c  */
-#line 10575 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10575 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item_list)= new List<Item>;
             if ((yyval.item_list) == NULL)
@@ -31166,8 +31136,8 @@
 
   case 1411:
 
-/* Line 1806 of yacc.c  */
-#line 10583 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10583 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(1) - (5)].item_list)->push_back((yyvsp[(3) - (5)].item));
             (yyvsp[(1) - (5)].item_list)->push_back((yyvsp[(5) - (5)].item));
@@ -31177,15 +31147,15 @@
 
   case 1412:
 
-/* Line 1806 of yacc.c  */
-#line 10593 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10593 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
     break;
 
   case 1413:
 
-/* Line 1806 of yacc.c  */
-#line 10595 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10595 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!((yyval.table_list)= lex->current_select->nest_last_join(lex->thd)))
@@ -31195,36 +31165,36 @@
 
   case 1414:
 
-/* Line 1806 of yacc.c  */
-#line 10603 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10603 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { MYSQL_YYABORT_UNLESS((yyval.table_list)=(yyvsp[(1) - (1)].table_list)); }
     break;
 
   case 1415:
 
-/* Line 1806 of yacc.c  */
-#line 10614 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10614 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
     break;
 
   case 1416:
 
-/* Line 1806 of yacc.c  */
-#line 10615 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10615 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.table_list)=(yyvsp[(3) - (4)].table_list); }
     break;
 
   case 1417:
 
-/* Line 1806 of yacc.c  */
-#line 10621 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10621 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
     break;
 
   case 1418:
 
-/* Line 1806 of yacc.c  */
-#line 10623 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10623 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list)));
           }
@@ -31232,22 +31202,22 @@
 
   case 1419:
 
-/* Line 1806 of yacc.c  */
-#line 10643 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10643 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); }
     break;
 
   case 1420:
 
-/* Line 1806 of yacc.c  */
-#line 10645 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10645 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); (yyvsp[(3) - (3)].table_list)->straight=1; }
     break;
 
   case 1421:
 
-/* Line 1806 of yacc.c  */
-#line 10648 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10648 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
             /* Change the current name resolution context to a local context. */
@@ -31259,8 +31229,8 @@
 
   case 1422:
 
-/* Line 1806 of yacc.c  */
-#line 10656 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10656 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item));
             Lex->pop_context();
@@ -31270,8 +31240,8 @@
 
   case 1423:
 
-/* Line 1806 of yacc.c  */
-#line 10663 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10663 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
             /* Change the current name resolution context to a local context. */
@@ -31283,8 +31253,8 @@
 
   case 1424:
 
-/* Line 1806 of yacc.c  */
-#line 10671 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10671 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(3) - (6)].table_list)->straight=1;
             add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item));
@@ -31295,8 +31265,8 @@
 
   case 1425:
 
-/* Line 1806 of yacc.c  */
-#line 10679 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10679 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
           }
@@ -31304,15 +31274,15 @@
 
   case 1426:
 
-/* Line 1806 of yacc.c  */
-#line 10683 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10683 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { add_join_natural((yyvsp[(1) - (8)].table_list),(yyvsp[(3) - (8)].table_list),(yyvsp[(7) - (8)].string_list),Select); (yyval.table_list)=(yyvsp[(3) - (8)].table_list); }
     break;
 
   case 1427:
 
-/* Line 1806 of yacc.c  */
-#line 10685 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10685 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && ((yyval.table_list)=(yyvsp[(4) - (4)].table_list)));
             add_join_natural((yyvsp[(1) - (4)].table_list),(yyvsp[(4) - (4)].table_list),NULL,Select);
@@ -31321,8 +31291,8 @@
 
   case 1428:
 
-/* Line 1806 of yacc.c  */
-#line 10693 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10693 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(5) - (6)].table_list));
             /* Change the current name resolution context to a local context. */
@@ -31334,8 +31304,8 @@
 
   case 1429:
 
-/* Line 1806 of yacc.c  */
-#line 10701 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10701 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             add_join_on((yyvsp[(5) - (8)].table_list),(yyvsp[(8) - (8)].item));
             Lex->pop_context();
@@ -31347,8 +31317,8 @@
 
   case 1430:
 
-/* Line 1806 of yacc.c  */
-#line 10709 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10709 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list));
           }
@@ -31356,8 +31326,8 @@
 
   case 1431:
 
-/* Line 1806 of yacc.c  */
-#line 10713 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10713 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             add_join_natural((yyvsp[(1) - (10)].table_list),(yyvsp[(5) - (10)].table_list),(yyvsp[(9) - (10)].string_list),Select); 
             (yyvsp[(5) - (10)].table_list)->outer_join|=JOIN_TYPE_LEFT; 
@@ -31367,8 +31337,8 @@
 
   case 1432:
 
-/* Line 1806 of yacc.c  */
-#line 10719 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10719 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(6) - (6)].table_list));
             add_join_natural((yyvsp[(1) - (6)].table_list),(yyvsp[(6) - (6)].table_list),NULL,Select);
@@ -31379,8 +31349,8 @@
 
   case 1433:
 
-/* Line 1806 of yacc.c  */
-#line 10729 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10729 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(5) - (6)].table_list));
             /* Change the current name resolution context to a local context. */
@@ -31392,8 +31362,8 @@
 
   case 1434:
 
-/* Line 1806 of yacc.c  */
-#line 10737 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10737 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!((yyval.table_list)= lex->current_select->convert_right_join()))
@@ -31406,8 +31376,8 @@
 
   case 1435:
 
-/* Line 1806 of yacc.c  */
-#line 10746 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10746 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list));
           }
@@ -31415,8 +31385,8 @@
 
   case 1436:
 
-/* Line 1806 of yacc.c  */
-#line 10750 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10750 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!((yyval.table_list)= lex->current_select->convert_right_join()))
@@ -31427,8 +31397,8 @@
 
   case 1437:
 
-/* Line 1806 of yacc.c  */
-#line 10757 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10757 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(6) - (6)].table_list));
             add_join_natural((yyvsp[(6) - (6)].table_list),(yyvsp[(1) - (6)].table_list),NULL,Select);
@@ -31440,36 +31410,36 @@
 
   case 1438:
 
-/* Line 1806 of yacc.c  */
-#line 10767 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10767 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1439:
 
-/* Line 1806 of yacc.c  */
-#line 10768 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10768 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1440:
 
-/* Line 1806 of yacc.c  */
-#line 10769 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10769 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1441:
 
-/* Line 1806 of yacc.c  */
-#line 10777 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10777 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.string_list)= 0;}
     break;
 
   case 1443:
 
-/* Line 1806 of yacc.c  */
-#line 10783 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10783 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.string_list)= (yyvsp[(3) - (5)].string_list);
           }
@@ -31477,8 +31447,8 @@
 
   case 1444:
 
-/* Line 1806 of yacc.c  */
-#line 10797 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10797 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->table_join_options= 0;
@@ -31487,8 +31457,8 @@
 
   case 1445:
 
-/* Line 1806 of yacc.c  */
-#line 10802 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10802 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyval.table_list)= Select->add_table_to_list(YYTHD, (yyvsp[(2) - (5)].table), (yyvsp[(4) - (5)].lex_str_ptr),
                                                 Select->get_table_join_options(),
@@ -31503,8 +31473,8 @@
 
   case 1446:
 
-/* Line 1806 of yacc.c  */
-#line 10813 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10813 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -31530,8 +31500,8 @@
 
   case 1447:
 
-/* Line 1806 of yacc.c  */
-#line 10853 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10853 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* Use $2 instead of Lex->current_select as derived table will
                alter value of Lex->current_select. */
@@ -31585,8 +31555,8 @@
 
   case 1448:
 
-/* Line 1806 of yacc.c  */
-#line 10926 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10926 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((yyvsp[(1) - (2)].table_list) && (yyvsp[(2) - (2)].is_not_empty))
             {
@@ -31598,8 +31568,8 @@
 
   case 1449:
 
-/* Line 1806 of yacc.c  */
-#line 10936 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10936 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_select_to_union_list(Lex, (bool)(yyvsp[(3) - (3)].num), FALSE))
               MYSQL_YYABORT;
@@ -31608,8 +31578,8 @@
 
   case 1450:
 
-/* Line 1806 of yacc.c  */
-#line 10941 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10941 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               Remove from the name resolution context stack the context of the
@@ -31621,8 +31591,8 @@
 
   case 1451:
 
-/* Line 1806 of yacc.c  */
-#line 10949 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10949 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((yyvsp[(1) - (7)].table_list) != NULL)
             {
@@ -31634,8 +31604,8 @@
 
   case 1452:
 
-/* Line 1806 of yacc.c  */
-#line 10961 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10961 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX * sel= lex->current_select;
@@ -31655,8 +31625,8 @@
 
   case 1453:
 
-/* Line 1806 of yacc.c  */
-#line 10980 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10980 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -31668,8 +31638,8 @@
 
   case 1454:
 
-/* Line 1806 of yacc.c  */
-#line 10988 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10988 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -31677,8 +31647,8 @@
 
   case 1456:
 
-/* Line 1806 of yacc.c  */
-#line 10997 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 10997 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if ((yyvsp[(1) - (1)].select_lex)->init_nested_join(lex->thd))
@@ -31688,8 +31658,8 @@
 
   case 1457:
 
-/* Line 1806 of yacc.c  */
-#line 11003 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11003 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             /* for normal joins, $3 != NULL and end_nested_join() != NULL,
@@ -31707,8 +31677,8 @@
 
   case 1458:
 
-/* Line 1806 of yacc.c  */
-#line 11019 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11019 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->derived_tables|= DERIVED_SUBQUERY;
@@ -31729,8 +31699,8 @@
 
   case 1459:
 
-/* Line 1806 of yacc.c  */
-#line 11036 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11036 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -31738,15 +31708,15 @@
 
   case 1461:
 
-/* Line 1806 of yacc.c  */
-#line 11043 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11043 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.select_lex)= Select; }
     break;
 
   case 1462:
 
-/* Line 1806 of yacc.c  */
-#line 11048 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11048 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -31773,22 +31743,22 @@
 
   case 1463:
 
-/* Line 1806 of yacc.c  */
-#line 11073 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11073 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1464:
 
-/* Line 1806 of yacc.c  */
-#line 11074 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11074 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1465:
 
-/* Line 1806 of yacc.c  */
-#line 11079 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11079 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.num)= old_mode ?  INDEX_HINT_MASK_JOIN : INDEX_HINT_MASK_ALL; 
           }
@@ -31796,43 +31766,43 @@
 
   case 1466:
 
-/* Line 1806 of yacc.c  */
-#line 11082 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11082 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= INDEX_HINT_MASK_JOIN;  }
     break;
 
   case 1467:
 
-/* Line 1806 of yacc.c  */
-#line 11083 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11083 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= INDEX_HINT_MASK_ORDER; }
     break;
 
   case 1468:
 
-/* Line 1806 of yacc.c  */
-#line 11084 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11084 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= INDEX_HINT_MASK_GROUP; }
     break;
 
   case 1469:
 
-/* Line 1806 of yacc.c  */
-#line 11088 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11088 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.index_hint)= INDEX_HINT_FORCE; }
     break;
 
   case 1470:
 
-/* Line 1806 of yacc.c  */
-#line 11089 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11089 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.index_hint)= INDEX_HINT_IGNORE; }
     break;
 
   case 1471:
 
-/* Line 1806 of yacc.c  */
-#line 11094 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11094 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->set_index_hint_type((yyvsp[(1) - (3)].index_hint), (yyvsp[(3) - (3)].num));
           }
@@ -31840,8 +31810,8 @@
 
   case 1473:
 
-/* Line 1806 of yacc.c  */
-#line 11099 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11099 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->set_index_hint_type(INDEX_HINT_USE, (yyvsp[(3) - (3)].num));
           }
@@ -31849,50 +31819,50 @@
 
   case 1478:
 
-/* Line 1806 of yacc.c  */
-#line 11112 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11112 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->alloc_index_hints(YYTHD); }
     break;
 
   case 1480:
 
-/* Line 1806 of yacc.c  */
-#line 11116 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11116 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {  Select->clear_index_hints(); }
     break;
 
   case 1482:
 
-/* Line 1806 of yacc.c  */
-#line 11121 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11121 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->add_index_hint(YYTHD, NULL, 0); }
     break;
 
   case 1483:
 
-/* Line 1806 of yacc.c  */
-#line 11122 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11122 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1484:
 
-/* Line 1806 of yacc.c  */
-#line 11127 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11127 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->add_index_hint(YYTHD, (yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); }
     break;
 
   case 1485:
 
-/* Line 1806 of yacc.c  */
-#line 11129 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11129 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); }
     break;
 
   case 1488:
 
-/* Line 1806 of yacc.c  */
-#line 11139 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11139 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyval.string_list)= new List<String>))
               MYSQL_YYABORT;
@@ -31907,8 +31877,8 @@
 
   case 1489:
 
-/* Line 1806 of yacc.c  */
-#line 11150 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11150 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             String *s= new (YYTHD->mem_root) String((const char *) (yyvsp[(3) - (3)].lex_str).str,
                                                     (yyvsp[(3) - (3)].lex_str).length,
@@ -31922,190 +31892,190 @@
 
   case 1490:
 
-/* Line 1806 of yacc.c  */
-#line 11162 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11162 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1491:
 
-/* Line 1806 of yacc.c  */
-#line 11163 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11163 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_DAY_HOUR; }
     break;
 
   case 1492:
 
-/* Line 1806 of yacc.c  */
-#line 11164 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11164 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_DAY_MICROSECOND; }
     break;
 
   case 1493:
 
-/* Line 1806 of yacc.c  */
-#line 11165 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11165 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_DAY_MINUTE; }
     break;
 
   case 1494:
 
-/* Line 1806 of yacc.c  */
-#line 11166 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11166 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_DAY_SECOND; }
     break;
 
   case 1495:
 
-/* Line 1806 of yacc.c  */
-#line 11167 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11167 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_HOUR_MICROSECOND; }
     break;
 
   case 1496:
 
-/* Line 1806 of yacc.c  */
-#line 11168 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11168 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_HOUR_MINUTE; }
     break;
 
   case 1497:
 
-/* Line 1806 of yacc.c  */
-#line 11169 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11169 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_HOUR_SECOND; }
     break;
 
   case 1498:
 
-/* Line 1806 of yacc.c  */
-#line 11170 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11170 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_MINUTE_MICROSECOND; }
     break;
 
   case 1499:
 
-/* Line 1806 of yacc.c  */
-#line 11171 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11171 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_MINUTE_SECOND; }
     break;
 
   case 1500:
 
-/* Line 1806 of yacc.c  */
-#line 11172 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11172 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_SECOND_MICROSECOND; }
     break;
 
   case 1501:
 
-/* Line 1806 of yacc.c  */
-#line 11173 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11173 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_YEAR_MONTH; }
     break;
 
   case 1502:
 
-/* Line 1806 of yacc.c  */
-#line 11177 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11177 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_DAY; }
     break;
 
   case 1503:
 
-/* Line 1806 of yacc.c  */
-#line 11178 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11178 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_WEEK; }
     break;
 
   case 1504:
 
-/* Line 1806 of yacc.c  */
-#line 11179 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11179 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_HOUR; }
     break;
 
   case 1505:
 
-/* Line 1806 of yacc.c  */
-#line 11180 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11180 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_MINUTE; }
     break;
 
   case 1506:
 
-/* Line 1806 of yacc.c  */
-#line 11181 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11181 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_MONTH; }
     break;
 
   case 1507:
 
-/* Line 1806 of yacc.c  */
-#line 11182 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11182 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_QUARTER; }
     break;
 
   case 1508:
 
-/* Line 1806 of yacc.c  */
-#line 11183 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11183 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_SECOND; }
     break;
 
   case 1509:
 
-/* Line 1806 of yacc.c  */
-#line 11184 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11184 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_MICROSECOND; }
     break;
 
   case 1510:
 
-/* Line 1806 of yacc.c  */
-#line 11185 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11185 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_YEAR; }
     break;
 
   case 1511:
 
-/* Line 1806 of yacc.c  */
-#line 11189 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11189 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {(yyval.date_time_type)= MYSQL_TIMESTAMP_DATE; }
     break;
 
   case 1512:
 
-/* Line 1806 of yacc.c  */
-#line 11190 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11190 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {(yyval.date_time_type)= MYSQL_TIMESTAMP_TIME; }
     break;
 
   case 1513:
 
-/* Line 1806 of yacc.c  */
-#line 11191 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11191 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {(yyval.date_time_type)= MYSQL_TIMESTAMP_DATETIME; }
     break;
 
   case 1514:
 
-/* Line 1806 of yacc.c  */
-#line 11192 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11192 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {(yyval.date_time_type)= MYSQL_TIMESTAMP_DATETIME; }
     break;
 
   case 1518:
 
-/* Line 1806 of yacc.c  */
-#line 11202 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11202 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str_ptr)=0; }
     break;
 
   case 1519:
 
-/* Line 1806 of yacc.c  */
-#line 11204 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11204 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.lex_str_ptr)= (LEX_STRING*) sql_memdup(&(yyvsp[(2) - (2)].lex_str),sizeof(LEX_STRING));
             if ((yyval.lex_str_ptr) == NULL)
@@ -32115,15 +32085,15 @@
 
   case 1522:
 
-/* Line 1806 of yacc.c  */
-#line 11217 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11217 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->where= 0; }
     break;
 
   case 1523:
 
-/* Line 1806 of yacc.c  */
-#line 11219 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11219 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->parsing_place= IN_WHERE;
           }
@@ -32131,8 +32101,8 @@
 
   case 1524:
 
-/* Line 1806 of yacc.c  */
-#line 11223 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11223 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             SELECT_LEX *select= Select;
             select->where= (yyvsp[(3) - (3)].item);
@@ -32144,8 +32114,8 @@
 
   case 1526:
 
-/* Line 1806 of yacc.c  */
-#line 11235 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11235 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->parsing_place= IN_HAVING;
           }
@@ -32153,8 +32123,8 @@
 
   case 1527:
 
-/* Line 1806 of yacc.c  */
-#line 11239 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11239 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->having= (yyvsp[(3) - (3)].item);
@@ -32166,8 +32136,8 @@
 
   case 1528:
 
-/* Line 1806 of yacc.c  */
-#line 11250 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11250 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->escape_used= TRUE;
             (yyval.item)= (yyvsp[(2) - (2)].item);
@@ -32176,8 +32146,8 @@
 
   case 1529:
 
-/* Line 1806 of yacc.c  */
-#line 11255 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11255 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Lex->escape_used= FALSE;
@@ -32191,29 +32161,29 @@
 
   case 1532:
 
-/* Line 1806 of yacc.c  */
-#line 11277 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11277 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { if (add_group_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
     break;
 
   case 1533:
 
-/* Line 1806 of yacc.c  */
-#line 11279 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11279 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { if (add_group_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
     break;
 
   case 1534:
 
-/* Line 1806 of yacc.c  */
-#line 11283 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11283 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1535:
 
-/* Line 1806 of yacc.c  */
-#line 11285 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11285 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               'WITH CUBE' is reserved in the MySQL syntax, but not implemented,
@@ -32237,8 +32207,8 @@
 
   case 1536:
 
-/* Line 1806 of yacc.c  */
-#line 11305 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11305 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               'WITH ROLLUP' is needed for backward compatibility,
@@ -32266,8 +32236,8 @@
 
   case 1540:
 
-/* Line 1806 of yacc.c  */
-#line 11345 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11345 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             bool ascending= ((yyvsp[(2) - (2)].num) == 1) ? true : false;
@@ -32278,8 +32248,8 @@
 
   case 1543:
 
-/* Line 1806 of yacc.c  */
-#line 11364 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11364 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -32314,43 +32284,43 @@
 
   case 1545:
 
-/* Line 1806 of yacc.c  */
-#line 11399 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11399 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { if (add_order_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
     break;
 
   case 1546:
 
-/* Line 1806 of yacc.c  */
-#line 11401 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11401 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { if (add_order_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
     break;
 
   case 1547:
 
-/* Line 1806 of yacc.c  */
-#line 11405 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11405 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num) =  1; }
     break;
 
   case 1548:
 
-/* Line 1806 of yacc.c  */
-#line 11406 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11406 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num) =1; }
     break;
 
   case 1549:
 
-/* Line 1806 of yacc.c  */
-#line 11407 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11407 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num) =0; }
     break;
 
   case 1550:
 
-/* Line 1806 of yacc.c  */
-#line 11412 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11412 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -32361,29 +32331,29 @@
 
   case 1551:
 
-/* Line 1806 of yacc.c  */
-#line 11418 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11418 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1552:
 
-/* Line 1806 of yacc.c  */
-#line 11422 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11422 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1553:
 
-/* Line 1806 of yacc.c  */
-#line 11423 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11423 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1554:
 
-/* Line 1806 of yacc.c  */
-#line 11428 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11428 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT);
           }
@@ -32391,8 +32361,8 @@
 
   case 1555:
 
-/* Line 1806 of yacc.c  */
-#line 11435 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11435 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->select_limit= (yyvsp[(1) - (1)].item);
@@ -32403,8 +32373,8 @@
 
   case 1556:
 
-/* Line 1806 of yacc.c  */
-#line 11442 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11442 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->select_limit= (yyvsp[(3) - (3)].item);
@@ -32415,8 +32385,8 @@
 
   case 1557:
 
-/* Line 1806 of yacc.c  */
-#line 11449 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11449 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->select_limit= (yyvsp[(1) - (3)].item);
@@ -32427,8 +32397,8 @@
 
   case 1558:
 
-/* Line 1806 of yacc.c  */
-#line 11459 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11459 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           THD *thd= YYTHD;
           LEX *lex= Lex;
@@ -32459,8 +32429,8 @@
 
   case 1559:
 
-/* Line 1806 of yacc.c  */
-#line 11486 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11486 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           ((Item_param *) (yyvsp[(1) - (1)].item))->limit_clause_param= TRUE;
         }
@@ -32468,8 +32438,8 @@
 
   case 1560:
 
-/* Line 1806 of yacc.c  */
-#line 11490 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11490 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -32479,8 +32449,8 @@
 
   case 1561:
 
-/* Line 1806 of yacc.c  */
-#line 11496 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11496 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -32490,8 +32460,8 @@
 
   case 1562:
 
-/* Line 1806 of yacc.c  */
-#line 11502 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11502 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -32501,8 +32471,8 @@
 
   case 1563:
 
-/* Line 1806 of yacc.c  */
-#line 11511 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11511 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->current_select->select_limit= 0;
@@ -32511,8 +32481,8 @@
 
   case 1564:
 
-/* Line 1806 of yacc.c  */
-#line 11516 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11516 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->select_limit= (yyvsp[(2) - (2)].item);
@@ -32523,155 +32493,155 @@
 
   case 1565:
 
-/* Line 1806 of yacc.c  */
-#line 11525 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11525 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1566:
 
-/* Line 1806 of yacc.c  */
-#line 11526 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11526 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
     break;
 
   case 1567:
 
-/* Line 1806 of yacc.c  */
-#line 11527 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11527 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1568:
 
-/* Line 1806 of yacc.c  */
-#line 11528 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11528 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1569:
 
-/* Line 1806 of yacc.c  */
-#line 11529 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11529 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1570:
 
-/* Line 1806 of yacc.c  */
-#line 11530 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11530 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1571:
 
-/* Line 1806 of yacc.c  */
-#line 11534 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11534 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1572:
 
-/* Line 1806 of yacc.c  */
-#line 11535 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11535 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
     break;
 
   case 1573:
 
-/* Line 1806 of yacc.c  */
-#line 11536 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11536 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1574:
 
-/* Line 1806 of yacc.c  */
-#line 11537 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11537 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1575:
 
-/* Line 1806 of yacc.c  */
-#line 11538 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11538 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { MYSQL_YYABORT; }
     break;
 
   case 1576:
 
-/* Line 1806 of yacc.c  */
-#line 11542 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11542 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1577:
 
-/* Line 1806 of yacc.c  */
-#line 11543 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11543 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1578:
 
-/* Line 1806 of yacc.c  */
-#line 11544 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11544 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1579:
 
-/* Line 1806 of yacc.c  */
-#line 11545 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11545 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1580:
 
-/* Line 1806 of yacc.c  */
-#line 11546 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11546 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1581:
 
-/* Line 1806 of yacc.c  */
-#line 11550 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11550 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1582:
 
-/* Line 1806 of yacc.c  */
-#line 11551 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11551 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1583:
 
-/* Line 1806 of yacc.c  */
-#line 11552 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11552 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1584:
 
-/* Line 1806 of yacc.c  */
-#line 11553 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11553 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { MYSQL_YYABORT; }
     break;
 
   case 1585:
 
-/* Line 1806 of yacc.c  */
-#line 11558 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11558 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { my_parse_error(ER(ER_ONLY_INTEGERS_ALLOWED)); }
     break;
 
   case 1589:
 
-/* Line 1806 of yacc.c  */
-#line 11569 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11569 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             
@@ -32705,15 +32675,15 @@
 
   case 1591:
 
-/* Line 1806 of yacc.c  */
-#line 11602 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11602 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1592:
 
-/* Line 1806 of yacc.c  */
-#line 11604 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11604 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->proc_analyse->max_tree_elements= (yyvsp[(1) - (1)].ulonglong_number);
           }
@@ -32721,8 +32691,8 @@
 
   case 1593:
 
-/* Line 1806 of yacc.c  */
-#line 11608 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11608 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->proc_analyse->max_tree_elements= (yyvsp[(1) - (3)].ulonglong_number);
             Lex->proc_analyse->max_treemem= (yyvsp[(3) - (3)].ulonglong_number);
@@ -32731,8 +32701,8 @@
 
   case 1594:
 
-/* Line 1806 of yacc.c  */
-#line 11616 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11616 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             int error;
             (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error);
@@ -32746,8 +32716,8 @@
 
   case 1595:
 
-/* Line 1806 of yacc.c  */
-#line 11628 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11628 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!lex->describe && (!(lex->result= new select_dumpvar())))
@@ -32757,22 +32727,22 @@
 
   case 1596:
 
-/* Line 1806 of yacc.c  */
-#line 11634 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11634 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1598:
 
-/* Line 1806 of yacc.c  */
-#line 11639 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11639 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1599:
 
-/* Line 1806 of yacc.c  */
-#line 11644 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11644 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->result) 
@@ -32795,8 +32765,8 @@
 
   case 1600:
 
-/* Line 1806 of yacc.c  */
-#line 11663 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11663 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 #ifndef DBUG_OFF
@@ -32836,8 +32806,8 @@
 
   case 1601:
 
-/* Line 1806 of yacc.c  */
-#line 11702 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11702 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (! Lex->parsing_options.allows_select_into)
             {
@@ -32849,8 +32819,8 @@
 
   case 1603:
 
-/* Line 1806 of yacc.c  */
-#line 11714 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11714 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
@@ -32862,15 +32832,15 @@
 
   case 1604:
 
-/* Line 1806 of yacc.c  */
-#line 11722 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11722 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->exchange->cs= (yyvsp[(4) - (4)].charset); }
     break;
 
   case 1606:
 
-/* Line 1806 of yacc.c  */
-#line 11725 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11725 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!lex->describe)
@@ -32886,8 +32856,8 @@
 
   case 1607:
 
-/* Line 1806 of yacc.c  */
-#line 11737 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11737 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
           }
@@ -32895,8 +32865,8 @@
 
   case 1608:
 
-/* Line 1806 of yacc.c  */
-#line 11748 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11748 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_DO;
@@ -32906,8 +32876,8 @@
 
   case 1609:
 
-/* Line 1806 of yacc.c  */
-#line 11754 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11754 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->insert_list= (yyvsp[(3) - (3)].item_list);
           }
@@ -32915,8 +32885,8 @@
 
   case 1610:
 
-/* Line 1806 of yacc.c  */
-#line 11765 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11765 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_DROP_TABLE;
@@ -32929,22 +32899,22 @@
 
   case 1611:
 
-/* Line 1806 of yacc.c  */
-#line 11774 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11774 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1612:
 
-/* Line 1806 of yacc.c  */
-#line 11775 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11775 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1613:
 
-/* Line 1806 of yacc.c  */
-#line 11776 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11776 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[(3) - (6)].lex_str).str);
@@ -32964,15 +32934,15 @@
 
   case 1614:
 
-/* Line 1806 of yacc.c  */
-#line 11791 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11791 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1615:
 
-/* Line 1806 of yacc.c  */
-#line 11793 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11793 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_DROP_DB;
@@ -32983,8 +32953,8 @@
 
   case 1616:
 
-/* Line 1806 of yacc.c  */
-#line 11800 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11800 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -33009,8 +32979,8 @@
 
   case 1617:
 
-/* Line 1806 of yacc.c  */
-#line 11821 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11821 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -33035,8 +33005,8 @@
 
   case 1618:
 
-/* Line 1806 of yacc.c  */
-#line 11842 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11842 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->sphead)
@@ -33052,8 +33022,8 @@
 
   case 1619:
 
-/* Line 1806 of yacc.c  */
-#line 11854 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11854 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_DROP_USER;
           }
@@ -33061,8 +33031,8 @@
 
   case 1620:
 
-/* Line 1806 of yacc.c  */
-#line 11858 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11858 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_DROP_VIEW;
@@ -33074,15 +33044,15 @@
 
   case 1621:
 
-/* Line 1806 of yacc.c  */
-#line 11866 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11866 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1622:
 
-/* Line 1806 of yacc.c  */
-#line 11868 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11868 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->drop_if_exists= (yyvsp[(3) - (4)].num);
             Lex->spname= (yyvsp[(4) - (4)].spname);
@@ -33092,8 +33062,8 @@
 
   case 1623:
 
-/* Line 1806 of yacc.c  */
-#line 11874 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11874 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_DROP_TRIGGER;
@@ -33104,8 +33074,8 @@
 
   case 1624:
 
-/* Line 1806 of yacc.c  */
-#line 11881 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11881 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= DROP_TABLESPACE;
@@ -33114,8 +33084,8 @@
 
   case 1625:
 
-/* Line 1806 of yacc.c  */
-#line 11886 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11886 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= DROP_LOGFILE_GROUP;
@@ -33124,8 +33094,8 @@
 
   case 1626:
 
-/* Line 1806 of yacc.c  */
-#line 11891 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11891 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_DROP_SERVER;
             Lex->drop_if_exists= (yyvsp[(3) - (4)].num);
@@ -33136,8 +33106,8 @@
 
   case 1629:
 
-/* Line 1806 of yacc.c  */
-#line 11906 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11906 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL,
                                            TL_OPTION_UPDATING,
@@ -33149,8 +33119,8 @@
 
   case 1630:
 
-/* Line 1806 of yacc.c  */
-#line 11917 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11917 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (2)].table), NULL,
                                            TL_OPTION_UPDATING,
@@ -33164,8 +33134,8 @@
 
   case 1633:
 
-/* Line 1806 of yacc.c  */
-#line 11935 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11935 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL,
                                            TL_OPTION_UPDATING | TL_OPTION_ALIAS,
@@ -33177,36 +33147,36 @@
 
   case 1634:
 
-/* Line 1806 of yacc.c  */
-#line 11945 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11945 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 1635:
 
-/* Line 1806 of yacc.c  */
-#line 11946 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11946 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 1636:
 
-/* Line 1806 of yacc.c  */
-#line 11950 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11950 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 1637:
 
-/* Line 1806 of yacc.c  */
-#line 11951 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11951 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 1645:
 
-/* Line 1806 of yacc.c  */
-#line 11974 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11974 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_INSERT;
@@ -33217,8 +33187,8 @@
 
   case 1646:
 
-/* Line 1806 of yacc.c  */
-#line 11982 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11982 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->set_lock_for_tables((yyvsp[(3) - (5)].lock_type));
             Lex->current_select= &Lex->select_lex;
@@ -33227,15 +33197,15 @@
 
   case 1647:
 
-/* Line 1806 of yacc.c  */
-#line 11987 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11987 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1648:
 
-/* Line 1806 of yacc.c  */
-#line 11992 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11992 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_REPLACE;
@@ -33246,8 +33216,8 @@
 
   case 1649:
 
-/* Line 1806 of yacc.c  */
-#line 11999 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 11999 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->set_lock_for_tables((yyvsp[(3) - (4)].lock_type));
             Lex->current_select= &Lex->select_lex;
@@ -33256,15 +33226,15 @@
 
   case 1650:
 
-/* Line 1806 of yacc.c  */
-#line 12004 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12004 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1651:
 
-/* Line 1806 of yacc.c  */
-#line 12009 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12009 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
 #ifdef HAVE_QUERY_CACHE
             /*
@@ -33281,15 +33251,15 @@
 
   case 1652:
 
-/* Line 1806 of yacc.c  */
-#line 12021 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12021 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
     break;
 
   case 1653:
 
-/* Line 1806 of yacc.c  */
-#line 12023 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12023 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
                                                     YYTHD->query());
@@ -33306,22 +33276,22 @@
 
   case 1654:
 
-/* Line 1806 of yacc.c  */
-#line 12035 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12035 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE; }
     break;
 
   case 1655:
 
-/* Line 1806 of yacc.c  */
-#line 12039 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12039 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lock_type)= (yyvsp[(1) - (1)].lock_type); }
     break;
 
   case 1656:
 
-/* Line 1806 of yacc.c  */
-#line 12041 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12041 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
                                                     YYTHD->query());
@@ -33338,22 +33308,22 @@
 
   case 1657:
 
-/* Line 1806 of yacc.c  */
-#line 12056 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12056 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1658:
 
-/* Line 1806 of yacc.c  */
-#line 12057 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12057 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1659:
 
-/* Line 1806 of yacc.c  */
-#line 12062 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12062 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->field_list.empty();
@@ -33364,29 +33334,29 @@
 
   case 1660:
 
-/* Line 1806 of yacc.c  */
-#line 12070 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12070 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1661:
 
-/* Line 1806 of yacc.c  */
-#line 12071 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12071 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1662:
 
-/* Line 1806 of yacc.c  */
-#line 12072 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12072 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1663:
 
-/* Line 1806 of yacc.c  */
-#line 12074 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12074 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!(lex->insert_list = new List_item) ||
@@ -33397,64 +33367,64 @@
 
   case 1665:
 
-/* Line 1806 of yacc.c  */
-#line 12084 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12084 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
     break;
 
   case 1666:
 
-/* Line 1806 of yacc.c  */
-#line 12085 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12085 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
     break;
 
   case 1667:
 
-/* Line 1806 of yacc.c  */
-#line 12089 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12089 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1668:
 
-/* Line 1806 of yacc.c  */
-#line 12090 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12090 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1669:
 
-/* Line 1806 of yacc.c  */
-#line 12092 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12092 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->set_braces(0);}
     break;
 
   case 1670:
 
-/* Line 1806 of yacc.c  */
-#line 12093 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12093 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1671:
 
-/* Line 1806 of yacc.c  */
-#line 12095 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12095 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->set_braces(1);}
     break;
 
   case 1672:
 
-/* Line 1806 of yacc.c  */
-#line 12096 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12096 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1677:
 
-/* Line 1806 of yacc.c  */
-#line 12111 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12111 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->field_list.push_back((yyvsp[(1) - (3)].item)) ||
@@ -33465,36 +33435,36 @@
 
   case 1678:
 
-/* Line 1806 of yacc.c  */
-#line 12120 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12120 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1679:
 
-/* Line 1806 of yacc.c  */
-#line 12121 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12121 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1680:
 
-/* Line 1806 of yacc.c  */
-#line 12125 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12125 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1681:
 
-/* Line 1806 of yacc.c  */
-#line 12126 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12126 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1682:
 
-/* Line 1806 of yacc.c  */
-#line 12131 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12131 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
               if (!(Lex->insert_list = new List_item))
                 MYSQL_YYABORT;
@@ -33503,8 +33473,8 @@
 
   case 1683:
 
-/* Line 1806 of yacc.c  */
-#line 12136 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12136 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->many_values.push_back(lex->insert_list))
@@ -33514,15 +33484,15 @@
 
   case 1684:
 
-/* Line 1806 of yacc.c  */
-#line 12144 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12144 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1686:
 
-/* Line 1806 of yacc.c  */
-#line 12150 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12150 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->insert_list->push_back((yyvsp[(3) - (3)].item)))
               MYSQL_YYABORT;
@@ -33531,8 +33501,8 @@
 
   case 1687:
 
-/* Line 1806 of yacc.c  */
-#line 12155 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12155 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->insert_list->push_back((yyvsp[(1) - (1)].item)))
               MYSQL_YYABORT;
@@ -33541,15 +33511,15 @@
 
   case 1688:
 
-/* Line 1806 of yacc.c  */
-#line 12162 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12162 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item);}
     break;
 
   case 1689:
 
-/* Line 1806 of yacc.c  */
-#line 12164 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12164 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_default_value(Lex->current_context());
             if ((yyval.item) == NULL)
@@ -33559,15 +33529,15 @@
 
   case 1691:
 
-/* Line 1806 of yacc.c  */
-#line 12173 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12173 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->duplicates= DUP_UPDATE; }
     break;
 
   case 1693:
 
-/* Line 1806 of yacc.c  */
-#line 12181 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12181 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             mysql_init_select(lex);
@@ -33578,8 +33548,8 @@
 
   case 1694:
 
-/* Line 1806 of yacc.c  */
-#line 12189 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12189 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->select_lex.table_list.elements > 1)
@@ -33602,15 +33572,15 @@
 
   case 1695:
 
-/* Line 1806 of yacc.c  */
-#line 12207 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12207 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1698:
 
-/* Line 1806 of yacc.c  */
-#line 12217 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12217 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_item_to_list(YYTHD, (yyvsp[(1) - (3)].item)) || add_value_to_list(YYTHD, (yyvsp[(3) - (3)].item)))
               MYSQL_YYABORT;
@@ -33619,8 +33589,8 @@
 
   case 1701:
 
-/* Line 1806 of yacc.c  */
-#line 12230 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12230 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
           LEX *lex= Lex;
           if (lex->update_list.push_back((yyvsp[(1) - (3)].item)) || 
@@ -33631,22 +33601,22 @@
 
   case 1702:
 
-/* Line 1806 of yacc.c  */
-#line 12239 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12239 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_DEFAULT; }
     break;
 
   case 1703:
 
-/* Line 1806 of yacc.c  */
-#line 12240 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12240 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
     break;
 
   case 1704:
 
-/* Line 1806 of yacc.c  */
-#line 12247 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12247 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_DELETE;
@@ -33661,8 +33631,8 @@
 
   case 1706:
 
-/* Line 1806 of yacc.c  */
-#line 12262 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12262 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(2) - (3)].table), NULL, TL_OPTION_UPDATING,
                                            YYPS->m_lock_type,
@@ -33677,15 +33647,15 @@
 
   case 1707:
 
-/* Line 1806 of yacc.c  */
-#line 12273 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12273 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1708:
 
-/* Line 1806 of yacc.c  */
-#line 12275 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12275 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             mysql_init_multi_delete(Lex);
             YYPS->m_lock_type= TL_READ_DEFAULT;
@@ -33695,8 +33665,8 @@
 
   case 1709:
 
-/* Line 1806 of yacc.c  */
-#line 12281 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12281 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (multi_delete_set_locks_and_link_aux_tables(Lex))
               MYSQL_YYABORT;
@@ -33705,8 +33675,8 @@
 
   case 1710:
 
-/* Line 1806 of yacc.c  */
-#line 12286 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12286 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             mysql_init_multi_delete(Lex);
             YYPS->m_lock_type= TL_READ_DEFAULT;
@@ -33716,8 +33686,8 @@
 
   case 1711:
 
-/* Line 1806 of yacc.c  */
-#line 12292 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12292 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (multi_delete_set_locks_and_link_aux_tables(Lex))
               MYSQL_YYABORT;
@@ -33726,8 +33696,8 @@
 
   case 1714:
 
-/* Line 1806 of yacc.c  */
-#line 12305 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12305 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Table_ident *ti= new Table_ident((yyvsp[(1) - (2)].lex_str));
             if (ti == NULL)
@@ -33744,8 +33714,8 @@
 
   case 1715:
 
-/* Line 1806 of yacc.c  */
-#line 12318 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12318 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Table_ident *ti= new Table_ident(YYTHD, (yyvsp[(1) - (4)].lex_str), (yyvsp[(3) - (4)].lex_str), 0);
             if (ti == NULL)
@@ -33762,57 +33732,57 @@
 
   case 1716:
 
-/* Line 1806 of yacc.c  */
-#line 12333 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12333 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1717:
 
-/* Line 1806 of yacc.c  */
-#line 12334 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12334 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1718:
 
-/* Line 1806 of yacc.c  */
-#line 12338 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12338 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1719:
 
-/* Line 1806 of yacc.c  */
-#line 12339 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12339 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1720:
 
-/* Line 1806 of yacc.c  */
-#line 12343 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12343 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->options|= OPTION_QUICK; }
     break;
 
   case 1721:
 
-/* Line 1806 of yacc.c  */
-#line 12344 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12344 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { YYPS->m_lock_type= TL_WRITE_LOW_PRIORITY; }
     break;
 
   case 1722:
 
-/* Line 1806 of yacc.c  */
-#line 12345 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12345 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->ignore= 1; }
     break;
 
   case 1723:
 
-/* Line 1806 of yacc.c  */
-#line 12350 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12350 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX* lex= Lex;
             lex->sql_command= SQLCOM_TRUNCATE;
@@ -33827,8 +33797,8 @@
 
   case 1724:
 
-/* Line 1806 of yacc.c  */
-#line 12361 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12361 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -33841,8 +33811,8 @@
 
   case 1731:
 
-/* Line 1806 of yacc.c  */
-#line 12386 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12386 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_CPU;
     }
@@ -33850,8 +33820,8 @@
 
   case 1732:
 
-/* Line 1806 of yacc.c  */
-#line 12390 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12390 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_MEMORY;
     }
@@ -33859,8 +33829,8 @@
 
   case 1733:
 
-/* Line 1806 of yacc.c  */
-#line 12394 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12394 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_BLOCK_IO;
     }
@@ -33868,8 +33838,8 @@
 
   case 1734:
 
-/* Line 1806 of yacc.c  */
-#line 12398 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12398 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_CONTEXT;
     }
@@ -33877,8 +33847,8 @@
 
   case 1735:
 
-/* Line 1806 of yacc.c  */
-#line 12402 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12402 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_PAGE_FAULTS;
     }
@@ -33886,8 +33856,8 @@
 
   case 1736:
 
-/* Line 1806 of yacc.c  */
-#line 12406 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12406 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_IPC;
     }
@@ -33895,8 +33865,8 @@
 
   case 1737:
 
-/* Line 1806 of yacc.c  */
-#line 12410 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12410 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_SWAPS;
     }
@@ -33904,8 +33874,8 @@
 
   case 1738:
 
-/* Line 1806 of yacc.c  */
-#line 12414 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12414 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_SOURCE;
     }
@@ -33913,8 +33883,8 @@
 
   case 1739:
 
-/* Line 1806 of yacc.c  */
-#line 12418 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12418 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_ALL;
     }
@@ -33922,8 +33892,8 @@
 
   case 1740:
 
-/* Line 1806 of yacc.c  */
-#line 12425 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12425 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_query_id= 0;
     }
@@ -33931,8 +33901,8 @@
 
   case 1741:
 
-/* Line 1806 of yacc.c  */
-#line 12429 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12429 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
       Lex->profile_query_id= atoi((yyvsp[(3) - (3)].lex_str).str);
     }
@@ -33940,8 +33910,8 @@
 
   case 1742:
 
-/* Line 1806 of yacc.c  */
-#line 12438 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12438 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->wild=0;
@@ -33953,8 +33923,8 @@
 
   case 1743:
 
-/* Line 1806 of yacc.c  */
-#line 12446 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12446 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -33962,8 +33932,8 @@
 
   case 1744:
 
-/* Line 1806 of yacc.c  */
-#line 12453 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12453 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_DATABASES;
@@ -33974,8 +33944,8 @@
 
   case 1745:
 
-/* Line 1806 of yacc.c  */
-#line 12460 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12460 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_TABLES;
@@ -33987,8 +33957,8 @@
 
   case 1746:
 
-/* Line 1806 of yacc.c  */
-#line 12468 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12468 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_TRIGGERS;
@@ -34000,8 +33970,8 @@
 
   case 1747:
 
-/* Line 1806 of yacc.c  */
-#line 12476 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12476 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_EVENTS;
@@ -34013,8 +33983,8 @@
 
   case 1748:
 
-/* Line 1806 of yacc.c  */
-#line 12484 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12484 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
@@ -34026,8 +33996,8 @@
 
   case 1749:
 
-/* Line 1806 of yacc.c  */
-#line 12492 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12492 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
@@ -34039,8 +34009,8 @@
 
   case 1750:
 
-/* Line 1806 of yacc.c  */
-#line 12500 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12500 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_PLUGINS;
@@ -34051,22 +34021,22 @@
 
   case 1751:
 
-/* Line 1806 of yacc.c  */
-#line 12507 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12507 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_info.db_type= (yyvsp[(2) - (3)].db_type); }
     break;
 
   case 1752:
 
-/* Line 1806 of yacc.c  */
-#line 12509 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12509 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_info.db_type= NULL; }
     break;
 
   case 1753:
 
-/* Line 1806 of yacc.c  */
-#line 12511 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12511 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_FIELDS;
@@ -34079,8 +34049,8 @@
 
   case 1754:
 
-/* Line 1806 of yacc.c  */
-#line 12520 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12520 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_SHOW_BINLOGS;
           }
@@ -34088,8 +34058,8 @@
 
   case 1755:
 
-/* Line 1806 of yacc.c  */
-#line 12524 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12524 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_SHOW_SLAVE_HOSTS;
           }
@@ -34097,8 +34067,8 @@
 
   case 1756:
 
-/* Line 1806 of yacc.c  */
-#line 12528 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12528 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS;
@@ -34107,8 +34077,8 @@
 
   case 1758:
 
-/* Line 1806 of yacc.c  */
-#line 12533 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12533 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_RELAYLOG_EVENTS;
@@ -34117,8 +34087,8 @@
 
   case 1760:
 
-/* Line 1806 of yacc.c  */
-#line 12538 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12538 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_KEYS;
@@ -34131,8 +34101,8 @@
 
   case 1761:
 
-/* Line 1806 of yacc.c  */
-#line 12547 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12547 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
@@ -34143,8 +34113,8 @@
 
   case 1762:
 
-/* Line 1806 of yacc.c  */
-#line 12554 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12554 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_PRIVILEGES;
@@ -34153,36 +34123,36 @@
 
   case 1763:
 
-/* Line 1806 of yacc.c  */
-#line 12559 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12559 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (void) create_select_for_variable("warning_count"); }
     break;
 
   case 1764:
 
-/* Line 1806 of yacc.c  */
-#line 12561 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12561 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (void) create_select_for_variable("error_count"); }
     break;
 
   case 1765:
 
-/* Line 1806 of yacc.c  */
-#line 12563 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12563 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sql_command = SQLCOM_SHOW_WARNS;}
     break;
 
   case 1766:
 
-/* Line 1806 of yacc.c  */
-#line 12565 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12565 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sql_command = SQLCOM_SHOW_ERRORS;}
     break;
 
   case 1767:
 
-/* Line 1806 of yacc.c  */
-#line 12567 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12567 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
                                 ER_WARN_DEPRECATED_SYNTAX,
@@ -34194,8 +34164,8 @@
 
   case 1768:
 
-/* Line 1806 of yacc.c  */
-#line 12575 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12575 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
                                 ER_WARN_DEPRECATED_SYNTAX,
@@ -34210,8 +34180,8 @@
 
   case 1769:
 
-/* Line 1806 of yacc.c  */
-#line 12586 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12586 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_STATUS;
@@ -34223,15 +34193,15 @@
 
   case 1770:
 
-/* Line 1806 of yacc.c  */
-#line 12594 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12594 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
     break;
 
   case 1771:
 
-/* Line 1806 of yacc.c  */
-#line 12596 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12596 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_VARIABLES;
@@ -34243,8 +34213,8 @@
 
   case 1772:
 
-/* Line 1806 of yacc.c  */
-#line 12604 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12604 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_CHARSETS;
@@ -34255,8 +34225,8 @@
 
   case 1773:
 
-/* Line 1806 of yacc.c  */
-#line 12611 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12611 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_COLLATIONS;
@@ -34267,8 +34237,8 @@
 
   case 1774:
 
-/* Line 1806 of yacc.c  */
-#line 12618 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12618 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_GRANTS;
@@ -34282,8 +34252,8 @@
 
   case 1775:
 
-/* Line 1806 of yacc.c  */
-#line 12628 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12628 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_GRANTS;
@@ -34294,8 +34264,8 @@
 
   case 1776:
 
-/* Line 1806 of yacc.c  */
-#line 12635 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12635 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command=SQLCOM_SHOW_CREATE_DB;
             Lex->create_info.options=(yyvsp[(3) - (4)].num);
@@ -34305,8 +34275,8 @@
 
   case 1777:
 
-/* Line 1806 of yacc.c  */
-#line 12641 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12641 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -34319,8 +34289,8 @@
 
   case 1778:
 
-/* Line 1806 of yacc.c  */
-#line 12650 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12650 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -34332,8 +34302,8 @@
 
   case 1779:
 
-/* Line 1806 of yacc.c  */
-#line 12658 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12658 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_SHOW_MASTER_STAT;
           }
@@ -34341,8 +34311,8 @@
 
   case 1780:
 
-/* Line 1806 of yacc.c  */
-#line 12662 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12662 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
           }
@@ -34350,8 +34320,8 @@
 
   case 1781:
 
-/* Line 1806 of yacc.c  */
-#line 12666 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12666 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -34362,8 +34332,8 @@
 
   case 1782:
 
-/* Line 1806 of yacc.c  */
-#line 12673 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12673 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -34374,8 +34344,8 @@
 
   case 1783:
 
-/* Line 1806 of yacc.c  */
-#line 12680 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12680 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_CREATE_TRIGGER;
@@ -34385,8 +34355,8 @@
 
   case 1784:
 
-/* Line 1806 of yacc.c  */
-#line 12686 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12686 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_STATUS_PROC;
@@ -34397,8 +34367,8 @@
 
   case 1785:
 
-/* Line 1806 of yacc.c  */
-#line 12693 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12693 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_STATUS_FUNC;
@@ -34409,8 +34379,8 @@
 
   case 1786:
 
-/* Line 1806 of yacc.c  */
-#line 12700 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12700 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command= SQLCOM_SHOW_PROC_CODE;
             Lex->spname= (yyvsp[(3) - (3)].spname);
@@ -34419,8 +34389,8 @@
 
   case 1787:
 
-/* Line 1806 of yacc.c  */
-#line 12705 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12705 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command= SQLCOM_SHOW_FUNC_CODE;
             Lex->spname= (yyvsp[(3) - (3)].spname);
@@ -34429,8 +34399,8 @@
 
   case 1788:
 
-/* Line 1806 of yacc.c  */
-#line 12710 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12710 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->spname= (yyvsp[(3) - (3)].spname);
             Lex->sql_command = SQLCOM_SHOW_CREATE_EVENT;
@@ -34439,85 +34409,85 @@
 
   case 1789:
 
-/* Line 1806 of yacc.c  */
-#line 12718 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12718 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_SHOW_ENGINE_STATUS; }
     break;
 
   case 1790:
 
-/* Line 1806 of yacc.c  */
-#line 12720 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12720 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_SHOW_ENGINE_MUTEX; }
     break;
 
   case 1791:
 
-/* Line 1806 of yacc.c  */
-#line 12722 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12722 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_SHOW_ENGINE_LOGS; }
     break;
 
   case 1796:
 
-/* Line 1806 of yacc.c  */
-#line 12736 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12736 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.simple_string)= 0; }
     break;
 
   case 1797:
 
-/* Line 1806 of yacc.c  */
-#line 12737 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12737 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.simple_string)= (yyvsp[(2) - (2)].lex_str).str; }
     break;
 
   case 1798:
 
-/* Line 1806 of yacc.c  */
-#line 12741 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12741 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->verbose=0; }
     break;
 
   case 1799:
 
-/* Line 1806 of yacc.c  */
-#line 12742 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12742 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->verbose=1; }
     break;
 
   case 1802:
 
-/* Line 1806 of yacc.c  */
-#line 12751 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12751 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->mi.log_file_name = 0; }
     break;
 
   case 1803:
 
-/* Line 1806 of yacc.c  */
-#line 12752 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12752 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->mi.log_file_name = (yyvsp[(2) - (2)].lex_str).str; }
     break;
 
   case 1804:
 
-/* Line 1806 of yacc.c  */
-#line 12756 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12756 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->mi.pos = 4; /* skip magic number */ }
     break;
 
   case 1805:
 
-/* Line 1806 of yacc.c  */
-#line 12757 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12757 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->mi.pos = (yyvsp[(2) - (2)].ulonglong_number); }
     break;
 
   case 1807:
 
-/* Line 1806 of yacc.c  */
-#line 12763 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12763 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->wild= new (YYTHD->mem_root) String((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length,
                                                     system_charset_info);
@@ -34528,8 +34498,8 @@
 
   case 1808:
 
-/* Line 1806 of yacc.c  */
-#line 12770 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12770 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->where= (yyvsp[(2) - (2)].item);
             if ((yyvsp[(2) - (2)].item))
@@ -34539,8 +34509,8 @@
 
   case 1809:
 
-/* Line 1806 of yacc.c  */
-#line 12780 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12780 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             mysql_init_select(lex);
@@ -34555,8 +34525,8 @@
 
   case 1810:
 
-/* Line 1806 of yacc.c  */
-#line 12791 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12791 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -34564,22 +34534,22 @@
 
   case 1811:
 
-/* Line 1806 of yacc.c  */
-#line 12795 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12795 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->describe|= DESCRIBE_NORMAL; }
     break;
 
   case 1812:
 
-/* Line 1806 of yacc.c  */
-#line 12797 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12797 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->select_lex.options|= SELECT_DESCRIBE; }
     break;
 
   case 1820:
 
-/* Line 1806 of yacc.c  */
-#line 12815 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12815 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((Lex->explain_format= new Explain_format_traditional) == NULL)
               MYSQL_YYABORT;
@@ -34588,8 +34558,8 @@
 
   case 1821:
 
-/* Line 1806 of yacc.c  */
-#line 12820 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12820 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((Lex->explain_format= new Explain_format_traditional) == NULL)
               MYSQL_YYABORT;
@@ -34599,8 +34569,8 @@
 
   case 1822:
 
-/* Line 1806 of yacc.c  */
-#line 12826 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12826 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((Lex->explain_format= new Explain_format_traditional) == NULL)
               MYSQL_YYABORT;
@@ -34610,8 +34580,8 @@
 
   case 1823:
 
-/* Line 1806 of yacc.c  */
-#line 12832 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12832 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!my_strcasecmp(system_charset_info, (yyvsp[(3) - (3)].lex_str).str, "JSON"))
             {
@@ -34634,22 +34604,22 @@
 
   case 1824:
 
-/* Line 1806 of yacc.c  */
-#line 12853 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12853 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1825:
 
-/* Line 1806 of yacc.c  */
-#line 12854 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12854 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->wild= (yyvsp[(1) - (1)].string); }
     break;
 
   case 1826:
 
-/* Line 1806 of yacc.c  */
-#line 12856 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12856 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->wild= new (YYTHD->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str,
                                                     (yyvsp[(1) - (1)].lex_str).length,
@@ -34661,8 +34631,8 @@
 
   case 1827:
 
-/* Line 1806 of yacc.c  */
-#line 12870 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12870 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_FLUSH;
@@ -34673,15 +34643,15 @@
 
   case 1828:
 
-/* Line 1806 of yacc.c  */
-#line 12877 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12877 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1829:
 
-/* Line 1806 of yacc.c  */
-#line 12882 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12882 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->type|= REFRESH_TABLES;
             /*
@@ -34695,29 +34665,29 @@
 
   case 1830:
 
-/* Line 1806 of yacc.c  */
-#line 12891 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12891 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1831:
 
-/* Line 1806 of yacc.c  */
-#line 12892 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12892 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1833:
 
-/* Line 1806 of yacc.c  */
-#line 12897 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12897 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1834:
 
-/* Line 1806 of yacc.c  */
-#line 12899 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12899 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             TABLE_LIST *tables= Lex->query_tables;
             Lex->type|= REFRESH_READ_LOCK;
@@ -34732,8 +34702,8 @@
 
   case 1835:
 
-/* Line 1806 of yacc.c  */
-#line 12910 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12910 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->query_tables == NULL) // Table list can't be empty
             {
@@ -34745,8 +34715,8 @@
 
   case 1836:
 
-/* Line 1806 of yacc.c  */
-#line 12918 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12918 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             TABLE_LIST *tables= Lex->query_tables;
             Lex->type|= REFRESH_FOR_EXPORT;
@@ -34761,120 +34731,120 @@
 
   case 1838:
 
-/* Line 1806 of yacc.c  */
-#line 12933 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12933 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1839:
 
-/* Line 1806 of yacc.c  */
-#line 12938 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12938 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_ERROR_LOG; }
     break;
 
   case 1840:
 
-/* Line 1806 of yacc.c  */
-#line 12940 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12940 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_ENGINE_LOG; }
     break;
 
   case 1841:
 
-/* Line 1806 of yacc.c  */
-#line 12942 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12942 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_GENERAL_LOG; }
     break;
 
   case 1842:
 
-/* Line 1806 of yacc.c  */
-#line 12944 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12944 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_SLOW_LOG; }
     break;
 
   case 1843:
 
-/* Line 1806 of yacc.c  */
-#line 12946 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12946 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_BINARY_LOG; }
     break;
 
   case 1844:
 
-/* Line 1806 of yacc.c  */
-#line 12948 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12948 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_RELAY_LOG; }
     break;
 
   case 1845:
 
-/* Line 1806 of yacc.c  */
-#line 12950 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12950 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_QUERY_CACHE_FREE; }
     break;
 
   case 1846:
 
-/* Line 1806 of yacc.c  */
-#line 12952 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12952 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_HOSTS; }
     break;
 
   case 1847:
 
-/* Line 1806 of yacc.c  */
-#line 12954 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12954 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_GRANT; }
     break;
 
   case 1848:
 
-/* Line 1806 of yacc.c  */
-#line 12956 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12956 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_LOG; }
     break;
 
   case 1849:
 
-/* Line 1806 of yacc.c  */
-#line 12958 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12958 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_STATUS; }
     break;
 
   case 1850:
 
-/* Line 1806 of yacc.c  */
-#line 12960 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12960 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_DES_KEY_FILE; }
     break;
 
   case 1851:
 
-/* Line 1806 of yacc.c  */
-#line 12962 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12962 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_USER_RESOURCES; }
     break;
 
   case 1852:
 
-/* Line 1806 of yacc.c  */
-#line 12966 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12966 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1853:
 
-/* Line 1806 of yacc.c  */
-#line 12967 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12967 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1854:
 
-/* Line 1806 of yacc.c  */
-#line 12972 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12972 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_RESET; lex->type=0;
@@ -34883,57 +34853,57 @@
 
   case 1855:
 
-/* Line 1806 of yacc.c  */
-#line 12977 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12977 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1858:
 
-/* Line 1806 of yacc.c  */
-#line 12986 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12986 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_SLAVE; }
     break;
 
   case 1859:
 
-/* Line 1806 of yacc.c  */
-#line 12987 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12987 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 1860:
 
-/* Line 1806 of yacc.c  */
-#line 12988 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12988 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_MASTER; }
     break;
 
   case 1861:
 
-/* Line 1806 of yacc.c  */
-#line 12989 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12989 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_QUERY_CACHE;}
     break;
 
   case 1862:
 
-/* Line 1806 of yacc.c  */
-#line 12993 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12993 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->reset_slave_info.all= false; }
     break;
 
   case 1863:
 
-/* Line 1806 of yacc.c  */
-#line 12994 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12994 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->reset_slave_info.all= true; }
     break;
 
   case 1864:
 
-/* Line 1806 of yacc.c  */
-#line 12999 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 12999 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->type=0;
@@ -34943,15 +34913,15 @@
 
   case 1865:
 
-/* Line 1806 of yacc.c  */
-#line 13005 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13005 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1867:
 
-/* Line 1806 of yacc.c  */
-#line 13014 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13014 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->to_log = (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -34959,8 +34929,8 @@
 
   case 1868:
 
-/* Line 1806 of yacc.c  */
-#line 13018 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13018 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->value_list.empty();
@@ -34971,8 +34941,8 @@
 
   case 1869:
 
-/* Line 1806 of yacc.c  */
-#line 13030 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13030 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->value_list.empty();
@@ -34983,29 +34953,29 @@
 
   case 1870:
 
-/* Line 1806 of yacc.c  */
-#line 13039 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13039 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type= 0; }
     break;
 
   case 1871:
 
-/* Line 1806 of yacc.c  */
-#line 13040 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13040 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type= 0; }
     break;
 
   case 1872:
 
-/* Line 1806 of yacc.c  */
-#line 13041 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13041 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->type= ONLY_KILL_QUERY; }
     break;
 
   case 1873:
 
-/* Line 1806 of yacc.c  */
-#line 13048 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13048 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_CHANGE_DB;
@@ -35015,8 +34985,8 @@
 
   case 1874:
 
-/* Line 1806 of yacc.c  */
-#line 13059 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13059 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -35032,8 +35002,8 @@
 
   case 1875:
 
-/* Line 1806 of yacc.c  */
-#line 13071 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13071 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_LOAD;
@@ -35047,8 +35017,8 @@
 
   case 1876:
 
-/* Line 1806 of yacc.c  */
-#line 13081 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13081 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(12) - (13)].table), NULL, TL_OPTION_UPDATING,
@@ -35062,57 +35032,57 @@
 
   case 1877:
 
-/* Line 1806 of yacc.c  */
-#line 13091 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13091 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->exchange->cs= (yyvsp[(15) - (15)].charset); }
     break;
 
   case 1878:
 
-/* Line 1806 of yacc.c  */
-#line 13095 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13095 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1879:
 
-/* Line 1806 of yacc.c  */
-#line 13099 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13099 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.filetype)= FILETYPE_CSV; }
     break;
 
   case 1880:
 
-/* Line 1806 of yacc.c  */
-#line 13100 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13100 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.filetype)= FILETYPE_XML; }
     break;
 
   case 1881:
 
-/* Line 1806 of yacc.c  */
-#line 13104 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13104 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=0;}
     break;
 
   case 1882:
 
-/* Line 1806 of yacc.c  */
-#line 13105 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13105 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=1;}
     break;
 
   case 1883:
 
-/* Line 1806 of yacc.c  */
-#line 13109 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13109 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_DEFAULT; }
     break;
 
   case 1884:
 
-/* Line 1806 of yacc.c  */
-#line 13111 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13111 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
 #ifdef HAVE_QUERY_CACHE
             /*
@@ -35128,36 +35098,36 @@
 
   case 1885:
 
-/* Line 1806 of yacc.c  */
-#line 13122 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13122 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
     break;
 
   case 1886:
 
-/* Line 1806 of yacc.c  */
-#line 13126 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13126 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->duplicates=DUP_ERROR; }
     break;
 
   case 1887:
 
-/* Line 1806 of yacc.c  */
-#line 13127 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13127 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->duplicates=DUP_REPLACE; }
     break;
 
   case 1888:
 
-/* Line 1806 of yacc.c  */
-#line 13128 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13128 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->ignore= 1; }
     break;
 
   case 1893:
 
-/* Line 1806 of yacc.c  */
-#line 13143 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13143 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->field_term= (yyvsp[(3) - (3)].string);
@@ -35166,8 +35136,8 @@
 
   case 1894:
 
-/* Line 1806 of yacc.c  */
-#line 13148 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13148 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             DBUG_ASSERT(lex->exchange != 0);
@@ -35178,8 +35148,8 @@
 
   case 1895:
 
-/* Line 1806 of yacc.c  */
-#line 13155 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13155 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->enclosed= (yyvsp[(3) - (3)].string);
@@ -35188,8 +35158,8 @@
 
   case 1896:
 
-/* Line 1806 of yacc.c  */
-#line 13160 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13160 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->escaped= (yyvsp[(3) - (3)].string);
@@ -35198,8 +35168,8 @@
 
   case 1901:
 
-/* Line 1806 of yacc.c  */
-#line 13178 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13178 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->line_term= (yyvsp[(3) - (3)].string);
@@ -35208,8 +35178,8 @@
 
   case 1902:
 
-/* Line 1806 of yacc.c  */
-#line 13183 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13183 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->line_start= (yyvsp[(3) - (3)].string);
@@ -35218,22 +35188,22 @@
 
   case 1903:
 
-/* Line 1806 of yacc.c  */
-#line 13190 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13190 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 1904:
 
-/* Line 1806 of yacc.c  */
-#line 13192 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13192 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->exchange->line_term = (yyvsp[(4) - (4)].string); }
     break;
 
   case 1906:
 
-/* Line 1806 of yacc.c  */
-#line 13197 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13197 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->skip_lines= atol((yyvsp[(2) - (3)].lex_str).str);
@@ -35242,64 +35212,64 @@
 
   case 1907:
 
-/* Line 1806 of yacc.c  */
-#line 13204 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13204 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 1908:
 
-/* Line 1806 of yacc.c  */
-#line 13206 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13206 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { }
     break;
 
   case 1909:
 
-/* Line 1806 of yacc.c  */
-#line 13210 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13210 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1910:
 
-/* Line 1806 of yacc.c  */
-#line 13211 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13211 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1911:
 
-/* Line 1806 of yacc.c  */
-#line 13212 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13212 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1912:
 
-/* Line 1806 of yacc.c  */
-#line 13217 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13217 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
     break;
 
   case 1913:
 
-/* Line 1806 of yacc.c  */
-#line 13219 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13219 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
     break;
 
   case 1914:
 
-/* Line 1806 of yacc.c  */
-#line 13223 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13223 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {(yyval.item)= (yyvsp[(1) - (1)].item);}
     break;
 
   case 1915:
 
-/* Line 1806 of yacc.c  */
-#line 13225 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13225 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_user_var_as_out_param((yyvsp[(2) - (2)].lex_str));
             if ((yyval.item) == NULL)
@@ -35309,22 +35279,22 @@
 
   case 1916:
 
-/* Line 1806 of yacc.c  */
-#line 13233 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13233 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1917:
 
-/* Line 1806 of yacc.c  */
-#line 13234 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13234 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1920:
 
-/* Line 1806 of yacc.c  */
-#line 13244 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13244 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             uint length= (uint) ((yyvsp[(5) - (5)].simple_string) - (yyvsp[(3) - (5)].simple_string));
@@ -35343,8 +35313,8 @@
 
   case 1921:
 
-/* Line 1806 of yacc.c  */
-#line 13264 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13264 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX_STRING tmp;
             THD *thd= YYTHD;
@@ -35372,8 +35342,8 @@
 
   case 1922:
 
-/* Line 1806 of yacc.c  */
-#line 13288 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13288 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             uint repertoire= Lex->text_string_is_7bit ?
                              MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
@@ -35389,8 +35359,8 @@
 
   case 1923:
 
-/* Line 1806 of yacc.c  */
-#line 13300 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13300 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item_string *str= new (YYTHD->mem_root) Item_string((yyvsp[(2) - (2)].lex_str).str,
                                                                 (yyvsp[(2) - (2)].lex_str).length, (yyvsp[(1) - (2)].charset));
@@ -35405,8 +35375,8 @@
 
   case 1924:
 
-/* Line 1806 of yacc.c  */
-#line 13311 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13311 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item_string* item= (Item_string*) (yyvsp[(1) - (2)].item);
             item->append((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
@@ -35426,8 +35396,8 @@
 
   case 1925:
 
-/* Line 1806 of yacc.c  */
-#line 13330 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13330 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.string)= new (YYTHD->mem_root) String((yyvsp[(1) - (1)].lex_str).str,
                                              (yyvsp[(1) - (1)].lex_str).length,
@@ -35439,8 +35409,8 @@
 
   case 1926:
 
-/* Line 1806 of yacc.c  */
-#line 13338 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13338 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *tmp= new (YYTHD->mem_root) Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if (tmp == NULL)
@@ -35456,8 +35426,8 @@
 
   case 1927:
 
-/* Line 1806 of yacc.c  */
-#line 13350 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13350 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *tmp= new (YYTHD->mem_root) Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if (tmp == NULL)
@@ -35473,8 +35443,8 @@
 
   case 1928:
 
-/* Line 1806 of yacc.c  */
-#line 13365 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13365 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -35496,22 +35466,22 @@
 
   case 1929:
 
-/* Line 1806 of yacc.c  */
-#line 13385 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13385 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); }
     break;
 
   case 1930:
 
-/* Line 1806 of yacc.c  */
-#line 13386 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13386 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(2) - (2)].item_num); }
     break;
 
   case 1931:
 
-/* Line 1806 of yacc.c  */
-#line 13388 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13388 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyvsp[(2) - (2)].item_num)->max_length++;
             (yyval.item)= (yyvsp[(2) - (2)].item_num)->neg();
@@ -35520,30 +35490,38 @@
 
   case 1932:
 
-/* Line 1806 of yacc.c  */
-#line 13396 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13396 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); }
     break;
 
   case 1933:
 
-/* Line 1806 of yacc.c  */
-#line 13397 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13397 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item_num); }
     break;
 
   case 1934:
 
-/* Line 1806 of yacc.c  */
-#line 13398 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13398 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 1935:
 
-/* Line 1806 of yacc.c  */
-#line 13400 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13400 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
+            Lex_input_stream *lip= YYLIP;
+            /*
+              For the digest computation, in this context only,
+              NULL is considered a literal, hence reduced to '?'
+              REDUCE:
+                TOK_GENERIC_VALUE := NULL_SYM
+            */
+            lip->reduce_digest_token(TOK_GENERIC_VALUE, NULL_SYM);
             (yyval.item) = new (YYTHD->mem_root) Item_null();
             if ((yyval.item) == NULL)
               MYSQL_YYABORT;
@@ -35553,8 +35531,8 @@
 
   case 1936:
 
-/* Line 1806 of yacc.c  */
-#line 13407 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13415 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_int(NAME_STRING("FALSE"), 0, 1);
             if ((yyval.item) == NULL)
@@ -35564,8 +35542,8 @@
 
   case 1937:
 
-/* Line 1806 of yacc.c  */
-#line 13413 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13421 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_int(NAME_STRING("TRUE"), 1, 1);
             if ((yyval.item) == NULL)
@@ -35575,8 +35553,8 @@
 
   case 1938:
 
-/* Line 1806 of yacc.c  */
-#line 13419 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13427 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item) = new (YYTHD->mem_root) Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -35586,8 +35564,8 @@
 
   case 1939:
 
-/* Line 1806 of yacc.c  */
-#line 13425 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13433 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -35597,8 +35575,8 @@
 
   case 1940:
 
-/* Line 1806 of yacc.c  */
-#line 13431 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13439 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *tmp= new (YYTHD->mem_root) Item_hex_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
             if (tmp == NULL)
@@ -35631,8 +35609,8 @@
 
   case 1941:
 
-/* Line 1806 of yacc.c  */
-#line 13460 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13468 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item *tmp= new (YYTHD->mem_root) Item_bin_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
             if (tmp == NULL)
@@ -35664,8 +35642,8 @@
 
   case 1942:
 
-/* Line 1806 of yacc.c  */
-#line 13491 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13499 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             int error;
             (yyval.item_num)= new (YYTHD->mem_root)
@@ -35679,8 +35657,8 @@
 
   case 1943:
 
-/* Line 1806 of yacc.c  */
-#line 13501 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13509 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             int error;
             (yyval.item_num)= new (YYTHD->mem_root)
@@ -35694,8 +35672,8 @@
 
   case 1944:
 
-/* Line 1806 of yacc.c  */
-#line 13511 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13519 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item_num)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item_num) == NULL)
@@ -35705,8 +35683,8 @@
 
   case 1945:
 
-/* Line 1806 of yacc.c  */
-#line 13517 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13525 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item_num)= new (YYTHD->mem_root) Item_decimal((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length,
                                                    YYTHD->charset());
@@ -35719,8 +35697,8 @@
 
   case 1946:
 
-/* Line 1806 of yacc.c  */
-#line 13526 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13534 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item_num)= new (YYTHD->mem_root) Item_float((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if (((yyval.item_num) == NULL) || (YYTHD->is_error()))
@@ -35732,8 +35710,8 @@
 
   case 1947:
 
-/* Line 1806 of yacc.c  */
-#line 13538 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13546 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyval.item)= create_temporal_literal(YYTHD, (yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length, YYCSCL,
                                               MYSQL_TYPE_DATE, true)))
@@ -35743,8 +35721,8 @@
 
   case 1948:
 
-/* Line 1806 of yacc.c  */
-#line 13544 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13552 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyval.item)= create_temporal_literal(YYTHD, (yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length, YYCSCL,
                                               MYSQL_TYPE_TIME, true)))
@@ -35754,8 +35732,8 @@
 
   case 1949:
 
-/* Line 1806 of yacc.c  */
-#line 13550 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13558 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyval.item)= create_temporal_literal(YYTHD, (yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length, YYCSCL,
                                               MYSQL_TYPE_DATETIME, true)))
@@ -35765,22 +35743,22 @@
 
   case 1950:
 
-/* Line 1806 of yacc.c  */
-#line 13565 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13573 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 1951:
 
-/* Line 1806 of yacc.c  */
-#line 13566 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13574 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 1952:
 
-/* Line 1806 of yacc.c  */
-#line 13571 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13579 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             (yyval.item)= new (YYTHD->mem_root) Item_field(Lex->current_context(),
@@ -35793,8 +35771,8 @@
 
   case 1953:
 
-/* Line 1806 of yacc.c  */
-#line 13580 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13588 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             SELECT_LEX *sel= Select;
@@ -35811,15 +35789,15 @@
 
   case 1954:
 
-/* Line 1806 of yacc.c  */
-#line 13595 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13603 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 1955:
 
-/* Line 1806 of yacc.c  */
-#line 13600 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13608 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -35874,15 +35852,15 @@
 
   case 1956:
 
-/* Line 1806 of yacc.c  */
-#line 13650 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13658 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 1957:
 
-/* Line 1806 of yacc.c  */
-#line 13655 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13663 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             SELECT_LEX *sel=Select;
@@ -35904,15 +35882,15 @@
 
   case 1958:
 
-/* Line 1806 of yacc.c  */
-#line 13672 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13680 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 1959:
 
-/* Line 1806 of yacc.c  */
-#line 13677 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13685 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -35964,7 +35942,7 @@
                 Let us add this item to list of all Item_trigger_field objects
                 in trigger.
               */
-              lex->sphead->m_trg_table_fields.link_in_list(
+              lex->sphead->m_cur_instr_trig_field_items.link_in_list(
                 trg_fld, &trg_fld->next_trg_field);
 
               (yyval.item)= trg_fld;
@@ -35996,8 +35974,8 @@
 
   case 1960:
 
-/* Line 1806 of yacc.c  */
-#line 13757 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13765 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -36026,8 +36004,8 @@
 
   case 1961:
 
-/* Line 1806 of yacc.c  */
-#line 13782 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13790 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -36059,15 +36037,15 @@
 
   case 1962:
 
-/* Line 1806 of yacc.c  */
-#line 13812 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13820 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
     break;
 
   case 1963:
 
-/* Line 1806 of yacc.c  */
-#line 13814 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13822 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             TABLE_LIST *table= Select->table_list.first;
             if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (5)].lex_str).str, table->db))
@@ -36087,8 +36065,8 @@
 
   case 1964:
 
-/* Line 1806 of yacc.c  */
-#line 13830 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13838 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             TABLE_LIST *table= Select->table_list.first;
             if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (3)].lex_str).str, table->alias))
@@ -36102,15 +36080,15 @@
 
   case 1965:
 
-/* Line 1806 of yacc.c  */
-#line 13839 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13847 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str);}
     break;
 
   case 1966:
 
-/* Line 1806 of yacc.c  */
-#line 13844 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13852 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.table)= new Table_ident((yyvsp[(1) - (1)].lex_str));
             if ((yyval.table) == NULL)
@@ -36120,8 +36098,8 @@
 
   case 1967:
 
-/* Line 1806 of yacc.c  */
-#line 13850 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13858 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.table)= new Table_ident(YYTHD, (yyvsp[(1) - (3)].lex_str),(yyvsp[(3) - (3)].lex_str),0);
             if ((yyval.table) == NULL)
@@ -36131,8 +36109,8 @@
 
   case 1968:
 
-/* Line 1806 of yacc.c  */
-#line 13856 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13864 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /* For Delphi */
             (yyval.table)= new Table_ident((yyvsp[(2) - (2)].lex_str));
@@ -36143,8 +36121,8 @@
 
   case 1969:
 
-/* Line 1806 of yacc.c  */
-#line 13866 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13874 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.table)= new Table_ident((yyvsp[(1) - (2)].lex_str));
             if ((yyval.table) == NULL)
@@ -36154,8 +36132,8 @@
 
   case 1970:
 
-/* Line 1806 of yacc.c  */
-#line 13872 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13880 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.table)= new Table_ident(YYTHD, (yyvsp[(1) - (4)].lex_str),(yyvsp[(3) - (4)].lex_str),0);
             if ((yyval.table) == NULL)
@@ -36165,8 +36143,8 @@
 
   case 1971:
 
-/* Line 1806 of yacc.c  */
-#line 13881 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13889 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX_STRING db={(char*) any_db,3};
             (yyval.table)= new Table_ident(YYTHD, db,(yyvsp[(1) - (1)].lex_str),0);
@@ -36177,15 +36155,15 @@
 
   case 1972:
 
-/* Line 1806 of yacc.c  */
-#line 13890 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13898 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1973:
 
-/* Line 1806 of yacc.c  */
-#line 13892 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13900 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -36216,8 +36194,8 @@
 
   case 1974:
 
-/* Line 1806 of yacc.c  */
-#line 13922 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13930 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!strcont((yyvsp[(1) - (1)].lex_str).str, "\n"))
               (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str);
@@ -36231,8 +36209,8 @@
 
   case 1975:
 
-/* Line 1806 of yacc.c  */
-#line 13935 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13943 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -36249,8 +36227,8 @@
 
   case 1976:
 
-/* Line 1806 of yacc.c  */
-#line 13951 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13959 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -36267,8 +36245,8 @@
 
   case 1977:
 
-/* Line 1806 of yacc.c  */
-#line 13967 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13975 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -36286,15 +36264,15 @@
 
   case 1978:
 
-/* Line 1806 of yacc.c  */
-#line 13983 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13991 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1979:
 
-/* Line 1806 of yacc.c  */
-#line 13985 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 13993 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             (yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
@@ -36306,15 +36284,15 @@
 
   case 1980:
 
-/* Line 1806 of yacc.c  */
-#line 13995 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14003 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1981:
 
-/* Line 1806 of yacc.c  */
-#line 13997 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14005 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             (yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
@@ -36326,29 +36304,29 @@
 
   case 1982:
 
-/* Line 1806 of yacc.c  */
-#line 14007 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14015 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
     break;
 
   case 1983:
 
-/* Line 1806 of yacc.c  */
-#line 14008 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14016 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
     break;
 
   case 1984:
 
-/* Line 1806 of yacc.c  */
-#line 14009 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14017 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
     break;
 
   case 1985:
 
-/* Line 1806 of yacc.c  */
-#line 14014 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14022 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
@@ -36379,8 +36357,8 @@
 
   case 1986:
 
-/* Line 1806 of yacc.c  */
-#line 14041 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14049 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
@@ -36417,8 +36395,8 @@
 
   case 1987:
 
-/* Line 1806 of yacc.c  */
-#line 14074 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14082 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (!((yyval.lex_user)=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user))))
               MYSQL_YYABORT;
@@ -36433,2465 +36411,2465 @@
 
   case 1988:
 
-/* Line 1806 of yacc.c  */
-#line 14088 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14096 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1989:
 
-/* Line 1806 of yacc.c  */
-#line 14089 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14097 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1990:
 
-/* Line 1806 of yacc.c  */
-#line 14090 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14098 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1991:
 
-/* Line 1806 of yacc.c  */
-#line 14091 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14099 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1992:
 
-/* Line 1806 of yacc.c  */
-#line 14092 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14100 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1993:
 
-/* Line 1806 of yacc.c  */
-#line 14093 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14101 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1994:
 
-/* Line 1806 of yacc.c  */
-#line 14094 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14102 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1995:
 
-/* Line 1806 of yacc.c  */
-#line 14095 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14103 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1996:
 
-/* Line 1806 of yacc.c  */
-#line 14096 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14104 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1997:
 
-/* Line 1806 of yacc.c  */
-#line 14097 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14105 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1998:
 
-/* Line 1806 of yacc.c  */
-#line 14098 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14106 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 1999:
 
-/* Line 1806 of yacc.c  */
-#line 14099 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14107 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2000:
 
-/* Line 1806 of yacc.c  */
-#line 14100 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14108 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2001:
 
-/* Line 1806 of yacc.c  */
-#line 14101 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14109 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2002:
 
-/* Line 1806 of yacc.c  */
-#line 14102 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14110 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2003:
 
-/* Line 1806 of yacc.c  */
-#line 14103 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14111 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2004:
 
-/* Line 1806 of yacc.c  */
-#line 14104 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14112 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2005:
 
-/* Line 1806 of yacc.c  */
-#line 14105 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14113 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2006:
 
-/* Line 1806 of yacc.c  */
-#line 14106 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14114 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2007:
 
-/* Line 1806 of yacc.c  */
-#line 14107 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14115 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2008:
 
-/* Line 1806 of yacc.c  */
-#line 14108 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14116 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2009:
 
-/* Line 1806 of yacc.c  */
-#line 14109 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14117 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2010:
 
-/* Line 1806 of yacc.c  */
-#line 14110 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14118 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2011:
 
-/* Line 1806 of yacc.c  */
-#line 14111 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14119 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2012:
 
-/* Line 1806 of yacc.c  */
-#line 14112 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14120 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2013:
 
-/* Line 1806 of yacc.c  */
-#line 14113 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14121 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2014:
 
-/* Line 1806 of yacc.c  */
-#line 14114 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14122 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2015:
 
-/* Line 1806 of yacc.c  */
-#line 14115 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14123 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2016:
 
-/* Line 1806 of yacc.c  */
-#line 14116 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14124 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2017:
 
-/* Line 1806 of yacc.c  */
-#line 14117 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14125 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2018:
 
-/* Line 1806 of yacc.c  */
-#line 14118 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14126 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2019:
 
-/* Line 1806 of yacc.c  */
-#line 14119 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14127 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2020:
 
-/* Line 1806 of yacc.c  */
-#line 14120 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14128 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2021:
 
-/* Line 1806 of yacc.c  */
-#line 14121 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14129 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2022:
 
-/* Line 1806 of yacc.c  */
-#line 14122 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14130 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2023:
 
-/* Line 1806 of yacc.c  */
-#line 14123 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14131 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2024:
 
-/* Line 1806 of yacc.c  */
-#line 14124 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14132 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2025:
 
-/* Line 1806 of yacc.c  */
-#line 14125 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14133 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2026:
 
-/* Line 1806 of yacc.c  */
-#line 14126 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14134 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2027:
 
-/* Line 1806 of yacc.c  */
-#line 14127 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14135 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2028:
 
-/* Line 1806 of yacc.c  */
-#line 14128 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14136 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2029:
 
-/* Line 1806 of yacc.c  */
-#line 14129 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14137 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2030:
 
-/* Line 1806 of yacc.c  */
-#line 14130 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14138 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2031:
 
-/* Line 1806 of yacc.c  */
-#line 14131 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14139 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2032:
 
-/* Line 1806 of yacc.c  */
-#line 14132 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14140 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2033:
 
-/* Line 1806 of yacc.c  */
-#line 14133 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14141 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2034:
 
-/* Line 1806 of yacc.c  */
-#line 14134 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14142 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2035:
 
-/* Line 1806 of yacc.c  */
-#line 14135 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14143 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2036:
 
-/* Line 1806 of yacc.c  */
-#line 14136 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14144 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2037:
 
-/* Line 1806 of yacc.c  */
-#line 14137 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14145 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2038:
 
-/* Line 1806 of yacc.c  */
-#line 14147 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14155 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2039:
 
-/* Line 1806 of yacc.c  */
-#line 14148 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14156 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2040:
 
-/* Line 1806 of yacc.c  */
-#line 14149 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14157 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2041:
 
-/* Line 1806 of yacc.c  */
-#line 14150 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14158 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2042:
 
-/* Line 1806 of yacc.c  */
-#line 14151 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14159 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2043:
 
-/* Line 1806 of yacc.c  */
-#line 14152 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14160 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2044:
 
-/* Line 1806 of yacc.c  */
-#line 14153 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14161 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2045:
 
-/* Line 1806 of yacc.c  */
-#line 14154 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14162 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2046:
 
-/* Line 1806 of yacc.c  */
-#line 14155 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14163 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2047:
 
-/* Line 1806 of yacc.c  */
-#line 14156 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14164 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2048:
 
-/* Line 1806 of yacc.c  */
-#line 14157 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14165 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2049:
 
-/* Line 1806 of yacc.c  */
-#line 14158 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14166 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2050:
 
-/* Line 1806 of yacc.c  */
-#line 14159 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14167 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2051:
 
-/* Line 1806 of yacc.c  */
-#line 14160 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14168 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2052:
 
-/* Line 1806 of yacc.c  */
-#line 14161 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14169 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2053:
 
-/* Line 1806 of yacc.c  */
-#line 14162 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14170 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2054:
 
-/* Line 1806 of yacc.c  */
-#line 14163 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14171 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2055:
 
-/* Line 1806 of yacc.c  */
-#line 14164 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14172 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2056:
 
-/* Line 1806 of yacc.c  */
-#line 14165 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14173 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2057:
 
-/* Line 1806 of yacc.c  */
-#line 14166 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14174 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2058:
 
-/* Line 1806 of yacc.c  */
-#line 14167 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14175 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2059:
 
-/* Line 1806 of yacc.c  */
-#line 14168 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14176 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2060:
 
-/* Line 1806 of yacc.c  */
-#line 14169 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14177 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2061:
 
-/* Line 1806 of yacc.c  */
-#line 14170 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14178 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2062:
 
-/* Line 1806 of yacc.c  */
-#line 14171 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14179 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2063:
 
-/* Line 1806 of yacc.c  */
-#line 14172 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14180 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2064:
 
-/* Line 1806 of yacc.c  */
-#line 14173 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14181 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2065:
 
-/* Line 1806 of yacc.c  */
-#line 14174 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14182 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2066:
 
-/* Line 1806 of yacc.c  */
-#line 14175 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14183 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2067:
 
-/* Line 1806 of yacc.c  */
-#line 14176 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14184 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2068:
 
-/* Line 1806 of yacc.c  */
-#line 14177 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14185 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2069:
 
-/* Line 1806 of yacc.c  */
-#line 14178 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14186 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2070:
 
-/* Line 1806 of yacc.c  */
-#line 14179 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14187 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2071:
 
-/* Line 1806 of yacc.c  */
-#line 14180 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14188 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2072:
 
-/* Line 1806 of yacc.c  */
-#line 14181 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14189 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2073:
 
-/* Line 1806 of yacc.c  */
-#line 14182 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14190 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2074:
 
-/* Line 1806 of yacc.c  */
-#line 14183 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14191 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2075:
 
-/* Line 1806 of yacc.c  */
-#line 14184 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14192 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2076:
 
-/* Line 1806 of yacc.c  */
-#line 14185 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14193 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2077:
 
-/* Line 1806 of yacc.c  */
-#line 14186 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14194 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2078:
 
-/* Line 1806 of yacc.c  */
-#line 14187 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14195 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2079:
 
-/* Line 1806 of yacc.c  */
-#line 14188 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14196 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2080:
 
-/* Line 1806 of yacc.c  */
-#line 14189 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14197 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2081:
 
-/* Line 1806 of yacc.c  */
-#line 14190 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14198 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2082:
 
-/* Line 1806 of yacc.c  */
-#line 14191 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14199 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2083:
 
-/* Line 1806 of yacc.c  */
-#line 14196 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14204 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2084:
 
-/* Line 1806 of yacc.c  */
-#line 14197 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14205 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2085:
 
-/* Line 1806 of yacc.c  */
-#line 14198 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14206 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2086:
 
-/* Line 1806 of yacc.c  */
-#line 14199 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14207 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2087:
 
-/* Line 1806 of yacc.c  */
-#line 14200 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14208 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2088:
 
-/* Line 1806 of yacc.c  */
-#line 14201 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14209 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2089:
 
-/* Line 1806 of yacc.c  */
-#line 14202 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14210 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2090:
 
-/* Line 1806 of yacc.c  */
-#line 14203 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14211 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2091:
 
-/* Line 1806 of yacc.c  */
-#line 14204 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14212 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2092:
 
-/* Line 1806 of yacc.c  */
-#line 14205 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14213 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2093:
 
-/* Line 1806 of yacc.c  */
-#line 14206 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14214 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2094:
 
-/* Line 1806 of yacc.c  */
-#line 14207 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14215 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2095:
 
-/* Line 1806 of yacc.c  */
-#line 14208 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14216 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2096:
 
-/* Line 1806 of yacc.c  */
-#line 14209 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14217 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2097:
 
-/* Line 1806 of yacc.c  */
-#line 14210 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14218 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2098:
 
-/* Line 1806 of yacc.c  */
-#line 14211 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14219 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2099:
 
-/* Line 1806 of yacc.c  */
-#line 14212 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14220 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2100:
 
-/* Line 1806 of yacc.c  */
-#line 14213 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14221 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2101:
 
-/* Line 1806 of yacc.c  */
-#line 14214 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14222 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2102:
 
-/* Line 1806 of yacc.c  */
-#line 14215 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14223 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2103:
 
-/* Line 1806 of yacc.c  */
-#line 14216 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14224 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2104:
 
-/* Line 1806 of yacc.c  */
-#line 14217 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14225 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2105:
 
-/* Line 1806 of yacc.c  */
-#line 14218 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14226 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2106:
 
-/* Line 1806 of yacc.c  */
-#line 14219 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14227 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2107:
 
-/* Line 1806 of yacc.c  */
-#line 14220 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14228 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2108:
 
-/* Line 1806 of yacc.c  */
-#line 14221 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14229 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2109:
 
-/* Line 1806 of yacc.c  */
-#line 14222 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14230 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2110:
 
-/* Line 1806 of yacc.c  */
-#line 14223 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14231 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2111:
 
-/* Line 1806 of yacc.c  */
-#line 14224 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14232 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2112:
 
-/* Line 1806 of yacc.c  */
-#line 14225 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14233 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2113:
 
-/* Line 1806 of yacc.c  */
-#line 14226 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14234 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2114:
 
-/* Line 1806 of yacc.c  */
-#line 14227 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14235 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2115:
 
-/* Line 1806 of yacc.c  */
-#line 14228 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14236 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2116:
 
-/* Line 1806 of yacc.c  */
-#line 14229 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14237 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2117:
 
-/* Line 1806 of yacc.c  */
-#line 14230 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14238 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2118:
 
-/* Line 1806 of yacc.c  */
-#line 14231 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14239 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2119:
 
-/* Line 1806 of yacc.c  */
-#line 14232 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14240 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2120:
 
-/* Line 1806 of yacc.c  */
-#line 14233 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14241 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2121:
 
-/* Line 1806 of yacc.c  */
-#line 14234 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14242 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2122:
 
-/* Line 1806 of yacc.c  */
-#line 14235 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14243 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2123:
 
-/* Line 1806 of yacc.c  */
-#line 14236 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14244 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2124:
 
-/* Line 1806 of yacc.c  */
-#line 14237 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14245 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2125:
 
-/* Line 1806 of yacc.c  */
-#line 14238 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14246 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2126:
 
-/* Line 1806 of yacc.c  */
-#line 14239 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14247 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2127:
 
-/* Line 1806 of yacc.c  */
-#line 14240 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14248 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2128:
 
-/* Line 1806 of yacc.c  */
-#line 14241 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14249 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2129:
 
-/* Line 1806 of yacc.c  */
-#line 14242 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14250 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2130:
 
-/* Line 1806 of yacc.c  */
-#line 14243 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14251 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2131:
 
-/* Line 1806 of yacc.c  */
-#line 14244 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14252 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2132:
 
-/* Line 1806 of yacc.c  */
-#line 14245 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14253 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2133:
 
-/* Line 1806 of yacc.c  */
-#line 14246 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14254 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2134:
 
-/* Line 1806 of yacc.c  */
-#line 14247 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14255 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2135:
 
-/* Line 1806 of yacc.c  */
-#line 14248 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14256 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2136:
 
-/* Line 1806 of yacc.c  */
-#line 14249 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14257 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2137:
 
-/* Line 1806 of yacc.c  */
-#line 14250 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14258 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2138:
 
-/* Line 1806 of yacc.c  */
-#line 14251 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14259 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2139:
 
-/* Line 1806 of yacc.c  */
-#line 14252 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14260 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2140:
 
-/* Line 1806 of yacc.c  */
-#line 14253 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14261 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2141:
 
-/* Line 1806 of yacc.c  */
-#line 14254 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14262 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2142:
 
-/* Line 1806 of yacc.c  */
-#line 14255 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14263 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2143:
 
-/* Line 1806 of yacc.c  */
-#line 14256 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14264 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2144:
 
-/* Line 1806 of yacc.c  */
-#line 14257 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14265 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2145:
 
-/* Line 1806 of yacc.c  */
-#line 14258 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14266 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2146:
 
-/* Line 1806 of yacc.c  */
-#line 14259 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14267 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2147:
 
-/* Line 1806 of yacc.c  */
-#line 14260 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14268 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2148:
 
-/* Line 1806 of yacc.c  */
-#line 14261 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14269 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2149:
 
-/* Line 1806 of yacc.c  */
-#line 14262 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14270 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2150:
 
-/* Line 1806 of yacc.c  */
-#line 14263 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14271 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2151:
 
-/* Line 1806 of yacc.c  */
-#line 14264 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14272 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2152:
 
-/* Line 1806 of yacc.c  */
-#line 14265 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14273 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2153:
 
-/* Line 1806 of yacc.c  */
-#line 14266 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14274 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2154:
 
-/* Line 1806 of yacc.c  */
-#line 14267 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14275 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2155:
 
-/* Line 1806 of yacc.c  */
-#line 14268 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14276 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2156:
 
-/* Line 1806 of yacc.c  */
-#line 14269 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14277 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2157:
 
-/* Line 1806 of yacc.c  */
-#line 14270 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14278 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2158:
 
-/* Line 1806 of yacc.c  */
-#line 14271 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14279 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2159:
 
-/* Line 1806 of yacc.c  */
-#line 14272 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14280 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2160:
 
-/* Line 1806 of yacc.c  */
-#line 14273 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14281 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2161:
 
-/* Line 1806 of yacc.c  */
-#line 14274 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14282 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2162:
 
-/* Line 1806 of yacc.c  */
-#line 14275 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14283 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2163:
 
-/* Line 1806 of yacc.c  */
-#line 14276 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14284 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2164:
 
-/* Line 1806 of yacc.c  */
-#line 14277 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14285 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2165:
 
-/* Line 1806 of yacc.c  */
-#line 14278 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14286 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2166:
 
-/* Line 1806 of yacc.c  */
-#line 14279 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14287 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2167:
 
-/* Line 1806 of yacc.c  */
-#line 14280 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14288 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2168:
 
-/* Line 1806 of yacc.c  */
-#line 14281 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14289 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2169:
 
-/* Line 1806 of yacc.c  */
-#line 14282 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14290 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2170:
 
-/* Line 1806 of yacc.c  */
-#line 14283 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14291 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2171:
 
-/* Line 1806 of yacc.c  */
-#line 14284 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14292 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2172:
 
-/* Line 1806 of yacc.c  */
-#line 14285 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14293 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2173:
 
-/* Line 1806 of yacc.c  */
-#line 14286 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14294 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2174:
 
-/* Line 1806 of yacc.c  */
-#line 14287 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14295 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2175:
 
-/* Line 1806 of yacc.c  */
-#line 14288 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14296 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2176:
 
-/* Line 1806 of yacc.c  */
-#line 14289 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14297 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2177:
 
-/* Line 1806 of yacc.c  */
-#line 14290 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14298 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2178:
 
-/* Line 1806 of yacc.c  */
-#line 14291 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14299 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2179:
 
-/* Line 1806 of yacc.c  */
-#line 14292 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14300 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2180:
 
-/* Line 1806 of yacc.c  */
-#line 14293 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14301 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2181:
 
-/* Line 1806 of yacc.c  */
-#line 14294 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14302 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2182:
 
-/* Line 1806 of yacc.c  */
-#line 14295 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14303 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2183:
 
-/* Line 1806 of yacc.c  */
-#line 14296 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14304 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2184:
 
-/* Line 1806 of yacc.c  */
-#line 14297 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14305 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2185:
 
-/* Line 1806 of yacc.c  */
-#line 14298 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14306 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2186:
 
-/* Line 1806 of yacc.c  */
-#line 14299 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14307 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2187:
 
-/* Line 1806 of yacc.c  */
-#line 14300 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14308 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2188:
 
-/* Line 1806 of yacc.c  */
-#line 14301 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14309 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2189:
 
-/* Line 1806 of yacc.c  */
-#line 14302 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14310 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2190:
 
-/* Line 1806 of yacc.c  */
-#line 14303 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14311 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2191:
 
-/* Line 1806 of yacc.c  */
-#line 14304 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14312 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2192:
 
-/* Line 1806 of yacc.c  */
-#line 14305 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14313 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2193:
 
-/* Line 1806 of yacc.c  */
-#line 14306 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14314 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2194:
 
-/* Line 1806 of yacc.c  */
-#line 14307 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14315 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2195:
 
-/* Line 1806 of yacc.c  */
-#line 14308 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14316 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2196:
 
-/* Line 1806 of yacc.c  */
-#line 14309 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14317 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2197:
 
-/* Line 1806 of yacc.c  */
-#line 14310 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14318 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2198:
 
-/* Line 1806 of yacc.c  */
-#line 14311 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14319 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2199:
 
-/* Line 1806 of yacc.c  */
-#line 14312 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14320 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2200:
 
-/* Line 1806 of yacc.c  */
-#line 14313 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14321 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2201:
 
-/* Line 1806 of yacc.c  */
-#line 14314 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14322 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2202:
 
-/* Line 1806 of yacc.c  */
-#line 14315 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14323 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2203:
 
-/* Line 1806 of yacc.c  */
-#line 14316 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14324 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2204:
 
-/* Line 1806 of yacc.c  */
-#line 14317 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14325 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2205:
 
-/* Line 1806 of yacc.c  */
-#line 14318 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14326 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2206:
 
-/* Line 1806 of yacc.c  */
-#line 14319 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14327 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2207:
 
-/* Line 1806 of yacc.c  */
-#line 14320 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14328 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2208:
 
-/* Line 1806 of yacc.c  */
-#line 14321 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14329 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2209:
 
-/* Line 1806 of yacc.c  */
-#line 14322 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14330 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2210:
 
-/* Line 1806 of yacc.c  */
-#line 14323 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14331 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2211:
 
-/* Line 1806 of yacc.c  */
-#line 14324 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14332 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2212:
 
-/* Line 1806 of yacc.c  */
-#line 14325 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14333 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2213:
 
-/* Line 1806 of yacc.c  */
-#line 14326 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14334 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2214:
 
-/* Line 1806 of yacc.c  */
-#line 14327 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14335 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2215:
 
-/* Line 1806 of yacc.c  */
-#line 14328 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14336 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2216:
 
-/* Line 1806 of yacc.c  */
-#line 14329 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14337 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2217:
 
-/* Line 1806 of yacc.c  */
-#line 14330 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14338 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2218:
 
-/* Line 1806 of yacc.c  */
-#line 14331 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14339 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2219:
 
-/* Line 1806 of yacc.c  */
-#line 14332 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14340 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2220:
 
-/* Line 1806 of yacc.c  */
-#line 14333 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14341 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2221:
 
-/* Line 1806 of yacc.c  */
-#line 14334 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14342 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2222:
 
-/* Line 1806 of yacc.c  */
-#line 14335 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14343 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2223:
 
-/* Line 1806 of yacc.c  */
-#line 14336 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14344 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2224:
 
-/* Line 1806 of yacc.c  */
-#line 14337 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14345 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2225:
 
-/* Line 1806 of yacc.c  */
-#line 14338 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14346 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2226:
 
-/* Line 1806 of yacc.c  */
-#line 14339 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14347 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2227:
 
-/* Line 1806 of yacc.c  */
-#line 14340 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14348 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2228:
 
-/* Line 1806 of yacc.c  */
-#line 14341 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14349 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2229:
 
-/* Line 1806 of yacc.c  */
-#line 14342 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14350 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2230:
 
-/* Line 1806 of yacc.c  */
-#line 14343 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14351 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2231:
 
-/* Line 1806 of yacc.c  */
-#line 14344 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14352 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2232:
 
-/* Line 1806 of yacc.c  */
-#line 14345 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14353 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2233:
 
-/* Line 1806 of yacc.c  */
-#line 14346 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14354 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2234:
 
-/* Line 1806 of yacc.c  */
-#line 14347 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14355 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2235:
 
-/* Line 1806 of yacc.c  */
-#line 14348 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14356 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2236:
 
-/* Line 1806 of yacc.c  */
-#line 14349 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14357 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2237:
 
-/* Line 1806 of yacc.c  */
-#line 14350 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14358 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2238:
 
-/* Line 1806 of yacc.c  */
-#line 14351 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14359 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2239:
 
-/* Line 1806 of yacc.c  */
-#line 14352 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14360 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2240:
 
-/* Line 1806 of yacc.c  */
-#line 14353 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14361 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2241:
 
-/* Line 1806 of yacc.c  */
-#line 14354 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14362 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2242:
 
-/* Line 1806 of yacc.c  */
-#line 14355 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14363 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2243:
 
-/* Line 1806 of yacc.c  */
-#line 14356 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14364 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2244:
 
-/* Line 1806 of yacc.c  */
-#line 14357 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14365 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2245:
 
-/* Line 1806 of yacc.c  */
-#line 14358 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14366 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2246:
 
-/* Line 1806 of yacc.c  */
-#line 14359 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14367 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2247:
 
-/* Line 1806 of yacc.c  */
-#line 14360 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14368 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2248:
 
-/* Line 1806 of yacc.c  */
-#line 14361 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14369 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2249:
 
-/* Line 1806 of yacc.c  */
-#line 14362 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14370 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2250:
 
-/* Line 1806 of yacc.c  */
-#line 14363 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14371 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2251:
 
-/* Line 1806 of yacc.c  */
-#line 14364 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14372 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2252:
 
-/* Line 1806 of yacc.c  */
-#line 14365 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14373 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2253:
 
-/* Line 1806 of yacc.c  */
-#line 14366 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14374 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2254:
 
-/* Line 1806 of yacc.c  */
-#line 14367 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14375 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2255:
 
-/* Line 1806 of yacc.c  */
-#line 14368 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14376 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2256:
 
-/* Line 1806 of yacc.c  */
-#line 14369 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14377 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2257:
 
-/* Line 1806 of yacc.c  */
-#line 14370 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14378 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2258:
 
-/* Line 1806 of yacc.c  */
-#line 14371 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14379 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2259:
 
-/* Line 1806 of yacc.c  */
-#line 14372 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14380 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2260:
 
-/* Line 1806 of yacc.c  */
-#line 14373 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14381 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2261:
 
-/* Line 1806 of yacc.c  */
-#line 14374 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14382 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2262:
 
-/* Line 1806 of yacc.c  */
-#line 14375 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14383 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2263:
 
-/* Line 1806 of yacc.c  */
-#line 14376 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14384 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2264:
 
-/* Line 1806 of yacc.c  */
-#line 14377 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14385 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2265:
 
-/* Line 1806 of yacc.c  */
-#line 14378 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14386 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2266:
 
-/* Line 1806 of yacc.c  */
-#line 14379 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14387 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2267:
 
-/* Line 1806 of yacc.c  */
-#line 14380 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14388 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2268:
 
-/* Line 1806 of yacc.c  */
-#line 14381 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14389 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2269:
 
-/* Line 1806 of yacc.c  */
-#line 14382 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14390 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2270:
 
-/* Line 1806 of yacc.c  */
-#line 14383 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14391 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2271:
 
-/* Line 1806 of yacc.c  */
-#line 14384 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14392 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2272:
 
-/* Line 1806 of yacc.c  */
-#line 14385 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14393 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2273:
 
-/* Line 1806 of yacc.c  */
-#line 14386 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14394 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2274:
 
-/* Line 1806 of yacc.c  */
-#line 14387 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14395 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2275:
 
-/* Line 1806 of yacc.c  */
-#line 14388 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14396 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2276:
 
-/* Line 1806 of yacc.c  */
-#line 14389 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14397 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2277:
 
-/* Line 1806 of yacc.c  */
-#line 14390 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14398 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2278:
 
-/* Line 1806 of yacc.c  */
-#line 14391 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14399 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2279:
 
-/* Line 1806 of yacc.c  */
-#line 14392 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14400 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2280:
 
-/* Line 1806 of yacc.c  */
-#line 14393 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14401 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2281:
 
-/* Line 1806 of yacc.c  */
-#line 14394 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14402 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2282:
 
-/* Line 1806 of yacc.c  */
-#line 14395 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14403 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2283:
 
-/* Line 1806 of yacc.c  */
-#line 14396 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14404 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2284:
 
-/* Line 1806 of yacc.c  */
-#line 14397 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14405 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2285:
 
-/* Line 1806 of yacc.c  */
-#line 14398 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14406 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2286:
 
-/* Line 1806 of yacc.c  */
-#line 14399 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14407 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2287:
 
-/* Line 1806 of yacc.c  */
-#line 14400 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14408 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2288:
 
-/* Line 1806 of yacc.c  */
-#line 14401 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14409 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2289:
 
-/* Line 1806 of yacc.c  */
-#line 14402 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14410 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2290:
 
-/* Line 1806 of yacc.c  */
-#line 14403 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14411 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2291:
 
-/* Line 1806 of yacc.c  */
-#line 14404 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14412 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2292:
 
-/* Line 1806 of yacc.c  */
-#line 14405 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14413 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2293:
 
-/* Line 1806 of yacc.c  */
-#line 14406 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14414 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2294:
 
-/* Line 1806 of yacc.c  */
-#line 14407 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14415 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2295:
 
-/* Line 1806 of yacc.c  */
-#line 14408 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14416 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2296:
 
-/* Line 1806 of yacc.c  */
-#line 14409 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14417 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2297:
 
-/* Line 1806 of yacc.c  */
-#line 14410 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14418 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2298:
 
-/* Line 1806 of yacc.c  */
-#line 14411 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14419 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2299:
 
-/* Line 1806 of yacc.c  */
-#line 14412 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14420 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2300:
 
-/* Line 1806 of yacc.c  */
-#line 14413 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14421 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2301:
 
-/* Line 1806 of yacc.c  */
-#line 14414 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14422 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2302:
 
-/* Line 1806 of yacc.c  */
-#line 14415 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14423 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2303:
 
-/* Line 1806 of yacc.c  */
-#line 14416 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14424 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2304:
 
-/* Line 1806 of yacc.c  */
-#line 14417 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14425 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2305:
 
-/* Line 1806 of yacc.c  */
-#line 14418 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14426 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2306:
 
-/* Line 1806 of yacc.c  */
-#line 14419 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14427 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2307:
 
-/* Line 1806 of yacc.c  */
-#line 14420 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14428 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2308:
 
-/* Line 1806 of yacc.c  */
-#line 14421 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14429 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2309:
 
-/* Line 1806 of yacc.c  */
-#line 14422 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14430 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2310:
 
-/* Line 1806 of yacc.c  */
-#line 14423 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14431 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2311:
 
-/* Line 1806 of yacc.c  */
-#line 14424 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14432 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2312:
 
-/* Line 1806 of yacc.c  */
-#line 14425 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14433 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2313:
 
-/* Line 1806 of yacc.c  */
-#line 14426 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14434 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2314:
 
-/* Line 1806 of yacc.c  */
-#line 14427 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14435 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2315:
 
-/* Line 1806 of yacc.c  */
-#line 14428 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14436 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2316:
 
-/* Line 1806 of yacc.c  */
-#line 14429 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14437 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2317:
 
-/* Line 1806 of yacc.c  */
-#line 14430 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14438 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2318:
 
-/* Line 1806 of yacc.c  */
-#line 14431 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14439 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2319:
 
-/* Line 1806 of yacc.c  */
-#line 14432 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14440 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2320:
 
-/* Line 1806 of yacc.c  */
-#line 14433 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14441 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2321:
 
-/* Line 1806 of yacc.c  */
-#line 14434 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14442 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2322:
 
-/* Line 1806 of yacc.c  */
-#line 14435 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14443 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2323:
 
-/* Line 1806 of yacc.c  */
-#line 14436 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14444 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2324:
 
-/* Line 1806 of yacc.c  */
-#line 14437 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14445 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2325:
 
-/* Line 1806 of yacc.c  */
-#line 14438 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14446 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2326:
 
-/* Line 1806 of yacc.c  */
-#line 14439 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14447 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2327:
 
-/* Line 1806 of yacc.c  */
-#line 14440 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14448 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2328:
 
-/* Line 1806 of yacc.c  */
-#line 14441 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14449 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2329:
 
-/* Line 1806 of yacc.c  */
-#line 14442 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14450 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2330:
 
-/* Line 1806 of yacc.c  */
-#line 14443 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14451 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2331:
 
-/* Line 1806 of yacc.c  */
-#line 14444 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14452 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2332:
 
-/* Line 1806 of yacc.c  */
-#line 14445 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14453 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2333:
 
-/* Line 1806 of yacc.c  */
-#line 14446 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14454 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2334:
 
-/* Line 1806 of yacc.c  */
-#line 14447 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14455 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2335:
 
-/* Line 1806 of yacc.c  */
-#line 14448 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14456 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2336:
 
-/* Line 1806 of yacc.c  */
-#line 14449 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14457 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2337:
 
-/* Line 1806 of yacc.c  */
-#line 14450 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14458 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2338:
 
-/* Line 1806 of yacc.c  */
-#line 14451 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14459 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2339:
 
-/* Line 1806 of yacc.c  */
-#line 14463 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14471 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             mysql_init_select(lex);
@@ -38907,15 +38885,15 @@
 
   case 2340:
 
-/* Line 1806 of yacc.c  */
-#line 14475 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14483 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2341:
 
-/* Line 1806 of yacc.c  */
-#line 14482 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14490 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
               MYSQL_YYABORT;
@@ -38924,8 +38902,8 @@
 
   case 2343:
 
-/* Line 1806 of yacc.c  */
-#line 14488 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14496 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->option_type= OPT_DEFAULT;
           }
@@ -38933,8 +38911,8 @@
 
   case 2344:
 
-/* Line 1806 of yacc.c  */
-#line 14492 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14500 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
               MYSQL_YYABORT;
@@ -38943,8 +38921,8 @@
 
   case 2345:
 
-/* Line 1806 of yacc.c  */
-#line 14497 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14505 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->option_type= (yyvsp[(1) - (1)].var_type);
           }
@@ -38952,8 +38930,8 @@
 
   case 2347:
 
-/* Line 1806 of yacc.c  */
-#line 14507 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14515 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
               MYSQL_YYABORT; 
@@ -38962,8 +38940,8 @@
 
   case 2349:
 
-/* Line 1806 of yacc.c  */
-#line 14513 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14521 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
               MYSQL_YYABORT; 
@@ -38972,8 +38950,8 @@
 
   case 2352:
 
-/* Line 1806 of yacc.c  */
-#line 14527 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14535 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             sp_create_assignment_lex(YYTHD, YY_TOKEN_START);
           }
@@ -38981,8 +38959,8 @@
 
   case 2353:
 
-/* Line 1806 of yacc.c  */
-#line 14531 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14539 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
               MYSQL_YYABORT; 
@@ -38991,8 +38969,8 @@
 
   case 2354:
 
-/* Line 1806 of yacc.c  */
-#line 14536 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14544 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             sp_create_assignment_lex(YYTHD, YY_TOKEN_START);
           }
@@ -39000,8 +38978,8 @@
 
   case 2355:
 
-/* Line 1806 of yacc.c  */
-#line 14540 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14548 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
               MYSQL_YYABORT; 
@@ -39010,8 +38988,8 @@
 
   case 2356:
 
-/* Line 1806 of yacc.c  */
-#line 14549 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14557 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->option_type= (yyvsp[(1) - (1)].var_type);
           }
@@ -39019,85 +38997,85 @@
 
   case 2359:
 
-/* Line 1806 of yacc.c  */
-#line 14557 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14565 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_GLOBAL; }
     break;
 
   case 2360:
 
-/* Line 1806 of yacc.c  */
-#line 14558 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14566 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2361:
 
-/* Line 1806 of yacc.c  */
-#line 14559 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14567 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2362:
 
-/* Line 1806 of yacc.c  */
-#line 14563 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14571 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2363:
 
-/* Line 1806 of yacc.c  */
-#line 14564 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14572 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_GLOBAL; }
     break;
 
   case 2364:
 
-/* Line 1806 of yacc.c  */
-#line 14565 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14573 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2365:
 
-/* Line 1806 of yacc.c  */
-#line 14566 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14574 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2366:
 
-/* Line 1806 of yacc.c  */
-#line 14570 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14578 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_DEFAULT; }
     break;
 
   case 2367:
 
-/* Line 1806 of yacc.c  */
-#line 14571 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14579 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_GLOBAL; }
     break;
 
   case 2368:
 
-/* Line 1806 of yacc.c  */
-#line 14572 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14580 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2369:
 
-/* Line 1806 of yacc.c  */
-#line 14573 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14581 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2370:
 
-/* Line 1806 of yacc.c  */
-#line 14579 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14587 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -39122,8 +39100,8 @@
 
   case 2371:
 
-/* Line 1806 of yacc.c  */
-#line 14604 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14612 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             sp_head *sp= Lex->sphead;
 
@@ -39134,8 +39112,8 @@
 
   case 2372:
 
-/* Line 1806 of yacc.c  */
-#line 14611 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14619 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -39232,8 +39210,8 @@
 
   case 2373:
 
-/* Line 1806 of yacc.c  */
-#line 14704 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14712 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Item_func_set_user_var *item;
             item= new (YYTHD->mem_root) Item_func_set_user_var((yyvsp[(2) - (4)].lex_str), (yyvsp[(4) - (4)].item), false);
@@ -39248,8 +39226,8 @@
 
   case 2374:
 
-/* Line 1806 of yacc.c  */
-#line 14715 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14723 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             struct sys_var_with_base tmp= (yyvsp[(4) - (6)].variable);
@@ -39266,8 +39244,8 @@
 
   case 2375:
 
-/* Line 1806 of yacc.c  */
-#line 14728 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14736 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -39287,8 +39265,8 @@
 
   case 2376:
 
-/* Line 1806 of yacc.c  */
-#line 14744 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14752 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
@@ -39305,8 +39283,8 @@
 
   case 2377:
 
-/* Line 1806 of yacc.c  */
-#line 14757 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14765 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             const CHARSET_INFO *cs2;
@@ -39332,8 +39310,8 @@
 
   case 2378:
 
-/* Line 1806 of yacc.c  */
-#line 14779 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14787 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -39372,8 +39350,8 @@
 
   case 2379:
 
-/* Line 1806 of yacc.c  */
-#line 14814 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14822 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX_USER *user= (yyvsp[(3) - (5)].lex_user);
             LEX *lex= Lex;
@@ -39416,8 +39394,8 @@
 
   case 2380:
 
-/* Line 1806 of yacc.c  */
-#line 14856 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14864 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -39449,8 +39427,8 @@
 
   case 2381:
 
-/* Line 1806 of yacc.c  */
-#line 14884 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14892 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -39500,8 +39478,8 @@
 
   case 2382:
 
-/* Line 1806 of yacc.c  */
-#line 14930 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14938 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             sys_var *tmp=find_sys_var(YYTHD, (yyvsp[(3) - (3)].lex_str).str, (yyvsp[(3) - (3)].lex_str).length);
             if (!tmp)
@@ -39516,8 +39494,8 @@
 
   case 2387:
 
-/* Line 1806 of yacc.c  */
-#line 14951 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14959 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex=Lex;
@@ -39536,8 +39514,8 @@
 
   case 2388:
 
-/* Line 1806 of yacc.c  */
-#line 14969 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14977 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex=Lex;
@@ -39556,57 +39534,57 @@
 
   case 2389:
 
-/* Line 1806 of yacc.c  */
-#line 14986 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14994 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= true; }
     break;
 
   case 2390:
 
-/* Line 1806 of yacc.c  */
-#line 14987 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14995 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= false; }
     break;
 
   case 2391:
 
-/* Line 1806 of yacc.c  */
-#line 14991 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 14999 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.tx_isolation)= ISO_READ_UNCOMMITTED; }
     break;
 
   case 2392:
 
-/* Line 1806 of yacc.c  */
-#line 14992 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15000 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.tx_isolation)= ISO_READ_COMMITTED; }
     break;
 
   case 2393:
 
-/* Line 1806 of yacc.c  */
-#line 14993 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15001 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.tx_isolation)= ISO_REPEATABLE_READ; }
     break;
 
   case 2394:
 
-/* Line 1806 of yacc.c  */
-#line 14994 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15002 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.tx_isolation)= ISO_SERIALIZABLE; }
     break;
 
   case 2395:
 
-/* Line 1806 of yacc.c  */
-#line 14998 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15006 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.simple_string)=(yyvsp[(1) - (1)].lex_str).str;}
     break;
 
   case 2396:
 
-/* Line 1806 of yacc.c  */
-#line 15000 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15008 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if ((yyvsp[(3) - (4)].lex_str).length == 0)
              (yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).str;
@@ -39628,9 +39606,10 @@
 
   case 2397:
 
-/* Line 1806 of yacc.c  */
-#line 15018 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15026 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
+		    WARN_DEPRECATED(YYTHD, "OLD_PASSWORD", "PASSWORD");
             (yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? Item_func_old_password::
               alloc(YYTHD, (yyvsp[(3) - (4)].lex_str).str, (yyvsp[(3) - (4)].lex_str).length) :
               (yyvsp[(3) - (4)].lex_str).str;
@@ -39642,22 +39621,22 @@
 
   case 2398:
 
-/* Line 1806 of yacc.c  */
-#line 15030 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15039 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 2399:
 
-/* Line 1806 of yacc.c  */
-#line 15031 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15040 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.item)=0; }
     break;
 
   case 2400:
 
-/* Line 1806 of yacc.c  */
-#line 15033 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15042 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)=new (YYTHD->mem_root) Item_string("ON",  2, system_charset_info);
             if ((yyval.item) == NULL)
@@ -39667,8 +39646,8 @@
 
   case 2401:
 
-/* Line 1806 of yacc.c  */
-#line 15039 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15048 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info);
             if ((yyval.item) == NULL)
@@ -39678,8 +39657,8 @@
 
   case 2402:
 
-/* Line 1806 of yacc.c  */
-#line 15045 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15054 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.item)=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info);
             if ((yyval.item) == NULL)
@@ -39689,8 +39668,8 @@
 
   case 2403:
 
-/* Line 1806 of yacc.c  */
-#line 15056 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15065 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -39705,15 +39684,15 @@
 
   case 2404:
 
-/* Line 1806 of yacc.c  */
-#line 15067 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15076 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2409:
 
-/* Line 1806 of yacc.c  */
-#line 15082 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15091 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             thr_lock_type lock_type= (thr_lock_type) (yyvsp[(3) - (3)].num);
             bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE);
@@ -39727,22 +39706,22 @@
 
   case 2410:
 
-/* Line 1806 of yacc.c  */
-#line 15094 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15103 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= TL_READ_NO_INSERT; }
     break;
 
   case 2411:
 
-/* Line 1806 of yacc.c  */
-#line 15095 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15104 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= TL_WRITE_DEFAULT; }
     break;
 
   case 2412:
 
-/* Line 1806 of yacc.c  */
-#line 15097 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15106 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             (yyval.num)= TL_WRITE_LOW_PRIORITY; 
             WARN_DEPRECATED(YYTHD, "LOW_PRIORITY WRITE", "WRITE");
@@ -39751,15 +39730,15 @@
 
   case 2413:
 
-/* Line 1806 of yacc.c  */
-#line 15101 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15110 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= TL_READ; }
     break;
 
   case 2414:
 
-/* Line 1806 of yacc.c  */
-#line 15106 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15115 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -39774,15 +39753,15 @@
 
   case 2415:
 
-/* Line 1806 of yacc.c  */
-#line 15117 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15126 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2416:
 
-/* Line 1806 of yacc.c  */
-#line 15126 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15135 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -39802,8 +39781,8 @@
 
   case 2417:
 
-/* Line 1806 of yacc.c  */
-#line 15142 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15151 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -39823,8 +39802,8 @@
 
   case 2418:
 
-/* Line 1806 of yacc.c  */
-#line 15158 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15167 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->sphead)
@@ -39846,8 +39825,8 @@
 
   case 2419:
 
-/* Line 1806 of yacc.c  */
-#line 15176 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15185 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -39869,64 +39848,64 @@
 
   case 2420:
 
-/* Line 1806 of yacc.c  */
-#line 15196 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15205 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->ident= null_lex_str; (yyval.ha_read_mode)=(yyvsp[(1) - (1)].ha_read_mode); }
     break;
 
   case 2421:
 
-/* Line 1806 of yacc.c  */
-#line 15197 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15206 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->ident= (yyvsp[(1) - (2)].lex_str); (yyval.ha_read_mode)=(yyvsp[(2) - (2)].ha_read_mode); }
     break;
 
   case 2422:
 
-/* Line 1806 of yacc.c  */
-#line 15201 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15210 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_read_mode)= RFIRST; }
     break;
 
   case 2423:
 
-/* Line 1806 of yacc.c  */
-#line 15202 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15211 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_read_mode)= RNEXT;  }
     break;
 
   case 2424:
 
-/* Line 1806 of yacc.c  */
-#line 15206 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15215 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_read_mode)= RFIRST; }
     break;
 
   case 2425:
 
-/* Line 1806 of yacc.c  */
-#line 15207 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15216 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_read_mode)= RNEXT;  }
     break;
 
   case 2426:
 
-/* Line 1806 of yacc.c  */
-#line 15208 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15217 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_read_mode)= RPREV;  }
     break;
 
   case 2427:
 
-/* Line 1806 of yacc.c  */
-#line 15209 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15218 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_read_mode)= RLAST;  }
     break;
 
   case 2428:
 
-/* Line 1806 of yacc.c  */
-#line 15211 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15220 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             YYTHD->m_parser_state->m_yacc.m_ha_rkey_mode= (yyvsp[(1) - (1)].ha_rkey_mode);
             Lex->insert_list= new List_item;
@@ -39937,8 +39916,8 @@
 
   case 2429:
 
-/* Line 1806 of yacc.c  */
-#line 15218 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15227 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.ha_read_mode)= RKEY;
           }
@@ -39946,57 +39925,57 @@
 
   case 2430:
 
-/* Line 1806 of yacc.c  */
-#line 15224 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15233 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_KEY_EXACT;   }
     break;
 
   case 2431:
 
-/* Line 1806 of yacc.c  */
-#line 15225 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15234 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_NEXT; }
     break;
 
   case 2432:
 
-/* Line 1806 of yacc.c  */
-#line 15226 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15235 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_PREV; }
     break;
 
   case 2433:
 
-/* Line 1806 of yacc.c  */
-#line 15227 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15236 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_AFTER_KEY;   }
     break;
 
   case 2434:
 
-/* Line 1806 of yacc.c  */
-#line 15228 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15237 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_BEFORE_KEY;  }
     break;
 
   case 2435:
 
-/* Line 1806 of yacc.c  */
-#line 15234 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15243 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_REVOKE; }
     break;
 
   case 2436:
 
-/* Line 1806 of yacc.c  */
-#line 15235 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15244 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2437:
 
-/* Line 1806 of yacc.c  */
-#line 15240 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15249 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->type= 0;
@@ -40005,8 +39984,8 @@
 
   case 2438:
 
-/* Line 1806 of yacc.c  */
-#line 15245 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15254 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->columns.elements)
@@ -40020,8 +39999,8 @@
 
   case 2439:
 
-/* Line 1806 of yacc.c  */
-#line 15255 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15264 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->columns.elements)
@@ -40035,8 +40014,8 @@
 
   case 2440:
 
-/* Line 1806 of yacc.c  */
-#line 15265 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15274 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_REVOKE_ALL;
           }
@@ -40044,8 +40023,8 @@
 
   case 2441:
 
-/* Line 1806 of yacc.c  */
-#line 15269 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15278 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->users_list.push_front ((yyvsp[(3) - (5)].lex_user));
@@ -40055,22 +40034,22 @@
 
   case 2442:
 
-/* Line 1806 of yacc.c  */
-#line 15277 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15286 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_GRANT; }
     break;
 
   case 2443:
 
-/* Line 1806 of yacc.c  */
-#line 15278 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15287 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2444:
 
-/* Line 1806 of yacc.c  */
-#line 15284 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15293 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->type= 0;
@@ -40079,8 +40058,8 @@
 
   case 2445:
 
-/* Line 1806 of yacc.c  */
-#line 15290 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15299 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->columns.elements)
@@ -40094,8 +40073,8 @@
 
   case 2446:
 
-/* Line 1806 of yacc.c  */
-#line 15301 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15310 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->columns.elements)
@@ -40109,8 +40088,8 @@
 
   case 2447:
 
-/* Line 1806 of yacc.c  */
-#line 15311 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15320 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->users_list.push_front ((yyvsp[(3) - (6)].lex_user));
@@ -40120,8 +40099,8 @@
 
   case 2450:
 
-/* Line 1806 of yacc.c  */
-#line 15325 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15334 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->grant == GLOBAL_ACLS &&
@@ -40132,8 +40111,8 @@
 
   case 2451:
 
-/* Line 1806 of yacc.c  */
-#line 15332 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15341 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             Lex->all_privileges= 1; 
             Lex->grant= GLOBAL_ACLS;
@@ -40142,260 +40121,260 @@
 
   case 2456:
 
-/* Line 1806 of yacc.c  */
-#line 15350 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15359 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->which_columns = SELECT_ACL;}
     break;
 
   case 2457:
 
-/* Line 1806 of yacc.c  */
-#line 15351 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15360 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2458:
 
-/* Line 1806 of yacc.c  */
-#line 15353 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15362 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->which_columns = INSERT_ACL;}
     break;
 
   case 2459:
 
-/* Line 1806 of yacc.c  */
-#line 15354 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15363 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2460:
 
-/* Line 1806 of yacc.c  */
-#line 15356 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15365 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->which_columns = UPDATE_ACL; }
     break;
 
   case 2461:
 
-/* Line 1806 of yacc.c  */
-#line 15357 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15366 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2462:
 
-/* Line 1806 of yacc.c  */
-#line 15359 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15368 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->which_columns = REFERENCES_ACL;}
     break;
 
   case 2463:
 
-/* Line 1806 of yacc.c  */
-#line 15360 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15369 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2464:
 
-/* Line 1806 of yacc.c  */
-#line 15361 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15370 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= DELETE_ACL;}
     break;
 
   case 2465:
 
-/* Line 1806 of yacc.c  */
-#line 15362 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15371 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2466:
 
-/* Line 1806 of yacc.c  */
-#line 15363 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15372 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= INDEX_ACL;}
     break;
 
   case 2467:
 
-/* Line 1806 of yacc.c  */
-#line 15364 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15373 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= ALTER_ACL;}
     break;
 
   case 2468:
 
-/* Line 1806 of yacc.c  */
-#line 15365 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15374 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_ACL;}
     break;
 
   case 2469:
 
-/* Line 1806 of yacc.c  */
-#line 15366 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15375 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= DROP_ACL;}
     break;
 
   case 2470:
 
-/* Line 1806 of yacc.c  */
-#line 15367 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15376 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= EXECUTE_ACL;}
     break;
 
   case 2471:
 
-/* Line 1806 of yacc.c  */
-#line 15368 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15377 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= RELOAD_ACL;}
     break;
 
   case 2472:
 
-/* Line 1806 of yacc.c  */
-#line 15369 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15378 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= SHUTDOWN_ACL;}
     break;
 
   case 2473:
 
-/* Line 1806 of yacc.c  */
-#line 15370 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15379 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= PROCESS_ACL;}
     break;
 
   case 2474:
 
-/* Line 1806 of yacc.c  */
-#line 15371 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15380 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= FILE_ACL;}
     break;
 
   case 2475:
 
-/* Line 1806 of yacc.c  */
-#line 15372 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15381 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= GRANT_ACL;}
     break;
 
   case 2476:
 
-/* Line 1806 of yacc.c  */
-#line 15373 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15382 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= SHOW_DB_ACL;}
     break;
 
   case 2477:
 
-/* Line 1806 of yacc.c  */
-#line 15374 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15383 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= SUPER_ACL;}
     break;
 
   case 2478:
 
-/* Line 1806 of yacc.c  */
-#line 15375 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15384 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_TMP_ACL;}
     break;
 
   case 2479:
 
-/* Line 1806 of yacc.c  */
-#line 15376 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15385 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= LOCK_TABLES_ACL; }
     break;
 
   case 2480:
 
-/* Line 1806 of yacc.c  */
-#line 15377 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15386 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= REPL_SLAVE_ACL; }
     break;
 
   case 2481:
 
-/* Line 1806 of yacc.c  */
-#line 15378 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15387 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= REPL_CLIENT_ACL; }
     break;
 
   case 2482:
 
-/* Line 1806 of yacc.c  */
-#line 15379 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15388 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_VIEW_ACL; }
     break;
 
   case 2483:
 
-/* Line 1806 of yacc.c  */
-#line 15380 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15389 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= SHOW_VIEW_ACL; }
     break;
 
   case 2484:
 
-/* Line 1806 of yacc.c  */
-#line 15381 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15390 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_PROC_ACL; }
     break;
 
   case 2485:
 
-/* Line 1806 of yacc.c  */
-#line 15382 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15391 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= ALTER_PROC_ACL; }
     break;
 
   case 2486:
 
-/* Line 1806 of yacc.c  */
-#line 15383 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15392 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_USER_ACL; }
     break;
 
   case 2487:
 
-/* Line 1806 of yacc.c  */
-#line 15384 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15393 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= EVENT_ACL;}
     break;
 
   case 2488:
 
-/* Line 1806 of yacc.c  */
-#line 15385 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15394 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= TRIGGER_ACL; }
     break;
 
   case 2489:
 
-/* Line 1806 of yacc.c  */
-#line 15386 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15395 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_TABLESPACE_ACL; }
     break;
 
   case 2490:
 
-/* Line 1806 of yacc.c  */
-#line 15390 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15399 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2491:
 
-/* Line 1806 of yacc.c  */
-#line 15391 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15400 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2494:
 
-/* Line 1806 of yacc.c  */
-#line 15401 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15410 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->x509_subject)
@@ -40409,8 +40388,8 @@
 
   case 2495:
 
-/* Line 1806 of yacc.c  */
-#line 15411 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15420 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->x509_issuer)
@@ -40424,8 +40403,8 @@
 
   case 2496:
 
-/* Line 1806 of yacc.c  */
-#line 15421 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15430 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->ssl_cipher)
@@ -40439,8 +40418,8 @@
 
   case 2497:
 
-/* Line 1806 of yacc.c  */
-#line 15434 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15443 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             size_t dummy;
@@ -40459,8 +40438,8 @@
 
   case 2498:
 
-/* Line 1806 of yacc.c  */
-#line 15449 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15458 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->current_select->db = (yyvsp[(1) - (3)].lex_str).str;
@@ -40477,8 +40456,8 @@
 
   case 2499:
 
-/* Line 1806 of yacc.c  */
-#line 15462 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15471 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->current_select->db = NULL;
@@ -40495,8 +40474,8 @@
 
   case 2500:
 
-/* Line 1806 of yacc.c  */
-#line 15475 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15484 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[(1) - (1)].table),NULL,
@@ -40509,8 +40488,8 @@
 
   case 2501:
 
-/* Line 1806 of yacc.c  */
-#line 15487 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15496 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user)))
               MYSQL_YYABORT;
@@ -40519,8 +40498,8 @@
 
   case 2502:
 
-/* Line 1806 of yacc.c  */
-#line 15492 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15501 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
               MYSQL_YYABORT;
@@ -40529,8 +40508,8 @@
 
   case 2503:
 
-/* Line 1806 of yacc.c  */
-#line 15500 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15509 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user)))
               MYSQL_YYABORT;
@@ -40539,8 +40518,8 @@
 
   case 2504:
 
-/* Line 1806 of yacc.c  */
-#line 15505 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15514 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
               MYSQL_YYABORT;
@@ -40549,8 +40528,8 @@
 
   case 2505:
 
-/* Line 1806 of yacc.c  */
-#line 15513 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15522 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.lex_user)=(yyvsp[(1) - (4)].lex_user); (yyvsp[(1) - (4)].lex_user)->password=(yyvsp[(4) - (4)].lex_str);
             if (Lex->sql_command == SQLCOM_REVOKE)
@@ -40572,8 +40551,8 @@
 
   case 2506:
 
-/* Line 1806 of yacc.c  */
-#line 15531 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15540 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             if (Lex->sql_command == SQLCOM_REVOKE)
             {
@@ -40597,8 +40576,8 @@
 
   case 2507:
 
-/* Line 1806 of yacc.c  */
-#line 15551 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15560 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->sql_command == SQLCOM_REVOKE)
             {
@@ -40614,8 +40593,8 @@
 
   case 2508:
 
-/* Line 1806 of yacc.c  */
-#line 15563 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15572 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->sql_command == SQLCOM_REVOKE)
             {
@@ -40632,8 +40611,8 @@
 
   case 2509:
 
-/* Line 1806 of yacc.c  */
-#line 15576 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15585 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.lex_user)= (yyvsp[(1) - (1)].lex_user);
             (yyvsp[(1) - (1)].lex_user)->password= null_lex_str;
@@ -40642,8 +40621,8 @@
 
   case 2510:
 
-/* Line 1806 of yacc.c  */
-#line 15584 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15593 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->grant |= lex->which_columns;
@@ -40652,8 +40631,8 @@
 
   case 2514:
 
-/* Line 1806 of yacc.c  */
-#line 15598 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15607 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             String *new_str = new (YYTHD->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str,(yyvsp[(1) - (1)].lex_str).length,system_charset_info);
             if (new_str == NULL)
@@ -40682,8 +40661,8 @@
 
   case 2516:
 
-/* Line 1806 of yacc.c  */
-#line 15627 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15636 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->ssl_type=SSL_TYPE_SPECIFIED;
           }
@@ -40691,8 +40670,8 @@
 
   case 2517:
 
-/* Line 1806 of yacc.c  */
-#line 15631 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15640 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->ssl_type=SSL_TYPE_ANY;
           }
@@ -40700,8 +40679,8 @@
 
   case 2518:
 
-/* Line 1806 of yacc.c  */
-#line 15635 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15644 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->ssl_type=SSL_TYPE_X509;
           }
@@ -40709,8 +40688,8 @@
 
   case 2519:
 
-/* Line 1806 of yacc.c  */
-#line 15639 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15648 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->ssl_type=SSL_TYPE_NONE;
           }
@@ -40718,50 +40697,50 @@
 
   case 2520:
 
-/* Line 1806 of yacc.c  */
-#line 15645 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15654 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2522:
 
-/* Line 1806 of yacc.c  */
-#line 15650 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15659 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2523:
 
-/* Line 1806 of yacc.c  */
-#line 15651 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15660 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= GRANT_ACL;}
     break;
 
   case 2524:
 
-/* Line 1806 of yacc.c  */
-#line 15655 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15664 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2525:
 
-/* Line 1806 of yacc.c  */
-#line 15656 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15665 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2526:
 
-/* Line 1806 of yacc.c  */
-#line 15660 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15669 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->grant |= GRANT_ACL;}
     break;
 
   case 2527:
 
-/* Line 1806 of yacc.c  */
-#line 15662 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15671 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->mqh.questions=(yyvsp[(2) - (2)].ulong_num);
@@ -40771,8 +40750,8 @@
 
   case 2528:
 
-/* Line 1806 of yacc.c  */
-#line 15668 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15677 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->mqh.updates=(yyvsp[(2) - (2)].ulong_num);
@@ -40782,8 +40761,8 @@
 
   case 2529:
 
-/* Line 1806 of yacc.c  */
-#line 15674 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15683 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->mqh.conn_per_hour= (yyvsp[(2) - (2)].ulong_num);
@@ -40793,8 +40772,8 @@
 
   case 2530:
 
-/* Line 1806 of yacc.c  */
-#line 15680 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15689 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->mqh.user_conn= (yyvsp[(2) - (2)].ulong_num);
@@ -40804,8 +40783,8 @@
 
   case 2531:
 
-/* Line 1806 of yacc.c  */
-#line 15689 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15698 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_BEGIN;
@@ -40815,85 +40794,85 @@
 
   case 2532:
 
-/* Line 1806 of yacc.c  */
-#line 15694 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15703 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2533:
 
-/* Line 1806 of yacc.c  */
-#line 15698 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15707 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2534:
 
-/* Line 1806 of yacc.c  */
-#line 15699 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15708 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2535:
 
-/* Line 1806 of yacc.c  */
-#line 15704 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15713 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
     break;
 
   case 2536:
 
-/* Line 1806 of yacc.c  */
-#line 15705 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15714 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_NO; }
     break;
 
   case 2537:
 
-/* Line 1806 of yacc.c  */
-#line 15706 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15715 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_YES; }
     break;
 
   case 2538:
 
-/* Line 1806 of yacc.c  */
-#line 15711 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15720 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
     break;
 
   case 2539:
 
-/* Line 1806 of yacc.c  */
-#line 15712 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15721 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_YES; }
     break;
 
   case 2540:
 
-/* Line 1806 of yacc.c  */
-#line 15713 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15722 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_NO; }
     break;
 
   case 2541:
 
-/* Line 1806 of yacc.c  */
-#line 15717 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15726 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2542:
 
-/* Line 1806 of yacc.c  */
-#line 15718 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15727 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2543:
 
-/* Line 1806 of yacc.c  */
-#line 15723 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15732 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_COMMIT;
@@ -40906,8 +40885,8 @@
 
   case 2544:
 
-/* Line 1806 of yacc.c  */
-#line 15735 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15744 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_ROLLBACK;
@@ -40920,8 +40899,8 @@
 
   case 2545:
 
-/* Line 1806 of yacc.c  */
-#line 15745 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15754 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_ROLLBACK_TO_SAVEPOINT;
@@ -40931,8 +40910,8 @@
 
   case 2546:
 
-/* Line 1806 of yacc.c  */
-#line 15754 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15763 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SAVEPOINT;
@@ -40942,8 +40921,8 @@
 
   case 2547:
 
-/* Line 1806 of yacc.c  */
-#line 15763 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15772 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_RELEASE_SAVEPOINT;
@@ -40953,15 +40932,15 @@
 
   case 2548:
 
-/* Line 1806 of yacc.c  */
-#line 15776 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15785 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2550:
 
-/* Line 1806 of yacc.c  */
-#line 15782 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15791 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_select_to_union_list(Lex, (bool)(yyvsp[(2) - (2)].num), TRUE))
               MYSQL_YYABORT;
@@ -40970,8 +40949,8 @@
 
   case 2551:
 
-/* Line 1806 of yacc.c  */
-#line 15787 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15796 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               Remove from the name resolution context stack the context of the
@@ -40983,43 +40962,43 @@
 
   case 2552:
 
-/* Line 1806 of yacc.c  */
-#line 15797 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15806 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 2553:
 
-/* Line 1806 of yacc.c  */
-#line 15798 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15807 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 2554:
 
-/* Line 1806 of yacc.c  */
-#line 15799 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15808 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 2555:
 
-/* Line 1806 of yacc.c  */
-#line 15803 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15812 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.is_not_empty)= false; }
     break;
 
   case 2556:
 
-/* Line 1806 of yacc.c  */
-#line 15804 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15813 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.is_not_empty)= true; }
     break;
 
   case 2557:
 
-/* Line 1806 of yacc.c  */
-#line 15808 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15817 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41039,8 +41018,8 @@
 
   case 2558:
 
-/* Line 1806 of yacc.c  */
-#line 15824 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15833 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             thd->lex->current_select->no_table_names_allowed= 0;
@@ -41050,29 +41029,29 @@
 
   case 2561:
 
-/* Line 1806 of yacc.c  */
-#line 15837 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15846 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=1; }
     break;
 
   case 2562:
 
-/* Line 1806 of yacc.c  */
-#line 15838 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15847 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=1; }
     break;
 
   case 2563:
 
-/* Line 1806 of yacc.c  */
-#line 15839 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15848 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { (yyval.num)=0; }
     break;
 
   case 2564:
 
-/* Line 1806 of yacc.c  */
-#line 15844 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15853 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             (yyval.select_lex)= Lex->current_select->master_unit()->first_select();
           }
@@ -41080,8 +41059,8 @@
 
   case 2565:
 
-/* Line 1806 of yacc.c  */
-#line 15848 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15857 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             (yyval.select_lex)= Lex->current_select->master_unit()->first_select();
           }
@@ -41089,8 +41068,8 @@
 
   case 2567:
 
-/* Line 1806 of yacc.c  */
-#line 15857 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15866 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (add_select_to_union_list(Lex, (bool)(yyvsp[(3) - (3)].num), FALSE))
               MYSQL_YYABORT;
@@ -41099,8 +41078,8 @@
 
   case 2568:
 
-/* Line 1806 of yacc.c  */
-#line 15863 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15872 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->pop_context();
             (yyval.select_lex)= (yyvsp[(1) - (6)].select_lex);
@@ -41109,8 +41088,8 @@
 
   case 2569:
 
-/* Line 1806 of yacc.c  */
-#line 15872 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15881 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { 
             (yyval.select_lex)= (yyvsp[(2) - (3)].select_lex);
           }
@@ -41118,8 +41097,8 @@
 
   case 2570:
 
-/* Line 1806 of yacc.c  */
-#line 15878 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15887 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!lex->expr_allows_subselect ||
@@ -41142,8 +41121,8 @@
 
   case 2571:
 
-/* Line 1806 of yacc.c  */
-#line 15899 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15908 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
 
@@ -41158,20 +41137,27 @@
             */
             lex->current_select->select_n_where_fields+=
             child->select_n_where_fields;
+
+            /*
+              Aggregate functions in having clause may add fields to an outer
+              select. Count them also.
+            */
+            lex->current_select->select_n_having_items+=
+            child->select_n_having_items;
           }
     break;
 
   case 2576:
 
-/* Line 1806 of yacc.c  */
-#line 15927 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15943 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->options|= SELECT_STRAIGHT_JOIN; }
     break;
 
   case 2577:
 
-/* Line 1806 of yacc.c  */
-#line 15929 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15945 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (check_simple_select())
               MYSQL_YYABORT;
@@ -41183,29 +41169,29 @@
 
   case 2578:
 
-/* Line 1806 of yacc.c  */
-#line 15936 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15952 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->options|= SELECT_DISTINCT; }
     break;
 
   case 2579:
 
-/* Line 1806 of yacc.c  */
-#line 15937 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15953 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->options|= SELECT_SMALL_RESULT; }
     break;
 
   case 2580:
 
-/* Line 1806 of yacc.c  */
-#line 15938 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15954 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->options|= SELECT_BIG_RESULT; }
     break;
 
   case 2581:
 
-/* Line 1806 of yacc.c  */
-#line 15940 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15956 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (check_simple_select())
               MYSQL_YYABORT;
@@ -41215,8 +41201,8 @@
 
   case 2582:
 
-/* Line 1806 of yacc.c  */
-#line 15946 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15962 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (check_simple_select())
               MYSQL_YYABORT;
@@ -41226,36 +41212,36 @@
 
   case 2583:
 
-/* Line 1806 of yacc.c  */
-#line 15951 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15967 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Select->options|= SELECT_ALL; }
     break;
 
   case 2584:
 
-/* Line 1806 of yacc.c  */
-#line 15962 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15978 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2585:
 
-/* Line 1806 of yacc.c  */
-#line 15964 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15980 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2586:
 
-/* Line 1806 of yacc.c  */
-#line 15966 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 15982 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2600:
 
-/* Line 1806 of yacc.c  */
-#line 15999 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16015 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               We have to distinguish missing DEFINER-clause from case when
@@ -41270,8 +41256,8 @@
 
   case 2601:
 
-/* Line 1806 of yacc.c  */
-#line 16013 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16029 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             YYTHD->lex->definer= get_current_user(YYTHD, (yyvsp[(3) - (3)].lex_user));
           }
@@ -41279,78 +41265,78 @@
 
   case 2602:
 
-/* Line 1806 of yacc.c  */
-#line 16026 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16042 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2603:
 
-/* Line 1806 of yacc.c  */
-#line 16028 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16044 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2604:
 
-/* Line 1806 of yacc.c  */
-#line 16030 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16046 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2605:
 
-/* Line 1806 of yacc.c  */
-#line 16035 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16051 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_mode= VIEW_CREATE_OR_REPLACE; }
     break;
 
   case 2606:
 
-/* Line 1806 of yacc.c  */
-#line 16040 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16056 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED; }
     break;
 
   case 2607:
 
-/* Line 1806 of yacc.c  */
-#line 16042 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16058 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_algorithm= VIEW_ALGORITHM_MERGE; }
     break;
 
   case 2608:
 
-/* Line 1806 of yacc.c  */
-#line 16044 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16060 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_algorithm= VIEW_ALGORITHM_TMPTABLE; }
     break;
 
   case 2609:
 
-/* Line 1806 of yacc.c  */
-#line 16049 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16065 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_suid= VIEW_SUID_DEFAULT; }
     break;
 
   case 2610:
 
-/* Line 1806 of yacc.c  */
-#line 16051 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16067 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_suid= VIEW_SUID_DEFINER; }
     break;
 
   case 2611:
 
-/* Line 1806 of yacc.c  */
-#line 16053 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16069 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_suid= VIEW_SUID_INVOKER; }
     break;
 
   case 2612:
 
-/* Line 1806 of yacc.c  */
-#line 16058 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16074 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41367,15 +41353,15 @@
 
   case 2614:
 
-/* Line 1806 of yacc.c  */
-#line 16075 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16091 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2616:
 
-/* Line 1806 of yacc.c  */
-#line 16081 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16097 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
               Lex->view_list.push_back((LEX_STRING*)
               sql_memdup(&(yyvsp[(1) - (1)].lex_str), sizeof(LEX_STRING)));
@@ -41384,8 +41370,8 @@
 
   case 2617:
 
-/* Line 1806 of yacc.c  */
-#line 16086 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16102 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
               Lex->view_list.push_back((LEX_STRING*)
               sql_memdup(&(yyvsp[(3) - (3)].lex_str), sizeof(LEX_STRING)));
@@ -41394,8 +41380,8 @@
 
   case 2618:
 
-/* Line 1806 of yacc.c  */
-#line 16093 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16109 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->parsing_options.allows_variable= FALSE;
@@ -41408,8 +41394,8 @@
 
   case 2619:
 
-/* Line 1806 of yacc.c  */
-#line 16102 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16118 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -41427,8 +41413,8 @@
 
   case 2620:
 
-/* Line 1806 of yacc.c  */
-#line 16119 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16135 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (Lex->current_select->set_braces(0))
             {
@@ -41448,8 +41434,8 @@
 
   case 2623:
 
-/* Line 1806 of yacc.c  */
-#line 16140 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16156 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             if (setup_select_in_parentheses(Lex))
               MYSQL_YYABORT;
@@ -41458,8 +41444,8 @@
 
   case 2625:
 
-/* Line 1806 of yacc.c  */
-#line 16149 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16165 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->current_select->table_list.save_and_clear(&Lex->save_list);
           }
@@ -41467,8 +41453,8 @@
 
   case 2626:
 
-/* Line 1806 of yacc.c  */
-#line 16153 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16169 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->current_select->table_list.push_front(&Lex->save_list);
           }
@@ -41476,36 +41462,36 @@
 
   case 2627:
 
-/* Line 1806 of yacc.c  */
-#line 16160 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16176 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_check= VIEW_CHECK_NONE; }
     break;
 
   case 2628:
 
-/* Line 1806 of yacc.c  */
-#line 16162 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16178 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_check= VIEW_CHECK_CASCADED; }
     break;
 
   case 2629:
 
-/* Line 1806 of yacc.c  */
-#line 16164 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16180 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_check= VIEW_CHECK_CASCADED; }
     break;
 
   case 2630:
 
-/* Line 1806 of yacc.c  */
-#line 16166 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16182 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->create_view_check= VIEW_CHECK_LOCAL; }
     break;
 
   case 2631:
 
-/* Line 1806 of yacc.c  */
-#line 16183 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16199 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {                 /* $8 */
             Lex->raw_trg_on_table_name_begin= YYLIP->get_tok_start();
           }
@@ -41513,8 +41499,8 @@
 
   case 2632:
 
-/* Line 1806 of yacc.c  */
-#line 16189 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16205 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {                 /* $12 */
             Lex->raw_trg_on_table_name_end= YYLIP->get_tok_start();
           }
@@ -41522,8 +41508,8 @@
 
   case 2633:
 
-/* Line 1806 of yacc.c  */
-#line 16194 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16210 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {                 /* $15 */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41557,8 +41543,8 @@
 
   case 2634:
 
-/* Line 1806 of yacc.c  */
-#line 16224 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16240 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* $17 */
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -41587,8 +41573,8 @@
 
   case 2635:
 
-/* Line 1806 of yacc.c  */
-#line 16259 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16275 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41609,8 +41595,8 @@
 
   case 2636:
 
-/* Line 1806 of yacc.c  */
-#line 16277 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16293 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41631,8 +41617,8 @@
 
   case 2637:
 
-/* Line 1806 of yacc.c  */
-#line 16300 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16316 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* $5 */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41667,8 +41653,8 @@
 
   case 2638:
 
-/* Line 1806 of yacc.c  */
-#line 16332 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16348 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* $8 */
             Lex->sphead->m_parser_data.set_parameter_end_ptr(
               YYLIP->get_cpp_tok_start());
@@ -41677,8 +41663,8 @@
 
   case 2639:
 
-/* Line 1806 of yacc.c  */
-#line 16337 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16353 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* $10 */
             LEX *lex= Lex;
             lex->charset= NULL;
@@ -41690,8 +41676,8 @@
 
   case 2640:
 
-/* Line 1806 of yacc.c  */
-#line 16345 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16361 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* $12 */
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -41718,8 +41704,8 @@
 
   case 2641:
 
-/* Line 1806 of yacc.c  */
-#line 16368 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16384 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { /* $14 */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41731,8 +41717,8 @@
 
   case 2642:
 
-/* Line 1806 of yacc.c  */
-#line 16376 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16392 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41791,8 +41777,8 @@
 
   case 2643:
 
-/* Line 1806 of yacc.c  */
-#line 16434 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16450 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -41816,8 +41802,8 @@
 
   case 2644:
 
-/* Line 1806 of yacc.c  */
-#line 16454 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16470 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             /*
               NOTE: the start of the parameters in the query string is
@@ -41833,8 +41819,8 @@
 
   case 2645:
 
-/* Line 1806 of yacc.c  */
-#line 16467 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16483 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41848,8 +41834,8 @@
 
   case 2646:
 
-/* Line 1806 of yacc.c  */
-#line 16477 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16493 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -41861,8 +41847,8 @@
 
   case 2647:
 
-/* Line 1806 of yacc.c  */
-#line 16485 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16501 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -41875,8 +41861,8 @@
 
   case 2648:
 
-/* Line 1806 of yacc.c  */
-#line 16499 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16515 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_START;
           }
@@ -41884,8 +41870,8 @@
 
   case 2649:
 
-/* Line 1806 of yacc.c  */
-#line 16503 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16519 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_END;
           }
@@ -41893,8 +41879,8 @@
 
   case 2650:
 
-/* Line 1806 of yacc.c  */
-#line 16507 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16523 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_PREPARE;
           }
@@ -41902,8 +41888,8 @@
 
   case 2651:
 
-/* Line 1806 of yacc.c  */
-#line 16511 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16527 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_COMMIT;
           }
@@ -41911,8 +41897,8 @@
 
   case 2652:
 
-/* Line 1806 of yacc.c  */
-#line 16515 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16531 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_ROLLBACK;
           }
@@ -41920,8 +41906,8 @@
 
   case 2653:
 
-/* Line 1806 of yacc.c  */
-#line 16519 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16535 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_RECOVER;
           }
@@ -41929,8 +41915,8 @@
 
   case 2654:
 
-/* Line 1806 of yacc.c  */
-#line 16526 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16542 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (1)].string)->length() <= MAXGTRIDSIZE);
             if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
@@ -41941,8 +41927,8 @@
 
   case 2655:
 
-/* Line 1806 of yacc.c  */
-#line 16533 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16549 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (3)].string)->length() <= MAXBQUALSIZE);
             if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
@@ -41953,8 +41939,8 @@
 
   case 2656:
 
-/* Line 1806 of yacc.c  */
-#line 16540 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16556 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (5)].string)->length() <= MAXBQUALSIZE);
             if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
@@ -41965,85 +41951,85 @@
 
   case 2657:
 
-/* Line 1806 of yacc.c  */
-#line 16549 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16565 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2658:
 
-/* Line 1806 of yacc.c  */
-#line 16550 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16566 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2659:
 
-/* Line 1806 of yacc.c  */
-#line 16554 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16570 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_NONE;        }
     break;
 
   case 2660:
 
-/* Line 1806 of yacc.c  */
-#line 16555 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16571 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_JOIN;        }
     break;
 
   case 2661:
 
-/* Line 1806 of yacc.c  */
-#line 16556 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16572 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_RESUME;      }
     break;
 
   case 2662:
 
-/* Line 1806 of yacc.c  */
-#line 16560 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16576 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_NONE;        }
     break;
 
   case 2663:
 
-/* Line 1806 of yacc.c  */
-#line 16561 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16577 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_ONE_PHASE;   }
     break;
 
   case 2664:
 
-/* Line 1806 of yacc.c  */
-#line 16566 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16582 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_NONE;        }
     break;
 
   case 2665:
 
-/* Line 1806 of yacc.c  */
-#line 16568 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16584 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_SUSPEND;     }
     break;
 
   case 2667:
 
-/* Line 1806 of yacc.c  */
-#line 16573 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16589 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {}
     break;
 
   case 2668:
 
-/* Line 1806 of yacc.c  */
-#line 16574 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16590 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_FOR_MIGRATE; }
     break;
 
   case 2669:
 
-/* Line 1806 of yacc.c  */
-#line 16579 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16595 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_INSTALL_PLUGIN;
@@ -42054,8 +42040,8 @@
 
   case 2670:
 
-/* Line 1806 of yacc.c  */
-#line 16589 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1455 of yacc.c  */
+#line 16605 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_UNINSTALL_PLUGIN;
@@ -42065,21 +42051,10 @@
 
 
 
-/* Line 1806 of yacc.c  */
-#line 42070 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.cc"
+/* Line 1455 of yacc.c  */
+#line 42056 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.cc"
       default: break;
     }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -42107,47 +42082,44 @@
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
 #if ! YYERROR_VERBOSE
-      yyerror (yythd, YY_("syntax error"));
+      yyerror (YYTHD, YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yythd, yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (YYTHD, yymsg);
+	  }
+	else
+	  {
+	    yyerror (YYTHD, YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -42167,7 +42139,7 @@
       else
 	{
 	  yydestruct ("Error: discarding",
-		      yytoken, &yylval, yythd);
+		      yytoken, &yylval, YYTHD);
 	  yychar = YYEMPTY;
 	}
     }
@@ -42206,7 +42178,7 @@
   for (;;)
     {
       yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
+      if (yyn != YYPACT_NINF)
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -42223,7 +42195,7 @@
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp, yythd);
+		  yystos[yystate], yyvsp, YYTHD);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -42258,20 +42230,15 @@
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
-  yyerror (yythd, YY_("memory exhausted"));
+  yyerror (YYTHD, YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
   if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval, yythd);
-    }
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval, YYTHD);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -42279,7 +42246,7 @@
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp, yythd);
+		  yystos[*yyssp], yyvsp, YYTHD);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
diff -Nru percona-xtrabackup-2.2.3/sql/sql_yacc.h percona-xtrabackup-2.3.7/sql/sql_yacc.h
--- percona-xtrabackup-2.2.3/sql/sql_yacc.h	2014-07-22 17:14:03.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_yacc.h	2017-02-27 07:49:21.000000000 +0000
@@ -1,8 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Bison interface for Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    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
@@ -1284,8 +1286,8 @@
 typedef union YYSTYPE
 {
 
-/* Line 2068 of yacc.c  */
-#line 970 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.yy"
+/* Line 1676 of yacc.c  */
+#line 968 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.yy"
 
   int  num;
   ulong ulong_num;
@@ -1345,8 +1347,8 @@
 
 
 
-/* Line 2068 of yacc.c  */
-#line 1350 "/mnt/workspace/percona-xtrabackup-2.2-debian-source-for-inclusion/sql/sql_yacc.h"
+/* Line 1676 of yacc.c  */
+#line 1352 "/var/lib/jenkins/jobs/percona-xtrabackup-2.3-source-tarball/workspace/sql/sql_yacc.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff -Nru percona-xtrabackup-2.2.3/sql/sql_yacc.yy percona-xtrabackup-2.3.7/sql/sql_yacc.yy
--- percona-xtrabackup-2.2.3/sql/sql_yacc.yy	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sql_yacc.yy	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -22,11 +22,9 @@
 */
 
 %{
-/* thd is passed as an argument to yyparse(), and subsequently to yylex().
-** The type will be void*, so it must be  cast to (THD*) when used.
-** Use the YYTHD macro for this.
+/*
+Note: YYTHD is passed as an argument to yyparse(), and subsequently to yylex().
 */
-#define YYTHD ((THD *)yythd)
 #define YYLIP (& YYTHD->m_parser_state->m_lip)
 #define YYPS (& YYTHD->m_parser_state->m_yacc)
 #define YYCSCL  YYTHD->variables.character_set_client
@@ -66,6 +64,7 @@
 #include "set_var.h"
 #include "opt_explain_traditional.h"
 #include "opt_explain_json.h"
+#include "lex_token.h"
 
 /* this is to get the bison compilation windows warnings out */
 #ifdef _MSC_VER
@@ -83,7 +82,7 @@
     ulong val= *(F);                          \
     if (my_yyoverflow((B), (D), &val))        \
     {                                         \
-      yyerror(yythd, (char*) (A));            \
+      yyerror(YYTHD, (char*) (A));            \
       return 2;                               \
     }                                         \
     else                                      \
@@ -181,10 +180,8 @@
   to abort from the parser.
 */
 
-void MYSQLerror(void *yythd, const char *s)
+void MYSQLerror(THD *thd, const char *s)
 {
-  THD *thd= current_thd;
-
   /*
     Restore the original LEX if it was replaced when parsing
     a stored procedure. We must ensure that a parsing error
@@ -469,7 +466,8 @@
     Let us add this item to list of all Item_trigger_field
     objects in trigger.
   */
-  sp->m_trg_table_fields.link_in_list(trg_fld, &trg_fld->next_trg_field);
+  sp->m_cur_instr_trig_field_items.link_in_list(trg_fld,
+                                                &trg_fld->next_trg_field);
 
   return sp->add_instr(thd, i);
 }
@@ -1029,9 +1027,9 @@
 bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %}
 
+%parse-param { class THD *YYTHD }
+%lex-param { class THD *YYTHD }
 %pure-parser                                    /* We have threads */
-%parse-param { void *yythd }
-%lex-param { void *yythd }
 /*
   Currently there are 161 shift/reduce conflicts.
   We should not introduce new conflicts any more.
@@ -6587,7 +6585,8 @@
         | GEOMETRYCOLLECTION  { $$= Field::GEOM_GEOMETRYCOLLECTION; }
         | POINT_SYM
           {
-            Lex->length= (char*)"25";
+            Lex->length= const_cast<char*>(STRINGIFY_ARG
+                                           (MAX_LEN_GEOM_POINT_FIELD));
             $$= Field::GEOM_POINT;
           }
         | MULTIPOINT          { $$= Field::GEOM_MULTIPOINT; }
@@ -9890,6 +9889,7 @@
           }
         | OLD_PASSWORD '(' expr ')'
           {
+            WARN_DEPRECATED(YYTHD, "OLD_PASSWORD", "PASSWORD");
             $$=  new (YYTHD->mem_root) Item_func_old_password($3);
             Lex->contains_plaintext_password= true;
             if ($$ == NULL)
@@ -13398,6 +13398,14 @@
         | temporal_literal { $$= $1; }
         | NULL_SYM
           {
+            Lex_input_stream *lip= YYLIP;
+            /*
+              For the digest computation, in this context only,
+              NULL is considered a literal, hence reduced to '?'
+              REDUCE:
+                TOK_GENERIC_VALUE := NULL_SYM
+            */
+            lip->reduce_digest_token(TOK_GENERIC_VALUE, NULL_SYM);
             $$ = new (YYTHD->mem_root) Item_null();
             if ($$ == NULL)
               MYSQL_YYABORT;
@@ -13725,7 +13733,7 @@
                 Let us add this item to list of all Item_trigger_field objects
                 in trigger.
               */
-              lex->sphead->m_trg_table_fields.link_in_list(
+              lex->sphead->m_cur_instr_trig_field_items.link_in_list(
                 trg_fld, &trg_fld->next_trg_field);
 
               $$= trg_fld;
@@ -15016,6 +15024,7 @@
           }
         | OLD_PASSWORD '(' TEXT_STRING ')'
           {
+		    WARN_DEPRECATED(YYTHD, "OLD_PASSWORD", "PASSWORD");
             $$= $3.length ? Item_func_old_password::
               alloc(YYTHD, $3.str, $3.length) :
               $3.str;
@@ -15910,6 +15919,13 @@
             */
             lex->current_select->select_n_where_fields+=
             child->select_n_where_fields;
+
+            /*
+              Aggregate functions in having clause may add fields to an outer
+              select. Count them also.
+            */
+            lex->current_select->select_n_having_items+=
+            child->select_n_having_items;
           }
         ;
 
diff -Nru percona-xtrabackup-2.2.3/sql/string_service.cc percona-xtrabackup-2.3.7/sql/string_service.cc
--- percona-xtrabackup-2.2.3/sql/string_service.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/string_service.cc	2017-02-27 07:47:02.000000000 +0000
@@ -141,18 +141,15 @@
   String *str= (String *) string_handle;
   String *res= new String[1];
   const CHARSET_INFO *cs= str->charset();
-  res->set_charset(cs);
   if (cs->casedn_multiply == 1)
   {
-    uint len;
-    res= copy_if_not_alloced(res, str, str->length());
-    len= cs->cset->casedn_str(cs, (char*) res->ptr());
-    DBUG_ASSERT(len <= res->length());
-    res->length(len);
+    res->copy(*str);
+    my_casedn_str(cs, res->c_ptr_quick());
   }
   else
   {
     uint len= str->length() * cs->casedn_multiply;
+    res->set_charset(cs);
     res->alloc(len);
     len= cs->cset->casedn(cs, (char*) str->ptr(), str->length(), (char *) res->ptr(), len);
     res->length(len);
diff -Nru percona-xtrabackup-2.2.3/sql/sys_vars.cc percona-xtrabackup-2.3.7/sql/sys_vars.cc
--- percona-xtrabackup-2.2.3/sql/sys_vars.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sys_vars.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2015, 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
@@ -1504,6 +1504,28 @@
        "warning.",
        GLOBAL_VAR(rpl_stop_slave_timeout), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(2, LONG_TIMEOUT), DEFAULT(LONG_TIMEOUT), BLOCK_SIZE(1));
+/*
+  alias for binlogging_imposible_mode as per the appropriate naming
+  convention
+*/
+static Sys_var_enum Sys_binlog_error_action(
+       "binlog_error_action",
+       "When statements cannot be written to the binary log due to a fatal "
+       "error, the server can either ignore the error and let the master "
+       "continue, or abort.", GLOBAL_VAR(binlog_error_action),
+       CMD_LINE(REQUIRED_ARG), binlog_error_action_list, DEFAULT(IGNORE_ERROR));
+
+static Sys_var_enum Sys_binlogging_impossible_mode(
+       "binlogging_impossible_mode",
+       "On a fatal error when statements cannot be binlogged the behaviour can "
+       "be ignore the error and let the master continue or abort the server. "
+       "This variable is deprecated and will be removed in a future release. "
+       "Please use binlog_error_action instead.",
+       GLOBAL_VAR(binlog_error_action),
+       CMD_LINE(REQUIRED_ARG, OPT_BINLOGGING_IMPOSSIBLE_MODE),
+       binlog_error_action_list, DEFAULT(IGNORE_ERROR),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
+       DEPRECATED("'@@binlog_error_action'"));
 
 static Sys_var_mybool Sys_trust_function_creators(
        "log_bin_trust_function_creators",
@@ -1757,6 +1779,21 @@
        VALID_RANGE(1, ULONG_MAX), DEFAULT(100),
        BLOCK_SIZE(1));
 
+static Sys_var_long Sys_max_digest_length(
+       "max_digest_length",
+       "Maximum length considered for digest text.",
+       READ_ONLY GLOBAL_VAR(max_digest_length),
+       CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1024 * 1024),
+       DEFAULT(1024),
+       BLOCK_SIZE(1),
+       NO_MUTEX_GUARD,
+       NOT_IN_BINLOG,
+       ON_CHECK(0),
+       ON_UPDATE(0),
+       NULL,
+       /* max_digest_length is used as a sizing hint by the performance schema. */
+       sys_var::PARSE_EARLY);
+
 static bool check_max_delayed_threads(sys_var *self, THD *thd, set_var *var)
 {
   return var->type != OPT_GLOBAL &&
@@ -2020,7 +2057,7 @@
        "open_files_limit",
        "If this is not 0, then mysqld will use this value to reserve file "
        "descriptors to use with setrlimit(). If this value is 0 then mysqld "
-       "will reserve max_connections*5 or max_connections + table_cache*2 "
+       "will reserve max_connections*5 or max_connections + table_open_cache*2 "
        "(whichever is larger) number of file descriptors",
        READ_ONLY GLOBAL_VAR(open_files_limit), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, OS_FILE_LIMIT), DEFAULT(0), BLOCK_SIZE(1),
@@ -2411,9 +2448,10 @@
        "the desired number of threads that should be run at the same time. "
        "This variable has no effect, and is deprecated. "
        "It will be removed in a future release. ",
-       READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG),
+       READ_ONLY GLOBAL_VAR(concurrency),
+       CMD_LINE(REQUIRED_ARG, OPT_THREAD_CONCURRENCY),
        VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1),
-       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), 
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
        DEPRECATED(""));
 
 static Sys_var_ulong Sys_thread_stack(
@@ -2446,7 +2484,7 @@
        "transaction_alloc_block_size",
        "Allocation block size for transactions to be stored in binary log",
        SESSION_VAR(trans_alloc_block_size), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1024, ULONG_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE),
+       VALID_RANGE(1024, 128 * 1024 * 1024), DEFAULT(QUERY_ALLOC_BLOCK_SIZE),
        BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_trans_mem_root));
 
@@ -2454,7 +2492,7 @@
        "transaction_prealloc_size",
        "Persistent buffer for transactions to be stored in binary log",
        SESSION_VAR(trans_prealloc_size), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1024, ULONG_MAX), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE),
+       VALID_RANGE(1024, 128 * 1024 * 1024), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE),
        BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_trans_mem_root));
 
@@ -2733,38 +2771,14 @@
     it will go the error-log if the deprecated sql_modes are used.
   */
   THD *thd= current_thd;
-  if (thd)
-  {
-    if (sql_mode & MODE_ERROR_FOR_DIVISION_BY_ZERO)
-      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
-                          ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
-                          ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                          "ERROR_FOR_DIVISION_BY_ZERO");
-
-    if (sql_mode & MODE_NO_ZERO_DATE)
-      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
-                          ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
-                          ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                          "NO_ZERO_DATE");
-
-    if (sql_mode & MODE_NO_ZERO_IN_DATE)
-      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
-                          ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
-                          ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                          "NO_ZERO_IN_DATE");
-  }
-  else
-  {
-    if (sql_mode & MODE_ERROR_FOR_DIVISION_BY_ZERO)
-      sql_print_warning("'ERROR_FOR_DIVISION_BY_ZERO' is deprecated "
-                        "and will be removed in a future release.");
-    if (sql_mode & MODE_NO_ZERO_DATE)
-      sql_print_warning("'NO_ZERO_DATE' is deprecated "
-                        "and will be removed in a future release.");
-    if (sql_mode & MODE_NO_ZERO_IN_DATE)
-      sql_print_warning("'NO_ZERO_IN_DATE' is deprecated "
-                        "and will be removed in a future release.");
-   }
+  if (sql_mode & MODE_ERROR_FOR_DIVISION_BY_ZERO)
+    WARN_DEPRECATED_NO_REPLACEMENT(thd, "ERROR_FOR_DIVISION_BY_ZERO");
+
+  if (sql_mode & MODE_NO_ZERO_DATE)
+    WARN_DEPRECATED_NO_REPLACEMENT(thd, "NO_ZERO_DATE");
+
+  if (sql_mode & MODE_NO_ZERO_IN_DATE)
+    WARN_DEPRECATED_NO_REPLACEMENT(thd, "NO_ZERO_IN_DATE");
 }
 
 export sql_mode_t expand_sql_mode(sql_mode_t sql_mode)
@@ -3096,9 +3110,10 @@
 
 static Sys_var_mybool Sys_timed_mutexes(
        "timed_mutexes",
-       "Specify whether to time mutexes (only InnoDB mutexes are currently "
-       "supported)",
-       GLOBAL_VAR(timed_mutexes), CMD_LINE(OPT_ARG), DEFAULT(0));
+       "Specify whether to time mutexes. Deprecated, has no effect.",
+       GLOBAL_VAR(timed_mutexes), CMD_LINE(OPT_ARG), DEFAULT(0),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), ON_UPDATE(NULL),
+       DEPRECATED(""));
 
 static char *server_version_ptr;
 static Sys_var_charptr Sys_version(
@@ -3286,13 +3301,13 @@
 static bool fix_sql_log_bin_after_update(sys_var *self, THD *thd,
                                          enum_var_type type)
 {
-  if (type == OPT_SESSION)
-  {
-    if (thd->variables.sql_log_bin)
-      thd->variables.option_bits |= OPTION_BIN_LOG;
-    else
-      thd->variables.option_bits &= ~OPTION_BIN_LOG;
-  }
+  DBUG_ASSERT(type == OPT_SESSION);
+
+  if (thd->variables.sql_log_bin)
+    thd->variables.option_bits |= OPTION_BIN_LOG;
+  else
+    thd->variables.option_bits &= ~OPTION_BIN_LOG;
+
   return FALSE;
 }
 
@@ -3314,7 +3329,7 @@
     return TRUE;
 
   if (var->type == OPT_GLOBAL)
-    return FALSE;
+    return TRUE;
 
   /* If in a stored function/trigger, it's too late to change sql_log_bin. */
   if (thd->in_sub_stmt)
@@ -3333,9 +3348,9 @@
 }
 
 static Sys_var_mybool Sys_log_binlog(
-       "sql_log_bin", "sql_log_bin",
-       SESSION_VAR(sql_log_bin), NO_CMD_LINE,
-       DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_sql_log_bin),
+       "sql_log_bin", "Controls whether logging to the binary log is done",
+       SESSION_VAR(sql_log_bin), NO_CMD_LINE, DEFAULT(TRUE),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_sql_log_bin),
        ON_UPDATE(fix_sql_log_bin_after_update));
 
 static Sys_var_bit Sys_transaction_allow_batching(
@@ -4281,6 +4296,28 @@
        );
 #endif
 
+static Sys_var_mybool Sys_binlog_gtid_simple_recovery(
+       "binlog_gtid_simple_recovery",
+       "If this option is enabled, the server does not scan more than one "
+       "binary log for every iteration when initializing GTID sets on server "
+       "restart. Enabling this option is very useful when restarting a server "
+       "which has already generated lots of binary logs without GTID events. "
+       "Note: If this option is enabled, GLOBAL.GTID_EXECUTED and "
+       "GLOBAL.GTID_PURGED cannot be initialized correctly if binary log(s) "
+       "with GTID events were generated before binary log(s) without GTID "
+       "events, for example if gtid_mode is disabled when the server has "
+       "already generated binary log(s) with GTID events and not purged them.",
+       READ_ONLY GLOBAL_VAR(binlog_gtid_simple_recovery),
+       CMD_LINE(OPT_ARG), DEFAULT(FALSE));
+
+static Sys_var_mybool Sys_simplified_binlog_gtid_recovery(
+       "simplified_binlog_gtid_recovery",
+       "Alias for @@binlog_gtid_simple_recovery. Deprecated",
+       READ_ONLY GLOBAL_VAR(binlog_gtid_simple_recovery),
+       CMD_LINE(OPT_ARG, OPT_SIMPLIFIED_BINLOG_GTID_RECOVERY),
+       DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
+       ON_UPDATE(0), DEPRECATED("'@@binlog_gtid_simple_recovery'"));
+
 static Sys_var_ulong Sys_sp_cache_size(
        "stored_program_cache",
        "The soft upper limit for number of cached stored routines for "
@@ -4637,3 +4674,28 @@
   "block_encryption_mode", "mode for AES_ENCRYPT/AES_DECRYPT",
   SESSION_VAR(my_aes_mode), CMD_LINE(REQUIRED_ARG),
   my_aes_opmode_names, DEFAULT(my_aes_128_ecb));
+
+static Sys_var_mybool Sys_avoid_temporal_upgrade(
+       "avoid_temporal_upgrade",
+       "When this option is enabled, the pre-5.6.4 temporal types are "
+       "not upgraded to the new format for ALTER TABLE requests ADD/CHANGE/MODIFY"
+       " COLUMN, ADD INDEX or FORCE operation. "
+       "This variable is deprecated and will be removed in a future release.",
+        GLOBAL_VAR(avoid_temporal_upgrade),
+        CMD_LINE(OPT_ARG, OPT_AVOID_TEMPORAL_UPGRADE),
+        DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG,
+        ON_CHECK(0), ON_UPDATE(0),
+        DEPRECATED(""));
+
+static Sys_var_mybool Sys_show_old_temporals(
+       "show_old_temporals",
+       "When this option is enabled, the pre-5.6.4 temporal types will "
+       "be marked in the 'SHOW CREATE TABLE' and 'INFORMATION_SCHEMA.COLUMNS' "
+       "table as a comment in COLUMN_TYPE field. "
+       "This variable is deprecated and will be removed in a future release.",
+        SESSION_VAR(show_old_temporals),
+        CMD_LINE(OPT_ARG, OPT_SHOW_OLD_TEMPORALS),
+        DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG,
+        ON_CHECK(0), ON_UPDATE(0),
+        DEPRECATED(""));
+
diff -Nru percona-xtrabackup-2.2.3/sql/sys_vars.h percona-xtrabackup-2.3.7/sql/sys_vars.h
--- percona-xtrabackup-2.2.3/sql/sys_vars.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/sys_vars.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2014, 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
@@ -2198,7 +2198,7 @@
                           previous_gtid_logged, current_gtid_logged);
 
     // Rotate logs to have Previous_gtid_event on last binlog.
-    rotate_res= mysql_bin_log.rotate_and_purge(true);
+    rotate_res= mysql_bin_log.rotate_and_purge(thd, true);
     if (rotate_res)
     {
       error= true;
diff -Nru percona-xtrabackup-2.2.3/sql/table.cc percona-xtrabackup-2.3.7/sql/table.cc
--- percona-xtrabackup-2.2.3/sql/table.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/table.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -40,6 +40,7 @@
 #include "opt_trace.h"           // opt_trace_disable_if_no_security_...
 #include "table_cache.h"         // table_cache_manager
 #include "sql_view.h"
+#include "debug_sync.h"
 
 /* INFORMATION_SCHEMA name */
 LEX_STRING INFORMATION_SCHEMA_NAME= {C_STRING_WITH_LEN("information_schema")};
@@ -1824,6 +1825,17 @@
               table_field->type() == MYSQL_TYPE_BLOB &&
               table_field->field_length == key_part[i].length)
             continue;
+          /*
+            If the key column is of NOT NULL GEOMETRY type, specifically POINT
+            type whose length is known internally (which is 25). And key part
+            prefix size is equal to the POINT column max size, then we can
+            promote it to primary key.
+          */
+          if (!table_field->real_maybe_null() &&
+              table_field->type() == MYSQL_TYPE_GEOMETRY &&
+              table_field->get_geometry_type() == Field::GEOM_POINT &&
+              key_part[i].length == MAX_LEN_GEOM_POINT_FIELD)
+            continue;
 
 	  if (table_field->real_maybe_null() ||
 	      table_field->key_length() != key_part[i].length)
@@ -2397,7 +2409,9 @@
     outparam->no_replicate= FALSE;
   }
 
-  thd->status_var.opened_tables++;
+  /* Increment the opened_tables counter, only when open flags set. */
+  if (db_stat)
+    thd->status_var.opened_tables++;
 
   DBUG_RETURN (0);
 
@@ -3590,6 +3604,8 @@
 
   mdl_context->find_deadlock();
 
+  DEBUG_SYNC(thd, "flush_complete");
+
   wait_status= mdl_context->m_wait.timed_wait(thd, abstime, TRUE,
                                               &stage_waiting_for_table_flush);
 
@@ -3608,6 +3624,8 @@
     destroy();
   }
 
+  DEBUG_SYNC(thd, "share_destroyed");
+
   /*
     In cases when our wait was aborted by KILL statement,
     a deadlock or a timeout, the share might still be referenced,
@@ -5725,12 +5743,23 @@
  /*
    Reset table_name and table_name_length,if it is a anonymous derived table
    or schema table. They are not valid as TABLEs were closed in the end of
-   previous prepare or execute call.
+   previous prepare or execute call. For derived table of view, restore view's
+   name and database wiped out by derived table processing.
  */
-  if (derived)
+  if (derived != NULL)
   {
-    table_name= NULL;
-    table_name_length= 0;
+    if (view != NULL)
+    {
+      db= view_db.str;
+      db_length= view_db.length;
+      table_name= view_name.str;
+      table_name_length= view_name.length;
+    }
+    else
+    {
+      table_name= NULL;
+      table_name_length= 0;
+    }
   }
   else if (schema_table_name)
   {
diff -Nru percona-xtrabackup-2.2.3/sql/table.h percona-xtrabackup-2.3.7/sql/table.h
--- percona-xtrabackup-2.2.3/sql/table.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/table.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef TABLE_INCLUDED
 #define TABLE_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -639,6 +639,11 @@
   key_map keys_for_keyread;
   ha_rows min_rows, max_rows;		/* create information */
   ulong   avg_row_length;		/* create information */
+  /**
+    TABLE_SHARE version, if changed the TABLE_SHARE must be reopened.
+    NOTE: The TABLE_SHARE will not be reopened during LOCK TABLES in
+    close_thread_tables!!!
+  */
   ulong   version;
   ulong   mysql_version;		/* 0 if .frm is created before 5.0 */
   ulong   reclength;			/* Recordlength */
@@ -1169,6 +1174,11 @@
   my_bool insert_or_update;             /* Can be used by the handler */
   my_bool alias_name_used;		/* true if table_name is alias */
   my_bool get_fields_in_item_tree;      /* Signal to fix_field */
+  /**
+    This table must be reopened and is not to be reused.
+    NOTE: The TABLE will not be reopened during LOCK TABLES in
+    close_thread_tables!!!
+  */
   my_bool m_needs_reopen;
 private:
   bool created; /* For tmp tables. TRUE <=> tmp table has been instantiated.*/
diff -Nru percona-xtrabackup-2.2.3/sql/udf_example.cc percona-xtrabackup-2.3.7/sql/udf_example.cc
--- percona-xtrabackup-2.2.3/sql/udf_example.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/udf_example.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -287,9 +287,12 @@
 
   if (!word)					/* Null argument */
   {
+    /* The length is expected to be zero when the argument is NULL. */
+    assert(args->lengths[0] == 0);
     *is_null=1;
     return 0;
   }
+
   w_end=word+args->lengths[0];
   org_result=result;
 
diff -Nru percona-xtrabackup-2.2.3/sql/unireg.cc percona-xtrabackup-2.3.7/sql/unireg.cc
--- percona-xtrabackup-2.2.3/sql/unireg.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql/unireg.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -905,7 +905,6 @@
     recpos= field->offset+1 + (uint) data_offset;
     int3store(buff+5,recpos);
     int2store(buff+8,field->pack_flag);
-    DBUG_ASSERT(field->unireg_check < 256);
     buff[10]= (uchar) field->unireg_check;
     buff[12]= (uchar) field->interval_id;
     buff[13]= (uchar) field->sql_type; 
diff -Nru percona-xtrabackup-2.2.3/sql-bench/graph-compare-results.sh percona-xtrabackup-2.3.7/sql-bench/graph-compare-results.sh
--- percona-xtrabackup-2.2.3/sql-bench/graph-compare-results.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql-bench/graph-compare-results.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,3 +1,5 @@
+#! /usr/bin/perl
+
 ####
 #### Hello ... this is a heavily hacked script by Luuk 
 #### instead of printing the result it makes a nice gif
diff -Nru percona-xtrabackup-2.2.3/sql-bench/innotest1a.sh percona-xtrabackup-2.3.7/sql-bench/innotest1a.sh
--- percona-xtrabackup-2.2.3/sql-bench/innotest1a.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql-bench/innotest1a.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,108 +1,108 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/InnoDB combined database
-#     (c) 2002 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/InnoDB combined database
+#     (c) 2002 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 200000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 200000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest1a: MySQL/InnoDB stress test in Perl\n";
-print "-------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on table innotest1 in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest1 > out1\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kh";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 1; $i++) {
-	print "loop $i\n";
-
-	for ($j = 1; $j < $opt_loop_count - 10; $j = $j + 2) {
-		$dbh->do(
-		"insert into innotest1 (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')");
-		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 2]."' where A = ".$random[$j + 5]);
-		$dbh->do("update innotest1 SET D = D + 1 where A =".(($j - 1) / 2 - 777));
-		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 8]."' where A =".(($j - 1) / 2 - 770));
-		$dbh->do("delete from innotest1 where A = ".$random[$random[$j]]);
-
-		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
-		
-		if (0 == ($j % 37)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 533)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 537)) {
-		print fetch_all_rows($dbh, "select c from innotest1 where c = '".$rnd_str[$j - 67]."'");
-		print fetch_all_rows($dbh, "select b from innotest1 where b = '".$rnd_str[$j - 688]."'");
-		print fetch_all_rows($dbh, "select b, c from innotest1 where c = '".$rnd_str[$j - 67]."'");
-		print fetch_all_rows($dbh, "select b, c from innotest1 where b = '".$rnd_str[$j - 622]."'");
-		print fetch_all_rows($dbh, "select a, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		print fetch_all_rows($dbh, "select a, b, c from innotest1 where b = '".$rnd_str[$j - 644]."'");
-		print fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		print fetch_all_rows($dbh, "select d, b, c from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		print "\n";
-		}
-
-		if (0 == (($j - 1) % 1000)) {
-			print "round $j\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest1a: MySQL/InnoDB stress test in Perl\n";
+print "-------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on table innotest1 in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest1 > out1\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kh";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 1; $i++) {
+	print "loop $i\n";
+
+	for ($j = 1; $j < $opt_loop_count - 10; $j = $j + 2) {
+		$dbh->do(
+		"insert into innotest1 (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')");
+		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 2]."' where A = ".$random[$j + 5]);
+		$dbh->do("update innotest1 SET D = D + 1 where A =".(($j - 1) / 2 - 777));
+		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 8]."' where A =".(($j - 1) / 2 - 770));
+		$dbh->do("delete from innotest1 where A = ".$random[$random[$j]]);
+
+		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
+		
+		if (0 == ($j % 37)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 533)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 537)) {
+		print fetch_all_rows($dbh, "select c from innotest1 where c = '".$rnd_str[$j - 67]."'");
+		print fetch_all_rows($dbh, "select b from innotest1 where b = '".$rnd_str[$j - 688]."'");
+		print fetch_all_rows($dbh, "select b, c from innotest1 where c = '".$rnd_str[$j - 67]."'");
+		print fetch_all_rows($dbh, "select b, c from innotest1 where b = '".$rnd_str[$j - 622]."'");
+		print fetch_all_rows($dbh, "select a, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		print fetch_all_rows($dbh, "select a, b, c from innotest1 where b = '".$rnd_str[$j - 644]."'");
+		print fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		print fetch_all_rows($dbh, "select d, b, c from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		print "\n";
+		}
+
+		if (0 == (($j - 1) % 1000)) {
+			print "round $j\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru percona-xtrabackup-2.2.3/sql-bench/innotest1b.sh percona-xtrabackup-2.3.7/sql-bench/innotest1b.sh
--- percona-xtrabackup-2.2.3/sql-bench/innotest1b.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql-bench/innotest1b.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,101 +1,101 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/InnoDB combined database
-#     (c) 2002 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/InnoDB combined database
+#     (c) 2002 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 200000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 200000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest1b: MySQL/InnoDB stress test in Perl\n";
-print "-------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on table innotest1 in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest1 > out1\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kh";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 5; $i++) {
-	print "loop $i\n";
-
-	for ($j = 1; $j < $opt_loop_count - 10; $j = $j + 2) {
-
-		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
-		
-		if (0 == ($j % 37)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 533)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 537)) {
-		print fetch_all_rows($dbh, "select c from innotest1 where c = '".$rnd_str[$j - 67]."'");
-		print fetch_all_rows($dbh, "select b from innotest1 where b = '".$rnd_str[$j - 688]."'");
-		print fetch_all_rows($dbh, "select b, c from innotest1 where c = '".$rnd_str[$j - 67]."'");
-		print fetch_all_rows($dbh, "select b, c from innotest1 where b = '".$rnd_str[$j - 622]."'");
-		print fetch_all_rows($dbh, "select a, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		print fetch_all_rows($dbh, "select a, b, c from innotest1 where b = '".$rnd_str[$j - 644]."'");
-		print fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		print fetch_all_rows($dbh, "select d, b, c from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		print "\n";
-		}
-
-		if (0 == (($j - 1) % 1000)) {
-			print "round $j\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest1b: MySQL/InnoDB stress test in Perl\n";
+print "-------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on table innotest1 in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest1 > out1\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kh";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 5; $i++) {
+	print "loop $i\n";
+
+	for ($j = 1; $j < $opt_loop_count - 10; $j = $j + 2) {
+
+		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
+		
+		if (0 == ($j % 37)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 533)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 537)) {
+		print fetch_all_rows($dbh, "select c from innotest1 where c = '".$rnd_str[$j - 67]."'");
+		print fetch_all_rows($dbh, "select b from innotest1 where b = '".$rnd_str[$j - 688]."'");
+		print fetch_all_rows($dbh, "select b, c from innotest1 where c = '".$rnd_str[$j - 67]."'");
+		print fetch_all_rows($dbh, "select b, c from innotest1 where b = '".$rnd_str[$j - 622]."'");
+		print fetch_all_rows($dbh, "select a, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		print fetch_all_rows($dbh, "select a, b, c from innotest1 where b = '".$rnd_str[$j - 644]."'");
+		print fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		print fetch_all_rows($dbh, "select d, b, c from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		print "\n";
+		}
+
+		if (0 == (($j - 1) % 1000)) {
+			print "round $j\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru percona-xtrabackup-2.2.3/sql-bench/innotest1.sh percona-xtrabackup-2.3.7/sql-bench/innotest1.sh
--- percona-xtrabackup-2.2.3/sql-bench/innotest1.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql-bench/innotest1.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,142 +1,142 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/InnoDB combined database
-#     (c) 2002 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/InnoDB combined database
+#     (c) 2002 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 100000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 100000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest1: MySQL/InnoDB stress test in Perl\n";
-print "-------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on table innotest1 in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest1 > out1\n\n";
-     
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kh";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-$dbh->do("set autocommit = 0");
-
-$n = 0;
-
-for ($i = 0; $i < 1; $i++) {
-
-	print "Dropping table innotest1\n";
-
-	$dbh->do("drop table innotest1");
-
-	print "Creating table innotest1\n";
-
-	$dbh->do(
-	"create table innotest1 (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), E TIMESTAMP, F TIMESTAMP, G DATETIME, PRIMARY KEY (A, D), INDEX
-(B, C), INDEX (C), INDEX (D), INDEX(E), INDEX(G)) TYPE = INNODB")
-	|| die $dbh->errstr;
-
-	for ($j = 2; $j < $opt_loop_count - 10; $j = $j + 2) {
-
-		if ($j % 10 == 0) {
-			$dbh->do(
-		"insert into innotest1 (D, B, C, F, G) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."', NULL, NULL)");
-		} else {
-			$dbh->do(
-		"insert into innotest1 (D, B, C, F, G) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."', NOW(), NOW())");
-		}
-
-		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 7]."' where A = ".$random[$j + 5]);
-
-		$dbh->do("update innotest1 SET D = D + 1 where A =".($j / 2 - 500));
-
-		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 1]."' where A =".($j / 2 - 505));
-
-		$dbh->do("delete from innotest1 where A = ".$random[$random[$j]]);
-		
-		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
-		
-		if (0 == ($j % 10)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 97)) {
-		fetch_all_rows($dbh, "select c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		fetch_all_rows($dbh, "select b, e, f, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		fetch_all_rows($dbh, "select b, c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		fetch_all_rows($dbh, "select b, c, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		fetch_all_rows($dbh, "select a, b, c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		fetch_all_rows($dbh, "select a, b, c, e, f, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		fetch_all_rows($dbh, "select d, b, c, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
-
-			$dbh->do("rollback");
-		}		
-
-        	for ($k = 1; $k < 10; $k++) {
-
-                	$n += fetch_all_rows($dbh,
-"SELECT a, d from innotest1 where a = ".(($k * 1764767) % $j));
-
-                	$n += fetch_all_rows($dbh,
-"SELECT * from innotest1 where a = ".(($k * 187567) % $j));
-
-        	}
-
-		if (0 == ($j % 1000)) {
-			print "round $j, $n rows fetched\n";
-		}
-
-		if (0 == ($j % 20000)) {
-			print "Checking table innotest1...\n";
-			$dbh->do("check table innotest1");
-			print "Table checked.\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest1: MySQL/InnoDB stress test in Perl\n";
+print "-------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on table innotest1 in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest1 > out1\n\n";
+     
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kh";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+$dbh->do("set autocommit = 0");
+
+$n = 0;
+
+for ($i = 0; $i < 1; $i++) {
+
+	print "Dropping table innotest1\n";
+
+	$dbh->do("drop table innotest1");
+
+	print "Creating table innotest1\n";
+
+	$dbh->do(
+	"create table innotest1 (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), E TIMESTAMP, F TIMESTAMP, G DATETIME, PRIMARY KEY (A, D), INDEX
+(B, C), INDEX (C), INDEX (D), INDEX(E), INDEX(G)) TYPE = INNODB")
+	|| die $dbh->errstr;
+
+	for ($j = 2; $j < $opt_loop_count - 10; $j = $j + 2) {
+
+		if ($j % 10 == 0) {
+			$dbh->do(
+		"insert into innotest1 (D, B, C, F, G) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."', NULL, NULL)");
+		} else {
+			$dbh->do(
+		"insert into innotest1 (D, B, C, F, G) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."', NOW(), NOW())");
+		}
+
+		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 7]."' where A = ".$random[$j + 5]);
+
+		$dbh->do("update innotest1 SET D = D + 1 where A =".($j / 2 - 500));
+
+		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 1]."' where A =".($j / 2 - 505));
+
+		$dbh->do("delete from innotest1 where A = ".$random[$random[$j]]);
+		
+		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
+		
+		if (0 == ($j % 10)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 97)) {
+		fetch_all_rows($dbh, "select c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		fetch_all_rows($dbh, "select b, e, f, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		fetch_all_rows($dbh, "select b, c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		fetch_all_rows($dbh, "select b, c, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		fetch_all_rows($dbh, "select a, b, c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		fetch_all_rows($dbh, "select a, b, c, e, f, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		fetch_all_rows($dbh, "select d, b, c, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
+
+			$dbh->do("rollback");
+		}		
+
+        	for ($k = 1; $k < 10; $k++) {
+
+                	$n += fetch_all_rows($dbh,
+"SELECT a, d from innotest1 where a = ".(($k * 1764767) % $j));
+
+                	$n += fetch_all_rows($dbh,
+"SELECT * from innotest1 where a = ".(($k * 187567) % $j));
+
+        	}
+
+		if (0 == ($j % 1000)) {
+			print "round $j, $n rows fetched\n";
+		}
+
+		if (0 == ($j % 20000)) {
+			print "Checking table innotest1...\n";
+			$dbh->do("check table innotest1");
+			print "Table checked.\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru percona-xtrabackup-2.2.3/sql-bench/innotest2a.sh percona-xtrabackup-2.3.7/sql-bench/innotest2a.sh
--- percona-xtrabackup-2.2.3/sql-bench/innotest2a.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql-bench/innotest2a.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,94 +1,94 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/Innobase combined database
-#     (c) 2000 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/Innobase combined database
+#     (c) 2000 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 100000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 100000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest2a: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
-print "------------------------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks with foreign keys with\n";
-print "the ON DELETE ... clause. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest2 > out2\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "khD";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kHd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 5; $i++) {
-	print "loop $i\n";
-
-	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 1) {
-		
-		$dbh->do("update innotest2a set B = '".$rnd_str[$j + 1]."' where A = ".$random[$j + 5])
-		|| print $dbh->errstr;
-
-		$dbh->do("delete from innotest2a where A = ".$random[$random[$j]])
-		|| print $dbh->errstr;
-		
-		if (0 == ($j % 10)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 39)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 1000)) {
-			print "round $j\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest2a: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
+print "------------------------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks with foreign keys with\n";
+print "the ON DELETE ... clause. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest2 > out2\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "khD";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kHd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 5; $i++) {
+	print "loop $i\n";
+
+	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 1) {
+		
+		$dbh->do("update innotest2a set B = '".$rnd_str[$j + 1]."' where A = ".$random[$j + 5])
+		|| print $dbh->errstr;
+
+		$dbh->do("delete from innotest2a where A = ".$random[$random[$j]])
+		|| print $dbh->errstr;
+		
+		if (0 == ($j % 10)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 39)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 1000)) {
+			print "round $j\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru percona-xtrabackup-2.2.3/sql-bench/innotest2b.sh percona-xtrabackup-2.3.7/sql-bench/innotest2b.sh
--- percona-xtrabackup-2.2.3/sql-bench/innotest2b.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql-bench/innotest2b.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,104 +1,104 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/Innobase combined database
-#     (c) 2000 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/Innobase combined database
+#     (c) 2000 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 100000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 100000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest2b: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
-print "------------------------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks with foreign keys with\n";
-print "the ON DELETE ... clause. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest2 > out2\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 98641) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "khD";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kHd";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 10); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect();
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 1; $i++) {
-	print "loop $i\n";
-
-	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 2) {
-		$dbh->do(
-		"insert into innotest2b (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do(
-		"insert into innotest2a (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-		
-		$dbh->do(
-		"insert into innotest2c (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do("delete from innotest2b where A = ".$random[$random[$j]])
-		|| print $dbh->errstr;
-
-		$dbh->do("update innotest2b set A = A + 1 where A = ".$random[$j])
-		|| print $dbh->errstr;
-
-		if (0 == ($j % 10)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 39)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 1000)) {
-			print "round $j\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest2b: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
+print "------------------------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks with foreign keys with\n";
+print "the ON DELETE ... clause. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest2 > out2\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 98641) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "khD";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kHd";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 10); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect();
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 1; $i++) {
+	print "loop $i\n";
+
+	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 2) {
+		$dbh->do(
+		"insert into innotest2b (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do(
+		"insert into innotest2a (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+		
+		$dbh->do(
+		"insert into innotest2c (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do("delete from innotest2b where A = ".$random[$random[$j]])
+		|| print $dbh->errstr;
+
+		$dbh->do("update innotest2b set A = A + 1 where A = ".$random[$j])
+		|| print $dbh->errstr;
+
+		if (0 == ($j % 10)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 39)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 1000)) {
+			print "round $j\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru percona-xtrabackup-2.2.3/sql-bench/innotest2.sh percona-xtrabackup-2.3.7/sql-bench/innotest2.sh
--- percona-xtrabackup-2.2.3/sql-bench/innotest2.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql-bench/innotest2.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,150 +1,150 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/InnoDB combined database
-#     (c) 2002 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/InnoDB combined database
+#     (c) 2002 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 100000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 100000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest2: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
-print "------------------------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks with foreign keys with\n";
-print "the ON DELETE ... clause. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest2 > out2\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "khD";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kHd";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 10); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 1; $i++) {
-	print "loop $i\n";
-
-	print "dropping table innotest2a\n";
-	$dbh->do("drop table innotest2a");
-
-	print "dropping table innotest2b\n";
-	$dbh->do("drop table innotest2b");
-
-	print "dropping table innotest2c\n";
-	$dbh->do("drop table innotest2c");
-
-	print "dropping table innotest2d\n";
-	$dbh->do("drop table innotest2d");
-
-	print "creating table innotest2b\n";
-	$dbh->do(
-	"create table innotest2b (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C)) TYPE = INNODB")
-	|| die $dbh->errstr;	
-
-	print "creating table innotest2a\n";
-
-	$dbh->do(
-	"create table innotest2a (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (A, D) REFERENCES innotest2b (A, D) ON DELETE CASCADE) TYPE = INNODB")
-	|| die $dbh->errstr;
-
-	print "creating table innotest2c\n";
-
-	$dbh->do(
-	"create table innotest2c (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (A, D) REFERENCES innotest2a (A, D) ON DELETE CASCADE, FOREIGN KEY (B, C) REFERENCES innotest2a (B, C) ON DELETE CASCADE) TYPE = INNODB")
-	|| die $dbh->errstr;	
-
-	print "creating table innotest2d\n";
-
-	$dbh->do(
-	"create table innotest2d (A INT AUTO_INCREMENT, D INT, B VARCHAR(200), C VARCHAR(175), UNIQUE KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (C) REFERENCES innotest2c (C) ON DELETE SET NULL, FOREIGN KEY (B, C) REFERENCES innotest2c (B, C) ON DELETE SET NULL) TYPE = INNODB")
-	|| die $dbh->errstr;	
-	print "created\n";
-
-	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 2) {
-		$dbh->do(
-		"insert into innotest2b (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do(
-		"insert into innotest2a (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-		
-		$dbh->do(
-		"insert into innotest2c (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do(
-		"insert into innotest2d (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do("delete from innotest2b where A = ".$random[$random[$j]])
-		|| print $dbh->errstr;
-		
-		if (0 == ($j % 10)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 39)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 1000)) {
-			print "round $j\n";
-		}
-		if (0 == ($j % 20000)) {
-			print "Checking tables...\n";
-			$dbh->do("check table innotest2a");
-			$dbh->do("check table innotest2b");
-			$dbh->do("check table innotest2c");
-			$dbh->do("check table innotest2d");
-			print "Tables checked.\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest2: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
+print "------------------------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks with foreign keys with\n";
+print "the ON DELETE ... clause. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest2 > out2\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "khD";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kHd";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 10); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 1; $i++) {
+	print "loop $i\n";
+
+	print "dropping table innotest2a\n";
+	$dbh->do("drop table innotest2a");
+
+	print "dropping table innotest2b\n";
+	$dbh->do("drop table innotest2b");
+
+	print "dropping table innotest2c\n";
+	$dbh->do("drop table innotest2c");
+
+	print "dropping table innotest2d\n";
+	$dbh->do("drop table innotest2d");
+
+	print "creating table innotest2b\n";
+	$dbh->do(
+	"create table innotest2b (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C)) TYPE = INNODB")
+	|| die $dbh->errstr;	
+
+	print "creating table innotest2a\n";
+
+	$dbh->do(
+	"create table innotest2a (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (A, D) REFERENCES innotest2b (A, D) ON DELETE CASCADE) TYPE = INNODB")
+	|| die $dbh->errstr;
+
+	print "creating table innotest2c\n";
+
+	$dbh->do(
+	"create table innotest2c (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (A, D) REFERENCES innotest2a (A, D) ON DELETE CASCADE, FOREIGN KEY (B, C) REFERENCES innotest2a (B, C) ON DELETE CASCADE) TYPE = INNODB")
+	|| die $dbh->errstr;	
+
+	print "creating table innotest2d\n";
+
+	$dbh->do(
+	"create table innotest2d (A INT AUTO_INCREMENT, D INT, B VARCHAR(200), C VARCHAR(175), UNIQUE KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (C) REFERENCES innotest2c (C) ON DELETE SET NULL, FOREIGN KEY (B, C) REFERENCES innotest2c (B, C) ON DELETE SET NULL) TYPE = INNODB")
+	|| die $dbh->errstr;	
+	print "created\n";
+
+	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 2) {
+		$dbh->do(
+		"insert into innotest2b (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do(
+		"insert into innotest2a (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+		
+		$dbh->do(
+		"insert into innotest2c (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do(
+		"insert into innotest2d (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do("delete from innotest2b where A = ".$random[$random[$j]])
+		|| print $dbh->errstr;
+		
+		if (0 == ($j % 10)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 39)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 1000)) {
+			print "round $j\n";
+		}
+		if (0 == ($j % 20000)) {
+			print "Checking tables...\n";
+			$dbh->do("check table innotest2a");
+			$dbh->do("check table innotest2b");
+			$dbh->do("check table innotest2c");
+			$dbh->do("check table innotest2d");
+			print "Tables checked.\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru percona-xtrabackup-2.2.3/sql-common/client.c percona-xtrabackup-2.3.7/sql-common/client.c
--- percona-xtrabackup-2.2.3/sql-common/client.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/sql-common/client.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2015, 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
@@ -724,6 +724,20 @@
   */
   net_clear(&mysql->net, (command != COM_QUIT));
 
+#if !defined(EMBEDDED_LIBRARY)
+  /*
+    If auto-reconnect mode is enabled check if connection is still alive before
+    sending new command. Otherwise, send() might not notice that connection was
+    closed by the server (for example, due to KILL statement), and the fact that
+    connection is gone will be noticed only on attempt to read command's result,
+    when it is too late to reconnect. Note that such scenario can still occur if
+    connection gets killed after this check but before command is sent to
+    server. But this should be rare.
+  */
+  if ((command != COM_QUIT) && mysql->reconnect && !vio_is_connected(net->vio))
+    net->error= 2;
+#endif
+
   if (net_write_command(net,(uchar) command, header, header_length,
 			arg, arg_length))
   {
@@ -1090,7 +1104,7 @@
         my_strdup((STR), MYF(MY_WME)) : NULL;                    \
     } while (0)
 
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+#if defined(HAVE_OPENSSL) && (!defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP))
 #define SET_SSL_OPTION(opt_var,arg) \
     if (mysql->options.opt_var) \
       my_free(mysql->options.opt_var); \
@@ -1212,7 +1226,7 @@
 	case OPT_return_found_rows:
 	  options->client_flag|=CLIENT_FOUND_ROWS;
 	  break;
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+#if defined(HAVE_OPENSSL) && (!defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP))
 	case OPT_ssl_key:
 	  my_free(options->ssl_key);
           options->ssl_key = my_strdup(opt_arg, MYF(MY_WME));
@@ -1248,7 +1262,7 @@
         case OPT_ssl_crl:
         case OPT_ssl_crlpath:
 	  break;
-#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
+#endif /* HAVE_OPENSSL && (!EMBEDDED_LIBRARY || XTRABACKUP) */
 	case OPT_character_sets_dir:
 	  my_free(options->charset_dir);
           options->charset_dir = my_strdup(opt_arg, MYF(MY_WME));
@@ -1665,8 +1679,8 @@
   strmov(mysql->net.sqlstate, not_error_sqlstate);
 
   /*
-    Only enable LOAD DATA INFILE by default if configured with
-    --enable-local-infile
+    Only enable LOAD DATA INFILE by default if configured with option
+    ENABLED_LOCAL_INFILE
   */
 
 #if defined(ENABLED_LOCAL_INFILE) && !defined(MYSQL_SERVER)
@@ -1720,7 +1734,7 @@
 {
   my_bool result= 0;
   DBUG_ENTER("mysql_ssl_set");
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+#if defined(HAVE_OPENSSL) && (!defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP))
   result=
     mysql_options(mysql, MYSQL_OPT_SSL_KEY,    key)    +
     mysql_options(mysql, MYSQL_OPT_SSL_CERT,   cert)   +
@@ -1738,7 +1752,7 @@
   NB! Errors are not reported until you do mysql_real_connect.
 */
 
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+#if defined(HAVE_OPENSSL) && (!defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP))
 
 static void
 mysql_ssl_free(MYSQL *mysql __attribute__((unused)))
@@ -1774,7 +1788,7 @@
   DBUG_VOID_RETURN;
 }
 
-#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
+#endif /* HAVE_OPENSSL && (!EMBEDDED_LIBRARY || XTRABACKUP) */
 
 /*
   Return the SSL cipher (if any) used for current
@@ -1790,10 +1804,10 @@
 mysql_get_ssl_cipher(MYSQL *mysql __attribute__((unused)))
 {
   DBUG_ENTER("mysql_get_ssl_cipher");
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+#if defined(HAVE_OPENSSL) && (!defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP))
   if (mysql->net.vio && mysql->net.vio->ssl_arg)
     DBUG_RETURN(SSL_get_cipher_name((SSL*)mysql->net.vio->ssl_arg));
-#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
+#endif /* HAVE_OPENSSL && (!EMBEDDED_LIBRARY || XTRABACKUP) */
   DBUG_RETURN(NULL);
 }
 
@@ -1815,7 +1829,7 @@
 
  */
 
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+#if defined(HAVE_OPENSSL) && (!defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP))
 
 static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const char **errptr)
 {
@@ -1844,6 +1858,12 @@
     DBUG_RETURN(1);
   }
 
+  if (X509_V_OK != SSL_get_verify_result(ssl))
+  {
+    *errptr= "Failed to verify the server certificate";
+    X509_free(server_cert);
+    DBUG_RETURN(1);
+  }
   /*
     We already know that the certificate exchanged was valid; the SSL library
     handled that. Now we need to verify that the contents of the certificate
@@ -1873,7 +1893,7 @@
   DBUG_RETURN(1);
 }
 
-#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
+#endif /* HAVE_OPENSSL && (!EMBEDDED_LIBRARY || XTRABACKUP) */
 
 
 /*
@@ -2579,7 +2599,7 @@
   if (mysql->client_flag & CLIENT_MULTI_STATEMENTS)
     mysql->client_flag|= CLIENT_MULTI_RESULTS;
 
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+#if defined(HAVE_OPENSSL) && (!defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP))
   if (mysql->options.ssl_key || mysql->options.ssl_cert ||
       mysql->options.ssl_ca || mysql->options.ssl_capath ||
       mysql->options.ssl_cipher ||
@@ -2588,7 +2608,7 @@
     mysql->options.use_ssl= 1;
   if (mysql->options.use_ssl)
     mysql->client_flag|= CLIENT_SSL;
-#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY*/
+#endif /* HAVE_OPENSSL && (!EMBEDDED_LIBRARY || XTRABACKUP) */
   if (mpvio->db)
     mysql->client_flag|= CLIENT_CONNECT_WITH_DB;
   else
@@ -3537,8 +3557,7 @@
       */
       saved_error= socket_errno;
 
-      DBUG_PRINT("info", ("No success, close socket, try next address."));
-      closesocket(sock);
+      DBUG_PRINT("info", ("No success, try next address."));
     }
     DBUG_PRINT("info",
                ("End of connect attempts, sock: %d  status: %d  error: %d",
@@ -3920,9 +3939,9 @@
     delete_dynamic(init_commands);
     my_free(init_commands);
   }
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+#if defined(HAVE_OPENSSL) && (!defined(EMBEDDED_LIBRARY) || defined(XTRABACKUP))
   mysql_ssl_free(mysql);
-#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
+#endif /* HAVE_OPENSSL && (!EMBEDDED_LIBRARY || XTRABACKUP) */
 #ifdef HAVE_SMEM
   if (mysql->options.shared_memory_base_name != def_shared_memory_base_name)
     my_free(mysql->options.shared_memory_base_name);
@@ -3971,12 +3990,15 @@
 */
 static void mysql_prune_stmt_list(MYSQL *mysql)
 {
-  LIST *element= mysql->stmts;
-  LIST *pruned_list= 0;
+  LIST *pruned_list= NULL;
 
-  for (; element; element= element->next)
+  while(mysql->stmts)
   {
-    MYSQL_STMT *stmt= (MYSQL_STMT *) element->data;
+    LIST *element= mysql->stmts;
+    MYSQL_STMT *stmt;
+
+    mysql->stmts= list_delete(element, element);
+    stmt= (MYSQL_STMT *) element->data;
     if (stmt->state != MYSQL_STMT_INIT_DONE)
     {
       stmt->mysql= 0;
@@ -4042,8 +4064,8 @@
     {
       free_old_query(mysql);
       mysql->status=MYSQL_STATUS_READY; /* Force command */
-      mysql->reconnect=0;
       simple_command(mysql,COM_QUIT,(uchar*) 0,0,1);
+      mysql->reconnect=0;
       end_server(mysql);			/* Sets mysql->net.vio= 0 */
     }
     mysql_close_free_options(mysql);
@@ -4637,17 +4659,27 @@
 
   RETURN
    Signed number > 323000
+   Zero if there is no connection
 */
 
 ulong STDCALL
 mysql_get_server_version(MYSQL *mysql)
 {
-  uint major, minor, version;
-  char *pos= mysql->server_version, *end_pos;
-  major=   (uint) strtoul(pos, &end_pos, 10);	pos=end_pos+1;
-  minor=   (uint) strtoul(pos, &end_pos, 10);	pos=end_pos+1;
-  version= (uint) strtoul(pos, &end_pos, 10);
-  return (ulong) major*10000L+(ulong) (minor*100+version);
+  ulong major= 0, minor= 0, version= 0;
+
+  if (mysql->server_version)
+  {
+    char *pos= mysql->server_version, *end_pos;
+    major=   strtoul(pos, &end_pos, 10);	pos=end_pos+1;
+    minor=   strtoul(pos, &end_pos, 10);	pos=end_pos+1;
+    version= strtoul(pos, &end_pos, 10);
+  }
+  else
+  {
+    set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
+  }
+
+  return major*10000 + minor*100 + version;
 }
 
 
diff -Nru percona-xtrabackup-2.2.3/storage/federated/ha_federated.cc percona-xtrabackup-2.3.7/storage/federated/ha_federated.cc
--- percona-xtrabackup-2.2.3/storage/federated/ha_federated.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/federated/ha_federated.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2015, 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
@@ -402,7 +402,6 @@
 
 /* Variables used when chopping off trailing characters */
 static const uint sizeof_trailing_comma= sizeof(", ") - 1;
-static const uint sizeof_trailing_closeparen= sizeof(") ") - 1;
 static const uint sizeof_trailing_and= sizeof(" AND ") - 1;
 static const uint sizeof_trailing_where= sizeof(" WHERE ") - 1;
 
@@ -1675,9 +1674,17 @@
   DBUG_ENTER("ha_federated::close");
 
   free_result();
-  
+
   delete_dynamic(&results);
-  
+
+  /*
+    Check to verify wheather the connection is still alive or not.
+    FLUSH TABLES will quit the connection and if connection is broken,
+    it will reconnect again and quit silently.
+  */
+  if (mysql && !vio_is_connected(mysql->net.vio))
+     mysql->net.error= 2;
+
   /* Disconnect from mysql */
   mysql_close(mysql);
   mysql= NULL;
@@ -2894,7 +2901,7 @@
 
   }
 
-  if (flag & HA_STATUS_AUTO)
+  if ((flag & HA_STATUS_AUTO) && mysql)
     stats.auto_increment_value= mysql->insert_id;
 
   mysql_free_result(result);
diff -Nru percona-xtrabackup-2.2.3/storage/heap/hp_block.c percona-xtrabackup-2.3.7/storage/heap/hp_block.c
--- percona-xtrabackup-2.2.3/storage/heap/hp_block.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/heap/hp_block.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -75,7 +75,8 @@
     This doesn't add much overhead - with current values of sizeof(HP_PTRS) 
     and my_default_record_cache_size we get about 1/128 unused memory.
    */
-  *alloc_length=sizeof(HP_PTRS)*i+block->records_in_block* block->recbuffer;
+  *alloc_length= sizeof(HP_PTRS)* i + (ulonglong) block->records_in_block *
+                                              block->recbuffer;
   if (!(root=(HP_PTRS*) my_malloc(*alloc_length,MYF(MY_WME))))
     return 1;
 
diff -Nru percona-xtrabackup-2.2.3/storage/heap/hp_create.c percona-xtrabackup-2.3.7/storage/heap/hp_create.c
--- percona-xtrabackup-2.2.3/storage/heap/hp_create.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/heap/hp_create.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -240,7 +240,7 @@
   records_in_block= max_records / 10;
   if (records_in_block < 10 && max_records)
     records_in_block= 10;
-  if (!records_in_block || records_in_block*recbuffer >
+  if (!records_in_block || (ulonglong) records_in_block * recbuffer >
       (my_default_record_cache_size-sizeof(HP_PTRS)*HP_MAX_LEVELS))
     records_in_block= (my_default_record_cache_size - sizeof(HP_PTRS) *
 		      HP_MAX_LEVELS) / recbuffer + 1;
diff -Nru percona-xtrabackup-2.2.3/storage/heap/hp_hash.c percona-xtrabackup-2.3.7/storage/heap/hp_hash.c
--- percona-xtrabackup-2.2.3/storage/heap/hp_hash.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/heap/hp_hash.c	2017-02-27 07:47:02.000000000 +0000
@@ -730,7 +730,7 @@
       {
 	float nr;
 	float4get(nr, pos);
-	if (isnan(nr))
+	if (my_isnan(nr))
 	{
 	  /* Replace NAN with zero */
  	  memset(key, 0, length);
@@ -742,7 +742,7 @@
       {
 	double nr;
 	float8get(nr, pos);
-	if (isnan(nr))
+	if (my_isnan(nr))
 	{
  	  memset(key, 0, length);
 	  key+= length;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/api/api0api.cc percona-xtrabackup-2.3.7/storage/innobase/api/api0api.cc
--- percona-xtrabackup-2.2.3/storage/innobase/api/api0api.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/api/api0api.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2008, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2008, 2015, 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
@@ -205,9 +205,9 @@
 };
 
 /** The following counter is used to convey information to InnoDB
-about server activity: in selects it is not sensible to call
-srv_active_wake_master_thread after each fetch or search, we only do
-it every INNOBASE_WAKE_INTERVAL'th step. */
+about server activity: in case of normal DML ops it is not
+sensible to call srv_active_wake_master_thread after each
+operation, we only do it every INNOBASE_WAKE_INTERVAL'th step. */
 
 #define INNOBASE_WAKE_INTERVAL	32
 
@@ -318,35 +318,6 @@
         }
 }
 
-/*********************************************************************//**
-Calculate the max row size of the columns in a cluster index.
-@return	max row length */
-UNIV_INLINE
-ulint
-ib_get_max_row_len(
-/*===============*/
-	dict_index_t*	cluster)		/*!< in: cluster index */
-{
-	ulint		i;
-	ulint		max_len = 0;
-	ulint		n_fields = cluster->n_fields;
-
-	/* Add the size of the ordering columns in the
-	clustered index. */
-	for (i = 0; i < n_fields; ++i) {
-		const dict_col_t*	col;
-
-		col = dict_index_get_nth_col(cluster, i);
-
-		/* Use the maximum output size of
-		mach_write_compressed(), although the encoded
-		length should always fit in 2 bytes. */
-		max_len += dict_col_get_max_size(col);
-	}
-
-	return(max_len);
-}
-
 /*****************************************************************//**
 Read the columns from a rec into a tuple. */
 static
@@ -707,125 +678,9 @@
         /* It should always succeed */
         ut_a(err == DB_SUCCESS);
 
-	ib_wake_master_thread();
-
 	return(err);
 }
 
-/*****************************************************************//**
-Find an index definition from the index vector using index name.
-@return	index def. if found else NULL */
-UNIV_INLINE
-const ib_index_def_t*
-ib_table_find_index(
-/*================*/
-	ib_vector_t*	indexes,	/*!< in: vector of indexes */
-	const char*	name)		/*!< in: index name */
-{
-	ulint		i;
-
-	for (i = 0; i < ib_vector_size(indexes); ++i) {
-		const ib_index_def_t*	index_def;
-
-		index_def = (ib_index_def_t*) ib_vector_get(indexes, i);
-
-		if (innobase_strcasecmp(name, index_def->name) == 0) {
-			return(index_def);
-		}
-	}
-
-	return(NULL);
-}
-
-/*****************************************************************//**
-Get the InnoDB internal precise type from the schema column definition.
-@return	precise type in api format */
-UNIV_INLINE
-ulint
-ib_col_get_prtype(
-/*==============*/
-	const ib_col_t*	ib_col)		/*!< in: column definition */
-{
-	ulint		prtype = 0;
-
-	if (ib_col->ib_col_attr & IB_COL_UNSIGNED) {
-		prtype |= DATA_UNSIGNED;
-
-		ut_a(ib_col->ib_col_type == IB_INT);
-	}
-
-	if (ib_col->ib_col_attr & IB_COL_NOT_NULL) {
-		prtype |= DATA_NOT_NULL;
-	}
-
-	return(prtype);
-}
-
-/*****************************************************************//**
-Get the InnoDB internal main type from the schema column definition.
-@return	column main type */
-UNIV_INLINE
-ulint
-ib_col_get_mtype(
-/*==============*/
-	const ib_col_t*	ib_col)		/*!< in: column definition */
-{
-	/* Note: The api0api.h types should map directly to
-	the internal numeric codes. */
-	return(ib_col->ib_col_type);
-}
-
-/*****************************************************************//**
-Find a column in the the column vector with the same name.
-@return	col. def. if found else NULL */
-UNIV_INLINE
-const ib_col_t*
-ib_table_find_col(
-/*==============*/
-	const ib_vector_t*	cols,	/*!< in: column list head */
-	const char*	name)		/*!< in: column name to find */
-{
-	ulint		i;
-
-	for (i = 0; i < ib_vector_size(cols); ++i) {
-		const ib_col_t*	ib_col;
-
-		ib_col =  static_cast<const ib_col_t*>(
-			ib_vector_get((ib_vector_t*) cols, i));
-
-		if (innobase_strcasecmp(ib_col->name, name) == 0) {
-			return(ib_col);
-		}
-	}
-
-	return(NULL);
-}
-
-/*****************************************************************//**
-Find a column in the the column list with the same name.
-@return	col. def. if found else NULL */
-UNIV_INLINE
-const ib_key_col_t*
-ib_index_find_col(
-/*==============*/
-	ib_vector_t*	cols,		/*!< in: column list head */
-	const char*	name)		/*!< in: column name to find */
-{
-	ulint		i;
-
-	for (i = 0; i < ib_vector_size(cols); ++i) {
-		const ib_key_col_t*	ib_col;
-
-		ib_col = static_cast<ib_key_col_t*>(ib_vector_get(cols, i));
-
-		if (innobase_strcasecmp(ib_col->name, name) == 0) {
-			return(ib_col);
-		}
-	}
-
-	return(NULL);
-}
-
 #ifdef __WIN__
 /*****************************************************************//**
 Convert a string to lower case. */
@@ -949,34 +804,6 @@
 
 
 /*****************************************************************//**
-Get an index definition that is tagged as a clustered index.
-@return	cluster index schema */
-UNIV_INLINE
-ib_index_def_t*
-ib_find_clustered_index(
-/*====================*/
-	ib_vector_t*	indexes)	/*!< in: index defs. to search */
-{
-	ulint		i;
-	ulint		n_indexes;
-
-	n_indexes = ib_vector_size(indexes);
-
-	for (i = 0; i < n_indexes; ++i) {
-		ib_index_def_t*	ib_index_def;
-
-		ib_index_def = static_cast<ib_index_def_t*>(
-			ib_vector_get(indexes, i));
-
-		if (ib_index_def->clustered) {
-			return(ib_index_def);
-		}
-	}
-
-	return(NULL);
-}
-
-/*****************************************************************//**
 Get a table id. The caller must have acquired the dictionary mutex.
 @return	DB_SUCCESS if found */
 static
@@ -1654,7 +1481,7 @@
 			src_tuple->index->table, q_proc->grph.ins, node->ins);
 	}
 
-	srv_active_wake_master_thread();
+	ib_wake_master_thread();
 
 	return(err);
 }
@@ -1940,7 +1767,7 @@
 		err = ib_execute_update_query_graph(cursor, pcur);
 	}
 
-	srv_active_wake_master_thread();
+	ib_wake_master_thread();
 
 	return(err);
 }
@@ -2044,6 +1871,8 @@
 		const rec_t*	rec;
 		ib_bool_t	page_format;
 		mtr_t		mtr;
+		rec_t*		copy = NULL;
+	        byte		ptr[UNIV_PAGE_SIZE_MAX];
 
 		page_format = static_cast<ib_bool_t>(
 			dict_table_is_comp(index->table));
@@ -2052,16 +1881,27 @@
 
 		if (btr_pcur_restore_position(
 			BTR_SEARCH_LEAF, pcur, &mtr)) {
+			mem_heap_t*	heap = NULL;
+			ulint		offsets_[REC_OFFS_NORMAL_SIZE];
+			ulint*		offsets	= offsets_;
+
+			rec_offs_init(offsets_);
 
 			rec = btr_pcur_get_rec(pcur);
-		} else {
-			rec = NULL;
+
+			/* Since mtr will be commited, the rec
+			will not be protected. Make a copy of
+			the rec. */
+			offsets = rec_get_offsets(
+				rec, index, offsets, ULINT_UNDEFINED, &heap);
+			ut_ad(rec_offs_size(offsets) < UNIV_PAGE_SIZE_MAX);
+			copy = rec_copy(ptr, rec, offsets);
 		}
 
 		mtr_commit(&mtr);
 
-		if (rec && !rec_get_deleted_flag(rec, page_format)) {
-			err = ib_delete_row(cursor, pcur, rec);
+		if (copy && !rec_get_deleted_flag(copy, page_format)) {
+			err = ib_delete_row(cursor, pcur, copy);
 		} else {
 			err = DB_RECORD_NOT_FOUND;
 		}
@@ -2069,7 +1909,7 @@
 		err = DB_RECORD_NOT_FOUND;
 	}
 
-	srv_active_wake_master_thread();
+	ib_wake_master_thread();
 
 	return(err);
 }
@@ -3541,41 +3381,6 @@
 	prebuilt->need_to_access_clustered = TRUE;
 }
 
-/*************************************************************//**
-Convert and write an INT column value to an InnoDB tuple.
-@return	DB_SUCCESS or error */
-UNIV_INLINE
-ib_err_t
-ib_tuple_write_int(
-/*===============*/
-	ib_tpl_t	ib_tpl,		/*!< in/out: tuple to write to */
-	ulint		col_no,		/*!< in: column number */
-	const void*	value,		/*!< in: integer value */
-	ulint		value_len)	/*!< in: sizeof value type */
-{
-	const dfield_t*	dfield;
-	ulint		data_len;
-	ulint		type_len;
-	ib_tuple_t*	tuple = (ib_tuple_t*) ib_tpl;
-
-	ut_a(col_no < ib_tuple_get_n_cols(ib_tpl));
-
-	dfield = ib_col_get_dfield(tuple, col_no);
-
-	data_len = dfield_get_len(dfield);
-	type_len = dtype_get_len(dfield_get_type(dfield));
-
-	if (dtype_get_mtype(dfield_get_type(dfield)) != DATA_INT
-	    || value_len != data_len) {
-
-		return(DB_DATA_MISMATCH);
-	}
-
-	return(ib_col_set_value(
-		ib_tpl, static_cast<ib_ulint_t>(col_no),
-		value, static_cast<ib_ulint_t>(type_len), true));
-}
-
 /*****************************************************************//**
 Write an integer value to a column. Integers are stored in big-endian
 format and will need to be converted from the host format.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/btr/btr0btr.cc percona-xtrabackup-2.3.7/storage/innobase/btr/btr0btr.cc
--- percona-xtrabackup-2.2.3/storage/innobase/btr/btr0btr.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/btr/btr0btr.cc	2017-02-27 07:47:02.000000000 +0000
@@ -2033,7 +2033,8 @@
 {
 	ulint	level;
 
-	ut_ad(ptr && end_ptr);
+	ut_ad(ptr != NULL);
+	ut_ad(end_ptr != NULL);
 
 	/* If dealing with a compressed page the record has the
 	compression level used during original compression written in
@@ -2802,6 +2803,134 @@
 	return(cmp_dtuple_rec(tuple, first_rec, *offsets) < 0);
 }
 
+/** Insert the tuple into the right sibling page, if the cursor is at the end
+of a page.
+@param[in]	flags	undo logging and locking flags
+@param[in,out]	cursor	cursor at which to insert; when the function succeeds,
+			the cursor is positioned before the insert point.
+@param[out]	offsets	offsets on inserted record
+@param[in,out]	heap	memory heap for allocating offsets
+@param[in]	tuple	tuple to insert
+@param[in]	n_ext	number of externally stored columns
+@param[in,out]	mtr	mini-transaction
+@return	inserted record (first record on the right sibling page);
+	the cursor will be positioned on the page infimum
+@retval	NULL if the operation was not performed */
+static
+rec_t*
+btr_insert_into_right_sibling(
+	ulint		flags,
+	btr_cur_t*	cursor,
+	ulint**		offsets,
+	mem_heap_t*	heap,
+	const dtuple_t*	tuple,
+	ulint		n_ext,
+	mtr_t*		mtr)
+{
+	buf_block_t*	block = btr_cur_get_block(cursor);
+	page_t*		page = buf_block_get_frame(block);
+	ulint		next_page_no = btr_page_get_next(page, mtr);
+
+	ut_ad(mtr_memo_contains(mtr, dict_index_get_lock(cursor->index),
+				MTR_MEMO_X_LOCK));
+	ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
+	ut_ad(heap);
+
+	if (next_page_no == FIL_NULL || !page_rec_is_supremum(
+			page_rec_get_next(btr_cur_get_rec(cursor)))) {
+
+		return(NULL);
+	}
+
+	page_cur_t	next_page_cursor;
+	buf_block_t*	next_block;
+	page_t*		next_page;
+	btr_cur_t	next_father_cursor;
+	rec_t*		rec = NULL;
+	ulint		zip_size = buf_block_get_zip_size(block);
+	ulint		max_size;
+
+	next_block = btr_block_get(
+		buf_block_get_space(block), zip_size,
+		next_page_no, RW_X_LATCH, cursor->index, mtr);
+	next_page = buf_block_get_frame(next_block);
+
+	bool	is_leaf = page_is_leaf(next_page);
+
+	btr_page_get_father(
+		cursor->index, next_block, mtr, &next_father_cursor);
+
+	page_cur_search(
+		next_block, cursor->index, tuple, PAGE_CUR_LE,
+		&next_page_cursor);
+
+	max_size = page_get_max_insert_size_after_reorganize(next_page, 1);
+
+	/* Extends gap lock for the next page */
+	lock_update_split_left(next_block, block);
+
+	rec = page_cur_tuple_insert(
+		&next_page_cursor, tuple, cursor->index, offsets, &heap,
+		n_ext, mtr);
+
+	if (rec == NULL) {
+		if (zip_size && is_leaf
+		    && !dict_index_is_clust(cursor->index)) {
+			/* Reset the IBUF_BITMAP_FREE bits, because
+			page_cur_tuple_insert() will have attempted page
+			reorganize before failing. */
+			ibuf_reset_free_bits(next_block);
+		}
+		return(NULL);
+	}
+
+	ibool	compressed;
+	dberr_t	err;
+	ulint	level = btr_page_get_level(next_page, mtr);
+
+	/* adjust cursor position */
+	*btr_cur_get_page_cur(cursor) = next_page_cursor;
+
+	ut_ad(btr_cur_get_rec(cursor) == page_get_infimum_rec(next_page));
+	ut_ad(page_rec_get_next(page_get_infimum_rec(next_page)) == rec);
+
+	/* We have to change the parent node pointer */
+
+	compressed = btr_cur_pessimistic_delete(
+		&err, TRUE, &next_father_cursor,
+		BTR_CREATE_FLAG, RB_NONE, mtr);
+
+	ut_a(err == DB_SUCCESS);
+
+	if (!compressed) {
+		btr_cur_compress_if_useful(&next_father_cursor, FALSE, mtr);
+	}
+
+	dtuple_t*	node_ptr = dict_index_build_node_ptr(
+		cursor->index, rec, buf_block_get_page_no(next_block),
+		heap, level);
+
+	btr_insert_on_non_leaf_level(
+		flags, cursor->index, level + 1, node_ptr, mtr);
+
+	ut_ad(rec_offs_validate(rec, cursor->index, *offsets));
+
+	if (is_leaf && !dict_index_is_clust(cursor->index)) {
+		/* Update the free bits of the B-tree page in the
+		insert buffer bitmap. */
+
+		if (zip_size) {
+			ibuf_update_free_bits_zip(next_block, mtr);
+		} else {
+			ibuf_update_free_bits_if_full(
+				next_block, max_size,
+				rec_offs_size(*offsets) + PAGE_DIR_SLOT_SIZE);
+		}
+	}
+
+	return(rec);
+}
+
 /*************************************************************//**
 Splits an index page to halves and inserts the tuple. It is assumed
 that mtr holds an x-latch to the index tree. NOTE: the tree x-latch is
@@ -2872,6 +3001,14 @@
 	ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
 	ut_ad(!page_is_empty(page));
 
+	/* try to insert to the next page if possible before split */
+	rec = btr_insert_into_right_sibling(
+		flags, cursor, offsets, *heap, tuple, n_ext, mtr);
+
+	if (rec != NULL) {
+		return(rec);
+	}
+
 	page_no = buf_block_get_page_no(block);
 
 	/* 1. Decide the split record; split_rec == NULL means that the
@@ -3205,7 +3342,7 @@
 
 /*************************************************************//**
 Removes a page from the level list of pages. */
-static __attribute__((nonnull))
+static
 void
 btr_level_list_remove_func(
 /*=======================*/
@@ -3221,7 +3358,8 @@
 	ulint	prev_page_no;
 	ulint	next_page_no;
 
-	ut_ad(page && mtr);
+	ut_ad(page != NULL);
+	ut_ad(mtr != NULL);
 	ut_ad(mtr_memo_contains_page(mtr, page, MTR_MEMO_PAGE_X_FIX));
 	ut_ad(space == page_get_space_id(page));
 	/* Get the previous and next page numbers of page */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/btr/btr0cur.cc percona-xtrabackup-2.3.7/storage/innobase/btr/btr0cur.cc
--- percona-xtrabackup-2.2.3/storage/innobase/btr/btr0cur.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/btr/btr0cur.cc	2017-02-27 07:47:02.000000000 +0000
@@ -202,15 +202,6 @@
 	mtr_t*		mtr);	/*!< in: mini-transaction handle which contains
 				an X-latch to record page and to the index
 				tree */
-/***********************************************************//**
-Gets the externally stored size of a record, in units of a database page.
-@return	externally stored part, in units of a database page */
-static
-ulint
-btr_rec_get_externally_stored_len(
-/*==============================*/
-	const rec_t*	rec,	/*!< in: record */
-	const ulint*	offsets);/*!< in: array returned by rec_get_offsets() */
 #endif /* !UNIV_HOTBACKUP */
 
 /******************************************************//**
@@ -1255,7 +1246,7 @@
 	rec_t*		dummy;
 	ibool		leaf;
 	ibool		reorg;
-	ibool		inherit;
+	ibool		inherit = TRUE;
 	ulint		zip_size;
 	ulint		rec_size;
 	dberr_t		err;
@@ -1533,7 +1524,7 @@
 	ulint		zip_size	= dict_table_zip_size(index->table);
 	big_rec_t*	big_rec_vec	= NULL;
 	dberr_t		err;
-	ibool		dummy_inh;
+	ibool		inherit = FALSE;
 	ibool		success;
 	ulint		n_reserved	= 0;
 
@@ -1555,7 +1546,7 @@
 	/* Check locks and write to undo log, if specified */
 
 	err = btr_cur_ins_lock_and_undo(flags, cursor, entry,
-					thr, mtr, &dummy_inh);
+					thr, mtr, &inherit);
 
 	if (err != DB_SUCCESS) {
 
@@ -1615,10 +1606,31 @@
 
 	ut_ad(page_rec_get_next(btr_cur_get_rec(cursor)) == *rec);
 
+	if (!(flags & BTR_NO_LOCKING_FLAG)) {
+		/* The cursor might be moved to the other page,
+		and the max trx id field should be updated after
+		the cursor was fixed. */
+		if (!dict_index_is_clust(index)) {
+			page_update_max_trx_id(
+				btr_cur_get_block(cursor),
+				btr_cur_get_page_zip(cursor),
+				thr_get_trx(thr)->id, mtr);
+		}
+		if (!page_rec_is_infimum(btr_cur_get_rec(cursor))
+		    || btr_page_get_prev(
+			buf_block_get_frame(
+				btr_cur_get_block(cursor)), mtr)
+		       == FIL_NULL) {
+			/* split and inserted need to call
+			lock_update_insert() always. */
+			inherit = TRUE;
+		}
+	}
+
 #ifdef BTR_CUR_ADAPT
 	btr_search_update_hash_on_insert(cursor);
 #endif
-	if (!(flags & BTR_NO_LOCKING_FLAG)) {
+	if (inherit && !(flags & BTR_NO_LOCKING_FLAG)) {
 
 		lock_update_insert(btr_cur_get_block(cursor), *rec);
 	}
@@ -1656,7 +1668,7 @@
 	const rec_t*	rec;
 	dberr_t		err;
 
-	ut_ad(thr || (flags & BTR_NO_LOCKING_FLAG));
+	ut_ad((thr != NULL) || (flags & BTR_NO_LOCKING_FLAG));
 
 	rec = btr_cur_get_rec(cursor);
 	index = cursor->index;
@@ -2352,6 +2364,38 @@
 }
 
 /*************************************************************//**
+Check if the total length of the modified blob for the row is within 10%
+of the total redo log size.  This constraint on the blob length is to
+avoid overwriting the redo logs beyond the last checkpoint lsn.
+@return	DB_SUCCESS or DB_TOO_BIG_FOR_REDO. */
+static
+dberr_t
+btr_check_blob_limit(const big_rec_t*	big_rec_vec)
+{
+	const	ib_uint64_t redo_size = srv_n_log_files * srv_log_file_size
+		* UNIV_PAGE_SIZE;
+	const	ib_uint64_t redo_10p = redo_size / 10;
+	ib_uint64_t	total_blob_len = 0;
+	dberr_t	err = DB_SUCCESS;
+
+	/* Calculate the total number of bytes for blob data */
+	for (ulint i = 0; i < big_rec_vec->n_fields; i++) {
+		total_blob_len += big_rec_vec->fields[i].len;
+	}
+
+	if (total_blob_len > redo_10p) {
+		ib_logf(IB_LOG_LEVEL_ERROR, "The total blob data"
+			" length (" UINT64PF ") is greater than"
+			" 10%% of the total redo log size (" UINT64PF
+			"). Please increase total redo log size.",
+			total_blob_len, redo_size);
+		err = DB_TOO_BIG_FOR_REDO;
+	}
+
+	return(err);
+}
+
+/*************************************************************//**
 Performs an update of a record on a page of a tree. It is assumed
 that mtr holds an x-latch on the tree and on the cursor page. If the
 update is made on the leaf level, to avoid deadlocks, mtr must also
@@ -2565,6 +2609,19 @@
 		ut_ad(flags & BTR_KEEP_POS_FLAG);
 	}
 
+	if (big_rec_vec) {
+
+		err = btr_check_blob_limit(big_rec_vec);
+
+		if (err != DB_SUCCESS) {
+			if (n_reserved > 0) {
+				fil_space_release_free_extents(
+					index->space, n_reserved);
+			}
+			goto err_exit;
+		}
+	}
+
 	/* Store state of explicit locks on rec on the page infimum record,
 	before deleting rec. The page infimum acts as a dummy carrier of the
 	locks, taking care also of lock releases, before we can move the locks
@@ -2882,7 +2939,7 @@
 	ut_ad(page_is_leaf(page_align(rec)));
 
 #ifdef UNIV_DEBUG
-	if (btr_cur_print_record_ops && thr) {
+	if (btr_cur_print_record_ops && (thr != NULL)) {
 		btr_cur_trx_report(thr_get_trx(thr)->id, index, "del mark ");
 		rec_print_new(stderr, rec, offsets);
 	}
@@ -3030,7 +3087,7 @@
 	rec = btr_cur_get_rec(cursor);
 
 #ifdef UNIV_DEBUG
-	if (btr_cur_print_record_ops && thr) {
+	if (btr_cur_print_record_ops && (thr != NULL)) {
 		btr_cur_trx_report(thr_get_trx(thr)->id, cursor->index,
 				   "del mark ");
 		rec_print(stderr, rec, cursor->index);
@@ -4043,15 +4100,15 @@
 #define btr_rec_get_field_ref(rec, offsets, n)			\
 	((rec) + btr_rec_get_field_ref_offs(offsets, n))
 
-/***********************************************************//**
-Gets the externally stored size of a record, in units of a database page.
+/** Gets the externally stored size of a record, in units of a database page.
+@param[in]	rec	record
+@param[in]	offsets	array returned by rec_get_offsets()
 @return	externally stored part, in units of a database page */
-static
+
 ulint
 btr_rec_get_externally_stored_len(
-/*==============================*/
-	const rec_t*	rec,	/*!< in: record */
-	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
+	const rec_t*	rec,
+	const ulint*	offsets)
 {
 	ulint	n_fields;
 	ulint	total_extern_len = 0;
@@ -4349,7 +4406,7 @@
 them in rec.  The extern flags in rec will have to be set beforehand.
 The fields are stored on pages allocated from leaf node
 file segment of the index tree.
-@return	DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
+@return	DB_SUCCESS or DB_OUT_OF_FILE_SPACE or DB_TOO_BIG_FOR_REDO */
 UNIV_INTERN
 dberr_t
 btr_store_big_rec_extern_fields(
@@ -4405,6 +4462,13 @@
 	rec_page_no = buf_block_get_page_no(rec_block);
 	ut_a(fil_page_get_type(page_align(rec)) == FIL_PAGE_INDEX);
 
+	error = btr_check_blob_limit(big_rec_vec);
+
+	if (error != DB_SUCCESS) {
+		ut_ad(op == BTR_STORE_INSERT);
+		return(error);
+	}
+
 	if (page_zip) {
 		int	err;
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/buf/buf0buf.cc percona-xtrabackup-2.3.7/storage/innobase/buf/buf0buf.cc
--- percona-xtrabackup-2.2.3/storage/innobase/buf/buf0buf.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/buf/buf0buf.cc	2017-02-27 07:47:02.000000000 +0000
@@ -565,9 +565,14 @@
 	checksum_field2 = mach_read_from_4(
 		read_buf + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM);
 
+#if FIL_PAGE_LSN % 8
+#error "FIL_PAGE_LSN must be 64 bit aligned"
+#endif
+
 	/* declare empty pages non-corrupted */
 	if (checksum_field1 == 0 && checksum_field2 == 0
-	    && mach_read_from_4(read_buf + FIL_PAGE_LSN) == 0) {
+	    && *reinterpret_cast<const ib_uint64_t*>(read_buf +
+						     FIL_PAGE_LSN) == 0) {
 		/* make sure that the page is really empty */
 #if 0
 		/* Do not make sure that the page is really empty as this check
@@ -2901,12 +2906,6 @@
 
 	ut_ad(buf_block_get_state(fix_block) == BUF_BLOCK_FILE_PAGE);
 
-#if UNIV_WORD_SIZE == 4
-	/* On 32-bit systems, there is no padding in buf_page_t.  On
-	other systems, Valgrind could complain about uninitialized pad
-	bytes. */
-	UNIV_MEM_ASSERT_RW(&fix_block->page, sizeof(fix_block->page));
-#endif
 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
 
 	if ((mode == BUF_GET_IF_IN_POOL || mode == BUF_GET_IF_IN_POOL_OR_WATCH)
@@ -4224,6 +4223,7 @@
 					      " because of"
 					      " a corrupt database page.\n",
 					      stderr);
+
 					ut_error;
 				}
 			}
@@ -5428,7 +5428,7 @@
 
 #else /* !UNIV_HOTBACKUP */
 /********************************************************************//**
-Inits a page to the buffer buf_pool, for use in ibbackup --restore. */
+Inits a page to the buffer buf_pool, for use in mysqlbackup --restore. */
 UNIV_INTERN
 void
 buf_page_init_for_backup_restore(
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/buf/buf0flu.cc percona-xtrabackup-2.3.7/storage/innobase/buf/buf0flu.cc
--- percona-xtrabackup-2.2.3/storage/innobase/buf/buf0flu.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/buf/buf0flu.cc	2017-02-27 07:47:02.000000000 +0000
@@ -828,41 +828,37 @@
 	case SRV_CHECKSUM_ALGORITHM_CRC32:
 	case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
 		checksum = buf_calc_page_crc32(page);
+		mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM, checksum);
 		break;
 	case SRV_CHECKSUM_ALGORITHM_INNODB:
 	case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
 		checksum = (srv_fast_checksum) ?
 			(ib_uint32_t) buf_calc_page_new_checksum_32(page) :
 		(ib_uint32_t) buf_calc_page_new_checksum(page);
+		mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM, checksum);
+		checksum = (ib_uint32_t) buf_calc_page_old_checksum(page);
 		break;
 	case SRV_CHECKSUM_ALGORITHM_NONE:
 	case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
 		checksum = BUF_NO_CHECKSUM_MAGIC;
+		mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM, checksum);
 		break;
 	/* no default so the compiler will emit a warning if new enum
 	is added and not handled here */
 	}
 
-	mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM, checksum);
-
-	/* We overwrite the first 4 bytes of the end lsn field to store
-	the old formula checksum. Since it depends also on the field
-	FIL_PAGE_SPACE_OR_CHKSUM, it has to be calculated after storing the
-	new formula checksum. */
-
-	if (srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_STRICT_INNODB
-	    || srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_INNODB) {
-
-		checksum = (ib_uint32_t) buf_calc_page_old_checksum(page);
-
-		/* In other cases we use the value assigned from above.
-		If CRC32 is used then it is faster to use that checksum
-		(calculated above) instead of calculating another one.
-		We can afford to store something other than
-		buf_calc_page_old_checksum() or BUF_NO_CHECKSUM_MAGIC in
-		this field because the file will not be readable by old
-		versions of MySQL/InnoDB anyway (older than MySQL 5.6.3) */
-	}
+	/* With the InnoDB checksum, we overwrite the first 4 bytes of
+	the end lsn field to store the old formula checksum. Since it
+	depends also on the field FIL_PAGE_SPACE_OR_CHKSUM, it has to
+	be calculated after storing the new formula checksum.
+
+	In other cases we write the same value to both fields.
+	If CRC32 is used then it is faster to use that checksum
+	(calculated above) instead of calculating another one.
+	We can afford to store something other than
+	buf_calc_page_old_checksum() or BUF_NO_CHECKSUM_MAGIC in
+	this field because the file will not be readable by old
+	versions of MySQL/InnoDB anyway (older than MySQL 5.6.3) */
 
 	mach_write_to_4(page + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM,
 			checksum);
@@ -2185,6 +2181,10 @@
 {
 	ulint dirty_pct = buf_get_modified_ratio_pct();
 
+	if (dirty_pct > 0 && srv_max_buf_pool_modified_pct == 0) {
+		return(100);
+	}
+
 	ut_a(srv_max_dirty_pages_pct_lwm
 	     <= srv_max_buf_pool_modified_pct);
 
@@ -2493,7 +2493,7 @@
 		success = buf_flush_list(PCT_IO(100), LSN_MAX, &n_flushed);
 		buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST);
 
-	} while (!success || n_flushed > 0);
+	} while (!success || n_flushed > 0 || buf_get_n_pending_read_ios() > 0);
 
 	/* Some sanity checks */
 	ut_a(srv_get_active_thread_type() == SRV_NONE);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/buf/buf0lru.cc percona-xtrabackup-2.3.7/storage/innobase/buf/buf0lru.cc
--- percona-xtrabackup-2.2.3/storage/innobase/buf/buf0lru.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/buf/buf0lru.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1818,13 +1818,6 @@
 	rw_lock_x_lock(hash_lock);
 	mutex_enter(block_mutex);
 
-#if UNIV_WORD_SIZE == 4
-	/* On 32-bit systems, there is no padding in buf_page_t.  On
-	other systems, Valgrind could complain about uninitialized pad
-	bytes. */
-	UNIV_MEM_ASSERT_RW(bpage, sizeof *bpage);
-#endif
-
 	if (!buf_page_can_relocate(bpage)) {
 
 		/* Do not free buffer fixed or I/O-fixed blocks. */
@@ -1862,12 +1855,6 @@
 	ut_ad(buf_page_in_file(bpage));
 	ut_ad(bpage->in_LRU_list);
 	ut_ad(!bpage->in_flush_list == !bpage->oldest_modification);
-#if UNIV_WORD_SIZE == 4
-	/* On 32-bit systems, there is no padding in buf_page_t.  On
-	other systems, Valgrind could complain about uninitialized pad
-	bytes. */
-	UNIV_MEM_ASSERT_RW(bpage, sizeof *bpage);
-#endif
 
 #ifdef UNIV_DEBUG
 	if (buf_debug_prints) {
@@ -1940,13 +1927,6 @@
 
 			ut_ad(prev_b->in_LRU_list);
 			ut_ad(buf_page_in_file(prev_b));
-#if UNIV_WORD_SIZE == 4
-			/* On 32-bit systems, there is no
-			padding in buf_page_t.  On other
-			systems, Valgrind could complain about
-			uninitialized pad bytes. */
-			UNIV_MEM_ASSERT_RW(prev_b, sizeof *prev_b);
-#endif
 			UT_LIST_INSERT_AFTER(LRU, buf_pool->LRU,
 					     prev_b, b);
 
@@ -2172,13 +2152,6 @@
 	ut_a(buf_page_get_io_fix(bpage) == BUF_IO_NONE);
 	ut_a(bpage->buf_fix_count == 0);
 
-#if UNIV_WORD_SIZE == 4
-	/* On 32-bit systems, there is no padding in
-	buf_page_t.  On other systems, Valgrind could complain
-	about uninitialized pad bytes. */
-	UNIV_MEM_ASSERT_RW(bpage, sizeof *bpage);
-#endif
-
 	buf_LRU_remove_block(bpage);
 
 	buf_pool->freed_page_clock += 1;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/buf/buf0rea.cc percona-xtrabackup-2.3.7/storage/innobase/buf/buf0rea.cc
--- percona-xtrabackup-2.2.3/storage/innobase/buf/buf0rea.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/buf/buf0rea.cc	2017-02-27 07:47:02.000000000 +0000
@@ -810,11 +810,9 @@
 		if (UNIV_UNLIKELY(err == DB_TABLESPACE_DELETED)) {
 tablespace_deleted:
 			/* We have deleted or are deleting the single-table
-			tablespace: remove the entries for that page */
+			tablespace: remove the entries for the tablespace */
 
-			ibuf_merge_or_delete_for_page(NULL, space_ids[i],
-						      page_nos[i],
-						      zip_size, FALSE);
+			ibuf_delete_for_discarded_space(space_ids[i]);
 		}
 	}
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/CMakeLists.txt percona-xtrabackup-2.3.7/storage/innobase/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/innobase/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -67,7 +67,6 @@
     long	x;
     long	y;
     long	res;
-    char	c;
 
     x = 10;
     y = 123;
@@ -88,6 +87,16 @@
     if (res != 123 + 10 || x != 123 + 10) {
       return(1);
     }
+    return(0);
+  }"
+  HAVE_IB_GCC_ATOMIC_BUILTINS
+  )
+  CHECK_C_SOURCE_RUNS(
+  "
+  int main()
+  {
+    long	res;
+    char	c;
 
     c = 10;
     res = __sync_lock_test_and_set(&c, 123);
@@ -96,7 +105,7 @@
     }
     return(0);
   }"
-  HAVE_IB_GCC_ATOMIC_BUILTINS
+  HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE
   )
   CHECK_C_SOURCE_RUNS(
   "#include<stdint.h>
@@ -118,16 +127,47 @@
   }"
   HAVE_IB_GCC_ATOMIC_BUILTINS_64
   )
+  CHECK_C_SOURCE_RUNS(
+  "#include<stdint.h>
+  int main()
+  {
+    __sync_synchronize();
+    return(0);
+  }"
+  HAVE_IB_GCC_SYNC_SYNCHRONISE
+  )
+  CHECK_C_SOURCE_RUNS(
+  "#include<stdint.h>
+  int main()
+  {
+    __atomic_thread_fence(__ATOMIC_ACQUIRE);
+    __atomic_thread_fence(__ATOMIC_RELEASE);
+    return(0);
+  }"
+  HAVE_IB_GCC_ATOMIC_THREAD_FENCE
+  )
 ENDIF()
 
 IF(HAVE_IB_GCC_ATOMIC_BUILTINS)
  ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS=1)
 ENDIF()
 
+IF(HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE)
+ ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS_BYTE=1)
+ENDIF()
+
 IF(HAVE_IB_GCC_ATOMIC_BUILTINS_64)
  ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS_64=1)
 ENDIF()
 
+IF(HAVE_IB_GCC_SYNC_SYNCHRONISE)
+ ADD_DEFINITIONS(-DHAVE_IB_GCC_SYNC_SYNCHRONISE=1)
+ENDIF()
+
+IF(HAVE_IB_GCC_ATOMIC_THREAD_FENCE)
+ ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_THREAD_FENCE=1)
+ENDIF()
+
  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
 IF(NOT CMAKE_CROSSCOMPILING)
   CHECK_C_SOURCE_RUNS(
@@ -209,10 +249,21 @@
       return(0);
     }
   " HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS)
+  CHECK_C_SOURCE_COMPILES(
+  "#include <mbarrier.h>
+  int main() {
+    __machine_r_barrier();
+    __machine_w_barrier();
+    return(0);
+  }"
+  HAVE_IB_MACHINE_BARRIER_SOLARIS)
   ENDIF()
   IF(HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS)
     ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=1)
   ENDIF()
+  IF(HAVE_IB_MACHINE_BARRIER_SOLARIS)
+    ADD_DEFINITIONS(-DHAVE_IB_MACHINE_BARRIER_SOLARIS=1)
+  ENDIF()
 ENDIF()
 
 
@@ -230,6 +281,7 @@
 
 IF(MSVC)
   ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS)
+  ADD_DEFINITIONS(-DHAVE_WINDOWS_MM_FENCE)
 ENDIF()
 
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/data/data0data.cc percona-xtrabackup-2.3.7/storage/innobase/data/data0data.cc
--- percona-xtrabackup-2.2.3/storage/innobase/data/data0data.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/data/data0data.cc	2017-02-27 07:47:02.000000000 +0000
@@ -67,7 +67,8 @@
 	ulint	n_fields;
 	ulint	i;
 
-	ut_ad(tuple1 && tuple2);
+	ut_ad(tuple1 != NULL);
+	ut_ad(tuple2 != NULL);
 	ut_ad(tuple1->magic_n == DATA_TUPLE_MAGIC_N);
 	ut_ad(tuple2->magic_n == DATA_TUPLE_MAGIC_N);
 	ut_ad(dtuple_check_typed(tuple1));
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/dict/dict0crea.cc percona-xtrabackup-2.3.7/storage/innobase/dict/dict0crea.cc
--- percona-xtrabackup-2.2.3/storage/innobase/dict/dict0crea.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/dict/dict0crea.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -1611,26 +1611,25 @@
 	return(error);
 }
 
-/********************************************************************//**
-Adds foreign key definitions to data dictionary tables in the database.
-@return	error code or DB_SUCCESS */
+/** Adds the given set of foreign key objects to the dictionary tables
+in the database. This function does not modify the dictionary cache. The
+caller must ensure that all foreign key objects contain a valid constraint
+name in foreign->id.
+@param[in]	local_fk_set	set of foreign key objects, to be added to
+the dictionary tables
+@param[in]	table		table to which the foreign key objects in
+local_fk_set belong to
+@param[in,out]	trx		transaction
+@return error code or DB_SUCCESS */
 UNIV_INTERN
 dberr_t
 dict_create_add_foreigns_to_dictionary(
 /*===================================*/
-	ulint		start_id,/*!< in: if we are actually doing ALTER TABLE
-				ADD CONSTRAINT, we want to generate constraint
-				numbers which are bigger than in the table so
-				far; we number the constraints from
-				start_id + 1 up; start_id should be set to 0 if
-				we are creating a new table, or if the table
-				so far has no constraints for which the name
-				was generated here */
-	dict_table_t*	table,	/*!< in: table */
-	trx_t*		trx)	/*!< in: transaction */
+	const dict_foreign_set&	local_fk_set,
+	const dict_table_t*	table,
+	trx_t*			trx)
 {
 	dict_foreign_t*	foreign;
-	ulint		number	= start_id + 1;
 	dberr_t		error;
 
 	ut_ad(mutex_own(&(dict_sys->mutex)));
@@ -1643,17 +1642,12 @@
 		return(DB_ERROR);
 	}
 
-	for (foreign = UT_LIST_GET_FIRST(table->foreign_list);
-	     foreign;
-	     foreign = UT_LIST_GET_NEXT(foreign_list, foreign)) {
+	for (dict_foreign_set::const_iterator it = local_fk_set.begin();
+	     it != local_fk_set.end();
+	     ++it) {
 
-		error = dict_create_add_foreign_id(&number, table->name,
-						   foreign);
-
-		if (error != DB_SUCCESS) {
-
-			return(error);
-		}
+		foreign = *it;
+		ut_ad(foreign->id != NULL);
 
 		error = dict_create_add_foreign_to_dictionary(table->name,
 							      foreign, trx);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/dict/dict0dict.cc percona-xtrabackup-2.3.7/storage/innobase/dict/dict0dict.cc
--- percona-xtrabackup-2.2.3/storage/innobase/dict/dict0dict.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/dict/dict0dict.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -27,6 +27,7 @@
 #include "dict0dict.h"
 #include "fts0fts.h"
 #include "fil0fil.h"
+#include <algorithm>
 
 #ifdef UNIV_NONINL
 #include "dict0dict.ic"
@@ -38,6 +39,16 @@
 /** dummy index for ROW_FORMAT=COMPACT supremum and infimum records */
 UNIV_INTERN dict_index_t*	dict_ind_compact;
 
+#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
+/** Flag to control insert buffer debugging. */
+extern UNIV_INTERN uint	ibuf_debug;
+#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
+
+/**********************************************************************
+Issue a warning that the row is too big. */
+void
+ib_warn_row_too_big(const dict_table_t*	table);
+
 #ifndef UNIV_HOTBACKUP
 #include "buf0buf.h"
 #include "data0type.h"
@@ -50,6 +61,7 @@
 #include "btr0btr.h"
 #include "btr0cur.h"
 #include "btr0sea.h"
+#include "os0once.h"
 #include "page0zip.h"
 #include "page0page.h"
 #include "pars0pars.h"
@@ -102,7 +114,7 @@
 UNIV_INTERN mysql_pfs_key_t	dict_operation_lock_key;
 UNIV_INTERN mysql_pfs_key_t	index_tree_rw_lock_key;
 UNIV_INTERN mysql_pfs_key_t	index_online_log_key;
-UNIV_INTERN mysql_pfs_key_t	dict_table_stats_latch_key;
+UNIV_INTERN mysql_pfs_key_t	dict_table_stats_key;
 #endif /* UNIV_PFS_RWLOCK */
 
 #ifdef UNIV_PFS_MUTEX
@@ -319,6 +331,82 @@
 	mutex_exit(&(dict_sys->mutex));
 }
 
+/** Allocate and init a dict_table_t's stats latch.
+This function must not be called concurrently on the same table object.
+@param[in,out]	table_void	table whose stats latch to create */
+static
+void
+dict_table_stats_latch_alloc(
+	void*	table_void)
+{
+	dict_table_t*	table = static_cast<dict_table_t*>(table_void);
+
+	table->stats_latch = new(std::nothrow) rw_lock_t;
+
+	ut_a(table->stats_latch != NULL);
+
+	rw_lock_create(dict_table_stats_key, table->stats_latch,
+		       SYNC_INDEX_TREE);
+}
+
+/** Deinit and free a dict_table_t's stats latch.
+This function must not be called concurrently on the same table object.
+@param[in,out]	table	table whose stats latch to free */
+static
+void
+dict_table_stats_latch_free(
+	dict_table_t*	table)
+{
+	rw_lock_free(table->stats_latch);
+	delete table->stats_latch;
+}
+
+/** Create a dict_table_t's stats latch or delay for lazy creation.
+This function is only called from either single threaded environment
+or from a thread that has not shared the table object with other threads.
+@param[in,out]	table	table whose stats latch to create
+@param[in]	enabled	if false then the latch is disabled
+and dict_table_stats_lock()/unlock() become noop on this table. */
+
+void
+dict_table_stats_latch_create(
+	dict_table_t*	table,
+	bool		enabled)
+{
+	if (!enabled) {
+		table->stats_latch = NULL;
+		table->stats_latch_created = os_once::DONE;
+		return;
+	}
+
+#ifdef HAVE_ATOMIC_BUILTINS
+	/* We create this lazily the first time it is used. */
+	table->stats_latch = NULL;
+	table->stats_latch_created = os_once::NEVER_DONE;
+#else /* HAVE_ATOMIC_BUILTINS */
+
+	dict_table_stats_latch_alloc(table);
+
+	table->stats_latch_created = os_once::DONE;
+#endif /* HAVE_ATOMIC_BUILTINS */
+}
+
+/** Destroy a dict_table_t's stats latch.
+This function is only called from either single threaded environment
+or from a thread that has not shared the table object with other threads.
+@param[in,out]	table	table whose stats latch to destroy */
+
+void
+dict_table_stats_latch_destroy(
+	dict_table_t*	table)
+{
+	if (table->stats_latch_created == os_once::DONE
+	    && table->stats_latch != NULL) {
+
+		dict_table_stats_latch_free(table);
+	}
+}
+
 /**********************************************************************//**
 Lock the appropriate latch to protect a given table's statistics. */
 UNIV_INTERN
@@ -331,6 +419,14 @@
 	ut_ad(table != NULL);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
 
+#ifdef HAVE_ATOMIC_BUILTINS
+	os_once::do_or_wait_for_done(
+		&table->stats_latch_created,
+		dict_table_stats_latch_alloc, table);
+#else /* HAVE_ATOMIC_BUILTINS */
+	ut_ad(table->stats_latch_created == os_once::DONE);
+#endif /* HAVE_ATOMIC_BUILTINS */
+
 	if (table->stats_latch == NULL) {
 		/* This is a dummy table object that is private in the current
 		thread and is not shared between multiple threads, thus we
@@ -548,6 +644,33 @@
 }
 
 #ifndef UNIV_HOTBACKUP
+/** Allocate and init the autoinc latch of a given table.
+This function must not be called concurrently on the same table object.
+@param[in,out]	table_void	table whose autoinc latch to create */
+void
+dict_table_autoinc_alloc(
+	void*	table_void)
+{
+	dict_table_t*	table = static_cast<dict_table_t*>(table_void);
+	table->autoinc_mutex = new (std::nothrow) ib_mutex_t();
+	ut_a(table->autoinc_mutex != NULL);
+	mutex_create(autoinc_mutex_key,
+		     table->autoinc_mutex, SYNC_DICT_AUTOINC_MUTEX);
+}
+
+/** Allocate and init the zip_pad_mutex of a given index.
+This function must not be called concurrently on the same index object.
+@param[in,out]	index_void	index whose zip_pad_mutex to create */
+void
+dict_index_zip_pad_alloc(
+	void*	index_void)
+{
+	dict_index_t*	index = static_cast<dict_index_t*>(index_void);
+	index->zip_pad.mutex = new (std::nothrow) os_fast_mutex_t;
+	ut_a(index->zip_pad.mutex != NULL);
+	os_fast_mutex_init(zip_pad_mutex_key, index->zip_pad.mutex);
+}
+
 /********************************************************************//**
 Acquire the autoinc lock. */
 UNIV_INTERN
@@ -556,7 +679,32 @@
 /*====================*/
 	dict_table_t*	table)	/*!< in/out: table */
 {
-	mutex_enter(&table->autoinc_mutex);
+#ifdef HAVE_ATOMIC_BUILTINS
+	os_once::do_or_wait_for_done(
+		&table->autoinc_mutex_created,
+		dict_table_autoinc_alloc, table);
+#else /* HAVE_ATOMIC_BUILTINS */
+	ut_ad(table->autoinc_mutex_created == os_once::DONE);
+#endif /* HAVE_ATOMIC_BUILTINS */
+
+	mutex_enter(table->autoinc_mutex);
+}
+
+/** Acquire the zip_pad_mutex latch.
+@param[in,out]	index	the index whose zip_pad_mutex to acquire.*/
+void
+dict_index_zip_pad_lock(
+	dict_index_t*	index)
+{
+#ifdef HAVE_ATOMIC_BUILTINS
+	os_once::do_or_wait_for_done(
+		&index->zip_pad.mutex_created,
+		dict_index_zip_pad_alloc, index);
+#else /* HAVE_ATOMIC_BUILTINS */
+	ut_ad(index->zip_pad.mutex_created == os_once::DONE);
+#endif /* HAVE_ATOMIC_BUILTINS */
+
+	os_fast_mutex_lock(index->zip_pad.mutex);
 }
 
 /********************************************************************//**
@@ -568,7 +716,7 @@
 	dict_table_t*	table,	/*!< in/out: table */
 	ib_uint64_t	value)	/*!< in: next value to assign to a row */
 {
-	ut_ad(mutex_own(&table->autoinc_mutex));
+	ut_ad(dict_table_autoinc_own(table));
 
 	table->autoinc = value;
 }
@@ -610,7 +758,7 @@
 /*====================*/
 	const dict_table_t*	table)	/*!< in: table */
 {
-	ut_ad(mutex_own(&table->autoinc_mutex));
+	ut_ad(dict_table_autoinc_own(table));
 
 	return(table->autoinc);
 }
@@ -626,7 +774,7 @@
 	dict_table_t*	table,	/*!< in/out: table */
 	ib_uint64_t	value)	/*!< in: value which was assigned to a row */
 {
-	ut_ad(mutex_own(&table->autoinc_mutex));
+	ut_ad(dict_table_autoinc_own(table));
 
 	if (value > table->autoinc) {
 
@@ -642,7 +790,7 @@
 /*======================*/
 	dict_table_t*	table)	/*!< in/out: table */
 {
-	mutex_exit(&table->autoinc_mutex);
+	mutex_exit(table->autoinc_mutex);
 }
 #endif /* !UNIV_HOTBACKUP */
 
@@ -1161,8 +1309,8 @@
 #endif /* UNIV_SYNC_DEBUG */
 
 	ut_a(table->can_be_evicted);
-	ut_a(UT_LIST_GET_LEN(table->foreign_list) == 0);
-	ut_a(UT_LIST_GET_LEN(table->referenced_list) == 0);
+	ut_a(table->foreign_set.empty());
+	ut_a(table->referenced_set.empty());
 
 	if (table->n_ref_count == 0) {
 		dict_index_t*	index;
@@ -1378,6 +1526,22 @@
 	return(NULL);
 }
 
+/** Function object to remove a foreign key constraint from the
+referenced_set of the referenced table.  The foreign key object is
+also removed from the dictionary cache.  The foreign key constraint
+is not removed from the foreign_set of the table containing the
+constraint. */
+struct dict_foreign_remove_partial
+{
+	void operator()(dict_foreign_t* foreign) {
+		dict_table_t*	table = foreign->referenced_table;
+		if (table != NULL) {
+			table->referenced_set.erase(foreign);
+		}
+		dict_foreign_free(foreign);
+	}
+};
+
 /**********************************************************************//**
 Renames a table object.
 @return	TRUE if success */
@@ -1466,15 +1630,18 @@
 	} else if (table->space != TRX_SYS_SPACE) {
 		char*	new_path = NULL;
 
-		if (table->dir_path_of_temp_table != NULL) {
+		if (DICT_TF2_FLAG_IS_SET(table, DICT_TF2_TEMPORARY)) {
 			ut_print_timestamp(stderr);
 			fputs("  InnoDB: Error: trying to rename a"
 			      " TEMPORARY TABLE ", stderr);
 			ut_print_name(stderr, NULL, TRUE, old_name);
-			fputs(" (", stderr);
-			ut_print_filename(stderr,
-					  table->dir_path_of_temp_table);
-			fputs(" )\n", stderr);
+			if (table->dir_path_of_temp_table != NULL) {
+				fputs(" (", stderr);
+				ut_print_filename(
+					stderr, table->dir_path_of_temp_table);
+				fputs(" )\n", stderr);
+			}
+
 			return(DB_ERROR);
 
 		} else if (DICT_TF_HAS_DATA_DIR(table->flags)) {
@@ -1552,27 +1719,25 @@
 		system tables through a call of dict_load_foreigns. */
 
 		/* Remove the foreign constraints from the cache */
-		foreign = UT_LIST_GET_LAST(table->foreign_list);
-
-		while (foreign != NULL) {
-			dict_foreign_remove_from_cache(foreign);
-			foreign = UT_LIST_GET_LAST(table->foreign_list);
-		}
+		std::for_each(table->foreign_set.begin(),
+			      table->foreign_set.end(),
+			      dict_foreign_remove_partial());
+		table->foreign_set.clear();
 
 		/* Reset table field in referencing constraints */
+		for (dict_foreign_set::iterator it
+			= table->referenced_set.begin();
+		     it != table->referenced_set.end();
+		     ++it) {
 
-		foreign = UT_LIST_GET_FIRST(table->referenced_list);
-
-		while (foreign != NULL) {
+			foreign = *it;
 			foreign->referenced_table = NULL;
 			foreign->referenced_index = NULL;
 
-			foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
 		}
 
-		/* Make the list of referencing constraints empty */
-
-		UT_LIST_INIT(table->referenced_list);
+		/* Make the set of referencing constraints empty */
+		table->referenced_set.clear();
 
 		return(DB_SUCCESS);
 	}
@@ -1581,9 +1746,23 @@
 	the constraint id of new format >= 4.0.18 constraints. Note that at
 	this point we have already changed table->name to the new name. */
 
-	foreign = UT_LIST_GET_FIRST(table->foreign_list);
+	dict_foreign_set	fk_set;
+
+	for (;;) {
+
+		dict_foreign_set::iterator	it
+			= table->foreign_set.begin();
+
+		if (it == table->foreign_set.end()) {
+			break;
+		}
+
+		foreign = *it;
+
+		if (foreign->referenced_table) {
+			foreign->referenced_table->referenced_set.erase(foreign);
+		}
 
-	while (foreign != NULL) {
 		if (ut_strlen(foreign->foreign_table_name)
 		    < ut_strlen(table->name)) {
 			/* Allocate a longer name buffer;
@@ -1733,12 +1912,22 @@
 			mem_free(old_id);
 		}
 
-		foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
+		table->foreign_set.erase(it);
+		fk_set.insert(foreign);
+
+		if (foreign->referenced_table) {
+			foreign->referenced_table->referenced_set.insert(foreign);
+		}
 	}
 
-	for (foreign = UT_LIST_GET_FIRST(table->referenced_list);
-	     foreign != NULL;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
+	ut_a(table->foreign_set.empty());
+	table->foreign_set.swap(fk_set);
+
+	for (dict_foreign_set::iterator it = table->referenced_set.begin();
+	     it != table->referenced_set.end();
+	     ++it) {
+
+		foreign = *it;
 
 		if (ut_strlen(foreign->referenced_table_name)
 		    < ut_strlen(table->name)) {
@@ -1808,27 +1997,17 @@
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
 
-#if 0
-	fputs("Removing table ", stderr);
-	ut_print_name(stderr, table->name, ULINT_UNDEFINED);
-	fputs(" from dictionary cache\n", stderr);
-#endif
-
 	/* Remove the foreign constraints from the cache */
-
-	for (foreign = UT_LIST_GET_LAST(table->foreign_list);
-	     foreign != NULL;
-	     foreign = UT_LIST_GET_LAST(table->foreign_list)) {
-
-		dict_foreign_remove_from_cache(foreign);
-	}
+	std::for_each(table->foreign_set.begin(), table->foreign_set.end(),
+		      dict_foreign_remove_partial());
+	table->foreign_set.clear();
 
 	/* Reset table field in referencing constraints */
+	for (dict_foreign_set::iterator it = table->referenced_set.begin();
+	     it != table->referenced_set.end();
+	     ++it) {
 
-	for (foreign = UT_LIST_GET_FIRST(table->referenced_list);
-	     foreign != NULL;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
-
+		foreign = *it;
 		foreign->referenced_table = NULL;
 		foreign->referenced_index = NULL;
 	}
@@ -2292,11 +2471,18 @@
 	new_index->n_fields = new_index->n_def;
 	new_index->trx_id = index->trx_id;
 
-	if (strict && dict_index_too_big_for_tree(table, new_index)) {
+	if (dict_index_too_big_for_tree(table, new_index)) {
+
+		if (strict) {
 too_big:
-		dict_mem_index_free(new_index);
-		dict_mem_index_free(index);
-		return(DB_TOO_BIG_RECORD);
+			dict_mem_index_free(new_index);
+			dict_mem_index_free(index);
+			return(DB_TOO_BIG_RECORD);
+		} else if (current_thd != NULL) {
+			/* Avoid the warning to be printed
+			during recovery. */
+			ib_warn_row_too_big(table);
+		}
 	}
 
 	if (dict_index_is_univ(index)) {
@@ -3044,7 +3230,7 @@
 /*====================================*/
 	const dict_table_t*	table)	/*!< in: InnoDB table */
 {
-	return(UT_LIST_GET_LEN(table->referenced_list) > 0);
+	return(!table->referenced_set.empty());
 }
 
 /*********************************************************************//**
@@ -3064,9 +3250,11 @@
 	ut_ad(index != NULL);
 	ut_ad(table != NULL);
 
-	for (foreign = UT_LIST_GET_FIRST(table->referenced_list);
-	     foreign;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
+	for (dict_foreign_set::iterator it = table->referenced_set.begin();
+	     it != table->referenced_set.end();
+	     ++it) {
+
+		foreign = *it;
 
 		if (foreign->referenced_index == index) {
 
@@ -3095,9 +3283,11 @@
 	ut_ad(index != NULL);
 	ut_ad(table != NULL);
 
-	for (foreign = UT_LIST_GET_FIRST(table->foreign_list);
-	     foreign;
-	     foreign = UT_LIST_GET_NEXT(foreign_list, foreign)) {
+	for (dict_foreign_set::iterator it = table->foreign_set.begin();
+	     it != table->foreign_set.end();
+	     ++it) {
+
+		foreign = *it;
 
 		if (foreign->foreign_index == index) {
 
@@ -3108,17 +3298,6 @@
 	return(NULL);
 }
 
-/*********************************************************************//**
-Frees a foreign key struct. */
-UNIV_INTERN
-void
-dict_foreign_free(
-/*==============*/
-	dict_foreign_t*	foreign)	/*!< in, own: foreign key struct */
-{
-	mem_heap_free(foreign->heap);
-}
-
 /**********************************************************************//**
 Removes a foreign constraint struct from the dictionary cache. */
 UNIV_INTERN
@@ -3130,16 +3309,12 @@
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 	ut_a(foreign);
 
-	if (foreign->referenced_table) {
-		UT_LIST_REMOVE(referenced_list,
-			       foreign->referenced_table->referenced_list,
-			       foreign);
+	if (foreign->referenced_table != NULL) {
+		foreign->referenced_table->referenced_set.erase(foreign);
 	}
 
-	if (foreign->foreign_table) {
-		UT_LIST_REMOVE(foreign_list,
-			       foreign->foreign_table->foreign_list,
-			       foreign);
+	if (foreign->foreign_table != NULL) {
+		foreign->foreign_table->foreign_set.erase(foreign);
 	}
 
 	dict_foreign_free(foreign);
@@ -3153,33 +3328,24 @@
 dict_foreign_t*
 dict_foreign_find(
 /*==============*/
-	dict_table_t*	table,	/*!< in: table object */
-	const char*	id)	/*!< in: foreign constraint id */
+	dict_table_t*	table,		/*!< in: table object */
+	dict_foreign_t*	foreign)	/*!< in: foreign constraint */
 {
-	dict_foreign_t*	foreign;
-
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 
-	foreign = UT_LIST_GET_FIRST(table->foreign_list);
+	ut_ad(dict_foreign_set_validate(table->foreign_set));
+	ut_ad(dict_foreign_set_validate(table->referenced_set));
 
-	while (foreign) {
-		if (ut_strcmp(id, foreign->id) == 0) {
+	dict_foreign_set::iterator it = table->foreign_set.find(foreign);
 
-			return(foreign);
-		}
-
-		foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
+	if (it != table->foreign_set.end()) {
+		return(*it);
 	}
 
-	foreign = UT_LIST_GET_FIRST(table->referenced_list);
-
-	while (foreign) {
-		if (ut_strcmp(id, foreign->id) == 0) {
+	it = table->referenced_set.find(foreign);
 
-			return(foreign);
-		}
-
-		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
+	if (it != table->referenced_set.end()) {
+		return(*it);
 	}
 
 	return(NULL);
@@ -3317,11 +3483,11 @@
 	ut_a(for_table || ref_table);
 
 	if (for_table) {
-		for_in_cache = dict_foreign_find(for_table, foreign->id);
+		for_in_cache = dict_foreign_find(for_table, foreign);
 	}
 
 	if (!for_in_cache && ref_table) {
-		for_in_cache = dict_foreign_find(ref_table, foreign->id);
+		for_in_cache = dict_foreign_find(ref_table, foreign);
 	}
 
 	if (for_in_cache) {
@@ -3358,9 +3524,12 @@
 
 		for_in_cache->referenced_table = ref_table;
 		for_in_cache->referenced_index = index;
-		UT_LIST_ADD_LAST(referenced_list,
-				 ref_table->referenced_list,
-				 for_in_cache);
+
+		std::pair<dict_foreign_set::iterator, bool>	ret
+			= ref_table->referenced_set.insert(for_in_cache);
+
+		ut_a(ret.second);	/* second is true if the insertion
+					took place */
 		added_to_referenced_list = TRUE;
 	}
 
@@ -3389,10 +3558,13 @@
 
 			if (for_in_cache == foreign) {
 				if (added_to_referenced_list) {
-					UT_LIST_REMOVE(
-						referenced_list,
-						ref_table->referenced_list,
-						for_in_cache);
+					const dict_foreign_set::size_type	n
+						= ref_table->referenced_set
+						  .erase(for_in_cache);
+
+					ut_a(n == 1);	/* the number of
+							elements removed must
+							be one */
 				}
 
 				mem_heap_free(foreign->heap);
@@ -3403,9 +3575,11 @@
 
 		for_in_cache->foreign_table = for_table;
 		for_in_cache->foreign_index = index;
-		UT_LIST_ADD_LAST(foreign_list,
-				 for_table->foreign_list,
-				 for_in_cache);
+		std::pair<dict_foreign_set::iterator, bool>	ret
+			= for_table->foreign_set.insert(for_in_cache);
+
+		ut_a(ret.second);	/* second is true if the insertion
+					took place */
 	}
 
 	/* We need to move the table to the non-LRU end of the table LRU
@@ -3983,9 +4157,12 @@
 	ut_a(table);
 
 	len = ut_strlen(table->name);
-	foreign = UT_LIST_GET_FIRST(table->foreign_list);
 
-	while (foreign) {
+	for (dict_foreign_set::iterator it = table->foreign_set.begin();
+	     it != table->foreign_set.end();
+	     ++it) {
+		foreign = *it;
+
 		if (ut_strlen(foreign->id) > ((sizeof dict_ibfk) - 1) + len
 		    && 0 == ut_memcmp(foreign->id, table->name, len)
 		    && 0 == ut_memcmp(foreign->id + len,
@@ -4004,8 +4181,6 @@
 				}
 			}
 		}
-
-		foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
 	}
 
 	return(biggest_id);
@@ -4066,6 +4241,7 @@
 	dict_table_t*	referenced_table;
 	dict_table_t*	table_to_alter;
 	ulint		highest_id_so_far	= 0;
+	ulint		number			= 1;
 	dict_index_t*	index;
 	dict_foreign_t*	foreign;
 	const char*	ptr			= sql_string;
@@ -4084,6 +4260,8 @@
 	const dict_col_t*columns[500];
 	const char*	column_names[500];
 	const char*	referenced_table_name;
+	dict_foreign_set	local_fk_set;
+	dict_foreign_set_free	local_fk_set_free(local_fk_set);
 
 	ut_ad(!srv_read_only_mode);
 	ut_ad(mutex_own(&(dict_sys->mutex)));
@@ -4148,6 +4326,7 @@
 			table_to_alter);
 	}
 
+	number = highest_id_so_far + 1;
 	/* Scan for foreign key declarations in a loop */
 loop:
 	/* Scan either to "CONSTRAINT" or "FOREIGN", whichever is closer */
@@ -4192,7 +4371,7 @@
 		command, determine if there are any foreign keys, and
 		if so, immediately reject the command if the table is a
 		temporary one. For now, this kludge will work. */
-		if (reject_fks && (UT_LIST_GET_LEN(table->foreign_list) > 0)) {
+		if (reject_fks && !local_fk_set.empty()) {
 
 			return(DB_CANNOT_ADD_CONSTRAINT);
 		}
@@ -4202,7 +4381,17 @@
 		to the data dictionary system tables on disk */
 
 		error = dict_create_add_foreigns_to_dictionary(
-			highest_id_so_far, table, trx);
+			local_fk_set, table, trx);
+
+		if (error == DB_SUCCESS) {
+
+			table->foreign_set.insert(local_fk_set.begin(),
+						  local_fk_set.end());
+			std::for_each(local_fk_set.begin(),
+				      local_fk_set.end(),
+				      dict_foreign_add_to_referenced_table());
+			local_fk_set.clear();
+		}
 		return(error);
 	}
 
@@ -4334,6 +4523,24 @@
 		strcpy(foreign->id + db_len + 1, constraint_name);
 	}
 
+	if (foreign->id == NULL) {
+		error = dict_create_add_foreign_id(&number,
+						   table->name, foreign);
+		if (error != DB_SUCCESS) {
+			dict_foreign_free(foreign);
+			return(error);
+		}
+	}
+
+	std::pair<dict_foreign_set::iterator, bool>	ret
+		= local_fk_set.insert(foreign);
+
+	if (!ret.second) {
+		/* A duplicate foreign key name has been found */
+		dict_foreign_free(foreign);
+		return(DB_CANNOT_ADD_CONSTRAINT);
+	}
+
 	foreign->foreign_table = table;
 	foreign->foreign_table_name = mem_heap_strdup(
 		foreign->heap, table->name);
@@ -4359,8 +4566,6 @@
 	checking of foreign key constraints! */
 
 	if (!success || (!referenced_table && trx->check_foreigns)) {
-		dict_foreign_free(foreign);
-
 		mutex_enter(&dict_foreign_err_mutex);
 		dict_foreign_error_report_low(ef, name);
 		fprintf(ef, "%s:\nCannot resolve table name close to:\n"
@@ -4374,7 +4579,6 @@
 	ptr = dict_accept(cs, ptr, "(", &success);
 
 	if (!success) {
-		dict_foreign_free(foreign);
 		dict_foreign_report_syntax_err(name, start_of_latest_foreign,
 					       ptr);
 		return(DB_CANNOT_ADD_CONSTRAINT);
@@ -4389,7 +4593,6 @@
 	i++;
 
 	if (!success) {
-		dict_foreign_free(foreign);
 
 		mutex_enter(&dict_foreign_err_mutex);
 		dict_foreign_error_report_low(ef, name);
@@ -4410,7 +4613,6 @@
 	ptr = dict_accept(cs, ptr, ")", &success);
 
 	if (!success || foreign->n_fields != i) {
-		dict_foreign_free(foreign);
 
 		dict_foreign_report_syntax_err(name, start_of_latest_foreign,
 					       ptr);
@@ -4436,7 +4638,6 @@
 		ptr = dict_accept(cs, ptr, "UPDATE", &success);
 
 		if (!success) {
-			dict_foreign_free(foreign);
 
 			dict_foreign_report_syntax_err(
 				name, start_of_latest_foreign, ptr);
@@ -4474,7 +4675,6 @@
 		ptr = dict_accept(cs, ptr, "ACTION", &success);
 
 		if (!success) {
-			dict_foreign_free(foreign);
 			dict_foreign_report_syntax_err(
 				name, start_of_latest_foreign, ptr);
 
@@ -4493,7 +4693,6 @@
 	ptr = dict_accept(cs, ptr, "SET", &success);
 
 	if (!success) {
-		dict_foreign_free(foreign);
 		dict_foreign_report_syntax_err(name, start_of_latest_foreign,
 					       ptr);
 		return(DB_CANNOT_ADD_CONSTRAINT);
@@ -4502,7 +4701,6 @@
 	ptr = dict_accept(cs, ptr, "NULL", &success);
 
 	if (!success) {
-		dict_foreign_free(foreign);
 		dict_foreign_report_syntax_err(name, start_of_latest_foreign,
 					       ptr);
 		return(DB_CANNOT_ADD_CONSTRAINT);
@@ -4515,8 +4713,6 @@
 			/* It is not sensible to define SET NULL
 			if the column is not allowed to be NULL! */
 
-			dict_foreign_free(foreign);
-
 			mutex_enter(&dict_foreign_err_mutex);
 			dict_foreign_error_report_low(ef, name);
 			fprintf(ef, "%s:\n"
@@ -4542,8 +4738,6 @@
 	if (n_on_deletes > 1 || n_on_updates > 1) {
 		/* It is an error to define more than 1 action */
 
-		dict_foreign_free(foreign);
-
 		mutex_enter(&dict_foreign_err_mutex);
 		dict_foreign_error_report_low(ef, name);
 		fprintf(ef, "%s:\n"
@@ -4565,7 +4759,6 @@
 						foreign->foreign_index,
 						TRUE, FALSE);
 		if (!index) {
-			dict_foreign_free(foreign);
 			mutex_enter(&dict_foreign_err_mutex);
 			dict_foreign_error_report_low(ef, name);
 			fprintf(ef, "%s:\n"
@@ -4609,16 +4802,6 @@
 			= mem_heap_strdup(foreign->heap, column_names[i]);
 	}
 
-	/* We found an ok constraint definition: add to the lists */
-
-	UT_LIST_ADD_LAST(foreign_list, table->foreign_list, foreign);
-
-	if (referenced_table) {
-		UT_LIST_ADD_LAST(referenced_list,
-				 referenced_table->referenced_list,
-				 foreign);
-	}
-
 	goto loop;
 }
 /**************************************************************************
@@ -4704,7 +4887,6 @@
 	const char***	constraints_to_drop)	/*!< out: id's of the
 						constraints to drop */
 {
-	dict_foreign_t*		foreign;
 	ibool			success;
 	char*			str;
 	size_t			len;
@@ -4770,25 +4952,10 @@
 	(*constraints_to_drop)[*n] = id;
 	(*n)++;
 
-	/* Look for the given constraint id */
-
-	foreign = UT_LIST_GET_FIRST(table->foreign_list);
-
-	while (foreign != NULL) {
-		if (0 == innobase_strcasecmp(foreign->id, id)
-		    || (strchr(foreign->id, '/')
-			&& 0 == innobase_strcasecmp(
-				id,
-				dict_remove_db_name(foreign->id)))) {
-			/* Found */
-			break;
-		}
-
-		foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
-	}
-
-
-	if (foreign == NULL) {
+	if (std::find_if(table->foreign_set.begin(),
+			 table->foreign_set.end(),
+			 dict_foreign_matches_id(id))
+	    == table->foreign_set.end()) {
 
 		if (!srv_read_only_mode) {
 			FILE*	ef = dict_foreign_err_file;
@@ -5115,7 +5282,6 @@
 	dict_table_t*	table)	/*!< in: table */
 {
 	dict_index_t*	index;
-	dict_foreign_t*	foreign;
 	ulint		i;
 
 	ut_ad(mutex_own(&(dict_sys->mutex)));
@@ -5152,23 +5318,15 @@
 		index = UT_LIST_GET_NEXT(indexes, index);
 	}
 
-	table->stat_initialized = FALSE;
-
 	dict_table_stats_unlock(table, RW_X_LATCH);
 
-	foreign = UT_LIST_GET_FIRST(table->foreign_list);
-
-	while (foreign != NULL) {
-		dict_foreign_print_low(foreign);
-		foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
-	}
-
-	foreign = UT_LIST_GET_FIRST(table->referenced_list);
-
-	while (foreign != NULL) {
-		dict_foreign_print_low(foreign);
-		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
-	}
+	std::for_each(table->foreign_set.begin(),
+		      table->foreign_set.end(),
+		      dict_foreign_print_low);
+
+	std::for_each(table->referenced_set.begin(),
+		      table->referenced_set.end(),
+		      dict_foreign_print_low);
 }
 
 /**********************************************************************//**
@@ -5376,15 +5534,12 @@
 
 	mutex_enter(&(dict_sys->mutex));
 
-	foreign = UT_LIST_GET_FIRST(table->foreign_list);
-
-	if (foreign == NULL) {
-		mutex_exit(&(dict_sys->mutex));
+	for (dict_foreign_set::iterator it = table->foreign_set.begin();
+	     it != table->foreign_set.end();
+	     ++it) {
 
-		return;
-	}
+		foreign = *it;
 
-	while (foreign != NULL) {
 		if (create_table_format) {
 			dict_print_info_on_foreign_key_in_create_format(
 				file, trx, foreign, TRUE);
@@ -5441,8 +5596,6 @@
 				fputs(" ON UPDATE NO ACTION", file);
 			}
 		}
-
-		foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
 	}
 
 	mutex_exit(&(dict_sys->mutex));
@@ -5479,6 +5632,11 @@
 
 	ut_ad(space_id > 0);
 
+	if (dict_sys == NULL) {
+		/* This could happen when it's in redo processing. */
+		return(NULL);
+	}
+
 	table = UT_LIST_GET_FIRST(dict_sys->table_LRU);
 	num_item =  UT_LIST_GET_LEN(dict_sys->table_LRU);
 
@@ -5593,11 +5751,11 @@
 
 	dict_index_copy_types(tuple, sys_index, 2);
 
-	btr_cur_search_to_nth_level(sys_index, 0, tuple, PAGE_CUR_GE,
+	btr_cur_search_to_nth_level(sys_index, 0, tuple, PAGE_CUR_LE,
 				    BTR_MODIFY_LEAF,
 				    &cursor, 0, __FILE__, __LINE__, &mtr);
 
-	if (cursor.up_match == dtuple_get_n_fields(tuple)) {
+	if (cursor.low_match == dtuple_get_n_fields(tuple)) {
 		/* UPDATE SYS_INDEXES SET TYPE=index->type
 		WHERE TABLE_ID=index->table->id AND INDEX_ID=index->id */
 		ulint	len;
@@ -5644,7 +5802,7 @@
 	dict_index_t*	index,		/*!< in/out: index */
 	dict_table_t*	table)		/*!< in/out: table */
 {
-	ut_ad(index);
+	ut_ad(index != NULL);
 	ut_ad(mutex_own(&dict_sys->mutex));
 	ut_ad(!dict_table_is_comp(dict_sys->sys_tables));
 	ut_ad(!dict_table_is_comp(dict_sys->sys_indexes));
@@ -5654,8 +5812,9 @@
 	if (dict_index_is_clust(index)) {
 		dict_table_t*	corrupt_table;
 
-		corrupt_table = table ? table : index->table;
-		ut_ad(!index->table || !table || index->table  == table);
+		corrupt_table = (table != NULL) ? table : index->table;
+		ut_ad((index->table != NULL) || (table != NULL)
+		      || index->table  == table);
 
 		if (corrupt_table) {
 			corrupt_table->corrupted = TRUE;
@@ -5735,11 +5894,6 @@
 {
 	dict_index_t*	index;
 
-	/* If name is NULL, just return */
-	if (!name) {
-		return(NULL);
-	}
-
 	index = dict_table_get_first_index(table);
 
 	while (index != NULL) {
@@ -5774,10 +5928,11 @@
 	ut_ad(index->to_be_dropped);
 	ut_ad(index->table == table);
 
-	for (foreign = UT_LIST_GET_FIRST(table->foreign_list);
-	     foreign;
-	     foreign = UT_LIST_GET_NEXT(foreign_list, foreign)) {
+	for (dict_foreign_set::iterator it = table->foreign_set.begin();
+	     it != table->foreign_set.end();
+	     ++it) {
 
+		foreign = *it;
 		if (foreign->foreign_index == index) {
 			ut_ad(foreign->foreign_table == index->table);
 
@@ -5797,10 +5952,11 @@
 		}
 	}
 
-	for (foreign = UT_LIST_GET_FIRST(table->referenced_list);
-	     foreign;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
+	for (dict_foreign_set::iterator it = table->referenced_set.begin();
+	     it != table->referenced_set.end();
+	     ++it) {
 
+		foreign = *it;
 		if (foreign->referenced_index == index) {
 			ut_ad(foreign->referenced_table == index->table);
 
@@ -6092,24 +6248,24 @@
 		}
 	}
 
-	if (req_schema->n_foreign != UT_LIST_GET_LEN(table->foreign_list)) {
+	if (req_schema->n_foreign != table->foreign_set.size()) {
 		ut_snprintf(
 			errstr, errstr_sz,
-			"Table %s has %lu foreign key(s) pointing to other "
-			"tables, but it must have %lu.",
+			"Table %s has " ULINTPF " foreign key(s) pointing"
+			" to other tables, but it must have %lu.",
 			ut_format_name(req_schema->table_name,
 				       TRUE, buf, sizeof(buf)),
-			UT_LIST_GET_LEN(table->foreign_list),
+			static_cast<ulint>(table->foreign_set.size()),
 			req_schema->n_foreign);
 		return(DB_ERROR);
 	}
 
-	if (req_schema->n_referenced != UT_LIST_GET_LEN(table->referenced_list)) {
+	if (req_schema->n_referenced != table->referenced_set.size()) {
 		ut_snprintf(
 			errstr, errstr_sz,
-			"There are %lu foreign key(s) pointing to %s, "
+			"There are " ULINTPF " foreign key(s) pointing to %s, "
 			"but there must be %lu.",
-			UT_LIST_GET_LEN(table->referenced_list),
+			static_cast<ulint>(table->referenced_set.size()),
 			ut_format_name(req_schema->table_name,
 				       TRUE, buf, sizeof(buf)),
 			req_schema->n_referenced);
@@ -6503,10 +6659,10 @@
 		return;
 	}
 
-	os_fast_mutex_lock(&index->zip_pad.mutex);
+	dict_index_zip_pad_lock(index);
 	++index->zip_pad.success;
 	dict_index_zip_pad_update(&index->zip_pad, zip_threshold);
-	os_fast_mutex_unlock(&index->zip_pad.mutex);
+	dict_index_zip_pad_unlock(index);
 }
 
 /*********************************************************************//**
@@ -6526,10 +6682,10 @@
 		return;
 	}
 
-	os_fast_mutex_lock(&index->zip_pad.mutex);
+	dict_index_zip_pad_lock(index);
 	++index->zip_pad.failure;
 	dict_index_zip_pad_update(&index->zip_pad, zip_threshold);
-	os_fast_mutex_unlock(&index->zip_pad.mutex);
+	dict_index_zip_pad_unlock(index);
 }
 
 
@@ -6561,9 +6717,9 @@
 #ifdef HAVE_ATOMIC_BUILTINS
 	pad = os_atomic_increment_ulint(&index->zip_pad.pad, 0);
 #else /* HAVE_ATOMIC_BUILTINS */
-	os_fast_mutex_lock(&index->zip_pad.mutex);
+	dict_index_zip_pad_lock(index);
 	pad = index->zip_pad.pad;
-	os_fast_mutex_unlock(&index->zip_pad.mutex);
+	dict_index_zip_pad_unlock(index);
 #endif /* HAVE_ATOMIC_BUILTINS */
 
 	ut_ad(pad < UNIV_PAGE_SIZE);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/dict/dict0load.cc percona-xtrabackup-2.3.7/storage/innobase/dict/dict0load.cc
--- percona-xtrabackup-2.2.3/storage/innobase/dict/dict0load.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/dict/dict0load.cc	2017-02-27 07:47:02.000000000 +0000
@@ -63,6 +63,17 @@
 metadata even if it is marked as "corrupted". */
 UNIV_INTERN my_bool     srv_load_corrupted = FALSE;
 
+/************************************************************************
+Checks if a table specified as a name in the form "database/name" (InnoDB 5.6)
+or "./database/name.ibd" (InnoDB 5.5-) should be skipped from backup based on
+the --tables or --tables-file options.
+
+@return TRUE if the table should be skipped. */
+my_bool
+check_if_skip_table(
+/******************/
+	const char*	name);	/*!< in: path to the table */
+
 #ifdef UNIV_DEBUG
 /****************************************************************//**
 Compare the name of an index column.
@@ -1077,6 +1088,7 @@
 
 		bool		is_temp = false;
 		bool		discarded = false;
+		bool		print_error_if_does_not_exist;
 		ib_uint32_t	flags2 = static_cast<ib_uint32_t>(
 			mach_read_from_4(field));
 
@@ -1101,13 +1113,19 @@
 			goto next_tablespace;
 		}
 
+		if (is_temp || discarded || check_if_skip_table(name)) {
+			print_error_if_does_not_exist = false;
+		} else {
+			print_error_if_does_not_exist = true;
+		}
+
 		switch (dict_check) {
 		case DICT_CHECK_ALL_LOADED:
 			/* All tablespaces should have been found in
 			fil_load_single_table_tablespaces(). */
 			if (fil_space_for_table_exists_in_mem(
-				space_id, name, TRUE, !(is_temp || discarded),
-				false, NULL, 0)
+				space_id, name, TRUE, print_error_if_does_not_exist,
+				!(is_temp || discarded), false, NULL, 0)
 			    && !(is_temp || discarded)) {
 				/* If user changes the path of .ibd files in
 				   *.isl files before doing crash recovery ,
@@ -1140,7 +1158,7 @@
 			trx_resurrect_table_locks(). */
 			if (fil_space_for_table_exists_in_mem(
 				    space_id, name, FALSE, FALSE,
-				    false, NULL, 0)) {
+				    false, false, NULL, 0)) {
 				break;
 			}
 			/* fall through */
@@ -1756,7 +1774,7 @@
 		goto err_len;
 	}
 	type = mach_read_from_4(field);
-	if (type & (~0 << DICT_IT_BITS)) {
+	if (type & (~0U << DICT_IT_BITS)) {
 		return("unknown SYS_INDEXES.TYPE bits");
 	}
 
@@ -2382,7 +2400,7 @@
 		table->ibd_file_missing = TRUE;
 
 	} else if (!fil_space_for_table_exists_in_mem(
-			table->space, name, FALSE, FALSE, true, heap,
+			table->space, name, FALSE, FALSE, false, true, heap,
 			table->id)) {
 
 		if (DICT_TF2_FLAG_IS_SET(table, DICT_TF2_TEMPORARY)) {
@@ -2549,6 +2567,8 @@
 		}
 	}
 
+	ut_ad(err != DB_SUCCESS || dict_foreign_set_validate(*table));
+
 	return(table);
 }
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/dict/dict0mem.cc percona-xtrabackup-2.3.7/storage/innobase/dict/dict0mem.cc
--- percona-xtrabackup-2.2.3/storage/innobase/dict/dict0mem.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/dict/dict0mem.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -35,6 +35,7 @@
 #include "mach0data.h"
 #include "dict0dict.h"
 #include "fts0priv.h"
+#include "ut0crc32.h"
 #ifndef UNIV_HOTBACKUP
 # include "ha_prototypes.h"	/* innobase_casedn_str(),
 				innobase_get_lower_case_table_names */
@@ -44,6 +45,7 @@
 #ifdef UNIV_BLOB_DEBUG
 # include "ut0rbt.h"
 #endif /* UNIV_BLOB_DEBUG */
+#include <iostream>
 
 #define	DICT_HEAP_SIZE		100	/*!< initial memory heap size when
 					creating a table or index object */
@@ -53,6 +55,10 @@
 UNIV_INTERN mysql_pfs_key_t	autoinc_mutex_key;
 #endif /* UNIV_PFS_MUTEX */
 
+/** An interger randomly initialized at startup used to make a temporary
+table name as unique as possible. */
+static ib_uint32_t	dict_temp_file_num;
+
 /**********************************************************************//**
 Creates a table memory object.
 @return	own: table object */
@@ -95,16 +101,15 @@
 
 	ut_d(table->magic_n = DICT_TABLE_MAGIC_N);
 
-	table->stats_latch = new rw_lock_t;
-	rw_lock_create(dict_table_stats_latch_key, table->stats_latch,
-		       SYNC_INDEX_TREE);
+	/* true means that the stats latch will be enabled -
+	dict_table_stats_lock() will not be noop. */
+	dict_table_stats_latch_create(table, true);
 
 #ifndef UNIV_HOTBACKUP
 	table->autoinc_lock = static_cast<ib_lock_t*>(
 		mem_heap_alloc(heap, lock_get_size()));
 
-	mutex_create(autoinc_mutex_key,
-		     &table->autoinc_mutex, SYNC_DICT_AUTOINC_MUTEX);
+	dict_table_autoinc_create_lazy(table);
 
 	table->autoinc = 0;
 
@@ -124,6 +129,9 @@
 	}
 #endif /* !UNIV_HOTBACKUP */
 
+	new(&table->foreign_set) dict_foreign_set();
+	new(&table->referenced_set) dict_foreign_set();
+
 	return(table);
 }
 
@@ -151,11 +159,13 @@
 		}
 	}
 #ifndef UNIV_HOTBACKUP
-	mutex_free(&(table->autoinc_mutex));
+	dict_table_autoinc_destroy(table);
 #endif /* UNIV_HOTBACKUP */
 
-	rw_lock_free(table->stats_latch);
-	delete table->stats_latch;
+	dict_table_stats_latch_destroy(table);
+
+	table->foreign_set.~dict_foreign_set();
+	table->referenced_set.~dict_foreign_set();
 
 	ut_free(table->name);
 	mem_heap_free(table->heap);
@@ -269,6 +279,9 @@
 	ut_ad(from_len <= NAME_LEN);
 	ut_ad(to_len <= NAME_LEN);
 
+	char from[NAME_LEN];
+	strncpy(from, s, NAME_LEN);
+
 	if (from_len == to_len) {
 		/* The easy case: simply replace the column name in
 		table->col_names. */
@@ -327,25 +340,73 @@
 		table->col_names = col_names;
 	}
 
+	dict_foreign_t*	foreign;
+
 	/* Replace the field names in every foreign key constraint. */
-	for (dict_foreign_t* foreign = UT_LIST_GET_FIRST(table->foreign_list);
-	     foreign != NULL;
-	     foreign = UT_LIST_GET_NEXT(foreign_list, foreign)) {
-		for (unsigned f = 0; f < foreign->n_fields; f++) {
-			/* These can point straight to
-			table->col_names, because the foreign key
-			constraints will be freed at the same time
-			when the table object is freed. */
-			foreign->foreign_col_names[f]
-				= dict_index_get_nth_field(
-					foreign->foreign_index, f)->name;
+	for (dict_foreign_set::iterator it = table->foreign_set.begin();
+	     it != table->foreign_set.end();
+	     ++it) {
+
+		foreign = *it;
+
+		if (foreign->foreign_index == NULL) {
+			/* We may go here when we set foreign_key_checks to 0,
+			and then try to rename a column and modify the
+			corresponding foreign key constraint. The index
+			would have been dropped, we have to find an equivalent
+			one */
+			for (unsigned f = 0; f < foreign->n_fields; f++) {
+				if (strcmp(foreign->foreign_col_names[f], from)
+				    == 0) {
+
+					char** rc = const_cast<char**>(
+						foreign->foreign_col_names
+						+ f);
+
+					if (to_len <= strlen(*rc)) {
+						memcpy(*rc, to, to_len + 1);
+					} else {
+						*rc = static_cast<char*>(
+							mem_heap_dup(
+								foreign->heap,
+								to,
+								to_len + 1));
+					}
+				}
+			}
+
+			dict_index_t* new_index = dict_foreign_find_index(
+				foreign->foreign_table, NULL,
+				foreign->foreign_col_names,
+				foreign->n_fields, NULL, true, false);
+			/* There must be an equivalent index in this case. */
+			ut_ad(new_index != NULL);
+
+			foreign->foreign_index = new_index;
+
+		} else {
+
+			for (unsigned f = 0; f < foreign->n_fields; f++) {
+				/* These can point straight to
+				table->col_names, because the foreign key
+				constraints will be freed at the same time
+				when the table object is freed. */
+				foreign->foreign_col_names[f]
+					= dict_index_get_nth_field(
+						foreign->foreign_index,
+						f)->name;
+			}
 		}
 	}
 
-	for (dict_foreign_t* foreign = UT_LIST_GET_FIRST(
-		     table->referenced_list);
-	     foreign != NULL;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
+	for (dict_foreign_set::iterator it = table->referenced_set.begin();
+	     it != table->referenced_set.end();
+	     ++it) {
+
+		foreign = *it;
+
+		ut_ad(foreign->referenced_index != NULL);
+
 		for (unsigned f = 0; f < foreign->n_fields; f++) {
 			/* foreign->referenced_col_names[] need to be
 			copies, because the constraint may become
@@ -463,8 +524,7 @@
 	dict_mem_fill_index_struct(index, heap, table_name, index_name,
 				   space, type, n_fields);
 
-	os_fast_mutex_init(zip_pad_mutex_key, &index->zip_pad.mutex);
-
+	dict_index_zip_pad_mutex_create_lazy(index);
 	return(index);
 }
 
@@ -597,31 +657,125 @@
 	}
 #endif /* UNIV_BLOB_DEBUG */
 
-	os_fast_mutex_free(&index->zip_pad.mutex);
+	dict_index_zip_pad_mutex_destroy(index);
 
 	mem_heap_free(index->heap);
 }
 
-/*******************************************************************//**
-Create a temporary tablename.
-@return temporary tablename suitable for InnoDB use */
+/** Create a temporary tablename like "#sql-ibtid-inc where
+  tid = the Table ID
+  inc = a randomly initialized number that is incremented for each file
+The table ID is a 64 bit integer, can use up to 20 digits, and is
+initialized at bootstrap. The second number is 32 bits, can use up to 10
+digits, and is initialized at startup to a randomly distributed number.
+It is hoped that the combination of these two numbers will provide a
+reasonably unique temporary file name.
+@param[in]	heap	A memory heap
+@param[in]	dbtab	Table name in the form database/table name
+@param[in]	id	Table id
+@return A unique temporary tablename suitable for InnoDB use */
 UNIV_INTERN
 char*
 dict_mem_create_temporary_tablename(
-/*================================*/
-	mem_heap_t*	heap,	/*!< in: memory heap */
-	const char*	dbtab,	/*!< in: database/table name */
-	table_id_t	id)	/*!< in: InnoDB table id */
-{
-	const char*	dbend   = strchr(dbtab, '/');
+	mem_heap_t*	heap,
+	const char*	dbtab,
+	table_id_t	id)
+{
+	size_t		size;
+	char*		name;
+	const char*	dbend = strchr(dbtab, '/');
 	ut_ad(dbend);
-	size_t		dblen   = dbend - dbtab + 1;
-	size_t		size = tmp_file_prefix_length + 4 + 9 + 9 + dblen;
+	size_t		dblen = dbend - dbtab + 1;
+
+#ifdef HAVE_ATOMIC_BUILTINS
+	/* Increment a randomly initialized number for each temp file. */
+	os_atomic_increment_uint32(&dict_temp_file_num, 1);
+#else /* HAVE_ATOMIC_BUILTINS */
+	dict_temp_file_num++;
+#endif /* HAVE_ATOMIC_BUILTINS */
 
-	char*	name = static_cast<char*>(mem_heap_alloc(heap, size));
+	size = tmp_file_prefix_length + 3 + 20 + 1 + 10 + dblen;
+	name = static_cast<char*>(mem_heap_alloc(heap, size));
 	memcpy(name, dbtab, dblen);
 	ut_snprintf(name + dblen, size - dblen,
-		    tmp_file_prefix "-ib" UINT64PF, id);
+		    TEMP_FILE_PREFIX_INNODB UINT64PF "-" UINT32PF,
+		    id, dict_temp_file_num);
+
 	return(name);
 }
 
+/** Initialize dict memory variables */
+
+void
+dict_mem_init(void)
+{
+	/* Initialize a randomly distributed temporary file number */
+	ib_uint32_t now = static_cast<ib_uint32_t>(ut_time());
+
+	const byte* buf = reinterpret_cast<const byte*>(&now);
+	ut_ad(ut_crc32 != NULL);
+
+	dict_temp_file_num = ut_crc32(buf, sizeof(now));
+
+	DBUG_PRINT("dict_mem_init",
+		   ("Starting Temporary file number is " UINT32PF,
+		   dict_temp_file_num));
+}
+
+/** Validate the search order in the foreign key set.
+@param[in]	fk_set	the foreign key set to be validated
+@return true if search order is fine in the set, false otherwise. */
+bool
+dict_foreign_set_validate(
+	const dict_foreign_set&	fk_set)
+{
+	dict_foreign_not_exists	not_exists(fk_set);
+
+	dict_foreign_set::iterator it = std::find_if(
+		fk_set.begin(), fk_set.end(), not_exists);
+
+	if (it == fk_set.end()) {
+		return(true);
+	}
+
+	dict_foreign_t*	foreign = *it;
+	std::cerr << "Foreign key lookup failed: " << *foreign;
+	std::cerr << fk_set;
+	ut_ad(0);
+	return(false);
+}
+
+/** Validate the search order in the foreign key sets of the table
+(foreign_set and referenced_set).
+@param[in]	table	table whose foreign key sets are to be validated
+@return true if foreign key sets are fine, false otherwise. */
+bool
+dict_foreign_set_validate(
+	const dict_table_t&	table)
+{
+	return(dict_foreign_set_validate(table.foreign_set)
+	       && dict_foreign_set_validate(table.referenced_set));
+}
+
+std::ostream&
+operator<< (std::ostream& out, const dict_foreign_t& foreign)
+{
+	out << "[dict_foreign_t: id='" << foreign.id << "'";
+
+	if (foreign.foreign_table_name != NULL) {
+		out << ",for: '" << foreign.foreign_table_name << "'";
+	}
+
+	out << "]";
+	return(out);
+}
+
+std::ostream&
+operator<< (std::ostream& out, const dict_foreign_set& fk_set)
+{
+	out << "[dict_foreign_set:";
+	std::for_each(fk_set.begin(), fk_set.end(), dict_foreign_print(out));
+	out << "]" << std::endl;
+	return(out);
+}
+
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/dict/dict0stats.cc percona-xtrabackup-2.3.7/storage/innobase/dict/dict0stats.cc
--- percona-xtrabackup-2.2.3/storage/innobase/dict/dict0stats.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/dict/dict0stats.cc	2017-02-27 07:47:02.000000000 +0000
@@ -46,6 +46,7 @@
 #include "ut0rnd.h" /* ut_rnd_interval() */
 #include "ut0ut.h" /* ut_format_name(), ut_time() */
 
+#include <algorithm>
 #include <map>
 #include <vector>
 
@@ -127,10 +128,11 @@
 #endif /* UNIV_STATS_DEBUG */
 
 /* Gets the number of leaf pages to sample in persistent stats estimation */
-#define N_SAMPLE_PAGES(index)				\
-	((index)->table->stats_sample_pages != 0 ?	\
-	 (index)->table->stats_sample_pages :		\
-	 srv_stats_persistent_sample_pages)
+#define N_SAMPLE_PAGES(index)					\
+	static_cast<ib_uint64_t>(				\
+		(index)->table->stats_sample_pages != 0		\
+		? (index)->table->stats_sample_pages		\
+		: srv_stats_persistent_sample_pages)
 
 /* number of distinct records on a given level that are required to stop
 descending to lower levels and fetch N_SAMPLE_PAGES(index) records
@@ -430,9 +432,9 @@
 	t->corrupted = table->corrupted;
 
 	/* This private object "t" is not shared with other threads, so
-	we do not need the stats_latch. The lock/unlock routines will do
-	nothing if stats_latch is NULL. */
-	t->stats_latch = NULL;
+	we do not need the stats_latch (thus we pass false below). The
+	dict_table_stats_lock()/unlock() routines will do nothing. */
+	dict_table_stats_latch_create(t, false);
 
 	UT_LIST_INIT(t->indexes);
 
@@ -508,6 +510,7 @@
 /*========================*/
 	dict_table_t*	t)	/*!< in: dummy table object to free */
 {
+	dict_table_stats_latch_destroy(t);
 	mem_heap_free(t->heap);
 }
 
@@ -1283,35 +1286,40 @@
 };
 /* @} */
 
-/*********************************************************************//**
-Scan a page, reading records from left to right and counting the number
-of distinct records on that page (looking only at the first n_prefix
-columns). If scan_method is QUIT_ON_FIRST_NON_BORING then the function
+/** Scan a page, reading records from left to right and counting the number
+of distinct records (looking only at the first n_prefix
+columns) and the number of external pages pointed by records from this page.
+If scan_method is QUIT_ON_FIRST_NON_BORING then the function
 will return as soon as it finds a record that does not match its neighbor
 to the right, which means that in the case of QUIT_ON_FIRST_NON_BORING the
 returned n_diff can either be 0 (empty page), 1 (the whole page has all keys
 equal) or 2 (the function found a non-boring record and returned).
+@param[out]	out_rec			record, or NULL
+@param[out]	offsets1		rec_get_offsets() working space (must
+be big enough)
+@param[out]	offsets2		rec_get_offsets() working space (must
+be big enough)
+@param[in]	index			index of the page
+@param[in]	page			the page to scan
+@param[in]	n_prefix		look at the first n_prefix columns
+@param[in]	scan_method		scan to the end of the page or not
+@param[out]	n_diff			number of distinct records encountered
+@param[out]	n_external_pages	if this is non-NULL then it will be set
+to the number of externally stored pages which were encountered
 @return offsets1 or offsets2 (the offsets of *out_rec),
 or NULL if the page is empty and does not contain user records. */
-UNIV_INLINE __attribute__((nonnull))
+UNIV_INLINE
 ulint*
 dict_stats_scan_page(
-/*=================*/
-	const rec_t**		out_rec,	/*!< out: record, or NULL */
-	ulint*			offsets1,	/*!< out: rec_get_offsets()
-						working space (must be big
-						enough) */
-	ulint*			offsets2,	/*!< out: rec_get_offsets()
-						working space (must be big
-						enough) */
-	dict_index_t*		index,		/*!< in: index of the page */
-	const page_t*		page,		/*!< in: the page to scan */
-	ulint			n_prefix,	/*!< in: look at the first
-						n_prefix columns */
-	page_scan_method_t	scan_method,	/*!< in: scan to the end of
-						the page or not */
-	ib_uint64_t*		n_diff)		/*!< out: number of distinct
-						records encountered */
+	const rec_t**		out_rec,
+	ulint*			offsets1,
+	ulint*			offsets2,
+	dict_index_t*		index,
+	const page_t*		page,
+	ulint			n_prefix,
+	page_scan_method_t	scan_method,
+	ib_uint64_t*		n_diff,
+	ib_uint64_t*		n_external_pages)
 {
 	ulint*		offsets_rec		= offsets1;
 	ulint*		offsets_next_rec	= offsets2;
@@ -1329,6 +1337,12 @@
 		get_next = page_rec_get_next_const;
 	}
 
+	const bool	should_count_external_pages = n_external_pages != NULL;
+
+	if (should_count_external_pages) {
+		*n_external_pages = 0;
+	}
+
 	rec = get_next(page_get_infimum_rec(page));
 
 	if (page_rec_is_supremum(rec)) {
@@ -1341,6 +1355,11 @@
 	offsets_rec = rec_get_offsets(rec, index, offsets_rec,
 				      ULINT_UNDEFINED, &heap);
 
+	if (should_count_external_pages) {
+		*n_external_pages += btr_rec_get_externally_stored_len(
+			rec, offsets_rec);
+	}
+
 	next_rec = get_next(rec);
 
 	*n_diff = 1;
@@ -1391,6 +1410,11 @@
 			offsets_next_rec = offsets_tmp;
 		}
 
+		if (should_count_external_pages) {
+			*n_external_pages += btr_rec_get_externally_stored_len(
+				rec, offsets_rec);
+		}
+
 		next_rec = get_next(next_rec);
 	}
 
@@ -1401,19 +1425,25 @@
 	return(offsets_rec);
 }
 
-/*********************************************************************//**
-Dive below the current position of a cursor and calculate the number of
+/** Dive below the current position of a cursor and calculate the number of
 distinct records on the leaf page, when looking at the fist n_prefix
-columns.
+columns. Also calculate the number of external pages pointed by records
+on the leaf page.
+@param[in]	cur			cursor
+@param[in]	n_prefix		look at the first n_prefix columns
+when comparing records
+@param[out]	n_diff			number of distinct records
+@param[out]	n_external_pages	number of external pages
+@param[in,out]	mtr			mini-transaction
 @return number of distinct records on the leaf page */
 static
-ib_uint64_t
+void
 dict_stats_analyze_index_below_cur(
-/*===============================*/
-	const btr_cur_t*cur,		/*!< in: cursor */
-	ulint		n_prefix,	/*!< in: look at the first n_prefix
-					columns when comparing records */
-	mtr_t*		mtr)		/*!< in/out: mini-transaction */
+	const btr_cur_t*	cur,
+	ulint			n_prefix,
+	ib_uint64_t*		n_diff,
+	ib_uint64_t*		n_external_pages,
+	mtr_t*			mtr)
 {
 	dict_index_t*	index;
 	ulint		space;
@@ -1426,7 +1456,6 @@
 	ulint*		offsets1;
 	ulint*		offsets2;
 	ulint*		offsets_rec;
-	ib_uint64_t	n_diff; /* the result */
 	ulint		size;
 
 	index = btr_cur_get_index(cur);
@@ -1462,6 +1491,10 @@
 
 	page_no = btr_node_ptr_get_child_page_no(rec, offsets_rec);
 
+	/* assume no external pages by default - in case we quit from this
+	function without analyzing any leaf pages */
+	*n_external_pages = 0;
+
 	/* descend to the leaf level on the B-tree */
 	for (;;) {
 
@@ -1480,20 +1513,24 @@
 		/* search for the first non-boring record on the page */
 		offsets_rec = dict_stats_scan_page(
 			&rec, offsets1, offsets2, index, page, n_prefix,
-			QUIT_ON_FIRST_NON_BORING, &n_diff);
+			QUIT_ON_FIRST_NON_BORING, n_diff, NULL);
 
 		/* pages on level > 0 are not allowed to be empty */
 		ut_a(offsets_rec != NULL);
 		/* if page is not empty (offsets_rec != NULL) then n_diff must
 		be > 0, otherwise there is a bug in dict_stats_scan_page() */
-		ut_a(n_diff > 0);
+		ut_a(*n_diff > 0);
 
-		if (n_diff == 1) {
+		if (*n_diff == 1) {
 			/* page has all keys equal and the end of the page
 			was reached by dict_stats_scan_page(), no need to
 			descend to the leaf level */
 			mem_heap_free(heap);
-			return(1);
+			/* can't get an estimate for n_external_pages here
+			because we do not dive to the leaf level, assume no
+			external pages (*n_external_pages was assigned to 0
+			above). */
+			return;
 		}
 		/* else */
 
@@ -1501,7 +1538,7 @@
 		first non-boring record it finds, then the returned n_diff
 		can either be 0 (empty page), 1 (page has all keys equal) or
 		2 (non-boring record was found) */
-		ut_a(n_diff == 2);
+		ut_a(*n_diff == 2);
 
 		/* we have a non-boring record in rec, descend below it */
 
@@ -1512,11 +1549,14 @@
 	ut_ad(btr_page_get_level(page, mtr) == 0);
 
 	/* scan the leaf page and find the number of distinct keys,
-	when looking only at the first n_prefix columns */
+	when looking only at the first n_prefix columns; also estimate
+	the number of externally stored pages pointed by records on this
+	page */
 
 	offsets_rec = dict_stats_scan_page(
 		&rec, offsets1, offsets2, index, page, n_prefix,
-		COUNT_ALL_NON_BORING_AND_SKIP_DEL_MARKED, &n_diff);
+		COUNT_ALL_NON_BORING_AND_SKIP_DEL_MARKED, n_diff,
+		n_external_pages);
 
 #if 0
 	DEBUG_PRINTF("      %s(): n_diff below page_no=%lu: " UINT64PF "\n",
@@ -1524,133 +1564,146 @@
 #endif
 
 	mem_heap_free(heap);
-
-	return(n_diff);
 }
 
-/*********************************************************************//**
-For a given level in an index select N_SAMPLE_PAGES(index)
-(or less) records from that level and dive below them to the corresponding
-leaf pages, then scan those leaf pages and save the sampling results in
-index->stat_n_diff_key_vals[n_prefix - 1] and the number of pages scanned in
-index->stat_n_sample_sizes[n_prefix - 1]. */
+/** Input data that is used to calculate dict_index_t::stat_n_diff_key_vals[]
+for each n-columns prefix (n from 1 to n_uniq). */
+struct n_diff_data_t {
+	/** Index of the level on which the descent through the btree
+	stopped. level 0 is the leaf level. This is >= 1 because we
+	avoid scanning the leaf level because it may contain too many
+	pages and doing so is useless when combined with the random dives -
+	if we are to scan the leaf level, this means a full scan and we can
+	simply do that instead of fiddling with picking random records higher
+	in the tree and to dive below them. At the start of the analyzing
+	we may decide to do full scan of the leaf level, but then this
+	structure is not used in that code path. */
+	ulint		level;
+
+	/** Number of records on the level where the descend through the btree
+	stopped. When we scan the btree from the root, we stop at some mid
+	level, choose some records from it and dive below them towards a leaf
+	page to analyze. */
+	ib_uint64_t	n_recs_on_level;
+
+	/** Number of different key values that were found on the mid level. */
+	ib_uint64_t	n_diff_on_level;
+
+	/** Number of leaf pages that are analyzed. This is also the same as
+	the number of records that we pick from the mid level and dive below
+	them. */
+	ib_uint64_t	n_leaf_pages_to_analyze;
+
+	/** Cumulative sum of the number of different key values that were
+	found on all analyzed pages. */
+	ib_uint64_t	n_diff_all_analyzed_pages;
+
+	/** Cumulative sum of the number of external pages (stored outside of
+	the btree but in the same file segment). */
+	ib_uint64_t	n_external_pages_sum;
+};
+
+/** Estimate the number of different key values in an index when looking at
+the first n_prefix columns. For a given level in an index select
+n_diff_data->n_leaf_pages_to_analyze records from that level and dive below
+them to the corresponding leaf pages, then scan those leaf pages and save the
+sampling results in n_diff_data->n_diff_all_analyzed_pages.
+@param[in]	index			index
+@param[in]	n_prefix		look at first 'n_prefix' columns when
+comparing records
+@param[in]	boundaries		a vector that contains
+n_diff_data->n_diff_on_level integers each of which represents the index (on
+level 'level', counting from left/smallest to right/biggest from 0) of the
+last record from each group of distinct keys
+@param[in,out]	n_diff_data		n_diff_all_analyzed_pages and
+n_external_pages_sum in this structure will be set by this function. The
+members level, n_diff_on_level and n_leaf_pages_to_analyze must be set by the
+caller in advance - they are used by some calculations inside this function
+@param[in,out]	mtr			mini-transaction */
 static
 void
 dict_stats_analyze_index_for_n_prefix(
-/*==================================*/
-	dict_index_t*	index,		/*!< in/out: index */
-	ulint		level,		/*!< in: level, must be >= 1 */
-	ib_uint64_t	total_recs_on_level,
-					/*!< in: total number of
-					records on the given level */
-	ulint		n_prefix,	/*!< in: look at first
-					n_prefix columns when
-					comparing records */
-	ib_uint64_t	n_diff_for_this_prefix,
-					/*!< in: number of distinct
-					records on the given level,
-					when looking at the first
-					n_prefix columns */
-	boundaries_t*	boundaries,	/*!< in: array that contains
-					n_diff_for_this_prefix
-					integers each of which
-					represents the index (on the
-					level, counting from
-					left/smallest to right/biggest
-					from 0) of the last record
-					from each group of distinct
-					keys */
-	mtr_t*		mtr)		/*!< in/out: mini-transaction */
+	dict_index_t*		index,
+	ulint			n_prefix,
+	const boundaries_t*	boundaries,
+	n_diff_data_t*		n_diff_data,
+	mtr_t*			mtr)
 {
 	btr_pcur_t	pcur;
 	const page_t*	page;
 	ib_uint64_t	rec_idx;
-	ib_uint64_t	last_idx_on_level;
-	ib_uint64_t	n_recs_to_dive_below;
-	ib_uint64_t	n_diff_sum_of_all_analyzed_pages;
 	ib_uint64_t	i;
 
 #if 0
 	DEBUG_PRINTF("    %s(table=%s, index=%s, level=%lu, n_prefix=%lu, "
-		     "n_diff_for_this_prefix=" UINT64PF ")\n",
+		     "n_diff_on_level=" UINT64PF ")\n",
 		     __func__, index->table->name, index->name, level,
-		     n_prefix, n_diff_for_this_prefix);
+		     n_prefix, n_diff_data->n_diff_on_level);
 #endif
 
 	ut_ad(mtr_memo_contains(mtr, dict_index_get_lock(index),
 				MTR_MEMO_S_LOCK));
 
-	/* if some of those is 0 then this means that there is exactly one
-	page in the B-tree and it is empty and we should have done full scan
-	and should not be here */
-	ut_ad(total_recs_on_level > 0);
-	ut_ad(n_diff_for_this_prefix > 0);
-
-	/* this must be at least 1 */
-	ut_ad(N_SAMPLE_PAGES(index) > 0);
-
 	/* Position pcur on the leftmost record on the leftmost page
 	on the desired level. */
 
 	btr_pcur_open_at_index_side(
 		true, index, BTR_SEARCH_LEAF | BTR_ALREADY_S_LATCHED,
-		&pcur, true, level, mtr);
+		&pcur, true, n_diff_data->level, mtr);
 	btr_pcur_move_to_next_on_page(&pcur);
 
 	page = btr_pcur_get_page(&pcur);
 
+	const rec_t*	first_rec = btr_pcur_get_rec(&pcur);
+
+	/* We shouldn't be scanning the leaf level. The caller of this function
+	should have stopped the descend on level 1 or higher. */
+	ut_ad(n_diff_data->level > 0);
+	ut_ad(!page_is_leaf(page));
+
 	/* The page must not be empty, except when
 	it is the root page (and the whole index is empty). */
-	ut_ad(btr_pcur_is_on_user_rec(&pcur) || page_is_leaf(page));
-	ut_ad(btr_pcur_get_rec(&pcur)
-	      == page_rec_get_next_const(page_get_infimum_rec(page)));
+	ut_ad(btr_pcur_is_on_user_rec(&pcur));
+	ut_ad(first_rec == page_rec_get_next_const(page_get_infimum_rec(page)));
 
 	/* check that we are indeed on the desired level */
-	ut_a(btr_page_get_level(page, mtr) == level);
+	ut_a(btr_page_get_level(page, mtr) == n_diff_data->level);
 
 	/* there should not be any pages on the left */
 	ut_a(btr_page_get_prev(page, mtr) == FIL_NULL);
 
 	/* check whether the first record on the leftmost page is marked
-	as such, if we are on a non-leaf level */
-	ut_a((level == 0)
-	     == !(REC_INFO_MIN_REC_FLAG & rec_get_info_bits(
-			  btr_pcur_get_rec(&pcur), page_is_comp(page))));
+	as such; we are on a non-leaf level */
+	ut_a(rec_get_info_bits(first_rec, page_is_comp(page))
+	     & REC_INFO_MIN_REC_FLAG);
 
-	last_idx_on_level = boundaries->at(
-		static_cast<unsigned int>(n_diff_for_this_prefix - 1));
+	const ib_uint64_t	last_idx_on_level = boundaries->at(
+		static_cast<unsigned>(n_diff_data->n_diff_on_level - 1));
 
 	rec_idx = 0;
 
-	n_diff_sum_of_all_analyzed_pages = 0;
-
-	n_recs_to_dive_below = ut_min(N_SAMPLE_PAGES(index),
-				      n_diff_for_this_prefix);
+	n_diff_data->n_diff_all_analyzed_pages = 0;
+	n_diff_data->n_external_pages_sum = 0;
 
-	for (i = 0; i < n_recs_to_dive_below; i++) {
-		ib_uint64_t	left;
-		ib_uint64_t	right;
-		ib_uint64_t	rnd;
-		ib_uint64_t	dive_below_idx;
-
-		/* there are n_diff_for_this_prefix elements
+	for (i = 0; i < n_diff_data->n_leaf_pages_to_analyze; i++) {
+		/* there are n_diff_on_level elements
 		in 'boundaries' and we divide those elements
-		into n_recs_to_dive_below segments, for example:
+		into n_leaf_pages_to_analyze segments, for example:
 
-		let n_diff_for_this_prefix=100, n_recs_to_dive_below=4, then:
+		let n_diff_on_level=100, n_leaf_pages_to_analyze=4, then:
 		segment i=0:  [0, 24]
 		segment i=1: [25, 49]
 		segment i=2: [50, 74]
 		segment i=3: [75, 99] or
 
-		let n_diff_for_this_prefix=1, n_recs_to_dive_below=1, then:
+		let n_diff_on_level=1, n_leaf_pages_to_analyze=1, then:
 		segment i=0: [0, 0] or
 
-		let n_diff_for_this_prefix=2, n_recs_to_dive_below=2, then:
+		let n_diff_on_level=2, n_leaf_pages_to_analyze=2, then:
 		segment i=0: [0, 0]
 		segment i=1: [1, 1] or
 
-		let n_diff_for_this_prefix=13, n_recs_to_dive_below=7, then:
+		let n_diff_on_level=13, n_leaf_pages_to_analyze=7, then:
 		segment i=0:  [0,  0]
 		segment i=1:  [1,  2]
 		segment i=2:  [3,  4]
@@ -1661,9 +1714,12 @@
 
 		then we select a random record from each segment and dive
 		below it */
-		left = n_diff_for_this_prefix * i / n_recs_to_dive_below;
-		right = n_diff_for_this_prefix * (i + 1)
-			/ n_recs_to_dive_below - 1;
+		const ib_uint64_t	n_diff = n_diff_data->n_diff_on_level;
+		const ib_uint64_t	n_pick
+			= n_diff_data->n_leaf_pages_to_analyze;
+
+		const ib_uint64_t	left = n_diff * i / n_pick;
+		const ib_uint64_t	right = n_diff * (i + 1) / n_pick - 1;
 
 		ut_a(left <= right);
 		ut_a(right <= last_idx_on_level);
@@ -1671,11 +1727,11 @@
 		/* we do not pass (left, right) because we do not want to ask
 		ut_rnd_interval() to work with too big numbers since
 		ib_uint64_t could be bigger than ulint */
-		rnd = static_cast<ib_uint64_t>(
-			ut_rnd_interval(0, static_cast<ulint>(right - left)));
+		const ulint	rnd = ut_rnd_interval(
+			0, static_cast<ulint>(right - left));
 
-		dive_below_idx = boundaries->at(
-			static_cast<unsigned int>(left + rnd));
+		const ib_uint64_t	dive_below_idx
+			= boundaries->at(static_cast<unsigned>(left + rnd));
 
 #if 0
 		DEBUG_PRINTF("    %s(): dive below record with index="
@@ -1711,9 +1767,13 @@
 		ut_a(rec_idx == dive_below_idx);
 
 		ib_uint64_t	n_diff_on_leaf_page;
+		ib_uint64_t	n_external_pages;
 
-		n_diff_on_leaf_page = dict_stats_analyze_index_below_cur(
-			btr_pcur_get_btr_cur(&pcur), n_prefix, mtr);
+		dict_stats_analyze_index_below_cur(btr_pcur_get_btr_cur(&pcur),
+						   n_prefix,
+						   &n_diff_on_leaf_page,
+						   &n_external_pages,
+						   mtr);
 
 		/* We adjust n_diff_on_leaf_page here to avoid counting
 		one record twice - once as the last on some page and once
@@ -1733,39 +1793,88 @@
 			n_diff_on_leaf_page--;
 		}
 
-		n_diff_sum_of_all_analyzed_pages += n_diff_on_leaf_page;
-	}
+		n_diff_data->n_diff_all_analyzed_pages += n_diff_on_leaf_page;
 
-	/* n_diff_sum_of_all_analyzed_pages can be 0 here if all the leaf
-	pages sampled contained only delete-marked records. In this case
-	we should assign 0 to index->stat_n_diff_key_vals[n_prefix - 1], which
-	the formula below does. */
-
-	/* See REF01 for an explanation of the algorithm */
-	index->stat_n_diff_key_vals[n_prefix - 1]
-		= index->stat_n_leaf_pages
-
-		* n_diff_for_this_prefix
-		/ total_recs_on_level
-
-		* n_diff_sum_of_all_analyzed_pages
-		/ n_recs_to_dive_below;
-
-	index->stat_n_sample_sizes[n_prefix - 1] = n_recs_to_dive_below;
-
-	DEBUG_PRINTF("    %s(): n_diff=" UINT64PF " for n_prefix=%lu "
-		     "(%lu"
-		     " * " UINT64PF " / " UINT64PF
-		     " * " UINT64PF " / " UINT64PF ")\n",
-		     __func__, index->stat_n_diff_key_vals[n_prefix - 1],
-		     n_prefix,
-		     index->stat_n_leaf_pages,
-		     n_diff_for_this_prefix, total_recs_on_level,
-		     n_diff_sum_of_all_analyzed_pages, n_recs_to_dive_below);
+		n_diff_data->n_external_pages_sum += n_external_pages;
+	}
 
 	btr_pcur_close(&pcur);
 }
 
+/** Set dict_index_t::stat_n_diff_key_vals[] and stat_n_sample_sizes[].
+@param[in]	n_diff_data	input data to use to derive the results
+@param[in,out]	index		index whose stat_n_diff_key_vals[] to set */
+UNIV_INLINE
+void
+dict_stats_index_set_n_diff(
+	const n_diff_data_t*	n_diff_data,
+	dict_index_t*		index)
+{
+	for (ulint n_prefix = dict_index_get_n_unique(index);
+	     n_prefix >= 1;
+	     n_prefix--) {
+		/* n_diff_all_analyzed_pages can be 0 here if
+		all the leaf pages sampled contained only
+		delete-marked records. In this case we should assign
+		0 to index->stat_n_diff_key_vals[n_prefix - 1], which
+		the formula below does. */
+
+		const n_diff_data_t*	data = &n_diff_data[n_prefix - 1];
+
+		ut_ad(data->n_leaf_pages_to_analyze > 0);
+		ut_ad(data->n_recs_on_level > 0);
+
+		ulint	n_ordinary_leaf_pages;
+
+		if (data->level == 1) {
+			/* If we know the number of records on level 1, then
+			this number is the same as the number of pages on
+			level 0 (leaf). */
+			n_ordinary_leaf_pages = data->n_recs_on_level;
+		} else {
+			/* If we analyzed D ordinary leaf pages and found E
+			external pages in total linked from those D ordinary
+			leaf pages, then this means that the ratio
+			ordinary/external is D/E. Then the ratio ordinary/total
+			is D / (D + E). Knowing that the total number of pages
+			is T (including ordinary and external) then we estimate
+			that the total number of ordinary leaf pages is
+			T * D / (D + E). */
+			n_ordinary_leaf_pages
+				= index->stat_n_leaf_pages
+				* data->n_leaf_pages_to_analyze
+				/ (data->n_leaf_pages_to_analyze
+				   + data->n_external_pages_sum);
+		}
+
+		/* See REF01 for an explanation of the algorithm */
+		index->stat_n_diff_key_vals[n_prefix - 1]
+			= n_ordinary_leaf_pages
+
+			* data->n_diff_on_level
+			/ data->n_recs_on_level
+
+			* data->n_diff_all_analyzed_pages
+			/ data->n_leaf_pages_to_analyze;
+
+		index->stat_n_sample_sizes[n_prefix - 1]
+			= data->n_leaf_pages_to_analyze;
+
+		DEBUG_PRINTF("    %s(): n_diff=" UINT64PF " for n_prefix=%lu"
+			     " (%lu"
+			     " * " UINT64PF " / " UINT64PF
+			     " * " UINT64PF " / " UINT64PF ")\n",
+			     __func__,
+			     index->stat_n_diff_key_vals[n_prefix - 1],
+			     n_prefix,
+			     index->stat_n_leaf_pages,
+			     data->n_diff_on_level,
+			     data->n_recs_on_level,
+			     data->n_diff_all_analyzed_pages,
+			     data->n_leaf_pages_to_analyze);
+	}
+}
+
 /*********************************************************************//**
 Calculates new statistics for a given index and saves them to the index
 members stat_n_diff_key_vals[], stat_n_sample_sizes[], stat_index_size and
@@ -1781,10 +1890,8 @@
 	bool		level_is_analyzed;
 	ulint		n_uniq;
 	ulint		n_prefix;
-	ib_uint64_t*	n_diff_on_level;
 	ib_uint64_t	total_recs;
 	ib_uint64_t	total_pages;
-	boundaries_t*	n_diff_boundaries;
 	mtr_t		mtr;
 	ulint		size;
 	DBUG_ENTER("dict_stats_analyze_index");
@@ -1870,11 +1977,18 @@
 		DBUG_VOID_RETURN;
 	}
 
-	/* set to zero */
-	n_diff_on_level = reinterpret_cast<ib_uint64_t*>
-		(mem_zalloc(n_uniq * sizeof(ib_uint64_t)));
-
-	n_diff_boundaries = new boundaries_t[n_uniq];
+	/* For each level that is being scanned in the btree, this contains the
+	number of different key values for all possible n-column prefixes. */
+	ib_uint64_t*		n_diff_on_level = new ib_uint64_t[n_uniq];
+
+	/* For each level that is being scanned in the btree, this contains the
+	index of the last record from each group of equal records (when
+	comparing only the first n columns, n=1..n_uniq). */
+	boundaries_t*		n_diff_boundaries = new boundaries_t[n_uniq];
+
+	/* For each n-column prefix this array contains the input data that is
+	used to calculate dict_index_t::stat_n_diff_key_vals[]. */
+	n_diff_data_t*		n_diff_data = new n_diff_data_t[n_uniq];
 
 	/* total_recs is also used to estimate the number of pages on one
 	level below, so at the start we have 1 page (the root) */
@@ -1986,12 +2100,12 @@
 
 			level_is_analyzed = true;
 
-			if (n_diff_on_level[n_prefix - 1]
-			    >= N_DIFF_REQUIRED(index)
-			    || level == 1) {
-				/* we found a good level with many distinct
-				records or we have reached the last level we
-				could scan */
+			if (level == 1
+			    || n_diff_on_level[n_prefix - 1]
+			    >= N_DIFF_REQUIRED(index)) {
+				/* we have reached the last level we could scan
+				or we found a good level with many distinct
+				records */
 				break;
 			}
 
@@ -2004,7 +2118,6 @@
 			     " distinct records for n_prefix=%lu\n",
 			     __func__, level, n_diff_on_level[n_prefix - 1],
 			     n_prefix);
-
 		/* here we are either on level 1 or the level that we are on
 		contains >= N_DIFF_REQUIRED distinct keys or we did not scan
 		deeper levels because they would contain too many pages */
@@ -2013,20 +2126,47 @@
 
 		ut_ad(level_is_analyzed);
 
+		/* if any of these is 0 then there is exactly one page in the
+		B-tree and it is empty and we should have done full scan and
+		should not be here */
+		ut_ad(total_recs > 0);
+		ut_ad(n_diff_on_level[n_prefix - 1] > 0);
+
+		ut_ad(N_SAMPLE_PAGES(index) > 0);
+
+		n_diff_data_t*	data = &n_diff_data[n_prefix - 1];
+
+		data->level = level;
+
+		data->n_recs_on_level = total_recs;
+
+		data->n_diff_on_level = n_diff_on_level[n_prefix - 1];
+
+		data->n_leaf_pages_to_analyze = std::min(
+			N_SAMPLE_PAGES(index),
+			n_diff_on_level[n_prefix - 1]);
+
 		/* pick some records from this level and dive below them for
 		the given n_prefix */
 
 		dict_stats_analyze_index_for_n_prefix(
-			index, level, total_recs, n_prefix,
-			n_diff_on_level[n_prefix - 1],
-			&n_diff_boundaries[n_prefix - 1], &mtr);
+			index, n_prefix, &n_diff_boundaries[n_prefix - 1],
+			data, &mtr);
 	}
 
 	mtr_commit(&mtr);
 
 	delete[] n_diff_boundaries;
 
-	mem_free(n_diff_on_level);
+	delete[] n_diff_on_level;
+
+	/* n_prefix == 0 means that the above loop did not end up prematurely
+	due to tree being changed and so n_diff_data[] is set up. */
+	if (n_prefix == 0) {
+		dict_stats_index_set_n_diff(n_diff_data, index);
+	}
+
+	delete[] n_diff_data;
 
 	dict_stats_assert_initialized_index(index);
 	DBUG_VOID_RETURN;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fil/fil0fil.cc percona-xtrabackup-2.3.7/storage/innobase/fil/fil0fil.cc
--- percona-xtrabackup-2.2.3/storage/innobase/fil/fil0fil.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fil/fil0fil.cc	2017-02-27 07:47:02.000000000 +0000
@@ -41,10 +41,12 @@
 #include "mtr0mtr.h"
 #include "mtr0log.h"
 #include "dict0dict.h"
+#include "dict0priv.h"
 #include "page0page.h"
 #include "page0zip.h"
 #include "pars0pars.h"
 #include "que0que.h"
+#include "trx0purge.h"
 #include "trx0sys.h"
 #include "row0mysql.h"
 #ifndef UNIV_HOTBACKUP
@@ -114,7 +116,7 @@
 the count drops to zero. */
 
 /** When mysqld is run, the default directory "." is the mysqld datadir,
-but in the MySQL Embedded Server Library and ibbackup it is not the default
+but in the MySQL Embedded Server Library and mysqlbackup it is not the default
 directory, and we must set the base file path explicitly */
 UNIV_INTERN const char*	fil_path_to_mysql_datadir	= ".";
 
@@ -543,7 +545,7 @@
 			fprintf(stderr,
 				"InnoDB: Error: the size of single-table"
 				" tablespace file %s\n"
-				"InnoDB: is only "UINT64PF","
+				"InnoDB: is only " UINT64PF ","
 				" should be at least %lu!\n",
 				node->name,
 				size_bytes,
@@ -1808,8 +1810,8 @@
 }
 
 /*******************************************************************//**
-Reads the flushed lsn, arch no, and tablespace flag fields from a data
-file at database startup.
+Reads the flushed lsn, arch no, space_id and tablespace flag fields from
+the first page of a data file at database startup.
 @retval NULL on success, or if innodb_force_recovery is set
 @return pointer to an error message string */
 UNIV_INTERN
@@ -1840,16 +1842,21 @@
 
 	os_file_read(data_file, page, 0, UNIV_PAGE_SIZE);
 
-	*flags = fsp_header_get_flags(page);
+	/* The FSP_HEADER on page 0 is only valid for the first file
+	in a tablespace.  So if this is not the first datafile, leave
+	*flags and *space_id as they were read from the first file and
+	do not validate the first page. */
+	if (!one_read_already) {
+		*flags = fsp_header_get_flags(page);
+		*space_id = fsp_header_get_space_id(page);
 
-	*space_id = fsp_header_get_space_id(page);
+                if (!srv_backup_mode) {
+                  check_msg = fil_check_first_page(page);
+                }
+	}
 
 	flushed_lsn = mach_read_from_8(page + FIL_PAGE_FILE_FLUSH_LSN);
 
-	if (!one_read_already && !srv_backup_mode) {
-		check_msg = fil_check_first_page(page);
-	}
-
 	ut_free(buf);
 
 	if (check_msg) {
@@ -1882,7 +1889,8 @@
 ibool
 fil_inc_pending_ops(
 /*================*/
-	ulint	id)	/*!< in: space id */
+	ulint	id,		/*!< in: space id */
+	ibool	print_err)	/*!< in: need to print error or not */
 {
 	fil_space_t*	space;
 
@@ -1891,10 +1899,12 @@
 	space = fil_space_get_by_id(id);
 
 	if (space == NULL) {
-		fprintf(stderr,
-			"InnoDB: Error: trying to do an operation on a"
-			" dropped tablespace %lu\n",
-			(ulong) id);
+		if (print_err) {
+			fprintf(stderr,
+				"InnoDB: Error: trying to do an operation on a"
+				" dropped tablespace %lu\n",
+				(ulong) id);
+		}
 	}
 
 	if (space == NULL || space->stop_new_ops) {
@@ -2045,13 +2055,13 @@
 at that path does not exist yet. If the database directory for the file to be
 created does not exist, then we create the directory, too.
 
-Note that ibbackup --apply-log sets fil_path_to_mysql_datadir to point to the
-datadir that we should use in replaying the file operations.
+Note that mysqlbackup --apply-log sets fil_path_to_mysql_datadir to point to
+the datadir that we should use in replaying the file operations.
 
 InnoDB recovery does not replay these fully since it always sets the space id
-to zero. But ibbackup does replay them.  TODO: If remote tablespaces are used,
-ibbackup will only create tables in the default directory since MLOG_FILE_CREATE
-and MLOG_FILE_CREATE2 only know the tablename, not the path.
+to zero. But mysqlbackup does replay them.  TODO: If remote tablespaces are
+used, mysqlbackup will only create tables in the default directory since
+MLOG_FILE_CREATE and MLOG_FILE_CREATE2 only know the tablename, not the path.
 
 @return end of log record, or NULL if the record was not completely
 contained between ptr and end_ptr */
@@ -2138,11 +2148,11 @@
 	}
 
 	/* Let us try to perform the file operation, if sensible. Note that
-	ibbackup has at this stage already read in all space id info to the
+	mysqlbackup has at this stage already read in all space id info to the
 	fil0fil.cc data structures.
 
 	NOTE that our algorithm is not guaranteed to work correctly if there
-	were renames of tables during the backup. See ibbackup code for more
+	were renames of tables during the backup. See mysqlbackup code for more
 	on the problem. */
 
 	switch (type) {
@@ -2557,12 +2567,12 @@
 	if (err == DB_SUCCESS) {
 #if 0
 		/* Write a log record about the deletion of the .ibd
-		file, so that ibbackup can replay it in the
+		file, so that mysqlbackup can replay it in the
 		--apply-log phase. We use a dummy mtr and the familiar
 		log write mechanism. */
 		mtr_t		mtr;
 
-		/* When replaying the operation in ibbackup, do not try
+		/* When replaying the operation in mysqlbackup, do not try
 		to write any log record */
 		mtr_start(&mtr);
 
@@ -3411,6 +3421,19 @@
 		     "index_id CHAR;\n"
 		     "foreign_id CHAR;\n"
 		     "found INT;\n"
+
+		     "DECLARE CURSOR cur_fk IS\n"
+		     "SELECT ID FROM SYS_FOREIGN\n"
+		     "WHERE FOR_NAME = :table_name\n"
+		     "AND TO_BINARY(FOR_NAME)\n"
+		     "  = TO_BINARY(:table_name)\n"
+		     "LOCK IN SHARE MODE;\n"
+
+		     "DECLARE CURSOR cur_idx IS\n"
+		     "SELECT ID FROM SYS_INDEXES\n"
+		     "WHERE TABLE_ID = table_id\n"
+		     "LOCK IN SHARE MODE;\n"
+
 		     "BEGIN\n"
 		     "SELECT ID INTO table_id\n"
 		     "FROM SYS_TABLES\n"
@@ -3433,13 +3456,9 @@
 		     "IF (:table_name = 'SYS_FOREIGN_COLS') THEN\n"
 		     "       found := 0;\n"
 		     "END IF;\n"
+		     "OPEN cur_fk;\n"
 		     "WHILE found = 1 LOOP\n"
-		     "       SELECT ID INTO foreign_id\n"
-		     "       FROM SYS_FOREIGN\n"
-		     "       WHERE FOR_NAME = :table_name\n"
-		     "               AND TO_BINARY(FOR_NAME)\n"
-		     "                 = TO_BINARY(:table_name)\n"
-		     "               LOCK IN SHARE MODE;\n"
+		     "       FETCH cur_fk INTO foreign_id;\n"
 		     "       IF (SQL % NOTFOUND) THEN\n"
 		     "               found := 0;\n"
 		     "       ELSE\n"
@@ -3449,12 +3468,11 @@
 		     "               WHERE ID = foreign_id;\n"
 		     "       END IF;\n"
 		     "END LOOP;\n"
+		     "CLOSE cur_fk;\n"
 		     "found := 1;\n"
+		     "OPEN cur_idx;\n"
 		     "WHILE found = 1 LOOP\n"
-		     "       SELECT ID INTO index_id\n"
-		     "       FROM SYS_INDEXES\n"
-		     "       WHERE TABLE_ID = table_id\n"
-		     "       LOCK IN SHARE MODE;\n"
+		     "       FETCH cur_idx INTO index_id;\n"
 		     "       IF (SQL % NOTFOUND) THEN\n"
 		     "               found := 0;\n"
 		     "       ELSE\n"
@@ -3465,13 +3483,42 @@
 		     "               AND TABLE_ID = table_id;\n"
 		     "       END IF;\n"
 		     "END LOOP;\n"
+		     "CLOSE cur_idx;\n"
 		     "DELETE FROM SYS_COLUMNS\n"
 		     "WHERE TABLE_ID = table_id;\n"
 		     "DELETE FROM SYS_TABLES\n"
-		     "WHERE ID = table_id;\n"
+		     "WHERE NAME = :table_name;\n"
 		     "END;\n"
 		     , FALSE, trx);
 
+	/* SYS_DATAFILES and SYS_TABLESPACES do not necessarily exist
+	on XtraBackup recovery. See comments around
+	dict_create_or_check_foreign_constraint_tables() in
+	innobase_start_or_create_for_mysql(). */
+	if (dict_table_get_low("SYS_DATAFILES") != NULL) {
+		info = pars_info_create();
+
+		pars_info_add_str_literal(info, "table_name", name);
+
+		que_eval_sql(info,
+			     "PROCEDURE DROP_TABLE_PROC () IS\n"
+			     "space_id INT;\n"
+
+			     "BEGIN\n"
+			     "SELECT SPACE INTO space_id\n"
+			     "FROM SYS_TABLES\n"
+			     "WHERE NAME = :table_name;\n"
+			     "IF (SQL % NOTFOUND) THEN\n"
+			     "       RETURN;\n"
+			     "END IF;\n"
+			     "DELETE FROM SYS_TABLESPACES\n"
+			     "WHERE SPACE = space_id;\n"
+			     "DELETE FROM SYS_DATAFILES\n"
+			     "WHERE SPACE = space_id;\n"
+			     "END;\n"
+			     , FALSE, trx);
+	}
+
 	trx_commit_for_mysql(trx);
 
 	trx_free_for_mysql(trx);
@@ -3691,7 +3738,9 @@
 		ib_logf(IB_LOG_LEVEL_WARN,
 			"It will be removed from the data dictionary.");
 
-		fil_remove_invalid_table_from_data_dict(tablename);
+		if (purge_sys) {
+			fil_remove_invalid_table_from_data_dict(tablename);
+		}
 
 		err = DB_CORRUPTION;
 
@@ -4154,7 +4203,18 @@
 	/* Build up the tablename in the standard form database/table. */
 	tablename = static_cast<char*>(
 		mem_alloc(dbname_len + filename_len + 2));
-	sprintf(tablename, "%s/%s", dbname, filename);
+
+	/* When lower_case_table_names = 2 it is possible that the
+	dbname is in upper case ,but while storing it in fil_space_t
+	we must convert it into lower case */
+	sprintf(tablename, "%s" , dbname);
+	tablename[dbname_len] = '\0';
+
+        if (lower_case_file_system) {
+                dict_casedn_str(tablename);
+        }
+
+	sprintf(tablename+dbname_len,"/%s",filename);
 	tablename_len = strlen(tablename) - strlen(".ibd");
 	tablename[tablename_len] = '\0';
 
@@ -4201,7 +4261,8 @@
 			os_file_close(remote.file);
 			mem_free(remote.filepath);
 
-			if (srv_backup_mode) {
+			if (srv_backup_mode && (remote.id == ULINT_UNDEFINED
+				|| remote.id == 0)) {
 
 				/* Ignore files that have uninitialized space
 				IDs on the backup stage. This means that a
@@ -4227,7 +4288,8 @@
 		if (!def.success) {
 			os_file_close(def.file);
 
-			if (srv_backup_mode) {
+			if (srv_backup_mode && (def.id == ULINT_UNDEFINED
+				|| def.id == 0)) {
 
 				/* Ignore files that have uninitialized space
 				IDs on the backup stage. This means that a
@@ -4366,7 +4428,7 @@
 			" (< 4 pages 16 kB each),\n"
 			"InnoDB: or the space id in the file header"
 			" is not sensible.\n"
-			"InnoDB: This can happen in an ibbackup run,"
+			"InnoDB: This can happen in an mysqlbackup run,"
 			" and is not dangerous.\n",
 			fsp->filepath, fsp->id, fsp->filepath, size);
 		os_file_close(fsp->file);
@@ -4403,7 +4465,7 @@
 			"InnoDB: because space %s with the same id\n"
 			"InnoDB: was scanned earlier. This can happen"
 			" if you have renamed tables\n"
-			"InnoDB: during an ibbackup run.\n",
+			"InnoDB: during an mysqlbackup run.\n",
 			fsp->filepath, fsp->id, fsp->filepath,
 			space->name);
 		os_file_close(fsp->file);
@@ -4454,7 +4516,7 @@
 	inconsistencies between the file name and the actual tablespace contents
 	if a DDL occurs between a fil_load_single_table_tablespaces() call and
 	the actual copy operation. */
-	if (srv_backup_mode) {
+	if (srv_backup_mode && !srv_close_files) {
 
 		fil_node_t*	node;
 		fil_space_t*	space;
@@ -4788,6 +4850,9 @@
 					information to the .err log if a
 					matching tablespace is not found from
 					memory */
+	bool		remove_from_data_dict_if_does_not_exist,
+					/*!< in: remove from the data dictionary
+					if tablespace does not exist */
 	bool		adjust_space,	/*!< in: whether to adjust space id
 					when find table space mismatch */
 	mem_heap_t*	heap,		/*!< in: heap memory */
@@ -4795,7 +4860,6 @@
 {
 	fil_space_t*	fnamespace;
 	fil_space_t*	space;
-	ibool		remove_from_data_dict = FALSE;
 
 	ut_ad(fil_system);
 
@@ -4864,9 +4928,7 @@
 
 	if (!print_error_if_does_not_exist) {
 
-		mutex_exit(&fil_system->mutex);
-
-		return(FALSE);
+		goto no_print_exit;
 	}
 
 	if (space == NULL) {
@@ -4876,7 +4938,6 @@
 				ib_logf(IB_LOG_LEVEL_WARN,
 					"It will be removed from "
 					"the data dictionary.");
-				remove_from_data_dict = TRUE;
 			}
 		} else {
 			ut_print_timestamp(stderr);
@@ -4898,10 +4959,13 @@
 		      "InnoDB: " REFMAN "innodb-troubleshooting-datadict.html\n"
 		      "InnoDB: for how to resolve the issue.\n", stderr);
 
+no_print_exit:
 		mutex_exit(&fil_system->mutex);
 
-		if (remove_from_data_dict) {
-			fil_remove_invalid_table_from_data_dict(name);
+		if (remove_from_data_dict_if_does_not_exist && purge_sys) {
+			if (space == NULL && fnamespace == NULL) {
+				fil_remove_invalid_table_from_data_dict(name);
+			}
 		}
 
 		return(FALSE);
@@ -5138,9 +5202,9 @@
 #ifdef UNIV_HOTBACKUP
 /********************************************************************//**
 Extends all tablespaces to the size stored in the space header. During the
-ibbackup --apply-log phase we extended the spaces on-demand so that log records
-could be applied, but that may have left spaces still too small compared to
-the size stored in the space header. */
+mysqlbackup --apply-log phase we extended the spaces on-demand so that log
+records could be applied, but that may have left spaces still too small
+compared to the size stored in the space header. */
 UNIV_INTERN
 void
 fil_extend_tablespaces_to_stored_len(void)
@@ -5643,11 +5707,11 @@
 
 	/* Do aio */
 
-	ut_a(byte_offset % OS_FILE_LOG_BLOCK_SIZE == 0);
-	ut_a((len % OS_FILE_LOG_BLOCK_SIZE) == 0);
+	ut_a(byte_offset % OS_MIN_LOG_BLOCK_SIZE == 0);
+	ut_a((len % OS_MIN_LOG_BLOCK_SIZE) == 0);
 
 #ifdef UNIV_HOTBACKUP
-	/* In ibbackup do normal i/o, not aio */
+	/* In mysqlbackup do normal i/o, not aio */
 	if (type == OS_FILE_READ) {
 		ret = os_file_read(node->handle, buf, offset, len);
 	} else {
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fsp/fsp0fsp.cc percona-xtrabackup-2.3.7/storage/innobase/fsp/fsp0fsp.cc
--- percona-xtrabackup-2.2.3/storage/innobase/fsp/fsp0fsp.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fsp/fsp0fsp.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2015, 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
@@ -132,7 +132,7 @@
 	ulint		space,		/*!< in: space */
 	fsp_header_t*	header,		/*!< in/out: space header */
 	mtr_t*		mtr)		/*!< in/out: mini-transaction */
-	UNIV_COLD __attribute__((nonnull));
+	UNIV_COLD;
 /**********************************************************************//**
 Allocates a single free page from a segment. This function implements
 the intelligent allocation strategy which tries to minimize file space
@@ -301,44 +301,6 @@
 }
 
 /**********************************************************************//**
-Looks for a descriptor bit having the desired value. Scans the extent in
-a direction opposite to xdes_find_bit.
-@return	bit index of the bit, ULINT_UNDEFINED if not found */
-UNIV_INLINE
-ulint
-xdes_find_bit_downward(
-/*===================*/
-	xdes_t*	descr,	/*!< in: descriptor */
-	ulint	bit,	/*!< in: XDES_FREE_BIT or XDES_CLEAN_BIT */
-	ibool	val,	/*!< in: desired bit value */
-	ulint	hint,	/*!< in: hint of which bit position would
-			be desirable */
-	mtr_t*	mtr)	/*!< in/out: mini-transaction */
-{
-	ulint	i;
-
-	ut_ad(descr && mtr);
-	ut_ad(val <= TRUE);
-	ut_ad(hint < FSP_EXTENT_SIZE);
-	ut_ad(mtr_memo_contains_page(mtr, descr, MTR_MEMO_PAGE_X_FIX));
-	for (i = hint + 1; i > 0; i--) {
-		if (val == xdes_mtr_get_bit(descr, bit, i - 1, mtr)) {
-
-			return(i - 1);
-		}
-	}
-
-	for (i = FSP_EXTENT_SIZE - 1; i > hint; i--) {
-		if (val == xdes_mtr_get_bit(descr, bit, i, mtr)) {
-
-			return(i);
-		}
-	}
-
-	return(ULINT_UNDEFINED);
-}
-
-/**********************************************************************//**
 Returns the number of used pages in a descriptor.
 @return	number of pages used */
 UNIV_INLINE
@@ -1084,7 +1046,8 @@
 	ulint	i;
 	mtr_t	ibuf_mtr;
 
-	ut_ad(header && mtr);
+	ut_ad(header != NULL);
+	ut_ad(mtr != NULL);
 	ut_ad(page_offset(header) == FSP_HEADER_OFFSET);
 
 	/* Check if we can fill free list from above the free list limit */
@@ -3050,7 +3013,8 @@
 	ib_id_t	seg_id;
 	ulint	i;
 
-	ut_ad(seg_inode && mtr);
+	ut_ad(seg_inode != NULL);
+	ut_ad(mtr != NULL);
 	ut_ad(mach_read_from_4(seg_inode + FSEG_MAGIC_N)
 	      == FSEG_MAGIC_N_VALUE);
 	ut_ad(!((page_offset(seg_inode) - FSEG_ARR_OFFSET) % FSEG_INODE_SIZE));
@@ -3259,7 +3223,8 @@
 	ulint	descr_n_used;
 	ulint	i;
 
-	ut_ad(seg_inode && mtr);
+	ut_ad(seg_inode != NULL);
+	ut_ad(mtr != NULL);
 
 	descr = xdes_get_descriptor(space, zip_size, page, mtr);
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0ast.cc percona-xtrabackup-2.3.7/storage/innobase/fts/fts0ast.cc
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0ast.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0ast.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2014, 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
@@ -83,11 +83,11 @@
 fts_ast_node_t*
 fts_ast_create_node_term(
 /*=====================*/
-	void*		arg,			/*!< in: ast state instance */
-	const char*	ptr)			/*!< in: ast term string */
+	void*			arg,		/*!< in: ast state instance */
+	const fts_ast_string_t*	ptr)		/*!< in: ast term string */
 {
 	fts_ast_state_t*	state = static_cast<fts_ast_state_t*>(arg);
-	ulint			len = strlen(ptr);
+	ulint			len = ptr->len;
 	ulint			cur_pos = 0;
 	fts_ast_node_t*         node = NULL;
 	fts_ast_node_t*		node_list = NULL;
@@ -101,8 +101,9 @@
 
 		cur_len = innobase_mysql_fts_get_token(
 			state->charset,
-			reinterpret_cast<const byte*>(ptr) + cur_pos,
-			reinterpret_cast<const byte*>(ptr) + len, &str, &offset);
+			reinterpret_cast<const byte*>(ptr->str) + cur_pos,
+			reinterpret_cast<const byte*>(ptr->str) + len,
+			&str, &offset);
 
 		if (cur_len == 0) {
 			break;
@@ -124,10 +125,8 @@
 
 			node->type = FTS_AST_TERM;
 
-			node->term.ptr = static_cast<byte*>(ut_malloc(
-				str.f_len + 1));
-			memcpy(node->term.ptr, str.f_str, str.f_len);
-			node->term.ptr[str.f_len] = '\0';
+			node->term.ptr = fts_ast_string_create(
+						str.f_str, str.f_len);
 
 			fts_ast_state_add_node(
 				static_cast<fts_ast_state_t*>(arg), node);
@@ -160,25 +159,21 @@
 fts_ast_node_t*
 fts_ast_create_node_text(
 /*=====================*/
-	void*		arg,			/*!< in: ast state instance */
-	const char*	ptr)			/*!< in: ast text string */
+	void*			arg,	/*!< in: ast state instance */
+	const fts_ast_string_t*	ptr)	/*!< in: ast text string */
 {
-	ulint		len = strlen(ptr);
+	ulint		len = ptr->len;
 	fts_ast_node_t*	node = NULL;
 
-
-	ut_ad(len >= 1);
-
-	if (len <= 2) {
-		/* There is a way to directly supply null terminator
-		in the query string (by using 0x220022) and get here,
-		and certainly it would not make a valid query text */
-		ut_ad(ptr[0] == '\"');
-
-		if (len == 2) {
-			ut_ad(ptr[1] == '\"');
-		}
-
+	/* Once we come here, the string must have at least 2 quotes ""
+	around the query string, which could be empty. Also the query
+	string may contain 0x00 in it, we don't treat it as null-terminated. */
+	ut_ad(len >= 2);
+	ut_ad(ptr->str[0] == '\"' && ptr->str[len - 1] == '\"');
+
+	if (len == 2) {
+		/* If the query string contains nothing except quotes,
+		it's obviously an invalid query. */
 		return(NULL);
 	}
 
@@ -188,11 +183,9 @@
 	len -= 2;
 
 	node->type = FTS_AST_TEXT;
-	node->text.ptr = static_cast<byte*>(ut_malloc(len + 1));
-
 	/*!< Skip copying the first quote */
-	memcpy(node->text.ptr, ptr + 1, len);
-	node->text.ptr[len] = 0;
+	node->text.ptr = fts_ast_string_create(
+			reinterpret_cast<const byte*>(ptr->str + 1), len);
 	node->text.distance = ULINT_UNDEFINED;
 
 	fts_ast_state_add_node((fts_ast_state_t*) arg, node);
@@ -275,14 +268,14 @@
 	switch (node->type) {
 	case FTS_AST_TEXT:
 		if (node->text.ptr) {
-			ut_free(node->text.ptr);
+			fts_ast_string_free(node->text.ptr);
 			node->text.ptr = NULL;
 		}
 		break;
 
 	case FTS_AST_TERM:
 		if (node->term.ptr) {
-			ut_free(node->term.ptr);
+			fts_ast_string_free(node->term.ptr);
 			node->term.ptr = NULL;
 		}
 		break;
@@ -421,10 +414,10 @@
 		fts_ast_node_t*	next = node->next_alloc;
 
 		if (node->type == FTS_AST_TEXT && node->text.ptr) {
-			ut_free(node->text.ptr);
+			fts_ast_string_free(node->text.ptr);
 			node->text.ptr = NULL;
 		} else if (node->type == FTS_AST_TERM && node->term.ptr) {
-			ut_free(node->term.ptr);
+			fts_ast_string_free(node->term.ptr);
 			node->term.ptr = NULL;
 		}
 
@@ -445,11 +438,13 @@
 {
 	switch (node->type) {
 	case FTS_AST_TEXT:
-		printf("TEXT: %s\n", node->text.ptr);
+		printf("TEXT: ");
+		fts_ast_string_print(node->text.ptr);
 		break;
 
 	case FTS_AST_TERM:
-		printf("TERM: %s\n", node->term.ptr);
+		printf("TERM: ");
+		fts_ast_string_print(node->term.ptr);
 		break;
 
 	case FTS_AST_LIST:
@@ -628,3 +623,122 @@
 
 	return(error);
 }
+
+/**
+Create an ast string object, with NUL-terminator, so the string
+has one more byte than len
+@param[in] str		pointer to string
+@param[in] len		length of the string
+@return ast string with NUL-terminator */
+UNIV_INTERN
+fts_ast_string_t*
+fts_ast_string_create(
+	const byte*	str,
+	ulint		len)
+{
+	fts_ast_string_t*	ast_str;
+
+	ut_ad(len > 0);
+
+	ast_str = static_cast<fts_ast_string_t*>
+			(ut_malloc(sizeof(fts_ast_string_t)));
+	ast_str->str = static_cast<byte*>(ut_malloc(len + 1));
+
+	ast_str->len = len;
+	memcpy(ast_str->str, str, len);
+	ast_str->str[len] = '\0';
+
+	return(ast_str);
+}
+
+/**
+Free an ast string instance
+@param[in,out] ast_str		string to free */
+UNIV_INTERN
+void
+fts_ast_string_free(
+	fts_ast_string_t*	ast_str)
+{
+	if (ast_str != NULL) {
+		ut_free(ast_str->str);
+		ut_free(ast_str);
+	}
+}
+
+/**
+Translate ast string of type FTS_AST_NUMB to unsigned long by strtoul
+@param[in] str		string to translate
+@param[in] base		the base
+@return translated number */
+UNIV_INTERN
+ulint
+fts_ast_string_to_ul(
+	const fts_ast_string_t*	ast_str,
+	int			base)
+{
+	return(strtoul(reinterpret_cast<const char*>(ast_str->str),
+		       NULL, base));
+}
+
+/**
+Print the ast string
+@param[in] str		string to print */
+UNIV_INTERN
+void
+fts_ast_string_print(
+	const fts_ast_string_t*	ast_str)
+{
+	for (ulint i = 0; i < ast_str->len; ++i) {
+		printf("%c", ast_str->str[i]);
+	}
+
+	printf("\n");
+}
+
+#ifdef UNIV_DEBUG
+const char*
+fts_ast_oper_name_get(fts_ast_oper_t	oper)
+{
+	switch(oper) {
+	case FTS_NONE:
+		return("FTS_NONE");
+	case FTS_IGNORE:
+		return("FTS_IGNORE");
+	case FTS_EXIST:
+		return("FTS_EXIST");
+	case FTS_NEGATE:
+		return("FTS_NEGATE");
+	case FTS_INCR_RATING:
+		return("FTS_INCR_RATING");
+	case FTS_DECR_RATING:
+		return("FTS_DECR_RATING");
+	case FTS_DISTANCE:
+		return("FTS_DISTANCE");
+	case FTS_IGNORE_SKIP:
+		return("FTS_IGNORE_SKIP");
+	case FTS_EXIST_SKIP:
+		return("FTS_EXIST_SKIP");
+	}
+	ut_ad(0);
+}
+
+const char*
+fts_ast_node_type_get(fts_ast_type_t	type)
+{
+	switch (type) {
+	case FTS_AST_OPER:
+		return("FTS_AST_OPER");
+	case FTS_AST_NUMB:
+		return("FTS_AST_NUMB");
+	case FTS_AST_TERM:
+		return("FTS_AST_TERM");
+	case FTS_AST_TEXT:
+		return("FTS_AST_TEXT");
+	case FTS_AST_LIST:
+		return("FTS_AST_LIST");
+	case FTS_AST_SUBEXP_LIST:
+		return("FTS_AST_SUBEXP_LIST");
+	}
+	ut_ad(0);
+}
+#endif /* UNIV_DEBUG */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0blex.cc percona-xtrabackup-2.3.7/storage/innobase/fts/fts0blex.cc
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0blex.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0blex.cc	2017-02-27 07:47:02.000000000 +0000
@@ -451,7 +451,7 @@
 #line 1 "fts0blex.l"
 /*****************************************************************************
 
-Copyright (c) 2007, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2014, 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
@@ -806,7 +806,7 @@
 YY_RULE_SETUP
 #line 53 "fts0blex.l"
 {
-	val->token = strdup(fts0bget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0bget_text(yyscanner)), fts0bget_leng(yyscanner));
 
 	return(FTS_NUMB);
 }
@@ -815,7 +815,7 @@
 YY_RULE_SETUP
 #line 59 "fts0blex.l"
 {
-	val->token = strdup(fts0bget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0bget_text(yyscanner)), fts0bget_leng(yyscanner));
 
 	return(FTS_TERM);
 }
@@ -824,7 +824,7 @@
 YY_RULE_SETUP
 #line 65 "fts0blex.l"
 {
-	val->token = strdup(fts0bget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0bget_text(yyscanner)), fts0bget_leng(yyscanner));
 
 	return(FTS_TEXT);
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0blex.l percona-xtrabackup-2.3.7/storage/innobase/fts/fts0blex.l
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0blex.l	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0blex.l	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2014, 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
@@ -51,19 +51,19 @@
 }
 
 [0-9]+			{
-	val->token = strdup(fts0bget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0bget_text(yyscanner)), fts0bget_leng(yyscanner));
 
 	return(FTS_NUMB);
 }
 
 [^" \n*()+\-<>~@%]*		{
-	val->token = strdup(fts0bget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0bget_text(yyscanner)), fts0bget_leng(yyscanner));
 
 	return(FTS_TERM);
 }
 
 \"[^\"\n]*\"		{
-	val->token = strdup(fts0bget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0bget_text(yyscanner)), fts0bget_leng(yyscanner));
 
 	return(FTS_TEXT);
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0fts.cc percona-xtrabackup-2.3.7/storage/innobase/fts/fts0fts.cc
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0fts.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0fts.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2015, 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
@@ -36,6 +36,7 @@
 #include "dict0priv.h"
 #include "dict0stats.h"
 #include "btr0pcur.h"
+#include <vector>
 
 #include "ha_prototypes.h"
 
@@ -44,6 +45,13 @@
 /** Column name from the FTS config table */
 #define FTS_MAX_CACHE_SIZE_IN_MB	"cache_size_in_mb"
 
+/** Verify if a aux table name is a obsolete table
+by looking up the key word in the obsolete table names */
+#define FTS_IS_OBSOLETE_AUX_TABLE(table_name)			\
+	(strstr((table_name), "DOC_ID") != NULL			\
+	 || strstr((table_name), "ADDED") != NULL		\
+	 || strstr((table_name), "STOPWORDS") != NULL)
+
 /** This is maximum FTS cache for each table and would be
 a configurable variable */
 UNIV_INTERN ulong	fts_max_cache_size;
@@ -73,11 +81,13 @@
 /** Error condition reported by fts_utf8_decode() */
 const ulint UTF8_ERROR = 0xFFFFFFFF;
 
+#ifdef FTS_CACHE_SIZE_DEBUG
 /** The cache size permissible lower limit (1K) */
 static const ulint FTS_CACHE_SIZE_LOWER_LIMIT_IN_MB = 1;
 
 /** The cache size permissible upper limit (1G) */
 static const ulint FTS_CACHE_SIZE_UPPER_LIMIT_IN_MB = 1024;
+#endif /* FTS_CACHE_SIZE_DEBUG */
 
 /** Time to sleep after DEADLOCK error before retrying operation. */
 static const ulint FTS_DEADLOCK_RETRY_WAIT = 100000;
@@ -183,7 +193,7 @@
 	""
 	"CREATE TABLE \"%s_CONFIG\" (\n"
 	"  key CHAR(50),\n"
-	"  value CHAR(50) NOT NULL\n"
+	"  value CHAR(200) NOT NULL\n"
 	") COMPACT;\n"
 	"CREATE UNIQUE CLUSTERED INDEX IND ON \"%s_CONFIG\"(key);\n"
 };
@@ -321,27 +331,6 @@
 	doc_id_t		doc_id,		/*!< in: last document id */
 	trx_t*			trx)		/*!< in: update trx, or NULL */
 	__attribute__((nonnull(1)));
-/********************************************************************
-Check if we should stop. */
-UNIV_INLINE
-ibool
-fts_is_stop_signalled(
-/*==================*/
-	fts_t*		fts)			/*!< in: fts instance */
-{
-	ibool		stop_signalled = FALSE;
-
-	mutex_enter(&fts->bg_threads_mutex);
-
-	if (fts->fts_status & BG_THREAD_STOP) {
-
-		stop_signalled = TRUE;
-	}
-
-	mutex_exit(&fts->bg_threads_mutex);
-
-	return(stop_signalled);
-}
 
 /****************************************************************//**
 This function loads the default InnoDB stopword list */
@@ -601,8 +590,10 @@
 
 	cache->total_size = 0;
 
+	mutex_enter((ib_mutex_t*) &cache->deleted_lock);
 	cache->deleted_doc_ids = ib_vector_create(
 		cache->sync_heap, sizeof(fts_update_t), 4);
+	mutex_exit((ib_mutex_t*) &cache->deleted_lock);
 
 	/* Reset the cache data for all the FTS indexes. */
 	for (i = 0; i < ib_vector_size(cache->indexes); ++i) {
@@ -890,12 +881,14 @@
 
 		index_cache = fts_find_index_cache(cache, index);
 
-		if (index_cache->words) {
-			fts_words_free(index_cache->words);
-			rbt_free(index_cache->words);
-		}
+		if (index_cache != NULL) {
+			if (index_cache->words) {
+				fts_words_free(index_cache->words);
+				rbt_free(index_cache->words);
+			}
 
-		ib_vector_remove(cache->indexes, *(void**) index_cache);
+			ib_vector_remove(cache->indexes, *(void**) index_cache);
+		}
 
 		if (cache->get_docs) {
 			fts_reset_get_doc(cache);
@@ -1130,7 +1123,10 @@
 	cache->sync_heap->arg = NULL;
 
 	cache->total_size = 0;
+
+	mutex_enter((ib_mutex_t*) &cache->deleted_lock);
 	cache->deleted_doc_ids = NULL;
+	mutex_exit((ib_mutex_t*) &cache->deleted_lock);
 }
 
 /*********************************************************************//**
@@ -1243,7 +1239,8 @@
 #endif
 
 	/* If it is a stopword, do not index it */
-	if (rbt_search(cache->stopword_info.cached_stopword,
+	if (cache->stopword_info.cached_stopword != NULL
+	    && rbt_search(cache->stopword_info.cached_stopword,
 		       &parent, text) == 0) {
 
 		return(NULL);
@@ -1947,10 +1944,15 @@
 	char*			table_name = fts_get_table_name(fts_table);
 	dberr_t			error;
 	CHARSET_INFO*		charset;
+	ulint			flags2 = 0;
 
 	ut_ad(index->type & DICT_FTS);
 
-	new_table = dict_mem_table_create(table_name, 0, 5, 1, 0);
+	if (srv_file_per_table) {
+		flags2 = DICT_TF2_USE_TABLESPACE;
+	}
+
+	new_table = dict_mem_table_create(table_name, 0, 5, 1, flags2);
 
 	field = dict_index_get_nth_field(index, 0);
 	charset = innobase_get_fts_charset(
@@ -1979,7 +1981,7 @@
 	dict_mem_table_add_col(new_table, heap, "ilist", DATA_BLOB,
 			       4130048,	0);
 
-	error = row_create_table_for_mysql(new_table, trx, true);
+	error = row_create_table_for_mysql(new_table, trx, false);
 
 	if (error != DB_SUCCESS) {
 		trx->error_state = error;
@@ -2244,11 +2246,15 @@
 fts_trx_t*
 fts_trx_create(
 /*===========*/
-	trx_t*	trx)				/*!< in: InnoDB transaction */
+	trx_t*	trx)				/*!< in/out: InnoDB
+						transaction */
 {
-	fts_trx_t*	ftt;
-	ib_alloc_t*	heap_alloc;
-	mem_heap_t*	heap = mem_heap_create(1024);
+	fts_trx_t*		ftt;
+	ib_alloc_t*		heap_alloc;
+	mem_heap_t*		heap = mem_heap_create(1024);
+	trx_named_savept_t*	savep;
+
+	ut_a(trx->fts_trx == NULL);
 
 	ftt = static_cast<fts_trx_t*>(mem_heap_alloc(heap, sizeof(fts_trx_t)));
 	ftt->trx = trx;
@@ -2266,6 +2272,14 @@
 	fts_savepoint_create(ftt->savepoints, NULL, NULL);
 	fts_savepoint_create(ftt->last_stmt, NULL, NULL);
 
+	/* Copy savepoints that already set before. */
+	for (savep = UT_LIST_GET_FIRST(trx->trx_savepoints);
+	     savep != NULL;
+	     savep = UT_LIST_GET_NEXT(trx_savepoints, savep)) {
+
+		fts_savepoint_take(trx, ftt, savep->name);
+	}
+
 	return(ftt);
 }
 
@@ -3375,7 +3389,7 @@
 		doc->charset = get_doc->index_cache->charset;
 
 		/* Null Field */
-		if (doc->text.f_len == UNIV_SQL_NULL) {
+		if (doc->text.f_len == UNIV_SQL_NULL || doc->text.f_len == 0) {
 			continue;
 		}
 
@@ -3528,6 +3542,12 @@
 
 				rw_lock_x_lock(&table->fts->cache->lock);
 
+				if (table->fts->cache->stopword_info.status
+				    & STOPWORD_NOT_INIT) {
+					fts_load_stopword(table, NULL, NULL,
+							  NULL, TRUE, TRUE);
+				}
+
 				fts_cache_add_doc(
 					table->fts->cache,
 					get_doc->index_cache,
@@ -4359,6 +4379,7 @@
 	/* We need to do this within the deleted lock since fts_delete() can
 	attempt to add a deleted doc id to the cache deleted id array. */
 	fts_cache_clear(cache);
+	DEBUG_SYNC_C("fts_deleted_doc_ids_clear");
 	fts_cache_init(cache);
 	rw_lock_x_unlock(&cache->lock);
 
@@ -5160,6 +5181,12 @@
 
 	mutex_enter((ib_mutex_t*) &cache->deleted_lock);
 
+	if (cache->deleted_doc_ids == NULL) {
+		mutex_exit((ib_mutex_t*) &cache->deleted_lock);
+		return;
+	}
+
+
 	for (i = 0; i < ib_vector_size(cache->deleted_doc_ids); ++i) {
 		fts_update_t*	update;
 
@@ -5445,16 +5472,15 @@
 fts_savepoint_take(
 /*===============*/
 	trx_t*		trx,		/*!< in: transaction */
+	fts_trx_t*	fts_trx,	/*!< in: fts transaction */
 	const char*	name)		/*!< in: savepoint name */
 {
 	mem_heap_t*		heap;
-	fts_trx_t*		fts_trx;
 	fts_savepoint_t*	savepoint;
 	fts_savepoint_t*	last_savepoint;
 
 	ut_a(name != NULL);
 
-	fts_trx = trx->fts_trx;
 	heap = fts_trx->heap;
 
 	/* The implied savepoint must exist. */
@@ -5499,7 +5525,7 @@
 
 /*********************************************************************//**
 Release the savepoint data identified by  name. All savepoints created
-after the named savepoint are also released.
+after the named savepoint are kept.
 @return DB_SUCCESS or error code */
 UNIV_INTERN
 void
@@ -5508,81 +5534,37 @@
 	trx_t*		trx,		/*!< in: transaction */
 	const char*	name)		/*!< in: savepoint name */
 {
-	ulint			i;
-	ib_vector_t*		savepoints;
-	ulint			top_of_stack = 0;
-
 	ut_a(name != NULL);
 
-	savepoints = trx->fts_trx->savepoints;
+	ib_vector_t*	savepoints = trx->fts_trx->savepoints;
 
 	ut_a(ib_vector_size(savepoints) > 0);
 
-	/* Skip the implied savepoint (first element). */
-	for (i = 1; i < ib_vector_size(savepoints); ++i) {
-		fts_savepoint_t*	savepoint;
+	ulint   i = fts_savepoint_lookup(savepoints, name);
+	if (i != ULINT_UNDEFINED) {
+		ut_a(i >= 1);
 
+		fts_savepoint_t*        savepoint;
 		savepoint = static_cast<fts_savepoint_t*>(
 			ib_vector_get(savepoints, i));
 
-		/* Even though we release the resources that are part
-		of the savepoint, we don't (always) actually delete the
-		entry.  We simply set the savepoint name to NULL. Therefore
-		we have to skip deleted/released entries. */
-		if (savepoint->name != NULL
-		    && strcmp(name, savepoint->name) == 0) {
-			break;
-
-		/* Track the previous savepoint instance that will
-		be at the top of the stack after the release. */
-		} else if (savepoint->name != NULL) {
-			/* We need to delete all entries
-			greater than this element. */
-			top_of_stack = i;
+		if (i == ib_vector_size(savepoints) - 1) {
+			/* If the savepoint is the last, we save its
+			tables to the  previous savepoint. */
+			fts_savepoint_t*	prev_savepoint;
+			prev_savepoint = static_cast<fts_savepoint_t*>(
+				ib_vector_get(savepoints, i - 1));
+
+			ib_rbt_t*	tables = savepoint->tables;
+			savepoint->tables = prev_savepoint->tables;
+			prev_savepoint->tables = tables;
 		}
-	}
-
-	/* Only if we found and element to release. */
-	if (i < ib_vector_size(savepoints)) {
-		fts_savepoint_t*	last_savepoint;
-		fts_savepoint_t*	top_savepoint;
-		ib_rbt_t*		tables;
-
-		ut_a(top_of_stack < ib_vector_size(savepoints));
-
-		/* Exchange tables between last savepoint and top savepoint */
-		last_savepoint = static_cast<fts_savepoint_t*>(
-				ib_vector_last(trx->fts_trx->savepoints));
-		top_savepoint = static_cast<fts_savepoint_t*>(
-				ib_vector_get(savepoints, top_of_stack));
-		tables = top_savepoint->tables;
-		top_savepoint->tables = last_savepoint->tables;
-		last_savepoint->tables = tables;
-
-		/* Skip the implied savepoint. */
-		for (i = ib_vector_size(savepoints) - 1;
-		     i > top_of_stack;
-		     --i) {
-
-			fts_savepoint_t*	savepoint;
-
-			savepoint = static_cast<fts_savepoint_t*>(
-				ib_vector_get(savepoints, i));
 
-			/* Skip savepoints that were released earlier. */
-			if (savepoint->name != NULL) {
-				savepoint->name = NULL;
-				fts_savepoint_free(savepoint);
-			}
-
-			ib_vector_pop(savepoints);
-		}
+		fts_savepoint_free(savepoint);
+		ib_vector_remove(savepoints, *(void**)savepoint);
 
 		/* Make sure we don't delete the implied savepoint. */
 		ut_a(ib_vector_size(savepoints) > 0);
-
-		/* This must hold. */
-		ut_a(ib_vector_size(savepoints) == (top_of_stack + 1));
 	}
 }
 
@@ -5771,7 +5753,7 @@
 		ut_a(ib_vector_size(savepoints) > 0);
 
 		/* Restore the savepoint. */
-		fts_savepoint_take(trx, name);
+		fts_savepoint_take(trx, trx->fts_trx, name);
 	}
 }
 
@@ -5837,6 +5819,12 @@
 			}
 		}
 
+		/* Could be obsolete common tables. */
+		if (strncmp(ptr, "ADDED", len) == 0
+		    || strncmp(ptr, "STOPWORDS", len) == 0) {
+			return(true);
+		}
+
 		/* Try and read the index id. */
 		if (!fts_read_object_id(&table->index_id, ptr)) {
 			return(FALSE);
@@ -6030,8 +6018,6 @@
 	return (err);
 }
 
-#ifdef _WIN32
-
 /*********************************************************************//**
 Rename an aux table to HEX format. It's called when "%016llu" is used
 to format an object id in table name, which only happens in Windows. */
@@ -6128,8 +6114,8 @@
 are set DICT_TF2_FTS_AUX_HEX_NAME with flags2 or none of them are set */
 static __attribute__((nonnull, warn_unused_result))
 dberr_t
-fts_rename_aux_tables_to_hex_format(
-/*================================*/
+fts_rename_aux_tables_to_hex_format_low(
+/*====================================*/
 	trx_t*		trx,		/*!< in: transaction */
 	dict_table_t*	parent_table,	/*!< in: parent table */
 	ib_vector_t*	tables)		/*!< in: aux tables to rename. */
@@ -6253,12 +6239,14 @@
 					"table %s. Please revert manually.",
 					table->name);
 				fts_sql_rollback(trx_bg);
+				trx_free_for_background(trx_bg);
 				/* Continue to clear aux tables' flags2 */
 				not_rename = true;
 				continue;
 			}
 
 			fts_sql_commit(trx_bg);
+			trx_free_for_background(trx_bg);
 		}
 
 		DICT_TF2_FLAG_UNSET(parent_table, DICT_TF2_FTS_AUX_HEX_NAME);
@@ -6278,11 +6266,15 @@
 {
 	ib_id_t		dec_id = 0;
 	char		tmp_id[FTS_AUX_MIN_TABLE_ID_LENGTH];
-	int		ret;
+	int		ret __attribute__((unused));
 
 	ret = sprintf(tmp_id, UINT64PFx, id);
 	ut_ad(ret == 16);
+#ifdef _WIN32
 	ret = sscanf(tmp_id, "%016llu", &dec_id);
+#else
+	ret = sscanf(tmp_id, "%016" PRIu64, &dec_id);
+#endif /* _WIN32 */
 	ut_ad(ret == 1);
 
 	return dec_id;
@@ -6304,7 +6296,293 @@
 	return static_cast<int>(fa1->parent_id - fa2->parent_id);
 }
 
-#endif /* _WIN32 */
+/** Mark all the fts index associated with the parent table as corrupted.
+@param[in]	trx		transaction
+@param[in, out] parent_table	fts index associated with this parent table
+				will be marked as corrupted. */
+static
+void
+fts_parent_all_index_set_corrupt(
+	trx_t*		trx,
+	dict_table_t*	parent_table)
+{
+	fts_t*	fts = parent_table->fts;
+
+	if (trx_get_dict_operation(trx) == TRX_DICT_OP_NONE) {
+		trx_set_dict_operation(trx, TRX_DICT_OP_INDEX);
+	}
+
+	for (ulint j = 0; j < ib_vector_size(fts->indexes); j++) {
+		dict_index_t*	index = static_cast<dict_index_t*>(
+			ib_vector_getp_const(fts->indexes, j));
+		dict_set_corrupted(index,
+				   trx, "DROP ORPHANED TABLE");
+	}
+}
+
+/** Mark the fts index which index id matches the id as corrupted.
+@param[in]	trx		transaction
+@param[in]	id		index id to search
+@param[in, out]	parent_table	parent table to check with all
+				the index. */
+static
+void
+fts_set_index_corrupt(
+	trx_t*		trx,
+	index_id_t	id,
+	dict_table_t*	table)
+{
+	fts_t*	fts = table->fts;
+
+	if (trx_get_dict_operation(trx) == TRX_DICT_OP_NONE) {
+		trx_set_dict_operation(trx, TRX_DICT_OP_INDEX);
+	}
+
+	for (ulint j = 0; j < ib_vector_size(fts->indexes); j++) {
+		dict_index_t*   index = static_cast<dict_index_t*>(
+			ib_vector_getp_const(fts->indexes, j));
+		if (index->id == id) {
+			dict_set_corrupted(index, trx,
+					   "DROP ORPHANED TABLE");
+			break;
+		}
+	}
+}
+
+/** Check the index for the aux table is corrupted.
+@param[in]	aux_table	auxiliary table
+@retval nonzero if index is corrupted, zero for valid index */
+static
+ulint
+fts_check_corrupt_index(
+	fts_aux_table_t*	aux_table)
+{
+	dict_table_t*	table;
+	dict_index_t*	index;
+	table = dict_table_open_on_id(
+		aux_table->parent_id, TRUE, DICT_TABLE_OP_NORMAL);
+
+	if (table == NULL) {
+		return(0);
+	}
+
+	for (index = UT_LIST_GET_FIRST(table->indexes);
+	     index;
+	     index = UT_LIST_GET_NEXT(indexes, index)) {
+		if (index->id == aux_table->index_id) {
+			ut_ad(index->type & DICT_FTS);
+			dict_table_close(table, true, false);
+			return(dict_index_is_corrupted(index));
+		}
+	}
+
+	dict_table_close(table, true, false);
+	return(0);
+}
+
+/** Check the validity of the parent table.
+@param[in]	aux_table	auxiliary table
+@return true if it is a valid table or false if it is not */
+static
+bool
+fts_valid_parent_table(
+	const fts_aux_table_t*	aux_table)
+{
+	dict_table_t*	parent_table;
+	bool		valid = false;
+
+	parent_table = dict_table_open_on_id(
+		aux_table->parent_id, TRUE, DICT_TABLE_OP_NORMAL);
+
+	if (parent_table != NULL && parent_table->fts != NULL) {
+		if (aux_table->index_id == 0) {
+			valid = true;
+		} else {
+			index_id_t	id = aux_table->index_id;
+			dict_index_t*	index;
+
+			/* Search for the FT index in the table's list. */
+			for (index = UT_LIST_GET_FIRST(parent_table->indexes);
+			     index;
+			     index = UT_LIST_GET_NEXT(indexes, index)) {
+				if (index->id == id) {
+					valid = true;
+					break;
+				}
+
+			}
+		}
+	}
+
+	if (parent_table) {
+		dict_table_close(parent_table, TRUE, FALSE);
+	}
+
+	return(valid);
+}
+
+/** Try to rename all aux tables of the specified parent table.
+@param[in]	aux_tables	aux_tables to be renamed
+@param[in]	parent_table	parent table of all aux
+				tables stored in tables. */
+static
+void
+fts_rename_aux_tables_to_hex_format(
+	ib_vector_t*	aux_tables,
+	dict_table_t*	parent_table)
+{
+	dberr_t err;
+	trx_t*	trx_rename = trx_allocate_for_background();
+	trx_rename->op_info = "Rename aux tables to hex format";
+	trx_rename->dict_operation_lock_mode = RW_X_LATCH;
+	trx_start_for_ddl(trx_rename, TRX_DICT_OP_TABLE);
+
+	err = fts_rename_aux_tables_to_hex_format_low(trx_rename,
+						      parent_table, aux_tables);
+
+	trx_rename->dict_operation_lock_mode = 0;
+
+	if (err != DB_SUCCESS) {
+
+		ib_logf(IB_LOG_LEVEL_WARN,
+			"Rollback operations on all aux tables of table %s. "
+			"All the fts index associated with the table are "
+			"marked as corrupted. Please rebuild the "
+			"index again.", parent_table->name);
+		fts_sql_rollback(trx_rename);
+
+		/* Corrupting the fts index related to parent table. */
+		trx_t*	trx_corrupt;
+		trx_corrupt = trx_allocate_for_background();
+		trx_corrupt->dict_operation_lock_mode = RW_X_LATCH;
+		trx_start_for_ddl(trx_corrupt, TRX_DICT_OP_TABLE);
+		fts_parent_all_index_set_corrupt(trx_corrupt, parent_table);
+		trx_corrupt->dict_operation_lock_mode = 0;
+		fts_sql_commit(trx_corrupt);
+		trx_free_for_background(trx_corrupt);
+	} else {
+		fts_sql_commit(trx_rename);
+	}
+
+	trx_free_for_background(trx_rename);
+	ib_vector_reset(aux_tables);
+}
+
+/** Set the hex format flag for the parent table.
+@param[in, out]	parent_table	parent table
+@param[in]	trx		transaction */
+static
+void
+fts_set_parent_hex_format_flag(
+	dict_table_t*	parent_table,
+	trx_t*		trx)
+{
+	if (!DICT_TF2_FLAG_IS_SET(parent_table,
+				  DICT_TF2_FTS_AUX_HEX_NAME)) {
+		DBUG_EXECUTE_IF("parent_table_flag_fail",
+			ib_logf(IB_LOG_LEVEL_FATAL,
+				"Setting parent table %s  to hex format "
+				"failed. Please try to restart the server "
+				"again, if it doesn't work, the system "
+				"tables might be corrupted.",
+				parent_table->name);
+			return;);
+
+		dberr_t	err = fts_update_hex_format_flag(
+				trx, parent_table->id, true);
+
+		if (err != DB_SUCCESS) {
+			ib_logf(IB_LOG_LEVEL_FATAL,
+				"Setting parent table %s  to hex format "
+				"failed. Please try to restart the server "
+				"again, if it doesn't work, the system "
+				"tables might be corrupted.",
+				parent_table->name);
+		} else {
+			DICT_TF2_FLAG_SET(
+				parent_table, DICT_TF2_FTS_AUX_HEX_NAME);
+		}
+	}
+}
+
+/** Drop the obsolete auxilary table.
+@param[in]	tables	tables to be dropped. */
+static
+void
+fts_drop_obsolete_aux_table_from_vector(
+	ib_vector_t*	tables)
+{
+	dberr_t		err;
+
+	for (ulint count = 0; count < ib_vector_size(tables);
+	     ++count) {
+
+		fts_aux_table_t*	aux_drop_table;
+		aux_drop_table = static_cast<fts_aux_table_t*>(
+			ib_vector_get(tables, count));
+		trx_t*	trx_drop = trx_allocate_for_background();
+		trx_drop->op_info = "Drop obsolete aux tables";
+		trx_drop->dict_operation_lock_mode = RW_X_LATCH;
+		trx_start_for_ddl(trx_drop, TRX_DICT_OP_TABLE);
+
+		err = row_drop_table_for_mysql(
+			aux_drop_table->name, trx_drop, false, true);
+
+		trx_drop->dict_operation_lock_mode = 0;
+
+		if (err != DB_SUCCESS) {
+			/* We don't need to worry about the
+			failure, since server would try to
+			drop it on next restart, even if
+			the table was broken. */
+			ib_logf(IB_LOG_LEVEL_WARN,
+				"Fail to drop obsolete aux table '%s', which "
+				"is harmless. will try to drop it on next "
+				"restart.", aux_drop_table->name);
+			fts_sql_rollback(trx_drop);
+		} else {
+			ib_logf(IB_LOG_LEVEL_INFO,
+				"Dropped obsolete aux table '%s'.",
+				aux_drop_table->name);
+
+			fts_sql_commit(trx_drop);
+		}
+
+		trx_free_for_background(trx_drop);
+	}
+}
+
+/** Drop all the auxiliary table present in the vector.
+@param[in]	trx	transaction
+@param[in]	tables	tables to be dropped */
+static
+void
+fts_drop_aux_table_from_vector(
+	trx_t*		trx,
+	ib_vector_t*	tables)
+{
+	for (ulint count = 0; count < ib_vector_size(tables);
+	    ++count) {
+		fts_aux_table_t*	aux_drop_table;
+		aux_drop_table = static_cast<fts_aux_table_t*>(
+				ib_vector_get(tables, count));
+
+		/* Check for the validity of the parent table */
+		if (!fts_valid_parent_table(aux_drop_table)) {
+			ib_logf(IB_LOG_LEVEL_WARN,
+				"Parent table of FTS auxiliary table %s not "
+				"found.", aux_drop_table->name);
+			dberr_t err = fts_drop_table(trx, aux_drop_table->name);
+			if (err == DB_FAIL) {
+				char*	path = fil_make_ibd_name(
+					aux_drop_table->name, false);
+				os_file_delete_if_exists(innodb_file_data_key,
+							 path);
+				mem_free(path);
+			}
+		}
+	}
+}
 
 /**********************************************************************//**
 Check and drop all orphaned FTS auxiliary tables, those that don't have
@@ -6317,9 +6595,12 @@
 	trx_t*		trx,			/*!< in: transaction */
 	ib_vector_t*	tables)			/*!< in: tables to check */
 {
-#ifdef _WIN32
 	mem_heap_t*	heap;
 	ib_vector_t*	aux_tables_to_rename;
+	ib_vector_t*	invalid_aux_tables;
+	ib_vector_t*	valid_aux_tables;
+	ib_vector_t*	drop_aux_tables;
+	ib_vector_t*	obsolete_aux_tables;
 	ib_alloc_t*	heap_alloc;
 
 	heap = mem_heap_create(1024);
@@ -6330,38 +6611,99 @@
 	aux_tables_to_rename = ib_vector_create(heap_alloc,
 						sizeof(fts_aux_table_t), 128);
 
+	/* We store all fake auxiliary table and orphaned table here. */
+	invalid_aux_tables = ib_vector_create(heap_alloc,
+					      sizeof(fts_aux_table_t), 128);
+
+	/* We store all valid aux tables. We use this to filter the
+	fake auxiliary table from invalid auxiliary tables. */
+	valid_aux_tables = ib_vector_create(heap_alloc,
+					    sizeof(fts_aux_table_t), 128);
+
+	/* We store all auxiliary tables to be dropped. */
+	drop_aux_tables = ib_vector_create(heap_alloc,
+					   sizeof(fts_aux_table_t), 128);
+
+	/* We store all obsolete auxiliary tables to be dropped. */
+	obsolete_aux_tables = ib_vector_create(heap_alloc,
+					       sizeof(fts_aux_table_t), 128);
+
 	/* Sort by parent_id first, in case rename will fail */
 	ib_vector_sort(tables, fts_check_aux_table_parent_id_cmp);
-#endif /* _WIN32 */
 
 	for (ulint i = 0; i < ib_vector_size(tables); ++i) {
 		dict_table_t*		parent_table;
 		fts_aux_table_t*	aux_table;
 		bool			drop = false;
-#ifdef _WIN32
 		dict_table_t*		table;
 		fts_aux_table_t*	next_aux_table = NULL;
 		ib_id_t			orig_parent_id = 0;
+		ib_id_t			orig_index_id = 0;
 		bool			rename = false;
-#endif /* _WIN32 */
 
 		aux_table = static_cast<fts_aux_table_t*>(
 			ib_vector_get(tables, i));
 
-#ifdef _WIN32
 		table = dict_table_open_on_id(
 			aux_table->id, TRUE, DICT_TABLE_OP_NORMAL);
 		orig_parent_id = aux_table->parent_id;
+		orig_index_id = aux_table->index_id;
 
 		if (table == NULL || strcmp(table->name, aux_table->name)) {
-			/* Skip these aux tables, which are common tables
-			with wrong table ids */
-			if (table) {
+
+			bool	fake_aux = false;
+
+			if (table != NULL) {
 				dict_table_close(table, TRUE, FALSE);
 			}
 
-			continue;
+			if (i + 1 < ib_vector_size(tables)) {
+				next_aux_table = static_cast<fts_aux_table_t*>(
+						ib_vector_get(tables, i + 1));
+			}
+
+			/* To know whether aux table is fake fts or
+			orphan fts table. */
+			for (ulint count = 0;
+			     count < ib_vector_size(valid_aux_tables);
+			     count++) {
+				fts_aux_table_t*	valid_aux;
+				valid_aux = static_cast<fts_aux_table_t*>(
+					ib_vector_get(valid_aux_tables, count));
+				if (strcmp(valid_aux->name,
+					   aux_table->name) == 0) {
+					fake_aux = true;
+					break;
+				}
+			}
+
+			/* All aux tables of parent table, whose id is
+			last_parent_id, have been checked, try to rename
+			them if necessary. */
+			if ((next_aux_table == NULL
+			     || orig_parent_id != next_aux_table->parent_id)
+			    && (!ib_vector_is_empty(aux_tables_to_rename))) {
+
+					ulint	parent_id = fts_fake_hex_to_dec(
+							aux_table->parent_id);
+
+					parent_table = dict_table_open_on_id(
+						parent_id, TRUE,
+						DICT_TABLE_OP_NORMAL);
+
+					fts_rename_aux_tables_to_hex_format(
+						aux_tables_to_rename, parent_table);
 
+					dict_table_close(parent_table, TRUE,
+							 FALSE);
+			}
+
+			/* If the aux table is fake aux table. Skip it. */
+			if (!fake_aux) {
+				ib_vector_push(invalid_aux_tables, aux_table);
+			}
+
+			continue;
 		} else if (!DICT_TF2_FLAG_IS_SET(table,
 						 DICT_TF2_FTS_AUX_HEX_NAME)) {
 
@@ -6374,67 +6716,115 @@
 			}
 
 			ut_ad(aux_table->id > aux_table->parent_id);
-			rename = true;
-		}
 
-		if (table) {
-			dict_table_close(table, TRUE, FALSE);
-		}
-#endif /* _WIN32 */
-
-		parent_table = dict_table_open_on_id(
-			aux_table->parent_id, TRUE, DICT_TABLE_OP_NORMAL);
-
-		if (parent_table == NULL || parent_table->fts == NULL) {
+			/* Check whether parent table id and index id
+			are stored as decimal format. */
+			if (fts_valid_parent_table(aux_table)) {
+
+				parent_table = dict_table_open_on_id(
+					aux_table->parent_id, true,
+					DICT_TABLE_OP_NORMAL);
+
+				ut_ad(parent_table != NULL);
+				ut_ad(parent_table->fts != NULL);
+
+				if (!DICT_TF2_FLAG_IS_SET(
+					parent_table,
+					DICT_TF2_FTS_AUX_HEX_NAME)) {
+					rename = true;
+				}
 
-			drop = true;
+				dict_table_close(parent_table, TRUE, FALSE);
+			}
 
-		} else if (aux_table->index_id != 0) {
-			index_id_t	id;
-			fts_t*		fts;
+			if (!rename) {
+				/* Reassign the original value of
+				aux table if it is not in decimal format */
+				aux_table->parent_id = orig_parent_id;
+				aux_table->index_id = orig_index_id;
+			}
+		}
 
-			drop = true;
-			fts = parent_table->fts;
-			id = aux_table->index_id;
+		if (table != NULL) {
+			dict_table_close(table, true, false);
+		}
 
-			/* Search for the FT index in the table's list. */
-			for (ulint j = 0;
-			     j < ib_vector_size(fts->indexes);
-			     ++j) {
+		if (!rename) {
+			/* Check the validity of the parent table. */
+			if (!fts_valid_parent_table(aux_table)) {
+				drop = true;
+			}
+		}
 
-				const dict_index_t*     index;
+		/* Filter out the fake aux table by comparing with the
+		current valid auxiliary table name . */
+		for (ulint count = 0;
+		     count < ib_vector_size(invalid_aux_tables); count++) {
+			fts_aux_table_t*	invalid_aux;
+			invalid_aux = static_cast<fts_aux_table_t*>(
+				ib_vector_get(invalid_aux_tables, count));
+			if (strcmp(invalid_aux->name, aux_table->name) == 0) {
+				ib_vector_remove(
+					invalid_aux_tables,
+					*reinterpret_cast<void**>(invalid_aux));
+				break;
+			}
+		}
 
-				index = static_cast<const dict_index_t*>(
-					ib_vector_getp_const(fts->indexes, j));
+		ib_vector_push(valid_aux_tables, aux_table);
 
-				if (index->id == id) {
-					drop = false;
-					break;
-				}
+		/* If the index associated with aux table is corrupted,
+		skip it. */
+		if (fts_check_corrupt_index(aux_table) > 0) {
+
+			if (i + 1 < ib_vector_size(tables)) {
+				next_aux_table = static_cast<fts_aux_table_t*>(
+						ib_vector_get(tables, i + 1));
 			}
-		}
 
-		if (drop) {
+			if (next_aux_table == NULL
+			    || orig_parent_id != next_aux_table->parent_id) {
 
-			ib_logf(IB_LOG_LEVEL_WARN,
-				"Parent table of FTS auxiliary table %s not "
-				"found.", aux_table->name);
+				parent_table = dict_table_open_on_id(
+					aux_table->parent_id, TRUE,
+					DICT_TABLE_OP_NORMAL);
+
+				if (!ib_vector_is_empty(aux_tables_to_rename)) {
+					fts_rename_aux_tables_to_hex_format(
+						aux_tables_to_rename, parent_table);
 
-			dberr_t err = fts_drop_table(trx, aux_table->name);
+				} else {
+					fts_set_parent_hex_format_flag(
+						parent_table, trx);
+				}
 
-			if (err == DB_FAIL) {
-				char*   path;
+				dict_table_close(parent_table, TRUE, FALSE);
+			}
 
-				path = fil_make_ibd_name(
-					aux_table->name, false);
+			continue;
+		}
 
-				os_file_delete_if_exists(innodb_file_data_key,
-							 path);
+		parent_table = dict_table_open_on_id(
+			aux_table->parent_id, TRUE, DICT_TABLE_OP_NORMAL);
 
-				mem_free(path);
+		if (drop) {
+			 ib_vector_push(drop_aux_tables, aux_table);
+		} else {
+			if (FTS_IS_OBSOLETE_AUX_TABLE(aux_table->name)) {
+
+				/* Current table could be one of the three
+				obsolete tables, in this case, we should
+				always try to drop it but not rename it.
+				This could happen when we try to upgrade
+				from older server to later one, which doesn't
+				contain these obsolete tables. */
+				ib_vector_push(obsolete_aux_tables, aux_table);
+				continue;
 			}
 		}
-#ifdef _WIN32
+
+		/* If the aux table is in decimal format, we should
+		rename it, so push it to aux_tables_to_rename */
 		if (!drop && rename) {
 			ib_vector_push(aux_tables_to_rename, aux_table);
 		}
@@ -6452,38 +6842,16 @@
 			them if necessary. We had better use a new background
 			trx to rename rather than the original trx, in case
 			any failure would cause a complete rollback. */
-			dberr_t	err;
-			trx_t*	trx_rename = trx_allocate_for_background();
-			trx_rename->op_info = "Rename aux tables to "
-					      "hex format";
-			trx_rename->dict_operation_lock_mode = RW_X_LATCH;
-			trx_start_for_ddl(trx_rename, TRX_DICT_OP_TABLE);
-
-			err = fts_rename_aux_tables_to_hex_format(trx_rename,
-					parent_table, aux_tables_to_rename);
-
-			trx_rename->dict_operation_lock_mode = 0;
-
-			if (err != DB_SUCCESS) {
-				ib_logf(IB_LOG_LEVEL_WARN,
-					"Rollback operations on all "
-					"aux tables of table %s. "
-					"Please check why renaming aux tables "
-					"failed, and restart the server to "
-					"upgrade again to "
-					"get the table work.",
-					parent_table->name);
+			ut_ad(rename);
+			ut_ad(!DICT_TF2_FLAG_IS_SET(
+				parent_table, DICT_TF2_FTS_AUX_HEX_NAME));
 
-				fts_sql_rollback(trx_rename);
-			} else {
-				fts_sql_commit(trx_rename);
-			}
-
-			trx_free_for_background(trx_rename);
-			ib_vector_reset(aux_tables_to_rename);
+			fts_rename_aux_tables_to_hex_format(
+				aux_tables_to_rename,parent_table);
 		}
-#else /* _WIN32 */
-		if (!drop) {
+
+		/* The IDs are already in correct hex format. */
+		if (!drop && !rename) {
 			dict_table_t*	table;
 
 			table = dict_table_open_on_id(
@@ -6498,6 +6866,16 @@
 			    && !DICT_TF2_FLAG_IS_SET(
 						table,
 						DICT_TF2_FTS_AUX_HEX_NAME)) {
+
+				DBUG_EXECUTE_IF("aux_table_flag_fail",
+					ib_logf(IB_LOG_LEVEL_WARN,
+						"Setting aux table %s to hex "
+						"format failed.", table->name);
+					fts_set_index_corrupt(
+						trx, aux_table->index_id,
+						parent_table);
+						goto table_exit;);
+
 				dberr_t err = fts_update_hex_format_flag(
 						trx, table->id, true);
 
@@ -6505,49 +6883,44 @@
 					ib_logf(IB_LOG_LEVEL_WARN,
 						"Setting aux table %s to hex "
 						"format failed.", table->name);
+
+					fts_set_index_corrupt(
+						trx, aux_table->index_id,
+						parent_table);
 				} else {
 					DICT_TF2_FLAG_SET(table,
 						DICT_TF2_FTS_AUX_HEX_NAME);
 				}
 			}
+#ifndef DBUG_OFF
+table_exit:
+#endif	/* !DBUG_OFF */
 
 			if (table != NULL) {
 				dict_table_close(table, TRUE, FALSE);
 			}
 
 			ut_ad(parent_table != NULL);
-			if (!DICT_TF2_FLAG_IS_SET(parent_table,
-						  DICT_TF2_FTS_AUX_HEX_NAME)) {
-				dberr_t err = fts_update_hex_format_flag(
-						trx, parent_table->id, true);
 
-				if (err != DB_SUCCESS) {
-					ib_logf(IB_LOG_LEVEL_WARN,
-						"Setting parent table %s of "
-						"FTS auxiliary %s to hex "
-						"format failed.",
-						parent_table->name,
-						aux_table->name);
-				} else {
-					DICT_TF2_FLAG_SET(parent_table,
-						DICT_TF2_FTS_AUX_HEX_NAME);
-				}
-			}
+			fts_set_parent_hex_format_flag(
+					parent_table, trx);
 		}
 
-#endif /* _WIN32 */
-
-		if (parent_table) {
+		if (parent_table != NULL) {
 			dict_table_close(parent_table, TRUE, FALSE);
 		}
 	}
 
-#ifdef _WIN32
+	fts_drop_aux_table_from_vector(trx, invalid_aux_tables);
+	fts_drop_aux_table_from_vector(trx, drop_aux_tables);
+	fts_sql_commit(trx);
+
+	fts_drop_obsolete_aux_table_from_vector(obsolete_aux_tables);
+
 	/* Free the memory allocated at the beginning */
 	if (heap != NULL) {
 		mem_heap_free(heap);
 	}
-#endif /* _WIN32 */
 }
 
 /**********************************************************************//**
@@ -6646,7 +7019,6 @@
 
 		if (error == DB_SUCCESS) {
 			fts_check_and_drop_orphaned_tables(trx, tables);
-			fts_sql_commit(trx);
 			break;				/* Exit the loop. */
 		} else {
 			ib_vector_reset(tables);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0opt.cc percona-xtrabackup-2.3.7/storage/innobase/fts/fts0opt.cc
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0opt.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0opt.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2015, 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
@@ -42,9 +42,6 @@
 /** The FTS optimize thread's work queue. */
 static ib_wqueue_t* fts_optimize_wq;
 
-/** The number of document ids to delete in one statement. */
-static const ulint FTS_MAX_DELETE_DOC_IDS = 1000;
-
 /** Time to wait for a message. */
 static const ulint FTS_QUEUE_WAIT_IN_USECS = 5000000;
 
@@ -95,7 +92,7 @@
 /** Compressed list of words that have been read from FTS INDEX
 that needs to be optimized. */
 struct fts_zip_t {
-	ulint		status;		/*!< Status of (un)/zip operation */
+	lint		status;		/*!< Status of (un)/zip operation */
 
 	ulint		n_words;	/*!< Number of words compressed */
 
@@ -190,6 +187,8 @@
 struct fts_slot_t {
 	dict_table_t*	table;		/*!< Table to optimize */
 
+	table_id_t	table_id;	/*!< Table id */
+
 	fts_state_t	state;		/*!< State of this slot */
 
 	ulint		added;		/*!< Number of doc ids added since the
@@ -1152,6 +1151,7 @@
 	}
 
 	/* Calculate the space required to store the ilist. */
+	ut_ad(doc_id > node->last_doc_id);
 	doc_id_delta = doc_id - node->last_doc_id;
 	enc_len = fts_get_encoded_len(static_cast<ulint>(doc_id_delta));
 
@@ -1394,7 +1394,8 @@
 
 		src_node = (fts_node_t*) ib_vector_get(word->nodes, i);
 
-		if (!dst_node) {
+		if (dst_node == NULL
+		    || dst_node->last_doc_id > src_node->first_doc_id) {
 
 			dst_node = static_cast<fts_node_t*>(
 				ib_vector_push(nodes, NULL));
@@ -2741,6 +2742,7 @@
 	memset(slot, 0x0, sizeof(*slot));
 
 	slot->table = table;
+	slot->table_id = table->id;
 	slot->state = FTS_STATE_LOADED;
 	slot->interval_time = FTS_OPTIMIZE_INTERVAL_IN_SECS;
 
@@ -2865,7 +2867,8 @@
 		slot = static_cast<const fts_slot_t*>(
 			ib_vector_get_const(tables, i));
 
-		if (slot->table && slot->table->fts) {
+		if (slot->state != FTS_STATE_EMPTY && slot->table
+		    && slot->table->fts) {
 			total_memory += slot->table->fts->cache->total_size;
 		}
 
@@ -2948,6 +2951,7 @@
 	ib_wqueue_t*	wq = (ib_wqueue_t*) arg;
 
 	ut_ad(!srv_read_only_mode);
+	my_thread_init();
 
 	heap = mem_heap_create(sizeof(dict_table_t*) * 64);
 	heap_alloc = ib_heap_allocator_create(heap);
@@ -3076,9 +3080,11 @@
 			if (slot->state != FTS_STATE_EMPTY) {
 				dict_table_t*	table = NULL;
 
-			        table = dict_table_open_on_name(
-					slot->table->name, FALSE, FALSE,
-					DICT_ERR_IGNORE_INDEX_ROOT);
+				/*slot->table may be freed, so we try to open
+				table by slot->table_id.*/
+				table = dict_table_open_on_id(
+					slot->table_id, FALSE,
+					DICT_TABLE_OP_NORMAL);
 
 				if (table) {
 
@@ -3101,6 +3107,7 @@
 	ib_logf(IB_LOG_LEVEL_INFO, "FTS optimize thread exiting.");
 
 	os_event_set(exit_event);
+	my_thread_end();
 
 	/* We count the number of threads in os_thread_exit(). A created
 	thread should always use that to exit and not use return() to exit. */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0pars.cc percona-xtrabackup-2.3.7/storage/innobase/fts/fts0pars.cc
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0pars.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0pars.cc	2017-02-27 07:47:02.000000000 +0000
@@ -100,6 +100,8 @@
 #define YYPARSE_PARAM state
 #define YYLEX_PARAM ((fts_ast_state_t*) state)->lexer
 
+#define YYTOKENFREE(token) fts_ast_string_free((token))
+
 typedef	int	(*fts_scanner_alt)(YYSTYPE* val, yyscan_t yyscanner);
 typedef	int	(*fts_scanner)();
 
@@ -154,9 +156,9 @@
 /* Line 293 of yacc.c  */
 #line 61 "fts0pars.y"
 
-	int		oper;
-	char*		token;
-	fts_ast_node_t*	node;
+	int			oper;
+	fts_ast_string_t*	token;
+	fts_ast_node_t*		node;
 
 
 
@@ -632,6 +634,19 @@
 #define YYTERROR	1
 #define YYERRCODE	256
 
+#define YYERRCLEANUP						\
+do								\
+  switch (yylastchar)						\
+    {								\
+      case FTS_NUMB:						\
+      case FTS_TEXT:						\
+      case FTS_TERM:						\
+        YYTOKENFREE(yylval.token);				\
+        break;							\
+      default:							\
+        break;							\
+    }								\
+while (YYID (0))
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
@@ -1169,6 +1184,8 @@
 {
 /* The lookahead symbol.  */
 int yychar;
+/* The backup of yychar when there is an error and we're in yyerrlab. */
+int yylastchar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
@@ -1524,8 +1541,8 @@
 /* Line 1806 of yacc.c  */
 #line 141 "fts0pars.y"
     {
-		fts_ast_term_set_distance((yyvsp[(1) - (3)].node), strtoul((yyvsp[(3) - (3)].token), NULL, 10));
-		free((yyvsp[(3) - (3)].token));
+		fts_ast_term_set_distance((yyvsp[(1) - (3)].node), fts_ast_string_to_ul((yyvsp[(3) - (3)].token), 10));
+		fts_ast_string_free((yyvsp[(3) - (3)].token));
 	}
     break;
 
@@ -1557,8 +1574,8 @@
     {
 		(yyval.node) = fts_ast_create_node_list(state, (yyvsp[(1) - (4)].node));
 		fts_ast_add_node((yyval.node), (yyvsp[(2) - (4)].node));
-		fts_ast_term_set_distance((yyvsp[(2) - (4)].node), strtoul((yyvsp[(4) - (4)].token), NULL, 10));
-		free((yyvsp[(4) - (4)].token));
+		fts_ast_term_set_distance((yyvsp[(2) - (4)].node), fts_ast_string_to_ul((yyvsp[(4) - (4)].token), 10));
+		fts_ast_string_free((yyvsp[(4) - (4)].token));
 	}
     break;
 
@@ -1623,7 +1640,7 @@
 #line 191 "fts0pars.y"
     {
 		(yyval.node)  = fts_ast_create_node_term(state, (yyvsp[(1) - (1)].token));
-		free((yyvsp[(1) - (1)].token));
+		fts_ast_string_free((yyvsp[(1) - (1)].token));
 	}
     break;
 
@@ -1633,7 +1650,7 @@
 #line 196 "fts0pars.y"
     {
 		(yyval.node)  = fts_ast_create_node_term(state, (yyvsp[(1) - (1)].token));
-		free((yyvsp[(1) - (1)].token));
+		fts_ast_string_free((yyvsp[(1) - (1)].token));
 	}
     break;
 
@@ -1652,7 +1669,7 @@
 #line 207 "fts0pars.y"
     {
 		(yyval.node)  = fts_ast_create_node_text(state, (yyvsp[(1) - (1)].token));
-		free((yyvsp[(1) - (1)].token));
+		fts_ast_string_free((yyvsp[(1) - (1)].token));
 	}
     break;
 
@@ -1700,6 +1717,8 @@
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Backup yychar, in case we would change it. */
+  yylastchar = yychar;
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
   yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
@@ -1755,7 +1774,11 @@
 	{
 	  /* Return failure if at end of input.  */
 	  if (yychar == YYEOF)
-	    YYABORT;
+	    {
+	      /* Since we don't need the token, we have to free it first. */
+	      YYERRCLEANUP;
+	      YYABORT;
+	    }
 	}
       else
 	{
@@ -1812,7 +1835,11 @@
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-	YYABORT;
+	{
+	  /* Since we don't need the error token, we have to free it first. */
+	  YYERRCLEANUP;
+	  YYABORT;
+	}
 
 
       yydestruct ("Error: popping",
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0pars.y percona-xtrabackup-2.3.7/storage/innobase/fts/fts0pars.y
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0pars.y	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0pars.y	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2013,  Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2014,  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
@@ -59,9 +59,9 @@
 %}
 
 %union {
-	int		oper;
-	char*		token;
-	fts_ast_node_t*	node;
+	int			oper;
+	fts_ast_string_t*	token;
+	fts_ast_node_t*		node;
 };
 
 /* Enable re-entrant parser */
@@ -139,8 +139,8 @@
 	}
 
 	| text '@' FTS_NUMB {
-		fts_ast_term_set_distance($1, strtoul($3, NULL, 10));
-		free($3);
+		fts_ast_term_set_distance($1, fts_ast_string_to_ul($3, 10));
+		fts_ast_string_free($3);
 	}
 
 	| prefix term '*' {
@@ -157,8 +157,8 @@
 	| prefix text '@' FTS_NUMB {
 		$$ = fts_ast_create_node_list(state, $1);
 		fts_ast_add_node($$, $2);
-		fts_ast_term_set_distance($2, strtoul($4, NULL, 10));
-		free($4);
+		fts_ast_term_set_distance($2, fts_ast_string_to_ul($4, 10));
+		fts_ast_string_free($4);
 	}
 
 	| prefix text {
@@ -190,12 +190,12 @@
 
 term	: FTS_TERM	{
 		$$  = fts_ast_create_node_term(state, $1);
-		free($1);
+		fts_ast_string_free($1);
 	}
 
 	| FTS_NUMB	{
 		$$  = fts_ast_create_node_term(state, $1);
-		free($1);
+		fts_ast_string_free($1);
 	}
 
 	/* Ignore leading '*' */
@@ -206,7 +206,7 @@
 
 text	: FTS_TEXT	{
 		$$  = fts_ast_create_node_text(state, $1);
-		free($1);
+		fts_ast_string_free($1);
 	}
 	;
 %%
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0que.cc percona-xtrabackup-2.3.7/storage/innobase/fts/fts0que.cc
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0que.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0que.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2015, 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
@@ -57,9 +57,6 @@
 /*Initial byte length for 'words' in fts_ranking_t */
 #define RANKING_WORDS_INIT_LEN	4
 
-/* Coeffecient to use for normalize relevance ranking. */
-static const double FTS_NORMALIZE_COEFF = 0.0115F;
-
 // FIXME: Need to have a generic iterator that traverses the ilist.
 
 typedef std::vector<fts_string_t>	word_vector_t;
@@ -1534,7 +1531,8 @@
 {
 	const ib_rbt_node_t*	node;
 
-	ut_a(!rbt_empty(doc_ids));
+	DBUG_ENTER("fts_merge_doc_ids");
+
 	ut_a(!query->intersection);
 
 	/* To process FTS_EXIST operation (intersection), we need
@@ -1559,7 +1557,7 @@
 				query, ranking->doc_id, ranking->rank);
 
 		if (query->error != DB_SUCCESS) {
-			return(query->error);
+			DBUG_RETURN(query->error);
 		}
 
 		/* Merge words. Don't need to take operator into account. */
@@ -1578,7 +1576,7 @@
 		query->intersection = NULL;
 	}
 
-	return(DB_SUCCESS);
+	DBUG_RETURN(DB_SUCCESS);
 }
 
 /*****************************************************************//**
@@ -2800,20 +2798,19 @@
 	ulint		str_len;
 	byte*		new_ptr = NULL;
 
-	str_len = ut_strlen((char*) node->term.ptr);
+	str_len = node->term.ptr->len;
 
 	ut_a(node->type == FTS_AST_TERM);
 
 	token->f_len = str_len;
-	token->f_str = node->term.ptr;
+	token->f_str = node->term.ptr->str;
 
 	if (node->term.wildcard) {
 
 		token->f_str = static_cast<byte*>(ut_malloc(str_len + 2));
 		token->f_len = str_len + 1;
 
-		/* Need to copy the NUL character too. */
-		memcpy(token->f_str, node->term.ptr, str_len + 1);
+		memcpy(token->f_str, node->term.ptr->str, str_len);
 
 		token->f_str[str_len] = '%';
 		token->f_str[token->f_len] = 0;
@@ -2839,17 +2836,17 @@
 	fts_query_t*	query = static_cast<fts_query_t*>(arg);
 
 	ut_a(node);
+	DBUG_ENTER("fts_query_visitor");
+	DBUG_PRINT("fts", ("nodetype: %s", fts_ast_node_type_get(node->type)));
 
 	token.f_n_char = 0;
-
 	query->oper = oper;
-
 	query->cur_node = node;
 
 	switch (node->type) {
 	case FTS_AST_TEXT:
-		token.f_str = node->text.ptr;
-		token.f_len = ut_strlen((char*) token.f_str);
+		token.f_str = node->text.ptr->str;
+		token.f_len = node->text.ptr->len;
 
 		if (query->oper == FTS_EXIST) {
 			ut_ad(query->intersection == NULL);
@@ -2878,8 +2875,8 @@
 		break;
 
 	case FTS_AST_TERM:
-		token.f_str = node->term.ptr;
-		token.f_len = ut_strlen(reinterpret_cast<char*>(token.f_str));
+		token.f_str = node->term.ptr->str;
+		token.f_len = node->term.ptr->len;
 
 		/* Add the word to our RB tree that will be used to
 		calculate this terms per document frequency. */
@@ -2905,7 +2902,7 @@
 		query->multi_exist = true;
 	}
 
-	return(query->error);
+	DBUG_RETURN(query->error);
 }
 
 /*****************************************************************//**
@@ -2929,6 +2926,8 @@
 	bool			will_be_ignored = false;
 	bool			multi_exist;
 
+	DBUG_ENTER("fts_ast_visit_sub_exp");
+
 	ut_a(node->type == FTS_AST_SUBEXP_LIST);
 
 	cur_oper = query->oper;
@@ -2957,14 +2956,14 @@
 	/* Merge the sub-expression result with the parent result set. */
 	subexpr_doc_ids = query->doc_ids;
 	query->doc_ids = parent_doc_ids;
-	if (error == DB_SUCCESS && !rbt_empty(subexpr_doc_ids)) {
+	if (error == DB_SUCCESS) {
 		error = fts_merge_doc_ids(query, subexpr_doc_ids);
 	}
 
 	/* Free current result set. Result already merged into parent. */
 	fts_query_free_doc_ids(query, subexpr_doc_ids);
 
-	return(error);
+	DBUG_RETURN(error);
 }
 
 #if 0
@@ -3191,13 +3190,9 @@
 	to assign the frequency on search string behalf. */
 	if (query->cur_node->type == FTS_AST_TERM
 	    && query->cur_node->term.wildcard) {
-
-		/* These cast are safe since we only care about the
-		terminating NUL character as an end of string marker. */
-		term.f_len = ut_strlen(reinterpret_cast<char*>
-			(query->cur_node->term.ptr));
+		term.f_len = query->cur_node->term.ptr->len;
 		ut_ad(FTS_MAX_WORD_LEN >= term.f_len);
-		memcpy(term.f_str, query->cur_node->term.ptr, term.f_len);
+		memcpy(term.f_str, query->cur_node->term.ptr->str, term.f_len);
 	} else {
 		term.f_len = word->f_len;
 		ut_ad(FTS_MAX_WORD_LEN >= word->f_len);
@@ -3444,8 +3439,10 @@
 	ib_rbt_bound_t		parent;
 	fts_ranking_t		new_ranking;
 
+	DBUG_ENTER("fts_retrieve_ranking");
+
 	if (!result || !result->rankings_by_id) {
-		return(0);
+		DBUG_RETURN(0);
 	}
 
 	new_ranking.doc_id = doc_id;
@@ -3456,10 +3453,10 @@
 
 		ranking = rbt_value(fts_ranking_t, parent.last);
 
-		return(ranking->rank);
+		DBUG_RETURN(ranking->rank);
 	}
 
-	return(0);
+	DBUG_RETURN(0);
 }
 
 /*****************************************************************//**
@@ -3476,6 +3473,8 @@
 	const ib_rbt_node_t*	node;
 	bool			result_is_null = false;
 
+	DBUG_ENTER("fts_query_prepare_result");
+
 	if (result == NULL) {
 		result = static_cast<fts_result_t*>(ut_malloc(sizeof(*result)));
 
@@ -3507,14 +3506,15 @@
 			doc_freq = rbt_value(fts_doc_freq_t, node);
 
 			/* Don't put deleted docs into result */
-			if (fts_bsearch(array, 0, static_cast<int>(size), doc_freq->doc_id)
-			    >= 0) {
+			if (fts_bsearch(array, 0, static_cast<int>(size),
+					doc_freq->doc_id) >= 0) {
+				/* one less matching doc count */
+				--word_freq->doc_count;
 				continue;
 			}
 
 			ranking.doc_id = doc_freq->doc_id;
-			ranking.rank = static_cast<fts_rank_t>(
-				doc_freq->freq * word_freq->idf * word_freq->idf);
+			ranking.rank = static_cast<fts_rank_t>(doc_freq->freq);
 			ranking.words = NULL;
 
 			fts_query_add_ranking(query, result->rankings_by_id,
@@ -3523,11 +3523,30 @@
 			if (query->total_size > fts_result_cache_limit) {
 				query->error = DB_FTS_EXCEED_RESULT_CACHE_LIMIT;
 				fts_query_free_result(result);
-				return(NULL);
+				DBUG_RETURN(NULL);
 			}
 		}
 
-		return(result);
+		/* Calculate IDF only after we exclude the deleted items */
+		fts_query_calculate_idf(query);
+
+		node = rbt_first(query->word_freqs);
+		word_freq = rbt_value(fts_word_freq_t, node);
+
+		/* Calculate the ranking for each doc */
+		for (node = rbt_first(result->rankings_by_id);
+		     node != NULL;
+		     node = rbt_next(result->rankings_by_id, node)) {
+
+			fts_ranking_t*  ranking;
+
+			ranking = rbt_value(fts_ranking_t, node);
+
+			ranking->rank = static_cast<fts_rank_t>(
+				ranking->rank * word_freq->idf * word_freq->idf);
+		}
+
+		DBUG_RETURN(result);
 	}
 
 	ut_a(rbt_size(query->doc_ids) > 0);
@@ -3554,7 +3573,7 @@
 			 if (query->total_size > fts_result_cache_limit) {
 				query->error = DB_FTS_EXCEED_RESULT_CACHE_LIMIT;
 				fts_query_free_result(result);
-				return(NULL);
+				DBUG_RETURN(NULL);
                         }
 		}
 	}
@@ -3566,7 +3585,7 @@
 		query->doc_ids = NULL;
 	}
 
-	return(result);
+	DBUG_RETURN(result);
 }
 
 /*****************************************************************//**
@@ -3578,6 +3597,8 @@
 	fts_query_t*		query,	/*!< in: query instance */
 	fts_result_t*		result)	/*!< in: result */
 {
+	DBUG_ENTER("fts_query_get_result");
+
 	if (rbt_size(query->doc_ids) > 0 || query->flags == FTS_OPT_RANKING) {
 		/* Copy the doc ids to the result. */
 		result = fts_query_prepare_result(query, result);
@@ -3587,7 +3608,7 @@
 		memset(result, 0, sizeof(*result));
 	}
 
-	return(result);
+	DBUG_RETURN(result);
 }
 
 /*****************************************************************//**
@@ -3665,6 +3686,7 @@
 	int		error;
 	fts_ast_state_t state;
 	bool		mode = query->boolean_mode;
+	DBUG_ENTER("fts_query_parse");
 
 	memset(&state, 0x0, sizeof(state));
 
@@ -3683,7 +3705,7 @@
 		query->root = state.root;
 	}
 
-	return(state.root);
+	DBUG_RETURN(state.root);
 }
 
 /*******************************************************************//**
@@ -3898,6 +3920,7 @@
 	/* Get the deleted doc ids that are in the cache. */
 	fts_cache_append_deleted_doc_ids(
 		index->table->fts->cache, query.deleted->doc_ids);
+	DEBUG_SYNC_C("fts_deleted_doc_ids_append");
 
 	/* Sort the vector so that we can do a binary search over the ids. */
 	ib_vector_sort(query.deleted->doc_ids, fts_update_doc_id_cmp);
@@ -3954,7 +3977,8 @@
 		}
 
 		/* Calculate the inverse document frequency of the terms. */
-		if (query.error == DB_SUCCESS) {
+		if (query.error == DB_SUCCESS
+		    && query.flags != FTS_OPT_RANKING) {
 			fts_query_calculate_idf(&query);
 		}
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0tlex.cc percona-xtrabackup-2.3.7/storage/innobase/fts/fts0tlex.cc
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0tlex.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0tlex.cc	2017-02-27 07:47:02.000000000 +0000
@@ -447,7 +447,7 @@
 #line 1 "fts0tlex.l"
 /*****************************************************************************
 
-Copyright (c) 2007, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2014, 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
@@ -802,7 +802,7 @@
 YY_RULE_SETUP
 #line 54 "fts0tlex.l"
 {
-	val->token = strdup(fts0tget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0tget_text(yyscanner)), fts0tget_leng(yyscanner));
 
 	return(FTS_TEXT);
 }
@@ -811,7 +811,7 @@
 YY_RULE_SETUP
 #line 60 "fts0tlex.l"
 {
-	val->token = strdup(fts0tget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0tget_text(yyscanner)), fts0tget_leng(yyscanner));
 
 	return(FTS_TERM);
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/fts/fts0tlex.l percona-xtrabackup-2.3.7/storage/innobase/fts/fts0tlex.l
--- percona-xtrabackup-2.2.3/storage/innobase/fts/fts0tlex.l	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/fts/fts0tlex.l	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2014, 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
@@ -52,13 +52,13 @@
 }
 
 \"[^\"\n]*\"	{
-	val->token = strdup(fts0tget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0tget_text(yyscanner)), fts0tget_leng(yyscanner));
 
 	return(FTS_TEXT);
 }
 
 [^" \n\%]*	{
-	val->token = strdup(fts0tget_text(yyscanner));
+	val->token = fts_ast_string_create(reinterpret_cast<const byte*>(fts0tget_text(yyscanner)), fts0tget_leng(yyscanner));
 
 	return(FTS_TERM);
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/handler/ha_innodb.cc percona-xtrabackup-2.3.7/storage/innobase/handler/ha_innodb.cc
--- percona-xtrabackup-2.2.3/storage/innobase/handler/ha_innodb.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/handler/ha_innodb.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2015, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, 2009 Google Inc.
 Copyright (c) 2009, Percona Inc.
 Copyright (c) 2012, Facebook Inc.
@@ -230,9 +230,9 @@
 };
 
 /* The following counter is used to convey information to InnoDB
-about server activity: in selects it is not sensible to call
-srv_active_wake_master_thread after each fetch or search, we only do
-it every INNOBASE_WAKE_INTERVAL'th step. */
+about server activity: in case of normal DML ops it is not
+sensible to call srv_active_wake_master_thread after each
+operation, we only do it every INNOBASE_WAKE_INTERVAL'th step. */
 
 #define INNOBASE_WAKE_INTERVAL	32
 static ulong	innobase_active_counter	= 0;
@@ -380,7 +380,7 @@
 	{&trx_purge_latch_key, "trx_purge_latch", 0},
 	{&index_tree_rw_lock_key, "index_tree_rw_lock", 0},
 	{&index_online_log_key, "index_online_log", 0},
-	{&dict_table_stats_latch_key, "dict_table_stats", 0},
+	{&dict_table_stats_key, "dict_table_stats", 0},
 	{&hash_table_rw_lock_key, "hash_table_locks", 0}
 };
 # endif /* UNIV_PFS_RWLOCK */
@@ -1495,6 +1495,15 @@
 		return(HA_ERR_TO_BIG_ROW);
 	}
 
+
+	case DB_TOO_BIG_FOR_REDO:
+		my_printf_error(ER_TOO_BIG_ROWSIZE, "%s" , MYF(0),
+				"The size of BLOB/TEXT data inserted"
+				" in one transaction is greater than"
+				" 10% of redo log size. Increase the"
+				" redo log size using innodb_log_file_size.");
+		return(HA_ERR_TO_BIG_ROW);
+
 	case DB_TOO_BIG_INDEX_COL:
 		my_error(ER_INDEX_COLUMN_TOO_LONG, MYF(0),
 			 DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(flags));
@@ -2534,11 +2543,25 @@
 	above the InnoDB trx_sys_t->lock. The caller of this function must
 	not have latches of a lower rank. */
 
-	/* Argument TRUE below means we are using transactions */
 #ifdef HAVE_QUERY_CACHE
+	char	qcache_key_name[2 * (NAME_LEN + 1)];
+	size_t	tabname_len;
+	size_t	dbname_len;
+
+	/* Construct the key("db-name\0table$name\0") for the query cache using
+	the path name("db@002dname\0table@0024name\0") of the table in its
+        canonical form. */
+	dbname_len = filename_to_tablename(full_name, qcache_key_name,
+					   sizeof(qcache_key_name));
+	tabname_len = filename_to_tablename(full_name + strlen(full_name) + 1,
+					    qcache_key_name + dbname_len + 1,
+					    sizeof(qcache_key_name)
+                                            - dbname_len - 1);
+
+	/* Argument TRUE below means we are using transactions */
 	mysql_query_cache_invalidate4(trx->mysql_thd,
-				      full_name,
-				      (uint32) full_name_len,
+				      qcache_key_name,
+				      (dbname_len + tabname_len + 2),
 				      TRUE);
 #endif
 }
@@ -2710,19 +2733,6 @@
 	return(trx && trx->mysql_thd && THDVAR(trx->mysql_thd, strict_mode));
 }
 
-/**********************************************************************//**
-Determines if the current MySQL thread is running in strict mode.
-If thd==NULL, THDVAR returns the global value of innodb-strict-mode.
-@return	TRUE if strict */
-UNIV_INLINE
-ibool
-thd_is_strict(
-/*==========*/
-	THD*	thd)	/*!< in: MySQL thread descriptor */
-{
-	return(THDVAR(thd, strict_mode));
-}
-
 /**************************************************************//**
 Resets some fields of a prebuilt struct. The template is used in fast
 retrieval of just those column values MySQL needs in its processing. */
@@ -2851,7 +2861,8 @@
 
 	innobase_hton->flush_logs = innobase_flush_logs;
 	innobase_hton->show_status = innobase_show_status;
-	innobase_hton->flags = HTON_SUPPORTS_EXTENDED_KEYS;
+	innobase_hton->flags =
+		HTON_SUPPORTS_EXTENDED_KEYS | HTON_SUPPORTS_FOREIGN_KEYS;
 
 	innobase_hton->release_temporary_latches =
 		innobase_release_temporary_latches;
@@ -3535,7 +3546,7 @@
 		/* We were instructed to commit the whole transaction, or
 		this is an SQL statement end and autocommit is on */
 
-		/* We need current binlog position for ibbackup to work. */
+		/* We need current binlog position for mysqlbackup to work. */
 retry:
 		if (innobase_commit_concurrency > 0) {
 			mysql_mutex_lock(&commit_cond_m);
@@ -3608,10 +3619,6 @@
 
 	innobase_srv_conc_force_exit_innodb(trx);
 
-	/* Tell the InnoDB server that there might be work for utility
-	threads: */
-	srv_active_wake_master_thread();
-
 	DBUG_RETURN(0);
 }
 
@@ -3860,7 +3867,7 @@
 	error = trx_savepoint_for_mysql(trx, name, (ib_int64_t)0);
 
 	if (error == DB_SUCCESS && trx->fts_trx != NULL) {
-		fts_savepoint_take(trx, name);
+		fts_savepoint_take(trx, trx->fts_trx, name);
 	}
 
 	DBUG_RETURN(convert_error_code_to_mysql(error, 0, NULL));
@@ -3895,7 +3902,7 @@
 
 		sql_print_warning(
 			"MySQL is closing a connection that has an active "
-			"InnoDB transaction.  "TRX_ID_FMT" row modifications "
+			"InnoDB transaction.  " TRX_ID_FMT " row modifications "
 			"will roll back.",
 			trx->undo_no);
 	}
@@ -6993,7 +7000,7 @@
 			if (doc_id < prebuilt->table->fts->cache->next_doc_id) {
 				fprintf(stderr,
 					"InnoDB: FTS Doc ID must be larger than"
-					" "IB_ID_FMT" for table",
+					" " IB_ID_FMT " for table",
 					innodb_table->fts->cache->next_doc_id
 					- 1);
 				ut_print_name(stderr, trx,
@@ -7005,9 +7012,9 @@
 				    - prebuilt->table->fts->cache->next_doc_id)
 				   >= FTS_DOC_ID_MAX_STEP) {
 				fprintf(stderr,
-					"InnoDB: Doc ID "UINT64PF" is too"
+					"InnoDB: Doc ID " UINT64PF " is too"
 					" big. Its difference with largest"
-					" Doc ID used "UINT64PF" cannot"
+					" Doc ID used " UINT64PF " cannot"
 					" exceed or equal to %d\n",
 					doc_id,
 					prebuilt->table->fts->cache->next_doc_id - 1,
@@ -7508,7 +7515,8 @@
 
 		row_sel_convert_mysql_key_to_innobase(
 			prebuilt->search_tuple,
-			srch_key_val1, sizeof(srch_key_val1),
+			prebuilt->srch_key_val1,
+			prebuilt->srch_key_val_len,
 			index,
 			(byte*) key_ptr,
 			(ulint) key_len,
@@ -10088,11 +10096,6 @@
 
 	log_buffer_flush_to_disk();
 
-	/* Tell the InnoDB server that there might be work for
-	utility threads: */
-
-	srv_active_wake_master_thread();
-
 	innobase_commit_low(trx);
 
 	trx_free_for_mysql(trx);
@@ -10174,11 +10177,6 @@
 
 	log_buffer_flush_to_disk();
 
-	/* Tell the InnoDB server that there might be work for
-	utility threads: */
-
-	srv_active_wake_master_thread();
-
 	innobase_commit_low(trx);
 	trx_free_for_mysql(trx);
 }
@@ -10328,11 +10326,6 @@
 
 	DEBUG_SYNC(thd, "after_innobase_rename_table");
 
-	/* Tell the InnoDB server that there might be work for
-	utility threads: */
-
-	srv_active_wake_master_thread();
-
 	innobase_commit_low(trx);
 	trx_free_for_mysql(trx);
 
@@ -10448,7 +10441,8 @@
 
 	row_sel_convert_mysql_key_to_innobase(
 				range_start,
-				srch_key_val1, sizeof(srch_key_val1),
+				prebuilt->srch_key_val1,
+				prebuilt->srch_key_val_len,
 				index,
 				(byte*) (min_key ? min_key->key :
 					 (const uchar*) 0),
@@ -10460,7 +10454,8 @@
 
 	row_sel_convert_mysql_key_to_innobase(
 				range_end,
-				srch_key_val2, sizeof(srch_key_val2),
+				prebuilt->srch_key_val2,
+				prebuilt->srch_key_val_len,
 				index,
 				(byte*) (max_key ? max_key->key :
 					 (const uchar*) 0),
@@ -11784,9 +11779,13 @@
 
 	mutex_enter(&(dict_sys->mutex));
 
-	for (foreign = UT_LIST_GET_FIRST(prebuilt->table->foreign_list);
-	     foreign != NULL;
-	     foreign = UT_LIST_GET_NEXT(foreign_list, foreign)) {
+	for (dict_foreign_set::iterator it
+		= prebuilt->table->foreign_set.begin();
+	     it != prebuilt->table->foreign_set.end();
+	     ++it) {
+
+		foreign = *it;
+
 		pf_key_info = get_foreign_key_info(thd, foreign);
 		if (pf_key_info) {
 			f_key_list->push_back(pf_key_info);
@@ -11822,9 +11821,13 @@
 
 	mutex_enter(&(dict_sys->mutex));
 
-	for (foreign = UT_LIST_GET_FIRST(prebuilt->table->referenced_list);
-	     foreign != NULL;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
+	for (dict_foreign_set::iterator it
+		= prebuilt->table->referenced_set.begin();
+	     it != prebuilt->table->referenced_set.end();
+	     ++it) {
+
+		foreign = *it;
+
 		pf_key_info = get_foreign_key_info(thd, foreign);
 		if (pf_key_info) {
 			f_key_list->push_back(pf_key_info);
@@ -11857,8 +11860,8 @@
 			"determining if there are foreign key constraints";
 	row_mysql_freeze_data_dictionary(prebuilt->trx);
 
-	can_switch = !UT_LIST_GET_FIRST(prebuilt->table->referenced_list)
-			&& !UT_LIST_GET_FIRST(prebuilt->table->foreign_list);
+	can_switch = prebuilt->table->referenced_set.empty()
+		&& prebuilt->table->foreign_set.empty();
 
 	row_mysql_unfreeze_data_dictionary(prebuilt->trx);
 	prebuilt->trx->op_info = "";
@@ -12003,6 +12006,7 @@
 	thr_lock_type	lock_type)
 {
 	trx_t*		trx;
+	DBUG_ENTER("ha_innobase::start_stmt");
 
 	update_thd(thd);
 
@@ -12026,6 +12030,29 @@
 	prebuilt->hint_need_to_fetch_extra_cols = 0;
 	reset_template();
 
+	if (dict_table_is_temporary(prebuilt->table)
+	    && prebuilt->mysql_has_locked
+	    && prebuilt->select_lock_type == LOCK_NONE) {
+		dberr_t error;
+
+		switch (thd_sql_command(thd)) {
+		case SQLCOM_INSERT:
+		case SQLCOM_UPDATE:
+		case SQLCOM_DELETE:
+			init_table_handle_for_HANDLER();
+			prebuilt->select_lock_type = LOCK_X;
+			prebuilt->stored_select_lock_type = LOCK_X;
+			error = row_lock_table_for_mysql(prebuilt, NULL, 1);
+
+			if (error != DB_SUCCESS) {
+				int st = convert_error_code_to_mysql(
+					error, 0, thd);
+				DBUG_RETURN(st);
+			}
+			break;
+		}
+	}
+
 	if (!prebuilt->mysql_has_locked) {
 		/* This handle is for a temporary table created inside
 		this same LOCK TABLES; since MySQL does NOT call external_lock
@@ -12063,7 +12090,7 @@
 		++trx->will_lock;
 	}
 
-	return(0);
+	DBUG_RETURN(0);
 }
 
 /******************************************************************//**
@@ -13417,10 +13444,8 @@
 			len1 = innobase_read_from_2_little_endian(ref1);
 			len2 = innobase_read_from_2_little_endian(ref2);
 
-			ref1 += 2;
-			ref2 += 2;
 			result = ((Field_blob*) field)->cmp(
-				ref1, len1, ref2, len2);
+				ref1 + 2, len1, ref2 + 2, len2);
 		} else {
 			result = field->key_cmp(ref1, ref2);
 		}
@@ -13626,17 +13651,12 @@
 		trx_mark_sql_stat_end(trx);
 	}
 
-	/* Tell the InnoDB server that there might be work for utility
-	threads: */
-
-	srv_active_wake_master_thread();
-
 	if (thd_sql_command(thd) != SQLCOM_XA_PREPARE
 	    && (prepare_trx
 		|| !thd_test_options(
 			thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) {
 
-		/* For ibbackup to work the order of transactions in binlog
+		/* For mysqlbackup to work the order of transactions in binlog
 		and InnoDB must be the same. Consider the situation
 
 		  thread1> prepare; write to binlog; ...
@@ -17169,3 +17189,28 @@
 	return(strconvert(
 		cs1, from, cs2, to, static_cast<uint>(len), errors));
 }
+
+/**********************************************************************
+Issue a warning that the row is too big. */
+void
+ib_warn_row_too_big(const dict_table_t*	table)
+{
+	/* If prefix is true then a 768-byte prefix is stored
+	locally for BLOB fields. Refer to dict_table_get_format() */
+	const bool prefix = (dict_tf_get_format(table->flags)
+			     == UNIV_FORMAT_A);
+
+	const ulint	free_space = page_get_free_space_of_empty(
+		table->flags & DICT_TF_COMPACT) / 2;
+
+	THD*	thd = current_thd;
+
+	push_warning_printf(
+		thd, Sql_condition::WARN_LEVEL_WARN, HA_ERR_TO_BIG_ROW,
+		"Row size too large (> %lu). Changing some columns to TEXT"
+		" or BLOB %smay help. In current row format, BLOB prefix of"
+		" %d bytes is stored inline.", free_space
+		, prefix ? "or using ROW_FORMAT=DYNAMIC or"
+		" ROW_FORMAT=COMPRESSED ": ""
+		, prefix ? DICT_MAX_FIXED_COL_LEN : 0);
+}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/handler/ha_innodb.h percona-xtrabackup-2.3.7/storage/innobase/handler/ha_innodb.h
--- percona-xtrabackup-2.2.3/storage/innobase/handler/ha_innodb.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/handler/ha_innodb.h	2017-02-27 07:47:02.000000000 +0000
@@ -71,13 +71,6 @@
 
 	uchar*		upd_buf;	/*!< buffer used in updates */
 	ulint		upd_buf_size;	/*!< the size of upd_buf in bytes */
-	uchar		srch_key_val1[MAX_KEY_LENGTH + MAX_REF_PARTS*2];
-	uchar		srch_key_val2[MAX_KEY_LENGTH + MAX_REF_PARTS*2];
-					/*!< buffers used in converting
-					search key values from MySQL format
-					to InnoDB format. For each column
-					2 bytes are used to store length,
-					hence MAX_REF_PARTS*2. */
 	Table_flags	int_table_flags;
 	uint		primary_key;
 	ulong		start_of_scan;	/*!< this is set to 1 when we are
@@ -516,7 +509,7 @@
 					columns and indexes */
 	HA_CREATE_INFO*	create_info,	/*!< in: create info. */
 	bool		use_tablespace)	/*!< in: srv_file_per_table */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /*********************************************************************//**
 Retrieve the FTS Relevance Ranking result for doc with doc_id
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/handler/handler0alter.cc percona-xtrabackup-2.3.7/storage/innobase/handler/handler0alter.cc
--- percona-xtrabackup-2.2.3/storage/innobase/handler/handler0alter.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/handler/handler0alter.cc	2017-02-27 07:47:02.000000000 +0000
@@ -558,15 +558,9 @@
 		/* Check if any existing foreign key has the same id,
 		this is needed only if user supplies the constraint name */
 
-		for (const dict_foreign_t* existing_foreign
-			= UT_LIST_GET_FIRST(table->foreign_list);
-		     existing_foreign != 0;
-		     existing_foreign = UT_LIST_GET_NEXT(
-			     foreign_list, existing_foreign)) {
-
-			if (ut_strcmp(existing_foreign->id, foreign->id) == 0) {
-				return(false);
-			}
+		if (table->foreign_set.find(foreign)
+		    != table->foreign_set.end()) {
+			return(false);
 		}
         }
 
@@ -2151,7 +2145,7 @@
 @param drop_fk		constraints being dropped
 @param n_drop_fk	number of constraints that are being dropped
 @return whether the constraint is being dropped */
-inline __attribute__((pure, nonnull, warn_unused_result))
+inline __attribute__((warn_unused_result))
 bool
 innobase_dropping_foreign(
 /*======================*/
@@ -2178,7 +2172,7 @@
 @retval true		Not allowed (will call my_error())
 @retval false		Allowed
 */
-static __attribute__((pure, nonnull, warn_unused_result))
+static __attribute__((warn_unused_result))
 bool
 innobase_check_foreigns_low(
 /*========================*/
@@ -2188,14 +2182,18 @@
 	const char*		col_name,
 	bool			drop)
 {
+	dict_foreign_t*	foreign;
 	ut_ad(mutex_own(&dict_sys->mutex));
 
 	/* Check if any FOREIGN KEY constraints are defined on this
 	column. */
-	for (const dict_foreign_t* foreign = UT_LIST_GET_FIRST(
-		     user_table->foreign_list);
-	     foreign;
-	     foreign = UT_LIST_GET_NEXT(foreign_list, foreign)) {
+
+	for (dict_foreign_set::iterator it = user_table->foreign_set.begin();
+	     it != user_table->foreign_set.end();
+	     ++it) {
+
+		foreign = *it;
+
 		if (!drop && !(foreign->type
 			       & (DICT_FOREIGN_ON_DELETE_SET_NULL
 				  | DICT_FOREIGN_ON_UPDATE_SET_NULL))) {
@@ -2227,10 +2225,13 @@
 
 	/* Check if any FOREIGN KEY constraints in other tables are
 	referring to the column that is being dropped. */
-	for (const dict_foreign_t* foreign = UT_LIST_GET_FIRST(
-		     user_table->referenced_list);
-	     foreign;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
+	for (dict_foreign_set::iterator it
+		= user_table->referenced_set.begin();
+	     it != user_table->referenced_set.end();
+	     ++it) {
+
+		foreign = *it;
+
 		if (innobase_dropping_foreign(foreign, drop_fk, n_drop_fk)) {
 			continue;
 		}
@@ -2271,7 +2272,7 @@
 @retval true		Not allowed (will call my_error())
 @retval false		Allowed
 */
-static __attribute__((pure, nonnull, warn_unused_result))
+static __attribute__((warn_unused_result))
 bool
 innobase_check_foreigns(
 /*====================*/
@@ -3176,9 +3177,6 @@
 	delete ctx;
 	ha_alter_info->handler_ctx = NULL;
 
-	/* There might be work for utility threads.*/
-	srv_active_wake_master_thread();
-
 	DBUG_RETURN(true);
 }
 
@@ -3297,9 +3295,7 @@
 	ulint		fts_doc_col_no		= ULINT_UNDEFINED;
 	bool		add_fts_doc_id		= false;
 	bool		add_fts_doc_id_idx	= false;
-#ifdef _WIN32
 	bool		add_fts_idx		= false;
-#endif /* _WIN32 */
 
 	DBUG_ENTER("prepare_inplace_alter_table");
 	DBUG_ASSERT(!ha_alter_info->handler_ctx);
@@ -3444,9 +3440,7 @@
 				      & ~(HA_FULLTEXT
 					  | HA_PACK_KEY
 					  | HA_BINARY_PACK_KEY)));
-#ifdef _WIN32
 			add_fts_idx = true;
-#endif /* _WIN32 */
 			continue;
 		}
 
@@ -3457,19 +3451,16 @@
 		}
 	}
 
-#ifdef _WIN32
 	/* We won't be allowed to add fts index to a table with
 	fts indexes already but without AUX_HEX_NAME set.
 	This means the aux tables of the table failed to
 	rename to hex format but new created aux tables
-	shall be in hex format, which is contradictory.
-	It's only for Windows. */
+	shall be in hex format, which is contradictory. */
 	if (!DICT_TF2_FLAG_IS_SET(indexed_table, DICT_TF2_FTS_AUX_HEX_NAME)
 	    && indexed_table->fts != NULL && add_fts_idx) {
 		my_error(ER_INNODB_FT_AUX_NOT_HEX_ID, MYF(0));
 		goto err_exit_no_heap;
 	}
-#endif /* _WIN32 */
 
 	/* Check existing index definitions for too-long column
 	prefixes as well, in case max_col_len shrunk. */
@@ -3532,11 +3523,12 @@
 				continue;
 			}
 
-			for (dict_foreign_t* foreign = UT_LIST_GET_FIRST(
-				     prebuilt->table->foreign_list);
-			     foreign != NULL;
-			     foreign = UT_LIST_GET_NEXT(
-				     foreign_list, foreign)) {
+			for (dict_foreign_set::iterator it
+				= prebuilt->table->foreign_set.begin();
+			     it != prebuilt->table->foreign_set.end();
+			     ++it) {
+
+				dict_foreign_t*	foreign = *it;
 				const char* fid = strchr(foreign->id, '/');
 
 				DBUG_ASSERT(fid);
@@ -4195,7 +4187,6 @@
 	}
 
 	trx_commit_for_mysql(prebuilt->trx);
-	srv_active_wake_master_thread();
 	MONITOR_ATOMIC_DEC(MONITOR_PENDING_ALTER_TABLE);
 	DBUG_RETURN(fail);
 }
@@ -4369,10 +4360,16 @@
 rename_foreign:
 	trx->op_info = "renaming column in SYS_FOREIGN_COLS";
 
-	for (const dict_foreign_t* foreign = UT_LIST_GET_FIRST(
-		     user_table->foreign_list);
-	     foreign != NULL;
-	     foreign = UT_LIST_GET_NEXT(foreign_list, foreign)) {
+	std::list<dict_foreign_t*>	fk_evict;
+	bool		foreign_modified;
+
+	for (dict_foreign_set::iterator it = user_table->foreign_set.begin();
+	     it != user_table->foreign_set.end();
+	     ++it) {
+
+		dict_foreign_t*	foreign = *it;
+		foreign_modified = false;
+
 		for (unsigned i = 0; i < foreign->n_fields; i++) {
 			if (strcmp(foreign->foreign_col_names[i], from)) {
 				continue;
@@ -4399,13 +4396,22 @@
 			if (error != DB_SUCCESS) {
 				goto err_exit;
 			}
+			foreign_modified = true;
+		}
+
+		if (foreign_modified) {
+			fk_evict.push_back(foreign);
 		}
 	}
 
-	for (const dict_foreign_t* foreign = UT_LIST_GET_FIRST(
-		     user_table->referenced_list);
-	     foreign != NULL;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
+	for (dict_foreign_set::iterator it
+		= user_table->referenced_set.begin();
+	     it != user_table->referenced_set.end();
+	     ++it) {
+
+		foreign_modified = false;
+		dict_foreign_t*	foreign = *it;
+
 		for (unsigned i = 0; i < foreign->n_fields; i++) {
 			if (strcmp(foreign->referenced_col_names[i], from)) {
 				continue;
@@ -4432,9 +4438,19 @@
 			if (error != DB_SUCCESS) {
 				goto err_exit;
 			}
+			foreign_modified = true;
+		}
+
+		if (foreign_modified) {
+			fk_evict.push_back(foreign);
 		}
 	}
 
+	if (new_clustered) {
+		std::for_each(fk_evict.begin(), fk_evict.end(),
+			      dict_foreign_remove_from_cache);
+	}
+
 	trx->op_info = "";
 	DBUG_RETURN(false);
 }
@@ -4704,14 +4720,17 @@
 /** Update the foreign key constraint definitions in the data dictionary cache
 after the changes to data dictionary tables were committed.
 @param ctx	In-place ALTER TABLE context
+@param user_thd	MySQL connection
 @return		InnoDB error code (should always be DB_SUCCESS) */
 static __attribute__((nonnull, warn_unused_result))
 dberr_t
 innobase_update_foreign_cache(
 /*==========================*/
-	ha_innobase_inplace_ctx*	ctx)
+	ha_innobase_inplace_ctx*	ctx,
+	THD*				user_thd)
 {
 	dict_table_t*	user_table;
+	dberr_t		err = DB_SUCCESS;
 
 	DBUG_ENTER("innobase_update_foreign_cache");
 
@@ -4729,8 +4748,8 @@
 		column names. No need to pass col_names or to drop
 		constraints from the data dictionary cache. */
 		DBUG_ASSERT(!ctx->col_names);
-		DBUG_ASSERT(UT_LIST_GET_LEN(user_table->foreign_list) == 0);
-		DBUG_ASSERT(UT_LIST_GET_LEN(user_table->referenced_list) == 0);
+		DBUG_ASSERT(user_table->foreign_set.empty());
+		DBUG_ASSERT(user_table->referenced_set.empty());
 		user_table = ctx->new_table;
 	} else {
 		/* Drop the foreign key constraints if the
@@ -4746,9 +4765,34 @@
 	/* Load the old or added foreign keys from the data dictionary
 	and prevent the table from being evicted from the data
 	dictionary cache (work around the lack of WL#6049). */
-	DBUG_RETURN(dict_load_foreigns(user_table->name,
-				       ctx->col_names, false, true,
-				       DICT_ERR_IGNORE_NONE));
+	err = dict_load_foreigns(user_table->name,
+				 ctx->col_names, false, true,
+				 DICT_ERR_IGNORE_NONE);
+
+	if (err == DB_CANNOT_ADD_CONSTRAINT) {
+		/* It is possible there are existing foreign key are
+		loaded with "foreign_key checks" off,
+		so let's retry the loading with charset_check is off */
+		err = dict_load_foreigns(user_table->name,
+					 ctx->col_names, false, false,
+					 DICT_ERR_IGNORE_NONE);
+
+		/* The load with "charset_check" off is successful, warn
+		the user that the foreign key has loaded with mis-matched
+		charset */
+		if (err == DB_SUCCESS) {
+			push_warning_printf(
+				user_thd,
+				Sql_condition::WARN_LEVEL_WARN,
+				ER_ALTER_INFO,
+				"Foreign key constraints for table '%s'"
+				" are loaded with charset check off",
+				user_table->name);
+				
+		}
+	}
+
+	DBUG_RETURN(err);
 }
 
 /** Commit the changes made during prepare_inplace_alter_table()
@@ -5626,12 +5670,12 @@
 			/* Rename the tablespace files. */
 			commit_cache_rebuild(ctx);
 
-			error = innobase_update_foreign_cache(ctx);
+			error = innobase_update_foreign_cache(ctx, user_thd);
 			if (error != DB_SUCCESS) {
 				goto foreign_fail;
 			}
 		} else {
-			error = innobase_update_foreign_cache(ctx);
+			error = innobase_update_foreign_cache(ctx, user_thd);
 
 			if (error != DB_SUCCESS) {
 foreign_fail:
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/handler/i_s.cc percona-xtrabackup-2.3.7/storage/innobase/handler/i_s.cc
--- percona-xtrabackup-2.2.3/storage/innobase/handler/i_s.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/handler/i_s.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2015, 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
@@ -2913,7 +2913,7 @@
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_stopword_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -3085,7 +3085,7 @@
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_doc_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -3172,7 +3172,7 @@
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_doc_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -3312,8 +3312,6 @@
 	for (rbt_node = rbt_first(index_cache->words);
 	     rbt_node;
 	     rbt_node = rbt_next(index_cache->words, rbt_node)) {
-		doc_id_t	doc_id = 0;
-
 		fts_tokenizer_word_t* word;
 
 		word = rbt_value(fts_tokenizer_word_t, rbt_node);
@@ -3339,6 +3337,7 @@
 			fts_node_t*	node;
 			byte*		ptr;
 			ulint		decoded = 0;
+			doc_id_t	doc_id = 0;
 
 			node = static_cast<fts_node_t*> (ib_vector_get(
 				word->nodes, i));
@@ -3466,7 +3465,7 @@
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_index_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -3905,7 +3904,7 @@
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_index_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -4020,10 +4019,14 @@
 
 	if (!user_table) {
 		DBUG_RETURN(0);
+	} else if (!dict_table_has_fts_index(user_table)) {
+		dict_table_close(user_table, FALSE, FALSE);
+
+		DBUG_RETURN(0);
 	}
 
 	trx = trx_allocate_for_background();
-	trx->op_info = "Select for FTS DELETE TABLE";
+	trx->op_info = "Select for FTS CONFIG TABLE";
 
 	FTS_INIT_FTS_TABLE(&fts_table, "CONFIG", FTS_COMMON_TABLE, user_table);
 
@@ -4103,7 +4106,7 @@
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_config_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/ibuf/ibuf0ibuf.cc percona-xtrabackup-2.3.7/storage/innobase/ibuf/ibuf0ibuf.cc
--- percona-xtrabackup-2.2.3/storage/innobase/ibuf/ibuf0ibuf.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/ibuf/ibuf0ibuf.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2014, 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
@@ -3885,7 +3885,7 @@
 	{
 		buf_page_t*	bpage;
 		buf_pool_t*	buf_pool = buf_pool_get(space, page_no);
-		bpage = buf_page_hash_get(buf_pool, space, page_no);
+		bpage = buf_page_get_also_watch(buf_pool, space, page_no);
 
 		if (UNIV_LIKELY_NULL(bpage)) {
 			/* A buffer pool watch has been set or the
@@ -4614,7 +4614,7 @@
 		function. When the counter is > 0, that prevents tablespace
 		from being dropped. */
 
-		tablespace_being_deleted = fil_inc_pending_ops(space);
+		tablespace_being_deleted = fil_inc_pending_ops(space, true);
 
 		if (UNIV_UNLIKELY(tablespace_being_deleted)) {
 			/* Do not try to read the bitmap page from space;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/btr0btr.h percona-xtrabackup-2.3.7/storage/innobase/include/btr0btr.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/btr0btr.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/btr0btr.h	2017-02-27 07:47:02.000000000 +0000
@@ -306,7 +306,7 @@
 btr_page_get_index_id(
 /*==================*/
 	const page_t*	page)	/*!< in: index page */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 #ifndef UNIV_HOTBACKUP
 /********************************************************//**
 Gets the node level field in an index page.
@@ -316,7 +316,7 @@
 btr_page_get_level_low(
 /*===================*/
 	const page_t*	page)	/*!< in: index page */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 #define btr_page_get_level(page, mtr) btr_page_get_level_low(page)
 /********************************************************//**
 Gets the next index page number.
@@ -327,7 +327,7 @@
 /*==============*/
 	const page_t*	page,	/*!< in: index page */
 	mtr_t*		mtr)	/*!< in: mini-transaction handle */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /********************************************************//**
 Gets the previous index page number.
 @return	prev page number */
@@ -337,7 +337,7 @@
 /*==============*/
 	const page_t*	page,	/*!< in: index page */
 	mtr_t*		mtr)	/*!< in: mini-transaction handle */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*************************************************************//**
 Gets pointer to the previous user record in the tree. It is assumed
 that the caller has appropriate latches on the page and its neighbor.
@@ -386,7 +386,7 @@
 /*===========================*/
 	const rec_t*	rec,	/*!< in: node pointer record */
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /************************************************************//**
 Creates the root node for a new index tree.
 @return	page number of the created root, FIL_NULL if did not succeed */
@@ -656,7 +656,7 @@
 	bool		compressed,/*!< in: true if compressed page */
 	buf_block_t*	block,	/*!< in: page to be reorganized, or NULL */
 	mtr_t*		mtr)	/*!< in: mtr or NULL */
-	__attribute__((nonnull(1,2,3), warn_unused_result));
+	__attribute__((warn_unused_result));
 #ifndef UNIV_HOTBACKUP
 /**************************************************************//**
 Gets the number of pages in a B-tree.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/btr0btr.ic percona-xtrabackup-2.3.7/storage/innobase/include/btr0btr.ic
--- percona-xtrabackup-2.2.3/storage/innobase/include/btr0btr.ic	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/btr0btr.ic	2017-02-27 07:47:02.000000000 +0000
@@ -162,7 +162,8 @@
 	mtr_t*		mtr __attribute__((unused)))
 				/*!< in: mini-transaction handle */
 {
-	ut_ad(page && mtr);
+	ut_ad(page != NULL);
+	ut_ad(mtr != NULL);
 	ut_ad(mtr_memo_contains_page(mtr, page, MTR_MEMO_PAGE_X_FIX)
 	      || mtr_memo_contains_page(mtr, page, MTR_MEMO_PAGE_S_FIX));
 
@@ -181,7 +182,8 @@
 	ulint		next,	/*!< in: next page number */
 	mtr_t*		mtr)	/*!< in: mini-transaction handle */
 {
-	ut_ad(page && mtr);
+	ut_ad(page != NULL);
+	ut_ad(mtr != NULL);
 
 	if (page_zip) {
 		mach_write_to_4(page + FIL_PAGE_NEXT, next);
@@ -201,7 +203,8 @@
 	const page_t*	page,	/*!< in: index page */
 	mtr_t*	mtr __attribute__((unused))) /*!< in: mini-transaction handle */
 {
-	ut_ad(page && mtr);
+	ut_ad(page != NULL);
+	ut_ad(mtr != NULL);
 
 	return(mach_read_from_4(page + FIL_PAGE_PREV));
 }
@@ -218,7 +221,8 @@
 	ulint		prev,	/*!< in: previous page number */
 	mtr_t*		mtr)	/*!< in: mini-transaction handle */
 {
-	ut_ad(page && mtr);
+	ut_ad(page != NULL);
+	ut_ad(mtr != NULL);
 
 	if (page_zip) {
 		mach_write_to_4(page + FIL_PAGE_PREV, prev);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/btr0cur.h percona-xtrabackup-2.3.7/storage/innobase/include/btr0cur.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/btr0cur.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/btr0cur.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2014, 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
@@ -576,6 +576,17 @@
 btr_estimate_number_of_different_key_vals(
 /*======================================*/
 	dict_index_t*	index);	/*!< in: index */
+
+/** Gets the externally stored size of a record, in units of a database page.
+@param[in]	rec	record
+@param[in]	offsets	array returned by rec_get_offsets()
+@return externally stored part, in units of a database page */
+
+ulint
+btr_rec_get_externally_stored_len(
+	const rec_t*	rec,
+	const ulint*	offsets);
+
 /*******************************************************************//**
 Marks non-updated off-page fields as disowned by this record. The ownership
 must be transferred to the updated record which is inserted elsewhere in the
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/btr0cur.ic percona-xtrabackup-2.3.7/storage/innobase/include/btr0cur.ic
--- percona-xtrabackup-2.2.3/storage/innobase/include/btr0cur.ic	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/btr0cur.ic	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2014, 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
@@ -28,7 +28,7 @@
 
 #ifdef UNIV_DEBUG
 # define LIMIT_OPTIMISTIC_INSERT_DEBUG(NREC, CODE)\
-if (btr_cur_limit_optimistic_insert_debug\
+if (btr_cur_limit_optimistic_insert_debug > 1\
     && (NREC) >= (ulint)btr_cur_limit_optimistic_insert_debug) {\
         CODE;\
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/buf0buf.h percona-xtrabackup-2.3.7/storage/innobase/include/buf0buf.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/buf0buf.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/buf0buf.h	2017-02-27 07:47:02.000000000 +0000
@@ -447,7 +447,7 @@
 	mtr_t*	mtr);	/*!< in: mini-transaction handle */
 #else /* !UNIV_HOTBACKUP */
 /********************************************************************//**
-Inits a page to the buffer buf_pool, for use in ibbackup --restore. */
+Inits a page to the buffer buf_pool, for use in mysqlbackup --restore. */
 UNIV_INTERN
 void
 buf_page_init_for_backup_restore(
@@ -534,7 +534,7 @@
 buf_page_get_freed_page_clock(
 /*==========================*/
 	const buf_page_t*	bpage)	/*!< in: block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 /********************************************************************//**
 Reads the freed_page_clock of a buffer block.
 @return	freed_page_clock */
@@ -543,7 +543,7 @@
 buf_block_get_freed_page_clock(
 /*===========================*/
 	const buf_block_t*	block)	/*!< in: block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 
 /********************************************************************//**
 Tells if a block is still close enough to the MRU end of the LRU list
@@ -682,7 +682,7 @@
 buf_block_get_lock_hash_val(
 /*========================*/
 	const buf_block_t*	block)	/*!< in: block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 #ifdef UNIV_DEBUG
 /*********************************************************************//**
 Finds a block in the buffer pool that points to a
@@ -870,7 +870,7 @@
 buf_block_get_state(
 /*================*/
 	const buf_block_t*	block)	/*!< in: pointer to the control block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Sets the state of a block. */
 UNIV_INLINE
@@ -895,7 +895,7 @@
 buf_page_in_file(
 /*=============*/
 	const buf_page_t*	bpage)	/*!< in: pointer to control block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 #ifndef UNIV_HOTBACKUP
 /*********************************************************************//**
 Determines if a block should be on unzip_LRU list.
@@ -905,7 +905,7 @@
 buf_page_belongs_to_unzip_LRU(
 /*==========================*/
 	const buf_page_t*	bpage)	/*!< in: pointer to control block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 
 /*********************************************************************//**
 Gets the mutex of a block.
@@ -915,7 +915,7 @@
 buf_page_get_mutex(
 /*===============*/
 	const buf_page_t*	bpage)	/*!< in: pointer to control block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 
 /*********************************************************************//**
 Get the flush type of a page.
@@ -925,7 +925,7 @@
 buf_page_get_flush_type(
 /*====================*/
 	const buf_page_t*	bpage)	/*!< in: buffer page */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Set the flush type of a page. */
 UNIV_INLINE
@@ -951,7 +951,7 @@
 buf_page_get_io_fix(
 /*================*/
 	const buf_page_t*	bpage)	/*!< in: pointer to the control block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Gets the io_fix state of a block.
 @return	io_fix state */
@@ -960,7 +960,7 @@
 buf_block_get_io_fix(
 /*================*/
 	const buf_block_t*	block)	/*!< in: pointer to the control block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Sets the io_fix state of a block. */
 UNIV_INLINE
@@ -1006,7 +1006,7 @@
 buf_page_can_relocate(
 /*==================*/
 	const buf_page_t*	bpage)	/*!< control block being relocated */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 
 /*********************************************************************//**
 Determine if a block has been flagged old.
@@ -1016,7 +1016,7 @@
 buf_page_is_old(
 /*============*/
 	const buf_page_t*	bpage)	/*!< in: control block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Flag a block old. */
 UNIV_INLINE
@@ -1033,7 +1033,7 @@
 buf_page_is_accessed(
 /*=================*/
 	const buf_page_t*	bpage)	/*!< in: control block */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Flag a block accessed. */
 UNIV_INLINE
@@ -1045,14 +1045,14 @@
 /*********************************************************************//**
 Gets the buf_block_t handle of a buffered file block if an uncompressed
 page frame exists, or NULL. Note: even though bpage is not declared a
-const we don't update its value. It is safe to make this pure.
+const we don't update its value.
 @return	control block, or NULL */
 UNIV_INLINE
 buf_block_t*
 buf_page_get_block(
 /*===============*/
 	buf_page_t*	bpage)	/*!< in: control block, or NULL */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 #endif /* !UNIV_HOTBACKUP */
 #ifdef UNIV_DEBUG
 /*********************************************************************//**
@@ -1063,7 +1063,7 @@
 buf_block_get_frame(
 /*================*/
 	const buf_block_t*	block)	/*!< in: pointer to the control block */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 #else /* UNIV_DEBUG */
 # define buf_block_get_frame(block) (block)->frame
 #endif /* UNIV_DEBUG */
@@ -1218,7 +1218,7 @@
 buf_pool_index(
 /*===========*/
 	const buf_pool_t*	buf_pool)	/*!< in: buffer pool */
-	__attribute__((nonnull, const));
+	__attribute__((warn_unused_result));
 /******************************************************************//**
 Returns the buffer pool instance given a page instance
 @return buf_pool */
@@ -1271,7 +1271,7 @@
 mode value is ignored. It is up to the caller to release the
 lock. If the block is found and the lock is NULL then the page_hash
 lock is released by this function.
-@return	block, NULL if not found */
+@return	block, NULL if not found, or watch sentinel (if watch is true) */
 UNIV_INLINE
 buf_page_t*
 buf_page_hash_get_locked(
@@ -1287,9 +1287,11 @@
 					found. NULL otherwise. If NULL
 					is passed then the hash_lock
 					is released by this function */
-	ulint		lock_mode);	/*!< in: RW_LOCK_EX or
+	ulint		lock_mode,	/*!< in: RW_LOCK_EX or
 					RW_LOCK_SHARED. Ignored if
 					lock == NULL */
+	bool		watch = false);	/*!< in: if true, return watch
+					sentinel also. */
 /******************************************************************//**
 Returns the control block of a file page, NULL if not found.
 If the block is found and lock is not NULL then the appropriate
@@ -1329,6 +1331,8 @@
 	buf_page_hash_get_locked(b, s, o, l, RW_LOCK_EX)
 #define buf_page_hash_get(b, s, o)				\
 	buf_page_hash_get_locked(b, s, o, NULL, 0)
+#define buf_page_get_also_watch(b, s, o)			\
+	buf_page_hash_get_locked(b, s, o, NULL, 0, true)
 
 #define buf_block_hash_get_s_locked(b, s, o, l)			\
 	buf_block_hash_get_locked(b, s, o, l, RW_LOCK_SHARED)
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/buf0buf.ic percona-xtrabackup-2.3.7/storage/innobase/include/buf0buf.ic
--- percona-xtrabackup-2.2.3/storage/innobase/include/buf0buf.ic	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/buf0buf.ic	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -1160,12 +1160,6 @@
 		ut_a(buf_page_in_file(bpage));
 		ut_ad(bpage->in_page_hash);
 		ut_ad(!bpage->in_zip_hash);
-#if UNIV_WORD_SIZE == 4
-		/* On 32-bit systems, there is no padding in
-		buf_page_t.  On other systems, Valgrind could complain
-		about uninitialized pad bytes. */
-		UNIV_MEM_ASSERT_RW(bpage, sizeof *bpage);
-#endif
 	}
 
 	return(bpage);
@@ -1178,7 +1172,7 @@
 mode value is ignored. It is up to the caller to release the
 lock. If the block is found and the lock is NULL then the page_hash
 lock is released by this function.
-@return	block, NULL if not found */
+@return	block, NULL if not found, or watch sentinel (if watch is true) */
 UNIV_INLINE
 buf_page_t*
 buf_page_hash_get_locked(
@@ -1194,9 +1188,11 @@
 					found. NULL otherwise. If NULL
 					is passed then the hash_lock
 					is released by this function */
-	ulint		lock_mode)	/*!< in: RW_LOCK_EX or
+	ulint		lock_mode,	/*!< in: RW_LOCK_EX or
 					RW_LOCK_SHARED. Ignored if
 					lock == NULL */
+	bool		watch)		/*!< in: if true, return watch
+					sentinel also. */
 {
 	buf_page_t*	bpage = NULL;
 	ulint		fold;
@@ -1227,7 +1223,9 @@
 	bpage = buf_page_hash_get_low(buf_pool, space, offset, fold);
 
 	if (!bpage || buf_pool_watch_is_sentinel(buf_pool, bpage)) {
-		bpage = NULL;
+		if (!watch) {
+			bpage = NULL;
+		}
 		goto unlock_and_exit;
 	}
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/data0data.h percona-xtrabackup-2.3.7/storage/innobase/include/data0data.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/data0data.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/data0data.h	2017-02-27 07:47:02.000000000 +0000
@@ -67,8 +67,7 @@
 dfield_set_type(
 /*============*/
 	dfield_t*	field,	/*!< in: SQL data field */
-	const dtype_t*	type)	/*!< in: pointer to data type struct */
-	__attribute__((nonnull));
+	const dtype_t*	type);	/*!< in: pointer to data type struct */
 /*********************************************************************//**
 Gets length of field data.
 @return	length of data; UNIV_SQL_NULL if SQL null data */
@@ -147,8 +146,7 @@
 dfield_copy_data(
 /*=============*/
 	dfield_t*	field1,	/*!< out: field to copy to */
-	const dfield_t*	field2)	/*!< in: field to copy from */
-	__attribute__((nonnull));
+	const dfield_t*	field2);/*!< in: field to copy from */
 /*********************************************************************//**
 Copies a data field to another. */
 UNIV_INLINE
@@ -272,7 +270,7 @@
 	void*	buf,		/*!< in, out: buffer to use */
 	ulint	buf_size,	/*!< in: buffer size */
 	ulint	n_fields)	/*!< in: number of fields */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /**********************************************************//**
 Creates a data tuple to a memory heap. The default value for number
@@ -340,7 +338,7 @@
 /*============*/
 	const dtuple_t*	tuple1,	/*!< in: tuple 1 */
 	const dtuple_t*	tuple2)	/*!< in: tuple 2 */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /************************************************************//**
 Folds a prefix given as the number of fields of a tuple.
 @return	the folded value */
@@ -353,7 +351,7 @@
 	ulint		n_bytes,/*!< in: number of bytes to fold in an
 				incomplete last field */
 	index_id_t	tree_id)/*!< in: index tree id */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*******************************************************************//**
 Sets types of fields binary in a tuple. */
 UNIV_INLINE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/data0data.ic percona-xtrabackup-2.3.7/storage/innobase/include/data0data.ic
--- percona-xtrabackup-2.2.3/storage/innobase/include/data0data.ic	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/data0data.ic	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2016, 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
@@ -56,7 +56,8 @@
 	dfield_t*	field,	/*!< in: SQL data field */
 	const dtype_t*	type)	/*!< in: pointer to data type struct */
 {
-	ut_ad(field && type);
+	ut_ad(field != NULL);
+	ut_ad(type != NULL);
 
 	field->type = *type;
 }
@@ -194,7 +195,8 @@
 	dfield_t*	field1,	/*!< out: field to copy to */
 	const dfield_t*	field2)	/*!< in: field to copy from */
 {
-	ut_ad(field1 && field2);
+	ut_ad(field1 != NULL);
+	ut_ad(field2 != NULL);
 
 	field1->data = field2->data;
 	field1->len = field2->len;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/db0err.h percona-xtrabackup-2.3.7/storage/innobase/include/db0err.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/db0err.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/db0err.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -130,7 +130,8 @@
 	DB_TEMP_FILE_WRITE_FAILURE,	/*!< Temp file write failure */
 	DB_FTS_TOO_MANY_WORDS_IN_PHRASE,
 					/*< Too many words in a phrase */
-
+	DB_TOO_BIG_FOR_REDO,		/* Record length greater than 10%
+					of redo log */
 	/* The following are partial failure codes */
 	DB_FAIL = 1000,
 	DB_OVERFLOW,
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/dict0crea.h percona-xtrabackup-2.3.7/storage/innobase/include/dict0crea.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/dict0crea.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/dict0crea.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -124,28 +124,24 @@
 	const char*	name,	/*!< in: table name */
 	dict_foreign_t*	foreign)/*!< in/out: foreign key */
 	__attribute__((nonnull));
-/********************************************************************//**
-Adds foreign key definitions to data dictionary tables in the database. We
-look at table->foreign_list, and also generate names to constraints that were
-not named by the user. A generated constraint has a name of the format
-databasename/tablename_ibfk_NUMBER, where the numbers start from 1, and are
-given locally for this table, that is, the number is not global, as in the
-old format constraints < 4.0.18 it used to be.
-@return	error code or DB_SUCCESS */
+
+/** Adds the given set of foreign key objects to the dictionary tables
+in the database. This function does not modify the dictionary cache. The
+caller must ensure that all foreign key objects contain a valid constraint
+name in foreign->id.
+@param[in]	local_fk_set	set of foreign key objects, to be added to
+the dictionary tables
+@param[in]	table		table to which the foreign key objects in
+local_fk_set belong to
+@param[in,out]	trx		transaction
+@return error code or DB_SUCCESS */
 UNIV_INTERN
 dberr_t
 dict_create_add_foreigns_to_dictionary(
 /*===================================*/
-	ulint		start_id,/*!< in: if we are actually doing ALTER TABLE
-				ADD CONSTRAINT, we want to generate constraint
-				numbers which are bigger than in the table so
-				far; we number the constraints from
-				start_id + 1 up; start_id should be set to 0 if
-				we are creating a new table, or if the table
-				so far has no constraints for which the name
-				was generated here */
-	dict_table_t*	table,	/*!< in: table */
-	trx_t*		trx)	/*!< in: transaction */
+	const dict_foreign_set&	local_fk_set,
+	const dict_table_t*	table,
+	trx_t*			trx)
 	__attribute__((nonnull, warn_unused_result));
 /****************************************************************//**
 Creates the tablespaces and datafiles system tables inside InnoDB
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/dict0dict.h percona-xtrabackup-2.3.7/storage/innobase/include/dict0dict.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/dict0dict.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/dict0dict.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -82,7 +82,7 @@
 	mem_heap_t*	heap);		/*!< in: heap memory */
 /*********************************************************************//**
 Frees a foreign key struct. */
-UNIV_INTERN
+
 void
 dict_foreign_free(
 /*==============*/
@@ -196,8 +196,7 @@
 dict_col_copy_type(
 /*===============*/
 	const dict_col_t*	col,	/*!< in: column */
-	dtype_t*		type)	/*!< out: data type */
-	__attribute__((nonnull));
+	dtype_t*		type);	/*!< out: data type */
 /**********************************************************************//**
 Determine bytes of column prefix to be stored in the undo log. Please
 note if the table format is UNIV_FORMAT_A (< UNIV_FORMAT_B), no prefix
@@ -440,7 +439,7 @@
 /*=================================*/
 	dict_table_t*	table,	/*!< in: InnoDB table */
 	dict_index_t*	index)	/*!< in: InnoDB index */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Checks if a table is referenced by foreign keys.
 @return	TRUE if table is referenced by a foreign key */
@@ -487,7 +486,7 @@
 /*==============================*/
 	dict_table_t*	table,	/*!< in: InnoDB table */
 	dict_index_t*	index)	/*!< in: InnoDB index */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Scans a table create SQL string and adds to the data dictionary
 the foreign key constraints declared in the string. This function
@@ -722,7 +721,7 @@
 dict_index_is_clust(
 /*================*/
 	const dict_index_t*	index)	/*!< in: index */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /********************************************************************//**
 Check whether the index is unique.
 @return	nonzero for unique index, zero for other indexes */
@@ -731,7 +730,7 @@
 dict_index_is_unique(
 /*=================*/
 	const dict_index_t*	index)	/*!< in: index */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /********************************************************************//**
 Check whether the index is the insert buffer tree.
 @return	nonzero for insert buffer, zero for other indexes */
@@ -740,7 +739,7 @@
 dict_index_is_ibuf(
 /*===============*/
 	const dict_index_t*	index)	/*!< in: index */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /********************************************************************//**
 Check whether the index is a secondary index or the insert buffer tree.
 @return	nonzero for insert buffer, zero for other indexes */
@@ -749,7 +748,7 @@
 dict_index_is_sec_or_ibuf(
 /*======================*/
 	const dict_index_t*	index)	/*!< in: index */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /************************************************************************
 Gets the all the FTS indexes for the table. NOTE: must not be called for
@@ -771,7 +770,7 @@
 dict_table_get_n_user_cols(
 /*=======================*/
 	const dict_table_t*	table)	/*!< in: table */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /********************************************************************//**
 Gets the number of system columns in a table in the dictionary cache.
 @return	number of system (e.g., ROW_ID) columns of a table */
@@ -780,7 +779,7 @@
 dict_table_get_n_sys_cols(
 /*======================*/
 	const dict_table_t*	table)	/*!< in: table */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /********************************************************************//**
 Gets the number of all columns (also system) in a table in the dictionary
 cache.
@@ -790,7 +789,7 @@
 dict_table_get_n_cols(
 /*==================*/
 	const dict_table_t*	table)	/*!< in: table */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /********************************************************************//**
 Gets the approximately estimated number of rows in the table.
 @return	estimated number of rows */
@@ -799,7 +798,7 @@
 dict_table_get_n_rows(
 /*==================*/
 	const dict_table_t*	table)	/*!< in: table */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /********************************************************************//**
 Increment the number of rows in the table by one.
 Notice that this operation is not protected by any latch, the number is
@@ -1435,6 +1434,28 @@
 void
 dict_mutex_exit_for_mysql(void);
 /*===========================*/
+
+/** Create a dict_table_t's stats latch or delay for lazy creation.
+This function is only called from either single threaded environment
+or from a thread that has not shared the table object with other threads.
+@param[in,out]	table	table whose stats latch to create
+@param[in]	enabled	if false then the latch is disabled
+and dict_table_stats_lock()/unlock() become noop on this table. */
+
+void
+dict_table_stats_latch_create(
+	dict_table_t*	table,
+	bool		enabled);
+
+/** Destroy a dict_table_t's stats latch.
+This function is only called from either single threaded environment
+or from a thread that has not shared the table object with other threads.
+@param[in,out]	table	table whose stats latch to destroy */
+
+void
+dict_table_stats_latch_destroy(
+	dict_table_t*	table);
+
 /**********************************************************************//**
 Lock the appropriate latch to protect a given table's statistics.
 table->id is used to pick the corresponding latch from a global array of
@@ -1718,8 +1739,7 @@
 dict_set_corrupted_index_cache_only(
 /*================================*/
 	dict_index_t*	index,		/*!< in/out: index */
-	dict_table_t*	table)		/*!< in/out: table */
-	__attribute__((nonnull));
+	dict_table_t*	table);		/*!< in/out: table */
 
 /**********************************************************************//**
 Flags a table with specified space_id corrupted in the table dictionary
@@ -1749,7 +1769,7 @@
 dict_table_is_discarded(
 /*====================*/
 	const dict_table_t*	table)	/*!< in: table to check */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /********************************************************************//**
 Check if it is a temporary table.
@@ -1759,7 +1779,7 @@
 dict_table_is_temporary(
 /*====================*/
 	const dict_table_t*	table)	/*!< in: table to check */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 #ifndef UNIV_HOTBACKUP
 /*********************************************************************//**
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/dict0dict.ic percona-xtrabackup-2.3.7/storage/innobase/include/dict0dict.ic
--- percona-xtrabackup-2.2.3/storage/innobase/include/dict0dict.ic	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/dict0dict.ic	2017-02-27 07:47:02.000000000 +0000
@@ -80,7 +80,8 @@
 	const dict_col_t*	col,	/*!< in: column */
 	dtype_t*		type)	/*!< out: data type */
 {
-	ut_ad(col && type);
+	ut_ad(col != NULL);
+	ut_ad(type != NULL);
 
 	type->mtype = col->mtype;
 	type->prtype = col->prtype;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/dict0mem.h percona-xtrabackup-2.3.7/storage/innobase/include/dict0mem.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/dict0mem.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/dict0mem.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -46,6 +46,10 @@
 #include "hash0hash.h"
 #include "trx0types.h"
 #include "fts0fts.h"
+#include "os0once.h"
+#include <set>
+#include <algorithm>
+#include <iterator>
 
 /* Forward declaration. */
 struct ib_rbt_t;
@@ -146,19 +150,19 @@
 
 /** Bit mask of the COMPACT field */
 #define DICT_TF_MASK_COMPACT				\
-		((~(~0 << DICT_TF_WIDTH_COMPACT))	\
+		((~(~0U << DICT_TF_WIDTH_COMPACT))	\
 		<< DICT_TF_POS_COMPACT)
 /** Bit mask of the ZIP_SSIZE field */
 #define DICT_TF_MASK_ZIP_SSIZE				\
-		((~(~0 << DICT_TF_WIDTH_ZIP_SSIZE))	\
+		((~(~0U << DICT_TF_WIDTH_ZIP_SSIZE))	\
 		<< DICT_TF_POS_ZIP_SSIZE)
 /** Bit mask of the ATOMIC_BLOBS field */
 #define DICT_TF_MASK_ATOMIC_BLOBS			\
-		((~(~0 << DICT_TF_WIDTH_ATOMIC_BLOBS))	\
+		((~(~0U << DICT_TF_WIDTH_ATOMIC_BLOBS))	\
 		<< DICT_TF_POS_ATOMIC_BLOBS)
 /** Bit mask of the DATA_DIR field */
 #define DICT_TF_MASK_DATA_DIR				\
-		((~(~0 << DICT_TF_WIDTH_DATA_DIR))	\
+		((~(~0U << DICT_TF_WIDTH_DATA_DIR))	\
 		<< DICT_TF_POS_DATA_DIR)
 
 /** Return the value of the COMPACT field */
@@ -192,7 +196,7 @@
 /* @{ */
 /** Total number of bits in table->flags2. */
 #define DICT_TF2_BITS			7
-#define DICT_TF2_BIT_MASK		~(~0 << DICT_TF2_BITS)
+#define DICT_TF2_BIT_MASK		~(~0U << DICT_TF2_BITS)
 
 /** TEMPORARY; TRUE for tables from CREATE TEMPORARY TABLE. */
 #define DICT_TF2_TEMPORARY		1
@@ -381,16 +385,29 @@
 	dict_foreign_t*	foreign,	/*!< in/out: foreign struct */
 	ibool		do_alloc);	/*!< in: is an alloc needed */
 
-/*******************************************************************//**
-Create a temporary tablename.
-@return temporary tablename suitable for InnoDB use */
-UNIV_INTERN __attribute__((nonnull, warn_unused_result))
+/** Create a temporary tablename like "#sql-ibtid-inc where
+  tid = the Table ID
+  inc = a randomly initialized number that is incremented for each file
+The table ID is a 64 bit integer, can use up to 20 digits, and is
+initialized at bootstrap. The second number is 32 bits, can use up to 10
+digits, and is initialized at startup to a randomly distributed number.
+It is hoped that the combination of these two numbers will provide a
+reasonably unique temporary file name.
+@param[in]	heap	A memory heap
+@param[in]	dbtab	Table name in the form database/table name
+@param[in]	id	Table id
+@return A unique temporary tablename suitable for InnoDB use */
+UNIV_INTERN
 char*
 dict_mem_create_temporary_tablename(
-/*================================*/
-	mem_heap_t*	heap,	/*!< in: memory heap */
-	const char*	dbtab,	/*!< in: database/table name */
-	table_id_t	id);	/*!< in: InnoDB table id */
+	mem_heap_t*	heap,
+	const char*	dbtab,
+	table_id_t	id);
+
+/** Initialize dict memory variables */
+
+void
+dict_mem_init(void);
 
 /** Data structure for a column in a table */
 struct dict_col_t{
@@ -523,11 +540,12 @@
 compression failures */
 extern ulong	zip_pad_max;
 
-/** Data structure to hold information about about how much space in
+/** Data structure to hold information about how much space in
 an uncompressed page should be left as padding to avoid compression
 failures. This estimate is based on a self-adapting heuristic. */
 struct zip_pad_info_t {
-	os_fast_mutex_t	mutex;	/*!< mutex protecting the info */
+	os_fast_mutex_t*
+			mutex;	/*!< mutex protecting the info */
 	ulint		pad;	/*!< number of bytes used as pad */
 	ulint		success;/*!< successful compression ops during
 				current round */
@@ -535,6 +553,9 @@
 				current round */
 	ulint		n_rounds;/*!< number of currently successful
 				rounds */
+	volatile os_once::state_t
+			mutex_created;
+				/*!< Creation state of mutex member */
 };
 
 /** Data structure for an index.  Most fields will be
@@ -702,12 +723,156 @@
 					does not generate new indexes
 					implicitly */
 	dict_index_t*	referenced_index;/*!< referenced index */
-	UT_LIST_NODE_T(dict_foreign_t)
-			foreign_list;	/*!< list node for foreign keys of the
-					table */
-	UT_LIST_NODE_T(dict_foreign_t)
-			referenced_list;/*!< list node for referenced
-					keys of the table */
+};
+
+std::ostream&
+operator<< (std::ostream& out, const dict_foreign_t& foreign);
+
+struct dict_foreign_print {
+
+	dict_foreign_print(std::ostream& out)
+		: m_out(out)
+	{}
+
+	void operator()(const dict_foreign_t* foreign) {
+		m_out << *foreign;
+	}
+private:
+	std::ostream&	m_out;
+};
+
+/** Compare two dict_foreign_t objects using their ids. Used in the ordering
+of dict_table_t::foreign_set and dict_table_t::referenced_set.  It returns
+true if the first argument is considered to go before the second in the
+strict weak ordering it defines, and false otherwise. */
+struct dict_foreign_compare {
+
+	bool operator()(
+		const dict_foreign_t*	lhs,
+		const dict_foreign_t*	rhs) const
+	{
+		return(ut_strcmp(lhs->id, rhs->id) < 0);
+	}
+};
+
+/** A function object to find a foreign key with the given index as the
+referenced index. Return the foreign key with matching criteria or NULL */
+struct dict_foreign_with_index {
+
+	dict_foreign_with_index(const dict_index_t*	index)
+	: m_index(index)
+	{}
+
+	bool operator()(const dict_foreign_t*	foreign) const
+	{
+		return(foreign->referenced_index == m_index);
+	}
+
+	const dict_index_t*	m_index;
+};
+
+/* A function object to check if the foreign constraint is between different
+tables.  Returns true if foreign key constraint is between different tables,
+false otherwise. */
+struct dict_foreign_different_tables {
+
+	bool operator()(const dict_foreign_t*	foreign) const
+	{
+		return(foreign->foreign_table != foreign->referenced_table);
+	}
+};
+
+/** A function object to check if the foreign key constraint has the same
+name as given.  If the full name of the foreign key constraint doesn't match,
+then, check if removing the database name from the foreign key constraint
+matches. Return true if it matches, false otherwise. */
+struct dict_foreign_matches_id {
+
+	dict_foreign_matches_id(const char* id)
+		: m_id(id)
+	{}
+
+	bool operator()(const dict_foreign_t*	foreign) const
+	{
+		if (0 == innobase_strcasecmp(foreign->id, m_id)) {
+			return(true);
+		}
+		if (const char* pos = strchr(foreign->id, '/')) {
+			if (0 == innobase_strcasecmp(m_id, pos + 1)) {
+				return(true);
+			}
+		}
+		return(false);
+	}
+
+	const char*	m_id;
+};
+
+typedef std::set<dict_foreign_t*, dict_foreign_compare> dict_foreign_set;
+
+std::ostream&
+operator<< (std::ostream& out, const dict_foreign_set& fk_set);
+
+/** Function object to check if a foreign key object is there
+in the given foreign key set or not.  It returns true if the
+foreign key is not found, false otherwise */
+struct dict_foreign_not_exists {
+	dict_foreign_not_exists(const dict_foreign_set& obj_)
+		: m_foreigns(obj_)
+	{}
+
+	/* Return true if the given foreign key is not found */
+	bool operator()(dict_foreign_t* const & foreign) const {
+		return(m_foreigns.find(foreign) == m_foreigns.end());
+	}
+private:
+	const dict_foreign_set&	m_foreigns;
+};
+
+/** Validate the search order in the foreign key set.
+@param[in]	fk_set	the foreign key set to be validated
+@return true if search order is fine in the set, false otherwise. */
+bool
+dict_foreign_set_validate(
+	const dict_foreign_set&	fk_set);
+
+/** Validate the search order in the foreign key sets of the table
+(foreign_set and referenced_set).
+@param[in]	table	table whose foreign key sets are to be validated
+@return true if foreign key sets are fine, false otherwise. */
+bool
+dict_foreign_set_validate(
+	const dict_table_t&	table);
+
+/*********************************************************************//**
+Frees a foreign key struct. */
+inline
+void
+dict_foreign_free(
+/*==============*/
+	dict_foreign_t*	foreign)	/*!< in, own: foreign key struct */
+{
+	mem_heap_free(foreign->heap);
+}
+
+/** The destructor will free all the foreign key constraints in the set
+by calling dict_foreign_free() on each of the foreign key constraints.
+This is used to free the allocated memory when a local set goes out
+of scope. */
+struct dict_foreign_set_free {
+
+	dict_foreign_set_free(const dict_foreign_set&	foreign_set)
+		: m_foreign_set(foreign_set)
+	{}
+
+	~dict_foreign_set_free()
+	{
+		std::for_each(m_foreign_set.begin(),
+			      m_foreign_set.end(),
+			      dict_foreign_free);
+	}
+
+	const dict_foreign_set&	m_foreign_set;
 };
 
 /** The flags for ON_UPDATE and ON_DELETE can be ORed; the default is that
@@ -729,6 +894,8 @@
 /** Data structure for a database table.  Most fields will be
 initialized to 0, NULL or FALSE in dict_mem_table_create(). */
 struct dict_table_t{
+
+
 	table_id_t	id;	/*!< id of the table */
 	mem_heap_t*	heap;	/*!< memory heap */
 	char*		name;	/*!< table name */
@@ -783,13 +950,16 @@
 	hash_node_t	id_hash; /*!< hash chain node */
 	UT_LIST_BASE_NODE_T(dict_index_t)
 			indexes; /*!< list of indexes of the table */
-	UT_LIST_BASE_NODE_T(dict_foreign_t)
-			foreign_list;/*!< list of foreign key constraints
+
+	dict_foreign_set	foreign_set;
+				/*!< set of foreign key constraints
 				in the table; these refer to columns
 				in other tables */
-	UT_LIST_BASE_NODE_T(dict_foreign_t)
-			referenced_list;/*!< list of foreign key constraints
+
+	dict_foreign_set	referenced_set;
+				/*!< list of foreign key constraints
 				which refer to this table */
+
 	UT_LIST_NODE_T(dict_table_t)
 			table_LRU; /*!< node of the LRU list of tables */
 	unsigned	fk_max_recusive_level:8;
@@ -839,6 +1009,10 @@
 				initialized in dict_table_add_to_cache() */
 				/** Statistics for query optimization */
 				/* @{ */
+
+	volatile os_once::state_t	stats_latch_created;
+				/*!< Creation state of 'stats_latch'. */
+
 	rw_lock_t*	stats_latch; /*!< this latch protects:
 				dict_table_t::stat_initialized
 				dict_table_t::stat_n_rows (*)
@@ -972,9 +1146,14 @@
 				space from the lock heap of the trx:
 				otherwise the lock heap would grow rapidly
 				if we do a large insert from a select */
-	ib_mutex_t		autoinc_mutex;
+	ib_mutex_t*	autoinc_mutex;
 				/*!< mutex protecting the autoincrement
 				counter */
+
+	/** Creation state of autoinc_mutex member */
+	volatile os_once::state_t
+			autoinc_mutex_created;
+
 	ib_uint64_t	autoinc;/*!< autoinc counter value to give to the
 				next inserted row */
 	ulong		n_waiting_or_granted_auto_inc_locks;
@@ -1024,6 +1203,124 @@
 #endif /* UNIV_DEBUG */
 };
 
+/** A function object to add the foreign key constraint to the referenced set
+of the referenced table, if it exists in the dictionary cache. */
+struct dict_foreign_add_to_referenced_table {
+	void operator()(dict_foreign_t*	foreign) const
+	{
+		if (dict_table_t* table = foreign->referenced_table) {
+			std::pair<dict_foreign_set::iterator, bool>	ret
+				= table->referenced_set.insert(foreign);
+			ut_a(ret.second);
+		}
+	}
+};
+
+/** Destroy the autoinc latch of the given table.
+This function is only called from either single threaded environment
+or from a thread that has not shared the table object with other threads.
+@param[in,out]	table	table whose stats latch to destroy */
+inline
+void
+dict_table_autoinc_destroy(
+	dict_table_t*	table)
+{
+	if (table->autoinc_mutex_created == os_once::DONE
+	    && table->autoinc_mutex != NULL) {
+		mutex_free(table->autoinc_mutex);
+		delete table->autoinc_mutex;
+	}
+}
+
+/** Allocate and init the autoinc latch of a given table.
+This function must not be called concurrently on the same table object.
+@param[in,out]	table_void	table whose autoinc latch to create */
+void
+dict_table_autoinc_alloc(
+	void*	table_void);
+
+/** Allocate and init the zip_pad_mutex of a given index.
+This function must not be called concurrently on the same index object.
+@param[in,out]	index_void	index whose zip_pad_mutex to create */
+void
+dict_index_zip_pad_alloc(
+	void*	index_void);
+
+/** Request for lazy creation of the autoinc latch of a given table.
+This function is only called from either single threaded environment
+or from a thread that has not shared the table object with other threads.
+@param[in,out]	table	table whose autoinc latch is to be created. */
+inline
+void
+dict_table_autoinc_create_lazy(
+	dict_table_t*	table)
+{
+#ifdef HAVE_ATOMIC_BUILTINS
+	table->autoinc_mutex = NULL;
+	table->autoinc_mutex_created = os_once::NEVER_DONE;
+#else /* HAVE_ATOMIC_BUILTINS */
+	dict_table_autoinc_alloc(table);
+	table->autoinc_mutex_created = os_once::DONE;
+#endif /* HAVE_ATOMIC_BUILTINS */
+}
+
+/** Request a lazy creation of dict_index_t::zip_pad::mutex.
+This function is only called from either single threaded environment
+or from a thread that has not shared the table object with other threads.
+@param[in,out]	index	index whose zip_pad mutex is to be created */
+inline
+void
+dict_index_zip_pad_mutex_create_lazy(
+	dict_index_t*	index)
+{
+#ifdef HAVE_ATOMIC_BUILTINS
+	index->zip_pad.mutex = NULL;
+	index->zip_pad.mutex_created = os_once::NEVER_DONE;
+#else /* HAVE_ATOMIC_BUILTINS */
+	dict_index_zip_pad_alloc(index);
+	index->zip_pad.mutex_created = os_once::DONE;
+#endif /* HAVE_ATOMIC_BUILTINS */
+}
+
+/** Destroy the zip_pad_mutex of the given index.
+This function is only called from either single threaded environment
+or from a thread that has not shared the table object with other threads.
+@param[in,out]	table	table whose stats latch to destroy */
+inline
+void
+dict_index_zip_pad_mutex_destroy(
+	dict_index_t*	index)
+{
+	if (index->zip_pad.mutex_created == os_once::DONE
+	    && index->zip_pad.mutex != NULL) {
+		os_fast_mutex_free(index->zip_pad.mutex);
+		delete index->zip_pad.mutex;
+	}
+}
+
+/** Release the zip_pad_mutex of a given index.
+@param[in,out]	index	index whose zip_pad_mutex is to be released */
+inline
+void
+dict_index_zip_pad_unlock(
+	dict_index_t*	index)
+{
+	os_fast_mutex_unlock(index->zip_pad.mutex);
+}
+
+#ifdef UNIV_DEBUG
+/** Check if the current thread owns the autoinc_mutex of a given table.
+@param[in]	table	the autoinc_mutex belongs to this table
+@return true, if the current thread owns the autoinc_mutex, false otherwise.*/
+inline
+bool
+dict_table_autoinc_own(
+	const dict_table_t*	table)
+{
+	return(mutex_own(table->autoinc_mutex));
+}
+#endif /* UNIV_DEBUG */
+
 #ifndef UNIV_NONINL
 #include "dict0mem.ic"
 #endif
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/dict0types.h percona-xtrabackup-2.3.7/storage/innobase/include/dict0types.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/dict0types.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/dict0types.h	2017-02-27 07:47:02.000000000 +0000
@@ -78,6 +78,7 @@
 /** Prefix for tmp tables, adopted from sql/table.h */
 #define tmp_file_prefix		"#sql"
 #define tmp_file_prefix_length	4
+#define TEMP_FILE_PREFIX_INNODB	"#sql-ib"
 
 #define TEMP_TABLE_PREFIX                "#sql"
 #define TEMP_TABLE_PATH_PREFIX           "/" TEMP_TABLE_PREFIX
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/fil0fil.h percona-xtrabackup-2.3.7/storage/innobase/include/fil0fil.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/fil0fil.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/fil0fil.h	2017-02-27 07:47:02.000000000 +0000
@@ -42,6 +42,7 @@
 
 #include <list>
 
+extern my_bool lower_case_file_system;
 // Forward declaration
 struct trx_t;
 struct fil_space_t;
@@ -49,7 +50,7 @@
 typedef std::list<const char*> space_name_list_t;
 
 /** When mysqld is run, the default directory "." is the mysqld datadir,
-but in the MySQL Embedded Server Library and ibbackup it is not the default
+but in the MySQL Embedded Server Library and mysqlbackup it is not the default
 directory, and we must set the base file path explicitly */
 extern const char*	fil_path_to_mysql_datadir;
 
@@ -579,7 +580,8 @@
 ibool
 fil_inc_pending_ops(
 /*================*/
-	ulint	id);	/*!< in: space id */
+	ulint	id,		/*!< in: space id */
+	ibool	print_err);	/*!< in: need to print error or not */
 /*******************************************************************//**
 Decrements the count of pending operations. */
 UNIV_INTERN
@@ -598,8 +600,8 @@
 at that path does not exist yet. If the database directory for the file to be
 created does not exist, then we create the directory, too.
 
-Note that ibbackup --apply-log sets fil_path_to_mysql_datadir to point to the
-datadir that we should use in replaying the file operations.
+Note that mysqlbackup --apply-log sets fil_path_to_mysql_datadir to point to
+the datadir that we should use in replaying the file operations.
 @return end of log record, or NULL if the record was not completely
 contained between ptr and end_ptr */
 UNIV_INTERN
@@ -845,6 +847,9 @@
 					information to the .err log if a
 					matching tablespace is not found from
 					memory */
+	bool		remove_from_data_dict_if_does_not_exist,
+					/*!< in: remove from the data dictionary
+					if tablespace does not exist */
 	bool		adjust_space,	/*!< in: whether to adjust space id
 					when find table space mismatch */
 	mem_heap_t*	heap,		/*!< in: heap memory */
@@ -852,9 +857,9 @@
 #else /* !UNIV_HOTBACKUP */
 /********************************************************************//**
 Extends all tablespaces to the size stored in the space header. During the
-ibbackup --apply-log phase we extended the spaces on-demand so that log records
-could be appllied, but that may have left spaces still too small compared to
-the size stored in the space header. */
+mysqlbackup --apply-log phase we extended the spaces on-demand so that log
+records could be appllied, but that may have left spaces still too small
+compared to the size stored in the space header. */
 UNIV_INTERN
 void
 fil_extend_tablespaces_to_stored_len(void);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/fsp0fsp.h percona-xtrabackup-2.3.7/storage/innobase/include/fsp0fsp.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/fsp0fsp.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/fsp0fsp.h	2017-02-27 07:47:02.000000000 +0000
@@ -83,23 +83,23 @@
 
 /** Bit mask of the POST_ANTELOPE field */
 #define FSP_FLAGS_MASK_POST_ANTELOPE				\
-		((~(~0 << FSP_FLAGS_WIDTH_POST_ANTELOPE))	\
+		((~(~0U << FSP_FLAGS_WIDTH_POST_ANTELOPE))	\
 		<< FSP_FLAGS_POS_POST_ANTELOPE)
 /** Bit mask of the ZIP_SSIZE field */
 #define FSP_FLAGS_MASK_ZIP_SSIZE				\
-		((~(~0 << FSP_FLAGS_WIDTH_ZIP_SSIZE))		\
+		((~(~0U << FSP_FLAGS_WIDTH_ZIP_SSIZE))		\
 		<< FSP_FLAGS_POS_ZIP_SSIZE)
 /** Bit mask of the ATOMIC_BLOBS field */
 #define FSP_FLAGS_MASK_ATOMIC_BLOBS				\
-		((~(~0 << FSP_FLAGS_WIDTH_ATOMIC_BLOBS))	\
+		((~(~0U << FSP_FLAGS_WIDTH_ATOMIC_BLOBS))	\
 		<< FSP_FLAGS_POS_ATOMIC_BLOBS)
 /** Bit mask of the PAGE_SSIZE field */
 #define FSP_FLAGS_MASK_PAGE_SSIZE				\
-		((~(~0 << FSP_FLAGS_WIDTH_PAGE_SSIZE))		\
+		((~(~0U << FSP_FLAGS_WIDTH_PAGE_SSIZE))		\
 		<< FSP_FLAGS_POS_PAGE_SSIZE)
 /** Bit mask of the DATA_DIR field */
 #define FSP_FLAGS_MASK_DATA_DIR					\
-		((~(~0 << FSP_FLAGS_WIDTH_DATA_DIR))		\
+		((~(~0U << FSP_FLAGS_WIDTH_DATA_DIR))		\
 		<< FSP_FLAGS_POS_DATA_DIR)
 
 /** Return the value of the POST_ANTELOPE field */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/fts0ast.h percona-xtrabackup-2.3.7/storage/innobase/include/fts0ast.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/fts0ast.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/fts0ast.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2014, 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
@@ -76,6 +76,7 @@
 struct fts_lexer_t;
 struct fts_ast_node_t;
 struct fts_ast_state_t;
+struct fts_ast_string_t;
 
 typedef dberr_t (*fts_ast_callback)(fts_ast_oper_t, fts_ast_node_t*, void*);
 
@@ -101,16 +102,16 @@
 fts_ast_node_t*
 fts_ast_create_node_term(
 /*=====================*/
-	void*		arg,			/*!< in: ast state */
-	const char*	ptr);			/*!< in: term string */
+	void*			arg,		/*!< in: ast state */
+	const fts_ast_string_t*	ptr);		/*!< in: term string */
 /********************************************************************
 Create an AST text node */
 extern
 fts_ast_node_t*
 fts_ast_create_node_text(
 /*=====================*/
-	void*		arg,			/*!< in: ast state */
-	const char*	ptr);			/*!< in: text string */
+	void*			arg,		/*!< in: ast state */
+	const fts_ast_string_t*	ptr);		/*!< in: text string */
 /********************************************************************
 Create an AST expr list node */
 extern
@@ -233,16 +234,66 @@
 						free */
 	__attribute__((nonnull));
 
+/**
+Create an ast string object, with NUL-terminator, so the string
+has one more byte than len
+@param[in] str		pointer to string
+@param[in] len		length of the string
+@return ast string with NUL-terminator */
+UNIV_INTERN
+fts_ast_string_t*
+fts_ast_string_create(
+	const byte*	str,
+	ulint		len);
+
+/**
+Free an ast string instance
+@param[in,out] ast_str		string to free */
+UNIV_INTERN
+void
+fts_ast_string_free(
+	fts_ast_string_t*	ast_str);
+
+/**
+Translate ast string of type FTS_AST_NUMB to unsigned long by strtoul
+@param[in] str		string to translate
+@param[in] base		the base
+@return translated number */
+UNIV_INTERN
+ulint
+fts_ast_string_to_ul(
+	const fts_ast_string_t*	ast_str,
+	int			base);
+
+/**
+Print the ast string
+@param[in] str		string to print */
+UNIV_INTERN
+void
+fts_ast_string_print(
+	const fts_ast_string_t*	ast_str);
+
+/* String of length len.
+We always store the string of length len with a terminating '\0',
+regardless of there is any 0x00 in the string itself */
+struct fts_ast_string_t {
+	/*!< Pointer to string. */
+	byte*		str;
+
+	/*!< Length of the string. */
+	ulint		len;
+};
+
 /* Query term type */
 struct fts_ast_term_t {
-	byte*		ptr;			/*!< Pointer to term string.*/
-	ibool		wildcard;		/*!< TRUE if wild card set.*/
+	fts_ast_string_t*	ptr;		/*!< Pointer to term string.*/
+	ibool			wildcard;	/*!< TRUE if wild card set.*/
 };
 
 /* Query text type */
 struct fts_ast_text_t {
-	byte*		ptr;			/*!< Pointer to term string.*/
-	ulint		distance;		/*!< > 0 if proximity distance
+	fts_ast_string_t*	ptr;		/*!< Pointer to text string.*/
+	ulint			distance;	/*!< > 0 if proximity distance
 						set */
 };
 
@@ -278,4 +329,11 @@
 						tokenization */
 };
 
+#ifdef UNIV_DEBUG
+const char*
+fts_ast_oper_name_get(fts_ast_oper_t	oper);
+const char*
+fts_ast_node_type_get(fts_ast_type_t	type);
+#endif /* UNIV_DEBUG */
+
 #endif /* INNOBASE_FSTS0AST_H */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/fts0fts.h percona-xtrabackup-2.3.7/storage/innobase/include/fts0fts.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/fts0fts.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/fts0fts.h	2017-02-27 07:47:02.000000000 +0000
@@ -745,8 +745,8 @@
 fts_savepoint_take(
 /*===============*/
 	trx_t*		trx,			/*!< in: transaction */
-	const char*	name)			/*!< in: savepoint name */
-	__attribute__((nonnull));
+	fts_trx_t*	fts_trx,		/*!< in: fts transaction */
+	const char*	name);			/*!< in: savepoint name */
 /**********************************************************************//**
 Refresh last statement savepoint. */
 UNIV_INTERN
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/fts0pars.h percona-xtrabackup-2.3.7/storage/innobase/include/fts0pars.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/fts0pars.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/fts0pars.h	2017-02-27 07:47:02.000000000 +0000
@@ -53,9 +53,9 @@
 /* Line 2068 of yacc.c  */
 #line 61 "fts0pars.y"
 
-	int		oper;
-	char*		token;
-	fts_ast_node_t*	node;
+	int			oper;
+	fts_ast_string_t*	token;
+	fts_ast_node_t*		node;
 
 
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/fts0priv.ic percona-xtrabackup-2.3.7/storage/innobase/include/fts0priv.ic
--- percona-xtrabackup-2.2.3/storage/innobase/include/fts0priv.ic	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/fts0priv.ic	2017-02-27 07:47:02.000000000 +0000
@@ -37,18 +37,38 @@
 					/* in: true for fixed hex format,
 					false for old ambiguous format */
 {
+
 #ifdef _WIN32
-	/* Use this to construct old(5.6.14 and 5.7.3) ambiguous
-	aux table names */
+
+	DBUG_EXECUTE_IF("innodb_test_wrong_non_windows_fts_aux_table_name",
+			return(sprintf(str, UINT64PFx, id)););
+
+	/* Use this to construct old(5.6.14 and 5.7.3) windows
+	ambiguous aux table names */
 	DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
 			return(sprintf(str, "%016llu", id)););
 
+#else /* _WIN32 */
+
+	/* Use this to construct old(5.6.14 and 5.7.3) windows
+	ambiguous aux table names */
+	DBUG_EXECUTE_IF("innodb_test_wrong_windows_fts_aux_table_name",
+			return(sprintf(str, "%016" PRIu64, id)););
+
+	DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
+			return(sprintf(str, UINT64PFx, id)););
+
+#endif /* _WIN32 */
+
 	/* As above, but this is only for those tables failing to rename. */
 	if (!hex_format) {
+#ifdef _WIN32
 		// FIXME: Use ut_snprintf(), so does following one.
 		return(sprintf(str, "%016llu", id));
-	}
+#else /* _WIN32 */
+		return(sprintf(str, "%016" PRIu64, id));
 #endif /* _WIN32 */
+	}
 
 	return(sprintf(str, UINT64PFx, id));
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/ha_prototypes.h percona-xtrabackup-2.3.7/storage/innobase/include/ha_prototypes.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/ha_prototypes.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/ha_prototypes.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/ibuf0ibuf.h percona-xtrabackup-2.3.7/storage/innobase/include/ibuf0ibuf.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/ibuf0ibuf.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/ibuf0ibuf.h	2017-02-27 07:47:02.000000000 +0000
@@ -252,7 +252,7 @@
 ibuf_inside(
 /*========*/
 	const mtr_t*	mtr)	/*!< in: mini-transaction */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /***********************************************************************//**
 Checks if a page address is an ibuf bitmap page (level 3 page) address.
 @return	TRUE if a bitmap page */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/lock0lock.h percona-xtrabackup-2.3.7/storage/innobase/include/lock0lock.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/lock0lock.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/lock0lock.h	2017-02-27 07:47:02.000000000 +0000
@@ -465,7 +465,7 @@
 				in dictionary cache */
 	enum lock_mode	mode,	/*!< in: lock mode */
 	que_thr_t*	thr)	/*!< in: query thread */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Creates a table IX lock object for a resurrected transaction. */
 UNIV_INTERN
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/log0log.h percona-xtrabackup-2.3.7/storage/innobase/include/log0log.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/log0log.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/log0log.h	2017-02-27 07:47:02.000000000 +0000
@@ -583,6 +583,14 @@
 void
 log_mem_free(void);
 /*==============*/
+/******************************************************//**
+Calculates the offset of an lsn within a log group.
+@return	offset within the log group */
+lsn_t
+log_group_calc_lsn_offset(
+/*======================*/
+	lsn_t			lsn,	/*!< in: lsn */
+	const log_group_t*	group);	/*!< in: log group */
 
 extern log_t*	log_sys;
 
@@ -665,13 +673,13 @@
 					megabyte.
 
 					This information might have been used
-					since ibbackup version 0.35 but
+					since mysqlbackup version 0.35 but
 					before 1.41 to decide if unused ends of
 					non-auto-extending data files
 					in space 0 can be truncated.
 
 					This information was made obsolete
-					by ibbackup --compress. */
+					by mysqlbackup --compress. */
 #define LOG_CHECKPOINT_FSP_MAGIC_N	(12 + LOG_CHECKPOINT_ARRAY_END)
 					/*!< Not used (0);
 					This magic number tells if the
@@ -700,7 +708,7 @@
 					/* a 32-byte field which contains
 					the string 'ibbackup' and the
 					creation time if the log file was
-					created by ibbackup --restore;
+					created by mysqlbackup --restore;
 					when mysqld is first time started
 					on the restored database, it can
 					print helpful info for the user */
@@ -749,6 +757,10 @@
 	lsn_t		lsn;		/*!< lsn used to fix coordinates within
 					the log group */
 	lsn_t		lsn_offset;	/*!< the offset of the above lsn */
+	lsn_t		lsn_offset_alt;	/*!< alternative lsn offset for PS 5.5
+					with large log files */
+	ibool		alt_offset_chosen;/*!< alternative lsn offset for PS 5.5
+					with large log files is chosen */
 	ulint		n_pending_writes;/*!< number of currently pending flush
 					writes for this log group */
 	byte**		file_header_bufs_ptr;/*!< unaligned buffers */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/mach0data.h percona-xtrabackup-2.3.7/storage/innobase/include/mach0data.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/mach0data.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/mach0data.h	2017-02-27 07:47:02.000000000 +0000
@@ -53,7 +53,7 @@
 mach_read_from_1(
 /*=============*/
 	const byte*	b)	/*!< in: pointer to byte */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*******************************************************//**
 The following function is used to store data in two consecutive
 bytes. We store the most significant byte to the lower address. */
@@ -72,7 +72,7 @@
 mach_read_from_2(
 /*=============*/
 	const byte*	b)	/*!< in: pointer to two bytes */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 
 /********************************************************//**
 The following function is used to convert a 16-bit data item
@@ -114,7 +114,7 @@
 mach_read_from_3(
 /*=============*/
 	const byte*	b)	/*!< in: pointer to 3 bytes */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*******************************************************//**
 The following function is used to store data in four consecutive
 bytes. We store the most significant byte to the lowest address. */
@@ -133,7 +133,7 @@
 mach_read_from_4(
 /*=============*/
 	const byte*	b)	/*!< in: pointer to four bytes */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************//**
 Writes a ulint in a compressed form (1..5 bytes).
 @return	stored size in bytes */
@@ -160,7 +160,7 @@
 mach_read_compressed(
 /*=================*/
 	const byte*	b)	/*!< in: pointer to memory from where to read */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*******************************************************//**
 The following function is used to store data in 6 consecutive
 bytes. We store the most significant byte to the lowest address. */
@@ -179,7 +179,7 @@
 mach_read_from_6(
 /*=============*/
 	const byte*	b)	/*!< in: pointer to 6 bytes */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*******************************************************//**
 The following function is used to store data in 7 consecutive
 bytes. We store the most significant byte to the lowest address. */
@@ -198,7 +198,7 @@
 mach_read_from_7(
 /*=============*/
 	const byte*	b)	/*!< in: pointer to 7 bytes */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*******************************************************//**
 The following function is used to store data in 8 consecutive
 bytes. We store the most significant byte to the lowest address. */
@@ -217,7 +217,7 @@
 mach_read_from_8(
 /*=============*/
 	const byte*	b)	/*!< in: pointer to 8 bytes */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************//**
 Writes a 64-bit integer in a compressed form (5..9 bytes).
 @return	size in bytes */
@@ -243,7 +243,7 @@
 mach_ull_read_compressed(
 /*=====================*/
 	const byte*	b)	/*!< in: pointer to memory from where to read */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************//**
 Writes a 64-bit integer in a compressed form (1..11 bytes).
 @return	size in bytes */
@@ -270,7 +270,7 @@
 mach_ull_read_much_compressed(
 /*==========================*/
 	const byte*	b)	/*!< in: pointer to memory from where to read */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************//**
 Reads a ulint in a compressed form if the log record fully contains it.
 @return	pointer to end of the stored field, NULL if not complete */
@@ -301,7 +301,7 @@
 mach_double_read(
 /*=============*/
 	const byte*	b)	/*!< in: pointer to memory from where to read */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************//**
 Writes a double. It is stored in a little-endian format. */
 UNIV_INLINE
@@ -318,7 +318,7 @@
 mach_float_read(
 /*============*/
 	const byte*	b)	/*!< in: pointer to memory from where to read */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************//**
 Writes a float. It is stored in a little-endian format. */
 UNIV_INLINE
@@ -336,7 +336,7 @@
 /*===========================*/
 	const byte*	buf,		/*!< in: from where to read */
 	ulint		buf_size)	/*!< in: from how many bytes to read */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************//**
 Writes a ulint in the little-endian format. */
 UNIV_INLINE
@@ -354,7 +354,7 @@
 mach_read_from_2_little_endian(
 /*===========================*/
 	const byte*	buf)		/*!< in: from where to read */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************//**
 Writes a ulint in the little-endian format. */
 UNIV_INLINE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/os0file.h percona-xtrabackup-2.3.7/storage/innobase/include/os0file.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/os0file.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/os0file.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2009, Percona Inc.
 
 Portions of this file contain modifications contributed and copyrighted
@@ -126,7 +126,7 @@
 
 #define OS_FILE_READ_ONLY		333
 #define	OS_FILE_READ_WRITE		444
-#define	OS_FILE_READ_ALLOW_DELETE	555	/* for ibbackup */
+#define	OS_FILE_READ_ALLOW_DELETE	555	/* for mysqlbackup */
 
 /* Options for file_create */
 #define	OS_FILE_AIO			61
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/os0once.h percona-xtrabackup-2.3.7/storage/innobase/include/os0once.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/os0once.h	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/os0once.h	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,125 @@
+/*****************************************************************************
+
+Copyright (c) 2014, 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 Street, Suite 500, Boston, MA 02110-1335 USA
+
+*****************************************************************************/
+
+/**************************************************//**
+@file include/os0once.h
+A class that aids executing a given function exactly once in a multi-threaded
+environment.
+
+Created Feb 20, 2014 Vasil Dimov
+*******************************************************/
+
+#ifndef os0once_h
+#define os0once_h
+
+#include "univ.i"
+
+#include "os0sync.h"
+#include "ut0ut.h"
+
+/** Execute a given function exactly once in a multi-threaded environment
+or wait for the function to be executed by another thread.
+
+Example usage:
+First the user must create a control variable of type os_once::state_t and
+assign it os_once::NEVER_DONE.
+Then the user must pass this variable, together with a function to be
+executed to os_once::do_or_wait_for_done().
+
+Multiple threads can call os_once::do_or_wait_for_done() simultaneously with
+the same (os_once::state_t) control variable. The provided function will be
+called exactly once and when os_once::do_or_wait_for_done() returns then this
+function has completed execution, by this or another thread. In other words
+os_once::do_or_wait_for_done() will either execute the provided function or
+will wait for its execution to complete if it is already called by another
+thread or will do nothing if the function has already completed its execution
+earlier.
+
+This mimics pthread_once(3), but unfortunatelly pthread_once(3) does not
+support passing arguments to the init_routine() function. We should use
+std::call_once() when we start compiling with C++11 enabled. */
+class os_once {
+public:
+	/** Control variables' state type */
+	typedef ib_uint32_t	state_t;
+
+	/** Not yet executed. */
+	static const state_t	NEVER_DONE = 0;
+
+	/** Currently being executed by this or another thread. */
+	static const state_t	IN_PROGRESS = 1;
+
+	/** Finished execution. */
+	static const state_t	DONE = 2;
+
+#ifdef HAVE_ATOMIC_BUILTINS
+	/** Call a given function or wait its execution to complete if it is
+	already called by another thread.
+	@param[in,out]	state		control variable
+	@param[in]	do_func		function to call
+	@param[in,out]	do_func_arg	an argument to pass to do_func(). */
+	static
+	void
+	do_or_wait_for_done(
+		volatile state_t*	state,
+		void			(*do_func)(void*),
+		void*			do_func_arg)
+	{
+		/* Avoid calling os_compare_and_swap_uint32() in the most
+		common case. */
+		if (*state == DONE) {
+			return;
+		}
+
+		if (os_compare_and_swap_uint32(state,
+					       NEVER_DONE, IN_PROGRESS)) {
+			/* We are the first. Call the function. */
+
+			do_func(do_func_arg);
+
+			const bool	swapped = os_compare_and_swap_uint32(
+				state, IN_PROGRESS, DONE);
+
+			ut_a(swapped);
+		} else {
+			/* The state is not NEVER_DONE, so either it is
+			IN_PROGRESS (somebody is calling the function right
+			now or DONE (it has already been called and completed).
+			Wait for it to become DONE. */
+			for (;;) {
+				const state_t	s = *state;
+
+				switch (s) {
+				case DONE:
+					return;
+				case IN_PROGRESS:
+					break;
+				case NEVER_DONE:
+					/* fall through */
+				default:
+					ut_error;
+				}
+
+				UT_RELAX_CPU();
+			}
+		}
+	}
+#endif /* HAVE_ATOMIC_BUILTINS */
+};
+
+#endif /* os0once_h */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/os0sync.h percona-xtrabackup-2.3.7/storage/innobase/include/os0sync.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/os0sync.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/os0sync.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -357,6 +357,10 @@
 
 # define HAVE_ATOMIC_BUILTINS
 
+# ifdef HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE
+#  define HAVE_ATOMIC_BUILTINS_BYTE
+# endif
+
 # ifdef HAVE_IB_GCC_ATOMIC_BUILTINS_64
 #  define HAVE_ATOMIC_BUILTINS_64
 # endif
@@ -437,6 +441,7 @@
 #elif defined(HAVE_IB_SOLARIS_ATOMICS)
 
 # define HAVE_ATOMIC_BUILTINS
+# define HAVE_ATOMIC_BUILTINS_BYTE
 # define HAVE_ATOMIC_BUILTINS_64
 
 /* If not compiling with GCC or GCC doesn't support the atomic
@@ -518,6 +523,7 @@
 #elif defined(HAVE_WINDOWS_ATOMICS)
 
 # define HAVE_ATOMIC_BUILTINS
+# define HAVE_ATOMIC_BUILTINS_BYTE
 
 # ifndef _WIN32
 #  define HAVE_ATOMIC_BUILTINS_64
@@ -574,7 +580,8 @@
 compare to, new_val is the value to swap in. */
 
 # define os_compare_and_swap_uint32(ptr, old_val, new_val) \
-	(win_cmp_and_xchg_dword(ptr, new_val, old_val) == old_val)
+	(InterlockedCompareExchange(reinterpret_cast<volatile long*>(ptr), \
+				    new_val, old_val) == old_val)
 
 # define os_compare_and_swap_ulint(ptr, old_val, new_val) \
 	(win_cmp_and_xchg_ulint(ptr, new_val, old_val) == old_val)
@@ -684,6 +691,51 @@
 		os_decrement_counter_by_amount(mutex, counter, 1);\
 	} while (0);
 
+/** barrier definitions for memory ordering */
+#if defined __i386__ || defined __x86_64__ || defined _M_IX86 || defined _M_X64 || defined __WIN__
+/* Performance regression was observed at some conditions for Intel
+architecture. Disable memory barrier for Intel architecture for now. */
+# define os_rmb
+# define os_wmb
+# define IB_MEMORY_BARRIER_STARTUP_MSG \
+	"Memory barrier is not used"
+#elif defined(HAVE_IB_GCC_ATOMIC_THREAD_FENCE)
+# define HAVE_MEMORY_BARRIER
+# define os_rmb	__atomic_thread_fence(__ATOMIC_ACQUIRE)
+# define os_wmb	__atomic_thread_fence(__ATOMIC_RELEASE)
+# define IB_MEMORY_BARRIER_STARTUP_MSG \
+	"GCC builtin __atomic_thread_fence() is used for memory barrier"
+
+#elif defined(HAVE_IB_GCC_SYNC_SYNCHRONISE)
+# define HAVE_MEMORY_BARRIER
+# define os_rmb	__sync_synchronize()
+# define os_wmb	__sync_synchronize()
+# define IB_MEMORY_BARRIER_STARTUP_MSG \
+	"GCC builtin __sync_synchronize() is used for memory barrier"
+
+#elif defined(HAVE_IB_MACHINE_BARRIER_SOLARIS)
+# define HAVE_MEMORY_BARRIER
+# include <mbarrier.h>
+# define os_rmb	__machine_r_barrier()
+# define os_wmb	__machine_w_barrier()
+# define IB_MEMORY_BARRIER_STARTUP_MSG \
+	"Solaris memory ordering functions are used for memory barrier"
+
+#elif defined(HAVE_WINDOWS_MM_FENCE) && defined(_WIN64)
+# define HAVE_MEMORY_BARRIER
+# include <mmintrin.h>
+# define os_rmb	_mm_lfence()
+# define os_wmb	_mm_sfence()
+# define IB_MEMORY_BARRIER_STARTUP_MSG \
+	"_mm_lfence() and _mm_sfence() are used for memory barrier"
+
+#else
+# define os_rmb
+# define os_wmb
+# define IB_MEMORY_BARRIER_STARTUP_MSG \
+	"Memory barrier is not used"
+#endif
+
 #ifndef UNIV_NONINL
 #include "os0sync.ic"
 #endif
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/page0page.h percona-xtrabackup-2.3.7/storage/innobase/include/page0page.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/page0page.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/page0page.h	2017-02-27 07:47:02.000000000 +0000
@@ -232,7 +232,7 @@
 /*=================*/
 	const page_t*	page,	/*!< in: page */
 	ulint		field)	/*!< in: PAGE_FREE, ... */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 
 /*************************************************************//**
 Returns the pointer stored in the given header field, or NULL. */
@@ -524,7 +524,7 @@
 page_is_leaf(
 /*=========*/
 	const page_t*	page)	/*!< in: page */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /************************************************************//**
 Determine whether the page is empty.
 @return	true if the page is empty (PAGE_N_RECS = 0) */
@@ -533,7 +533,7 @@
 page_is_empty(
 /*==========*/
 	const page_t*	page)	/*!< in: page */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /************************************************************//**
 Determine whether the page contains garbage.
 @return	true if the page contains garbage (PAGE_GARBAGE is not 0) */
@@ -542,7 +542,7 @@
 page_has_garbage(
 /*=============*/
 	const page_t*	page)	/*!< in: page */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /************************************************************//**
 Gets the pointer to the next record on the page.
 @return	pointer to next record */
@@ -642,7 +642,7 @@
 page_rec_is_user_rec(
 /*=================*/
 	const rec_t*	rec)	/*!< in: record */
-	__attribute__((const));
+	__attribute__((warn_unused_result));
 /************************************************************//**
 TRUE if the record is the supremum record on a page.
 @return	TRUE if the supremum record */
@@ -651,7 +651,7 @@
 page_rec_is_supremum(
 /*=================*/
 	const rec_t*	rec)	/*!< in: record */
-	__attribute__((const));
+	__attribute__((warn_unused_result));
 
 /************************************************************//**
 TRUE if the record is the infimum record on a page.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/page0zip.h percona-xtrabackup-2.3.7/storage/innobase/include/page0zip.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/page0zip.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/page0zip.h	2017-02-27 07:47:02.000000000 +0000
@@ -58,7 +58,7 @@
 page_zip_get_size(
 /*==============*/
 	const page_zip_des_t*	page_zip)	/*!< in: compressed page */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /**********************************************************************//**
 Set the size of a compressed page in bytes. */
 UNIV_INLINE
@@ -195,7 +195,7 @@
 /*==================*/
 	const page_zip_des_t*	page_zip,/*!< in: compressed page */
 	ibool			is_clust)/*!< in: TRUE if clustered index */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 
 /**********************************************************************//**
 Determine if enough space is available in the modification log.
@@ -209,7 +209,7 @@
 	ulint			length,	/*!< in: combined size of the record */
 	ulint			create)	/*!< in: nonzero=add the record to
 					the heap */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 
 /**********************************************************************//**
 Write data to the uncompressed header portion of a page.  The data must
@@ -449,8 +449,7 @@
 	byte*		ptr,	/*!< in: buffer */
 	byte*		end_ptr,/*!< in: buffer end */
 	page_t*		page,	/*!< out: uncompressed page */
-	page_zip_des_t*	page_zip)/*!< out: compressed page */
-	__attribute__((nonnull(1,2)));
+	page_zip_des_t*	page_zip);/*!< out: compressed page */
 
 /**********************************************************************//**
 Calculate the compressed page checksum.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/rem0cmp.h percona-xtrabackup-2.3.7/storage/innobase/include/rem0cmp.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/rem0cmp.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/rem0cmp.h	2017-02-27 07:47:02.000000000 +0000
@@ -169,12 +169,11 @@
 				/*!< in/out: number of already completely
 				matched fields; when function returns,
 				contains the value for current comparison */
-	ulint*		matched_bytes)
+	ulint*		matched_bytes);
 				/*!< in/out: number of already matched
 				bytes within the first field not completely
 				matched; when function returns, contains the
 				value for current comparison */
-	__attribute__((nonnull));
 #define cmp_dtuple_rec_with_match(tuple,rec,offsets,fields,bytes)	\
 	cmp_dtuple_rec_with_match_low(					\
 		tuple,rec,offsets,dtuple_get_n_fields_cmp(tuple),fields,bytes)
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/rem0rec.h percona-xtrabackup-2.3.7/storage/innobase/include/rem0rec.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/rem0rec.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/rem0rec.h	2017-02-27 07:47:02.000000000 +0000
@@ -98,7 +98,7 @@
 /*===================*/
 	const rec_t*	rec,	/*!< in: physical record */
 	ulint		comp)	/*!< in: nonzero=compact page format */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to get the pointer of the next chained record
 on the same page.
@@ -109,7 +109,7 @@
 /*=============*/
 	rec_t*	rec,	/*!< in: physical record */
 	ulint	comp)	/*!< in: nonzero=compact page format */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to get the offset of the
 next chained record on the same page.
@@ -120,7 +120,7 @@
 /*==============*/
 	const rec_t*	rec,	/*!< in: physical record */
 	ulint		comp)	/*!< in: nonzero=compact page format */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to set the next record offset field
 of an old-style record. */
@@ -150,7 +150,7 @@
 rec_get_n_fields_old(
 /*=================*/
 	const rec_t*	rec)	/*!< in: physical record */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to get the number of fields
 in a record.
@@ -161,7 +161,7 @@
 /*=============*/
 	const rec_t*		rec,	/*!< in: physical record */
 	const dict_index_t*	index)	/*!< in: record descriptor */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to get the number of records owned by the
 previous directory record.
@@ -171,7 +171,7 @@
 rec_get_n_owned_old(
 /*================*/
 	const rec_t*	rec)	/*!< in: old-style physical record */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to set the number of owned records. */
 UNIV_INLINE
@@ -190,7 +190,7 @@
 rec_get_n_owned_new(
 /*================*/
 	const rec_t*	rec)	/*!< in: new-style physical record */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to set the number of owned records. */
 UNIV_INLINE
@@ -211,7 +211,7 @@
 /*==============*/
 	const rec_t*	rec,	/*!< in: physical record */
 	ulint		comp)	/*!< in: nonzero=compact page format */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to set the info bits of a record. */
 UNIV_INLINE
@@ -238,7 +238,7 @@
 rec_get_status(
 /*===========*/
 	const rec_t*	rec)	/*!< in: physical record */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /******************************************************//**
 The following function is used to set the status bits of a new-style record. */
@@ -260,7 +260,7 @@
 /*=========================*/
 	const rec_t*	rec,	/*!< in: physical record */
 	ulint		comp)	/*!< in: nonzero=compact page format */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to set the info and status
 bits of a record.  (Only compact records have status bits.) */
@@ -281,7 +281,7 @@
 /*=================*/
 	const rec_t*	rec,	/*!< in: physical record */
 	ulint		comp)	/*!< in: nonzero=compact page format */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to set the deleted bit. */
 UNIV_INLINE
@@ -309,7 +309,7 @@
 rec_get_node_ptr_flag(
 /*==================*/
 	const rec_t*	rec)	/*!< in: physical record */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to get the order number
 of an old-style record in the heap of the index page.
@@ -319,7 +319,7 @@
 rec_get_heap_no_old(
 /*================*/
 	const rec_t*	rec)	/*!< in: physical record */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to set the heap number
 field in an old-style record. */
@@ -339,7 +339,7 @@
 rec_get_heap_no_new(
 /*================*/
 	const rec_t*	rec)	/*!< in: physical record */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 The following function is used to set the heap number
 field in a new-style record. */
@@ -359,7 +359,7 @@
 rec_get_1byte_offs_flag(
 /*====================*/
 	const rec_t*	rec)	/*!< in: physical record */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /******************************************************//**
 The following function is used to set the 1-byte offsets flag. */
@@ -382,7 +382,7 @@
 /*=====================*/
 	const rec_t*	rec,	/*!< in: record */
 	ulint		n)	/*!< in: field index */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /******************************************************//**
 Returns the offset of nth field end if the record is stored in the 2-byte
@@ -396,7 +396,7 @@
 /*=====================*/
 	const rec_t*	rec,	/*!< in: record */
 	ulint		n)	/*!< in: field index */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /******************************************************//**
 Returns nonzero if the field is stored off-page.
@@ -408,7 +408,7 @@
 /*==================*/
 	const rec_t*	rec,	/*!< in: record */
 	ulint		n)	/*!< in: field index */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /******************************************************//**
 Determine how many of the first n columns in a compact
@@ -531,7 +531,7 @@
 /*===================*/
 	const rec_t*	rec,	/*!< in: record */
 	ulint		n)	/*!< in: index of the field */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /************************************************************//**
 The following function is used to get an offset to the nth
 data field in a record.
@@ -556,7 +556,7 @@
 rec_offs_comp(
 /*==========*/
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 Determine if the offsets are for a record containing
 externally stored columns.
@@ -566,7 +566,7 @@
 rec_offs_any_extern(
 /*================*/
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 Determine if the offsets are for a record containing null BLOB pointers.
 @return	first field containing a null BLOB pointer, or NULL if none found */
@@ -576,7 +576,7 @@
 /*=====================*/
 	const rec_t*	rec,		/*!< in: record */
 	const ulint*	offsets)	/*!< in: rec_get_offsets(rec) */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /******************************************************//**
 Returns nonzero if the extern bit is set in nth field of rec.
 @return	nonzero if externally stored */
@@ -606,7 +606,7 @@
 /*==============*/
 	const ulint*	offsets,/*!< in: array returned by rec_get_offsets() */
 	ulint		n)	/*!< in: nth field */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 /******************************************************//**
 Returns the number of extern bits set in a record.
@@ -616,7 +616,7 @@
 rec_offs_n_extern(
 /*==============*/
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /***********************************************************//**
 This is used to modify the value of an already existing field in a record.
 The previous value must have exactly the same size as the new value. If len
@@ -648,7 +648,7 @@
 rec_get_data_size_old(
 /*==================*/
 	const rec_t*	rec)	/*!< in: physical record */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /**********************************************************//**
 The following function returns the number of allocated elements
 for an array of offsets.
@@ -658,7 +658,7 @@
 rec_offs_get_n_alloc(
 /*=================*/
 	const ulint*	offsets)/*!< in: array for rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /**********************************************************//**
 The following function sets the number of allocated elements
 for an array of offsets. */
@@ -680,7 +680,7 @@
 rec_offs_n_fields(
 /*==============*/
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /**********************************************************//**
 The following function returns the data size of a physical
 record, that is the sum of field lengths. SQL null fields
@@ -692,7 +692,7 @@
 rec_offs_data_size(
 /*===============*/
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /**********************************************************//**
 Returns the total size of record minus data size of record.
 The value returned by the function is the distance from record
@@ -703,7 +703,7 @@
 rec_offs_extra_size(
 /*================*/
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /**********************************************************//**
 Returns the total size of a physical record.
 @return	size */
@@ -712,7 +712,7 @@
 rec_offs_size(
 /*==========*/
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 #ifdef UNIV_DEBUG
 /**********************************************************//**
 Returns a pointer to the start of the record.
@@ -723,7 +723,7 @@
 /*==========*/
 	const rec_t*	rec,	/*!< in: pointer to record */
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 /**********************************************************//**
 Returns a pointer to the end of the record.
 @return	pointer to end */
@@ -733,7 +733,7 @@
 /*========*/
 	const rec_t*	rec,	/*!< in: pointer to record */
 	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 #else /* UNIV_DEBUG */
 # define rec_get_start(rec, offsets) ((rec) - rec_offs_extra_size(offsets))
 # define rec_get_end(rec, offsets) ((rec) + rec_offs_data_size(offsets))
@@ -747,8 +747,7 @@
 /*=====*/
 	void*		buf,	/*!< in: buffer */
 	const rec_t*	rec,	/*!< in: physical record */
-	const ulint*	offsets)/*!< in: array returned by rec_get_offsets() */
-	__attribute__((nonnull));
+	const ulint*	offsets);/*!< in: array returned by rec_get_offsets() */
 #ifndef UNIV_HOTBACKUP
 /**********************************************************//**
 Determines the size of a data tuple prefix in a temporary file.
@@ -821,7 +820,7 @@
 	ulint		n_bytes,	/*!< in: number of bytes to fold
 					in an incomplete last field */
 	index_id_t	tree_id)	/*!< in: index tree id */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 #endif /* !UNIV_HOTBACKUP */
 /*********************************************************//**
 Builds a physical record out of a data tuple and
@@ -837,7 +836,7 @@
 	const dtuple_t*		dtuple,	/*!< in: data tuple */
 	ulint			n_ext)	/*!< in: number of
 					externally stored columns */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /**********************************************************//**
 Returns the extra size of an old-style physical record if we know its
 data size and number of fields.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/rem0rec.ic percona-xtrabackup-2.3.7/storage/innobase/include/rem0rec.ic
--- percona-xtrabackup-2.2.3/storage/innobase/include/rem0rec.ic	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/rem0rec.ic	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2016, 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
@@ -1540,7 +1540,8 @@
 	ulint	extra_len;
 	ulint	data_len;
 
-	ut_ad(rec && buf);
+	ut_ad(rec != NULL);
+	ut_ad(buf != NULL);
 	ut_ad(rec_offs_validate(rec, NULL, offsets));
 	ut_ad(rec_validate(rec, offsets));
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/row0merge.h percona-xtrabackup-2.3.7/storage/innobase/include/row0merge.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/row0merge.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/row0merge.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/row0mysql.h percona-xtrabackup-2.3.7/storage/innobase/include/row0mysql.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/row0mysql.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/row0mysql.h	2017-02-27 07:47:02.000000000 +0000
@@ -276,7 +276,7 @@
 					the MySQL format */
 	row_prebuilt_t*	prebuilt)	/*!< in: prebuilt struct in MySQL
 					handle */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 This can only be used when srv_locks_unsafe_for_binlog is TRUE or this
 session is using a READ COMMITTED or READ UNCOMMITTED isolation level.
@@ -292,12 +292,11 @@
 /*=================*/
 	row_prebuilt_t*	prebuilt,	/*!< in/out: prebuilt struct in MySQL
 					handle */
-	ibool		has_latches_on_recs)/*!< in: TRUE if called
+	ibool		has_latches_on_recs);/*!< in: TRUE if called
 					so that we have the latches on
 					the records under pcur and
 					clust_pcur, and we do not need
 					to reposition the cursors. */
-	__attribute__((nonnull));
 /*********************************************************************//**
 Checks if a table name contains the string "/#sql" which denotes temporary
 tables in MySQL.
@@ -488,10 +487,9 @@
 	const char*	name,	/*!< in: table name */
 	trx_t*		trx,	/*!< in: dictionary transaction handle */
 	bool		drop_db,/*!< in: true=dropping whole database */
-	bool		nonatomic = true)
+	bool		nonatomic = true);
 				/*!< in: whether it is permitted
 				to release and reacquire dict_operation_lock */
-	__attribute__((nonnull));
 /*********************************************************************//**
 Drop all temporary tables during crash recovery. */
 UNIV_INTERN
@@ -530,8 +528,7 @@
 row_drop_database_for_mysql(
 /*========================*/
 	const char*	name,	/*!< in: database name which ends to '/' */
-	trx_t*		trx)	/*!< in: transaction handle */
-	__attribute__((nonnull));
+	trx_t*		trx);	/*!< in: transaction handle */
 /*********************************************************************//**
 Renames a table for MySQL.
 @return	error code or DB_SUCCESS */
@@ -543,7 +540,7 @@
 	const char*	new_name,	/*!< in: new table name */
 	trx_t*		trx,		/*!< in/out: transaction */
 	bool		commit)		/*!< in: whether to commit trx */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Checks that the index contains entries in an ascending order, unique
 constraint is not broken, and calculates the number of index entries
@@ -871,6 +868,14 @@
 	unsigned	innodb_api:1;	/*!< whether this is a InnoDB API
 					query */
 	const rec_t*	innodb_api_rec;	/*!< InnoDB API search result */
+	byte*		srch_key_val1;  /*!< buffer used in converting
+					search key values from MySQL format
+					to InnoDB format.*/
+	byte*		srch_key_val2;  /*!< buffer used in converting
+					search key values from MySQL format
+					to InnoDB format.*/
+	uint		srch_key_val_len; /*!< Size of search key */
+
 };
 
 /** Callback for row_mysql_sys_index_iterate() */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/row0purge.h percona-xtrabackup-2.3.7/storage/innobase/include/row0purge.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/row0purge.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/row0purge.h	2017-02-27 07:47:02.000000000 +0000
@@ -47,7 +47,7 @@
 	que_thr_t*	parent,		/*!< in: parent node, i.e., a
 					thr node */
 	mem_heap_t*	heap)		/*!< in: memory heap where created */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /***********************************************************//**
 Determines if it is possible to remove a secondary index entry.
 Removal is possible if the secondary index entry does not refer to any
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/row0row.h percona-xtrabackup-2.3.7/storage/innobase/include/row0row.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/row0row.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/row0row.h	2017-02-27 07:47:02.000000000 +0000
@@ -153,9 +153,8 @@
 	row_ext_t**		ext,	/*!< out, own: cache of
 					externally stored column
 					prefixes, or NULL */
-	mem_heap_t*		heap)	/*!< in: memory heap from which
+	mem_heap_t*		heap);	/*!< in: memory heap from which
 					the memory needed is allocated */
-	__attribute__((nonnull(2,3,9)));
 /*******************************************************************//**
 Converts an index record to a typed data tuple.
 @return index entry built; does not set info_bits, and the data fields
@@ -171,7 +170,7 @@
 					stored columns */
 	mem_heap_t*		heap)	/*!< in: memory heap from which
 					the memory needed is allocated */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*******************************************************************//**
 Converts an index record to a typed data tuple. NOTE that externally
 stored (often big) fields are NOT copied to heap.
@@ -187,7 +186,7 @@
 					stored columns */
 	mem_heap_t*		heap)	/*!< in: memory heap from which
 					the memory needed is allocated */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*******************************************************************//**
 Builds from a secondary index record a row reference with which we can
 search the clustered index record.
@@ -210,7 +209,7 @@
 				as long as the row reference is used! */
 	mem_heap_t*	heap)	/*!< in: memory heap from which the memory
 				needed is allocated */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /*******************************************************************//**
 Builds from a secondary index record a row reference with which we can
 search the clustered index record. */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/row0umod.h percona-xtrabackup-2.3.7/storage/innobase/include/row0umod.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/row0umod.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/row0umod.h	2017-02-27 07:47:02.000000000 +0000
@@ -43,7 +43,7 @@
 /*=========*/
 	undo_node_t*	node,	/*!< in: row undo node */
 	que_thr_t*	thr)	/*!< in: query thread */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 
 #ifndef UNIV_NONINL
 #include "row0umod.ic"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/row0upd.h percona-xtrabackup-2.3.7/storage/innobase/include/row0upd.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/row0upd.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/row0upd.h	2017-02-27 07:47:02.000000000 +0000
@@ -91,7 +91,7 @@
 /*======================*/
 	const upd_t*	update,	/*!< in: update vector */
 	ulint		no)	/*!< in: field_no */
-	__attribute__((nonnull, pure));
+	__attribute__((warn_unused_result));
 /*********************************************************************//**
 Writes into the redo log the values of trx id and roll ptr and enough info
 to determine their positions within a clustered index record.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/srv0srv.h percona-xtrabackup-2.3.7/storage/innobase/include/srv0srv.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/srv0srv.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/srv0srv.h	2017-02-27 07:47:02.000000000 +0000
@@ -361,6 +361,7 @@
 extern ibool	srv_apply_log_only;
 
 extern ibool	srv_backup_mode;
+extern ibool	srv_close_files;
 
 /*-------------------------------------------*/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/sync0rw.h percona-xtrabackup-2.3.7/storage/innobase/include/sync0rw.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/sync0rw.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/sync0rw.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -141,7 +141,7 @@
 extern	mysql_pfs_key_t	trx_purge_latch_key;
 extern	mysql_pfs_key_t	index_tree_rw_lock_key;
 extern	mysql_pfs_key_t	index_online_log_key;
-extern	mysql_pfs_key_t	dict_table_stats_latch_key;
+extern	mysql_pfs_key_t	dict_table_stats_key;
 extern  mysql_pfs_key_t trx_sys_rw_lock_key;
 extern  mysql_pfs_key_t hash_table_rw_lock_key;
 #endif /* UNIV_PFS_RWLOCK */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/sync0rw.ic percona-xtrabackup-2.3.7/storage/innobase/include/sync0rw.ic
--- percona-xtrabackup-2.2.3/storage/innobase/include/sync0rw.ic	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/sync0rw.ic	2017-02-27 07:47:02.000000000 +0000
@@ -93,6 +93,7 @@
 	(void) os_compare_and_swap_ulint(&lock->waiters, 0, 1);
 #else /* INNODB_RW_LOCKS_USE_ATOMICS */
 	lock->waiters = 1;
+	os_wmb;
 #endif /* INNODB_RW_LOCKS_USE_ATOMICS */
 }
 
@@ -110,6 +111,7 @@
 	(void) os_compare_and_swap_ulint(&lock->waiters, 1, 0);
 #else /* INNODB_RW_LOCKS_USE_ATOMICS */
 	lock->waiters = 0;
+	os_wmb;
 #endif /* INNODB_RW_LOCKS_USE_ATOMICS */
 }
 
@@ -199,7 +201,10 @@
 	ulint		amount)		/*!< in: amount to decrement */
 {
 #ifdef INNODB_RW_LOCKS_USE_ATOMICS
-	lint local_lock_word = lock->lock_word;
+	lint local_lock_word;
+
+	os_rmb;
+	local_lock_word = lock->lock_word;
 	while (local_lock_word > 0) {
 		if (os_compare_and_swap_lint(&lock->lock_word,
 					     local_lock_word,
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/sync0sync.h percona-xtrabackup-2.3.7/storage/innobase/include/sync0sync.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/sync0sync.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/sync0sync.h	2017-02-27 07:47:02.000000000 +0000
@@ -49,6 +49,8 @@
 #ifdef HAVE_WINDOWS_ATOMICS
 typedef LONG lock_word_t;	/*!< On Windows, InterlockedExchange operates
 				on LONG variable */
+#elif defined(HAVE_ATOMIC_BUILTINS) && !defined(HAVE_ATOMIC_BUILTINS_BYTE)
+typedef ulint lock_word_t;
 #else
 typedef byte lock_word_t;
 #endif
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/sync0sync.ic percona-xtrabackup-2.3.7/storage/innobase/include/sync0sync.ic
--- percona-xtrabackup-2.2.3/storage/innobase/include/sync0sync.ic	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/sync0sync.ic	2017-02-27 07:47:02.000000000 +0000
@@ -80,7 +80,11 @@
 	ib_mutex_t*	mutex)	/*!< in: mutex */
 {
 #if defined(HAVE_ATOMIC_BUILTINS)
+# if defined(HAVE_ATOMIC_BUILTINS_BYTE)
 	return(os_atomic_test_and_set_byte(&mutex->lock_word, 1));
+# else
+	return(os_atomic_test_and_set_ulint(&mutex->lock_word, 1));
+# endif
 #else
 	ibool	ret;
 
@@ -92,6 +96,7 @@
 		ut_a(mutex->lock_word == 0);
 
 		mutex->lock_word = 1;
+		os_wmb;
 	}
 
 	return((byte) ret);
@@ -111,7 +116,11 @@
 	/* In theory __sync_lock_release should be used to release the lock.
 	Unfortunately, it does not work properly alone. The workaround is
 	that more conservative __sync_lock_test_and_set is used instead. */
+# if defined(HAVE_ATOMIC_BUILTINS_BYTE)
 	os_atomic_test_and_set_byte(&mutex->lock_word, 0);
+# else
+	os_atomic_test_and_set_ulint(&mutex->lock_word, 0);
+# endif
 #else
 	mutex->lock_word = 0;
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/trx0roll.h percona-xtrabackup-2.3.7/storage/innobase/include/trx0roll.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/trx0roll.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/trx0roll.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -32,6 +32,8 @@
 #include "mtr0mtr.h"
 #include "trx0sys.h"
 
+extern bool	trx_rollback_or_clean_is_active;
+
 /*******************************************************************//**
 Determines if this transaction is rolling back an incomplete transaction
 in crash recovery.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/trx0sys.h percona-xtrabackup-2.3.7/storage/innobase/include/trx0sys.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/trx0sys.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/trx0sys.h	2017-02-27 07:47:02.000000000 +0000
@@ -42,6 +42,7 @@
 #include "read0types.h"
 #include "page0types.h"
 #include "ut0bh.h"
+#include "trx0xa.h"
 
 typedef UT_LIST_BASE_NODE_T(trx_t) trx_list_t;
 
@@ -302,6 +303,15 @@
 trx_sys_print_mysql_binlog_offset(void);
 /*===================================*/
 /*****************************************************************//**
+Read WSREP XID information from the trx system header if the magic value
+shows it is valid. This code has been copied from MySQL patches by Codership
+with some modifications.
+@return true if the magic value is valid. Otherwise
+return false and leave 'xid' unchanged. */
+bool
+trx_sys_read_wsrep_checkpoint(XID* xid);
+/*===================================*/
+/*****************************************************************//**
 Prints to stderr the MySQL master log offset info in the trx system header if
 the magic number shows it valid. */
 UNIV_INTERN
@@ -531,6 +541,18 @@
 						within that file */
 #define TRX_SYS_MYSQL_LOG_NAME		12	/*!< MySQL log file name */
 
+/* The offset to WSREP XID headers */
+#define TRX_SYS_WSREP_XID_INFO (UNIV_PAGE_SIZE - 3500)
+#define TRX_SYS_WSREP_XID_MAGIC_N_FLD 0
+#define TRX_SYS_WSREP_XID_MAGIC_N 0x77737265
+
+/* XID field: formatID, gtrid_len, bqual_len, xid_data */
+#define TRX_SYS_WSREP_XID_LEN        (4 + 4 + 4 + XIDDATASIZE)
+#define TRX_SYS_WSREP_XID_FORMAT     4
+#define TRX_SYS_WSREP_XID_GTRID_LEN  8
+#define TRX_SYS_WSREP_XID_BQUAL_LEN 12
+#define TRX_SYS_WSREP_XID_DATA      16
+
 /** Doublewrite buffer */
 /* @{ */
 /** The offset of the doublewrite buffer header on the trx system header page */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/trx0trx.h percona-xtrabackup-2.3.7/storage/innobase/include/trx0trx.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/trx0trx.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/trx0trx.h	2017-02-27 07:47:02.000000000 +0000
@@ -354,7 +354,7 @@
 trx_get_dict_operation(
 /*===================*/
 	const trx_t*	trx)	/*!< in: transaction */
-	__attribute__((pure));
+	__attribute__((warn_unused_result));
 /**********************************************************************//**
 Flag a transaction a dictionary operation. */
 UNIV_INLINE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/trx0undo.h percona-xtrabackup-2.3.7/storage/innobase/include/trx0undo.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/trx0undo.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/trx0undo.h	2017-02-27 07:47:02.000000000 +0000
@@ -73,7 +73,7 @@
 trx_undo_trx_id_is_insert(
 /*======================*/
 	const byte*	trx_id)	/*!< in: DB_TRX_ID, followed by DB_ROLL_PTR */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((warn_unused_result));
 #endif /* !UNIV_HOTBACKUP */
 /*****************************************************************//**
 Writes a roll ptr to an index page. In case that the size changes in
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/univ.i percona-xtrabackup-2.3.7/storage/innobase/include/univ.i
--- percona-xtrabackup-2.2.3/storage/innobase/include/univ.i	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/univ.i	2017-02-27 07:47:02.000000000 +0000
@@ -247,15 +247,9 @@
 			at a buffer page write: it should be tested with this
 			option off; also some ibuf tests are suppressed */
 
-/* Linkage specifier for non-static InnoDB symbols (variables and functions)
-that are only referenced from within InnoDB, not from MySQL. We disable the
-GCC visibility directive on all Sun operating systems because there is no
-easy way to get it to work. See http://bugs.mysql.com/bug.php?id=52263. */
-#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(sun) || defined(__INTEL_COMPILER)
-# define UNIV_INTERN __attribute__((visibility ("hidden")))
-#else
-# define UNIV_INTERN
-#endif
+/* For XtraBackup, we disable the GCC visibility directive for InnoDB internal
+symbols as that allows XtraBackup print fully resolved stacktraces on Linux. */
+#define UNIV_INTERN
 #if defined(INNODB_COMPILER_HINTS)      \
     && defined __GNUC__                 \
     && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
@@ -442,10 +436,10 @@
 typedef unsigned __int32 ib_uint32_t;
 #else
 /* Use the integer types and formatting strings defined in the C99 standard. */
-# define UINT32PF	"%"PRIu32
-# define INT64PF	"%"PRId64
-# define UINT64PF	"%"PRIu64
-# define UINT64PFx	"%016"PRIx64
+# define UINT32PF	"%" PRIu32
+# define INT64PF	"%" PRId64
+# define UINT64PF	"%" PRIu64
+# define UINT64PFx	"%016" PRIx64
 # define DBUG_LSN_PF    UINT64PF
 typedef int64_t ib_int64_t;
 typedef uint64_t ib_uint64_t;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/include/xb0xb.h percona-xtrabackup-2.3.7/storage/innobase/include/xb0xb.h
--- percona-xtrabackup-2.2.3/storage/innobase/include/xb0xb.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/include/xb0xb.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/lock/lock0lock.cc percona-xtrabackup-2.3.7/storage/innobase/lock/lock0lock.cc
--- percona-xtrabackup-2.2.3/storage/innobase/lock/lock0lock.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/lock/lock0lock.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2015, 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
@@ -378,8 +378,10 @@
 the lock_sys_t::mutex. */
 static lock_stack_t*	lock_stack;
 
+#ifdef UNIV_DEBUG
 /** The count of the types of locks. */
 static const ulint	lock_types = UT_ARR_SIZE(lock_compatibility_matrix);
+#endif /* UNIV_DEBUG */
 
 #ifdef UNIV_PFS_MUTEX
 /* Key to register mutex with performance schema */
@@ -2026,7 +2028,8 @@
 
 	ut_ad(lock_mutex_own());
 	ut_ad(caller_owns_trx_mutex == trx_mutex_own(trx));
-	ut_ad(dict_index_is_clust(index) || !dict_index_is_online_ddl(index));
+	ut_ad(dict_index_is_clust(index)
+	      || dict_index_get_online_status(index) != ONLINE_INDEX_CREATION);
 #ifdef UNIV_DEBUG
 	switch (type_mode & LOCK_MODE_MASK) {
 	case LOCK_X:
@@ -4388,7 +4391,8 @@
 	dberr_t		err;
 	const lock_t*	wait_for;
 
-	ut_ad(table && thr);
+	ut_ad(table != NULL);
+	ut_ad(thr != NULL);
 
 	if (flags & BTR_NO_LOCKING_FLAG) {
 
@@ -5366,6 +5370,7 @@
 			ulint	space	= lock->un_member.rec_lock.space;
 			ulint	zip_size= fil_space_get_zip_size(space);
 			ulint	page_no = lock->un_member.rec_lock.page_no;
+			ibool	tablespace_being_deleted = FALSE;
 
 			if (UNIV_UNLIKELY(zip_size == ULINT_UNDEFINED)) {
 
@@ -5384,12 +5389,28 @@
 			lock_mutex_exit();
 			mutex_exit(&trx_sys->mutex);
 
-			mtr_start(&mtr);
+			DEBUG_SYNC_C("innodb_monitor_before_lock_page_read");
+
+			/* Check if the space is exists or not. only when the space
+			is valid, try to get the page. */
+			tablespace_being_deleted = fil_inc_pending_ops(space, false);
+
+			if (!tablespace_being_deleted) {
+				mtr_start(&mtr);
+
+				buf_page_get_gen(space, zip_size, page_no,
+						 RW_NO_LATCH, NULL,
+						 BUF_GET_POSSIBLY_FREED,
+						 __FILE__, __LINE__, &mtr);
 
-			buf_page_get_with_no_latch(
-				space, zip_size, page_no, &mtr);
+				mtr_commit(&mtr);
 
-			mtr_commit(&mtr);
+				fil_decr_pending_ops(space);
+			} else {
+				fprintf(file, "RECORD LOCKS on"
+					" non-existing space %lu\n",
+					(ulong) space);
+			}
 
 			load_page_first = FALSE;
 
@@ -5812,7 +5833,7 @@
 
 	/* Make sure that the tablespace is not deleted while we are
 	trying to access the page. */
-	if (!fil_inc_pending_ops(space)) {
+	if (!fil_inc_pending_ops(space, true)) {
 		mtr_start(&mtr);
 		block = buf_page_get_gen(
 			space, fil_space_get_zip_size(space),
@@ -5906,6 +5927,7 @@
 	lock_t*		lock;
 	dberr_t		err;
 	ulint		next_rec_heap_no;
+	ibool		inherit_in = *inherit;
 
 	ut_ad(block->frame == page_align(rec));
 	ut_ad(!dict_index_is_online_ddl(index)
@@ -5938,7 +5960,7 @@
 
 		lock_mutex_exit();
 
-		if (!dict_index_is_clust(index)) {
+		if (inherit_in && !dict_index_is_clust(index)) {
 			/* Update the page max trx id field */
 			page_update_max_trx_id(block,
 					       buf_block_get_page_zip(block),
@@ -5986,7 +6008,7 @@
 		err = DB_SUCCESS;
 		/* fall through */
 	case DB_SUCCESS:
-		if (dict_index_is_clust(index)) {
+		if (!inherit_in || dict_index_is_clust(index)) {
 			break;
 		}
 		/* Update the page max trx id field */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/log/log0log.cc percona-xtrabackup-2.3.7/storage/innobase/log/log0log.cc
--- percona-xtrabackup-2.2.3/storage/innobase/log/log0log.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/log/log0log.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2009, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -48,6 +48,7 @@
 #include "srv0start.h"
 #include "trx0sys.h"
 #include "trx0trx.h"
+#include "trx0roll.h"
 #include "srv0mon.h"
 
 /*
@@ -196,7 +197,7 @@
 {
 	ulint	move_start;
 	ulint	move_end;
-	byte	tmp_buf[OS_FILE_LOG_BLOCK_SIZE];
+	byte	*tmp_buf = static_cast<byte *>(alloca(OS_FILE_LOG_BLOCK_SIZE));
 
 	mutex_enter(&(log_sys->mutex));
 
@@ -621,7 +622,6 @@
 /******************************************************//**
 Calculates the offset of an lsn within a log group.
 @return	offset within the log group */
-static
 lsn_t
 log_group_calc_lsn_offset(
 /*======================*/
@@ -998,7 +998,9 @@
 	group->state = LOG_GROUP_OK;
 	group->lsn = LOG_START_LSN;
 	group->lsn_offset = LOG_FILE_HDR_SIZE;
+	group->lsn_offset_alt = LOG_FILE_HDR_SIZE;
 	group->n_pending_writes = 0;
+	group->alt_offset_chosen = FALSE;
 
 	group->file_header_bufs_ptr = static_cast<byte**>(
 		mem_zalloc(sizeof(byte*) * n_files));
@@ -1254,7 +1256,7 @@
 	mach_write_to_4(buf + LOG_GROUP_ID, group->id);
 	mach_write_to_8(buf + LOG_FILE_START_LSN, start_lsn);
 
-	/* Wipe over possible label of ibbackup --restore */
+	/* Wipe over possible label of mysqlbackup --restore */
 	memcpy(buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP, "    ", 4);
 
 	if (srv_log_block_size > 512) {
@@ -1993,7 +1995,7 @@
 
 	lsn = start + LOG_BLOCK_HDR_SIZE;
 
-	/* Write the label of ibbackup --restore */
+	/* Write the label of mysqlbackup --restore */
 	strcpy((char*) hdr_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP,
 	       "ibbackup ");
 	ut_sprintf_timestamp((char*) hdr_buf
@@ -3267,6 +3269,12 @@
 
 	ib_logf(IB_LOG_LEVEL_INFO, "Starting shutdown...");
 
+	while (srv_fast_shutdown == 0 && trx_rollback_or_clean_is_active) {
+		/* we should wait until rollback after recovery end
+		for slow shutdown */
+		os_thread_sleep(100000);
+	}
+
 	/* Wait until the master thread and all other operations are idle: our
 	algorithm only works if the server is idle at shutdown */
 
@@ -3462,7 +3470,11 @@
 
 	lsn = log_sys->lsn;
 
-	if (lsn != log_sys->last_checkpoint_lsn
+	ut_ad(srv_force_recovery != SRV_FORCE_NO_LOG_REDO
+	      || lsn == log_sys->last_checkpoint_lsn + LOG_BLOCK_HDR_SIZE);
+
+	if ((srv_force_recovery != SRV_FORCE_NO_LOG_REDO
+	     && lsn != log_sys->last_checkpoint_lsn)
 #ifdef UNIV_LOG_ARCHIVE
 	    || (srv_log_archive_on
 		&& lsn != log_sys->archived_lsn + LOG_BLOCK_HDR_SIZE)
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/log/log0recv.cc percona-xtrabackup-2.3.7/storage/innobase/log/log0recv.cc
--- percona-xtrabackup-2.2.3/storage/innobase/log/log0recv.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/log/log0recv.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -65,7 +65,7 @@
 
 
 /** This is set to FALSE if the backup was originally taken with the
-ibbackup --include regexp option: then we do not want to create tables in
+mysqlbackup --include regexp option: then we do not want to create tables in
 directories which were not included */
 UNIV_INTERN ibool	recv_replay_file_ops	= TRUE;
 
@@ -800,8 +800,20 @@
 				buf + LOG_CHECKPOINT_LSN);
 			group->lsn_offset = mach_read_from_4(
 				buf + LOG_CHECKPOINT_OFFSET_LOW32);
-			group->lsn_offset |= ((lsn_t) mach_read_from_4(
-				buf + LOG_CHECKPOINT_OFFSET_HIGH32)) << 32;
+			group->lsn_offset_alt = group->lsn_offset;
+			if (group->file_size * group->n_files >
+				4294967296ULL /* 4GiB */) {
+				group->lsn_offset |= ((lsn_t) mach_read_from_4(
+					buf + LOG_CHECKPOINT_OFFSET_HIGH32))
+					<< 32;
+				group->lsn_offset_alt =
+					((lsn_t) mach_read_from_8(
+					buf + LOG_CHECKPOINT_ARCHIVED_LSN));
+				if (group->alt_offset_chosen) {
+					group->lsn_offset =
+						group->lsn_offset_alt;
+				}
+			}
 			checkpoint_no = mach_read_from_8(
 				buf + LOG_CHECKPOINT_NO);
 
@@ -1937,7 +1949,7 @@
 		goto loop;
 	}
 
-	ut_ad(!allow_ibuf == mutex_own(&log_sys->mutex));
+	ut_ad((!allow_ibuf) == mutex_own(&log_sys->mutex));
 
 	if (!allow_ibuf) {
 		recv_no_ibuf_operations = TRUE;
@@ -2144,7 +2156,7 @@
 
 			/* Extend the tablespace's last file if the page_no
 			does not fall inside its bounds; we assume the last
-			file is auto-extending, and ibbackup copied the file
+			file is auto-extending, and mysqlbackup copied the file
 			when it still was smaller */
 
 			success = fil_extend_space_to_desired_size(
@@ -2515,10 +2527,10 @@
 
 			if (recv_replay_file_ops) {
 
-				/* In ibbackup --apply-log, replay an .ibd file
-				operation, if possible; note that
-				fil_path_to_mysql_datadir is set in ibbackup to
-				point to the datadir we should use there */
+				/* In mysqlbackup --apply-log, replay an .ibd
+				file operation, if possible; note that
+				fil_path_to_mysql_datadir is set in mysqlbackup
+				to point to the datadir we should use there */
 
 				if (NULL == fil_op_log_parse_or_replay(
 					    body, end_ptr, type,
@@ -3122,7 +3134,8 @@
 #endif /* UNIV_LOG_ARCHIVE */
 	byte*		buf;
 	byte*		log_hdr_buf;
-	byte		log_hdr_buf_base[LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE];
+	byte		*log_hdr_buf_base = static_cast<byte *>
+		(alloca(LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE));
 	dberr_t		err;
 	ut_when_dtor<recv_dblwr_t> tmp(recv_sys->dblwr);
 
@@ -3191,17 +3204,17 @@
 		if (srv_read_only_mode) {
 
 			ib_logf(IB_LOG_LEVEL_ERROR,
-				"Cannot restore from ibbackup, InnoDB running "
-				"in read-only mode!");
+				"Cannot restore from mysqlbackup, InnoDB "
+				"running in read-only mode!");
 
 			return(DB_ERROR);
 		}
 
-		/* This log file was created by ibbackup --restore: print
+		/* This log file was created by mysqlbackup --restore: print
 		a note to the user about it */
 
 		ib_logf(IB_LOG_LEVEL_INFO,
-			"The log file was created by ibbackup --apply-log "
+			"The log file was created by mysqlbackup --apply-log "
 			"at %s. The following crash recovery is part of a "
 			"normal restore.",
 			log_hdr_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP);
@@ -3504,7 +3517,6 @@
 
 	if (recv_needed_recovery) {
 		trx_sys_print_mysql_master_log_pos();
-		trx_sys_print_mysql_binlog_offset();
 	}
 
 	if (recv_sys->found_corrupt_log) {
@@ -3607,6 +3619,7 @@
 		/* Rollback the uncommitted transactions which have no user
 		session */
 
+		trx_rollback_or_clean_is_active = true;
 		os_thread_create(trx_rollback_or_clean_all_recovered, 0, 0);
 	}
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/os/os0file.cc percona-xtrabackup-2.3.7/storage/innobase/os/os0file.cc
--- percona-xtrabackup-2.2.3/storage/innobase/os/os0file.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/os/os0file.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2009, Percona Inc.
 
 Portions of this file contain modifications contributed and copyrighted
@@ -66,6 +66,9 @@
 /** Log segment id */
 static const ulint IO_LOG_SEGMENT = 1;
 
+/** Number of retries for partial I/O's */
+static const ulint NUM_RETRIES_ON_PARTIAL_IO = 10;
+
 /* This specifies the file permissions InnoDB uses when it creates files in
 Unix; the value of os_innodb_umask is initialized in ha_innodb.cc to
 my_umask */
@@ -652,7 +655,7 @@
 		}
 
 		if (should_exit) {
-			exit(1);
+			ut_error;
 		}
 	}
 
@@ -1824,7 +1827,7 @@
 	bool	ret;
 	ulint	count	= 0;
 loop:
-	/* In Windows, deleting an .ibd file may fail if ibbackup is copying
+	/* In Windows, deleting an .ibd file may fail if mysqlbackup is copying
 	it */
 
 	ret = DeleteFile((LPCTSTR) name);
@@ -1849,7 +1852,7 @@
 		ib_logf(IB_LOG_LEVEL_WARN, "Delete of file %s failed.", name);
 	}
 
-	os_thread_sleep(1000000);	/* sleep for a second */
+	os_thread_sleep(500000);	/* sleep for 0.5 second */
 
 	if (count > 2000) {
 
@@ -1886,7 +1889,7 @@
 	BOOL	ret;
 	ulint	count	= 0;
 loop:
-	/* In Windows, deleting an .ibd file may fail if ibbackup is copying
+	/* In Windows, deleting an .ibd file may fail if mysqlbackup is copying
 	it */
 
 	ret = DeleteFile((LPCTSTR) name);
@@ -1909,7 +1912,7 @@
 
 		fprintf(stderr,
 			"InnoDB: Warning: cannot delete file %s\n"
-			"InnoDB: Are you running ibbackup"
+			"InnoDB: Are you running mysqlbackup"
 			" to back up the file?\n", name);
 	}
 
@@ -2336,11 +2339,75 @@
 #endif
 }
 
-#ifndef __WIN__
+#ifndef _WIN32
+/*******************************************************************//**
+Does a syncronous read or write depending upon the type specified
+In case of partial reads/writes the function tries
+NUM_RETRIES_ON_PARTIAL_IO times to read/write the complete data.
+@return number of bytes read/written, -1 if error */
+static __attribute__((warn_unused_result))
+ssize_t
+os_file_io(
+/*==========*/
+	os_file_t	file,	/*!< in: handle to a file */
+	void*		buf,	/*!< in: buffer where to read/write */
+	ulint		n,	/*!< in: number of bytes to read/write */
+	off_t		offset,	/*!< in: file offset from where to read/write */
+	ulint		type)   /*!< in: type for read or write */
+{
+	ssize_t bytes_returned = 0;
+	ssize_t n_bytes;
+
+	for (ulint i = 0; i < NUM_RETRIES_ON_PARTIAL_IO; ++i) {
+		if (type == OS_FILE_READ ) {
+			n_bytes = pread(file, buf, n, offset);
+		} else {
+			ut_ad(type == OS_FILE_WRITE);
+			n_bytes = pwrite(file, buf, n, offset);
+		}
+
+		if ((ulint) n_bytes == n) {
+			bytes_returned += n_bytes;
+			return(bytes_returned);
+		} else if (n_bytes > 0 && (ulint) n_bytes < n) {
+			/* For partial read/write scenario */
+			if (type == OS_FILE_READ) {
+				ib_logf(IB_LOG_LEVEL_WARN,
+					"%lu bytes should have"
+					" been read. Only %lu bytes"
+					" read. Retrying again to read"
+					" the remaining bytes.",
+					(ulong) n, (ulong) n_bytes);
+			} else {
+				ib_logf(IB_LOG_LEVEL_WARN,
+					"%lu bytes should have"
+					" been written. Only %lu bytes"
+					" written. Retrying again to"
+					" write the remaining bytes.",
+					(ulong) n, (ulong) n_bytes);
+			}
+
+			buf = (uchar*) buf + (ulint) n_bytes;
+			n -=  (ulint) n_bytes;
+			offset += n_bytes;
+			bytes_returned += (ulint) n_bytes;
+
+		} else {
+			break;
+		}
+	}
+
+	ib_logf(IB_LOG_LEVEL_WARN,
+		"Retry attempts for %s partial data failed.",
+		type == OS_FILE_READ ? "reading" : "writing");
+
+	return(bytes_returned);
+}
+
 /*******************************************************************//**
 Does a synchronous read operation in Posix.
-@return	number of bytes read, -1 if error */
-static __attribute__((nonnull, warn_unused_result))
+@return number of bytes read, -1 if error */
+static __attribute__((warn_unused_result))
 ssize_t
 os_file_pread(
 /*==========*/
@@ -2349,10 +2416,8 @@
 	ulint		n,	/*!< in: number of bytes to read */
 	os_offset_t	offset)	/*!< in: file offset from where to read */
 {
-	off_t	offs;
-#if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
-	ssize_t	n_bytes;
-#endif /* HAVE_PREAD && !HAVE_BROKEN_PREAD */
+	off_t		offs;
+	ssize_t		read_bytes;
 
 	ut_ad(n);
 
@@ -2360,98 +2425,45 @@
 	64-bit address */
 	offs = (off_t) offset;
 
-	if (sizeof(off_t) <= 4) {
-		if (offset != (os_offset_t) offs) {
-			ib_logf(IB_LOG_LEVEL_ERROR,
-				"File read at offset > 4 GB");
-		}
+	if (sizeof(off_t) <= 4 && offset != (os_offset_t) offs) {
+		ib_logf(IB_LOG_LEVEL_ERROR, "File read at offset > 4 GB");
 	}
 
 	os_n_file_reads++;
 
-#if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
-#if defined(HAVE_ATOMIC_BUILTINS) && UNIV_WORD_SIZE == 8
+# if defined(HAVE_ATOMIC_BUILTINS_64)
 	(void) os_atomic_increment_ulint(&os_n_pending_reads, 1);
 	(void) os_atomic_increment_ulint(&os_file_n_pending_preads, 1);
 	MONITOR_ATOMIC_INC(MONITOR_OS_PENDING_READS);
-#else
+# else
 	os_mutex_enter(os_file_count_mutex);
 	os_file_n_pending_preads++;
 	os_n_pending_reads++;
 	MONITOR_INC(MONITOR_OS_PENDING_READS);
 	os_mutex_exit(os_file_count_mutex);
-#endif /* HAVE_ATOMIC_BUILTINS && UNIV_WORD == 8 */
+# endif /* HAVE_ATOMIC_BUILTINS */
 
-	n_bytes = pread(file, buf, n, offs);
+	read_bytes = os_file_io(file, buf, n, offs, OS_FILE_READ);
 
-#if defined(HAVE_ATOMIC_BUILTINS) && UNIV_WORD_SIZE == 8
+# if defined(HAVE_ATOMIC_BUILTINS_64)
 	(void) os_atomic_decrement_ulint(&os_n_pending_reads, 1);
 	(void) os_atomic_decrement_ulint(&os_file_n_pending_preads, 1);
 	MONITOR_ATOMIC_DEC(MONITOR_OS_PENDING_READS);
-#else
+# else
 	os_mutex_enter(os_file_count_mutex);
 	os_file_n_pending_preads--;
 	os_n_pending_reads--;
 	MONITOR_DEC(MONITOR_OS_PENDING_READS);
 	os_mutex_exit(os_file_count_mutex);
-#endif /* !HAVE_ATOMIC_BUILTINS || UNIV_WORD == 8 */
-
-	return(n_bytes);
-#else
-	{
-		off_t	ret_offset;
-		ssize_t	ret;
-#ifndef UNIV_HOTBACKUP
-		ulint	i;
-#endif /* !UNIV_HOTBACKUP */
+# endif /* HAVE_ATOMIC_BUILTINS */
 
-#if defined(HAVE_ATOMIC_BUILTINS) && UNIV_WORD_SIZE == 8
-		(void) os_atomic_increment_ulint(&os_n_pending_reads, 1);
-		MONITOR_ATOMIC_INC(MONITOR_OS_PENDING_READS);
-#else
-		os_mutex_enter(os_file_count_mutex);
-		os_n_pending_reads++;
-		MONITOR_INC(MONITOR_OS_PENDING_READS);
-		os_mutex_exit(os_file_count_mutex);
-#endif /* HAVE_ATOMIC_BUILTINS && UNIV_WORD == 8 */
-#ifndef UNIV_HOTBACKUP
-		/* Protect the seek / read operation with a mutex */
-		i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES;
-
-		os_mutex_enter(os_file_seek_mutexes[i]);
-#endif /* !UNIV_HOTBACKUP */
-
-		ret_offset = lseek(file, offs, SEEK_SET);
-
-		if (ret_offset < 0) {
-			ret = -1;
-		} else {
-			ret = read(file, buf, (ssize_t) n);
-		}
-
-#ifndef UNIV_HOTBACKUP
-		os_mutex_exit(os_file_seek_mutexes[i]);
-#endif /* !UNIV_HOTBACKUP */
-
-#if defined(HAVE_ATOMIC_BUILTINS) && UNIV_WORD_SIZE == 8
-		(void) os_atomic_decrement_ulint(&os_n_pending_reads, 1);
-		MONITOR_ATOIC_DEC(MONITOR_OS_PENDING_READS);
-#else
-		os_mutex_enter(os_file_count_mutex);
-		os_n_pending_reads--;
-		MONITOR_DEC(MONITOR_OS_PENDING_READS);
-		os_mutex_exit(os_file_count_mutex);
-#endif /* HAVE_ATOMIC_BUILTINS && UNIV_WORD_SIZE == 8 */
-
-		return(ret);
-	}
-#endif
+	return(read_bytes);
 }
 
 /*******************************************************************//**
 Does a synchronous write operation in Posix.
-@return	number of bytes written, -1 if error */
-static __attribute__((nonnull, warn_unused_result))
+@return number of bytes written, -1 if error */
+static __attribute__((warn_unused_result))
 ssize_t
 os_file_pwrite(
 /*===========*/
@@ -2460,95 +2472,49 @@
 	ulint		n,	/*!< in: number of bytes to write */
 	os_offset_t	offset)	/*!< in: file offset where to write */
 {
-	ssize_t	ret;
-	off_t	offs;
+	off_t		offs;
+	ssize_t		written_bytes;
 
 	ut_ad(n);
-	ut_ad(!srv_read_only_mode);
 
 	/* If off_t is > 4 bytes in size, then we assume we can pass a
 	64-bit address */
 	offs = (off_t) offset;
 
-	if (sizeof(off_t) <= 4) {
-		if (offset != (os_offset_t) offs) {
-			ib_logf(IB_LOG_LEVEL_ERROR,
-				"File write at offset > 4 GB.");
-		}
+	if (sizeof(off_t) <= 4 && offset != (os_offset_t) offs) {
+		ib_logf(IB_LOG_LEVEL_ERROR, "file write at offset > 4 GB.");
 	}
 
 	os_n_file_writes++;
 
-#if defined(HAVE_PWRITE) && !defined(HAVE_BROKEN_PREAD)
-#if !defined(HAVE_ATOMIC_BUILTINS) || UNIV_WORD_SIZE < 8
+#if defined(HAVE_ATOMIC_BUILTINS_64)
+	(void) os_atomic_increment_ulint(&os_n_pending_writes, 1);
+	(void) os_atomic_increment_ulint(&os_file_n_pending_pwrites, 1);
+	MONITOR_ATOMIC_INC(MONITOR_OS_PENDING_WRITES);
+#else
 	os_mutex_enter(os_file_count_mutex);
 	os_file_n_pending_pwrites++;
 	os_n_pending_writes++;
 	MONITOR_INC(MONITOR_OS_PENDING_WRITES);
 	os_mutex_exit(os_file_count_mutex);
-#else
-	(void) os_atomic_increment_ulint(&os_n_pending_writes, 1);
-	(void) os_atomic_increment_ulint(&os_file_n_pending_pwrites, 1);
-	MONITOR_ATOMIC_INC(MONITOR_OS_PENDING_WRITES);
-#endif /* !HAVE_ATOMIC_BUILTINS || UNIV_WORD < 8 */
+#endif /* HAVE_ATOMIC_BUILTINS */
 
-	ret = pwrite(file, buf, (ssize_t) n, offs);
+	written_bytes = os_file_io(
+		file, (void*) buf, n, offs, OS_FILE_WRITE);
 
-#if !defined(HAVE_ATOMIC_BUILTINS) || UNIV_WORD_SIZE < 8
+#if defined(HAVE_ATOMIC_BUILTINS_64)
+	(void) os_atomic_decrement_ulint(&os_n_pending_writes, 1);
+	(void) os_atomic_decrement_ulint(&os_file_n_pending_pwrites, 1);
+	MONITOR_ATOMIC_DEC(MONITOR_OS_PENDING_WRITES);
+#else
 	os_mutex_enter(os_file_count_mutex);
 	os_file_n_pending_pwrites--;
 	os_n_pending_writes--;
 	MONITOR_DEC(MONITOR_OS_PENDING_WRITES);
 	os_mutex_exit(os_file_count_mutex);
-#else
-	(void) os_atomic_decrement_ulint(&os_n_pending_writes, 1);
-	(void) os_atomic_decrement_ulint(&os_file_n_pending_pwrites, 1);
-	MONITOR_ATOMIC_DEC(MONITOR_OS_PENDING_WRITES);
-#endif /* !HAVE_ATOMIC_BUILTINS || UNIV_WORD < 8 */
-
-	return(ret);
-#else
-	{
-		off_t	ret_offset;
-# ifndef UNIV_HOTBACKUP
-		ulint	i;
-# endif /* !UNIV_HOTBACKUP */
-
-		os_mutex_enter(os_file_count_mutex);
-		os_n_pending_writes++;
-		MONITOR_INC(MONITOR_OS_PENDING_WRITES);
-		os_mutex_exit(os_file_count_mutex);
-
-# ifndef UNIV_HOTBACKUP
-		/* Protect the seek / write operation with a mutex */
-		i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES;
-
-		os_mutex_enter(os_file_seek_mutexes[i]);
-# endif /* UNIV_HOTBACKUP */
-
-		ret_offset = lseek(file, offs, SEEK_SET);
-
-		if (ret_offset < 0) {
-			ret = -1;
-
-			goto func_exit;
-		}
-
-		ret = write(file, buf, (ssize_t) n);
-
-func_exit:
-# ifndef UNIV_HOTBACKUP
-		os_mutex_exit(os_file_seek_mutexes[i]);
-# endif /* !UNIV_HOTBACKUP */
-
-		os_mutex_enter(os_file_count_mutex);
-		os_n_pending_writes--;
-		MONITOR_DEC(MONITOR_OS_PENDING_WRITES);
-		os_mutex_exit(os_file_count_mutex);
+#endif /* HAVE_ATOMIC_BUILTINS */
 
-		return(ret);
-	}
-#endif /* !UNIV_HOTBACKUP */
+	return(written_bytes);
 }
 #endif
 
@@ -2645,13 +2611,18 @@
 	ret = os_file_pread(file, buf, n, offset);
 
 	if ((ulint) ret == n) {
-
 		return(TRUE);
+	} else if (ret == -1) {
+                ib_logf(IB_LOG_LEVEL_ERROR,
+			"Error in system call pread(). The operating"
+			" system error number is %lu.",(ulint) errno);
+        } else {
+		/* Partial read occured */
+		ib_logf(IB_LOG_LEVEL_ERROR,
+			"Tried to read " ULINTPF " bytes at offset "
+			UINT64PF ". Was only able to read %ld.",
+			n, offset, (lint) ret);
 	}
-
-	ib_logf(IB_LOG_LEVEL_ERROR,
-		"Tried to read "ULINTPF" bytes at offset " UINT64PF". "
-		"Was only able to read %ld.", n, offset, (lint) ret);
 #endif /* __WIN__ */
 #ifdef __WIN__
 error_handling:
@@ -2659,6 +2630,13 @@
 	retry = os_file_handle_error(NULL, "read");
 
 	if (retry) {
+#ifndef _WIN32
+		if (ret > 0 && (ulint) ret < n) {
+			buf = (uchar*) buf + (ulint) ret;
+			offset += (ulint) ret;
+			n -= (ulint) ret;
+		}
+#endif
 		goto try_again;
 	}
 
@@ -2772,8 +2750,17 @@
 	ret = os_file_pread(file, buf, n, offset);
 
 	if ((ulint) ret == n) {
-
 		return(TRUE);
+	} else if (ret == -1) {
+                ib_logf(IB_LOG_LEVEL_ERROR,
+			"Error in system call pread(). The operating"
+			" system error number is %lu.",(ulint) errno);
+        } else {
+		/* Partial read occured */
+		ib_logf(IB_LOG_LEVEL_ERROR,
+			"Tried to read " ULINTPF " bytes at offset "
+			UINT64PF ". Was only able to read %ld.",
+			n, offset, (lint) ret);
 	}
 #endif /* __WIN__ */
 #ifdef __WIN__
@@ -2782,6 +2769,13 @@
 	retry = os_file_handle_error_no_exit(NULL, "read", FALSE);
 
 	if (retry) {
+#ifndef _WIN32
+		if (ret > 0 && (ulint) ret < n) {
+			buf = (uchar*) buf + (ulint) ret;
+			offset += ret;
+			n -= (ulint) ret;
+		}
+#endif /* _WIN32 */
 		goto try_again;
 	}
 
@@ -2974,18 +2968,26 @@
 
 		ut_print_timestamp(stderr);
 
-		fprintf(stderr,
-			" InnoDB: Error: Write to file %s failed"
-			" at offset "UINT64PF".\n"
-			"InnoDB: %lu bytes should have been written,"
-			" only %ld were written.\n"
-			"InnoDB: Operating system error number %lu.\n"
-			"InnoDB: Check that your OS and file system"
-			" support files of this size.\n"
-			"InnoDB: Check also that the disk is not full"
-			" or a disk quota exceeded.\n",
-			name, offset, n, (lint) ret,
-			(ulint) errno);
+		if(ret == -1) {
+			ib_logf(IB_LOG_LEVEL_ERROR,
+				"Failure of system call pwrite(). Operating"
+				" system error number is %lu.",
+				(ulint) errno);
+		} else {
+			fprintf(stderr,
+				" InnoDB: Error: Write to file %s failed"
+				" at offset " UINT64PF ".\n"
+				"InnoDB: %lu bytes should have been written,"
+				" only %ld were written.\n"
+				"InnoDB: Operating system error number %lu.\n"
+				"InnoDB: Check that your OS and file system"
+				" support files of this size.\n"
+				"InnoDB: Check also that the disk is not full"
+				" or a disk quota exceeded.\n",
+				name, offset, n, (lint) ret,
+				(ulint) errno);
+		}
+
 		if (strerror(errno) != NULL) {
 			fprintf(stderr,
 				"InnoDB: Error number %d means '%s'.\n",
@@ -4541,8 +4543,8 @@
 	ut_ad(file);
 	ut_ad(buf);
 	ut_ad(n > 0);
-	ut_ad(n % OS_FILE_LOG_BLOCK_SIZE == 0);
-	ut_ad(offset % OS_FILE_LOG_BLOCK_SIZE == 0);
+	ut_ad(n % OS_MIN_LOG_BLOCK_SIZE == 0);
+	ut_ad(offset % OS_MIN_LOG_BLOCK_SIZE == 0);
 	ut_ad(os_aio_validate_skip());
 #ifdef WIN_ASYNC_IO
 	ut_ad((n & 0xFFFFFFFFUL) == n);
@@ -5047,6 +5049,7 @@
 	segment = os_aio_get_array_and_local_segment(&array, global_seg);
 	n = array->n_slots / array->n_segments;
 
+wait_for_event:
 	/* Loop until we have found a completed request. */
 	for (;;) {
 		ibool	any_reserved = FALSE;
@@ -5108,6 +5111,41 @@
 	if (slot->ret == 0 && slot->n_bytes == (long) slot->len) {
 
 		ret = TRUE;
+	} else if ((slot->ret == 0) && (slot->n_bytes > 0)
+		   &&  (slot->n_bytes < (long) slot->len)) {
+		/* Partial read or write scenario */
+		int submit_ret;
+		struct iocb*    iocb;
+		slot->buf = (byte*)slot->buf + slot->n_bytes;
+		slot->offset = slot->offset + slot->n_bytes;
+		slot->len = slot->len - slot->n_bytes;
+		/* Resetting the bytes read/written */
+		slot->n_bytes = 0;
+		slot->io_already_done = false;
+		iocb = &(slot->control);
+
+		if (slot->type == OS_FILE_READ) {
+			io_prep_pread(&slot->control, slot->file, slot->buf,
+				      slot->len, (off_t) slot->offset);
+		} else {
+			ut_a(slot->type == OS_FILE_WRITE);
+			io_prep_pwrite(&slot->control, slot->file, slot->buf,
+				       slot->len, (off_t) slot->offset);
+		}
+		/* Resubmit an I/O request */
+		submit_ret = io_submit(array->aio_ctx[segment], 1, &iocb);
+		if (submit_ret < 0 ) {
+			/* Aborting in case of submit failure */
+			ib_logf(IB_LOG_LEVEL_FATAL,
+				"Native Linux AIO interface. io_submit()"
+				" call failed when resubmitting a partial"
+				" I/O request on the file %s.",
+				slot->name);
+		} else {
+			ret = false;
+			os_mutex_exit(array->mutex);
+			goto wait_for_event;
+		}
 	} else {
 		errno = -slot->ret;
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/os/os0sync.cc percona-xtrabackup-2.3.7/storage/innobase/os/os0sync.cc
--- percona-xtrabackup-2.2.3/storage/innobase/os/os0sync.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/os/os0sync.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2015, 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
@@ -233,24 +233,6 @@
 #endif
 }
 
-/*********************************************************//**
-Wakes one thread waiting for condition variable */
-UNIV_INLINE
-void
-os_cond_signal(
-/*==========*/
-	os_cond_t*	cond)	/*!< in: condition variable. */
-{
-	ut_a(cond);
-
-#ifdef __WIN__
-	ut_a(wake_condition_variable != NULL);
-	wake_condition_variable(cond);
-#else
-	ut_a(pthread_cond_signal(cond) == 0);
-#endif
-}
-
 /*********************************************************//**
 Destroys condition variable */
 UNIV_INLINE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/os/os0thread.cc percona-xtrabackup-2.3.7/storage/innobase/os/os0thread.cc
--- percona-xtrabackup-2.2.3/storage/innobase/os/os0thread.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/os/os0thread.cc	2017-02-27 07:47:02.000000000 +0000
@@ -114,6 +114,9 @@
 	os_thread_id_t*		thread_id)	/*!< out: id of the created
 						thread, or NULL */
 {
+	/* the new thread should look recent changes up here so far. */
+	os_wmb;
+
 #ifdef __WIN__
 	os_thread_t	thread;
 	DWORD		win_thread_id;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/page/page0zip.cc percona-xtrabackup-2.3.7/storage/innobase/page/page0zip.cc
--- percona-xtrabackup-2.2.3/storage/innobase/page/page0zip.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/page/page0zip.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2015, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -1572,7 +1572,7 @@
 {
 	if (index) {
 		dict_table_t*	table = index->table;
-		os_fast_mutex_free(&index->zip_pad.mutex);
+		dict_index_zip_pad_mutex_destroy(index);
 		mem_heap_free(index->heap);
 
 		dict_mem_table_free(table);
@@ -3254,24 +3254,8 @@
 	temp_page_buf = static_cast<byte*>(ut_malloc(2 * UNIV_PAGE_SIZE));
 	temp_page = static_cast<byte*>(ut_align(temp_page_buf, UNIV_PAGE_SIZE));
 
-#ifdef UNIV_DEBUG_VALGRIND
-	/* Get detailed information on the valid bits in case the
-	UNIV_MEM_ASSERT_RW() checks fail.  The v-bits of page[],
-	page_zip->data[] or page_zip could be viewed at temp_page[] or
-	temp_page_zip in a debugger when running valgrind --db-attach. */
-	(void) VALGRIND_GET_VBITS(page, temp_page, UNIV_PAGE_SIZE);
 	UNIV_MEM_ASSERT_RW(page, UNIV_PAGE_SIZE);
-# if UNIV_WORD_SIZE == 4
-	VALGRIND_GET_VBITS(page_zip, &temp_page_zip, sizeof temp_page_zip);
-	/* On 32-bit systems, there is no padding in page_zip_des_t.
-	On other systems, Valgrind could complain about uninitialized
-	pad bytes. */
-	UNIV_MEM_ASSERT_RW(page_zip, sizeof *page_zip);
-# endif
-	(void) VALGRIND_GET_VBITS(page_zip->data, temp_page,
-				  page_zip_get_size(page_zip));
 	UNIV_MEM_ASSERT_RW(page_zip->data, page_zip_get_size(page_zip));
-#endif /* UNIV_DEBUG_VALGRIND */
 
 	temp_page_zip = *page_zip;
 	valid = page_zip_decompress(&temp_page_zip, temp_page, TRUE);
@@ -4785,7 +4769,8 @@
 	ulint	size;
 	ulint	trailer_size;
 
-	ut_ad(ptr && end_ptr);
+	ut_ad(ptr != NULL);
+	ut_ad(end_ptr != NULL);
 	ut_ad(!page == !page_zip);
 
 	if (UNIV_UNLIKELY(ptr + (2 + 2) > end_ptr)) {
@@ -4905,8 +4890,15 @@
 	stored = static_cast<ib_uint32_t>(mach_read_from_4(
 		static_cast<const unsigned char*>(data) + FIL_PAGE_SPACE_OR_CHKSUM));
 
-	/* declare empty pages non-corrupted */
-	if (stored == 0) {
+#if FIL_PAGE_LSN % 8
+#error "FIL_PAGE_LSN must be 64 bit aligned"
+#endif
+
+	/* Check if page is empty */
+	if (stored == 0
+	    && *reinterpret_cast<const ib_uint64_t*>(static_cast<const char*>(
+		data)
+		+ FIL_PAGE_LSN) == 0) {
 		/* make sure that the page is really empty */
 		ulint i;
 		for (i = 0; i < size; i++) {
@@ -4914,7 +4906,7 @@
 				return(FALSE);
 			}
 		}
-
+		/* Empty page */
 		return(TRUE);
 	}
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/que/que0que.cc percona-xtrabackup-2.3.7/storage/innobase/que/que0que.cc
--- percona-xtrabackup-2.2.3/storage/innobase/que/que0que.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/que/que0que.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2015, 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
@@ -380,32 +380,6 @@
 	return(thr);
 }
 
-/****************************************************************//**
-Tests if all the query threads in the same fork have a given state.
-@return TRUE if all the query threads in the same fork were in the
-given state */
-UNIV_INLINE
-ibool
-que_fork_all_thrs_in_state(
-/*=======================*/
-	que_fork_t*	fork,	/*!< in: query fork */
-	ulint		state)	/*!< in: state */
-{
-	que_thr_t*	thr_node;
-
-	for (thr_node = UT_LIST_GET_FIRST(fork->thrs);
-	     thr_node != NULL;
-	     thr_node = UT_LIST_GET_NEXT(thrs, thr_node)) {
-
-		if (thr_node->state != state) {
-
-			return(FALSE);
-		}
-	}
-
-	return(TRUE);
-}
-
 /**********************************************************************//**
 Calls que_graph_free_recursive for statements in a statement list. */
 static
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/rem/rem0cmp.cc percona-xtrabackup-2.3.7/storage/innobase/rem/rem0cmp.cc
--- percona-xtrabackup-2.2.3/storage/innobase/rem/rem0cmp.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/rem/rem0cmp.cc	2017-02-27 07:47:02.000000000 +0000
@@ -71,11 +71,10 @@
 				dtuple */
 	const ulint*	offsets,/*!< in: array returned by rec_get_offsets() */
 	ulint		n_cmp,	/*!< in: number of fields to compare */
-	ulint*		matched_fields)/*!< in/out: number of already
+	ulint*		matched_fields);/*!< in/out: number of already
 				completely  matched fields; when function
 				returns, contains the value for current
 				comparison */
-	__attribute__((nonnull, warn_unused_result));
 #endif /* UNIV_DEBUG */
 /*************************************************************//**
 This function is used to compare two data fields for which the data type
@@ -659,7 +658,10 @@
 					in current field */
 	int		ret;		/* return value */
 
-	ut_ad(dtuple && rec && matched_fields && matched_bytes);
+	ut_ad(dtuple != NULL);
+	ut_ad(rec != NULL);
+	ut_ad(matched_fields != NULL);
+	ut_ad(matched_bytes != NULL);
 	ut_ad(dtuple_check_typed(dtuple));
 	ut_ad(rec_offs_validate(rec, NULL, offsets));
 
@@ -1139,7 +1141,9 @@
 	int		ret = 0;	/* return value */
 	ulint		comp;
 
-	ut_ad(rec1 && rec2 && index);
+	ut_ad(rec1 != NULL);
+	ut_ad(rec2 != NULL);
+	ut_ad(index != NULL);
 	ut_ad(rec_offs_validate(rec1, index, offsets1));
 	ut_ad(rec_offs_validate(rec2, index, offsets2));
 	ut_ad(rec_offs_comp(offsets1) == rec_offs_comp(offsets2));
@@ -1375,7 +1379,9 @@
 	int		ret;		/* return value */
 	ulint		cur_field;	/* current field number */
 
-	ut_ad(dtuple && rec && matched_fields);
+	ut_ad(dtuple != NULL);
+	ut_ad(rec != NULL);
+	ut_ad(matched_fields != NULL);
 	ut_ad(dtuple_check_typed(dtuple));
 	ut_ad(rec_offs_validate(rec, NULL, offsets));
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/rem/rem0rec.cc percona-xtrabackup-2.3.7/storage/innobase/rem/rem0rec.cc
--- percona-xtrabackup-2.2.3/storage/innobase/rem/rem0rec.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/rem/rem0rec.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1338,7 +1338,9 @@
 {
 	rec_t*	rec;
 
-	ut_ad(buf && index && dtuple);
+	ut_ad(buf != NULL);
+	ut_ad(index != NULL);
+	ut_ad(dtuple != NULL);
 	ut_ad(dtuple_validate(dtuple));
 	ut_ad(dtuple_check_typed(dtuple));
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0ftsort.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0ftsort.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0ftsort.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0ftsort.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2010, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2010, 2014, 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
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0ins.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0ins.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0ins.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0ins.cc	2017-02-27 07:47:02.000000000 +0000
@@ -151,35 +151,37 @@
 	ut_ad(row && table && heap);
 	ut_ad(dtuple_get_n_fields(row) == dict_table_get_n_cols(table));
 
-	/* 1. Allocate buffer for row id */
+	/* allocate buffer to hold the needed system created hidden columns. */
+	uint len = DATA_ROW_ID_LEN + DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN;
+	ptr = static_cast<byte*>(mem_heap_zalloc(heap, len));
 
+	/* 1. Populate row-id */
 	col = dict_table_get_sys_col(table, DATA_ROW_ID);
 
 	dfield = dtuple_get_nth_field(row, dict_col_get_no(col));
 
-	ptr = static_cast<byte*>(mem_heap_zalloc(heap, DATA_ROW_ID_LEN));
-
 	dfield_set_data(dfield, ptr, DATA_ROW_ID_LEN);
 
 	node->row_id_buf = ptr;
 
-	/* 3. Allocate buffer for trx id */
+	ptr += DATA_ROW_ID_LEN;
 
+	/* 2. Populate trx id */
 	col = dict_table_get_sys_col(table, DATA_TRX_ID);
 
 	dfield = dtuple_get_nth_field(row, dict_col_get_no(col));
-	ptr = static_cast<byte*>(mem_heap_zalloc(heap, DATA_TRX_ID_LEN));
 
 	dfield_set_data(dfield, ptr, DATA_TRX_ID_LEN);
 
 	node->trx_id_buf = ptr;
 
-	/* 4. Allocate buffer for roll ptr */
+	ptr += DATA_TRX_ID_LEN;
+
+	/* 3. Populate roll ptr */
 
 	col = dict_table_get_sys_col(table, DATA_ROLL_PTR);
 
 	dfield = dtuple_get_nth_field(row, dict_col_get_no(col));
-	ptr = static_cast<byte*>(mem_heap_zalloc(heap, DATA_ROLL_PTR_LEN));
 
 	dfield_set_data(dfield, ptr, DATA_ROLL_PTR_LEN);
 }
@@ -1709,12 +1711,11 @@
 		table case (check_ref == 0), since MDL lock will prevent
 		concurrent DDL and DML on the same table */
 		if (!check_ref) {
-			for (const dict_foreign_t* check_foreign
-				= UT_LIST_GET_FIRST( table->referenced_list);
-			     check_foreign;
-			     check_foreign = UT_LIST_GET_NEXT(
-					referenced_list, check_foreign)) {
-				if (check_foreign == foreign) {
+			for (dict_foreign_set::iterator it
+				= table->referenced_set.begin();
+			     it != table->referenced_set.end();
+			     ++it) {
+				if (*it == foreign) {
 					verified = true;
 					break;
 				}
@@ -1762,12 +1763,15 @@
 
 	trx = thr_get_trx(thr);
 
-	foreign = UT_LIST_GET_FIRST(table->foreign_list);
-
 	DEBUG_SYNC_C_IF_THD(thr_get_trx(thr)->mysql_thd,
 			    "foreign_constraint_check_for_ins");
 
-	while (foreign) {
+	for (dict_foreign_set::iterator it = table->foreign_set.begin();
+	     it != table->foreign_set.end();
+	     ++it) {
+
+		foreign = *it;
+
 		if (foreign->foreign_index == index) {
 			dict_table_t*	ref_table = NULL;
 			dict_table_t*	foreign_table = foreign->foreign_table;
@@ -1823,8 +1827,6 @@
 				return(err);
 			}
 		}
-
-		foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
 	}
 
 	return(DB_SUCCESS);
@@ -1944,7 +1946,7 @@
 	do {
 		const rec_t*		rec	= btr_pcur_get_rec(&pcur);
 		const buf_block_t*	block	= btr_pcur_get_block(&pcur);
-		ulint			lock_type;
+		const ulint		lock_type = LOCK_ORDINARY;
 
 		if (page_rec_is_infimum(rec)) {
 
@@ -1954,16 +1956,6 @@
 		offsets = rec_get_offsets(rec, index, offsets,
 					  ULINT_UNDEFINED, &offsets_heap);
 
-		/* If the transaction isolation level is no stronger than
-		READ COMMITTED, then avoid gap locks. */
-		if (!page_rec_is_supremum(rec)
-		    && thr_get_trx(thr)->isolation_level
-					<= TRX_ISO_READ_COMMITTED) {
-			lock_type = LOCK_REC_NOT_GAP;
-		} else {
-			lock_type = LOCK_ORDINARY;
-		}
-
 		if (flags & BTR_NO_LOCKING_FLAG) {
 			/* Set no locks when applying log
 			in online table rebuild. */
@@ -2856,7 +2848,7 @@
 	dberr_t	err;
 	ulint	n_uniq;
 
-	if (UT_LIST_GET_FIRST(index->table->foreign_list)) {
+	if (!index->table->foreign_set.empty()) {
 		err = row_ins_check_foreign_constraints(
 			index->table, index, entry, thr);
 		if (err != DB_SUCCESS) {
@@ -2914,7 +2906,7 @@
 	mem_heap_t*	offsets_heap;
 	mem_heap_t*	heap;
 
-	if (UT_LIST_GET_FIRST(index->table->foreign_list)) {
+	if (!index->table->foreign_set.empty()) {
 		err = row_ins_check_foreign_constraints(index->table, index,
 							entry, thr);
 		if (err != DB_SUCCESS) {
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0log.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0log.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0log.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0log.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2015, 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
@@ -1381,6 +1381,27 @@
 			dfield_set_data(dfield, data, len);
 		}
 
+		if (len != UNIV_SQL_NULL && col->mtype == DATA_MYSQL
+		    && col->len != len && !dict_table_is_comp(log->table)) {
+
+			ut_ad(col->len >= len);
+			if (dict_table_is_comp(index->table)) {
+				byte*	buf = (byte*) mem_heap_alloc(heap,
+								     col->len);
+				memcpy(buf, dfield->data, len);
+				memset(buf + len, 0x20, col->len - len);
+
+				dfield_set_data(dfield, buf, col->len);
+			} else {
+				/* field length mismatch should not happen
+				when rebuilding the redundant row format
+				table. */
+				ut_ad(0);
+				*error = DB_CORRUPTION;
+				return(NULL);
+			}
+		}
+
 		/* See if any columns were changed to NULL or NOT NULL. */
 		const dict_col_t*	new_col
 			= dict_table_get_nth_col(log->table, col_no);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0merge.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0merge.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0merge.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0merge.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2015, 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
@@ -235,22 +235,86 @@
 	mem_heap_free(buf->heap);
 }
 
-/******************************************************//**
-Insert a data tuple into a sort buffer.
-@return	number of rows added, 0 if out of space */
+/** Convert the field data from compact to redundant format.
+@param[in]	row_field	field to copy from
+@param[out]	field		field to copy to
+@param[in]	len		length of the field data
+@param[in]	zip_size	compressed BLOB page size,
+				zero for uncompressed BLOBs
+@param[in,out]	heap		memory heap where to allocate data when
+				converting to ROW_FORMAT=REDUNDANT, or NULL
+				when not to invoke
+				row_merge_buf_redundant_convert(). */
+static
+void
+row_merge_buf_redundant_convert(
+	const dfield_t*		row_field,
+	dfield_t*		field,
+	ulint			len,
+	ulint			zip_size,
+	mem_heap_t*		heap)
+{
+	ut_ad(DATA_MBMINLEN(field->type.mbminmaxlen) == 1);
+	ut_ad(DATA_MBMAXLEN(field->type.mbminmaxlen) > 1);
+
+	byte*		buf = (byte*) mem_heap_alloc(heap, len);
+	ulint		field_len = row_field->len;
+	ut_ad(field_len <= len);
+
+	if (row_field->ext) {
+		const byte*	field_data = static_cast<byte*>(
+			dfield_get_data(row_field));
+		ulint		ext_len;
+
+		ut_a(field_len >= BTR_EXTERN_FIELD_REF_SIZE);
+		ut_a(memcmp(field_data + field_len - BTR_EXTERN_FIELD_REF_SIZE,
+			    field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE));
+
+		byte*	data = btr_copy_externally_stored_field(
+			&ext_len, field_data, zip_size, field_len, heap);
+
+		ut_ad(ext_len < len);
+
+		memcpy(buf, data, ext_len);
+		field_len = ext_len;
+	} else {
+		memcpy(buf, row_field->data, field_len);
+	}
+
+	memset(buf + field_len, 0x20, len - field_len);
+
+	dfield_set_data(field, buf, len);
+}
+
+/** Insert a data tuple into a sort buffer.
+@param[in,out]	buf		sort buffer
+@param[in]	fts_index	fts index to be created
+@param[in]	old_table	original table
+@param[in,out]	psort_info	parallel sort info
+@param[in]	row		table row
+@param[in]	ext		cache of externally stored
+				column prefixes, or NULL
+@param[in,out]	doc_id		Doc ID if we are creating
+				FTS index
+@param[in,out]	conv_heap	memory heap where to allocate data when
+				converting to ROW_FORMAT=REDUNDANT, or NULL
+				when not to invoke
+				row_merge_buf_redundant_convert()
+@param[in,out]	exceed_page	set if the record size exceeds the page size
+				when converting to ROW_FORMAT=REDUNDANT
+@return number of rows added, 0 if out of space */
 static
 ulint
 row_merge_buf_add(
-/*==============*/
-	row_merge_buf_t*	buf,	/*!< in/out: sort buffer */
-	dict_index_t*		fts_index,/*!< in: fts index to be created */
-	const dict_table_t*	old_table,/*!< in: original table */
-	fts_psort_t*		psort_info, /*!< in: parallel sort info */
-	const dtuple_t*		row,	/*!< in: table row */
-	const row_ext_t*	ext,	/*!< in: cache of externally stored
-					column prefixes, or NULL */
-	doc_id_t*		doc_id)	/*!< in/out: Doc ID if we are
-					creating FTS index */
+	row_merge_buf_t*	buf,
+	dict_index_t*		fts_index,
+	const dict_table_t*	old_table,
+	fts_psort_t*		psort_info,
+	const dtuple_t*		row,
+	const row_ext_t*	ext,
+	doc_id_t*		doc_id,
+	mem_heap_t*		conv_heap,
+	bool*			exceed_page)
 {
 	ulint			i;
 	const dict_index_t*	index;
@@ -400,6 +464,23 @@
 				n_row_added = 1;
 				continue;
 			}
+
+			if (field->len != UNIV_SQL_NULL
+			    && col->mtype == DATA_MYSQL
+			    && col->len != field->len) {
+
+				if (conv_heap != NULL) {
+					row_merge_buf_redundant_convert(
+						row_field, field, col->len,
+						dict_table_zip_size(old_table),
+						conv_heap);
+				} else {
+					/* Field length mismatch should not
+					happen when rebuilding redundant row
+					format table. */
+					ut_ad(dict_table_is_comp(index->table));
+				}
+			}
 		}
 
 		len = dfield_get_len(field);
@@ -508,6 +589,14 @@
 	of extra_size. */
 	data_size += (extra_size + 1) + ((extra_size + 1) >= 0x80);
 
+	/* Record size can exceed page size while converting to
+	redundant row format. But there is assert
+	ut_ad(size < UNIV_PAGE_SIZE) in rec_offs_data_size().
+	It may hit the assert before attempting to insert the row. */
+	if (conv_heap != NULL && data_size > UNIV_PAGE_SIZE) {
+		*exceed_page = true;
+	}
+
 	ut_ad(data_size < srv_sort_buf_size);
 
 	/* Reserve one byte for the end marker of row_merge_block_t. */
@@ -527,6 +616,10 @@
 		dfield_dup(field++, buf->heap);
 	} while (--n_fields);
 
+	if (conv_heap != NULL) {
+		mem_heap_empty(conv_heap);
+	}
+
 	DBUG_RETURN(n_row_added);
 }
 
@@ -786,7 +879,7 @@
 	if (UNIV_UNLIKELY(!success)) {
 		ut_print_timestamp(stderr);
 		fprintf(stderr,
-			"  InnoDB: failed to read merge block at "UINT64PF"\n",
+			"  InnoDB: failed to read merge block at " UINT64PF "\n",
 			ofs);
 	}
 
@@ -1208,6 +1301,7 @@
 	os_event_t		fts_parallel_sort_event = NULL;
 	ibool			fts_pll_sort = FALSE;
 	ib_int64_t		sig_count = 0;
+	mem_heap_t*		conv_heap = NULL;
 	DBUG_ENTER("row_merge_read_clustered_index");
 
 	ut_ad((old_table == new_table) == !col_map);
@@ -1303,6 +1397,11 @@
 
 	row_heap = mem_heap_create(sizeof(mrec_buf_t));
 
+	if (dict_table_is_comp(old_table)
+	    && !dict_table_is_comp(new_table)) {
+		conv_heap = mem_heap_create(sizeof(mrec_buf_t));
+	}
+
 	/* Scan the clustered index. */
 	for (;;) {
 		const rec_t*	rec;
@@ -1581,16 +1680,24 @@
 			row_merge_buf_t*	buf	= merge_buf[i];
 			merge_file_t*		file	= &files[i];
 			ulint			rows_added = 0;
+			bool			exceed_page = false;
 
 			if (UNIV_LIKELY
 			    (row && (rows_added = row_merge_buf_add(
 					buf, fts_index, old_table,
-					psort_info, row, ext, &doc_id)))) {
+					psort_info, row, ext, &doc_id,
+					conv_heap, &exceed_page)))) {
 
 				/* If we are creating FTS index,
 				a single row can generate more
 				records for tokenized word */
 				file->n_rec += rows_added;
+
+				if (exceed_page) {
+					err = DB_TOO_BIG_RECORD;
+					break;
+				}
+
 				if (doc_id > max_doc_id) {
 					max_doc_id = doc_id;
 				}
@@ -1691,12 +1798,18 @@
 				    (!(rows_added = row_merge_buf_add(
 						buf, fts_index, old_table,
 						psort_info, row, ext,
-						&doc_id)))) {
+						&doc_id, conv_heap,
+						&exceed_page)))) {
 					/* An empty buffer should have enough
 					room for at least one record. */
 					ut_error;
 				}
 
+				if (exceed_page) {
+					err = DB_TOO_BIG_RECORD;
+					break;
+				}
+
 				file->n_rec += rows_added;
 			}
 		}
@@ -1721,6 +1834,10 @@
 	}
 
 all_done:
+	if (conv_heap != NULL) {
+		mem_heap_free(conv_heap);
+	}
+
 #ifdef FTS_INTERNAL_DIAG_PRINT
 	DEBUG_FTS_SORT_PRINT("FTS_SORT: Complete Scan Table\n");
 #endif
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0mysql.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0mysql.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0mysql.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0mysql.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2015, 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
@@ -33,6 +33,7 @@
 #include <debug_sync.h>
 #include <my_dbug.h>
 
+#include <sql_const.h>
 #include "row0ins.h"
 #include "row0merge.h"
 #include "row0sel.h"
@@ -46,6 +47,7 @@
 #include "dict0boot.h"
 #include "dict0stats.h"
 #include "dict0stats_bg.h"
+#include "dict0priv.h"
 #include "trx0roll.h"
 #include "trx0purge.h"
 #include "trx0rec.h"
@@ -63,6 +65,7 @@
 #include "m_string.h"
 #include "my_sys.h"
 #include "ha_prototypes.h"
+#include <algorithm>
 
 /** Provide optional 4.x backwards compatibility for 5.0 and above */
 UNIV_INTERN ibool	row_rollback_on_timeout	= FALSE;
@@ -608,6 +611,7 @@
 	case DB_DUPLICATE_KEY:
 	case DB_FOREIGN_DUPLICATE_KEY:
 	case DB_TOO_BIG_RECORD:
+	case DB_TOO_BIG_FOR_REDO:
 	case DB_UNDO_RECORD_TOO_BIG:
 	case DB_ROW_IS_REFERENCED:
 	case DB_NO_REFERENCED_ROW:
@@ -710,8 +714,10 @@
 	row_prebuilt_t*	prebuilt;
 	mem_heap_t*	heap;
 	dict_index_t*	clust_index;
+	dict_index_t*	temp_index;
 	dtuple_t*	ref;
 	ulint		ref_len;
+	uint		srch_key_len = 0;
 	ulint		search_tuple_n_fields;
 
 	search_tuple_n_fields = 2 * dict_table_get_n_cols(table);
@@ -723,6 +729,14 @@
 
 	ref_len = dict_index_get_n_unique(clust_index);
 
+
+        /* Maximum size of the buffer needed for conversion of INTs from
+	little endian format to big endian format in an index. An index
+	can have maximum 16 columns (MAX_REF_PARTS) in it. Therfore
+	Max size for PK: 16 * 8 bytes (BIGINT's size) = 128 bytes
+	Max size Secondary index: 16 * 8 bytes + PK = 256 bytes. */
+#define MAX_SRCH_KEY_VAL_BUFFER         2* (8 * MAX_REF_PARTS)
+
 #define PREBUILT_HEAP_INITIAL_SIZE	\
 	( \
 	sizeof(*prebuilt) \
@@ -751,10 +765,38 @@
 	+ sizeof(que_thr_t) \
 	)
 
+	/* Calculate size of key buffer used to store search key in
+	InnoDB format. MySQL stores INTs in little endian format and
+	InnoDB stores INTs in big endian format with the sign bit
+	flipped. All other field types are stored/compared the same
+	in MySQL and InnoDB, so we must create a buffer containing
+	the INT key parts in InnoDB format.We need two such buffers
+	since both start and end keys are used in records_in_range(). */
+
+	for (temp_index = dict_table_get_first_index(table); temp_index;
+	     temp_index = dict_table_get_next_index(temp_index)) {
+		DBUG_EXECUTE_IF("innodb_srch_key_buffer_max_value",
+			ut_a(temp_index->n_user_defined_cols
+						== MAX_REF_PARTS););
+		uint temp_len = 0;
+		for (uint i = 0; i < temp_index->n_uniq; i++) {
+			if (temp_index->fields[i].col->mtype == DATA_INT) {
+				temp_len +=
+					temp_index->fields[i].fixed_len;
+			}
+		}
+		srch_key_len = max(srch_key_len,temp_len);
+	}
+
+	ut_a(srch_key_len <= MAX_SRCH_KEY_VAL_BUFFER);
+
+	DBUG_EXECUTE_IF("innodb_srch_key_buffer_max_value",
+		ut_a(srch_key_len == MAX_SRCH_KEY_VAL_BUFFER););
+
 	/* We allocate enough space for the objects that are likely to
 	be created later in order to minimize the number of malloc()
 	calls */
-	heap = mem_heap_create(PREBUILT_HEAP_INITIAL_SIZE);
+	heap = mem_heap_create(PREBUILT_HEAP_INITIAL_SIZE + 2 * srch_key_len);
 
 	prebuilt = static_cast<row_prebuilt_t*>(
 		mem_heap_zalloc(heap, sizeof(*prebuilt)));
@@ -767,6 +809,18 @@
 	prebuilt->sql_stat_start = TRUE;
 	prebuilt->heap = heap;
 
+	prebuilt->srch_key_val_len = srch_key_len;
+	if (prebuilt->srch_key_val_len) {
+		prebuilt->srch_key_val1 = static_cast<byte*>(
+			mem_heap_alloc(prebuilt->heap,
+				       2 * prebuilt->srch_key_val_len));
+		prebuilt->srch_key_val2 = prebuilt->srch_key_val1 +
+						prebuilt->srch_key_val_len;
+	} else {
+		prebuilt->srch_key_val1 = NULL;
+		prebuilt->srch_key_val2 = NULL;
+	}
+
 	btr_pcur_reset(&prebuilt->pcur);
 	btr_pcur_reset(&prebuilt->clust_pcur);
 
@@ -1359,7 +1413,7 @@
 			if (doc_id < next_doc_id) {
 				fprintf(stderr,
 					"InnoDB: FTS Doc ID must be large than"
-					" "UINT64PF" for table",
+					" " UINT64PF " for table",
 					next_doc_id - 1);
 				ut_print_name(stderr, trx, TRUE, table->name);
 				putc('\n', stderr);
@@ -1374,9 +1428,9 @@
 
 			if (doc_id - next_doc_id >= FTS_DOC_ID_MAX_STEP) {
 				fprintf(stderr,
-					"InnoDB: Doc ID "UINT64PF" is too"
+					"InnoDB: Doc ID " UINT64PF " is too"
 					" big. Its difference with largest"
-					" used Doc ID "UINT64PF" cannot"
+					" used Doc ID " UINT64PF " cannot"
 					" exceed or equal to %d\n",
 					doc_id, next_doc_id - 1,
 					FTS_DOC_ID_MAX_STEP);
@@ -1573,8 +1627,6 @@
 {
 	dict_foreign_t* foreign;
 
-	foreign = UT_LIST_GET_FIRST(table->referenced_list);
-
 	table->fk_max_recusive_level = 0;
 
 	(*depth)++;
@@ -1586,17 +1638,25 @@
 
 	/* Loop through this table's referenced list and also
 	recursively traverse each table's foreign table list */
-	while (foreign && foreign->foreign_table) {
-		if (foreign->foreign_table->fts) {
-			fts_init_doc_id(foreign->foreign_table);
+	for (dict_foreign_set::iterator it = table->referenced_set.begin();
+	     it != table->referenced_set.end();
+	     ++it) {
+
+		foreign = *it;
+
+		if (foreign->foreign_table == NULL) {
+			break;
 		}
 
-		if (UT_LIST_GET_LEN(foreign->foreign_table->referenced_list)
-		    > 0 && foreign->foreign_table != table) {
-			init_fts_doc_id_for_ref(foreign->foreign_table, depth);
+		if (foreign->foreign_table->fts != NULL) {
+			fts_init_doc_id(foreign->foreign_table);
 		}
 
-		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
+		if (!foreign->foreign_table->referenced_set.empty()
+		    && foreign->foreign_table != table) {
+			init_fts_doc_id_for_ref(
+				foreign->foreign_table, depth);
+		}
 	}
 }
 
@@ -1623,7 +1683,8 @@
 	trx_t*		trx		= prebuilt->trx;
 	ulint		fk_depth	= 0;
 
-	ut_ad(prebuilt && trx);
+	ut_ad(prebuilt != NULL);
+	ut_ad(trx != NULL);
 	UT_NOT_USED(mysql_rec);
 
 	if (prebuilt->table->ibd_file_missing) {
@@ -1820,7 +1881,8 @@
 	btr_pcur_t*	clust_pcur	= &prebuilt->clust_pcur;
 	trx_t*		trx		= prebuilt->trx;
 
-	ut_ad(prebuilt && trx);
+	ut_ad(prebuilt != NULL);
+	ut_ad(trx != NULL);
 
 	if (UNIV_UNLIKELY
 	    (!srv_locks_unsafe_for_binlog
@@ -2825,43 +2887,47 @@
 	const trx_t*		trx,	/*!< in: transaction handle */
 	const dict_table_t*	table)	/*!< in: table to be discarded */
 {
-	const dict_foreign_t*	foreign;
+
+	if (srv_read_only_mode || !trx->check_foreigns) {
+		return(DB_SUCCESS);
+	}
 
 	/* Check if the table is referenced by foreign key constraints from
 	some other table (not the table itself) */
+	dict_foreign_set::iterator	it
+		= std::find_if(table->referenced_set.begin(),
+			       table->referenced_set.end(),
+			       dict_foreign_different_tables());
 
-	for (foreign = UT_LIST_GET_FIRST(table->referenced_list);
-	     foreign && foreign->foreign_table == table;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
-
+	if (it == table->referenced_set.end()) {
+		return(DB_SUCCESS);
 	}
 
-	if (!srv_read_only_mode && foreign && trx->check_foreigns) {
+	const dict_foreign_t*	foreign	= *it;
+	FILE*			ef	= dict_foreign_err_file;
 
-		FILE*	ef	= dict_foreign_err_file;
-
-		/* We only allow discarding a referenced table if
-		FOREIGN_KEY_CHECKS is set to 0 */
+	ut_ad(foreign->foreign_table != table);
+	ut_ad(foreign->referenced_table == table);
 
-		mutex_enter(&dict_foreign_err_mutex);
+	/* We only allow discarding a referenced table if
+	FOREIGN_KEY_CHECKS is set to 0 */
 
-		rewind(ef);
+	mutex_enter(&dict_foreign_err_mutex);
 
-		ut_print_timestamp(ef);
+	rewind(ef);
 
-		fputs("  Cannot DISCARD table ", ef);
-		ut_print_name(stderr, trx, TRUE, table->name);
-		fputs("\n"
-		      "because it is referenced by ", ef);
-		ut_print_name(stderr, trx, TRUE, foreign->foreign_table_name);
-		putc('\n', ef);
+	ut_print_timestamp(ef);
 
-		mutex_exit(&dict_foreign_err_mutex);
+	fputs("  Cannot DISCARD table ", ef);
+	ut_print_name(stderr, trx, TRUE, table->name);
+	fputs("\n"
+	      "because it is referenced by ", ef);
+	ut_print_name(stderr, trx, TRUE, foreign->foreign_table_name);
+	putc('\n', ef);
 
-		return(DB_CANNOT_DROP_CONSTRAINT);
-	}
+	mutex_exit(&dict_foreign_err_mutex);
 
-	return(DB_SUCCESS);
+	return(DB_CANNOT_DROP_CONSTRAINT);
 }
 
 /*********************************************************************//**
@@ -3164,7 +3230,6 @@
 	dict_table_t*	table,	/*!< in: table handle */
 	trx_t*		trx)	/*!< in: transaction handle */
 {
-	dict_foreign_t*	foreign;
 	dberr_t		err;
 	mem_heap_t*	heap;
 	byte*		buf;
@@ -3256,18 +3321,17 @@
 	/* Check if the table is referenced by foreign key constraints from
 	some other table (not the table itself) */
 
-	for (foreign = UT_LIST_GET_FIRST(table->referenced_list);
-	     foreign != 0 && foreign->foreign_table == table;
-	     foreign = UT_LIST_GET_NEXT(referenced_list, foreign)) {
-
-		/* Do nothing. */
-	}
+	dict_foreign_set::iterator	it
+		= std::find_if(table->referenced_set.begin(),
+			       table->referenced_set.end(),
+			       dict_foreign_different_tables());
 
 	if (!srv_read_only_mode
-	    && foreign
+	    && it != table->referenced_set.end()
 	    && trx->check_foreigns) {
 
-		FILE*	ef	= dict_foreign_err_file;
+		FILE*		ef	= dict_foreign_err_file;
+		dict_foreign_t*	foreign	= *it;
 
 		/* We only allow truncating a referenced table if
 		FOREIGN_KEY_CHECKS is set to 0 */
@@ -3350,13 +3414,11 @@
 		goto funct_exit;
 	}
 
-	if (table->space && !table->dir_path_of_temp_table) {
+	if (table->space && !DICT_TF2_FLAG_IS_SET(table, DICT_TF2_TEMPORARY)) {
 		/* Discard and create the single-table tablespace. */
 		ulint	space	= table->space;
 		ulint	flags	= fil_space_get_flags(space);
 
-		ut_a(!DICT_TF2_FLAG_IS_SET(table, DICT_TF2_TEMPORARY));
-
 		dict_get_and_save_data_dir_path(table, true);
 
 		if (flags != ULINT_UNDEFINED
@@ -3704,6 +3766,10 @@
 	pars_info_t*	info			= NULL;
 	mem_heap_t*	heap			= NULL;
 
+	DBUG_ENTER("row_drop_table_for_mysql");
+
+	DBUG_PRINT("row_drop_table_for_mysql", ("table: %s", name));
+
 	ut_a(name != NULL);
 
 	if (srv_created_new_raw) {
@@ -3713,7 +3779,7 @@
 		      "InnoDB: Shut down mysqld and edit my.cnf so that newraw"
 		      " is replaced with raw.\n", stderr);
 
-		return(DB_ERROR);
+		DBUG_RETURN(DB_ERROR);
 	}
 
 	/* The table name is prefixed with the database name and a '/'.
@@ -3868,42 +3934,45 @@
 	/* Check if the table is referenced by foreign key constraints from
 	some other table (not the table itself) */
 
-	foreign = UT_LIST_GET_FIRST(table->referenced_list);
+	if (!srv_read_only_mode && trx->check_foreigns) {
 
-	while (foreign && foreign->foreign_table == table) {
-check_next_foreign:
-		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
-	}
+		for (dict_foreign_set::iterator it
+			= table->referenced_set.begin();
+		     it != table->referenced_set.end();
+		     ++it) {
 
-	if (!srv_read_only_mode
-	    && foreign
-	    && trx->check_foreigns
-	    && !(drop_db && dict_tables_have_same_db(
-			 name, foreign->foreign_table_name_lookup))) {
-		FILE*	ef	= dict_foreign_err_file;
+			foreign = *it;
 
-		/* We only allow dropping a referenced table if
-		FOREIGN_KEY_CHECKS is set to 0 */
+			const bool	ref_ok = drop_db
+				&& dict_tables_have_same_db(
+					name,
+					foreign->foreign_table_name_lookup);
 
-		err = DB_CANNOT_DROP_CONSTRAINT;
+			if (foreign->foreign_table != table && !ref_ok) {
 
-		mutex_enter(&dict_foreign_err_mutex);
-		rewind(ef);
-		ut_print_timestamp(ef);
+				FILE*	ef	= dict_foreign_err_file;
 
-		fputs("  Cannot drop table ", ef);
-		ut_print_name(ef, trx, TRUE, name);
-		fputs("\n"
-		      "because it is referenced by ", ef);
-		ut_print_name(ef, trx, TRUE, foreign->foreign_table_name);
-		putc('\n', ef);
-		mutex_exit(&dict_foreign_err_mutex);
+				/* We only allow dropping a referenced table
+				if FOREIGN_KEY_CHECKS is set to 0 */
 
-		goto funct_exit;
-	}
+				err = DB_CANNOT_DROP_CONSTRAINT;
+
+				mutex_enter(&dict_foreign_err_mutex);
+				rewind(ef);
+				ut_print_timestamp(ef);
+
+				fputs("  Cannot drop table ", ef);
+				ut_print_name(ef, trx, TRUE, name);
+				fputs("\n"
+				      "because it is referenced by ", ef);
+				ut_print_name(ef, trx, TRUE,
+					      foreign->foreign_table_name);
+				putc('\n', ef);
+				mutex_exit(&dict_foreign_err_mutex);
 
-	if (foreign && trx->check_foreigns) {
-		goto check_next_foreign;
+				goto funct_exit;
+			}
+		}
 	}
 
 	/* TODO: could we replace the counter n_foreign_key_checks_running
@@ -4054,7 +4123,6 @@
 			   "table_id CHAR;\n"
 			   "index_id CHAR;\n"
 			   "foreign_id CHAR;\n"
-			   "space_id INT;\n"
 			   "found INT;\n"
 
 			   "DECLARE CURSOR cur_fk IS\n"
@@ -4077,12 +4145,6 @@
 			   "IF (SQL % NOTFOUND) THEN\n"
 			   "       RETURN;\n"
 			   "END IF;\n"
-			   "SELECT SPACE INTO space_id\n"
-			   "FROM SYS_TABLES\n"
-			   "WHERE NAME = :table_name;\n"
-			   "IF (SQL % NOTFOUND) THEN\n"
-			   "       RETURN;\n"
-			   "END IF;\n"
 			   "found := 1;\n"
 			   "SELECT ID INTO sys_foreign_id\n"
 			   "FROM SYS_TABLES\n"
@@ -4125,10 +4187,6 @@
 			   "       END IF;\n"
 			   "END LOOP;\n"
 			   "CLOSE cur_idx;\n"
-			   "DELETE FROM SYS_TABLESPACES\n"
-			   "WHERE SPACE = space_id;\n"
-			   "DELETE FROM SYS_DATAFILES\n"
-			   "WHERE SPACE = space_id;\n"
 			   "DELETE FROM SYS_COLUMNS\n"
 			   "WHERE TABLE_ID = table_id;\n"
 			   "DELETE FROM SYS_TABLES\n"
@@ -4136,6 +4194,34 @@
 			   "END;\n"
 			   , FALSE, trx);
 
+	/* SYS_DATAFILES and SYS_TABLESPACES do not necessarily exist
+	on XtraBackup recovery. See comments around
+	dict_create_or_check_foreign_constraint_tables() in
+	innobase_start_or_create_for_mysql(). */
+	if (err == DB_SUCCESS && dict_table_get_low("SYS_DATAFILES") != NULL) {
+		info = pars_info_create();
+
+		pars_info_add_str_literal(info, "table_name", name);
+
+		err = que_eval_sql(info,
+				   "PROCEDURE DROP_TABLE_PROC () IS\n"
+				   "space_id INT;\n"
+
+				   "BEGIN\n"
+				   "SELECT SPACE INTO space_id\n"
+				   "FROM SYS_TABLES\n"
+				   "WHERE NAME = :table_name;\n"
+				   "IF (SQL % NOTFOUND) THEN\n"
+				   "       RETURN;\n"
+				   "END IF;\n"
+				   "DELETE FROM SYS_TABLESPACES\n"
+				   "WHERE SPACE = space_id;\n"
+				   "DELETE FROM SYS_DATAFILES\n"
+				   "WHERE SPACE = space_id;\n"
+				   "END;\n"
+				   , FALSE, trx);
+	}
+
 	switch (err) {
 		ibool	is_temp;
 
@@ -4149,8 +4235,9 @@
 		is_temp = DICT_TF2_FLAG_IS_SET(table, DICT_TF2_TEMPORARY);
 
 		/* If there is a temp path then the temp flag is set.
-		However, during recovery, we might have a temp flag but
-		not know the temp path */
+		However, during recovery or reloading the table object
+		after eviction from data dictionary cache, we might
+		have a temp flag but not know the temp path */
 		ut_a(table->dir_path_of_temp_table == NULL || is_temp);
 		if (dict_table_is_discarded(table)
 		    || table->ibd_file_missing) {
@@ -4229,7 +4316,8 @@
 			if (!is_temp
 			    && !fil_space_for_table_exists_in_mem(
 					space_id, tablename, FALSE,
-					print_msg, false, NULL, 0)) {
+					print_msg, print_msg, false,
+					NULL, 0)) {
 				/* This might happen if we are dropping a
 				discarded tablespace */
 				err = DB_SUCCESS;
@@ -4338,7 +4426,7 @@
 
 	srv_wake_master_thread();
 
-	return(err);
+	DBUG_RETURN(err);
 }
 
 /*********************************************************************//**
@@ -4718,6 +4806,7 @@
 	ibool		old_is_tmp, new_is_tmp;
 	pars_info_t*	info			= NULL;
 	int		retry;
+	bool		aux_fts_rename		= false;
 
 	ut_a(old_name != NULL);
 	ut_a(new_name != NULL);
@@ -5004,34 +5093,8 @@
 	if (dict_table_has_fts_index(table)
 	    && !dict_tables_have_same_db(old_name, new_name)) {
 		err = fts_rename_aux_tables(table, new_name, trx);
-
-		if (err != DB_SUCCESS && (table->space != 0)) {
-			char*	orig_name = table->name;
-			trx_t*	trx_bg = trx_allocate_for_background();
-
-			/* If the first fts_rename fails, the trx would
-			be rolled back and committed, we can't use it any more,
-			so we have to start a new background trx here. */
-			ut_a(trx_state_eq(trx, TRX_STATE_NOT_STARTED));
-			trx_bg->op_info = "Revert the failing rename "
-					  "for fts aux tables";
-			trx_bg->dict_operation_lock_mode = RW_X_LATCH;
-			trx_start_for_ddl(trx_bg, TRX_DICT_OP_TABLE);
-
-			/* If rename fails and table has its own tablespace,
-			we need to call fts_rename_aux_tables again to
-			revert the ibd file rename, which is not under the
-			control of trx. Also notice the parent table name
-			in cache is not changed yet. If the reverting fails,
-			the ibd data may be left in the new database, which
-			can be fixed only manually. */
-			table->name = const_cast<char*>(new_name);
-			fts_rename_aux_tables(table, old_name, trx_bg);
-			table->name = orig_name;
-
-			trx_bg->dict_operation_lock_mode = 0;
-			trx_commit_for_mysql(trx_bg);
-			trx_free_for_background(trx_bg);
+		if (err != DB_TABLE_NOT_FOUND) {
+			aux_fts_rename = true;
 		}
 	}
 
@@ -5132,6 +5195,37 @@
 	}
 
 funct_exit:
+	if (aux_fts_rename && err != DB_SUCCESS
+	    && table != NULL && (table->space != 0)) {
+
+		char*	orig_name = table->name;
+		trx_t*	trx_bg = trx_allocate_for_background();
+
+		/* If the first fts_rename fails, the trx would
+		be rolled back and committed, we can't use it any more,
+		so we have to start a new background trx here. */
+		ut_a(trx_state_eq(trx_bg, TRX_STATE_NOT_STARTED));
+		trx_bg->op_info = "Revert the failing rename "
+				  "for fts aux tables";
+		trx_bg->dict_operation_lock_mode = RW_X_LATCH;
+		trx_start_for_ddl(trx_bg, TRX_DICT_OP_TABLE);
+
+		/* If rename fails and table has its own tablespace,
+		we need to call fts_rename_aux_tables again to
+		revert the ibd file rename, which is not under the
+		control of trx. Also notice the parent table name
+		in cache is not changed yet. If the reverting fails,
+		the ibd data may be left in the new database, which
+		can be fixed only manually. */
+		table->name = const_cast<char*>(new_name);
+		fts_rename_aux_tables(table, old_name, trx_bg);
+		table->name = orig_name;
+
+		trx_bg->dict_operation_lock_mode = 0;
+		trx_commit_for_mysql(trx_bg);
+		trx_free_for_background(trx_bg);
+	}
+
 	if (table != NULL) {
 		dict_table_close(table, dict_locked, FALSE);
 	}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0purge.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0purge.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0purge.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0purge.cc	2017-02-27 07:47:02.000000000 +0000
@@ -69,7 +69,8 @@
 {
 	purge_node_t*	node;
 
-	ut_ad(parent && heap);
+	ut_ad(parent != NULL);
+	ut_ad(heap != NULL);
 
 	node = static_cast<purge_node_t*>(
 		mem_heap_zalloc(heap, sizeof(*node)));
@@ -337,9 +338,24 @@
 	if (row_purge_poss_sec(node, index, entry)) {
 		/* Remove the index record, which should have been
 		marked for deletion. */
-		ut_ad(REC_INFO_DELETED_FLAG
-		      & rec_get_info_bits(btr_cur_get_rec(btr_cur),
-					  dict_table_is_comp(index->table)));
+		if (!rec_get_deleted_flag(btr_cur_get_rec(btr_cur),
+					  dict_table_is_comp(index->table))) {
+			fputs("InnoDB: tried to purge sec index entry not"
+			      " marked for deletion in\n"
+			      "InnoDB: ", stderr);
+			dict_index_name_print(stderr, NULL, index);
+			fputs("\n"
+			      "InnoDB: tuple ", stderr);
+			dtuple_print(stderr, entry);
+			fputs("\n"
+			      "InnoDB: record ", stderr);
+			rec_print(stderr, btr_cur_get_rec(btr_cur), index);
+			putc('\n', stderr);
+
+			ut_ad(0);
+
+			goto func_exit;
+		}
 
 		btr_cur_pessimistic_delete(&err, FALSE, btr_cur, 0,
 					   RB_NONE, &mtr);
@@ -428,10 +444,29 @@
 			btr_cur_t* btr_cur = btr_pcur_get_btr_cur(&pcur);
 
 			/* Only delete-marked records should be purged. */
-			ut_ad(REC_INFO_DELETED_FLAG
-			      & rec_get_info_bits(
-				      btr_cur_get_rec(btr_cur),
-				      dict_table_is_comp(index->table)));
+			if (!rec_get_deleted_flag(
+				btr_cur_get_rec(btr_cur),
+				dict_table_is_comp(index->table))) {
+
+				fputs("InnoDB: tried to purge sec index"
+				      " entry not marked for deletion in\n"
+				      "InnoDB: ", stderr);
+				dict_index_name_print(stderr, NULL, index);
+				fputs("\n"
+				      "InnoDB: tuple ", stderr);
+				dtuple_print(stderr, entry);
+				fputs("\n"
+				      "InnoDB: record ", stderr);
+				rec_print(stderr, btr_cur_get_rec(btr_cur),
+					  index);
+				putc('\n', stderr);
+
+				ut_ad(0);
+
+				btr_pcur_close(&pcur);
+
+				goto func_exit_no_pcur;
+			}
 
 			if (!btr_cur_optimistic_delete(btr_cur, 0, &mtr)) {
 
@@ -697,7 +732,8 @@
 	ulint		info_bits;
 	ulint		type;
 
-	ut_ad(node && thr);
+	ut_ad(node != NULL);
+	ut_ad(thr != NULL);
 
 	ptr = trx_undo_rec_get_pars(
 		undo_rec, &type, &node->cmpl_info,
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0quiesce.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0quiesce.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0quiesce.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0quiesce.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2012, 2014, 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
@@ -680,7 +680,6 @@
 
 	switch (state) {
 	case QUIESCE_START:
-		ut_a(table->quiesce == QUIESCE_NONE);
 		break;
 
 	case QUIESCE_COMPLETE:
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0row.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0row.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0row.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0row.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2016, 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
@@ -240,7 +240,9 @@
 	ulint			offsets_[REC_OFFS_NORMAL_SIZE];
 	rec_offs_init(offsets_);
 
-	ut_ad(index && rec && heap);
+	ut_ad(index != NULL);
+	ut_ad(rec != NULL);
+	ut_ad(heap != NULL);
 	ut_ad(dict_index_is_clust(index));
 	ut_ad(!mutex_own(&trx_sys->mutex));
 	ut_ad(!col_map || col_table);
@@ -409,7 +411,9 @@
 	ulint		len;
 	ulint		rec_len;
 
-	ut_ad(rec && heap && index);
+	ut_ad(rec != NULL);
+	ut_ad(heap != NULL);
+	ut_ad(index != NULL);
 	/* Because this function may be invoked by row0merge.cc
 	on a record whose header is in different format, the check
 	rec_offs_validate(rec, index, offsets) must be avoided here. */
@@ -464,7 +468,9 @@
 	byte*		buf;
 	const rec_t*	copy_rec;
 
-	ut_ad(rec && heap && index);
+	ut_ad(rec != NULL);
+	ut_ad(heap != NULL);
+	ut_ad(index != NULL);
 	ut_ad(rec_offs_validate(rec, index, offsets));
 
 	/* Take a copy of rec to heap */
@@ -523,7 +529,9 @@
 	ulint*		offsets		= offsets_;
 	rec_offs_init(offsets_);
 
-	ut_ad(index && rec && heap);
+	ut_ad(index != NULL);
+	ut_ad(rec != NULL);
+	ut_ad(heap != NULL);
 	ut_ad(!dict_index_is_clust(index));
 
 	offsets = rec_get_offsets(rec, index, offsets,
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0sel.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0sel.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0sel.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0sel.cc	2017-02-27 07:47:02.000000000 +0000
@@ -2455,13 +2455,12 @@
 		/* Storing may use at most data_len bytes of buf */
 
 		if (UNIV_LIKELY(!is_null)) {
-			ut_a(buf + data_len <= original_buf + buf_len);
-			row_mysql_store_col_in_innobase_format(
-				dfield, buf,
-				FALSE, /* MySQL key value format col */
-				key_ptr + data_offset, data_len,
-				dict_table_is_comp(index->table));
-			buf += data_len;
+			buf = row_mysql_store_col_in_innobase_format(
+					dfield, buf,
+					FALSE, /* MySQL key value format col */
+					key_ptr + data_offset, data_len,
+					dict_table_is_comp(index->table));
+			ut_a(buf <= original_buf + buf_len);
 		}
 
 		key_ptr += data_field_len;
@@ -2505,9 +2504,6 @@
 		dfield++;
 	}
 
-	DBUG_EXECUTE_IF("innodb_srch_key_buffer_full",
-		ut_a(buf == (original_buf + buf_len)););
-
 	ut_a(buf <= original_buf + buf_len);
 
 	/* We set the length of tuple to n_fields: we assume that the memory
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0umod.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0umod.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0umod.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0umod.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1105,7 +1105,8 @@
 	dberr_t	err;
 	ibool	dict_locked;
 
-	ut_ad(node && thr);
+	ut_ad(node != NULL);
+	ut_ad(thr != NULL);
 	ut_ad(node->state == UNDO_NODE_MODIFY);
 
 	dict_locked = thr_get_trx(thr)->dict_operation_lock_mode == RW_X_LATCH;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0undo.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0undo.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0undo.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0undo.cc	2017-02-27 07:47:02.000000000 +0000
@@ -245,7 +245,7 @@
 If none left, or a partial rollback completed, returns control to the
 parent node, which is always a query thread node.
 @return	DB_SUCCESS if operation successfully completed, else error code */
-static __attribute__((nonnull, warn_unused_result))
+static __attribute__((warn_unused_result))
 dberr_t
 row_undo(
 /*=====*/
@@ -257,7 +257,8 @@
 	roll_ptr_t	roll_ptr;
 	ibool		locked_data_dict;
 
-	ut_ad(node && thr);
+	ut_ad(node != NULL);
+	ut_ad(thr != NULL);
 
 	trx = node->trx;
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/row/row0upd.cc percona-xtrabackup-2.3.7/storage/innobase/row/row0upd.cc
--- percona-xtrabackup-2.2.3/storage/innobase/row/row0upd.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/row/row0upd.cc	2017-02-27 07:47:02.000000000 +0000
@@ -51,7 +51,7 @@
 #include "pars0sym.h"
 #include "eval0eval.h"
 #include "buf0lru.h"
-
+#include <algorithm>
 
 /* What kind of latch and lock can we assume when the control comes to
    -------------------------------------------------------------------
@@ -136,12 +136,10 @@
 	trx_t*		trx)	/*!< in: transaction */
 {
 	dict_table_t*	table		= index->table;
-	dict_foreign_t*	foreign;
 	ibool		froze_data_dict	= FALSE;
 	ibool		is_referenced	= FALSE;
 
-	if (!UT_LIST_GET_FIRST(table->referenced_list)) {
-
+	if (table->referenced_set.empty()) {
 		return(FALSE);
 	}
 
@@ -150,19 +148,13 @@
 		froze_data_dict = TRUE;
 	}
 
-	foreign = UT_LIST_GET_FIRST(table->referenced_list);
-
-	while (foreign) {
-		if (foreign->referenced_index == index) {
-
-			is_referenced = TRUE;
-			goto func_exit;
-		}
+	dict_foreign_set::iterator	it
+		= std::find_if(table->referenced_set.begin(),
+			       table->referenced_set.end(),
+			       dict_foreign_with_index(index));
 
-		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
-	}
+	is_referenced = (it != table->referenced_set.end());
 
-func_exit:
 	if (froze_data_dict) {
 		row_mysql_unfreeze_data_dictionary(trx);
 	}
@@ -200,7 +192,7 @@
 	dberr_t		err;
 	ibool		got_s_lock	= FALSE;
 
-	if (UT_LIST_GET_FIRST(table->referenced_list) == NULL) {
+	if (table->referenced_set.empty()) {
 
 		return(DB_SUCCESS);
 	}
@@ -227,9 +219,13 @@
 	}
 
 run_again:
-	foreign = UT_LIST_GET_FIRST(table->referenced_list);
 
-	while (foreign) {
+	for (dict_foreign_set::iterator it = table->referenced_set.begin();
+	     it != table->referenced_set.end();
+	     ++it) {
+
+		foreign = *it;
+
 		/* Note that we may have an update which updates the index
 		record, but does NOT update the first fields which are
 		referenced in a foreign key constraint. Then the update does
@@ -282,8 +278,6 @@
 				goto func_exit;
 			}
 		}
-
-		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
 	}
 
 	err = DB_SUCCESS;
@@ -2494,7 +2488,7 @@
 record, and the position of the cursor is stored in the cursor.
 @return DB_SUCCESS if operation successfully completed, else error
 code or DB_LOCK_WAIT */
-static __attribute__((nonnull, warn_unused_result))
+static __attribute__((warn_unused_result))
 dberr_t
 row_upd(
 /*====*/
@@ -2503,7 +2497,8 @@
 {
 	dberr_t		err	= DB_SUCCESS;
 
-	ut_ad(node && thr);
+	ut_ad(node != NULL);
+	ut_ad(thr != NULL);
 
 	if (UNIV_LIKELY(node->in_mysql_interface)) {
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/srv/srv0mon.cc percona-xtrabackup-2.3.7/storage/innobase/srv/srv0mon.cc
--- percona-xtrabackup-2.2.3/storage/innobase/srv/srv0mon.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/srv/srv0mon.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2010, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2010, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -41,8 +41,8 @@
 /* Macro to standardize the counter names for counters in the
 "monitor_buf_page" module as they have very structured defines */
 #define	MONITOR_BUF_PAGE(name, description, code, op, op_code)	\
-	{"buffer_page_"op"_"name, "buffer_page_io",		\
-	 "Number of "description" Pages "op,			\
+	{"buffer_page_" op "_" name, "buffer_page_io",		\
+	 "Number of " description " Pages " op,			\
 	 MONITOR_GROUP_MODULE, MONITOR_DEFAULT_START,		\
 	 MONITOR_##code##_##op_code}
 
@@ -925,7 +925,8 @@
 
 	{"adaptive_hash_searches_btree", "adaptive_hash_index",
 	 "Number of searches using B-tree on an index search",
-	 MONITOR_NONE,
+	 static_cast<monitor_type_t>(
+	 MONITOR_EXISTING | MONITOR_DEFAULT_ON),
 	 MONITOR_DEFAULT_START, MONITOR_OVLD_ADAPTIVE_HASH_SEARCH_BTREE},
 
 	{"adaptive_hash_pages_added", "adaptive_hash_index",
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/srv/srv0srv.cc percona-xtrabackup-2.3.7/storage/innobase/srv/srv0srv.cc
--- percona-xtrabackup-2.2.3/storage/innobase/srv/srv0srv.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/srv/srv0srv.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, 2009 Google Inc.
 Copyright (c) 2009, Percona Inc.
 
@@ -358,6 +358,7 @@
 UNIV_INTERN ibool	srv_apply_log_only	= FALSE;
 
 UNIV_INTERN ibool	srv_backup_mode	= FALSE;
+UNIV_INTERN ibool	srv_close_files = TRUE;
 
 UNIV_INTERN ulint	srv_log_checksum_algorithm =
 	SRV_CHECKSUM_ALGORITHM_INNODB;
@@ -992,6 +993,8 @@
 	trx_i_s_cache_init(trx_i_s_cache);
 
 	ut_crc32_init();
+
+	dict_mem_init();
 }
 
 /*********************************************************************//**
@@ -2603,7 +2606,9 @@
 
 		*n_total_purged += n_pages_purged;
 
-	} while (!srv_purge_should_exit(n_pages_purged) && n_pages_purged > 0);
+	} while (!srv_purge_should_exit(n_pages_purged)
+		 && n_pages_purged > 0
+		 && purge_sys->state == PURGE_STATE_RUN);
 
 	return(rseg_history_len);
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/srv/srv0start.cc percona-xtrabackup-2.3.7/storage/innobase/srv/srv0start.cc
--- percona-xtrabackup-2.2.3/storage/innobase/srv/srv0start.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/srv/srv0start.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1659,6 +1659,19 @@
 		"" IB_ATOMICS_STARTUP_MSG "");
 
 	ib_logf(IB_LOG_LEVEL_INFO,
+		"" IB_MEMORY_BARRIER_STARTUP_MSG "");
+
+#ifndef HAVE_MEMORY_BARRIER
+#if defined __i386__ || defined __x86_64__ || defined _M_IX86 || defined _M_X64 || defined __WIN__
+#else
+	ib_logf(IB_LOG_LEVEL_WARN,
+		"MySQL was built without a memory barrier capability on this"
+		" architecture, which might allow a mutex/rw_lock violation"
+		" under high thread concurrency. This may cause a hang.");
+#endif /* IA32 or AMD64 */
+#endif /* HAVE_MEMORY_BARRIER */
+
+	ib_logf(IB_LOG_LEVEL_INFO,
 		"Compressed tables use zlib " ZLIB_VERSION
 #ifdef UNIV_ZIP_DEBUG
 	      " with validation"
@@ -1993,19 +2006,6 @@
 		os_thread_create(io_handler_thread, n + i, thread_ids + i);
 	}
 
-	if (srv_n_log_files * srv_log_file_size * UNIV_PAGE_SIZE
-	    >= 512ULL * 1024ULL * 1024ULL * 1024ULL) {
-		/* log_block_convert_lsn_to_no() limits the returned block
-		number to 1G and given that OS_FILE_LOG_BLOCK_SIZE is 512
-		bytes, then we have a limit of 512 GB. If that limit is to
-		be raised, then log_block_convert_lsn_to_no() must be
-		modified. */
-		ib_logf(IB_LOG_LEVEL_ERROR,
-			"Combined size of log files must be < 512 GB");
-
-		return(DB_ERROR);
-	}
-
 	if (srv_n_log_files * srv_log_file_size >= ULINT_MAX) {
 		/* fil_io() takes ulint as an argument and we are passing
 		(next_offset / UNIV_PAGE_SIZE) to it in log_group_write_buf().
@@ -2211,9 +2211,9 @@
 			} else if (size != srv_log_file_size) {
 				ib_logf(IB_LOG_LEVEL_ERROR,
 					"Log file %s is"
-					" of different size "UINT64PF" bytes"
+					" of different size " UINT64PF " bytes"
 					" than other log"
-					" files "UINT64PF" bytes!",
+					" files " UINT64PF " bytes!",
 					logfilename,
 					size << UNIV_PAGE_SIZE_SHIFT,
 					(os_offset_t) srv_log_file_size
@@ -2652,13 +2652,6 @@
 		srv_undo_logs = ULONG_UNDEFINED;
 	}
 
-	/* Flush the changes made to TRX_SYS_PAGE by trx_sys_create_rsegs()*/
-	if (!srv_force_recovery && !srv_read_only_mode) {
-		bool success = buf_flush_list(ULINT_MAX, LSN_MAX, NULL);
-		ut_a(success);
-		buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST);
-	}
-
 	if (!srv_read_only_mode) {
 		/* Create the thread which watches the timeouts
 		for lock waits */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/sync/sync0arr.cc percona-xtrabackup-2.3.7/storage/innobase/sync/sync0arr.cc
--- percona-xtrabackup-2.2.3/storage/innobase/sync/sync0arr.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/sync/sync0arr.cc	2017-02-27 07:47:02.000000000 +0000
@@ -741,6 +741,7 @@
 
 		mutex = static_cast<ib_mutex_t*>(cell->wait_object);
 
+		os_rmb;
 		if (mutex_get_lock_word(mutex) == 0) {
 
 			return(TRUE);
@@ -750,6 +751,7 @@
 
 		lock = static_cast<rw_lock_t*>(cell->wait_object);
 
+		os_rmb;
 		if (lock->lock_word > 0) {
 		/* Either unlocked or only read locked. */
 
@@ -761,6 +763,7 @@
 		lock = static_cast<rw_lock_t*>(cell->wait_object);
 
                 /* lock_word == 0 means all readers have left */
+		os_rmb;
 		if (lock->lock_word == 0) {
 
 			return(TRUE);
@@ -769,6 +772,7 @@
 		lock = static_cast<rw_lock_t*>(cell->wait_object);
 
                 /* lock_word > 0 means no writer or reserved writer */
+		os_rmb;
 		if (lock->lock_word > 0) {
 
 			return(TRUE);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/sync/sync0rw.cc percona-xtrabackup-2.3.7/storage/innobase/sync/sync0rw.cc
--- percona-xtrabackup-2.2.3/storage/innobase/sync/sync0rw.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/sync/sync0rw.cc	2017-02-27 07:47:02.000000000 +0000
@@ -291,6 +291,7 @@
 	ib_mutex_t*	mutex;
 #endif /* !INNODB_RW_LOCKS_USE_ATOMICS */
 
+	os_rmb;
 	ut_ad(rw_lock_validate(lock));
 	ut_a(lock->lock_word == X_LOCK_DECR);
 
@@ -381,6 +382,7 @@
 lock_loop:
 
 	/* Spin waiting for the writer field to become free */
+	os_rmb;
 	while (i < SYNC_SPIN_ROUNDS && lock->lock_word <= 0) {
 		if (srv_spin_wait_delay) {
 			ut_delay(ut_rnd_interval(0, srv_spin_wait_delay));
@@ -389,7 +391,7 @@
 		i++;
 	}
 
-	if (i == SYNC_SPIN_ROUNDS) {
+	if (i >= SYNC_SPIN_ROUNDS) {
 		os_thread_yield();
 	}
 
@@ -476,6 +478,7 @@
 
 	counter_index = (size_t) os_thread_get_curr_id();
 
+	os_rmb;
 	ut_ad(lock->lock_word <= 0);
 
 	while (lock->lock_word < 0) {
@@ -484,6 +487,7 @@
 		}
 		if(i < SYNC_SPIN_ROUNDS) {
 			i++;
+			os_rmb;
 			continue;
 		}
 
@@ -560,6 +564,10 @@
 	} else {
 		os_thread_id_t	thread_id = os_thread_get_curr_id();
 
+		if (!pass) {
+			os_rmb;
+		}
+
 		/* Decrement failed: relock or failed lock */
 		if (!pass && lock->recursive
 		    && os_thread_eq(lock->writer_thread, thread_id)) {
@@ -638,6 +646,7 @@
 		}
 
 		/* Spin waiting for the lock_word to become free */
+		os_rmb;
 		while (i < SYNC_SPIN_ROUNDS
 		       && lock->lock_word <= 0) {
 			if (srv_spin_wait_delay) {
@@ -647,7 +656,7 @@
 
 			i++;
 		}
-		if (i == SYNC_SPIN_ROUNDS) {
+		if (i >= SYNC_SPIN_ROUNDS) {
 			os_thread_yield();
 		} else {
 			goto lock_loop;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/sync/sync0sync.cc percona-xtrabackup-2.3.7/storage/innobase/sync/sync0sync.cc
--- percona-xtrabackup-2.2.3/storage/innobase/sync/sync0sync.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/sync/sync0sync.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -298,9 +298,9 @@
 
 	/* NOTE! The very first mutexes are not put to the mutex list */
 
-	if ((mutex == &mutex_list_mutex)
+	if (mutex == &mutex_list_mutex
 #ifdef UNIV_SYNC_DEBUG
-	    || (mutex == &sync_thread_mutex)
+	    || mutex == &sync_thread_mutex
 #endif /* UNIV_SYNC_DEBUG */
 	    ) {
 
@@ -458,6 +458,7 @@
 
 	*ptr = n;		/* Here we assume that the write of a single
 				word in memory is atomic */
+	os_wmb;
 }
 
 /******************************************************************//**
@@ -499,7 +500,7 @@
 	a memory word. */
 
 spin_loop:
-
+	os_rmb;
 	while (mutex_get_lock_word(mutex) != 0 && i < SYNC_SPIN_ROUNDS) {
 		if (srv_spin_wait_delay) {
 			ut_delay(ut_rnd_interval(0, srv_spin_wait_delay));
@@ -508,7 +509,7 @@
 		i++;
 	}
 
-	if (i == SYNC_SPIN_ROUNDS) {
+	if (i >= SYNC_SPIN_ROUNDS) {
 		os_thread_yield();
 	}
 
@@ -1558,12 +1559,12 @@
 	FILE*	file)		/*!< in: file where to print */
 {
 	fprintf(file,
-		"Mutex spin waits "UINT64PF", rounds "UINT64PF", "
-		"OS waits "UINT64PF"\n"
-		"RW-shared spins "UINT64PF", rounds "UINT64PF", "
-		"OS waits "UINT64PF"\n"
-		"RW-excl spins "UINT64PF", rounds "UINT64PF", "
-		"OS waits "UINT64PF"\n",
+		"Mutex spin waits " UINT64PF ", rounds " UINT64PF ", "
+		"OS waits " UINT64PF "\n"
+		"RW-shared spins " UINT64PF ", rounds " UINT64PF ", "
+		"OS waits " UINT64PF "\n"
+		"RW-excl spins " UINT64PF ", rounds " UINT64PF ", "
+		"OS waits " UINT64PF "\n",
 		(ib_uint64_t) mutex_spin_wait_count,
 		(ib_uint64_t) mutex_spin_round_count,
 		(ib_uint64_t) mutex_os_wait_count,
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/trx/trx0i_s.cc percona-xtrabackup-2.3.7/storage/innobase/trx/trx0i_s.cc
--- percona-xtrabackup-2.2.3/storage/innobase/trx/trx0i_s.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/trx/trx0i_s.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1653,7 +1653,7 @@
 	} else {
 		/* table lock */
 		res_len = ut_snprintf(lock_id, lock_id_size,
-				      TRX_ID_FMT":"UINT64PF,
+				      TRX_ID_FMT":" UINT64PF,
 				      row->lock_trx_id,
 				      row->lock_table_id);
 	}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/trx/trx0roll.cc percona-xtrabackup-2.3.7/storage/innobase/trx/trx0roll.cc
--- percona-xtrabackup-2.2.3/storage/innobase/trx/trx0roll.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/trx/trx0roll.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -50,6 +50,9 @@
 rollback */
 #define TRX_ROLL_TRUNC_THRESHOLD	1
 
+/** true if trx_rollback_or_clean_all_recovered() thread is active */
+bool			trx_rollback_or_clean_is_active;
+
 /** In crash recovery, the current trx to be rolled back; NULL otherwise */
 static const trx_t*	trx_roll_crash_recv_trx	= NULL;
 
@@ -126,6 +129,9 @@
 
 	mem_heap_free(heap);
 
+	/* There might be work for utility threads.*/
+	srv_active_wake_master_thread();
+
 	MONITOR_DEC(MONITOR_TRX_ACTIVE);
 }
 
@@ -143,20 +149,10 @@
 {
 	ut_ad(!trx_mutex_own(trx));
 
-	/* Tell Innobase server that there might be work for
-	utility threads: */
-
-	srv_active_wake_master_thread();
-
 	trx_start_if_not_started_xa(trx);
 
 	trx_rollback_to_savepoint_low(trx, savept);
 
-	/* Tell Innobase server that there might be work for
-	utility threads: */
-
-	srv_active_wake_master_thread();
-
 	return(trx->error_state);
 }
 
@@ -169,8 +165,6 @@
 /*=======================*/
 	trx_t*	trx)	/*!< in/out: transaction */
 {
-	srv_active_wake_master_thread();
-
 	trx->op_info = "rollback";
 
 	/* If we are doing the XA recovery of prepared transactions,
@@ -184,8 +178,6 @@
 
 	ut_a(trx->error_state == DB_SUCCESS);
 
-	srv_active_wake_master_thread();
-
 	return(trx->error_state);
 }
 
@@ -816,6 +808,8 @@
 
 	trx_rollback_or_clean_recovered(TRUE);
 
+	trx_rollback_or_clean_is_active = false;
+
 	/* We count the number of threads in os_thread_exit(). A created
 	thread should always use that to exit and not use return() to exit. */
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/trx/trx0sys.cc percona-xtrabackup-2.3.7/storage/innobase/trx/trx0sys.cc
--- percona-xtrabackup-2.2.3/storage/innobase/trx/trx0sys.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/trx/trx0sys.cc	2017-02-27 07:47:02.000000000 +0000
@@ -292,15 +292,61 @@
 		  + TRX_SYS_MYSQL_LOG_NAME, TRX_SYS_MYSQL_LOG_NAME_LEN);
 
 	fprintf(stderr,
-		"InnoDB: Last MySQL binlog file position %lu %lu,"
+		"xtrabackup: Last MySQL binlog file position " UINT64PF ","
 		" file name %s\n",
-		trx_sys_mysql_bin_log_pos_high, trx_sys_mysql_bin_log_pos_low,
+		trx_sys_mysql_bin_log_pos,
 		trx_sys_mysql_bin_log_name);
 
 	mtr_commit(&mtr);
 }
 
 /*****************************************************************//**
+Read WSREP XID information from the trx system header if the magic value
+shows it is valid. This code has been copied from MySQL patches by Codership
+with some modifications.
+@return true if the magic value is valid. Otherwise
+return false and leave 'xid' unchanged. */
+bool
+trx_sys_read_wsrep_checkpoint(XID* xid)
+/*===================================*/
+{
+	trx_sysf_t* sys_header;
+	mtr_t	    mtr;
+	ulint	    magic;
+
+	ut_ad(xid);
+
+	mtr_start(&mtr);
+
+	sys_header = trx_sysf_get(&mtr);
+	magic = mach_read_from_4(sys_header + TRX_SYS_WSREP_XID_INFO +
+				 TRX_SYS_WSREP_XID_MAGIC_N_FLD);
+
+	if (magic != TRX_SYS_WSREP_XID_MAGIC_N) {
+
+		mtr_commit(&mtr);
+		return(false);
+	}
+
+	xid->formatID	  = (int)mach_read_from_4(
+		sys_header
+		+ TRX_SYS_WSREP_XID_INFO + TRX_SYS_WSREP_XID_FORMAT);
+	xid->gtrid_length = (int)mach_read_from_4(
+		sys_header
+		+ TRX_SYS_WSREP_XID_INFO + TRX_SYS_WSREP_XID_GTRID_LEN);
+	xid->bqual_length = (int)mach_read_from_4(
+		sys_header
+		+ TRX_SYS_WSREP_XID_INFO + TRX_SYS_WSREP_XID_BQUAL_LEN);
+	ut_memcpy(xid->data,
+		  sys_header + TRX_SYS_WSREP_XID_INFO + TRX_SYS_WSREP_XID_DATA,
+		  XIDDATASIZE);
+
+	mtr_commit(&mtr);
+
+	return(true);
+}
+
+/*****************************************************************//**
 Prints to stderr the MySQL master log offset info in the trx system header if
 the magic number shows it valid. */
 UNIV_INTERN
@@ -952,7 +998,7 @@
 	    == TRX_SYS_MYSQL_LOG_MAGIC_N) {
 
 		fprintf(stderr,
-			"ibbackup: Last MySQL binlog file position %lu %lu,"
+			"mysqlbackup: Last MySQL binlog file position %lu %lu,"
 			" file name %s\n",
 			(ulong) mach_read_from_4(
 				sys_header + TRX_SYS_MYSQL_LOG_INFO
@@ -1003,9 +1049,9 @@
 		ut_print_timestamp(stderr);
 
 		fprintf(stderr,
-			"  ibbackup: Error: trying to read system tablespace "
-			"file format,\n"
-			"  ibbackup: but could not open the tablespace "
+			"  mysqlbackup: Error: trying to read system "
+			"tablespace file format,\n"
+			"  mysqlbackup: but could not open the tablespace "
 			"file %s!\n", pathname);
 		return(FALSE);
 	}
@@ -1022,9 +1068,9 @@
 		ut_print_timestamp(stderr);
 
 		fprintf(stderr,
-			"  ibbackup: Error: trying to read system tablespace "
-			"file format,\n"
-			"  ibbackup: but failed to read the tablespace "
+			"  mysqlbackup: Error: trying to read system "
+			"tablespace file format,\n"
+			"  mysqlbackup: but failed to read the tablespace "
 			"file %s!\n", pathname);
 
 		os_file_close(file);
@@ -1083,9 +1129,9 @@
 		ut_print_timestamp(stderr);
 
 		fprintf(stderr,
-			"  ibbackup: Error: trying to read per-table "
+			"  mysqlbackup: Error: trying to read per-table "
 			"tablespace format,\n"
-			"  ibbackup: but could not open the tablespace "
+			"  mysqlbackup: but could not open the tablespace "
 			"file %s!\n", pathname);
 
 		return(FALSE);
@@ -1102,9 +1148,9 @@
 		ut_print_timestamp(stderr);
 
 		fprintf(stderr,
-			"  ibbackup: Error: trying to per-table data file "
+			"  mysqlbackup: Error: trying to per-table data file "
 			"format,\n"
-			"  ibbackup: but failed to read the tablespace "
+			"  mysqlbackup: but failed to read the tablespace "
 			"file %s!\n", pathname);
 
 		os_file_close(file);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/trx/trx0trx.cc percona-xtrabackup-2.3.7/storage/innobase/trx/trx0trx.cc
--- percona-xtrabackup-2.2.3/storage/innobase/trx/trx0trx.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/trx/trx0trx.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -1278,6 +1278,12 @@
 		}
 
 		trx->commit_lsn = lsn;
+
+		/* Tell server some activity has happened, since the trx
+		does changes something. Background utility threads like
+		master thread, purge thread or page_cleaner thread might
+		have some work to do. */
+		srv_active_wake_master_thread();
 	}
 
 	/* undo_no is non-zero if we're doing the final commit. */
@@ -1615,7 +1621,8 @@
 		scenario where some undo log records generated by a
 		transaction contain XA information and other undo log
 		records, generated by the same transaction do not. */
-		trx->support_xa = thd_supports_xa(trx->mysql_thd);
+		trx->support_xa = trx->mysql_thd
+		    ? thd_supports_xa(trx->mysql_thd) : FALSE;
 
 		ut_d(trx->start_file = __FILE__);
 		ut_d(trx->start_line = __LINE__);
@@ -1800,7 +1807,7 @@
 
 	if (trx->undo_no != 0) {
 		newline = TRUE;
-		fprintf(f, ", undo log entries "TRX_ID_FMT, trx->undo_no);
+		fprintf(f, ", undo log entries " TRX_ID_FMT, trx->undo_no);
 	}
 
 	if (newline) {
@@ -2100,7 +2107,7 @@
 			ut_print_timestamp(stderr);
 			fprintf(stderr,
 				"  InnoDB: Transaction contains changes"
-				" to "TRX_ID_FMT" rows\n",
+				" to " TRX_ID_FMT " rows\n",
 				trx->undo_no);
 
 			count++;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/trx/trx0undo.cc percona-xtrabackup-2.3.7/storage/innobase/trx/trx0undo.cc
--- percona-xtrabackup-2.2.3/storage/innobase/trx/trx0undo.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/trx/trx0undo.cc	2017-02-27 07:47:02.000000000 +0000
@@ -419,7 +419,7 @@
 Creates a new undo log segment in file.
 @return DB_SUCCESS if page creation OK possible error codes are:
 DB_TOO_MANY_CONCURRENT_TRXS DB_OUT_OF_FILE_SPACE */
-static __attribute__((nonnull, warn_unused_result))
+static __attribute__((warn_unused_result))
 dberr_t
 trx_undo_seg_create(
 /*================*/
@@ -443,7 +443,9 @@
 	ibool		success;
 	dberr_t		err = DB_SUCCESS;
 
-	ut_ad(mtr && id && rseg_hdr);
+	ut_ad(mtr != NULL);
+	ut_ad(id != NULL);
+	ut_ad(rseg_hdr != NULL);
 	ut_ad(mutex_own(&(rseg->mutex)));
 
 	/*	fputs(type == TRX_UNDO_INSERT
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/ut/ut0ut.cc percona-xtrabackup-2.3.7/storage/innobase/ut/ut0ut.cc
--- percona-xtrabackup-2.2.3/storage/innobase/ut/ut0ut.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/ut/ut0ut.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2014, 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
@@ -822,6 +822,8 @@
 		return("Temp file write failure");
 	case DB_FTS_TOO_MANY_WORDS_IN_PHRASE:
 		return("Too many words in a FTS phrase or proximity search");
+	case DB_TOO_BIG_FOR_REDO:
+		return("BLOB record length is greater than 10%% of redo log");
 
 	/* do not add default: in order to produce a warning if new code
 	is added to the enum but not added here */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/.bzrignore percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/.bzrignore
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/.bzrignore	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/.bzrignore	2017-02-27 07:47:02.000000000 +0000
@@ -8,4 +8,4 @@
 percona-theme*
 doc/source/percona-theme
 doc/source/percona-theme/
-doc/build
+doc/source/build
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/CMakeLists.txt percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -11,17 +11,18 @@
 
 # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 SET(XB_DISTRIBUTION $ENV{XB_DISTRIBUTION})
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/innobackupex.pl
-  ${CMAKE_CURRENT_BINARY_DIR}/innobackupex ESCAPE_QUOTES @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xbcloud_osenv.sh
+  ${CMAKE_CURRENT_BINARY_DIR}/xbcloud_osenv ESCAPE_QUOTES @ONLY)
 
-INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/innobackupex
+INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/xbcloud_osenv
   DESTINATION ${INSTALL_BINDIR}
   COMPONENT Server
   )
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(doc/source)
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/COPYING percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/COPYING
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/COPYING	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/COPYING	2017-02-27 07:47:02.000000000 +0000
@@ -2,7 +2,7 @@
                          Version 2, June 1991
 
      Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
      Everyone is permitted to copy and distribute verbatim copies
      of this license document, but changing it is not allowed.
@@ -316,7 +316,7 @@
 
      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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/make.bat percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/make.bat
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/make.bat	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/make.bat	1970-01-01 00:00:00.000000000 +0000
@@ -1,170 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\PerconaXtraBackup.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\PerconaXtraBackup.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-:end
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/Makefile percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/Makefile
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/Makefile	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,143 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	@echo "Downloading percona-theme ..."
-	@wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-xtrabackup/2.2
-	@echo "Extracting theme."
-	@tar -zxf percona-theme.tar.gz
-	@rm -rf source/percona-theme
-	@mv percona-theme source/percona-theme
-	@rm percona-theme.tar.gz
-	@echo "Building html doc"
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-offhtml:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/PerconaXtraBackup.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/PerconaXtraBackup.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/PerconaXtraBackup"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/PerconaXtraBackup"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	make -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/advanced/incremental_backups_with_ps_56.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/advanced/incremental_backups_with_ps_56.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/advanced/incremental_backups_with_ps_56.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/advanced/incremental_backups_with_ps_56.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,167 @@
+.. _xb_incremental_ps_56:
+
+=================================================
+Incremental Backups with Log Archiving for XtraDB
+=================================================
+
+|Percona Server| 5.6.11-60.3 has introduced a new feature called `Log Archiving
+for XtraDB
+<http://www.percona.com/doc/percona-server/5.6/management/log_archiving.html>`_.
+This feature makes copies of the old log files before they are overwritten,
+thus saving all the redo log for a write workload.
+
+.. note:: 
+
+  This feature was removed in Percona Server 5.7, and not supported by |Percona
+  XtraBackup| 2.4.
+
+
+When log archiving is enabled, it duplicates all redo log writes in a separate
+set of files in addition to normal redo log writing, creating new files as
+necessary.
+
+Archived log file name format is ``ib_log_archive_<startlsn>``. The start LSN
+marks the log sequence number when the archive was started. An example of the
+archived log files should look like this:
+
+.. code-block:: text
+
+ ib_log_archive_00000000010145937920
+ ib_log_archive_00000000010196267520
+
+In order to enable this feature, variable :option:`innodb_log_archive` should
+be set to ``ON``. Once the feature has been enabled, directory specified with
+:option:`innodb_log_arch_dir` (|MySQL| datadir by default) will contain the
+archived log files.
+
+Creating the Backup
+===================
+
+To make an incremental backup, begin with a full backup as usual. The
+|xtrabackup| binary writes a file called :file:`xtrabackup_checkpoints` into
+the backup's target directory. This file contains a line showing the
+``to_lsn``, which is the database's :term:`LSN` at the end of the backup.
+:ref:`Create the full backup <full_backup>` with a command such as the
+following:
+
+.. code-block:: bash
+
+  $ xtrabackup --backup --target-dir=/data/backup/
+
+If you look at the :file:`xtrabackup_checkpoints` file, you should see contents
+similar to the following:
+
+.. code-block:: text
+
+  backup_type = full-backuped
+  from_lsn = 0
+  to_lsn = 430824722
+  last_lsn = 438369416
+  compact = 0
+  recover_binlog_info = 1
+
+Using the Log Archiving to prepare the backup
+=============================================
+
+In order to prepare the backup we need to specify the directory that contains
+the archived logs with the :option:`xtrabackup --innodb-log-arch-dir` option:
+
+.. code-block:: text
+
+ $ xtrabackup --prepare --target-dir=/data/backup/ \
+ --innodb-log-arch-dir=/data/archived-logs/
+
+This command will use archived logs, replay them against the backup folder and
+bring them up to date with the latest archived log.
+
+Output should look like this:
+
+.. code-block:: text
+
+  xtrabackup version 2.3.5 based on MySQL server 5.6.24 Linux (x86_64) (revision id: 45cda89)
+  xtrabackup: cd to /tmp/backup/
+  xtrabackup: using the following InnoDB configuration for recovery:
+  xtrabackup:   innodb_data_home_dir = ./
+  xtrabackup:   innodb_data_file_path = ibdata1:12M:autoextend
+  xtrabackup:   innodb_log_group_home_dir = ./
+  xtrabackup:   innodb_log_files_in_group = 2
+  xtrabackup:   innodb_log_file_size = 50331648
+  xtrabackup: Generating a list of tablespaces
+  xtrabackup: using the following InnoDB configuration for recovery:
+  xtrabackup:   innodb_data_home_dir = ./
+  xtrabackup:   innodb_data_file_path = ibdata1:12M:autoextend
+  xtrabackup:   innodb_log_group_home_dir = ./
+  xtrabackup:   innodb_log_files_in_group = 2
+  xtrabackup:   innodb_log_file_size = 50331648
+  xtrabackup: Starting InnoDB instance for recovery.
+  xtrabackup: Using 104857600 bytes for buffer pool (set by --use-memory parameter)
+  InnoDB: Using atomics to ref count buffer pool pages
+  InnoDB: The InnoDB memory heap is disabled
+  InnoDB: Mutexes and rw_locks use GCC atomic builtins
+  InnoDB: Memory barrier is not used
+  InnoDB: Compressed tables use zlib 1.2.8
+  InnoDB: Using CPU crc32 instructions
+  InnoDB: Initializing buffer pool, size = 100.0M
+  InnoDB: Completed initialization of buffer pool
+  InnoDB: Setting log file ./ib_logfile101 size to 48 MB
+  InnoDB: Setting log file ./ib_logfile1 size to 48 MB
+  InnoDB: Renaming log file ./ib_logfile101 to ./ib_logfile0
+  InnoDB: New log files created, LSN=15717900
+  InnoDB:  Starting archive recovery from a backup...
+  InnoDB: Opened archived log file /var/lib/mysql/ib_log_archive_00000000000009079808
+  InnoDB: Starting an apply batch of log records to the database...
+  InnoDB: Progress in percent: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
+  InnoDB: Apply batch completed
+  InnoDB: Opened archived log file /var/lib/mysql/ib_log_archive_00000000000059409408
+  InnoDB: Starting an apply batch of log records to the database...
+  InnoDB: Progress in percent: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
+  InnoDB: Apply batch completed
+  ...
+  InnoDB: Starting an apply batch of log records to the database...
+  InnoDB: Progress in percent: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
+  InnoDB: Apply batch completed
+  InnoDB: 1 transaction(s) which must be rolled back or cleaned up
+  InnoDB: in total 15931 row operations to undo
+  InnoDB: Trx id counter is 36864
+
+  xtrabackup: starting shutdown with innodb_fast_shutdown = 1
+  InnoDB: Starting shutdown...
+  InnoDB: Shutdown completed; log sequence number 713694189
+  161012 13:48:50 completed OK!
+
+After this is completed successfully backup can be restored.
+
+You can check the :file:`xtrabackup_checkpoints` file and see that the
+``backup_type`` has changed:
+
+.. code-block:: text
+
+   backup_type = log-applied
+   from_lsn = 0
+   to_lsn = 430824722
+   last_lsn = 438369416
+   compact = 0
+   recover_binlog_info = 0
+
+.. note::
+
+   Archived logs can be applied to backup data several times, for example to
+   decrease the backup size or time required for preparing the backup.
+
+Additional option is available if you need to restore a backup to specific
+point in time. By adding the :option:`xtrabackup --to-archived-lsn` option you
+can specify the LSN to which the backup will be prepared.
+
+.. code-block:: bash
+
+  $ xtrabackup --prepare --target-dir=/data/backup/ --innodb-log-arch-dir=/data/archived-logs/ --to-archived-lsn=5536301566
+
+This will prepare the backup up to the specified Log Sequence Number.
+
+.. note::
+
+  When restoring this backup, due to bugs :bug:`1632734` and :bug:`1632737`
+  you'll need to either restore the backup as usual and let server to cleanup
+  on startup because transactions will not be rolled back and server startup
+  could take longer or manually remove ``ib_logfiles`` and
+  :file:`xtrabackup_logfile` and run :option:`--prepare` second time.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/advanced/lockless_bin-log.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/advanced/lockless_bin-log.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/advanced/lockless_bin-log.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/advanced/lockless_bin-log.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,70 @@
+.. _lockless_bin-log:
+
+===============================
+Lockless binary log information
+===============================
+
+|Percona XtraBackup| implemented support for lock-less binary log information
+in 2.3.2. When the `Lockless binary log information
+<https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-safe-binlog-information>`_
+feature is available [#n-1]_ on the server, |Percona XtraBackup| can trust
+binary log information stored in the |InnoDB| system header and avoid executing
+``LOCK BINLOG FOR BACKUP`` (and thus, blocking commits for the duration of
+finalizing the ``REDO`` log copy) under a number of circumstances:
+
+* when the server is not a GTID-enabled Galera cluster node
+
+* when the replication I/O thread information should not be stored as a part of
+  the backup (i.e. when the :option:`xtrabackup --slave-info` option is not
+  specified)
+
+If all of the above conditions hold, |Percona XtraBackup| does not execute the
+``SHOW MASTER STATUS`` as a part of the backup procedure, does not create the
+:file:`xtrabackup_binlog_info` file on backup. Instead, that information is
+retrieved and the file is created after preparing the backup, along with
+creating :file:`xtrabackup_binlog_pos_innodb`, which in this case contains
+exactly the same information as in :file:`xtrabackup_binlog_info` and is thus
+redundant.
+
+To make this new functionality configurable, there is now a new |Percona
+XtraBackup| option, :option:`xtrabackup --binlog-info`, which can accept the
+following values:
+
+* ``OFF`` - This means that |Percona XtraBackup| will not attempt to retrieve
+  the binary log information at all, neither during the backup creation, nor
+  after preparing it. This can help when a user just wants to copy data without
+  any meta information like binary log or replication coordinates. In this
+  case, :option:`--binlog-info=OFF` can be passed to |Percona XtraBackup| and
+  ``LOCK BINLOG FOR BACKUP`` will not be executed, even if the backup-safe
+  binlog info feature is not provided by the server (but the backup locks
+  feature is still a requirement).
+
+* ``ON`` - This matches the old behavior, i.e. the one before this |Percona
+  XtraBackup| feature had been implemented. When specified, |Percona
+  XtraBackup| retrieves the binary log information and uses ``LOCK BINLOG FOR
+  BACKUP`` (if available) to ensure its consistency.
+
+* ``LOCKLESS`` - This corresponds to the functionality explained above:
+  |Percona XtraBackup| will not retrieve binary log information during the
+  backup process, will not execute ``LOCK BINLOG FOR BACKUP``, and the
+  :file:`xtrabackup_binlog_info` file will not be created. The file will be
+  created after preparing the backup using the information stored in the InnoDB
+  system header. If the required server-side functionality is not provided by
+  the server, specifying this :option:`xtrabackup --binlog-info` value will
+  result in an error. If one of the above mentioned conditions does not hold,
+  ``LOCK BINLOG FOR BACKUP`` will still be executed to ensure consistency of
+  other meta data.
+
+* ``AUTO`` - This is the default value. When used, |Percona XtraBackup| will
+  automatically switch to either ``ON`` or ``LOCKLESS``, depending on the
+  server-side feature availability, i.e. whether the
+  :option:`have_backup_safe_binlog_info` server variable is available.
+
+.. rubric:: Footnotes
+
+.. [#n-1]
+
+  This feature is exclusive to |Percona Server| starting with version
+  5.6.26-74.0. It is also used in |Percona XtraDB Cluster| starting with
+  version 5.6.26-25.12 when the node is being backed up without
+  :option:`xtrabackup --galera-info`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/backup_scenarios/full_backup.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/backup_scenarios/full_backup.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/backup_scenarios/full_backup.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/backup_scenarios/full_backup.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,215 @@
+.. _full_backup:
+
+===============================
+The Backup Cycle - Full Backups
+===============================
+
+Creating a backup
+=================
+
+To create a backup, run :program:`xtrabackup` with the :option:`--backup`
+option. You also need to specify a :option:`--target_dir` option, which is
+where the backup will be stored, if the |InnoDB| data or log files aren't
+stored in the same directory, you might need to specify the location of those,
+too. If the target directory does not exist, |xtrabackup| creates it. If the
+directory does exist and is empty, |xtrabackup| will succeed. |xtrabackup| will
+not overwrite existing files, it will fail with operating system error 17,
+``file exists``.
+
+To start the backup process run:
+
+.. code-block:: bash
+
+  $ xtrabackup --backup --target-dir=/data/backups/
+
+This will store the backup at :file:`/data/backups/`. If you specify a
+relative path, the target directory will be relative to the current directory.
+
+During the backup process, you should see a lot of output showing the data
+files being copied, as well as the log file thread repeatedly scanning the log
+files and copying from it. Here is an example that shows the log thread
+scanning the log in the background, and a file copying thread working on the
+:file:`ibdata1` file:
+
+.. code-block:: text
+
+  160906 10:19:17 Finished backing up non-InnoDB tables and files
+  160906 10:19:17 Executing FLUSH NO_WRITE_TO_BINLOG ENGINE LOGS...
+  xtrabackup: The latest check point (for incremental): '62988944'
+  xtrabackup: Stopping log copying thread.
+  .160906 10:19:18 >> log scanned up to (137343534)
+  160906 10:19:18 Executing UNLOCK TABLES
+  160906 10:19:18 All tables unlocked
+  160906 10:19:18 Backup created in directory '/data/backups/'
+  160906 10:19:18 [00] Writing backup-my.cnf
+  160906 10:19:18 [00]        ...done
+  160906 10:19:18 [00] Writing xtrabackup_info
+  160906 10:19:18 [00]        ...done
+  xtrabackup: Transaction log of lsn (26970807) to (137343534) was copied.
+  160906 10:19:18 completed OK!
+
+The last thing you should see is something like the following, where the value
+of the ``<LSN>`` will be a number that depends on your system:
+
+.. code-block:: text
+
+  xtrabackup: Transaction log of lsn (<SLN>) to (<LSN>) was copied.
+
+.. note::
+
+  Log copying thread checks the transactional log every second to see if there
+  were any new log records written that need to be copied, but there is a
+  chance that the log copying thread might not be able to keep up with the
+  amount of writes that go to the transactional logs, and will hit an error
+  when the log records are overwritten before they could be read.
+
+After the backup is finished, the target directory will contain files such as
+the following, assuming you have a single InnoDB table :file:`test.tbl1` and
+you are using MySQL's :term:`innodb_file_per_table` option:
+
+.. code-block:: bash
+
+  $ ls -lh /data/backups/
+  total 182M
+  drwx------  7 root root 4.0K Sep  6 10:19 .
+  drwxrwxrwt 11 root root 4.0K Sep  6 11:05 ..
+  -rw-r-----  1 root root  387 Sep  6 10:19 backup-my.cnf
+  -rw-r-----  1 root root  76M Sep  6 10:19 ibdata1
+  drwx------  2 root root 4.0K Sep  6 10:19 mysql
+  drwx------  2 root root 4.0K Sep  6 10:19 performance_schema
+  drwx------  2 root root 4.0K Sep  6 10:19 sbtest
+  drwx------  2 root root 4.0K Sep  6 10:19 test
+  drwx------  2 root root 4.0K Sep  6 10:19 world2
+  -rw-r-----  1 root root  116 Sep  6 10:19 xtrabackup_checkpoints
+  -rw-r-----  1 root root  433 Sep  6 10:19 xtrabackup_info
+  -rw-r-----  1 root root 106M Sep  6 10:19 xtrabackup_logfile
+
+The backup can take a long time, depending on how large the database is. It is
+safe to cancel at any time, because it does not modify the database.
+
+The next step is getting your backup ready to be restored.
+
+.. _preparing_a_backup:
+
+Preparing a backup
+==================
+
+After you made a backup with the :option:`--backup` option, you'll first need
+to prepare it in order to restore it. Data files are not point-in-time
+consistent until they've been prepared, because they were copied at different
+times as the program ran, and they might have been changed while this was
+happening. If you try to start InnoDB with these data files, it will detect
+corruption and crash itself to prevent you from running on damaged data. The
+:option:`--prepare` step makes the files perfectly consistent at a single
+instant in time, so you can run |InnoDB| on them.
+
+You can run the prepare operation on any machine; it does not need to be on the
+originating server or the server to which you intend to restore. You can copy
+the backup to a utility server and prepare it there.
+
+.. note::
+
+  You can prepare a backup created with older |Percona XtraBackup| version with
+  a newer one, but not vice versa. Preparing a backup on an unsupported server
+  version should be done with the latest |Percona XtraBackup| release which
+  supports that server version. For example, if one has a backup of MySQL 5.0
+  created with |Percona XtraBackup| 1.6, then preparing the backup with
+  |Percona XtraBackup| 2.3 is not supported, because support for MySQL 5.0 was
+  removed in |Percona XtraBackup| 2.1. Instead, the latest release in the 2.0
+  series should be used.
+
+During the prepare operation, |xtrabackup| boots up a kind of modified InnoDB
+that's embedded inside it (the libraries it was linked against). The
+modifications are necessary to disable InnoDB's standard safety checks, such as
+complaining that the log file isn't the right size, which aren't appropriate
+for working with backups. These modifications are only for the xtrabackup
+binary; you don't need a modified |InnoDB| to use |xtrabackup| for your
+backups.
+
+The prepare step uses this "embedded InnoDB" to perform crash recovery on the
+copied data files, using the copied log file. The ``prepare`` step is very
+simple to use: you simply run |xtrabackup| with the :option:`--prepare` option
+and tell it which directory to prepare, for example, to prepare the previously
+taken backup run:
+
+.. code-block:: bash
+
+  $ xtrabackup --prepare --target-dir=/data/backups/
+
+When this finishes, you should see an "InnoDB shutdown" with a message such as
+the following, where again the value of :term:`LSN` will depend on your system:
+
+.. code-block:: text
+
+  InnoDB: Shutdown completed; log sequence number 137345046
+  160906 11:21:01 completed OK!
+
+All following prepares will not change the already prepared data files, you'll
+see that output says:
+
+.. code-block:: console
+
+  xtrabackup: This target seems to be already prepared.
+  xtrabackup: notice: xtrabackup_logfile was already used to '--prepare'.
+
+It is not recommended to interrupt xtrabackup process while preparing backup
+because it may cause data files corruption and backup will become unusable.
+Backup validity is not guaranteed if prepare process was interrupted.
+
+.. note::
+
+  If you intend the backup to be the basis for further incremental backups, you
+  should use the :option:`--apply-log-only` option when preparing the backup,
+  or you will not be able to apply incremental backups to it. See the
+  documentation on preparing :ref:`incremental backups <incremental_backup>`
+  for more details.
+
+.. _restoring_a_backup:
+
+Restoring a Backup
+==================
+
+.. warning::
+
+  Backup needs to be :ref:`prepared <preparing_a_backup>` before it can be
+  restored.
+
+For convenience |xtrabackup| binary has an :option:`xtrabackup --copy-back`
+option, which will copy the backup to the server's :term:`datadir`:
+
+.. code-block:: bash
+
+  $ xtrabackup --copy-back --target-dir=/data/backups/
+
+If you don't want to save your backup, you can use the :option:`move-back`
+option which will move the backed up data to the :term:`datadir`.
+
+If you don't want to use any of the above options, you can additionally use
+:program:`rsync` or :program:`cp` to restore the files.
+
+.. note::
+
+ The :term:`datadir` must be empty before restoring the backup. Also it's
+ important to note that MySQL server needs to be shut down before restore is
+ performed. You can't restore to a :term:`datadir` of a running mysqld instance
+ (except when importing a partial backup).
+
+Example of the :program:`rsync` command that can be used to restore the backup
+can look like this:
+
+.. code-block:: bash
+
+  $ rsync -avrP /data/backup/ /var/lib/mysql/
+
+You should check that the restored files have the correct ownership and
+permissions.
+
+As files' attributes will be preserved, in most cases you will need to change
+the files' ownership to ``mysql`` before starting the database server, as they
+will be owned by the user who created the backup:
+
+.. code-block:: bash
+
+  $ chown -R mysql:mysql /var/lib/mysql
+
+Data is now restored and you can start the server.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/backup_scenarios/incremental_backup.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/backup_scenarios/incremental_backup.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/backup_scenarios/incremental_backup.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/backup_scenarios/incremental_backup.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,227 @@
+.. _incremental_backup:
+
+==================
+Incremental Backup
+==================
+
+Both |xtrabackup| and |innobackupex| tools supports incremental backups,
+which means that they can copy only the data that has changed since the last
+backup.
+
+You can perform many incremental backups between each full backup, so you can
+set up a backup process such as a full backup once a week and an incremental
+backup every day, or full backups every day and incremental backups every hour.
+
+Incremental backups work because each |InnoDB| page contains a log sequence
+number, or :term:`LSN`. The :term:`LSN` is the system version number for the
+entire database. Each page's :term:`LSN` shows how recently it was changed.
+
+An incremental backup copies each page whose :term:`LSN` is newer than the
+previous incremental or full backup's :term:`LSN`. There are two algorithms in
+use to find the set of such pages to be copied. The first one, available with
+all the server types and versions, is to check the page :term:`LSN` directly by
+reading all the data pages. The second one, available with |Percona Server|, is
+to enable the `changed page tracking
+<http://www.percona.com/doc/percona-server/5.6/management/changed_page_tracking.html>`_
+feature on the server, which will note the pages as they are being changed.
+This information will be then written out in a compact separate so-called
+bitmap file. The |xtrabackup| binary will use that file to read only the data
+pages it needs for the incremental backup, potentially saving many read
+requests. The latter algorithm is enabled by default if the |xtrabackup| binary
+finds the bitmap file. It is possible to specify
+:option:`--incremental-force-scan` to read all the pages even if the bitmap
+data is available.
+
+Incremental backups do not actually compare the data files to the previous
+backup's data files. In fact, you can use :option:`--incremental-lsn` to
+perform an incremental backup without even having the previous backup, if you
+know its :term:`LSN`. Incremental backups simply read the pages and compare
+their :term:`LSN` to the last backup's :term:`LSN`. You still need a full
+backup to recover the incremental changes, however; without a full backup to
+act as a base, the incremental backups are useless.
+
+Creating an Incremental Backup
+==============================
+
+To make an incremental backup, begin with a full backup as usual. The
+|xtrabackup| binary writes a file called :file:`xtrabackup_checkpoints` into
+the backup's target directory. This file contains a line showing the
+``to_lsn``, which is the database's :term:`LSN` at the end of the backup.
+:ref:`Create the full backup <full_backup>` with a following command:
+
+.. code-block:: bash
+
+  $ xtrabackup --backup --target-dir=/data/backups/base
+
+If you look at the :file:`xtrabackup_checkpoints` file, you should see similar
+content depending on your LSN nuber:
+
+.. code-block:: text
+
+  backup_type = full-backuped
+  from_lsn = 0
+  to_lsn = 1626007
+  last_lsn = 1626007
+  compact = 0
+  recover_binlog_info = 1
+
+Now that you have a full backup, you can make an incremental backup based on
+it. Use the following command:
+
+.. code-block:: bash
+
+  $ xtrabackup --backup --target-dir=/data/backups/inc1 \
+  --incremental-basedir=/data/backups/base
+
+The :file:`/data/backups/inc1/` directory should now contain delta files, such
+as :file:`ibdata1.delta` and :file:`test/table1.ibd.delta`. These represent the
+changes since the ``LSN 1626007``. If you examine the
+:file:`xtrabackup_checkpoints` file in this directory, you should see similar
+content to the following:
+
+.. code-block:: text
+
+  backup_type = incremental
+  from_lsn = 1626007
+  to_lsn = 4124244
+  last_lsn = 4124244
+  compact = 0
+  recover_binlog_info = 1
+
+``from_lsn`` is the starting LSN of the backup and for incremental it has to be
+the same as ``to_lsn`` (if it is the last checkpoint) of the previous/base
+backup.
+
+It's now possible to use this directory as the base for yet another incremental
+backup:
+
+.. code-block:: bash
+
+  $ xtrabackup --backup --target-dir=/data/backups/inc2 \
+  --incremental-basedir=/data/backups/inc1
+
+This folder also contains the :file:`xtrabackup_checkpoints`:
+
+.. code-block:: text
+
+  backup_type = incremental
+  from_lsn = 4124244
+  to_lsn = 6938371
+  last_lsn = 7110572
+  compact = 0
+  recover_binlog_info = 1
+
+.. note::
+
+  In this case you can see that there is a difference between the ``to_lsn``
+  (last checkpoint LSN) and ``last_lsn`` (last copied LSN), this means that
+  there was some traffic on the server during the backup process.
+
+.. _preparing_incremental_backups:
+
+Preparing the Incremental Backups
+=================================
+
+The :option:`--prepare` step for incremental backups is not the same as for
+full backups. In full backups, two types of operations are performed to make
+the database consistent: committed transactions are replayed from the log file
+against the data files, and uncommitted transactions are rolled back. You must
+skip the rollback of uncommitted transactions when preparing an incremental
+backup, because transactions that were uncommitted at the time of your backup
+may be in progress, and it's likely that they will be committed in the next
+incremental backup. You should use the :option:`--apply-log-only` option to
+prevent the rollback phase.
+
+.. warning::
+
+  **If you do not use the** :option:`--apply-log-only` **option to prevent the
+  rollback phase, then your incremental backups will be useless**. After
+  transactions have been rolled back, further incremental backups cannot be
+  applied.
+
+Beginning with the full backup you created, you can prepare it, and then apply
+the incremental differences to it. Recall that you have the following backups:
+
+.. code-block:: bash
+
+  /data/backups/base
+  /data/backups/inc1
+  /data/backups/inc2
+
+To prepare the base backup, you need to run :option:`--prepare` as usual, but
+prevent the rollback phase:
+
+.. code-block:: bash
+
+  $ xtrabackup --prepare --apply-log-only --target-dir=/data/backups/base
+
+The output should end with some text such as the following:
+
+.. code-block:: text
+
+  InnoDB: Shutdown completed; log sequence number 1626007
+  161011 12:41:04 completed OK!
+
+The log sequence number should match the ``to_lsn`` of the base backup, which
+you saw previously.
+
+.. note::
+
+  This backup is actually safe to :ref:`restore <restoring_a_backup>` as-is
+  now, even though the rollback phase has been skipped. If you restore it and
+  start |MySQL|, |InnoDB| will detect that the rollback phase was not
+  performed, and it will do that in the background, as it usually does for a
+  crash recovery upon start. It will notify you that the database was not shut
+  down normally.
+
+To apply the first incremental backup to the full backup, run the following
+command:
+
+.. code-block:: bash
+
+  $ xtrabackup --prepare --apply-log-only --target-dir=/data/backups/base \
+  --incremental-dir=/data/backups/inc1
+
+This applies the delta files to the files in :file:`/data/backups/base`, which
+rolls them forward in time to the time of the incremental backup. It then
+applies the redo log as usual to the result. The final data is in
+:file:`/data/backups/base`, not in the incremental directory. You should see
+the output similar to:
+
+.. code-block:: bash
+
+  incremental backup from 1626007 is enabled.
+  xtrabackup: cd to /data/backups/base
+  xtrabackup: This target seems to be already prepared with --apply-log-only.
+  xtrabackup: xtrabackup_logfile detected: size=2097152, start_lsn=(4124244)
+  ...
+  xtrabackup: page size for /tmp/backups/inc1/ibdata1.delta is 16384 bytes
+  Applying /tmp/backups/inc1/ibdata1.delta to ./ibdata1...
+  ...
+  161011 12:45:56 completed OK!
+
+Again, the |LSN| should match what you saw from your earlier inspection of the
+first incremental backup. If you restore the files from
+:file:`/data/backups/base`, you should see the state of the database as of the
+first incremental backup.
+
+Preparing the second incremental backup is a similar process: apply the deltas
+to the (modified) base backup, and you will roll its data forward in time to
+the point of the second incremental backup:
+
+.. code-block:: bash
+
+  $ xtrabackup --prepare --target-dir=/data/backups/base \
+  --incremental-dir=/data/backups/inc2
+
+.. note::
+
+ :option:`--apply-log-only` should be used when merging all incrementals except
+ the last one. That's why the previous line doesn't contain the
+ :option:`--apply-log-only` option. Even if the :option:`--apply-log-only` was
+ used on the last step, backup would still be consistent but in that case server
+ would perform the rollback phase.
+
+Once prepared incremental backups are the same as the :ref:`full backups
+<full_backup>` and they can be :ref:`restored <restoring_a_backup>` the same
+way.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/CMakeLists.txt percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,80 @@
+# Copyright (c) 2015 Percona LLC and/or its affiliates.
+#
+# 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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+# generate man pages
+IF(WITH_MAN_PAGES)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/man
+    COMMAND sphinx-build -b man -d ${CMAKE_CURRENT_BINARY_DIR}/build/doctrees ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build/man
+    VERBATIM
+  )
+
+  ADD_CUSTOM_TARGET(man ALL
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/man
+  )
+
+  INSTALL(
+    CODE "FILE( GLOB MAN1_FILES \"${CMAKE_CURRENT_BINARY_DIR}/build/man/*.1\" )"
+    CODE "FILE( INSTALL \${MAN1_FILES} DESTINATION \"${INSTALL_MANDIR}/man1\" )"
+  )
+ENDIF()
+
+# generate html documentation
+IF(WITH_HTML_DOCS)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/html
+    # Downloads percona-theme into source dir because of sphinx bug:
+    # https://github.com/sphinx-doc/sphinx/issues/925
+    COMMAND wget -O ${CMAKE_CURRENT_SOURCE_DIR}/percona-theme.tar.gz http://percona.com/docs/theme/percona-xtrabackup/2.3
+    COMMAND tar -zxf ${CMAKE_CURRENT_SOURCE_DIR}/percona-theme.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND rm -f ${CMAKE_CURRENT_SOURCE_DIR}/percona-theme.tar.gz
+    COMMAND sphinx-build -b html -d ${CMAKE_CURRENT_BINARY_DIR}/build/doctrees ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build/html
+    COMMAND rm -rf ${CMAKE_CURRENT_SOURCE_DIR}/percona-theme
+    VERBATIM
+  )
+
+  ADD_CUSTOM_TARGET(html ALL
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/html
+  )
+ENDIF()
+
+# generate latex or pdf documentation
+IF(WITH_LATEX_DOCS OR WITH_PDF_DOCS)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.3.tex
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/latex/Makefile
+    COMMAND sphinx-build -b latex -d ${CMAKE_CURRENT_BINARY_DIR}/build/doctrees ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build/latex
+    VERBATIM
+  )
+
+  ADD_CUSTOM_TARGET(latex ALL
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.3.tex
+  )
+
+  IF(WITH_PDF_DOCS)
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.3.pdf
+      COMMAND make -C ${CMAKE_CURRENT_BINARY_DIR}/build/latex all-pdf
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.3.tex
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/latex/Makefile
+      VERBATIM
+    )
+
+    ADD_CUSTOM_TARGET(latexpdf ALL
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.3.pdf
+    )
+  ENDIF()
+
+ENDIF()
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/conf.py percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/conf.py
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/conf.py	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/conf.py	2017-02-27 07:47:02.000000000 +0000
@@ -26,9 +26,8 @@
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 
-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo', 
-              'sphinx.ext.coverage', 'sphinx.ext.ifconfig', 
-              'sphinx.ext.extlinks']
+extensions = ['sphinx.ext.extlinks', 'sphinx.ext.todo', 
+              'sphinx.ext.coverage', 'sphinx.ext.ifconfig']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -44,16 +43,16 @@
 
 # General information about the project.
 project = u'Percona XtraBackup'
-copyright = u'2009-2014, Percona LLC and/or its affiliates'
+copyright = u'2009-2016, Percona LLC and/or its affiliates'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.2'
+version = '2.3.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.2-beta1'
+release = '2.3.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -96,11 +95,13 @@
 
 .. |xbstream|  replace:: :term:`xbstream`
 
-.. |XtraDB|  replace:: :term:`XtraDB`
+.. |xbcrypt|  replace:: :term:`xbcrypt`
 
-.. |InnoDB|  replace:: :term:`InnoDB`
+.. |XtraDB|  replace:: *XtraDB*
 
-.. |MyISAM|  replace:: :term:`MyISAM`
+.. |InnoDB|  replace:: *InnoDB*
+
+.. |MyISAM|  replace:: *MyISAM*
 
 .. |Percona Toolkit|  replace:: *Percona Toolkit*
 
@@ -124,6 +125,8 @@
 
 .. |tar|  replace:: :program:`tar`
 
+.. |xbcloud| replace:: *xbcloud*
+
 '''
 
 extlinks = {'bug': ('https://bugs.launchpad.net/percona-xtrabackup/+bug/%s',
@@ -150,10 +153,10 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = 'Percona XtraBackup 2.2 Documentation'
+html_title = 'Percona XtraBackup 2.3 Documentation'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-html_short_title = 'Percona XtraBackup 2.2 Documentation'
+html_short_title = 'Percona XtraBackup 2.3 Documentation'
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
@@ -178,7 +181,10 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {
+        '**': ['localtoc.html', 'sourcelink.html'],
+        'using/windows': ['windowssidebar.html'],
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
@@ -225,7 +231,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'PerconaXtraBackup-2.2.tex', u'Percona XtraBackup 2.2 Documentation',
+  ('index', 'PerconaXtraBackup-2.3.tex', u'Percona XtraBackup 2.3 Documentation',
    u'Percona LLC and/or its affiliates', 'manual'),
 ]
 
@@ -235,7 +241,12 @@
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+latex_use_parts = True
+
+latex_elements = {
+  'classoptions': ',oneside',
+  'babel': '\\usepackage[english]{babel}'
+}
 
 # If true, show page references after internal links.
 #latex_show_pagerefs = False
@@ -258,7 +269,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('xtrabackup_bin/xtrabackup_binary', 'xtrabackup', u'Percona XtraBackup 2.2 Documentation',
+    ('xtrabackup_bin/xtrabackup_binary', 'xtrabackup', u'Percona XtraBackup 2.3 Documentation',
      [u'Percona LLC and/or its affiliates'], 1),
     ('innobackupex/innobackupex_script', 'innobackupex', u'innobackupex Documentation',
      [u'Percona LLC and/or its affiliates'], 1),
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/faq.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/faq.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/faq.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/faq.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,62 +1,79 @@
-============================
- Frequently Asked Questions
-============================
+==========================
+Frequently Asked Questions
+==========================
 
 Do I need an InnoDB Hot Backup license to use Percona XtraBackup?
 =================================================================
 
-No. Although ``innobackupex`` is derived from the same GPL and open-source wrapper script that InnoDB Hot Backup uses, it does not execute ``ibbackup``, and the ``xtrabackup`` binary does not execute or link to ``ibbackup``. You can use |Percona XtraBackup| without any license; it is completely separate from InnoDB Hot Backup.
+No. Although ``innobackupex`` is derived from the same GPL and open-source
+wrapper script that InnoDB Hot Backup uses, it does not execute ``ibbackup``,
+and the ``xtrabackup`` binary does not execute or link to ``ibbackup``. You
+can use |Percona XtraBackup| without any license; it is completely separate
+from InnoDB Hot Backup.
 
-Why is innobackupex distributed as innobackupex-1.5.1?
-======================================================
-
-That's the way the source for the tool was distributed from Oracle. Nowadays, it is a symbolic link to |innobackupex| for backward compatibility with |Percona XtraBackup|.
-
-What's the difference between :program:`innobackupex` and :program:`innobackup`?
-================================================================================
-
-Because :program:`innobackupex` is a patched version of *Oracle* ’s :program:`innobackup` script (now renamed to :program:`mysqlbackup`), it is quite similar in some ways, and familiarity with innobackup might be helpful.
-
-Aside from the options for specific features of |innobackupex|, the main differences are:
-
-  * printing to ``STDERR`` instead of ``STDOUT`` (which enables the :option:`--stream` option), 
+What's the difference between :program:`innobackupex` and
+=========================================================
+:program:`innobackup`?
+======================
 
-  * the configuration file - :term:`my.cnf` - is detected automatically (or setted with :option:`innobackupex --defaults-file`) instead of the mandotory first argument,
+Because :program:`innobackupex` is a patched version of *Oracle* ’s
+:program:`innobackup` script (now renamed to :program:`mysqlbackup`), it is
+quite similar in some ways, and familiarity with innobackup might be helpful.
+
+Aside from the options for specific features of |innobackupex|, the main
+differences are:
+
+  * printing to ``STDERR`` instead of ``STDOUT`` (which enables the
+    :option:`--stream` option),
+
+  * the configuration file - :term:`my.cnf` - is detected automatically (or
+    set with :option:`innobackupex --defaults-file`) instead of the mandotory
+    first argument,
 
   * and defaults to |xtrabackup| as binary to use in the :option:`--ibbackup`.
 
-..  * Ssleep and compress?
-
 See :doc:`innobackupex/innobackupex_option_reference` for more details.
 
-
-Why doesn't the :program:`xtrabackup` binary include MyISAM tables and other files in its backup? Should I use :program:`innobackupex` always?
-===============================================================================================================================================
-
-:program:`xtrabackup` is a C program written to take advantage of the InnoDB or XtraDB features in order to make it as fast, less resource-consuming and unobtrusive (locking the database server) as possible. That is only possible with those engines. In the case of MyISAM a "read lock" is needed.
-
-:program:`innobackupex` is a script written in Perl which wraps :program:`xtrabackup` and other backup tools (such as :program:`tar4ibd`) and provides you with the functionality of each tool taking care of the details.
-
-However, for some specific tasks, you must use :program:`xtrabackup` directly. See the :ref:`user-manual` for details on each one.
-
-Are you aware of any web-based backup management tools (commercial or not) built around |Percona XtraBackup|?
-=============================================================================================================
-
-`Zmanda Recovery Manager <http://www.zmanda.com/zrm-mysql-enterprise.html>`_ is a commercial tool that uses |Percona XtraBackup| for Non-Blocking Backups: 
-
- *"ZRM provides support for non-blocking backups of MySQL using |Percona XtraBackup|. ZRM with |Percona XtraBackup| provides resource utilization management by providing throttling based on the number of IO operations per second. |Percona XtraBackup| based backups also allow for table level recovery even though the backup was done at the database level (needs the recovery database server to be |Percona Server| with XtraDB)."*
+Are you aware of any web-based backup management tools (commercial or not)
+==========================================================================
+built around |Percona XtraBackup|?
+==================================
+
+`Zmanda Recovery Manager <http://www.zmanda.com/zrm-mysql-enterprise.html>`_ is
+a commercial tool that uses |Percona XtraBackup| for Non-Blocking Backups:
+
+ *"ZRM provides support for non-blocking backups of MySQL using |Percona
+ XtraBackup|. ZRM with |Percona XtraBackup| provides resource utilization
+ management by providing throttling based on the number of IO operations per
+ second. |Percona XtraBackup| based backups also allow for table level recovery
+ even though the backup was done at the database level (needs the recovery
+ database server to be |Percona Server| with XtraDB)."*
 
 |xtrabackup| binary fails with a floating point exception
 =========================================================
 
-In most of the cases this is due to not having install the required libraries (and version) by |xtrabackup|. Installing the *GCC* suite with the supporting libraries and recompiling |xtrabackup| will solve the issue. See :doc:`installation/compiling_xtrabackup` for instructions on the procedure.
-
-How innobackupex handles the ibdata/ib_log files on restore if they aren't in mysql datadir?
-============================================================================================
-
-In case the ibdata and ib_log files are located in different directories outside of the datadir, you will have to put them in their proper place after the logs have been applied.
+In most of the cases this is due to not having install the required libraries
+(and version) by |xtrabackup|. Installing the *GCC* suite with the supporting
+libraries and recompiling |xtrabackup| will solve the issue. See
+:doc:`installation/compiling_xtrabackup` for instructions on the procedure.
+
+How xtrabackup handles the ibdata/ib_log files on restore if they aren't in
+===========================================================================
+mysql datadir?
+==============
+
+In case the :file:`ibdata` and :file:`ib_log` files are located in different
+directories outside of the datadir, you will have to put them in their proper
+place after the logs have been applied.
 
 Backup fails with Error 24: 'Too many open files'
 =================================================
 
-This usually happens when database being backed up contains large amount of files and |Percona XtraBackup| can't open all of them to create a successful backup. In order to avoid this error the operating system should be configured appropriately so that |Percona XtraBackup| can open all its files. On Linux, this can be done with the ``ulimit`` command for specific backup session or by editing the :file:`/etc/security/limits.conf` to change it globally (**NOTE**: the maximum possible value that can be set up is 1048576 which is a hard-coded constant in the Linux kernel). 
+This usually happens when database being backed up contains large amount of
+files and |Percona XtraBackup| can't open all of them to create a successful
+backup. In order to avoid this error the operating system should be configured
+appropriately so that |Percona XtraBackup| can open all its files. On Linux,
+this can be done with the ``ulimit`` command for specific backup session or by
+editing the :file:`/etc/security/limits.conf` to change it globally (**NOTE**:
+the maximum possible value that can be set up is ``1048576`` which is a
+hard-coded constant in the Linux kernel).
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/glossary.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/glossary.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/glossary.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/glossary.rst	2017-02-27 07:47:02.000000000 +0000
@@ -5,12 +5,16 @@
 .. glossary::
 
    LSN
-     Each InnoDB page (usually 16kb in size) contains a log sequence number, or LSN. The LSN is the system version number for the entire database. Each page's LSN shows how recently it was changed.
+     Each InnoDB page (usually 16kb in size) contains a log sequence number, or
+     LSN. The LSN is the system version number for the entire database. Each
+     page's LSN shows how recently it was changed.
 
    innodb_file_per_table
-     By default, all InnoDB tables and indexes are stored in the system tablespace on one file. This option causes the server to create one tablespace file per table. To enable it, set it on your configuration file, 
+     By default, all InnoDB tables and indexes are stored in the system
+     tablespace on one file. This option causes the server to create one
+     tablespace file per table. To enable it, set it on your configuration file,
 
-      .. code-block:: guess
+      .. code-block:: text
 
          [mysqld]
          innodb_file_per_table
@@ -18,14 +22,20 @@
       or start the server with ``--innodb_file_per_table``.
 
    innodb_expand_import
-     This feature of |Percona Server| implements the ability to import arbitrary :term:`.ibd` files exported using the |Percona XtraBackup| :option:`--export` option.
-     
-     See the `the full documentation <http://www.percona.com/doc/percona-server/5.5/management/innodb_expand_import.html>`_ for more information.
+     This feature of |Percona Server| implements the ability to import
+     arbitrary :term:`.ibd` files exported using the |Percona XtraBackup|
+     :option:`--export` option.
+
+     See the `the full documentation
+     <http://www.percona.com/doc/percona-server/5.5/management/innodb_expand_import.html>`_
+     for more information.
 
    innodb_data_home_dir
-     The directory (relative to :term:` datadir`) where the database server stores the files in a shared tablespace setup. This option does not affect the location of :term:`innodb_file_per_table`. For example, 
+     The directory (relative to :term:`datadir`) where the database server
+     stores the files in a shared tablespace setup. This option does not affect
+     the location of :term:`innodb_file_per_table`. For example:
 
-      .. code-block:: guess
+      .. code-block:: text
 
          [mysqld]
          innodb_data_home_dir = ./
@@ -33,86 +43,135 @@
    innodb_data_file_path
      Specifies the names, sizes and location of shared tablespace files:
 
-      .. code-block:: guess
+      .. code-block:: text
 
          [mysqld]
          innodb_data_file_path=ibdata1:50M;ibdata2:50M:autoextend
-  
+
    innodb_log_group_home_dir
      Specifies the location of the |InnoDB| log files:
 
-      .. code-block:: guess
+      .. code-block:: text
 
          [mysqld]
          innodb_log_group_home=/var/lib/mysql
 
    innodb_buffer_pool_size
-     The size in bytes of the memory buffer to cache data and indexes of |InnoDB|'s tables. This aims to reduce disk access to provide better performance. By default:
+     The size in bytes of the memory buffer to cache data and indexes of
+     |InnoDB|'s tables. This aims to reduce disk access to provide better
+     performance. By default:
 
-      .. code-block:: guess
+      .. code-block:: text
 
          [mysqld]
          innodb_buffer_pool_size=8MB
 
    InnoDB
-      Storage engine which provides ACID-compliant transactions and foreign key support, among others improvements over :term:`MyISAM`. It is the default engine for |MySQL| as of the 5.5 series.
+      Storage engine which provides ACID-compliant transactions and foreign
+      key support, among others improvements over :term:`MyISAM`. It is the
+      default engine for |MySQL| as of the 5.5 series.
 
    MyISAM
-     Previous default storage engine for |MySQL| for versions prior to 5.5. It doesn't fully support transactions but in some scenarios may be faster than :term:`InnoDB`. Each table is stored on disk in 3 files: :term:`.frm`, :term:`.MYD`, :term:`.MYI`
+     Previous default storage engine for |MySQL| for versions prior to 5.5. It
+     doesn't fully support transactions but in some scenarios may be faster
+     than :term:`InnoDB`. Each table is stored on disk in 3 files:
+     :term:`.frm`, :term:`.MYD`, :term:`.MYI`.
 
    XtraDB
-     *Percona XtraDB* is an enhanced version of the InnoDB storage engine, designed to better scale on modern hardware, and including a variety of other features useful in high performance environments. It is fully backwards compatible, and so can be used as a drop-in replacement for standard InnoDB. More information `here <http://www.percona.com/docs/wiki/Percona-XtraDB:start>`_ .
+     *Percona XtraDB* is an enhanced version of the InnoDB storage engine,
+     designed to better scale on modern hardware, and including a variety of
+     other features useful in high performance environments. It is fully
+     backwards compatible, and so can be used as a drop-in replacement for
+     standard InnoDB. More information `here
+     <https://www.percona.com/doc/percona-server/5.6/percona_xtradb.html>`_.
 
    my.cnf
-     This file refers to the database server's main configuration file. Most linux distributions place it as :file:`/etc/mysql/my.cnf`, but the location and name depends on the particular installation. Note that this is not the only way of configuring the server, some systems does not have one even and rely on the command options to start the server and its defaults values.
+     This file refers to the database server's main configuration file. Most
+     Linux distributions place it as :file:`/etc/mysql/my.cnf` or
+     :file:`/etc/my.cnf`, but the location and name depends on the particular
+     installation. Note that this is not the only way of configuring the
+     server, some systems does not have one even and rely on the command
+     options to start the server and its defaults values.
 
    datadir
-    The directory in which the database server stores its databases. Most Linux distribution use :file:`/var/lib/mysql` by default.
+    The directory in which the database server stores its databases. Most Linux
+    distribution use :file:`/var/lib/mysql` by default.
+
+   xbcrypt
+     To support encryption and decryption of the backups, a new tool xbcrypt
+     was introduced to |Percona XtraBackup|. This utility has been modeled
+     after The xbstream binary to perform encryption and decryption outside of
+     |Percona XtraBackup|.
 
    xbstream
-     To support simultaneous compression and streaming, a new custom streaming format called xbstream was introduced to |Percona XtraBackup| in addition to the TAR format. 
+     To support simultaneous compression and streaming, a new custom streaming
+     format called xbstream was introduced to |Percona XtraBackup| in addition
+     to the TAR format.
 
    ibdata
-     Default prefix for tablespace files, e.g. :file:`ibdata1` is a 10MB  autoextensible file that |MySQL| creates for the shared tablespace by default. 
+     Default prefix for tablespace files, e.g. :file:`ibdata1` is a 10MB
+     auto-extensible file that |MySQL| creates for the shared tablespace by
+     default.
 
    .frm
-     For each table, the server will create a file with the ``.frm`` extension containing the table definition (for all storage engines).
+     For each table, the server will create a file with the ``.frm`` extension
+     containing the table definition (for all storage engines).
 
    .ibd
-     On a multiple tablespace setup (:term:`innodb_file_per_table` enabled), |MySQL| will store each newly created table on a file with a ``.ibd`` extension.
+     On a multiple tablespace setup (:term:`innodb_file_per_table` enabled),
+     |MySQL| will store each newly created table on a file with a ``.ibd``
+     extension.
 
    .MYD
-     Each |MyISAM| table has ``.MYD`` (MYData) file which contains the data on it.
+     Each |MyISAM| table has ``.MYD`` (MYData) file which contains the data on
+     it.
 
    .MYI
-     Each |MyISAM| table has ``.MYI`` (MYIndex) file which contains the table's indexes.
+     Each |MyISAM| table has ``.MYI`` (MYIndex) file which contains the table's
+     indexes.
 
    .exp
-     Files with the ``.exp`` extension are created by |Percona XtraBackup| per each |InnoDB| tablespace when the :option:`xtrabckup --export` option is used on prepare. These files can be used to import those tablespaces on |Percona Server| 5.5 or lower versions, see :doc:`restoring individual tables <xtrabackup_bin/restoring_individual_tables>`"
+     Files with the ``.exp`` extension are created by |Percona XtraBackup| per
+     each |InnoDB| tablespace when the :option:`xtrabckup --export` option is
+     used on prepare. These files can be used to import those tablespaces on
+     |Percona Server| 5.5 or lower versions, see :doc:`restoring individual
+     tables <xtrabackup_bin/restoring_individual_tables>`".
 
    .MRG
-     Each table using the :program:`MERGE` storage engine, besides of a :term:`.frm` file, will have :term:`.MRG` file containing the names of the |MyISAM| tables associated with it.
+     Each table using the :program:`MERGE` storage engine, besides of a
+     :term:`.frm` file, will have :term:`.MRG` file containing the names of the
+     |MyISAM| tables associated with it.
 
    .TRG
-     File containing the Triggers associated to a table, e.g. `:file:`mytable.TRG`. With the :term:`.TRN` file, they represent all the Trigger definitions.
+     File containing the Triggers associated to a table, e.g.
+     `:file:`mytable.TRG`. With the :term:`.TRN` file, they represent all the
+     Trigger definitions.
 
    .TRN
-     File containing the Triggers' Names associated to a table, e.g. `:file:`mytable.TRN`. With the :term:`.TRG` file, they represent all the Trigger definitions.
+     File containing the Triggers' Names associated to a table, e.g.
+     `:file:`mytable.TRN`. With the :term:`.TRG` file, they represent all the
+     Trigger definitions.
 
    .ARM
-     Each table with the :program:`Archive Storage Engine` has ``.ARM`` file which contains the metadata of it.
+     Each table with the :program:`Archive Storage Engine` has ``.ARM`` file
+     which contains the metadata of it.
 
    .ARZ
-     Each table with the :program:`Archive Storage Engine` has ``.ARZ`` file which contains the data of it.
+     Each table with the :program:`Archive Storage Engine` has ``.ARZ`` file
+     which contains the data of it.
 
    .CSM
-     Each table with the :program:`CSV Storage Engine` has ``.CSM`` file which contains the metadata of it.
+     Each table with the :program:`CSV Storage Engine` has ``.CSM`` file which
+     contains the metadata of it.
 
    .CSV
-     Each table with the :program:`CSV Storage` engine has ``.CSV`` file which contains the data of it (which is a standard Comma Separated Value file).
+     Each table with the :program:`CSV Storage` engine has ``.CSV`` file which
+     contains the data of it (which is a standard Comma Separated Value file).
 
    .opt
-     |MySQL| stores options of a database (like charset) in a file with a :option:`.opt` extension in the database directory.
-   
+     |MySQL| stores options of a database (like charset) in a file with a
+     :file:`.opt` extension in the database directory.
+
    .par
-     Each partitioned table has .par file which contains metadata about the partitions.
+     Each partitioned table has .par file which contains metadata about the
+     partitions.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst	2017-02-27 07:47:02.000000000 +0000
@@ -30,12 +30,10 @@
 
   $ for bf in `find . -iname "*\.qp"`; do qpress -d $bf $(dirname $bf) && rm $bf; done
 
-In |Percona Xtrabackup| 2.1.4 new :option:`innobackupex --decompress` option has been implemented that can be used to decompress the backup: ::
+In |Percona XtraBackup| 2.1.4 new :option:`innobackupex --decompress` option has been implemented that can be used to decompress the backup: ::
 
   $ innobackupex --decompress /data/backup/2013-08-01_11-24-04/
 
-This option will remove the original compressed files and leave the uncompressed ones in the same location.
-
 .. note:: 
 
   In order to successfully use the :option:`innobackupex --decompress` option, qpress binary needs to installed and within the path.
@@ -51,6 +49,10 @@
 
 Now the files in :file:`/data/backups/2013-08-01_11-24-04` is ready to be used by the server.
 
+.. note::
+
+   |Percona XtraBackup| doesn't automatically remove the compressed files. In order to clean up the backup directory users should remove the :file:`*.qp` files.
+
 Restoring the backup
 --------------------
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_gtid.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_gtid.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_gtid.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_gtid.rst	2017-02-27 07:47:02.000000000 +0000
@@ -21,7 +21,7 @@
 
 That information is also printed by innobackupex after backup is taken: ::
 
- innobackupex: MySQL binlog position: filename 'mysql-bin.000002', position 1232, gtid_executed c777888a-b6df-11e2-a604-080027635ef5:1-4
+ innobackupex: MySQL binlog position: filename 'mysql-bin.000002', position 1232, GTID of the last change 'c777888a-b6df-11e2-a604-080027635ef5:1-4'
 
 STEP 2: Prepare the backup
 --------------------------
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_inc.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_inc.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_inc.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_inc.rst	2017-02-27 07:47:02.000000000 +0000
@@ -22,7 +22,7 @@
   innobackupex --apply-log --redo-only $FULLBACKUP \
    --use-memory=1G --user=USER --password=PASSWORD
 
-The :option:`–use-memory` option is not necessary, it will speed up the process if it is used (provided that the amount of RAM given is available).
+The :option:`--use-memory` option is not necessary, it will speed up the process if it is used (provided that the amount of RAM given is available).
 
 If everything went fine, you should see an output similar to: ::
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_local.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_local.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_local.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_local.rst	2017-02-27 07:47:02.000000000 +0000
@@ -36,6 +36,10 @@
 
 This will copy the prepared data back to its original location as defined by the ``datadir`` in your :term:`my.cnf`.
 
+.. note:: 
+
+   The :term:`datadir` must be empty; |Percona XtraBackup| :option:`innobackupex --copy-back` option will not copy over existing files unless :option:`innobackupex --force-non-empty-directories` option is specified. Also it's important to note that |MySQL| server needs to be shut down before restore is performed. You can't restore to a :term:`datadir` of a running mysqld instance (except when importing a partial backup).  
+
 After the confirmation message::
 
   100313 02:58:44  innobackupex: completed OK!
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst	2017-02-27 07:47:02.000000000 +0000
@@ -56,7 +56,7 @@
 
 .. code-block:: console
 
-   TheMaster$ innobackupex --user=yourDBuser --password=MaGiCdB1 /
+   TheMaster$ innobackupex --user=yourDBuser --password=MaGiCdB1 \
               --apply-log /path/to/backupdir/$TIMESTAMP/
 
 You need to select path where your snapshot has been taken, for example /home/backups/2012-01-16_11-14-43. If everything is ok you should get the same OK message. Now the transaction logs are applied to the data files, and new ones are created: your data files are ready to be used by the MySQL server.
@@ -80,7 +80,7 @@
 
 .. code-block:: console
 
-   TheMaster$ rsync -avprP -e ssh /path/to/backupdir/$TIMESTAMP TheSlave:/path/to/mysql/
+   TheMaster$ rsync -avpP -e ssh /path/to/backupdir/$TIMESTAMP TheSlave:/path/to/mysql/
 
 After data has been copied you can back up the original or previously installed |MySQL| :term:`datadir` (**NOTE**: Make sure mysqld is shut down before you move the contents of its datadir, or move the snapshot into its datadir.):
 
@@ -193,7 +193,7 @@
 
 .. code-block:: console
 
-   TheSlave$ innobackupex --user=yourDBuser --password=MaGiCiGaM /
+   TheSlave$ innobackupex --user=yourDBuser --password=MaGiCiGaM \
              --slave-info /path/to/backupdir 
 
 By using the :option:`--slave-info` |Percona XtraBackup| creates additional file called :file:`xtrabackup_slave_info`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/how-tos.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/how-tos.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/how-tos.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/how-tos.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
-=====================
- How-tos and Recipes
-=====================
+===================
+How-tos and Recipes
+===================
 
 .. _recipes-ibk:
 
@@ -43,7 +43,7 @@
 
 .. _aux-guides:
 
-Auxiliary Guides 
+Auxiliary Guides
 ================
 
 .. toctree::
@@ -56,21 +56,31 @@
 Assumptions in this section
 ===========================
 
-Most of the times, the context will make the recipe or tutorial understandable. To assure that, a list of the assumptions, names and "things" that will appear in this section is given. At the beginning of each recipe or tutorial they will be specified in order to make it quicker and more practical.
+Most of the times, the context will make the recipe or tutorial understandable.
+To assure that, a list of the assumptions, names and "things" that will appear
+in this section is given. At the beginning of each recipe or tutorial they will
+be specified in order to make it quicker and more practical.
 
 ``HOST``
-   A system with a |MySQL|-based server installed, configured and running. We will assume the following about this system:
 
-   *  the MySQL server is able to :doc:`communicate with others by the standard TCP/IP port <howtos/enabling_tcp>`;
+   A system with a |MySQL|-based server installed, configured and running. We
+   will assume the following about this system:
 
-   *  a SSH server is installed and configured - see :doc:`here <howtos/ssh_server>` if it is not;
+     * the MySQL server is able to :doc:`communicate with others by the
+       standard TCP/IP port <howtos/enabling_tcp>`;
 
-   *  you have an user account in the system with the appropriate :doc:`permissions <howtos/permissions>` and
+     * a SSH server is installed and configured - see :doc:`here
+       <howtos/ssh_server>` if it is not;
 
-   *  you have a MySQL's user account with appropriate :doc:`privileges <howtos/permissions>`.
+     * you have an user account in the system with the appropriate
+       :doc:`permissions <howtos/permissions>` and
+
+     * you have a MySQL's user account with appropriate :ref:`privileges`.
 
 ``USER``
-   An user account in the system with shell access and appropriate permissions for the task. A guide for checking them is :doc:`here <howtos/permissions>`.
+   An user account in the system with shell access and appropriate permissions
+   for the task. A guide for checking them is :doc:`here <howtos/permissions>`.
 
 ``DB-USER``
-   An user account in the database server with appropriate privileges for the task. A guide for checking them is :doc:`here <howtos/permissions>`.
+   An user account in the database server with appropriate privileges for the
+   task. A guide for checking them is :doc:`here <howtos/permissions>`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/how_xtrabackup_works.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/how_xtrabackup_works.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/how_xtrabackup_works.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/how_xtrabackup_works.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,17 +1,113 @@
+.. _how_xtrabackup_works:
+
 ================================
  How |Percona XtraBackup| Works
 ================================
 
-|Percona XtraBackup| is based on :term:`InnoDB`'s crash-recovery functionality. It copies your |InnoDB| data files, which results in data that is internally inconsistent; but then it performs crash recovery on the files to make them a consistent, usable database again.
-
-This works because |InnoDB| maintains a redo log, also called the transaction log. This contains a record of every change to InnoDB's data. When |InnoDB| starts, it inspects the data files and the transaction log, and performs two steps. It applies committed transaction log entries to the data files, and it performs an undo operation on any transactions that modified data but did not commit.
-
-|Percona XtraBackup| works by remembering the log sequence number (:term:`LSN`) when it starts, and then copying away the data files. It takes some time to do this, so if the files are changing, then they reflect the state of the database at different points in time. At the same time, |Percona XtraBackup| runs a background process that watches the transaction log files, and copies changes from it. |Percona XtraBackup| needs to do this continually because the transaction logs are written in a round-robin fashion, and can be reused after a while. |Percona XtraBackup| needs the transaction log records for every change to the data files since it began execution.
-
-The above is the backup process. Next is the prepare process. During this step, |Percona XtraBackup| performs crash recovery against the copied data files, using the copied transaction log file. After this is done, the database is ready to restore and use.
-
-The above process is implemented in the |xtrabackup| compiled binary program. The |innobackupex| program adds more convenience and functionality by also permitting you to back up |MyISAM| tables and :term:`.frm` files. It starts |xtrabackup|, waits until it finishes copying files, and then issues ``FLUSH TABLES WITH READ LOCK`` to prevent further changes to |MySQL|'s data and flush all |MyISAM| tables to disk. It holds this lock, copies the |MyISAM| files, and then releases the lock.
-
-The backed-up |MyISAM| and |InnoDB| tables will eventually be consistent with each other, because after the prepare (recovery) process, |InnoDB|'s data is rolled forward to the point at which the backup completed, not rolled back to the point at which it started. This point in time matches where the ``FLUSH TABLES WITH READ LOCK`` was taken, so the |MyISAM| data and the prepared |InnoDB| data are in sync.
-
-The |xtrabackup| and |innobackupex| tools both offer many features not mentioned in the preceding explanation. Each tool's functionality is explained in more detail on its manual page. In brief, though, the tools permit you to do operations such as streaming and incremental backups with various combinations of copying the data files, copying the log files, and applying the logs to the data.
+|Percona XtraBackup| is based on :term:`InnoDB`'s crash-recovery functionality.
+It copies your |InnoDB| data files, which results in data that is internally
+inconsistent; but then it performs crash recovery on the files to make them a
+consistent, usable database again.
+
+This works because |InnoDB| maintains a redo log, also called the transaction
+log. This contains a record of every change to InnoDB data. When |InnoDB|
+starts, it inspects the data files and the transaction log, and performs two
+steps. It applies committed transaction log entries to the data files, and it
+performs an undo operation on any transactions that modified data but did not
+commit.
+
+|Percona XtraBackup| works by remembering the log sequence number (:term:`LSN`)
+when it starts, and then copying away the data files. It takes some time to do
+this, so if the files are changing, then they reflect the state of the database
+at different points in time. At the same time, |Percona XtraBackup| runs a
+background process that watches the transaction log files, and copies changes
+from it. |Percona XtraBackup| needs to do this continually because the
+transaction logs are written in a round-robin fashion, and can be reused after
+a while. |Percona XtraBackup| needs the transaction log records for every
+change to the data files since it began execution.
+
+|Percona XtraBackup| will use `Backup locks
+<https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html>`_
+where available as a lightweight alternative to ``FLUSH TABLES WITH READ
+LOCK``. This feature is available in |Percona Server| 5.6+. |Percona
+XtraBackup| uses this automatically to copy non-InnoDB data to avoid blocking
+DML queries that modify |InnoDB| tables. When backup locks are supported by the
+server, |xtrabackup| will first copy |InnoDB| data, run the ``LOCK TABLES FOR
+BACKUP`` and copy the |MyISAM| tables and :term:`.frm` files. Once this is
+done, the backup of the files will begin. It will backup :term:`.frm`,
+:term:`.MRG`, :term:`.MYD`, :term:`.MYI`, :term:`.TRG`, :term:`.TRN`,
+:term:`.ARM`, :term:`.ARZ`, :term:`.CSM`, :term:`.CSV`, ``.par``, and
+:term:`.opt` files.
+
+.. note::
+
+  Locking is done only for |MyISAM| and other non-InnoDB tables, and only
+  **after** |Percona XtraBackup| is finished backing up all InnoDB/XtraDB data
+  and logs. |Percona XtraBackup| will use `Backup locks
+  <https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html>`_
+  where available as a lightweight alternative to ``FLUSH TABLES WITH READ
+  LOCK``. This feature is available in |Percona Server| 5.6+. |Percona
+  XtraBackup| uses this automatically to copy non-InnoDB data to avoid blocking
+  DML queries that modify |InnoDB| tables.
+
+After that |xtrabackup| will use ``LOCK BINLOG FOR BACKUP`` to block all
+operations that might change either binary log position or
+``Exec_Master_Log_Pos`` or ``Exec_Gtid_Set`` (i.e. master binary log
+coordinates corresponding to the current SQL thread state on a replication
+slave) as reported by ``SHOW MASTER/SLAVE STATUS``. |xtrabackup| will then
+finish copying the REDO log files and fetch the binary log coordinates. After
+this is completed |xtrabackup| will unlock the binary log and tables.
+
+Finally, the binary log position will be printed to ``STDERR`` and |xtrabackup|
+will exit returning 0 if all went OK.
+
+Note that the ``STDERR`` of |xtrabackup| is not written in any file. You will
+have to redirect it to a file, e.g., ``xtrabackup OPTIONS 2> backupout.log``.
+
+It will also create the :ref:`following files <xtrabackup_files>` in the
+directory of the backup.
+
+During the prepare phase, |Percona XtraBackup| performs crash recovery against
+the copied data files, using the copied transaction log file. After this is
+done, the database is ready to restore and use.
+
+The backed-up |MyISAM| and |InnoDB| tables will be eventually consistent with
+each other, because after the prepare (recovery) process, |InnoDB|'s data is
+rolled forward to the point at which the backup completed, not rolled back to
+the point at which it started. This point in time matches where the ``FLUSH
+TABLES WITH READ LOCK`` was taken, so the |MyISAM| data and the prepared
+|InnoDB| data are in sync.
+
+The |xtrabackup| and |innobackupex| tools both offer many features not
+mentioned in the preceding explanation. Each tool's functionality is explained
+in more detail further in the manual. In brief, though, the tools permit you to
+do operations such as streaming and incremental backups with various
+combinations of copying the data files, copying the log files, and applying the
+logs to the data.
+
+.. _copy-back-xbk:
+
+Restoring a backup
+------------------
+
+To restore a backup with |xtrabackup| you can use the :option:`--copy-back` or
+:option:`--move-backup` options.
+
+|xtrabackup| will read from the :file:`my.cnf` the variables :term:`datadir`,
+:term:`innodb_data_home_dir`, :term:`innodb_data_file_path`,
+:term:`innodb_log_group_home_dir` and check that the directories exist.
+
+It will copy the |MyISAM| tables, indexes, etc. (:term:`.frm`, :term:`.MRG`,
+:term:`.MYD`, :term:`.MYI`, :term:`.TRG`, :term:`.TRN`, :term:`.ARM`,
+:term:`.ARZ`, :term:`.CSM`, :term:`.CSV`, ``par`` and :term:`.opt` files)
+first, |InnoDB| tables and indexes next and the log files at last. It will
+preserve file's attributes when copying them, you may have to change the files'
+ownership to ``mysql`` before starting the database server, as they will be
+owned by the user who created the backup.
+
+Alternatively, the :option:`xtrabackup --move-back` option may be used to
+restore a backup. This option is similar to :option:`xtrabackup --copy-back`
+with the only difference that instead of copying files it moves them to their
+target locations. As this option removes backup files, it must be used with
+caution. It is useful in cases when there is not enough free disk space to hold
+both data files and their backup copies.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/index.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/index.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/index.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/index.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,23 +1,25 @@
-.. Percona Xtrabackup documentation master file, created by
+.. Percona XtraBackup documentation master file, created by
    sphinx-quickstart on Fri May  6 01:04:39 2011.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
 ====================================
- Percona Xtrabackup - Documentation
+ Percona XtraBackup - Documentation
 ====================================
 
-|Percona XtraBackup| is an open-source hot backup utility for |MySQL| - based servers that doesn't lock your database during the backup.
+|Percona XtraBackup| is an open-source hot backup utility for |MySQL| - based
+servers that doesn't lock your database during the backup.
 
-It can back up data from |InnoDB|, |XtraDB|, and |MyISAM| tables on |MySQL| 5.1 [#n-1]_, 5.5 and 5.6 servers, as well as |Percona Server| with |XtraDB|. For a high-level overview of many of its advanced features, including a feature comparison, please see :doc:`intro`.
-
-Whether it is a 24x7 highly loaded server or a low-transaction-volume environment, |Percona XtraBackup| is designed to make backups a seamless procedure without disrupting the performance of the server in a production environment. `Commercial support contracts are available <http://www.percona.com/mysql-support/>`_.
-
-|Percona XtraBackup| is a combination of the |xtrabackup| *C* program, and the |innobackupex| *Perl* script. The |xtrabackup| program copies and manipulates |InnoDB| and |XtraDB| data files, and the *Perl* script enables enhanced functionality, such as interacting with a running |MySQL| server and backing up |MyISAM| tables. 
-
-.. note:: 
-
-   This is a **BETA** quality release and it is not intended for production.
+It can back up data from |InnoDB|, |XtraDB|, and |MyISAM| tables on |MySQL| 5.1
+[#n-1]_, 5.5 and 5.6 servers, as well as |Percona Server| with |XtraDB|. For a
+high-level overview of many of its advanced features, including a feature
+comparison, please see :doc:`intro`.
+
+Whether it is a 24x7 highly loaded server or a low-transaction-volume
+environment, |Percona XtraBackup| is designed to make backups a seamless
+procedure without disrupting the performance of the server in a production
+environment. `Commercial support contracts are available
+<http://www.percona.com/mysql-support/>`_.
 
 
 Introduction
@@ -28,16 +30,38 @@
    :glob:
 
    intro
+   how_xtrabackup_works
+
 
 Installation
 ============
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
    :glob:
 
    installation
-   installation/compiling_xtrabackup
+
+
+Prerequisites
+=============
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   using_xtrabackup/privileges
+   using_xtrabackup/configuring
+
+Backup Scenarios
+================
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   backup_scenarios/full_backup
+   backup_scenarios/incremental_backup
 
 User's Manual
 =============
@@ -48,6 +72,16 @@
 
    manual
 
+Advanced Features
+=================
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   advanced/lockless_bin-log
+   advanced/incremental_backups_with_ps_56
+
 Tutorials, Recipes, How-tos
 ===========================
 
@@ -65,13 +99,19 @@
 
 * :ref:`aux-guides`
 
-Miscellaneous
-=============
+References
+==========
 
 .. toctree::
    :maxdepth: 1
    :glob:
 
+   xtrabackup_bin/xbk_option_reference
+   innobackupex/innobackupex_option_reference
+   xbcloud/xbcloud
+   xbcrypt/xbcrypt
+   xbstream/xbstream
+   known_issues
    faq
    release-notes
    glossary
@@ -87,5 +127,7 @@
 
 .. rubric:: Footnotes
 
-.. [#n-1] Support for InnoDB 5.1 builtin has been removed in |Percona XtraBackup| 2.1
+.. [#n-1]
+
+  Support for InnoDB 5.1 builtin has been removed in |Percona XtraBackup| 2.1
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/creating_a_backup_ibk.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/creating_a_backup_ibk.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/creating_a_backup_ibk.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/creating_a_backup_ibk.rst	2017-02-27 07:47:02.000000000 +0000
@@ -2,7 +2,7 @@
  Creating a Backup with |innobackupex|
 =======================================
 
-|innobackupex| is the tool that glues |xtrabackup| and |tar4ibd|, which are specific tools, plus adding functionality to provide a single interface to backup all the data in your database server.
+|innobackupex| is the tool which provides functionality to backup a whole MySQL database instance using the |xtrabackup| in combination with tools like |xbstream| and |xbcrypt|.
 
 To create a full backup, invoke the script with the options needed to connect to the server and only one argument: the path to the directory where the backup will be stored ::
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/encrypted_backups_innobackupex.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/encrypted_backups_innobackupex.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/encrypted_backups_innobackupex.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/encrypted_backups_innobackupex.rst	2017-02-27 07:47:02.000000000 +0000
@@ -4,11 +4,7 @@
  Encrypted Backups
 ===================
 
-|Percona XtraBackup| has implemented support for encrypted backups. This feature was introduced in |Percona XtraBackup| 2.1. It can be used to encrypt/decrypt local or streaming backup with |xbstream| option (streaming tar backups are not supported) in order to add another layer of protection to the backups. Encryption is done with the ``libgcrypt`` library.
-
-.. note:: 
-
-  Encryption related options are currently ignored by |innobackupex| when specified in :file:`my.cnf`.
+|Percona XtraBackup| has implemented support for encrypted backups. It can be used to encrypt/decrypt local or streaming backup with |xbstream| option (streaming tar backups are not supported) in order to add another layer of protection to the backups. Encryption is done with the ``libgcrypt`` library.
 
 Creating Encrypted Backups
 ===========================
@@ -23,21 +19,19 @@
 
 Both :option:`--encrypt-key` option  and :option:`--encrypt-key-file` option can be used to specify the encryption key. Encryption key can be generated with command like: ::
   
-  $ openssl enc -aes-256-cbc -pass pass:Password -P -md sha1
+  $ openssl rand -base64 24
 
-Output of that command should look like this: :: 
+Example output of that command should look like this: :: 
 
-  salt=9464A264486EEC69
-  key=DDD3A1B6BC90B9A9B631913CF30E0336A2571BA854E2D65CF92A6D0BDBCBB251
-  iv =A1EDC73815467C083B0869508406637E
+  GCHFLrDFVx6UAsRb88uLVbAVWbK+Yzfs
 
-In this case we can use ``iv`` value as key.
+This value then can be used as the encryption key
 
 Using the :option:`--encrypt-key` option
 -----------------------------------------
 Example of the innobackupex command using the :option:`--encrypt-key` should look like this ::
 
-  $ innobackupex --encrypt=AES256 --encrypt-key="A1EDC73815467C083B0869508406637E" /data/backups
+  $ innobackupex --encrypt=AES256 --encrypt-key="GCHFLrDFVx6UAsRb88uLVbAVWbK+Yzfs" /data/backups
 
 
 Using the :option:`--encrypt-key-file` option
@@ -48,7 +42,7 @@
 
 .. note::
 
-  Depending on the text editor used for making the ``KEYFILE``, text file in some cases can contain the CRLF and this will cause the key size to grow and thus making it invalid. Suggested way to do this would be to create the file with: ``echo -n "A1EDC73815467C083B0869508406637E" > /data/backups/keyfile``
+  Depending on the text editor used for making the ``KEYFILE``, text file in some cases can contain the CRLF and this will cause the key size to grow and thus making it invalid. Suggested way to do this would be to create the file with: ``echo -n "GCHFLrDFVx6UAsRb88uLVbAVWbK+Yzfs" > /data/backups/keyfile``
 
 
 Both of these examples will create a timestamped directory in :file:`/data/backups` containing the encrypted backup.
@@ -69,11 +63,11 @@
 
   $ for i in `find . -iname "*\.xbcrypt"`; do xbcrypt -d --encrypt-key-file=/root/secret_key --encrypt-algo=AES256 < $i > $(dirname $i)/$(basename $i .xbcrypt) && rm $i; done
 
-In |Percona XtraBackup| 2.1.4 new :option:`innobackupex --decrypt` option has been implemented that can be used to decrypt the backups: ::
+|Percona XtraBackup| :option:`innobackupex --decrypt` option has been implemented that can be used to decrypt the backups: ::
 
-  $ innobackupex --decrypt=AES256 --encrypt-key="A1EDC73815467C083B0869508406637E" /data/backups/2013-08-01_08-31-35/
+  $ innobackupex --decrypt=AES256 --encrypt-key="GCHFLrDFVx6UAsRb88uLVbAVWbK+Yzfs" /data/backups/2015-03-18_08-31-35/
 
-Use of the :option:`innobackupex --decrypt` will remove the original encrypted files and leave the results in the same location.
+|Percona XtraBackup| doesn't automatically remove the encrypted files. In order to clean up the backup directory users should remove the :file:`*.xbcrypt` files.
 
 .. note::
  
@@ -86,7 +80,11 @@
 
 After the backups have been decrypted, they can be prepared the same way as the standard full backups with the :option:`--apply-logs` option: :: 
 
-  $ innobackupex --apply-log /data/backups/2013-08-01_08-31-35/
+  $ innobackupex --apply-log /data/backups/2015-03-18_08-31-35/
+
+.. note::
+
+   |Percona XtraBackup| doesn't automatically remove the encrypted files. In order to clean up the backup directory users should remove the :file:`*.xbcrypt` files.
 
 Restoring Encrypted Backups
 =============================
@@ -98,7 +96,7 @@
 It will copy all the data-related files back to the server's :term:`datadir`, determined by the server's :file:`my.cnf` configuration file. You should check the last line of the output for a success message::
 
   innobackupex: Finished copying back files.
-  130801 11:08:13  innobackupex: completed OK!
+  150318 11:08:13  innobackupex: completed OK!
 
 Other Reading
 =============
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/how_innobackupex_works.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/how_innobackupex_works.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/how_innobackupex_works.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/how_innobackupex_works.rst	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,7 @@
  How |innobackupex| Works
 ==========================
 
-:program:`innobackupex` is a script written in Perl that wraps the :program:`xtrabackup` and :program:`tar4ibd` binaries and performs the tasks where the performance and efficiency of *C* program isn't needed. In this way, it provides a convinient and integrated approach to backing up in many common scenarios. 
+From |Percona XtraBackup| version 2.3 :program:`innobackupex` is has been rewritten in *C* and set up as a symlink to the :program:`xtrabackup`. |innobackupex| supports all features and syntax as 2.2 version did, but it is now deprecated and will be removed in next major release. Syntax for new features will not be added to the innobackupex, only to the xtrabackup.
 
 The following describes the rationale behind :program:`innobackupex` actions.
 
@@ -15,17 +15,15 @@
 
 If no mode is specified, |innobackupex| will assume the backup mode.
 
-By default, it starts :program:`xtrabackup` with the :option:`--suspend-at-end` option, and lets it copy the InnoDB data files. When :program:`xtrabackup` finishes that, :program:`innobackupex` sees it create the :file:`xtrabackup_suspended_2` file and executes ``FLUSH TABLES WITH READ LOCK``. Then it begins copying the rest of the files.
+By default, it starts :program:`xtrabackup` with the :option:`--suspend-at-end` option, and lets it copy the InnoDB data files. When :program:`xtrabackup` finishes that, :program:`innobackupex` sees it create the :file:`xtrabackup_suspended_2` file and executes ``FLUSH TABLES WITH READ LOCK``. :program:`xtrabackup` will use `Backup locks <https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_ where available as a lightweight alternative to ``FLUSH TABLES WITH READ LOCK``. This feature is available in |Percona Server| 5.6+. |Percona XtraBackup| uses this automatically to copy non-InnoDB data to avoid blocking DML queries that modify InnoDB tables. Then it begins copying the rest of the files.
 
-If the :option:`--ibbackup` is not supplied, |innobackupex| will try to detect it: if the :file:`xtrabackup_binary` file exists on the backup directory, it reads from it which binary of |xtrabackup| will be used. Otherwise, it will try to connect to the database server in order to determine it. If the connection can't be established, |xtrabackup| will fail and you must specify it (see :ref:`ibk-right-binary`).
+|innobackupex| will then check |MySQL| variables to determine which features are supported by server. Special interest are backup locks, changed page bitmaps, GTID mode, etc. If everything goes well, the binary is started as a child process.
 
-When the binary is determined, the connection to the database server is checked. This is done by connecting, issuing a query, and closing the connection. If everything goes well, the binary is started as a child process.
-
-If it is not an incremental backup, it connects to the server. It waits for slaves in a replication setup if the option :option:`--safe-slave-backup` is set and will flush all tables with **READ LOCK**, preventing all |MyISAM| tables from writing (unless option :option:`--no-lock` is specified). 
+|innobackupex| will wait for slaves in a replication setup if the option :option:`--safe-slave-backup` is set and will flush all tables with **READ LOCK**, preventing all |MyISAM| tables from writing (unless option :option:`--no-lock` is specified). 
 
 .. note:: 
 
-  Locking is done only for MyISAM and other non-InnoDB tables, and only **after** |Percona XtraBackup| is finished backing up all InnoDB/XtraDB data and logs.
+  Locking is done only for MyISAM and other non-InnoDB tables, and only **after** |Percona XtraBackup| is finished backing up all InnoDB/XtraDB data and logs. |Percona XtraBackup| will use `Backup locks <https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_ where available as a lightweight alternative to ``FLUSH TABLES WITH READ LOCK``. This feature is available in |Percona Server| 5.6+. |Percona XtraBackup| uses this automatically to copy non-InnoDB data to avoid blocking DML queries that modify InnoDB tables.
 
 Once this is done, the backup of the files will begin. It will backup :term:`.frm`, :term:`.MRG`, :term:`.MYD`, :term:`.MYI`, :term:`.TRG`, :term:`.TRN`, :term:`.ARM`, :term:`.ARZ`, :term:`.CSM`, :term:`.CSV`, ``.par``,  and :term:`.opt` files.
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/improved_ftwrl.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/improved_ftwrl.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/improved_ftwrl.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/improved_ftwrl.rst	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,11 @@
 Improved ``FLUSH TABLES WITH READ LOCK`` handling
 ==================================================
 
-When taking backups, ``FLUSH TABLES WITH READ LOCK`` is being used before the non-InnoDB files are being backed up to ensure backup is being consistent. ``FLUSH TABLES WITH READ LOCK`` can be run even though there may be a running query that has been executing for hours. In this case everything will be locked up in ``Waiting for table flush`` or ``Waiting for master to send event`` states. Killing the ``FLUSH TABLES WITH READ LOCK`` does not correct this issue either. In this case the only way to get the server operating normally again is to kill off the long running queries that blocked it to begin with. This means that if there are long running queries ``FLUSH TABLES WITH READ LOCK`` can get stuck, leaving server in read-only mode until waiting for these queries to complete.  
+When taking backups, ``FLUSH TABLES WITH READ LOCK`` is being used before the non-InnoDB files are being backed up to ensure backup is being consistent. ``FLUSH TABLES WITH READ LOCK`` can be run even though there may be a running query that has been executing for hours. In this case everything will be locked up in ``Waiting for table flush`` or ``Waiting for master to send event`` states. Killing the ``FLUSH TABLES WITH READ LOCK`` does not correct this issue either. In this case the only way to get the server operating normally again is to kill off the long running queries that blocked it to begin with. This means that if there are long running queries ``FLUSH TABLES WITH READ LOCK`` can get stuck, leaving server in read-only mode until waiting for these queries to complete. 
+
+.. note:: 
+
+  All described in this section has no effect when backup locks are used. |Percona XtraBackup| will use `Backup locks <https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_ where available as a lightweight alternative to ``FLUSH TABLES WITH READ LOCK``. This feature is available in |Percona Server| 5.6+. |Percona XtraBackup| uses this automatically to copy non-InnoDB data to avoid blocking DML queries that modify InnoDB tables.  
 
 In order to prevent this from happening two things have been implemented:
 
@@ -14,11 +18,11 @@
 Waiting for queries to finish
 -----------------------------
 
-Good moment to issue a global lock is the moment when there are no long queries running. But waiting for a good moment to issue the global lock for extended period of time isn't always good approach, as it can extend the time needed for backup to take place. To prevent |innobackupex| from waiting to issue ``FLUSH TABLES WITH READ LOCK`` for too long, new option has been implemented: :option:`innobackupex --lock-wait-timeout` option can be used to limit the waiting time. If the good moment to issue the lock did not happen during this time, |innobackupex| will give up and exit with an error message and backup will not be taken. Zero value for this option turns off the feature (which is default).
+Good moment to issue a global lock is the moment when there are no long queries running. But waiting for a good moment to issue the global lock for extended period of time isn't always good approach, as it can extend the time needed for backup to take place. To prevent |innobackupex| from waiting to issue ``FLUSH TABLES WITH READ LOCK`` for too long, new option has been implemented: :option:`innobackupex --ftwrl-wait-timeout` option can be used to limit the waiting time. If the good moment to issue the lock did not happen during this time, |innobackupex| will give up and exit with an error message and backup will not be taken. Zero value for this option turns off the feature (which is default).
 
-Another possibility is to specify the type of query to wait on. In this case :option:`innobackupex --lock-wait-query-type`. Possible values are ``all`` and ``update``. When ``all`` is used |innobackupex| will wait for all long running queries (execution time longer than allowed by :option:`innobackupex --lock-wait-threshold`) to finish before running the ``FLUSH TABLES WITH READ LOCK``. When ``update`` is used |innobackupex| will wait on ``UPDATE/ALTER/REPLACE/INSERT`` queries to finish.
+Another possibility is to specify the type of query to wait on. In this case :option:`innobackupex --ftwrl-wait-query-type`. Possible values are ``all`` and ``update``. When ``all`` is used |innobackupex| will wait for all long running queries (execution time longer than allowed by :option:`innobackupex --ftwrl-wait-threshold`) to finish before running the ``FLUSH TABLES WITH READ LOCK``. When ``update`` is used |innobackupex| will wait on ``UPDATE/ALTER/REPLACE/INSERT`` queries to finish.
 
-Although time needed for specific query to complete is hard to predict, we can assume that queries that are running for a long time already will likely not be completed soon, and queries which are running for a short time will likely be completed shortly. |innobackupex| can use the value of :option:`innobackupex --lock-wait-threshold` option to specify which query is long running and will likely block global lock for a while.
+Although time needed for specific query to complete is hard to predict, we can assume that queries that are running for a long time already will likely not be completed soon, and queries which are running for a short time will likely be completed shortly. |innobackupex| can use the value of :option:`innobackupex --ftwrl-wait-threshold` option to specify which query is long running and will likely block global lock for a while. In order to use this option xtrabackup user should have ``PROCESS`` and ``SUPER`` privileges.
 
 Killing the blocking queries
 ----------------------------
@@ -30,11 +34,11 @@
 Options summary
 ---------------
 
-* :option:`--lock-wait-timeout=N` (seconds) - how long to wait for a good moment. Default is 0, not to wait.
+* :option:`--ftwrl-wait-timeout=N` (seconds) - how long to wait for a good moment. Default is 0, not to wait.
 
-* :option:`--lock-wait-query-type={all|update}` - which long queries should be finished before ``FLUSH TABLES WITH READ LOCK`` is run. Default is all.
+* :option:`--ftwrl-wait-query-type={all|update}` - which long queries should be finished before ``FLUSH TABLES WITH READ LOCK`` is run. Default is all.
 
-* :option:`--lock-wait-threshold=N` (seconds) - how long query should be running before we consider it long running and potential blocker of global lock.
+* :option:`--ftwrl-wait-threshold=N` (seconds) - how long query should be running before we consider it long running and potential blocker of global lock.
 
 * :option:`--kill-long-queries-timeout=N` (seconds) - how many time we give for queries to complete after ``FLUSH TABLES WITH READ LOCK`` is issued before start to kill. Default if ``0``, not to kill.
 
@@ -45,11 +49,7 @@
 
 Running the |innobackupex| with the following options: ::
 
- $ innobackupex --lock-wait-threshold=40 --lock-wait-query-type=all --lock-wait-timeout=180 --kill-long-queries-timeout=20 --kill-long-query-type=all /data/backups/
+ $ innobackupex --ftwrl-wait-threshold=40 --ftwrl-wait-query-type=all --ftwrl-wait-timeout=180 --kill-long-queries-timeout=20 --kill-long-query-type=all /data/backups/
 
 will cause |innobackupex| to spend no longer than 3 minutes waiting for all queries older than 40 seconds to complete. After ``FLUSH TABLES WITH READ LOCK`` is issued, |innobackupex| will wait 20 seconds for lock to be acquired. If lock is still not acquired after 20 seconds, it will kill all queries which are running longer that the ``FLUSH TABLES WITH READ LOCK``.
 
-Version Information
--------------------
-
-This feature has been implemented in |Percona XtraBackup| 2.1.4.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,7 @@
 
 .. program:: innobackupex
 
-This page documents all of the command-line options for the :program:`innobackupex` Perl script.
+This page documents all of the command-line options for the :program:`innobackupex`. 
 
 
 Options
@@ -14,6 +14,15 @@
 
    Prepare a backup in ``BACKUP-DIR`` by applying the transaction log file named :file:`xtrabackup_logfile` located in the same directory. Also, create new transaction logs. The InnoDB configuration is read from the file :file:`backup-my.cnf` created by |innobackupex| when the backup was made. innobackupex --apply-log uses InnoDB configuration from ``backup-my.cnf`` by default, or from --defaults-file, if specified. InnoDB configuration in this context means server variables that affect data format, i.e. :option:`innodb_page_size`, :option:`innodb_log_block_size`, etc. Location-related variables, like :option:`innodb_log_group_home_dir` or :option:`innodb_data_file_path` are always ignored by --apply-log, so preparing a backup always works with data files from the backup directory, rather than any external ones.
 
+.. option:: --backup-locks
+
+   This option controls if backup locks should be used instead of ``FLUSH TABLES WITH READ LOCK`` on the backup stage. The option has no effect when backup locks are not supported by the server. This option is enabled by default, disable with ``--no-backup-locks``.
+
+
+.. option:: --close-files
+
+   Do not keep files opened. This option is passed directly to xtrabackup. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. |Percona XtraBackup| can produce inconsistent backups with this option enabled. Use at your own risk.
+
 .. option:: --compact
 
    Create a compact backup with all secondary index pages omitted. This option is passed directly to xtrabackup.  See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
@@ -32,7 +41,7 @@
 
 .. option:: --copy-back
 
-    Copy all the files in a previously made backup from the backup directory to their original locations.
+    Copy all the files in a previously made backup from the backup directory to their original locations. |Percona XtraBackup| :option:`innobackupex --copy-back` option will not copy over existing files unless :option:`innobackupex --force-non-empty-directories` option is specified.
 
 .. option:: --databases=LIST
 
@@ -40,7 +49,7 @@
 
 .. option:: --decompress
 
-   Decompresses all files with the .qp extension in a backup previously made with the --compress option. The :option:`innobackupex --parallel` option will allow multiple files to be decrypted and/or decompressed simultaneously. In order to decompress, the qpress utility MUST be installed and accessable within the path. This process will remove the original compressed/encrypted files and leave the results in the same location.
+   Decompresses all files with the .qp extension in a backup previously made with the --compress option. The :option:`innobackupex --parallel` option will allow multiple files to be decrypted and/or decompressed simultaneously. In order to decompress, the qpress utility MUST be installed and accessible within the path. |Percona XtraBackup| doesn't automatically remove the compressed files. In order to clean up the backup directory users should remove the ``*.qp`` files manually.
 
 .. option:: --decrypt=ENCRYPTION-ALGORITHM
 
@@ -48,11 +57,11 @@
 
 .. option:: --defaults-file=[MY.CNF]
 
-   This option accepts a string argument that specifies what file to read the default MySQL options from. It is also passed directly to :program:`xtrabackup` 's defaults-file option. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
+   This option accepts a string argument that specifies what file to read the default MySQL options from. Must be given as the first option on the command-line.
 
 .. option:: --defaults-extra-file=[MY.CNF]
 
-   This option specifies what extra file to read the default |MySQL| options from before the standard defaults-file. The option accepts a string argument. It is also passed directly to xtrabackup's --defaults-extra-file option. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
+   This option specifies what extra file to read the default |MySQL| options from before the standard defaults-file. Must be given as the first option on the command-line.
 
 .. option:: --defaults-group=GROUP-NAME
 
@@ -92,7 +101,7 @@
 
 .. option:: --galera-info
 
-   This options creates the ``xtrabackup_galera_info`` file which contains the local node state at the time of the backup. Option should be used when performing the backup of Percona-XtraDB-Cluster.
+   This options creates the ``xtrabackup_galera_info`` file which contains the local node state at the time of the backup. Option should be used when performing the backup of Percona-XtraDB-Cluster. Has no effect when backup locks are used to create the backup.
 
 .. option:: --help
 
@@ -108,7 +117,7 @@
 
 .. option:: --ibbackup=IBBACKUP-BINARY
 
-   This option accepts a string argument that specifies which |xtrabackup| binary should be used. The string should be the command used to run |Percona XtraBackup|. The option can be useful if the :program:`xtrabackup` binary is not in your search path or working directory and the database server is not accessible at the moment. If this option is not specified, :program:`innobackupex` attempts to determine the binary to use automatically. By default, :program:`xtrabackup` is the command used. When option :option:`--apply-log` is specified, the binary is used whose name is in the file :file:`xtrabackup_binary` in the backup directory, if that file exists, or will attempt to autodetect it. However, if :option:`--copy-back` or :option:`--move-back` is used, :program:`xtrabackup` is used unless other is specified.
+   This option specifies which |xtrabackup| binary should be used. The option accepts a string argument. IBBACKUP-BINARY should be the command used to run |Percona XtraBackup|. The option can be useful if the |xtrabackup| binary is not in your search path or working directory. If this option is not specified, |innobackupex| attempts to determine the binary to use automatically.
 
 .. option:: --include=REGEXP
 
@@ -140,21 +149,21 @@
 
 .. option:: --kill-long-queries-timeout=SECONDS
 
-   This option specifies the number of seconds innobackupex waits between starting ``FLUSH TABLES WITH READ LOCK`` and killing those queries that block it. Default is 0 seconds, which means innobackupex will not attempt to kill any queries. In order to use this option xtrabackup user should have ``PROCESS`` and ``SUPER`` privileges.
+   This option specifies the number of seconds innobackupex waits between starting ``FLUSH TABLES WITH READ LOCK`` and killing those queries that block it. Default is 0 seconds, which means innobackupex will not attempt to kill any queries. In order to use this option xtrabackup user should have ``PROCESS`` and ``SUPER`` privileges. Where supported (Percona Server 5.6+) xtrabackup will automatically use `Backup Locks <https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_ as a lightweight alternative to ``FLUSH TABLES WITH READ LOCK`` to copy non-InnoDB data to avoid blocking DML queries that modify InnoDB tables. 
 
 .. option:: --kill-long-query-type=all|select
 
    This option specifies which types of queries should be killed to unblock the global lock. Default is "all".
 
-.. option:: --lock-wait-timeout=SECONDS
+.. option:: --ftwrl-wait-timeout=SECONDS
 
-   This option specifies time in seconds that innobackupex should wait for queries that would block ``FLUSH TABLES WITH READ LOCK`` before running it. If there are still such queries when the timeout expires, innobackupex terminates with an error. Default is 0, in which case innobackupex does not wait for queries to complete and starts ``FLUSH TABLES WITH READ LOCK`` immediately.
+   This option specifies time in seconds that innobackupex should wait for queries that would block ``FLUSH TABLES WITH READ LOCK`` before running it. If there are still such queries when the timeout expires, innobackupex terminates with an error. Default is 0, in which case innobackupex does not wait for queries to complete and starts ``FLUSH TABLES WITH READ LOCK`` immediately. Where supported (Percona Server 5.6+) xtrabackup will automatically use `Backup Locks <https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_ as a lightweight alternative to ``FLUSH TABLES WITH READ LOCK`` to copy non-InnoDB data to avoid blocking DML queries that modify InnoDB tables.
 
-.. option:: --lock-wait-threshold=SECONDS
+.. option:: --ftwrl-wait-threshold=SECONDS
 
-   This option specifies the query run time threshold which is used by innobackupex to detect long-running queries with a non-zero value of :option:`innobackupex --lock-wait-timeout`. FLUSH TABLES WITH READ LOCK`` is not started until such long-running queries exist. This option has no effect if --lock-wait-timeout is 0. Default value is 60 seconds.
+   This option specifies the query run time threshold which is used by innobackupex to detect long-running queries with a non-zero value of :option:`innobackupex --ftwrl-wait-timeout`. ``FLUSH TABLES WITH READ LOCK`` is not started until such long-running queries exist. This option has no effect if --ftwrl-wait-timeout is 0. Default value is 60 seconds. Where supported (Percona Server 5.6+) xtrabackup will automatically use `Backup Locks <https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_ as a lightweight alternative to ``FLUSH TABLES WITH READ LOCK`` to copy non-InnoDB data to avoid blocking DML queries that modify InnoDB tables.
 
-.. option:: --lock-wait-query-type=all|update
+.. option:: --ftwrl-wait-query-type=all|update
 
    This option specifies which types of queries are allowed to complete before innobackupex will issue the global lock. Default is all.
 
@@ -168,7 +177,7 @@
 
 .. option:: --no-lock
 
-   Use this option to disable table lock with ``FLUSH TABLES WITH READ LOCK``. Use it only if ALL your tables are InnoDB and you **DO NOT CARE** about the binary log position of the backup. This option shouldn't be used if there are any ``DDL`` statements being executed or if any updates are happening on non-InnoDB tables (this includes the system MyISAM tables in the *mysql* database), otherwise it could lead to an inconsistent backup. 
+   Use this option to disable table lock with ``FLUSH TABLES WITH READ LOCK``. Use it only if ALL your tables are InnoDB and you **DO NOT CARE** about the binary log position of the backup. This option shouldn't be used if there are any ``DDL`` statements being executed or if any updates are happening on non-InnoDB tables (this includes the system MyISAM tables in the *mysql* database), otherwise it could lead to an inconsistent backup. Where supported (Percona Server 5.6+) xtrabackup will automatically use `Backup Locks <https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_ as a lightweight alternative to ``FLUSH TABLES WITH READ LOCK`` to copy non-InnoDB data to avoid blocking DML queries that modify InnoDB tables.
    If you are considering to use :option:`--no-lock` because your backups are failing to acquire the lock, this could be because of incoming replication events preventing the lock from succeeding. Please try using :option:`--safe-slave-backup` to momentarily stop the replication slave thread, this may help the backup to succeed and you then don't need to resort to using this option.
    :file:`xtrabackup_binlog_info` is not created when --no-lock option is used (because ``SHOW MASTER STATUS`` may be inconsistent), but under certain conditions :file:`xtrabackup_binlog_pos_innodb` can be used instead to get consistent binlog coordinates as described in :ref:`working_with_binlogs`.
 .. option:: --no-timestamp
@@ -209,11 +218,11 @@
 
 .. option:: --safe-slave-backup
 
-   Stop slave SQL thread and wait to start backup until ``Slave_open_temp_tables`` in ``SHOW STATUS`` is zero. If there are no open temporary tables, the backup will take place, otherwise the SQL thread will be started and stopped until there are no open temporary tables. The backup will fail if ``Slave_open_temp_tables`` does not become zero after :option:`--safe-slave-backup-timeout` seconds. The slave SQL thread will be restarted when the backup finishes.
+   When specified, innobackupex will stop the slave SQL thread just before running ``FLUSH TABLES WITH READ LOCK`` and wait to start backup until ``Slave_open_temp_tables`` in ``SHOW STATUS`` is zero. If there are no open temporary tables, the backup will take place, otherwise the SQL thread will be started and stopped until there are no open temporary tables. The backup will fail if ``Slave_open_temp_tables`` does not become zero after :option:`innobackupex --safe-slave-backup-timeout` seconds. The slave SQL thread will be restarted when the backup finishes.
 
 .. option:: --safe-slave-backup-timeout=SECONDS
 
-   How many seconds :option:`--safe-slave-backup`` should wait for ``Slave_open_temp_tables`` to become zero. Defaults to 300 seconds.
+   How many seconds :option:`innobackupex --safe-slave-backup` should wait for ``Slave_open_temp_tables`` to become zero. Defaults to 300 seconds.
 
 .. option:: --scpopt = SCP-OPTIONS
 
@@ -241,7 +250,7 @@
 
 .. option:: --throttle=IOS
 
-   This option accepts an integer argument that specifies the number of I/O operations (i.e., pairs of read+write) per second. It is passed directly to xtrabackup's :option:`xtrabackup --throttle` option.
+   This option accepts an integer argument that specifies the number of I/O operations (i.e., pairs of read+write) per second. It is passed directly to xtrabackup's :option:`xtrabackup --throttle` option. **NOTE:** This option works only during the backup phase, ie. it will not work with :option:`innobackupex --apply-log` and :option:`innobackupex --copy-back` options.
 
 .. option:: --tmpdir=DIRECTORY
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_script.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_script.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_script.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_script.rst	2017-02-27 07:47:02.000000000 +0000
@@ -4,19 +4,8 @@
 
 The |innobackupex| tool is a *Perl* script that acts as a wrapper for the :doc:`xtrabackup <../xtrabackup_bin/xtrabackup_binary>` *C* program. It is a patched version of the ``innobackup`` *Perl* script that *Oracle* distributes with the *InnoDB Hot Backup* tool. It enables more functionality by integrating |xtrabackup| and other functions such as file copying and streaming, and adds some convenience. It lets you perform point-in-time backups of |InnoDB| / |XtraDB| tables together with the schema definitions, |MyISAM| tables, and other portions of the server.
 
-We are currently not satisfied with the architecture, code quality and maintainability, or functionality of |innobackupex|, and we expect to replace it with something else in the future.
-
 This manual section explains how to use |innobackupex| in detail.
 
-Prerequisites
-=============
-
-.. toctree::
-   :maxdepth: 1
-
-   privileges
-
-
 The Backup Cycle - Full Backups
 ===============================
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/parallel_copy_ibk.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/parallel_copy_ibk.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/parallel_copy_ibk.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/parallel_copy_ibk.rst	2017-02-27 07:47:02.000000000 +0000
@@ -31,7 +31,7 @@
 Accelerating with :option:`--rsync` option
 ------------------------------------------
 
-In order to speed up the backup process and to minimize the time ``FLUSH TABLES WITH READ LOCK`` is blocking the writes, option :option:`innobackupex --rsync` should be used. When this option is specified, |innobackupex| uses ``rsync`` to copy all non-InnoDB files instead of spawning a separate ``cp`` for each file, which can be much faster for servers with a large number of databases or tables. |innobackupex| will call the ``rsync`` twice, once before the ``FLUSH TABLES WITH READ LOCK`` and once during to minimize the time the read lock is being held. During the second ``rsync`` call, it will only synchronize the changes to non-transactional data (if any) since the first call performed before the ``FLUSH TABLES WITH READ LOCK``.
+In order to speed up the backup process and to minimize the time ``FLUSH TABLES WITH READ LOCK`` is blocking the writes, option :option:`innobackupex --rsync` should be used. When this option is specified, |innobackupex| uses ``rsync`` to copy all non-InnoDB files instead of spawning a separate ``cp`` for each file, which can be much faster for servers with a large number of databases or tables. |innobackupex| will call the ``rsync`` twice, once before the ``FLUSH TABLES WITH READ LOCK`` and once during to minimize the time the read lock is being held. During the second ``rsync`` call, it will only synchronize the changes to non-transactional data (if any) since the first call performed before the ``FLUSH TABLES WITH READ LOCK``. Note that |Percona XtraBackup| will use `Backup locks <https://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_ where available as a lightweight alternative to ``FLUSH TABLES WITH READ LOCK``. This feature is available in |Percona Server| 5.6+. |Percona XtraBackup| uses this automatically to copy non-InnoDB data to avoid blocking DML queries that modify InnoDB tables.
 
 .. note::
  
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/partial_backups_innobackupex.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/partial_backups_innobackupex.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/partial_backups_innobackupex.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/partial_backups_innobackupex.rst	2017-02-27 07:47:02.000000000 +0000
@@ -42,7 +42,7 @@
 Using the :option:`--databases` option
 --------------------------------------
 
-This option is specific to |innobackupex| and accepts either a space-separated list of the databases and tables to backup - in the  ``databasename[.tablename]`` form - or a file containing the list at one element per line.
+This option accepts either a space-separated list of the databases and tables to backup - in the  ``databasename[.tablename]`` form - or a file containing the list at one element per line.
 
 For example, ::
 
@@ -50,10 +50,6 @@
 
 The command above will create a timestamped directory with the usual files that |innobackupex| creates, but only containing the data-files related to ``mytable`` in the ``mydatabase`` directory and the ``mysql`` directory with the entire ``mysql`` database.
 
-.. note:: 
- 
- Currently in |Percona XtraBackup| the --databases option has no effect for InnoDB files for both local and streaming backups, i.e. all InnoDB files are always backed up. Currently, only .frm and non-InnoDB tables are limited by that option.
-
 Preparing Partial Backups
 =========================
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/preparing_a_backup_ibk.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/preparing_a_backup_ibk.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/preparing_a_backup_ibk.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/preparing_a_backup_ibk.rst	2017-02-27 07:47:02.000000000 +0000
@@ -10,18 +10,19 @@
 
 and check the last line of the output for a confirmation on the process::
 
-  111225  1:01:57  InnoDB: Shutdown completed; log sequence number 1609228
-  111225 01:01:57  innobackupex: completed OK!
+  150806 01:01:57  InnoDB: Shutdown completed; log sequence number 1609228
+  150806 01:01:57  innobackupex: completed OK!
 
 If it succeeded, |innobackupex| performed all operations needed, leaving the data ready to use immediately.
 
 Under the hood
 ==============
-reading the configuration from the files in the backup directory,
 
-|innobackupex| replayed the committed transactions in the log files (some transactions could have been done while the backup was being done) and rolled back the uncommitted ones. Once this is done, all the information lay in the tablespace (the InnoDB files), and the log files are re-created.
+|innobackupex| started the prepare process by reading the configuration from the :file:`backup-my.cnf` file in the backup directory.
 
-This implies calling :program:`xtrabackup --prepare` twice with the right binary (determined through the :file:`xtrabackup_binary` or by connecting the server). More details of this process are shown in the :doc:`xtrabackup section <../xtrabackup_bin/preparing_the_backup>`.
+After that, |innobackupex| replayed the committed transactions in the log files (some transactions could have been done while the backup was being done) and rolled back the uncommitted ones. Once this is done, all the information lay in the tablespace (the InnoDB files), and the log files are re-created.
+
+This implies calling :option:`xtrabackup --prepare` twice. More details of this process are shown in the :doc:`xtrabackup section <../xtrabackup_bin/preparing_the_backup>`.
 
 Note that this preparation is not suited for incremental backups. If you perform it on the base of an incremental backup, you will not be able to "add" the increments. See :doc:`incremental_backups_innobackupex`.
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/privileges.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/privileges.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/privileges.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/privileges.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-==================================
- Connection and Privileges Needed
-==================================
-
-|Percona XtraBackup| needs to be able to connect to the database server and perform operations on the server and the :term:`datadir` when creating a backup, when preparing in some scenarios and when restoring it. In order to do so, there are privileges and permission requirements on its execution that must be fulfilled.
-
-Privileges refers to the operations that a system user is permitted to do in the database server. **They are set at the database server and only apply to users in the database server**.
-
-Permissions are those which permits a user to perform operations on the system, like reading, writing or executing on a certain directory or start/stop a system service. **They are set at a system level and only apply to system users**.
-
-Whether |xtrabackup| or |innobackupex| is used, there are two actors involved: the user invoking the program - *a system user* - and the user performing action in the database server - *a database user*. Note that these are different users in different places, even tough they may have the same username.
-
-All the invocations of |innobackupex| and |xtrabackup| in this documentation assumes that the system user has the appropriate permissions and you are providing the relevant options for connecting the database server - besides the options for the action to be performed - and the database user has adequate privileges. 
-
-Connecting to the server
-========================
-
-The database user used to connect to the server and its password are specified by the :option:`--user` and :option:`--password` option, ::
-
-  $ innobackupex --user=DBUSER --password=SECRET /path/to/backup/dir/
-  $ innobackupex --user=LUKE  --password=US3TH3F0RC3 --stream=tar ./ | bzip2 - 
-  $ xtrabackup --user=DVADER --password=14MY0URF4TH3R --backup --target-dir=/data/bkps/
-
-If you don't use the :option:`--user` option, |Percona XtraBackup| will assume the database user whose name is the system user executing it.
-
-Other Connection Options
-------------------------
-
-According to your system, you may need to specify one or more of the following options to connect to the server:
-
-===============  ===================================================================
-Option           Description
-===============  ===================================================================
---port           The port to use when connecting to the database server with TCP/IP.
---socket         The socket to use when connecting to the local database.
---host           The host to use when connecting to the database server with TCP/IP.
-===============  ===================================================================
-
-These options are passed to the :command:`mysql` child process without alteration, see :option:`mysql --help` for details.
-
-.. note::
- In case of multiple server instances the correct connection parameters (port, socket, host) must be specified in order for |innobackupex| to talk to the correct server. 
-
-
-Permissions and Privileges Needed
-=================================
-
-Once connected to the server, in order to perform a backup you will need ``READ``, ``WRITE`` and ``EXECUTE`` permissions at a filesystem level in the server's :term:`datadir`.
-
-The database user needs the following privileges on the tables / databases to be backed up:
-
-  * ``RELOAD`` and ``LOCK TABLES`` (unless the :option:`--no-lock <innobackupex --no-lock>` option is specified) in order to ``FLUSH TABLES WITH READ LOCK`` prior to start copying the files and 
-
-  * ``REPLICATION CLIENT`` in order to obtain the binary log position,
-
-  * ``CREATE TABLESPACE`` in order to import tables (see :ref:`imp_exp_ibk`) and
-
-  * ``SUPER`` in order to start/stop the slave threads in a replication environment.
-
-The explanation of when these are used can be found in :ref:`how_ibk_works`.
-
-An SQL example of creating a database user with the minimum privileges required to full backups would be:
-
-.. code-block:: sql
-
-  mysql> CREATE USER 'bkpuser'@'localhost' IDENTIFIED BY 's3cret';
-  mysql> GRANT RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO 'bkpuser'@'localhost';
-  mysql> FLUSH PRIVILEGES;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/restoring_a_backup_ibk.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/restoring_a_backup_ibk.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/restoring_a_backup_ibk.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/restoring_a_backup_ibk.rst	2017-02-27 07:47:02.000000000 +0000
@@ -14,9 +14,9 @@
 
 .. note:: 
 
- The :term:`datadir` must be empty; |Percona XtraBackup| :option:`innobackupex --copy-back` option will not copy over existing files. Also it's important to note that MySQL server needs to be shut down before restore is performed. You can't restore to a :term:`datadir` of a running mysqld instance (except when importing a partial backup). 
+   The :term:`datadir` must be empty; |Percona XtraBackup| :option:`innobackupex --copy-back` option will not copy over existing files unless :option:`innobackupex --force-non-empty-directories` option is specified. Also it's important to note that |MySQL| server needs to be shut down before restore is performed. You can't restore to a :term:`datadir` of a running mysqld instance (except when importing a partial backup). 
 
-As files' attributes will be preserved, in most cases you will need to change the files’ ownership to ``mysql`` before starting the database server, as they will be owned by the user who created the backup::
+As files' attributes will be preserved, in most cases you will need to change the files' ownership to ``mysql`` before starting the database server, as they will be owned by the user who created the backup::
 
   $ chown -R mysql:mysql /var/lib/mysql
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/storing_history.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/storing_history.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/storing_history.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/storing_history.rst	2017-02-27 07:47:02.000000000 +0000
@@ -80,7 +80,7 @@
    * - encrypted
      - Is this an encrypted backup
  
-Limitiatons
+Limitations
 -----------
 
 * :option:`innobackupex --history` option must be specified only on the innobackupex command line and not within a configuration file in order to be effective.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/throttling_ibk.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/throttling_ibk.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/innobackupex/throttling_ibk.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/innobackupex/throttling_ibk.rst	2017-02-27 07:47:02.000000000 +0000
@@ -8,4 +8,8 @@
 
 One way of checking the current I/O operations at a system is with :command:`iostat` command. See :ref:`throttling_backups_xbk` for details of how throttling works.
 
+.. note:: 
+
+   :option:`innobackupex --throttle` option works only during the backup phase, ie. it will not work with :option:`innobackupex --apply-log` and :option:`innobackupex --copy-back` options.
+
 The :option:`--throttle` option is similar to the ``--sleep`` option in ``mysqlbackup`` and should be used instead of it, as ``--sleep`` will be ignored.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,69 +1,154 @@
-===================================
- Percona :program:`apt` Repository
-===================================
+.. _apt_repo:
 
-*Debian* and *Ubuntu* packages from *Percona* are signed with a key. Before using the repository, you should add the key to :program:`apt`. To do that, run the following commands: ::
+========================================================
+Installing |Percona XtraBackup| on *Debian* and *Ubuntu*
+========================================================
 
-  $ apt-key adv --keyserver keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A
+Ready-to-use packages are available from the |Percona XtraBackup| software
+repositories and the `download page
+<https://www.percona.com/downloads/XtraBackup/>`_.
 
-Add this to :file:`/etc/apt/sources.list`, replacing ``VERSION`` with the name of your distribution: ::
+Supported Releases:
 
-  deb http://repo.percona.com/apt VERSION main
-  deb-src http://repo.percona.com/apt VERSION main
+* Debian:
 
-Remember to update the local cache: ::
+ * 7.0 (wheezy)
+ * 8.0 (jessie)
 
-  $ apt-get update
+* Ubuntu:
 
-Supported Architectures
-=======================
+ * 12.04LTS (precise)
+ * 14.04LTS (trusty)
+ * 16.04LTS (xenial)
+ * 16.10 (yakkety)
 
- * x86_64 (also known as amd64)
- * x86
+Supported Platforms:
 
-Supported Releases
-==================
+* x86
+* x86_64 (also known as ``amd64``)
 
-Debian
-------
+What's in each DEB package?
+===========================
 
- * 6.0 (squeeze)
- * 7.0 (wheezy)
+The ``percona-xtrabackup`` package contains the latest |Percona XtraBackup|
+GA binaries and associated files.
+
+The ``percona-xtrabackup-dbg`` package contains the debug symbols for binaries
+in ``percona-xtrabackup``.
+
+The ``percona-xtrabackup-test`` package contains the test suite for |Percona
+XtraBackup|.
+
+The ``percona-xtrabackup-2x`` package contains the older version of the
+|Percona XtraBackup|.
+
+Installing |Percona XtraBackup| from Percona ``apt`` repository
+===============================================================
+
+1. Fetch the repository packages from Percona web:
+
+   .. code-block:: bash
+
+     $ wget https://repo.percona.com/apt/percona-release_0.1-4.$(lsb_release -sc)_all.deb
+
+2. Install the downloaded package with :program:`dpkg`. To do that, run the
+   following commands as root or with :program:`sudo`:
+
+   .. code-block:: bash
+
+     $ sudo dpkg -i percona-release_0.1-4.$(lsb_release -sc)_all.deb
+
+   Once you install this package the Percona repositories should be added. You
+   can check the repository setup in the
+   :file:`/etc/apt/sources.list.d/percona-release.list` file.
+
+3. Remember to update the local cache:
+
+   .. code-block:: bash
+
+     $ sudo apt-get update
+
+4. After that you can install the package:
+
+   .. code-block:: bash
+
+     $ sudo apt-get install percona-xtrabackup
+
+.. _debian_testing:
+
+Percona ``apt`` Testing repository
+----------------------------------
+
+Percona offers pre-release builds from the testing repository. To enable it add
+the just add the ``testing`` word at the end of the Percona repository
+definition in your repository file (default
+:file:`/etc/apt/sources.list.d/percona-release.list`). It should looks like
+this (in this example ``VERSION`` is the name of your distribution):
+
+.. code-block:: text
+
+  deb http://repo.percona.com/apt VERSION main testing
+  deb-src http://repo.percona.com/apt VERSION main testing
+
+For example, if you are running *Debian* 8 (*jessie*) and want to install the
+latest testing builds, the definitions should look like this:
+
+.. code-block:: text
+
+  deb http://repo.percona.com/apt jessie main testing
+  deb-src http://repo.percona.com/apt jessie main testing
+
+Apt-Pinning the packages
+------------------------
+
+In some cases you might need to "pin" the selected packages to avoid the
+upgrades from the distribution repositories. You'll need to make a new file
+:file:`/etc/apt/preferences.d/00percona.pref` and add the following lines in
+it:
+
+.. code-block:: text
+
+  Package: *
+  Pin: release o=Percona Development Team
+  Pin-Priority: 1001
+
+For more information about the pinning you can check the official
+`debian wiki <http://wiki.debian.org/AptPreferences>`_.
+
+.. _standalone_deb:
 
-Ubuntu
-------
+Installing |Percona XtraBackup| using downloaded deb packages
+=============================================================
 
- * 10.04LTS (lucid)
- * 12.04LTS (precise) 
- * 12.10 (quantal)
- * 13.04 (raring)
- * 13.10 (saucy)
+Download the packages of the desired series for your architecture from the
+`download page <https://www.percona.com/downloads/XtraBackup/>`_. Following
+example will download |Percona XtraBackup| 2.3.5 release package for *Debian*
+8.0:
 
-.. _debian_experimental: 
+.. code-block:: bash
 
-Experimental Repository
-=======================
+  $ wget https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.3.5/\
+  binary/debian/jessie/x86_64/percona-xtrabackup_2.3.5-1.jessie_amd64.deb
 
-Percona now offers experimental repository for beta releases. To enable it add this to :file:`/etc/apt/sources.list`, replacing ``VERSION`` with the name of your distribution: ::
+Now you can install |Percona XtraBackup| by running:
 
-  deb http://repo.percona.com/apt VERSION main experimental
-  deb-src http://repo.percona.com/apt VERSION main experimental
+.. code-block:: bash
 
-Ubuntu PPA of daily builds
-==========================
+  $ sudo dpkg -i percona-xtrabackup_2.3.5-1.jessie_amd64.deb
 
-Percona offers a Personal Package Archive (PPA) `percona-daily/percona-xtrabackup <https://launchpad.net/~percona-daily/+archive/percona-xtrabackup>`_. Every time code is pushed to our main source code repository, the PPA gets updated.
+.. note::
 
-.. note:: 
+  When installing packages manually like this, you'll need to make sure to
+  resolve all the dependencies and install missing packages yourself.
 
-  These packages are directly built from lp:percona-xtrabackup/2.1 trunk and should be considered PRE-RELEASE SOFTWARE.
+Uninstalling |Percona XtraBackup|
+=================================
 
-This PPA can be added to your system manually by copying the lines below and adding them to your system's software sources: :: 
-  
-  deb http://ppa.launchpad.net/percona-daily/percona-xtrabackup/ubuntu YOUR_UBUNTU_VERSION_HERE main 
-  deb-src http://ppa.launchpad.net/percona-daily/percona-xtrabackup/ubuntu YOUR_UBUNTU_VERSION_HERE main
+To uninstall |Percona XtraBackup| you'll need to remove all the installed
+packages.
 
-or by simply running: :: 
+2. Remove the packages
 
-  $ sudo add-apt-repository ppa:percona-daily/percona-xtrabackup
+   .. code-block:: bash
 
+     $ sudo apt-get remove percona-xtrabackup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/installation/compiling_xtrabackup.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/installation/compiling_xtrabackup.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/installation/compiling_xtrabackup.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/installation/compiling_xtrabackup.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,15 +1,22 @@
 .. _compiling_xtrabackup:
 
-===========================================
- Compiling and Installing from Source Code
-===========================================
-
-The source code is available from the *Launchpad* project `here <https://launchpad.net/percona-xtrabackup>`_. The easiest way to get the code is with :command:`bzr branch` of the desired release, such as the following: ::
-
-  bzr branch lp:percona-xtrabackup/2.2
-
-You should then have a directory named after the release you branched, such as ``percona-xtrabackup``.
+=========================================
+Compiling and Installing from Source Code
+=========================================
+
+The source code is available from the |Percona XtraBackup| *Github* `project
+<https://github.com/percona/percona-xtrabackup>`_. The easiest way to get the
+code is with :command:`git clone` and switch to the desired release branch,
+such as the following:
+
+.. code-block:: bash
+
+  $ git clone https://github.com/percona/percona-xtrabackup.git
+  $ cd percona-xtrabackup
+  $ git checkout 2.3
 
+You should then have a directory named after the release you branched, such as
+``percona-xtrabackup``.
 
 Compiling on Linux
 ==================
@@ -17,41 +24,63 @@
 Prerequisites
 -------------
 
-The following packages and tools must be installed to compile |Percona XtraBackup| from source. These might vary from system to system.
+The following packages and tools must be installed to compile |Percona
+XtraBackup| from source. These might vary from system to system.
 
-In Debian-based distributions, you need to: ::
+In Debian-based distributions, you need to:
 
- $ apt-get install build-essential flex bison automake autoconf bzr \
+.. code-block:: bash
+
+ $ apt-get install build-essential flex bison automake autoconf \
     libtool cmake libaio-dev mysql-client libncurses-dev zlib1g-dev \
-    libgcrypt11-dev
+    libgcrypt11-dev libev-dev libcurl4-gnutls-dev vim-common
+
+
+In ``RPM``-based distributions, you need to:
 
+.. code-block:: bash
 
-In ``RPM``-based distributions, you need to: ::
- 
-  $ yum install cmake gcc gcc-c++ libaio libaio-devel automake autoconf bzr \
-    bison libtool ncurses5-devel
+  $ yum install cmake gcc gcc-c++ libaio libaio-devel automake autoconf \
+    bison libtool ncurses-devel libgcrypt-devel libev-devel libcurl-devel \
+    vim-common
 
 Compiling with CMake
 --------------------
 
-At the base directory of the source code tree, if you execute: ::
+At the base directory of the source code tree, if you execute:
 
-  $ cmake -DBUILD_CONFIG=xtrabackup_release && make -j4
+.. code-block:: bash
 
-and you go for a coffee, at your return |Percona XtraBackup| will be ready to be used.
+  $ cmake -DBUILD_CONFIG=xtrabackup_release -DWITH_MAN_PAGES=OFF && make -j4
+
+and you go for a coffee, at your return |Percona XtraBackup| will be ready to
+be used.
+
+.. note::
+
+  You can build |Percona XtraBackup| with man pages but this requires
+  ``python-sphinx`` package which isn't available from that main repositories
+  for every distribution. If you installed the ``python-sphinx`` package you
+  need to remove the ``-DWITH_MAN_PAGES=OFF`` from previous command.
 
 Installation
 ------------
 
-The following command: ::
+The following command:
+
+.. code-block:: bash
 
   $ make install
 
-will install all |Percona XtraBackup| binaries, the |innobackupex| script and tests to :file:`/usr/local/xtrabackup`. You can override this either with: :: 
-  
-  make DESTDIR=... install
+will install all |Percona XtraBackup| binaries, the |innobackupex| script and
+tests to :file:`/usr/local/xtrabackup`. You can override this either with:
+
+.. code-block:: bash
+
+  $ make DESTDIR=... install
 
-or by changing the installation layout with: :: 
+or by changing the installation layout with:
 
- cmake -DINSTALL_LAYOUT=...
+.. code-block:: bash
 
+  $ cmake -DINSTALL_LAYOUT=...
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/installation/yum_repo.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/installation/yum_repo.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/installation/yum_repo.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/installation/yum_repo.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,83 +1,191 @@
-===================================
- Percona :program:`yum` Repository
-===================================
+.. _yum_repo:
 
-The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*.
+======================================================================
+Installing |Percona XtraBackup| on Red Hat Enterprise Linux and CentOS
+======================================================================
 
-The easiest way to install the *Percona Yum* repository is to install an *RPM* that configures :program:`yum` and installs the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_. You can also do the installation manually.
+Ready-to-use packages are available from the |Percona XtraBackup| software
+repositories and the `download page
+<https://www.percona.com/downloads/XtraBackup/>`_. The |Percona|
+:program:`yum` repository supports popular *RPM*-based operating systems,
+including the *Amazon Linux AMI*.
 
-Automatic Installation
-======================
+The easiest way to install the *Percona Yum* repository is to install an *RPM*
+that configures :program:`yum` and installs the `Percona GPG key
+<https://www.percona.com/downloads/RPM-GPG-KEY-percona>`_.
 
-Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: ::
+Supported Releases:
 
-  $ rpm -Uhv http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
 
-You should see some output such as the following: ::
+ * *CentOS* 5 and *RHEL* 5
 
-  Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
-  Preparing...                ########################################### [100%]
-     1:percona-release        ########################################### [100%]
+ * *CentOS* 6 and *RHEL* 6 (Current Stable) [#f1]_
 
-The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
+ * *CentOS* 7 and *RHEL* 7
 
-Manual Installation
-===================
+ * *Amazon Linux AMI* (works the same as *CentOS* 6)
 
-To install the repository manually, place the following into a new file named :file:`/etc/yum.repos.d/Percona.repo`: ::
+The *CentOS* repositories should work well with *Red Hat Enterprise Linux* too,
+provided that :program:`yum` is installed on the server.
 
-  [percona]
-  name = CentOS $releasever - Percona
-  baseurl=http://repo.percona.com/centos/$releasever/os/$basearch/
-  enabled = 1
-  gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-percona
-  gpgcheck = 1
+Supported Platforms:
 
-Also, copy the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_  into a file named :file:`/etc/pki/rpm-gpg/RPM-GPG-KEY-percona`.
+ * x86
+ * x86_64 (also known as ``amd64``)
 
-Testing The Repository
-======================
+What's in each RPM package?
+===========================
 
-Make sure packages are downloaded from the repository, by executing the following command as root: ::
+The ``percona-xtrabackup`` package contains the latest |Percona XtraBackup| GA
+binaries and associated files.
 
-  yum list | grep percona
+The ``percona-xtrabackup-debuginfo`` package contains the debug symbols for
+binaries in ``percona-xtrabackup``.
 
-You should see output similar to the following: ::
+The ``percona-xtrabackup-test`` package contains the test suite for |Percona
+XtraBackup|.
 
-  percona-release.x86_64                     0.0-1                       installed
-  ...
-  Percona-Server-client-51.x86_64            5.1.47-rel11.1.51.rhel5     percona  
-  Percona-Server-devel-51.x86_64             5.1.47-rel11.1.51.rhel5     percona  
-  Percona-Server-server-51.x86_64            5.1.47-rel11.1.51.rhel5     percona  
-  Percona-Server-shared-51.x86_64            5.1.47-rel11.1.51.rhel5     percona  
-  Percona-Server-test-51.x86_64              5.1.47-rel11.1.51.rhel5     percona  
-  ...
-  xtrabackup.x86_64                          1.2-22.rhel5                percona  
+The ``percona-xtrabackup-2x`` package contains the older version of the
+|Percona XtraBackup|.
 
-Supported Platforms
-===================
-  
-  *  ``x86_64``
-  *  ``i386``
+Installing |Percona XtraBackup| from Percona ``yum`` repository
+===============================================================
 
-Supported Releases
-==================
+1. Install the Percona repository
 
-The *CentOS* repositories should work well with *Red Hat Enterprise Linux* too, provided that :program:`yum` is installed on the server.
+   You can install Percona yum repository by running the following command as a
+   ``root`` user or with :program:`sudo`:
 
-* *CentOS* 5 and *RHEL* 5
-* *CentOS* 6 and *RHEL* 6
-* *Amazon Linux AMI* (works the same as *CentOS* 5)
+   .. code-block:: bash
+
+     yum install http://www.percona.com/downloads/percona-release/redhat/0.1-4/percona-release-0.1-4.noarch.rpm
+
+   You should see some output such as the following:
+
+   .. code-block:: bash
+
+     Retrieving http://www.percona.com/downloads/percona-release/redhat/0.1-4/percona-release-0.1-4.noarch.rpm
+     Preparing...                ########################################### [100%]
+        1:percona-release        ########################################### [100%]
+
+.. note::
+
+  *RHEL*/*Centos* 5 doesn't support installing the packages directly from the
+  remote location so you'll need to download the package first and install it
+  manually with :program:`rpm`:
+
+  .. code-block:: bash
+
+    wget http://www.percona.com/downloads/percona-release/redhat/0.1-4/percona-release-0.1-4.noarch.rpm
+    rpm -ivH percona-release-0.1-4.noarch.rpm
+
+2. Testing the repository
+
+   Make sure packages are now available from the repository, by executing the
+   following command:
+
+   .. code-block:: bash
+
+     yum list | grep percona
+
+   You should see output similar to the following:
+
+   .. code-block:: bash
+
+     ...
+     percona-xtrabackup-20.x86_64               2.0.8-587.rhel5             percona-release-x86_64
+     percona-xtrabackup-20-debuginfo.x86_64     2.0.8-587.rhel5             percona-release-x86_64
+     percona-xtrabackup-20-test.x86_64          2.0.8-587.rhel5             percona-release-x86_64
+     percona-xtrabackup-21.x86_64               2.1.9-746.rhel5             percona-release-x86_64
+     percona-xtrabackup-21-debuginfo.x86_64     2.1.9-746.rhel5             percona-release-x86_64
+     percona-xtrabackup-22.x86_64               2.2.13-1.el5                percona-release-x86_64
+     percona-xtrabackup-22-debuginfo.x86_64     2.2.13-1.el5                percona-release-x86_64
+     percona-xtrabackup-debuginfo.x86_64        2.3.5-1.el5                 percona-release-x86_64
+     percona-xtrabackup-test.x86_64             2.3.5-1.el5                 percona-release-x86_64
+     percona-xtrabackup-test-21.x86_64          2.1.9-746.rhel5             percona-release-x86_64
+     percona-xtrabackup-test-22.x86_64          2.2.13-1.el5                percona-release-x86_64
+     ...
+
+3. Install the packages
+
+   You can now install |Percona XtraBackup| by running:
+
+   .. code-block:: bash
+
+     yum install percona-xtrabackup
+
+.. warning::
+
+   In order to sucessfully install |Percona XtraBackup| ``libev`` package will
+   need to be installed first. ``libev`` package can be installed from the
+   `EPEL <https://fedoraproject.org/wiki/EPEL>`_ repositories.
 
 .. _yum_testing:
 
-Percona `yum` testing repository
-=====================================
+Percona `yum` Testing Repository
+================================
+
+Percona offers pre-release builds from our testing repository. To subscribe to
+the testing repository, you'll need to enable the testing repository in
+:file:`/etc/yum.repos.d/percona-release.repo`. To do so, set both
+``percona-testing-$basearch`` and ``percona-testing-noarch`` to
+``enabled = 1`` (Note that there are 3 sections in this file: release, testing
+and experimental - in this case it is the second section that requires
+updating). **NOTE:** You'll need to install the Percona repository first (ref
+above) if this hasn't been done already.
+
+.. _standalone_rpm:
+
+Installing |Percona XtraBackup| using downloaded rpm packages
+=============================================================
+
+Download the packages of the desired series for your architecture from the
+`download page <https://www.percona.com/downloads/XtraBackup/>`_. Following
+example will download |Percona XtraBackup| 2.3.5 release package for
+*CentOS* 7:
+
+.. code-block:: bash
+
+  $ wget https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.3.5/binary/redhat/7/x86_64/percona-xtrabackup-2.3.5-1.el7.x86_64.rpm
+
+Now you can install |Percona XtraBackup| by running:
+
+.. code-block:: bash
+
+ $ yum localinstall percona-xtrabackup-2.3.2-1.el7.x86_64.rpm
+
+.. note::
+
+  When installing packages manually like this, you'll need to make sure to
+  resolve all the dependencies and install missing packages yourself.
+
+Uninstalling |Percona XtraBackup|
+=================================
+
+To completely uninstall |Percona XtraBackup| you'll need to remove all the
+installed packages.
+
+Remove the packages
+
+.. code-block:: bash
 
-Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: ::
+  yum remove percona-xtrabackup
 
- yum install http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm
+.. rubric:: Footnotes
 
-.. note:: 
- This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6
+.. [#f1]
 
+  "Current Stable": We support only the current stable RHEL6/CentOS6
+  release, because there is no official (i.e. RedHat provided) method to
+  support or download the latest OpenSSL on RHEL/CentOS versions prior to 6.5.
+  Similarly, and also as a result thereof, there is no official Percona way to
+  support the latest Percona XtraBackup builds on RHEL/CentOS versions prior to
+  6.5. Additionally, many users will need to upgrade to OpenSSL 1.0.1g or later
+  (due to the `Heartbleed vulnerability
+  <http://www.percona.com/resources/ceo-customer-advisory-heartbleed>`_), and
+  this OpenSSL version is not available for download from any official
+  RHEL/CentOS repository for versions 6.4 and prior. For any officially
+  unsupported system, src.rpm packages may be used to rebuild |Percona
+  XtraBackup| for any environment. Please contact our `support service
+  <http://www.percona.com/products/mysql-support>`_ if you require further
+  information on this.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/installation.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/installation.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/installation.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/installation.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,28 +1,50 @@
 .. _installation:
 
-===============================================
- Installing |Percona XtraBackup| from Binaries
-===============================================
+===================================
+Installing |Percona XtraBackup| 2.3
+===================================
 
-Before installing, you might want to read the :doc:`release-notes`.
+This page provides the information on how to install |Percona XtraBackup|.
+Following options are available:
 
-Ready-to-use binaries are available from the |Percona XtraBackup| `download page <http://www.percona.com/downloads/XtraBackup/>`_, including:
+* :ref:`installing_from_binaries` (recommended)
+* Installing |Percona XtraBackup| from Downloaded
+  :ref:`rpm <standalone_rpm>` or :ref:`apt <standalone_deb>` packages
+* :ref:`compiling_xtrabackup`
 
- * ``RPM`` packages for *RHEL* 5 and *RHEL* 6 (including compatible distributions such as CentOS and Oracle Enterprise Linux)
+Before installing, you might want to read the :doc:`release-notes`.
 
- * *Debian* packages for *Debian* and *Ubuntu*
+.. _installing_from_binaries:
 
- * Generic ``.tar.gz`` binary packages
+Installing |Percona XtraBackup| from Repositories
+=================================================
 
-Using Percona Software Repositories
-===================================
+|Percona| provides repositories for :program:`yum` (``RPM`` packages for
+*Red Hat*, *CentOS* and *Amazon Linux AMI*) and :program:`apt` (:file:`.deb`
+packages for *Ubuntu* and *Debian*) for software such as |Percona Server|,
+|Percona XtraBackup|, and *Percona Toolkit*. This makes it easy to install and
+update your software and its dependencies through your operating system's
+package manager. This is the recommend way of installing where possible.
+
+Following guides describe the installation process for using the official
+Percona repositories for :file:`.deb` and :file:`.rpm` packages.
 
 .. toctree::
    :maxdepth: 1
+   :titlesonly:
 
    installation/apt_repo
    installation/yum_repo
 
-|Percona| provides repositories for :program:`yum` (``RPM`` packages for *Red Hat Enterprise Linux* and compatible distributions such as *CentOS*, *Oracle Enterprise Linux*, *Amazon Linux AMI*, and *Fedora*) and :program:`apt` (:file:`.deb` packages for *Ubuntu* and *Debian*) for software such as |Percona Server|, |XtraDB|, |Percona XtraBackup|, and |Percona Toolkit|. This makes it easy to install and update your software and its dependencies through your operating system's package manager.
+Compiling and Installing from Source Code
+=========================================
+
+|Percona XtraBackup| is open source and the code is available on
+`Github <https://github.com/percona/percona-xtrabackup>`_. Following guide
+describes the compiling and installation process from source code.
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
 
-This is the recommend way of installing where possible.
+   installation/compiling_xtrabackup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/intro.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/intro.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/intro.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/intro.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,9 +1,12 @@
+.. _intro:
+
 ==========================
- About Percona Xtrabackup
+ About Percona XtraBackup
 ==========================
 
-
-*Percona XtraBackup* is the world's only open-source, free |MySQL| hot backup software that performs non-blocking backups for |InnoDB| and |XtraDB| databases. With *Percona XtraBackup*, you can achieve the following benefits:
+*Percona XtraBackup* is the world's only open-source, free |MySQL| hot backup
+software that performs non-blocking backups for |InnoDB| and |XtraDB|
+databases. With *Percona XtraBackup*, you can achieve the following benefits:
 
 * Backups that complete quickly and reliably
 
@@ -15,105 +18,165 @@
 
 * Higher uptime due to faster restore time
 
-|Percona XtraBackup| makes |MySQL| hot backups for all versions of |Percona Server|, |MySQL|, and |MariaDB|. It performs streaming, compressed, and incremental |MySQL| backups.
-
-|Percona XtraBackup| works with |MySQL|, |MariaDB|, and |Percona Server|. It supports completely non-blocking backups of |InnoDB|, |XtraDB|, and *HailDB* storage engines. In addition, it can back up the following storage engines by briefly pausing writes at the end of the backup: |MyISAM|, :term:`Merge <.MRG>`, and :term:`Archive <.ARM>`, including partitioned tables, triggers, and database options.
-
-Percona's enterprise-grade commercial `MySQL Support <http://www.percona.com/mysql-support/>`_ contracts include support for |Percona XtraBackup|. We recommend support for critical production deployments.
+|Percona XtraBackup| makes |MySQL| hot backups for all versions of |Percona
+Server|, |MySQL|, and |MariaDB|. It performs streaming, compressed, and
+incremental |MySQL| backups.
+
+|Percona XtraBackup| works with |MySQL|, |MariaDB|, and |Percona Server|. It
+supports completely non-blocking backups of |InnoDB|, |XtraDB|, and *HailDB*
+storage engines. In addition, it can back up the following storage engines by
+briefly pausing writes at the end of the backup: |MyISAM|,
+:term:`Merge <.MRG>`, and :term:`Archive <.ARM>`, including partitioned tables,
+triggers, and database options.
+
+Percona's enterprise-grade commercial `MySQL Support
+<http://www.percona.com/mysql-support/>`_ contracts include support for
+|Percona XtraBackup|. We recommend support for critical production deployments.
 
 MySQL Backup Tool Feature Comparison
 ====================================
 
-+---------------------------------------------+----------------------+-----------------------+
-|Features                                     |Percona XtraBackup    |MySQL Enterprise Backup|
-|                                             |                      |(InnoDB Hot Backup)    |
-+=============================================+======================+=======================+
-|License                                      | GPL                  | Proprietary           |      
-+---------------------------------------------+----------------------+-----------------------+
-|Price                                        | Free                 | $5000 per server      |      
-+---------------------------------------------+----------------------+-----------------------+
-|Open source                                  | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Streaming and encryption formats             | Open source          | Proprietary           |
-+---------------------------------------------+----------------------+-----------------------+
-|Supported MySQL flavors                      | |Percona Server|,    | |MySQL|               |
-|                                             | |MySQL|,             |                       |
-|                                             | |MariaDB|            |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Non-blocking InnoDB backups [#n-1]_          | Yes                  | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Blocking MyISAM backups                      | Yes                  | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Incremental backups                          | Yes                  | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Full compressed backups                      | Yes                  | Yes                   |
-+---------------------------------------------+----------------------+-----------------------+
-|Incremental compressed backups               | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Fast incremental backups [#n-2]_             | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Incremental backups with archived logs       | Yes                  |                       |      
-+---------------------------------------------+----------------------+-----------------------+
-|Backup locks [#n-8]_                         | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Encrypted backups                            | Yes                  | Yes [#n-3]_           |      
-+---------------------------------------------+----------------------+-----------------------+
-|Streaming backups                            | Yes                  | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Parallel local backups                       | Yes                  | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Parallel streaming backups                   | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Parallel compression                         | Yes                  | Yes                   |
-+---------------------------------------------+----------------------+-----------------------+
-|Parallel encryption                          | Yes                  | Yes                   |
-+---------------------------------------------+----------------------+-----------------------+
-|Parallel apply-log                           | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Parallel copy-back                           |                      | Yes                   |
-+---------------------------------------------+----------------------+-----------------------+
-|Partial backups                              | Yes                  | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Throttling [#n-4]_                           | Yes                  | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Point-in-time recovery support               | Yes                  | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Safe slave backups                           | Yes                  |                       |      
-+---------------------------------------------+----------------------+-----------------------+
-|Compact backups [#n-5]_                      | Yes                  | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Buffer pool state backups                    | Yes                  |                       |      
-+---------------------------------------------+----------------------+-----------------------+
-|Individual tables export                     | Yes                  | Yes [#n-6]_           |      
-+---------------------------------------------+----------------------+-----------------------+
-|Individual partitions export                 | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Restoring tables to a different server       | Yes                  | Yes                   |      
-|[#n-7]_                                      |                      |                       |   
-+---------------------------------------------+----------------------+-----------------------+
-|Data & index file statistics                 | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|InnoDB secondary indexes defragmentation     | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|``rsync`` support to minimize lock time      | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Improved ``FTWRL`` handling                  | Yes                  |                       |
-+---------------------------------------------+----------------------+-----------------------+
-|Backup history table                         | Yes                  | Yes                   |
-+---------------------------------------------+----------------------+-----------------------+
-|Backup progress table                        |                      | Yes                   |
-+---------------------------------------------+----------------------+-----------------------+
-|Offline backups                              |                      | Yes                   |      
-+---------------------------------------------+----------------------+-----------------------+
-|Tape backups with Oracle Secure Backup       |                      | Yes                   |
-+---------------------------------------------+----------------------+-----------------------+
+.. tabularcolumns:: |p{5cm}|p{5cm}|p{5cm}|
 
+.. list-table::
+   :header-rows: 1
 
+   * - Features
+     - Percona XtraBackup
+     - MySQL Enterprise backup
+   * - License
+     - GPL
+     - Proprietary
+   * - Price
+     - Free
+     - Included in subscription at $5000 per Server
+   * - Streaming and encryption formats
+     - Open source
+     - Proprietary
+   * - Supported |MySQL| flavors
+     - |MySQL|, |Percona Server|, |MariaDB|, |Percona XtraDB Cluster|,
+       *MariaDB Galera Cluster*
+     - |MySQL|
+   * - Supported operating systems
+     - Linux
+     - Linux, Solaris, Windows, OSX, FreeBSD.
+   * - Non-blocking InnoDB backups [#n-1]_
+     - Yes
+     - Yes
+   * - Blocking MyISAM backups
+     - Yes
+     - Yes
+   * - Incremental backups
+     - Yes
+     - Yes
+   * - Full compressed backups
+     - Yes
+     - Yes
+   * - Incremental compressed backups
+     - Yes
+     -
+   * - Fast incremental backups [#n-2]_
+     - Yes
+     -
+   * - Incremental backups with archived logs feature in Percona Server
+     - Yes
+     -
+   * - Incremental backups with REDO log only
+     -
+     - Yes
+   * - Backup locks [#n-8]_
+     - Yes
+     -
+   * - Encrypted backups
+     - Yes
+     - Yes [#n-3]_
+   * - Streaming backups
+     - Yes
+     - Yes
+   * - Parallel local backups
+     - Yes
+     - Yes
+   * - Parallel compression
+     - Yes
+     - Yes
+   * - Parallel encryption
+     - Yes
+     - Yes
+   * - Parallel apply-log
+     - Yes
+     -
+   * - Parallel copy-back
+     -
+     - Yes
+   * - Partial backups
+     - Yes
+     - Yes
+   * - Partial backups of individual partitions
+     - Yes
+     -
+   * - Throttling [#n-4]_
+     - Yes
+     - Yes
+   * - Backup image validation
+     -
+     - Yes
+   * - Point-in-time recovery support
+     - Yes
+     - Yes
+   * - Safe slave backups
+     - Yes
+     -
+   * - Compact backups [#n-5]_
+     - Yes
+     -
+   * - Buffer pool state backups
+     - Yes
+     -
+   * - Individual tables export
+     - Yes
+     - Yes [#n-6]_
+   * - Individual partitions export
+     - Yes
+     -
+   * - Restoring tables to a different server [#n-7]_
+     - Yes
+     - Yes
+   * - Data & index file statistics
+     - Yes
+     -
+   * - InnoDB secondary indexes defragmentation
+     - Yes
+     -
+   * - ``rsync`` support to minimize lock time
+     - Yes
+     -
+   * - Improved ``FTWRL`` handling
+     - Yes
+     -
+   * - Backup history table
+     - Yes
+     - Yes
+   * - Backup progress table
+     -
+     - Yes
+   * - Offline backups
+     -
+     - Yes
+   * - Backup to tape media managers
+     -
+     - Yes
+   * - Cloud backups support
+     -
+     - Amazon S3
+   * - External graphical user interfaces to backup/recovery
+     - Zmanda Recovery Manager for MySQL
+     - MySQL Workbench, MySQL Enterprise Monitor
 
 What are the features of Percona XtraBackup?
 ============================================
 
-Here is a short list of |Percona XtraBackup| features. See the documentation for more.
+Here is a short list of |Percona XtraBackup| features. See the documentation
+for more.
 
 * Create hot |InnoDB| backups without pausing your database
 * Make incremental backups of |MySQL|
@@ -128,16 +191,32 @@
 
 .. [#n-1] |InnoDB| tables are still locked while copying non-|InnoDB| data.
 
-.. [#n-2] Fast incremental backups are supported for |Percona Server| with XtraDB changed page tracking enabled.
-
-.. [#n-3] |Percona XtraBackup| supports encryption with any kinds of backups. *MySQL Enterprise Backup* only supports encryption for single-file backups.
-
-.. [#n-4] |Percona XtraBackup| performs throttling based on the number of IO operations per second. *MySQL Enterprise Backup* supports a configurable sleep time between operations.
-
-.. [#n-5] |Percona XtraBackup| skips secondary index pages and recreates them when a compact backup is prepared. *MySQL Enterprise Backup* skips unused pages and reinserts on the prepare stage.
-
-.. [#n-6] |Percona XtraBackup| can export individual tables even from a full backup, regardless of the InnoDB version. *MySQL Enterprise Backup* uses InnoDB 5.6 transportable tablespaces only when performing a partial backup.
-
-.. [#n-7] Tables exported with |Percona XtraBackup| can be imported into |Percona Server| 5.1, 5.5 or 5.6+, or |MySQL| 5.6+. Transportable tablespaces created with *MySQL Enterprise Backup* can only be imported to |Percona Server| 5.6+, |MySQL| 5.6+ or |MariaDB| 10.0+.
+.. [#n-2] Fast incremental backups are supported for |Percona Server| with
+          XtraDB changed page tracking enabled.
 
-.. [#n-8] Backup locks is a lightweight alternative to ``FLUSH TABLES WITH READ LOCK`` available in |Percona Server| 5.6+. |Percona XtraBackup| uses them automatically to copy non-InnoDB data to avoid blocking DML queries that modify |InnoDB| tables.
+.. [#n-3] |Percona XtraBackup| supports encryption with any kinds of backups.
+          *MySQL Enterprise Backup* only supports encryption for single-file
+          backups.
+
+.. [#n-4] |Percona XtraBackup| performs throttling based on the number of IO
+          operations per second. *MySQL Enterprise Backup* supports a
+          configurable sleep time between operations.
+
+.. [#n-5] |Percona XtraBackup| skips secondary index pages and recreates them
+          when a compact backup is prepared. *MySQL Enterprise Backup* skips
+          unused pages and reinserts on the prepare stage.
+
+.. [#n-6] |Percona XtraBackup| can export individual tables even from a full
+          backup, regardless of the InnoDB version. *MySQL Enterprise Backup*
+          uses InnoDB 5.6 transportable tablespaces only when performing a
+          partial backup.
+
+.. [#n-7] Tables exported with |Percona XtraBackup| can be imported into
+          |Percona Server| 5.1, 5.5 or 5.6+, or |MySQL| 5.6+. Transportable
+          tablespaces created with *MySQL Enterprise Backup* can only be
+          imported to |Percona Server| 5.6+, |MySQL| 5.6+ or |MariaDB| 10.0+.
+
+.. [#n-8] Backup locks is a lightweight alternative to ``FLUSH TABLES WITH READ
+          LOCK`` available in |Percona Server| 5.6+. |Percona XtraBackup| uses
+          them automatically to copy non-InnoDB data to avoid blocking DML
+          queries that modify |InnoDB| tables.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/known_issues.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/known_issues.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/known_issues.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/known_issues.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,65 @@
+.. _known_issues:
+
+==============================
+ Known issues and limitations
+==============================
+
+There is a number of |Percona XtraBackup| related issues with compressed
+|InnoDB| tables. These issues result from either server-side bugs, or OS
+configuration and thus, cannot be fixed on the |Percona XtraBackup| side.
+
+Known issues:
+
+ * For |MySQL| or |Percona Server| versions 5.1 and 5.5 there are known and
+   unfixed bugs with redo-logging of updates to compressed |InnoDB| tables. For
+   example, internal Oracle bug #16267120 has been fixed only in |MySQL|
+   5.6.12, but not in 5.1 or 5.5. The bug is about compressed page images not
+   being logged on page reorganization and thus, creating a possibility for
+   recovery process to fail in case a different zlib version is being used when
+   replaying a ``MLOG_ZIP_PAGE_REORGANIZE`` redo log record.
+
+ * For |MySQL| or |Percona Server| version 5.6 it is **NOT** recommended to set
+   ``innodb_log_compressed_pages=OFF`` for servers that use compressed |InnoDB|
+   tables which are backed up with |Percona XtraBackup|. This option makes
+   |InnoDB| recovery (and thus, backup prepare) sensible to ``zlib`` versions.
+   In case the host where a backup prepare is performed uses a different
+   ``zlib`` version than the one that was used by the server during runtime,
+   backup prepare may fail due to differences in compression algorithms.
+
+ * Backup fails with ``Error 24: 'Too many open files'``. This usually happens
+   when database being backed up contains large amount of files and |Percona
+   XtraBackup| can't open all of them to create a successful backup. In order
+   to avoid this error the operating system should be configured appropriately
+   so that |Percona XtraBackup| can open all its files. On Linux, this can be
+   done with the ``ulimit`` command for specific backup session or by editing
+   the :file:`/etc/security/limits.conf` to change it globally (**NOTE**: the
+   maximum possible value that can be set up is ``1048576`` which is a
+   hard-coded constant in the Linux kernel).
+
+.. _xtrabackup_limitations:
+
+The ``xtrabackup`` binary has some limitations you should be aware of to ensure
+that your backups go smoothly and are recoverable.
+
+Limitations:
+
+ * The Aria storage engine is part of |MariaDB| and has been integrated in it
+   for many years and Aria table files backup support has been added to
+   |innobackupex| in 2011. The issue is that the engine uses recovery log files
+   and an :file:`aria_log_control` file that are not backed up by
+   |xtrabackup|. As stated in the `documentation
+   <https://mariadb.com/kb/en/aria-faq/#when-is-it-safe-to-remove-old-log-files>`_,
+   starting |MariaDB| without the :file:`maria_log_control` file will mark all
+   the Aria tables as corrupted with this error when doing a ``CHECK`` on the
+   table: ``Table is from another system and must be zerofilled or repaired to
+   be usable on this system``. This means that the Aria tables from an
+   |xtrabackup| backup must be repaired before being usable (this could be
+   quite long depending on the size of the table). Another option is ``aria_chk
+   --zerofil table`` on all Aria tables present on the backup after the prepare
+   phase.
+
+ * If the ``xtrabackup_logfile`` is larger than 4GB, the ``--prepare`` step
+   will fail on 32-bit versions of ``xtrabackup``.
+
+ * ``xtrabackup`` doesn't understand the very old ``--set-variable`` ``my.cnf``
+   syntax that MySQL uses. See :ref:`configuring`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/manual.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/manual.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/manual.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/manual.rst	2017-02-27 07:47:02.000000000 +0000
@@ -12,20 +12,31 @@
    xtrabackup_bin/xtrabackup_binary
    xbstream/xbstream
    xbcrypt/xbcrypt
+   xbcloud/xbcloud
    how_xtrabackup_works
 
 |Percona XtraBackup| is a set of following tools:
 
 :doc:`innobackupex <innobackupex/innobackupex_script>`
-    a wrapper script that provides functionality to backup a whole |MySQL| database instance with :term:`MyISAM`, :term:`InnoDB`, and :term:`XtraDB` tables.
+    |innobackupex| is the symlink for |xtrabackup|. |innobackupex| still
+    supports all features and syntax as 2.2 version did, but is now
+    deprecated and will be removed in next major release.
 
 :doc:`xtrabackup <xtrabackup_bin/xtrabackup_binary>`
-    a compiled *C* binary, which copies only :term:`InnoDB` and :term:`XtraDB` data
-    
+    a compiled *C* binary that provides functionality to backup a whole |MySQL|
+    database instance with |MyISAM|, |InnoDB|, and |XtraDB| tables.
+
 :doc:`xbcrypt <xbcrypt/xbcrypt>`
    utility used for encrypting and decrypting backup files.
 
 :doc:`xbstream <xbstream/xbstream>`
-   utility that allows streaming and extracting files to/from the :term:`xbstream` format.
+   utility that allows streaming and extracting files to/from the
+   :term:`xbstream` format.
+
+:doc:`xbcloud <xbcloud/xbcloud>`
+   utility used for downloading and uploading full or part of |xbstream|
+   archive from/to cloud.
 
-It is possible to use the |xtrabackup| binary alone, however, the recommend way is using it through the |innobackupex| wrapper script and let it execute |xtrabackup| for you. It might be helpful to first learn :doc:`how to use innobackupex <innobackupex/innobackupex_script>`, and then learn  :doc:`how to use xtrabackup <xtrabackup_bin/xtrabackup_binary>` for having a better low-level understanding or control of the tool if needed.
+After |Percona XtraBackup| 2.3 release the recommend way to take the backup is
+using the |xtrabackup| script. More information on script options can be found
+in :doc:`how to use xtrabackup <xtrabackup_bin/xtrabackup_binary>`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,7 @@
 
 Percona is glad to announce the release of Percona XtraBackup 1.6.4 on 19 December, 2011 (Downloads are available `here <http://www.percona.com/downloads/XtraBackup/XtraBackup-1.6.4/>`_ and from the :doc:`Percona Software Repositories </installation>`).
 
-This release is purely composed of bug fixes and is the current stable release of |Percona| |Xtrabackup|.
+This release is purely composed of bug fixes and is the current stable release of |Percona| |XtraBackup|.
 
 In this release we now compile the |xtrabackup| binary against more recent MySQL and Percona Server versions. We now build against: MySQL 5.1.59, MySQL 5.5.17, Percona Server 5.1.59-13.0 and Percona Server 5.5.16-22.0 and get all the InnoDB bug fixes each of these releases contain. Using `xtrabackup` to back up older MySQL or Percona Server releases is still supported.
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst	2017-02-27 07:47:02.000000000 +0000
@@ -34,7 +34,7 @@
 
  Fixed couple of warnings found in |innobackupex| when all warnings have been made ``FATAL``. Bug fixed :bug:`1116177`.
 
- If there are thousands of tables and slow IO then |Xtrabackup| can spend a lot of time opening all the tablespaces. Optimization has been implemented and |Percona XtraBackup| now avoids loading non-relevant tablespaces when partial backup is being taken which speeds up the backup process. Bug fixed :bug:`1130145`.
+ If there are thousands of tables and slow IO then |xtrabackup| can spend a lot of time opening all the tablespaces. Optimization has been implemented and |Percona XtraBackup| now avoids loading non-relevant tablespaces when partial backup is being taken which speeds up the backup process. Bug fixed :bug:`1130145`.
 
  |Percona XtraBackup| didn't initialize per-thread data in the log copying thread which could cause |Percona XtraBackup| to crash. Bug fixed :bug:`1166888`.
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst	2017-02-27 07:47:02.000000000 +0000
@@ -11,7 +11,7 @@
 New features
 ------------
 
- |Percona Xtrabackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space.
+ |Percona XtraBackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space.
 
  |Percona XtraBackup| has implemented :ref:`encrypted_backups_ibk`. This feature can be used to encrypt/decrypt both local and streamed backups in order to add another layer of protection to the backups.
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst	2017-02-27 07:47:02.000000000 +0000
@@ -9,7 +9,7 @@
 New features
 ------------
 
- |Percona Xtrabackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space. GA release now contains new :option:`innobackupex --rebuild-threads` that can be used to specify the number of threads started by XtraBackup when rebuilding secondary indexes on ``innobackupex --apply-log --rebuild-indexes``. This allows parallel processing of individual tables when rebuilding the index.  
+ |Percona XtraBackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space. GA release now contains new :option:`innobackupex --rebuild-threads` that can be used to specify the number of threads started by XtraBackup when rebuilding secondary indexes on ``innobackupex --apply-log --rebuild-indexes``. This allows parallel processing of individual tables when rebuilding the index.  
  
  |Percona XtraBackup| has implemented :ref:`encrypted_backups_ibk`. This feature can be used to encrypt/decrypt both local and streamed backups in order to add another layer of protection to the backups.
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,7 @@
 
 Percona is glad to announce the release of |Percona XtraBackup| 2.1.3 on May 22nd 2013. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/XtraBackup-2.1.3/>`_ and :doc:`Percona Software Repositories </installation>`. 
 
-This release fixes a high priority bug. It's advised to upgrade your latest 2.1 version to 2.1.3 if you're using the |Percona Xtrabackup| with |Percona XtraDB Cluster|. This release is the latest stable release in the 2.1 series.
+This release fixes a high priority bug. It's advised to upgrade your latest 2.1 version to 2.1.3 if you're using the |Percona XtraBackup| with |Percona XtraDB Cluster|. This release is the latest stable release in the 2.1 series.
 
 Bugs Fixed
 ----------
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.10.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.10.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.10.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.10.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,42 @@
+===========================
+|Percona XtraBackup| 2.2.10
+===========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.10 on
+March 31st 2015. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/XtraBackup-2.2.10/>`_ and from
+:ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+Bugs Fixed
+----------
+
+ Decrypting backup with the wrong key would make the backup unusable and
+ unrecoverable. |innobackupex| doesn't automatically delete the :file:`*.qp`
+ and :file:`.xbcrypt` files anymore, after :option:`innobackupex --decrypt`
+ and :option:`innobackupex --decompress` are used. Bug fixed :bug:`1413044`.
+
+ `XtraDB Changed Page Tracking
+ <http://www.percona.com/doc/percona-server/5.6/management/changed_page_tracking.html>`_
+ wasn't working with |innobackupex|. Bug fixed :bug:`1436793`.
+
+ Fixed |Percona XtraBackup| assertion caused by dirty pages remaining in the
+ buffer pool after the log was fully applied. Bug fixed :bug:`1368846`.
+
+ Backup will not be prepared and |innobackupex| will stop with an error if the
+ transaction log file is corrupted and it wasn't applied to the intended LSN.
+ Previously this was showing only as a warning. Bug fixed :bug:`1414221`.
+
+ New status ``log-applied`` is introduced for backup prepared with
+ :option:`innobackupex --redo-only` to avoid making the backup unusable by
+ preparing full or incremental backup without :option:`--redo-only` and then
+ applying next incremental on top of it. Incremental backup now can be applied
+ only to backup in ``log-applied`` state, but not to ``full-prepared`` as it
+ was earlier. Bug fixed :bug:`1436790`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.10 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.10>`_ at Launchpad.
+Bugs can be reported on the `launchpad bug tracker
+<https://bugs.launchpad.net/percona-xtrabackup/+filebug>`_.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.11.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.11.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.11.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.11.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,57 @@
+===========================
+|Percona XtraBackup| 2.2.11
+===========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.11 on May
+28th 2015. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/XtraBackup-2.2.11/>`_ and from
+:ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+New Features
+------------
+
+ |Percona XtraBackup| has been rebased on |MySQL| 5.6.24.
+
+Bugs Fixed
+----------
+
+ Version check would crash |innobackupex| and abort the backup on *CentOS* 5.
+ Bug fixed :bug:`1255451`.
+
+ |Percona XtraBackup| could crash when preparing the backup taken on
+ |MySQL|/|Percona Server| 5.5 if there were open temporary tables during the
+ backup. Bug fixed :bug:`1399471` (*Fungo Wang*).
+
+ |Percona XtraBackup| would fail to prepare the backup if the
+ :file:`xtrabackup_logfile` was lager than 512GB. Bug fixed :bug:`1425269`.
+
+ Fix for bug :bug:`1403237` was incomplete, due to setting wrong offset, last
+ copied batch of log records was copied from wrong location. Bug fixed
+ :bug:`1448447`.
+
+ |Percona XtraBackup| now executes an extra ``FLUSH TABLES`` before executing
+ ``FLUSH TABLES WITH READ LOCK`` to potentially lower the impact from ``FLUSH
+ TABLES WITH READ LOCK``. Bug fixed :bug:`1277403`.
+
+ Regression introduced by fixing :bug:`1436793` in |Percona XtraBackup| 2.2.10
+ caused an error when taking an incremental backup from *MariaDB* 10. Bug fixed
+ :bug:`1444541`.
+
+ |Percona XtraBackup| now prints and stores the file based binlog coordinates
+ in :file:`xtrabackup_binlog_info` even though GTID is enabled. Bug fixed
+ :bug:`1449834`.
+
+ |Percona XtraBackup| doesn't print warnings anymore during the prepare phase
+ about missing tables when a filtering option (:option:`--databases`,
+ :option:`--tables`, etc.) is provided. Bug fixed :bug:`1454815` (*Davi
+ Arnaut*).
+
+Other bugs fixed: :bug:`1415191`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.11 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.11>`_ at Launchpad.
+Bugs can be reported on the `launchpad bug tracker
+<https://bugs.launchpad.net/percona-xtrabackup/+filebug>`_.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.12.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.12.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.12.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.12.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,57 @@
+===========================
+|Percona XtraBackup| 2.2.12
+===========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.12 on
+August 3rd 2015. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/XtraBackup-2.2.12/>`_ and
+from :ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+Bugs Fixed
+----------
+
+ |Percona XtraBackup| would segfault during the prepare phase of certain FTS
+ pages. Bug fixed :bug:`1460138`.
+
+ Fixed compilation error due to missing dependency caused by the upstream bug
+ :mysqlbug:`77226`. Bug fixed :bug:`1461129`.
+
+ Regression introduced by fixing a bug :bug:`1403237` in |Percona XtraBackup|
+ 2.2.8 could cause |xtrabackup| to read a redo log from incorrect offset which
+ would cause an assertion. Bug fixed :bug:`1464608`.
+
+ Fixed uninitialized ``current_thd`` thread-local variable. This also
+ completely fixes :bug:`1415191`. Bug fixed :bug:`1467574`.
+
+ After the release of |Percona XtraBackup| 2.2.11, |innobackupex| issues a
+ ``FLUSH TABLE`` before running the ``FLUSH TABLES WITH READ LOCK``. While it
+ will help the backups in some situation, it also implies that the ``FLUSH
+ TABLE`` will be written to the binary log. On *MariaDB* 10.0 with GTID
+ enabled, when backup was taken on the slave, this altered the GTID of that
+ slave and |Percona XtraBackup| didn't see the correct GTID anymore. Bug fixed
+ :bug:`1466446` (*Julien Pivotto*).
+
+ RPM compilation of |Percona XtraBackup| was still requiring ``bzr``. Bug fixed
+ :bug:`1466888` (*Julien Pivotto*).
+
+ Compiling |Percona XtraBackup| RPMs with ``XB_VERSION_EXTRA`` option would
+ create an incorrect RPM version. Bug fixed :bug:`1467424` (*Julien Pivotto*).
+
+ |Percona XtraBackup| would complete successfully even when redo log wasn't
+ copied completely. This means that backup were considered successful even when
+ they were corrupt. Bug fixed :bug:`1470847`.
+
+ In rare cases when there are two or more tablespaces with the same ID in the
+ data directory, |xtrabackup| picks up the first one by lexical order, which
+ could lead to losing the correct table. Bug fixed :bug:`1475487`.
+
+ |Percona XtraBackup| was missing ``revision_id`` in binaries. Bug fixed
+ :bug:`1394174`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.12 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.12>`_ at Launchpad.
+Bugs can be reported on the `launchpad bug tracker
+<https://bugs.launchpad.net/percona-xtrabackup/+filebug>`_.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.13.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.13.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.13.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.13.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,45 @@
+===========================
+|Percona XtraBackup| 2.2.13
+===========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.13 on
+October 22nd 2015. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/XtraBackup-2.2.13/>`_ and
+from :ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+.. note::
+
+  Package name has been changed from ``percona-xtrabackup`` to
+  ``percona-xtrabackup-22`` (``percona-xtrabackup`` now points to the latest
+  GA release 2.3.2).
+
+Bugs Fixed
+----------
+
+ Improved the detection when the log block that has the different number from
+ what is expected, was caused by log block not being flushed to position
+ xtrabackup is reading from or if it was caused by using incorrect last
+ checkpoint LSN offset in our calculations. Bug fixed :bug:`1497912`.
+
+ Fixed false positive error: ``The log was not applied to the intended LSN``
+ which was happening even when the redo log was applied correctly. Bug fixed
+ :bug:`1505017`.
+
+ :file:`xtrabackup_logfile` was not compressed when :option:`--compress` option
+ was used. Bug fixed :bug:`1242309`.
+
+ |innobackupex| wrote error message to ``STDOUT`` instead of ``STDIN`` which
+ broke xbstream and tar stream. Bug fixed :bug:`1503964`.
+
+ Incremental backups did not work with |MariaDB| below 10.1.6. Bug fixed
+ :bug:`1505865`.
+
+Other bugs fixed: :bug:`1493015`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.13 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.13>`_ at
+Launchpad. Bugs can be reported on the `launchpad bug tracker
+<https://bugs.launchpad.net/percona-xtrabackup/+filebug>`_.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,35 +1,58 @@
-=======================================
- |Percona XtraBackup| 2.2.1-alpha1
-=======================================
+=================================
+|Percona XtraBackup| 2.2.1-alpha1
+=================================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.1-alpha1 on
+March 28th 2014. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/2.2.1/>`_. This **ALPHA** release,
+will be available in :ref:`Debian experimental <debian_testing>` and
+:ref:`CentOS testing <yum_testing>` repositories.
+
+This is an **ALPHA** quality release and it is not intended for production. If
+you want a high quality, Generally Available release, the current Stable
+version should be used (currently 2.1.8 in the 2.1 series at the time of
+writing).
 
-Percona is glad to announce the release of |Percona XtraBackup| 2.2.1-alpha1 on March 28th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.1/>`_. This **ALPHA** release, will be available in :ref:`Debian experimental <debian_experimental>` and :ref:`CentOS testing <yum_testing>` repositories. 
-
-This is an **ALPHA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.8 in the 2.1 series at the time of writing).
-
-This release contains all of the features and bug fixes in :doc:`Percona XtraBackup 2.1.8 </release-notes/2.1/2.1.8>`, plus the following:
+This release contains all of the features and bug fixes in
+:doc:`Percona XtraBackup 2.1.8 </release-notes/2.1/2.1.8>`, plus the following:
 
 New features
 ------------
 
- |Percona XtraBackup| has removed the multiple binaries (``xtrabackup_56``, ``xtrabackup_55``, ``xtrabackup``) and now uses single ``xtrabackup`` binary instead for handling backups. Single binary implementation removed the requirement to download server source tarballs and removed different patches which resulted in cleaner code.
- 
- |Percona XtraBackup| source layout has been changed to implement the single binary. |Percona XtraBackup| code can now be found in :file:`storage/innobase/xtrabackup`.
+ |Percona XtraBackup| has removed the multiple binaries (``xtrabackup_56``,
+ ``xtrabackup_55``, ``xtrabackup``) and now uses single ``xtrabackup`` binary
+ instead for handling backups. Single binary implementation removed the
+ requirement to download server source tarballs and removed different patches
+ which resulted in cleaner code.
+
+ |Percona XtraBackup| source layout has been changed to implement the single
+ binary. |Percona XtraBackup| code can now be found in
+ :file:`storage/innobase/xtrabackup`.
+
+ |Percona XtraBackup| implemented support for `Backup Locks
+ <http://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_.
 
- |Percona XtraBackup| implemented support for `Backup Locks <http://www.percona.com/doc/percona-server/5.6/management/backup_locks.html#backup-locks>`_.
+ |Percona XtraBackup| can now store :ref:`backup history <storing_history>` on
+ the server itself in a special table created for that purpose.
 
- |Percona XtraBackup| can now store :ref:`backup history <storing_history>` on the server itself in a special table created for that purpose. 
+ ``innobackupex-1.5.1`` symlink has been removed, instead |innobackupex| binary
+ should be used.
 
- ``innobackupex-1.5.1`` symlink has been removed, instead |innobackupex| binary should be used.
-
- |Percona XtraBackup| has removed the ``build.sh`` script and it's now :ref:`built with CMake <compiling_xtrabackup>`. 
+ |Percona XtraBackup| has removed the ``build.sh`` script and it's now
+ :ref:`built with CMake <compiling_xtrabackup>`.
 
  |Percona XtraBackup| has been rebased on |MySQL| 5.6.16.
 
 Bugs Fixed
 ----------
 
- Information about tool version used to take the backup was added by implementing :ref:`backup history <storing_history>` feature. Bug fixed :bug:`1133017`.
- 
- If an XtraDB-based binary was used to a backup an |InnoDB| database, it will convert it to |XtraDB| by adding the ``XTRADB_1`` marker in the dictionary header page and by adding the ``SYS_STATS`` table. Bug fixed :bug:`988310`.
- 
-Other bugs fixed: :bug:`721690`, :bug:`1255899`, :bug:`1255901`, :bug:`1268300`, and :bug:`788316`.
+ Information about tool version used to take the backup was added by
+ implementing :ref:`backup history <storing_history>` feature. Bug fixed
+ :bug:`1133017`.
+
+ If an XtraDB-based binary was used to a backup an |InnoDB| database, it will
+ convert it to |XtraDB| by adding the ``XTRADB_1`` marker in the dictionary
+ header page and by adding the ``SYS_STATS`` table. Bug fixed :bug:`988310`.
+
+Other bugs fixed: :bug:`721690`, :bug:`1255899`, :bug:`1255901`,
+:bug:`1268300`, and :bug:`788316`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,10 +1,17 @@
-=======================================
- |Percona XtraBackup| 2.2.2-beta1
-=======================================
-
-Percona is glad to announce the release of |Percona XtraBackup| 2.2.2-beta1 on May 8th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.2/>`_. This **BETA** release will be available in :ref:`Debian experimental <debian_experimental>` and :ref:`CentOS testing <yum_testing>` repositories. 
-
-This is a **BETA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.9 in the 2.1 series at the time of writing).
+================================
+|Percona XtraBackup| 2.2.2-beta1
+================================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.2-beta1 on
+May 8th 2014. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/2.2.2/>`_. This **BETA** release
+will be available in :ref:`Debian experimental <debian_testing>` and
+:ref:`CentOS testing <yum_testing>` repositories.
+
+This is a **BETA** quality release and it is not intended for production. If
+you want a high quality, Generally Available release, the current Stable
+version should be used (currently 2.1.9 in the 2.1 series at the time of
+writing).
 
 New Features
 ------------
@@ -16,15 +23,31 @@
 Bugs Fixed
 ----------
 
- |Percona XtraBackup| couldn't be built with *Bison* 3.0. Bug fixed :bug:`1262439`.
-
- The xtrabackup binaries now recognize a new :file:`my.cnf` option, :option:`open_files_limit`. The effect is the same as for the server: it changes the maximum number of file descriptors available to the xtrabackup process. The actual limit depends on the platform and ``ulimit`` settings. Bug fixed :bug:`1183793`.
- 
- If a remote |InnoDB| tablespace got CREATEd or ALTERed during the backup, an attempt to prepare such a backup later would lead to |Percona XtraBackup| crash. Bug fixed :bug:`1291299`.
-
- Code in both |innobackupex| and |xtrabackup|, that was supposed to make sure no child processes are left running in case |innobackupex| got killed or failed with an error, relied on the fact the ``SIGTERM`` and ``SIGINT`` signals were not blocked by the xtrabackup process. However, both ``SIGTERM`` and ``SIGINT`` might be blocked by the process that had invoked |innobackupex|, for example, by the |Percona XtraDB Cluster| server processes doing an SST, in which case they were also blocked by the xtrabackup process, since the signal mask is inherited by child processes. Fixed by replacing ``SIGTERM`` in |innobackupex| and ``SIGINT`` in |xtrabackup| auto-termination with ``SIGKILL``. Bug fixed :bug:`1294782`.
-
-
-All of Percona's software is open-source and free, all the details of the release can be found in the `2.2.2-beta1 milestone <https://launchpad.net/percona-xtrabackup/+milestone/2.2.2-beta1>`_ at Launchpad.
-
+ |Percona XtraBackup| couldn't be built with *Bison* 3.0. Bug fixed
+ :bug:`1262439`.
 
+ The |xtrabackup| binaries now recognize a new :file:`my.cnf` option,
+ :option:`open_files_limit`. The effect is the same as for the server: it
+ changes the maximum number of file descriptors available to the xtrabackup
+ process. The actual limit depends on the platform and ``ulimit`` settings.
+ Bug fixed :bug:`1183793`.
+
+ If a remote |InnoDB| tablespace got CREATEd or ALTERed during the backup, an
+ attempt to prepare such a backup later would lead to |Percona XtraBackup|
+ crash. Bug fixed :bug:`1291299`.
+
+ Code in both |innobackupex| and |xtrabackup|, that was supposed to make sure
+ no child processes are left running in case |innobackupex| got killed or
+ failed with an error, relied on the fact the ``SIGTERM`` and ``SIGINT``
+ signals were not blocked by the xtrabackup process. However, both ``SIGTERM``
+ and ``SIGINT`` might be blocked by the process that had invoked
+ |innobackupex|, for example, by the |Percona XtraDB Cluster| server processes
+ doing an SST, in which case they were also blocked by the xtrabackup process,
+ since the signal mask is inherited by child processes. Fixed by replacing
+ ``SIGTERM`` in |innobackupex| and ``SIGINT`` in |xtrabackup| auto-termination
+ with ``SIGKILL``. Bug fixed :bug:`1294782`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.2-beta1 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.2-beta1>`_ at
+Launchpad.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.3.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.3.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.3.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.3.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,44 @@
+==========================
+|Percona XtraBackup| 2.2.3
+==========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.3 on June
+12th 2014. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/2.2.2/>`_ and from
+:ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the first GA (Generally Available) stable release in the 2.2
+series.
+
+Bugs Fixed
+----------
+
+ Fixed the |InnoDB| redo log incompatibility with 5.1/5.5 server and compressed
+ tables which was introduced by the upstream fix in |MySQL| 5.6.11 that could
+ make |InnoDB| crash on recovery when replaying redo logs created on earlier
+ versions. Bug fixed :bug:`1255476`.
+
+ |Percona XtraBackup| did not flush the |InnoDB| REDO log buffer before
+ finalizing the log copy. This would only become a problem when the binary log
+ coordinates were used after restoring from a backup: the actual data files
+ state after recovery could be inconsistent with the binary log coordinates.
+ Bug fixed :bug:`1320685`.
+
+ |innobackupex| now sets ``wsrep_causal_reads`` to ``0`` before executing
+ ``FLUSH TABLES WITH READ LOCK`` if the server is a member of the Galera
+ cluster. Bug fixed :bug:`1320441`.
+
+ :file:`storage/innobase/xtrabackup/CMakeLists.txt` now honors the
+ ``XB_DISTRIBUTION`` environment variable when configuring ``innobackupex.pl``
+ to |innobackupex|. Bug fixed :bug:`1320856`.
+
+ When `backup locks
+ <http://www.percona.com/doc/percona-server/5.6/management/backup_locks.html>`_
+ are used, ``xtrabackup_slave_info`` should be written under ``BINLOG`` lock
+ instead of ``TABLE`` lock. Bug fixed :bug:`1328532`.
+
+ Other bugs fixed: :bug:`1318540`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.3 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.3-ga>`_ at Launchpad.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.4.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.4.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.4.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.4.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,58 @@
+==========================
+|Percona XtraBackup| 2.2.4
+==========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.4 on
+September 12th 2014. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/2.2.4/>`_ and from
+:ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+New Features
+------------
+
+ |Percona XtraBackup| has implemented support for Galera GTID autorecovery.
+ |Percona XtraBackup| retrieves the GTID information, after backing up a server
+ with `backup locks
+ <http://www.percona.com/doc/percona-server/5.6/management/backup_locks.html>`_
+ support, from the |InnoDB| trx header on recovery and creates the
+ :file:`xtrabackup_galera_info` during that stage.
+
+Bugs Fixed
+----------
+
+ |Percona XtraBackup| is now built with system ``zlib`` library instead of the
+ older bundled one. Bug fixed :bug:`1108016`.
+
+ ``apt-get source`` was downloading older version of |Percona XtraBackup|. Bug
+ fixed :bug:`1363259`.
+
+ |innobackupex| would ignore the :option:`innobackupex --databases` without
+ :option:`innobackupex --stream` option and back up all the databases. Bug
+ fixed :bug:`569387`.
+
+ ``rsync`` package wasn't a dependency although it is required for the
+ :option:`innobackupex --rsync` option. Bug fixed :bug:`1259436`.
+
+ :option:`innobackupex --galera-info` was checking only for non-capitalized
+ ``wsrep_*`` status variables which was incompatible with *MariaDB Galera
+ Cluster* 10.0. Bug fixed :bug:`1306875`.
+
+ |Percona XtraBackup| now supports *MariaDB* GTID. Bugs fixed :bug:`1329539`
+ and :bug:`1326967` (*Nirbhay Choubey*).
+
+ |Percona XtraBackup| would crash trying to remove absent table from |InnoDB|
+ data dictionary while preparing a partial backup. Bug fixed :bug:`1340717`.
+
+ *MariaDB* 10.1 is now added to the list of supported servers. Bug fixed
+ :bug:`1364398`.
+
+ |Percona XtraBackup| would fail to restore (copy-back) tables that have
+ partitions with their own tablespace location. Bug fixed :bug:`1322658`.
+
+Other bugs fixed: :bug:`1333570`, :bug:`1326224`, and :bug:`1181171`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.4 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.4>`_ at Launchpad.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.5.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.5.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.5.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.5.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,64 @@
+==========================
+|Percona XtraBackup| 2.2.5
+==========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.5 on
+October 2nd 2014. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/2.2.5/>`_ and from
+:ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+New Features
+------------
+
+ |Percona XtraBackup| has been rebased on |MySQL| 5.6.21.
+
+Bugs Fixed
+----------
+
+ The fix for bug :bug:`1079700` introduced a problem for users with huge
+ numbers of |InnoDB| tablespaces, and the workaround of raising the open files
+ limits didn't work in all cases due to a limitation in the Linux kernel. A new
+ :option:`innobackupex --close-files` option has been implemented to close the
+ file handles once they are no longer accessed. **NOTE:** Using this option may
+ result in a broken backup if DDL is performed on |InnoDB| tables during the
+ backup procedure. Bug fixed :bug:`1222062`.
+
+ Fix for bug :bug:`1206309` introduced a regression in |Percona XtraBackup|
+ 2.2.0 which caused |Percona XtraBackup| to fail to copy redo logs in random
+ cases. Bug fixed :bug:`1365835`.
+
+ :option:`innobackupex --galera-info` didn't copy the last binary log file when
+ it was taking a backup from server where `backup locks
+ <http://www.percona.com/doc/percona-server/5.6/management/backup_locks.html>`_
+ are supported. Bug fixed :bug:`1368577`.
+
+ |xtrabackup| binary would accept arguments that were not options, which could
+ lead to unexpected results. Bug fixed :bug:`1367377`.
+
+ If |innobackupex| is run against |MySQL| 5.1 with built-in InnoDB, it will now
+ suggest using |Percona XtraBackup| 2.0 or upgrading to InnoDB plugin, rather
+ than just failing with the generic ``unsupported server version`` message. Bug
+ fixed :bug:`1335101`.
+
+ Using the (deprecated) ``log`` parameter in mysqld section would cause backups
+ to fail. Bug fixed :bug:`1347698`.
+
+ |Percona XtraBackup| now uses |MySQL| code to get the stack trace in case
+ |Percona XtraBackup| crashes with a segmentation fault or an assertion
+ failure. Bug fixed :bug:`766305`.
+
+ Attempt to use any of the following options without the
+ :option:`innobackupex --incremental` option now fails with an error message
+ rather than creates a full backup: :option:`innobackupex --incremental-lsn`,
+ :option:`innobackupex --incremental-basedir`,
+ :option:`innobackupex --incremental-history-name`,
+ :option:`innobackupex --incremental-history-uuid`. Bug fixed :bug:`1213778`.
+
+Other bugs fixed: :bug:`1367613`, :bug:`1368574`, :bug:`1370462`,
+:bug:`1371441`, :bug:`1373429`, :bug:`1373984`, and :bug:`1265070`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.5 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.5>`_ at Launchpad.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.6.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.6.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.6.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.6.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,67 @@
+==========================
+|Percona XtraBackup| 2.2.6
+==========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.6 on
+November 3rd 2014. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/2.2.6/>`_ and from
+:ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+New Features
+------------
+
+ |Percona XtraBackup| now reads server options from ``SHOW VARIABLES`` rather
+ than :file:`my.cnf` configuration file.
+
+ |Percona XtraBackup| now has more verbose output during initial table scan (it
+ will now print a diagnostic message before performing a tablespace scan, which
+ may take a long time on systems with large numbers of tablespaces) and before
+ starting a backup/apply-log/copy-back operation in innobackupex (it will now
+ print a diagnostic message with a timestamp to make it easier for users to get
+ duration of the operation.)
+
+Bugs Fixed
+----------
+
+ |innobackupex| didn't take the default datadir, which caused backups to fail
+ if the datadir wasn't specified in the :file:`my.cnf` configuration file. Bug
+ fixed :bug:`936934`.
+
+ |innobackupex| will now fail with an error when
+ :option:`innobackupex --slave-info` is used on  a multi-threaded non-GTID
+ slave, because ``Exec_Master_Log_Pos`` cannot be trusted for a multi-threaded
+ slave. Bug fixed :bug:`1372679`.
+
+ |InnoDB| log scanning failure (bug :mysqlbug:`60788`) would cause backups to
+ fail. Fixed by porting the fix from |MySQL| 5.7. Bug fixed :bug:`1375383`.
+
+ Options :option:`innobackupex --apply-log` and
+ :option:`innobackupex --decompress` weren't marked as mutually exclusive, ie.
+ if they were both specified, only :option:`innobackupex --decompress` would
+ work, which could lead to |MySQL| instance being started with an unprepared
+ backup. Fixed by making mutually exclusive categories of options: 1.
+ :option:`innobackupex --decompress`, :option:`innobackupex --decrypt`; 2.
+ :option:`innobackupex --copy-back`; 3. :option:`innobackupex --move-back`;
+ 4. :option:`innobackupex --apply-log`. Bug fixed :bug:`1376874`.
+
+ |innobackupex| wasn't creating directories specified in
+ :option:`innodb_data_home_dir` and :option:`innodb_log_group_home_dir` when
+ :option:`innobackupex --copy-back` option was used. Bug fixed :bug:`1382347`.
+
+ |Percona XtraBackup| now supports all option modifiers supported by upstream
+ MySQL: skip, disable, enable, maximum, loose. Bug fixed :bug:`664128`.
+
+ |Percona Xtrabackup| would fail to perform a full backup on |Percona Server|
+ 5.5 if :option:`innodb_log_file_size` variable wasn't set in the ``[mysqld]``
+ section of :file:`my.cnf`. Bug fixed :bug:`1334062`.
+
+Other bugs fixed: :bug:`1379905`, :bug:`1386013`, :bug:`1072695`,
+:bug:`1375241`, :bug:`1182841`, and :bug:`1343722`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.6 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.6>`_ at Launchpad.
+Bugs can be reported on the `launchpad bug tracker
+<https://bugs.launchpad.net/percona-xtrabackup/+filebug>`_.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.7.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.7.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.7.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.7.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,42 @@
+==========================
+|Percona XtraBackup| 2.2.7
+==========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.7 on
+December 10th 2014. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/2.2.7/>`_ and from
+:ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+Bugs Fixed
+----------
+
+* Non-default value for `innodb_log_block_size
+  <http://www.percona.com/doc/percona-server/5.6/scalability/innodb_io.html#innodb_log_block_size>`_
+  variable would cause assertion when preparing the backup. Bug fixed
+  :bug:`1391216`.
+
+* When |Percona XtraBackup| would run ``FLUSH ENGINE LOGS`` during the backup
+  process on GTID master, command was recorded to the slave's binary log as
+  well, which lead to inconsistency between master and slave. Fixed by adding
+  the ``NO_WRITE_TO_BINLOG`` clause to ``FLUSH ENGINE LOGS`` to avoid
+  interfering with binary log and inconsistency with coordinates. Bug fixed
+  :bug:`1394632`.
+
+* Exporting tables was inefficient when backup contained a large (and
+  unrelated) change buffer. Bug fixed :bug:`1366065` (*Davi Arnaut*).
+
+* |innobackupex| was printing the GTID even if the GTID mode was disabled which
+  could cause confusion since it wasn't incrementing. Now it prints only GTID
+  when GITD mode is enabled and when GTID mode is disabled it prints only
+  filename and position. |innobackupex| still prints GTID, filename and
+  positions if *MariaDB* server is being backed up. Bug fixed :bug:`1391041`.
+
+Other bugs fixed: :bug:`1386157`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.7 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.7>`_ at Launchpad.
+Bugs can be reported on the `launchpad bug tracker
+<https://bugs.launchpad.net/percona-xtrabackup/+filebug>`_.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.8.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.8.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.8.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.8.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,41 @@
+==========================
+|Percona XtraBackup| 2.2.8
+==========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.8 on
+January 14th 2015. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/XtraBackup-2.2.8/>`_ and from
+:ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+New Features
+------------
+
+ |Percona XtraBackup| has been rebased on |MySQL| 5.6.22.
+
+Bugs Fixed
+----------
+
+ Incremental backups would fail if the number of undo tablespaces
+ (`innodb_undo_tablespaces
+ <https://dev.mysql.com/doc/refman/5.6/en/innodb-parameters.html#sysvar_innodb_undo_tablespaces>`_)
+ was more than ``1``. This was caused by |innobackupex| removing the undo
+ tablespaces during the prepare phase. Bug fixed :bug:`1363234`.
+
+ Fixed multiple memory leaks detected by AddressSanitizer. Bug fixed
+ :bug:`1395143`.
+
+ |innobackupex| could fail when preparing backup that was taken from |Percona
+ Server| 5.5 with log files (``log_file_size``) bigger than ``4G``. The root
+ cause was that the last checkpoint LSN offset in log group is stored at
+ different offsets in ``ibdata1`` for |Percona Server| 5.5 and |MySQL| 5.6 when
+ the total size of log files is greater than 4G. Bug fixed :bug:`1403237`.
+
+ |Percona XtraBackup| out-of-source builds failed. Bug fixed :bug:`1402450`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.8 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.8>`_ at Launchpad.
+Bugs can be reported on the `launchpad bug tracker
+<https://bugs.launchpad.net/percona-xtrabackup/+filebug>`_.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.9.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.9.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.9.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.9.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,43 @@
+============================
+ |Percona XtraBackup| 2.2.9
+============================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.9 on
+February 17th 2015. Downloads are available from our download site `here
+<http://www.percona.com/downloads/XtraBackup/XtraBackup-2.2.9/>`_ and
+from :ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current stable release in the 2.2 series.
+
+Bugs Fixed
+----------
+
+ |Percona XtraBackup| was vulnerable to MITM attack which could allow
+ exfiltration of MySQL configuration information via
+ :option:`innobackupex --version-check` option. This vulnerability was logged
+ as `CVE 2015-1027
+ <http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2015-1027>`_. Bug fixed
+ :bug:`1408375`.
+
+ :file:`xtrabackup_galera_info` isn't overwritten during the Galera
+ auto-recovery. Bug fixed :bug:`1418584`.
+
+ |Percona XtraBackup| man pages are now included with binary packages. Bug
+ fixed :bug:`1156209`.
+
+ |Percona XtraBackup| now sets the maximum supported session value for
+ :option:`lock_wait_timeout` to prevent unnecessary timeouts when the global
+ value is changed from the default. Bug fixed :bug:`1410339`.
+
+ New option :option:`innobackupex --backup-locks`, enabled by default, has been
+ implemented to control if `backup locks
+ <http://www.percona.com/doc/percona-server/5.6/management/backup_locks.html>`_
+ will be used even if they are supported by the server. To disable backup locks
+ |innobackupex| should be run with :option:`innobackupex --no-backup-locks`
+ option. Bug fixed :bug:`1418820`.
+
+All of Percona's software is open-source and free, all the details of the
+release can be found in the `2.2.9 milestone
+<https://launchpad.net/percona-xtrabackup/+milestone/2.2.9>`_ at Launchpad.
+Bugs can be reported on the `launchpad bug tracker
+<https://bugs.launchpad.net/percona-xtrabackup/+filebug>`_.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,28 @@
+===================================
+ |Percona XtraBackup| 2.3.0-alpha1
+===================================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.3.0-alpha1 on
+October 30th 2014. Downloads are available from our download site `here
+<http://www.percona.com/downloads/TESTING/XtraBackup/xtrabackup-2.3.0alpha1/>`_.
+This **ALPHA** release, will be available in :ref:`Debian testing
+<debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories.
+
+This is an **ALPHA** quality release and it is not intended for production. If
+you want a high quality, Generally Available release, the current Stable
+version should be used (currently 2.2.5 in the 2.2 series at the time of
+writing).
+
+New features
+------------
+
+ |Percona XtraBackup| has implemented new tool, :ref:`xbcloud_binary`, which
+ can be used to upload/download full or part of |xbstream| archive from/to
+ cloud.
+
+.. note::
+
+   In order to sucessfully install Percona Xtrabackup 2.3.0-alpha1 on *CentOS*,
+   ``libev.so.4`` package will need to be installed first. ``libev.so.4``
+   package can be installed from the `EPEL
+   <https://fedoraproject.org/wiki/EPEL>`_ repositories.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.1-beta1.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.1-beta1.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.1-beta1.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.1-beta1.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,66 @@
+==================================
+ |Percona XtraBackup| 2.3.1-beta1
+==================================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.3.1-beta1 on
+May 20th 2015. Downloads are available from our download site `here
+<http://www.percona.com/downloads/TESTING/XtraBackup/xtrabackup-2.3.1beta1/>`_.
+This **BETA** release, will be available in :ref:`Debian testing
+<debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories.
+
+This is an **BETA** quality release and it is not intended for production. If
+you want a high quality, Generally Available release, the current Stable
+version should be used (currently 2.2.10 in the 2.2 series at the time of
+writing).
+
+This release contains all of the features and bug fixes in :doc:`Percona
+XtraBackup 2.2.10 </release-notes/2.2/2.2.10>`, plus the following:
+
+New features
+------------
+
+ |innobackupex| script has been rewritten in C and it's set as the symlink for
+ |xtrabackup|. |innobackupex| still supports all features and syntax as 2.2
+ version did, but it is now deprecated and will be removed in next major
+ release. Syntax for new features will not be added to the |innobackupex|, only
+ to the |xtrabackup|. |xtrabackup| now also copies *MyISAM* tables and supports
+ every feature of |innobackupex|. Syntax for features previously unique to
+ |innobackupex| (option names and allowed values) remains the same for
+ |xtrabackup|.
+
+ |Percona XtraBackup| can now read swift parameters from a `[xbcloud]` section
+ from the :file:`.my.cnf` file in the users home directory or alternatively
+ from the global configuration file:`/etc/my.cnf`. This makes it more
+ convenient to use and avoids passing the sensitive data, such as
+ :option:`--swift-key`, on the command line.
+
+ |Percona XtraBackup| now supports different :ref:`authentication options
+ <swift_auth>` for Swift.
+
+ |Percona XtraBackup| now supports partial download of the cloud backup.
+
+ Options: :option:`--lock-wait-query-type`, :option:`--lock-wait-threshold` and
+ :option:`--lock-wait-timeout` have been renamed to
+ :option:`innobackupex --ftwrl-wait-query-type`,
+ :option:`innobackupex --ftwrl-wait-threshold` and
+ :option:`innobackupex --ftwrl-wait-timeout` respectively.
+
+Bugs fixed
+----------
+
+ |innobackupex| didn't work correctly when credentials were specified in
+ :file:`.mylogin.cnf`. Bug fixed :bug:`1388122`.
+
+ :option:`--decrypt` and :option:`--decompress` options didn't work with
+ |xtrabackup| binary. Bug fixed :bug:`1452307`.
+
+ |Percona XtraBackup| now executes an extra ``FLUSH TABLES`` before executing
+ ``FLUSH TABLES WITH READ LOCK`` to potentially lower the impact from ``FLUSH
+ TABLES WITH READ LOCK``. Bug fixed :bug:`1277403`.
+
+ |innobackupex| didn't read user, password options from :file:`~/.my.cnf` file.
+ Bug fixed :bug:`1092235`.
+
+ |innobackupex| was always reporting the original version of the ``innobackup``
+ script from *InnoDB Hot Backup*. Bug fixed :bug:`1092380`.
+
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.2.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.2.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.2.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.2.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,54 @@
+============================
+ |Percona XtraBackup| 2.3.2
+============================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.3.2 on
+October 22nd 2015. Downloads are available from our `download site
+<http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.3.2/>`_ and
+from :ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the first GA (Generally Available) stable release in the 2.3
+series.
+
+This release contains all the features and bug fixes in :doc:`Percona
+XtraBackup 2.2.13 </release-notes/2.2/2.2.13>`, plus the following:
+
+New Features
+------------
+
+ |Percona XtraBackup| 2.3 command line syntax has been changed to follow
+ `command-line-option guidelines
+ <http://dev.mysql.com/doc/refman/5.6/en/command-line-options.html>`_.
+
+Bugs fixed
+----------
+
+ :ref:`xbcloud <xbcloud_binary>` contained password in the processlist which
+ would allow an unprivileged user privileged access to the swift service, and
+ more likely the entire OpenStack deploy for which keystone is providing the
+ identity service. Bug fixed :bug:`1447610`.
+
+ |Percona XtraBackup| 2.3 didn't set :option:`wait_timeout` session variable in
+ order to prevent server to kill the connection while it is copying data files.
+ Bug fixed :bug:`1495367`.
+
+ :ref:`xbcloud <xbcloud_binary>` would fail to create a container with ``error:
+ curl_easy_perform() failed: Failed sending data to the peer``. Bug fixed
+ :bug:`1500508`.
+
+ In some cases streaming backup could be corrupted due to a broken pipe error,
+ particularly if error occurred when |xtrabackup| copied set of tiny files
+ (:file:`*.frm` or similar), but |xtrabackup| would not notice it and complete
+ successfully. Bug fixed :bug:`1452387`.
+
+ |xtrabackup| 2.3 now adds timestamps to the ``STDERR`` output. Bug fixed
+ :bug:`1454692`.
+
+ Stream decryption would fail if the encryption options were in :file:`my.cnf`
+ configuration file because they were ignored by |innobackupex|. Bug fixed
+ :bug:`1190335`.
+
+ Fixed broken out-of-source tree builds in 2.3 trunk. Bug fixed :bug:`1457016`.
+
+ |Percona XtraBackup| now supports :option:`--datadir` as a command line
+ option. Bug fixed :bug:`1042887`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.3.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.3.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.3.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.3.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,54 @@
+============================
+ |Percona XtraBackup| 2.3.3
+============================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.3.3 on
+December 17th 2015. Downloads are available from our `download site
+<http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.3.3/>`_ and
+from :ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current GA (Generally Available) stable release in the 2.3
+series.
+
+Bugs fixed
+----------
+
+ Database directories were not removed if ``DROP DATABASE`` happened during the
+ backup. Bug fixed :bug:`1461735`.
+
+ Backup would fail if :ref:`storing_history` feature was enabled and backup was
+ taken from server without binary log enabled. Bug fixed :bug:`1509812`.
+
+ |Percona XtraBackup| now fails with descriptive error message if
+ :option:`--defaults-extra-file` is not specified first. Bug fixed
+ :bug:`1511451`.
+
+ Backup would fail if :option:`--rsync` option was used without specifying
+ temporary folder. Bug fixed :bug:`1511701`.
+
+ Fixed |Percona XtraBackup| crash which happened when it was used for SST on
+ *MariaDB Galera Cluster* caused by double free of :option:`datadir`' variable.
+ Bug fixed :bug:`1512281`.
+
+ :option:`--move-back` did not respect the :option:`innodb_log_group_home_dir`
+ and :option:`innodb_data_home_dir` options which caused ``ib_logfiles`` and
+ data files not to be moved to correct location. Bug fixed :bug:`1512616`.
+
+ :file:`xtrabackup_binlog_info` was not updated correctly when applying
+ incremental backups. Bug fixed :bug:`1523687`.
+
+ When using a :option:`--defaults-file` option |Percona XtraBackup| would
+ complain about :option:`datadir` being mismatched if it wasn't explicitly set
+ in the defaults file. Bug fixed :bug:`1508448`.
+
+ Fixed build issues by adding missing check in ``cmake`` script for ``xxd``
+ presence. Bug fixed :bug:`1511267`.
+
+ |Percona Xtrabackup| would terminate backup process without error if
+ :option:`--slave-info` option was used on a server not running as a
+ replication slave. Bug fixed :bug:`1513520`.
+
+ |innobackupex| when used with :option:`--stream` option would create an empty
+ directory with a timestamp as a name. Bug fixed :bug:`1520569`.
+
+Other bugs fixed :bug:`1523728` and :bug:`1507238`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.4.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.4.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.4.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.4.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,35 @@
+============================
+ |Percona XtraBackup| 2.3.4
+============================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.3.4 on March
+17th 2016. Downloads are available from our `download site
+<http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.3.4/>`_ and
+from :ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current GA (Generally Available) stable release in the 2.3
+series.
+
+Bugs fixed
+----------
+
+ |Percona XtraBackup| didn't respect variables stored in :file:`backup-my.cnf`
+ unless it was specified. One needed to specify
+ ``--defaults-file=backup-my.cnf`` for options to be respected. Bug fixed
+ :bug:`1527081`.
+
+ |Percona XtraBackup| didn't abort the backup if :option:`innobackupex --rsync`
+ completed with error. Bug fixed :bug:`1537256`.
+
+ When backup was taken on *MariaDB* 10 with GTID enabled, |Percona XtraBackup|
+ didn't store ``gtid_slave_pos`` in :file:`xtrabackup_slave_info` but logged it
+ only to ``STDERR``. Bug fixed :bug:`1404484`.
+
+ |Percona XtraBackup| was silently skipping extra arguments. Bug fixed
+ :bug:`1533542` (*Fungo Wang*).
+
+ |Percona XtraBackup| refuses client connecting to server if it uses old
+ (pre-4.1.1) protocol. To disable this check in order to allow backing up
+ servers with legacy passwords still set, new
+ :option:`xtrabackup --skip-secure-auth` option has been implemented. Bug fixed
+ :bug:`1508450`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.5.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.5.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.5.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.5.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,46 @@
+============================
+ |Percona XtraBackup| 2.3.5
+============================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.3.5 on July
+8th 2016. Downloads are available from our `download site
+<http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.3.5/>`_ and
+from :ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current GA (Generally Available) stable release in the 2.3
+series.
+
+Bugs fixed
+==========
+
+ Backup process would fail if :option:`xtrabackup --throttle` option was used.
+ Bug fixed :bug:`1554235`.
+
+ :file:`.ibd` files for remote tablespaces were not copied back to original
+ location pointed by the :file:`.isl` files. Bug fixed :bug:`1555423`.
+
+ When called with insufficient parameters, like specifying the empty
+ :option:`--defaults-file` option, |Percona XtraBackup| could crash. Bug
+ fixed :bug:`1566228`.
+
+ Documentation states that the default value for
+ :option:`--ftwrl-wait-query-type` is ``all``, however it was ``update``.
+ Changed the default value to reflect the documentation. Bug fixed
+ :bug:`1566315`.
+
+ Free Software Foundation address in copyright notices was outdated. Bug fixed
+ :bug:`1222777`.
+
+ Backup process would fail if the ``datadir`` specified on the command-line was
+ not the same as one that is reported by the server. |Percona XtraBackup| now
+ allows the ``datadir`` from :file:`my.cnf` override the one from ``SHOW
+ VARIABLES``. |xtrabackup| will print a warning that they don't match, but
+ continue. Bug fixed :bug:`1526467`.
+
+ Backup process would fail on |MariaDB| if binary logs were in non-standard
+ directory. Bug fixed :bug:`1517629`.
+
+ Output of :option:`xtrabackup --slave-info` option was missing an apostrophe.
+ Bug fixed :bug:`1573371`.
+
+Other bugs fixed: :bug:`1599397`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.6.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.6.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.6.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.6.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,54 @@
+==========================
+|Percona XtraBackup| 2.3.6
+==========================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.3.6 on
+November 29th 2016. Downloads are available from our `download site
+<http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.3.6/>`_ and
+from :ref:`apt <apt_repo>` and :ref:`yum <yum_repo>` repositories.
+
+This release is the current GA (Generally Available) stable release in the 2.3
+series.
+
+New Features
+============
+
+ |Percona XtraBackup| now supports ``SHA256`` passwords. Using the ``SHA256``
+ algorithm requires either SSL encrypted connection, or using public
+ key encryption for password exchange which is only available when both
+ client and server are linked with OpenSSL.
+
+ |Percona XtraBackup| now supports `Command Options for Secure Connections
+ <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl-ca>`_.
+
+ **NOTE:** Due to |xbcrypt| format changes, backups encrypted with this
+ |Percona XtraBackup| version will not be recoverable by older versions.
+
+Bugs fixed
+==========
+
+ Fixed intermittent assertion failures that were happening when |Percona
+ XtraBackup| couldn't correctly identify server version. Bug fixed
+ :bug:`1568009`.
+
+ Safe slave backup algorithm performed too short delays between retries which
+ could cause backups to fail on a busy servers. Bug fixed :bug:`1624473`.
+
+ Fixed new compilation warnings with GCC 6. Bug fixed :bug:`1641612`.
+
+ |xbcrypt| was not setting the Initialization Vector (IV) correctly (and thus
+ is was not using an IV). This was causing the same ciphertext to be generated
+ across different runs (for the same message/same key). The IV provides the
+ extra randomness to ensure that the same ciphertext is not generated across
+ runs. Bug fixed :bug:`1643949`.
+
+ Backup would still succeed even if |xtrabackup| would fail to write the
+ metadata. Bug fixed :bug:`1623210`.
+
+ |xbcloud| now supports EMC ECS Swift API Authorization requests. Bugs fixed
+ :bug:`1638017` and :bug:`1638020` (*Txomin Barturen*).
+
+ |Percona XtraBackup| would fail to backup *MariaDB* 10.2 with the
+ ``unsupported server version`` error message. Bug fixed :bug:`1602842`.
+
+Other bugs fixed: :bug:`1639764` and :bug:`1639767`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/release-notes.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/release-notes.rst	2017-02-27 07:47:02.000000000 +0000
@@ -2,49 +2,105 @@
  |Percona XtraBackup| Release Notes
 ======================================
 
-Older releases
-==============
+
+|Percona XtraBackup| 2.3
+========================
 
 .. toctree::
    :maxdepth: 1
    :glob:
 
-   release-notes/1.3
-   release-notes/1.4
-   release-notes/1.5
+   release-notes/2.3/2.3.6
+   release-notes/2.3/2.3.5
+   release-notes/2.3/2.3.4
+   release-notes/2.3/2.3.3
+   release-notes/2.3/2.3.2
+   release-notes/2.3/2.3.1-beta1
+   release-notes/2.3/2.3.0-alpha1
 
-|Percona XtraBackup| 1.6 
-=========================
+|Percona XtraBackup| 2.2
+========================
 
 .. toctree::
    :maxdepth: 1
    :glob:
 
-   release-notes/1.6/*
+   release-notes/2.2/2.2.13
+   release-notes/2.2/2.2.12
+   release-notes/2.2/2.2.11
+   release-notes/2.2/2.2.10
+   release-notes/2.2/2.2.9
+   release-notes/2.2/2.2.8
+   release-notes/2.2/2.2.7
+   release-notes/2.2/2.2.6
+   release-notes/2.2/2.2.5
+   release-notes/2.2/2.2.4
+   release-notes/2.2/2.2.3
+   release-notes/2.2/2.2.2-beta1
+   release-notes/2.2/2.2.1-alpha1
 
-|Percona XtraBackup| 2.0 
-=========================
+|Percona XtraBackup| 2.1
+========================
 
 .. toctree::
    :maxdepth: 1
    :glob:
 
-   release-notes/2.0/*
+   release-notes/2.1/2.1.9
+   release-notes/2.1/2.1.8
+   release-notes/2.1/2.1.7
+   release-notes/2.1/2.1.6
+   release-notes/2.1/2.1.5
+   release-notes/2.1/2.1.4
+   release-notes/2.1/2.1.3
+   release-notes/2.1/2.1.2
+   release-notes/2.1/2.1.1
+   release-notes/2.1/2.1.0-rc1
+   release-notes/2.1/2.1.0-beta1
+   release-notes/2.1/2.1.0-alpha1
 
-Percona |XtraBackup| 2.1 
+|Percona XtraBackup| 2.0
 =========================
 
 .. toctree::
    :maxdepth: 1
    :glob:
 
-   release-notes/2.1/*
+   release-notes/2.0/2.0.8
+   release-notes/2.0/2.0.7
+   release-notes/2.0/2.0.6
+   release-notes/2.0/2.0.5
+   release-notes/2.0/2.0.4
+   release-notes/2.0/2.0.3
+   release-notes/2.0/2.0.2
+   release-notes/2.0/2.0.1
+   release-notes/2.0/2.0.0
+   release-notes/2.0/1.9.2
+   release-notes/2.0/1.9.1
+   release-notes/2.0/1.9.0
 
-Percona |XtraBackup| 2.2 
+|Percona XtraBackup| 1.6
 =========================
 
 .. toctree::
    :maxdepth: 1
    :glob:
 
-   release-notes/2.2/*
+   release-notes/1.6/1.6.7
+   release-notes/1.6/1.6.6
+   release-notes/1.6/1.6.5
+   release-notes/1.6/1.6.4
+   release-notes/1.6/1.6.3
+   release-notes/1.6/1.6.2
+   release-notes/1.6/1.6.0
+
+Older releases
+==============
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   release-notes/1.5
+   release-notes/1.4
+   release-notes/1.3
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/trademark-policy.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/trademark-policy.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/trademark-policy.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/trademark-policy.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,23 +1,69 @@
+.. _trademark-policy:
+
 ================
 Trademark Policy
 ================
 
-This Trademark Policy is to ensure that users of Percona-branded products or services know that what they receive has really been developed, approved, tested and maintained by Percona. Trademarks help to prevent confusion in the marketplace, by distinguishing one company's or person’s products and services from another's.
-
-Percona owns a number of marks, including but not limited to Percona, XtraDB, Percona XtraDB, XtraBackup, Percona XtraBackup, Percona Server, and Percona Live, plus the distinctive visual icons and logos associated with these marks. Both the unregistered and registered marks of Percona are protected.
-
-Use of any Percona trademark in the name, URL, or other identifying characteristic of any product, service, website, or other use is not permitted without Percona's written permission with the following three limited exceptions.
-
-*First*, you may use the appropriate Percona mark when making a nominative fair use reference to a bona fide Percona product.
-
-*Second*, when Percona has released a product under a version of the GNU General Public License ("GPL"), you may use the appropriate Percona mark when distributing a verbatim copy of that product in accordance with the terms and conditions of the GPL.
-
-*Third*, you may use the appropriate Percona mark to refer to a distribution of GPL-released  Percona software that has been modified with minor changes for the sole purpose of allowing the software to operate on an operating system or hardware platform for which Percona has not yet released the software, provided that those third party changes do not affect the behavior, functionality, features, design or performance of the software. Users who acquire this Percona-branded software receive substantially exact implementations of the Percona software.
-
-Percona reserves the right to revoke this authorization at any time in its sole discretion.  For example, if Percona believes that your modification is beyond the scope of the limited license granted in this Policy or that your use of the Percona mark is detrimental to Percona, Percona will revoke this authorization.  Upon revocation, you must immediately cease using the applicable Percona mark.  If you do not immediately cease using the Percona mark upon revocation, Percona may take action to protect its rights and interests in the Percona mark.  Percona does not grant any license to use any Percona mark for any other modified versions of Percona software; such use will require our prior written permission.
-
-Neither trademark law nor any of the exceptions set forth in this Trademark Policy permit you to truncate, modify or otherwise use any Percona mark as part of your own brand.  For example, if XYZ creates a modified version of the Percona Server, XYZ may not brand that modification as "XYZ Percona Server" or "Percona XYZ Server", even if that modification otherwise complies with the third exception noted above.
-
-In all cases, you must comply with applicable law, the underlying license, and this Trademark Policy, as amended from time to time.  For instance, any mention of Percona trademarks should include the full trademarked name, with proper spelling and capitalization, along with attribution of ownership to Percona LLC and/or its affiliates.  For example, the full proper name for XtraBackup is Percona XtraBackup. However, it is acceptable to omit the word "Percona" for brevity on the second and subsequent uses, where such omission does not cause confusion.
-
-In the event of doubt as to any of the conditions or exceptions outlined in this Trademark Policy, please contact trademarks@percona.com for assistance and we will do our very best to be helpful.
+This Trademark Policy is to ensure that users of Percona-branded products or
+services know that what they receive has really been developed, approved,
+tested and maintained by Percona. Trademarks help to prevent confusion in the
+marketplace, by distinguishing one company's or person’s products and
+services from another's.
+
+Percona owns a number of marks, including but not limited to Percona, XtraDB,
+Percona XtraDB, XtraBackup, Percona XtraBackup, Percona Server, and Percona
+Live, plus the distinctive visual icons and logos associated with these marks.
+Both the unregistered and registered marks of Percona are protected.
+
+Use of any Percona trademark in the name, URL, or other identifying
+characteristic of any product, service, website, or other use is not permitted
+without Percona's written permission with the following three limited
+exceptions.
+
+*First*, you may use the appropriate Percona mark when making a nominative fair
+use reference to a bona fide Percona product.
+
+*Second*, when Percona has released a product under a version of the GNU
+General Public License ("GPL"), you may use the appropriate Percona mark when
+distributing a verbatim copy of that product in accordance with the terms and
+conditions of the GPL.
+
+*Third*, you may use the appropriate Percona mark to refer to a distribution of
+GPL-released  Percona software that has been modified with minor changes for
+the sole purpose of allowing the software to operate on an operating system or
+hardware platform for which Percona has not yet released the software, provided
+that those third party changes do not affect the behavior, functionality,
+features, design or performance of the software. Users who acquire this
+Percona-branded software receive substantially exact implementations of the
+Percona software.
+
+Percona reserves the right to revoke this authorization at any time in its sole
+discretion. For example, if Percona believes that your modification is beyond
+the scope of the limited license granted in this Policy or that your use of the
+Percona mark is detrimental to Percona, Percona will revoke this authorization.
+Upon revocation, you must immediately cease using the applicable Percona mark.
+If you do not immediately cease using the Percona mark upon revocation, Percona
+may take action to protect its rights and interests in the Percona mark.
+Percona does not grant any license to use any Percona mark for any other
+modified versions of Percona software; such use will require our prior written
+permission.
+
+Neither trademark law nor any of the exceptions set forth in this Trademark
+Policy permit you to truncate, modify or otherwise use any Percona mark as part
+of your own brand. For example, if XYZ creates a modified version of the
+Percona Server, XYZ may not brand that modification as "XYZ Percona Server" or
+"Percona XYZ Server", even if that modification otherwise complies with the
+third exception noted above.
+
+In all cases, you must comply with applicable law, the underlying license, and
+this Trademark Policy, as amended from time to time. For instance, any mention
+of Percona trademarks should include the full trademarked name, with proper
+spelling and capitalization, along with attribution of ownership to Percona LLC
+and/or its affiliates. For example, the full proper name for XtraBackup is
+Percona XtraBackup. However, it is acceptable to omit the word "Percona" for
+brevity on the second and subsequent uses, where such omission does not cause
+confusion.
+
+In the event of doubt as to any of the conditions or exceptions outlined in
+this Trademark Policy, please contact trademarks@percona.com for assistance and
+we will do our very best to be helpful.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/using_xtrabackup/configuring.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/using_xtrabackup/configuring.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/using_xtrabackup/configuring.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/using_xtrabackup/configuring.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,50 @@
+.. _configuring:
+
+Configuring xtrabackup
+======================
+
+All of the |xtrabackup| configuration is done through options, which behave
+exactly like standard |MySQL| program options: they can be specified either at
+the command-line, or through a file such as :file:`/etc/my.cnf`.
+
+The |xtrabackup| binary reads the ``[mysqld]`` and ``[xtrabackup]`` sections
+from any configuration files, in that order. That is so that it can read its
+options from your existing |MySQL| installation, such as the :term:`datadir` or
+some of the |InnoDB| options. If you want to override these, just specify them
+in the ``[xtrabackup]`` section, and because it is read later, it will take
+precedence.
+
+You don't need to put any configuration in your :file:`my.cnf` if you don't
+want to. You can simply specify the options on the command-line. Normally, the
+only thing you might find convenient to place in the ``[xtrabackup]`` section
+of your :file:`my.cnf` file is the ``target_dir`` option to default the
+directory in which the backups will be placed, for example:
+
+.. code-block:: text
+
+  [xtrabackup]
+  target_dir = /data/backups/mysql/
+
+This manual will assume that you do not have any file-based configuration for
+|xtrabackup|, so it will always show command-line options being used
+explicitly. Please see the :ref:`option and variable reference
+<xbk_option_reference>` for details on all of the configuration options.
+
+The |xtrabackup| binary does not accept exactly the same syntax in the
+:file:`my.cnf` file as the :program:`mysqld` server binary does. For historical
+reasons, the :program:`mysqld` server binary accepts parameters with a
+``--set-variable=<variable>=<value>`` syntax, which |xtrabackup| does not
+understand. If your :file:`my.cnf` file has such configuration directives, you
+should rewrite them in the ``--variable=value`` syntax.
+
+System Configuration and NFS Volumes
+------------------------------------
+
+The |xtrabackup| tool requires no special configuration on most systems.
+However, the storage where the :option:`--target-dir` is located must behave
+properly when ``fsync()`` is called. In particular, we have noticed that NFS
+volumes not mounted with the ``sync`` option might not really sync the data. As
+a result, if you back up to an NFS volume mounted with the async option, and
+then try to prepare the backup from a different server that also mounts that
+volume, the data might appear to be corrupt. You can use the ``sync`` mount
+option to avoid this problem.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/using_xtrabackup/privileges.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/using_xtrabackup/privileges.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/using_xtrabackup/privileges.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/using_xtrabackup/privileges.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,130 @@
+.. _privileges:
+
+==================================
+ Connection and Privileges Needed
+==================================
+
+|Percona XtraBackup| needs to be able to connect to the database server and
+perform operations on the server and the :term:`datadir` when creating a
+backup, when preparing in some scenarios and when restoring it. In order to do
+so, there are privileges and permission requirements on its execution that
+must be fulfilled.
+
+Privileges refers to the operations that a system user is permitted to do in
+the database server. **They are set at the database server and only apply to
+users in the database server**.
+
+Permissions are those which permits a user to perform operations on the system,
+like reading, writing or executing on a certain directory or start/stop a
+system service. **They are set at a system level and only apply to system
+users**.
+
+Whether |xtrabackup| or |innobackupex| is used, there are two actors involved:
+the user invoking the program - *a system user* - and the user performing
+action in the database server - *a database user*. Note that these are
+different users in different places, even though they may have the same
+username.
+
+All the invocations of |innobackupex| and |xtrabackup| in this documentation
+assume that the system user has the appropriate permissions and you are
+providing the relevant options for connecting the database server - besides the
+options for the action to be performed - and the database user has adequate
+privileges.
+
+Connecting to the server
+========================
+
+The database user used to connect to the server and its password are specified
+by the :option:`--user` and :option:`--password` option:
+
+.. code-block:: bash
+
+  $ xtrabackup --user=DVADER --password=14MY0URF4TH3R --backup \
+    --target-dir=/data/bkps/
+  $ innobackupex --user=DBUSER --password=SECRET /path/to/backup/dir/
+  $ innobackupex --user=LUKE  --password=US3TH3F0RC3 --stream=tar ./ | bzip2 -
+
+If you don't use the :option:`--user` option, |Percona XtraBackup| will assume
+the database user whose name is the system user executing it.
+
+Other Connection Options
+------------------------
+
+According to your system, you may need to specify one or more of the following
+options to connect to the server:
+
+===========  ==================================================================
+Option       Description
+===========  ==================================================================
+--port       The port to use when connecting to the database server with
+             TCP/IP.
+--socket     The socket to use when connecting to the local database.
+--host       The host to use when connecting to the database server with
+             TCP/IP.
+===========  ==================================================================
+
+These options are passed to the :command:`mysql` child process without
+alteration, see :option:`mysql --help` for details.
+
+.. note::
+
+   In case of multiple server instances the correct connection parameters
+   (port, socket, host) must be specified in order for |xtrabackup| to talk to
+   the correct server.
+
+
+Permissions and Privileges Needed
+=================================
+
+Once connected to the server, in order to perform a backup you will need
+``READ``, ``WRITE`` and ``EXECUTE`` permissions at a filesystem level in the
+server's :term:`datadir`.
+
+The database user needs the following privileges on the tables/databases to be
+backed up:
+
+  * ``RELOAD`` and ``LOCK TABLES`` (unless the
+    :option:`--no-lock <innobackupex --no-lock>` option is specified) in order
+    to ``FLUSH TABLES WITH READ LOCK`` and ``FLUSH ENGINE LOGS`` prior to start
+    copying the files, and  ``LOCK TABLES FOR BACKUP`` and ``LOCK BINLOG FOR
+    BACKUP`` require this privilege when `Backup Locks
+    <http://www.percona.com/doc/percona-server/5.6/management/backup_locks.html>`_
+    are used,
+
+  * ``REPLICATION CLIENT`` in order to obtain the binary log position,
+
+  * ``CREATE TABLESPACE`` in order to import tables (see :ref:`imp_exp_ibk`),
+
+  * ``PROCESS`` in order to see all threads which are running on the server
+    (see :ref:`improved_ftwrl`),
+
+  * ``SUPER`` in order to start/stop the slave threads in a replication
+    environment, use `XtraDB Changed Page Tracking
+    <https://www.percona.com/doc/percona-server/5.6/management/changed_page_tracking.html>`_
+    for :ref:`xb_incremental` and for :ref:`improved_ftwrl`,
+
+  * ``CREATE`` privilege in order to create the
+    :ref:`PERCONA_SCHEMA.xtrabackup_history <xtrabackup_history>` database and
+    table,
+
+  * ``INSERT`` privilege in order to add history records to the
+    :ref:`PERCONA_SCHEMA.xtrabackup_history <xtrabackup_history>` table,
+
+  * ``SELECT`` privilege in order to use
+    :option:`innobackupex --incremental-history-name` or
+    :option:`innobackupex --incremental-history-uuid` in order for the feature
+    to look up the ``innodb_to_lsn`` values in the
+    :ref:`PERCONA_SCHEMA.xtrabackup_history <xtrabackup_history>` table.
+
+The explanation of when these are used can be found in
+:ref:`how_xtrabackup_works`.
+
+An SQL example of creating a database user with the minimum privileges required
+to full backups would be:
+
+.. code-block:: mysql
+
+  mysql> CREATE USER 'bkpuser'@'localhost' IDENTIFIED BY 's3cret';
+  mysql> GRANT RELOAD, LOCK TABLES, PROCESS, REPLICATION CLIENT ON *.* TO
+         'bkpuser'@'localhost';
+  mysql> FLUSH PRIVILEGES;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,261 @@
+.. _xbcloud_binary:
+
+======================
+ The xbcloud Binary
+======================
+
+.. note::
+
+   This feature implementation is considered **ALPHA** quality.
+
+|xbcloud| is a new tool which is part of the |Percona XtraBackup| 2.3.2
+release. The purpose of |xbcloud| is to download and upload full or part of
+|xbstream| archive from/to cloud. |xbcloud| will refuse to overwrite the backup
+with the same name.
+
+|xbcloud| stores each chunk as a separate object with name
+``backup_name/database/table.ibd.NNNNNNNNNNNNNNNNNNNN``, where ``NNN...`` is a
+0-padded serial number of chunk within file. Size of chunk produced by
+|xtrabackup| and |xbstream| changed to 10M.
+
+Version specific information
+----------------------------
+ * 2.3.0-alpha1 - Initial implementation
+ * 2.3.1-beta1 - Implemented ability to store *xbcloud* parameters in a
+   :file:`.cnf` file
+ * 2.3.1-beta1 - Implemented support different :ref:`authentication options
+   <swift_auth>` for Swift
+ * 2.3.1-beta1 - Implemented support for partial download of the cloud backups
+ * 2.3.1-beta1 - :option:`--swift-url` option has been renamed to
+   :option:`--swift-auth-url`
+
+Usage
+-----
+
+Backup:
+
+.. code-block:: bash
+
+ xtrabackup --backup --stream=xbstream --target-dir=/tmp | xbcloud \
+ put [options] <name>
+
+Following example shows how to make a full backup and upload it to Swift:
+
+.. code-block:: bash
+
+ xtrabackup --backup --stream=xbstream --extra-lsndir=/tmp --target-dir=/tmp | \
+ xbcloud put --storage=Swift \
+ --swift-container=test \
+ --swift-user=test:tester \
+ --swift-auth-url=http://192.168.8.80:8080/ \
+ --swift-key=testing \
+ --parallel=10 \
+ full_backup
+
+Restore:
+
+.. code-block:: bash
+
+ xbcloud get [options] <name> [<list-of-files>] | xbstream -x
+
+Following example shows how to fetch and restore the backup from Swift:
+
+.. code-block:: bash
+
+  xbcloud get --storage=Swift \
+  --swift-container=test \
+  --swift-user=test:tester \
+  --swift-auth-url=http://192.168.8.80:8080/ \
+  --swift-key=testing \
+  full_backup | xbstream -xv -C /tmp/downloaded_full
+
+  xtrabackup --prepare --target-dir=/tmp/downloaded_full
+  xtrabackup --copy-back --target-dir=/tmp/downloaded_full
+
+Incremental backups
+-------------------
+
+Taking incremental backups:
+
+First you need to make the full backup on which the incremental one is going to
+be based:
+
+.. code-block:: bash
+
+  xtrabackup --backup --stream=xbstream --extra-lsndir=/storage/backups/ \
+  --target-dir=/storage/backups/ | xbcloud put \
+  --storage=swift --swift-container=test_backup \
+  --swift-auth-version=2.0 --swift-user=admin \
+  --swift-tenant=admin --swift-password=xoxoxoxo \
+  --swift-auth-url=http://127.0.0.1:35357/ --parallel=10 \
+  full_backup
+
+Then you can make the incremental backup:
+
+.. code-block:: bash
+
+  xtrabackup --backup --incremental-basedir=/storage/backups \
+  --stream=xbstream --target-dir=/storage/inc_backup | xbcloud put \
+  --storage=swift --swift-container=test_backup \
+  --swift-auth-version=2.0 --swift-user=admin \
+  --swift-tenant=admin --swift-password=xoxoxoxo \
+  --swift-auth-url=http://127.0.0.1:35357/ --parallel=10 \
+  inc_backup
+
+Preparing incremental backups:
+
+To prepare the backup you first need to download the full backup:
+
+.. code-block:: bash
+
+  xbcloud get --swift-container=test_backup \
+  --swift-auth-version=2.0 --swift-user=admin \
+  --swift-tenant=admin --swift-password=xoxoxoxo \
+  --swift-auth-url=http://127.0.0.1:35357/ --parallel=10 \
+  full_backup | xbstream -xv -C /storage/downloaded_full
+
+Once you download full backup it should be prepared:
+
+.. code-block:: bash
+
+  xtrabackup --prepare --apply-log-only --target-dir=/storage/downloaded_full
+
+After the full backup has been prepared you can download the incremental
+backup:
+
+.. code-block:: bash
+
+  xbcloud get --swift-container=test_backup \
+  --swift-auth-version=2.0 --swift-user=admin \
+  --swift-tenant=admin --swift-password=xoxoxoxo \
+  --swift-auth-url=http://127.0.0.1:35357/ --parallel=10 \
+  inc_backup | xbstream -xv -C /storage/downloaded_inc
+
+Once the incremental backup has been downloaded you can prepare it by running:
+
+.. code-block:: bash
+
+  xtrabackup --prepare --apply-log-only \
+  --target-dir=/storage/downloaded_full \
+  --incremental-dir=/storage/downloaded_inc
+
+  xtrabackup --prepare --target-dir=/storage/downloaded_full
+
+Partial download of the cloud backup
+------------------------------------
+
+If you don't want to download entire backup to restore the specific database
+you can specify only tables you want to restore:
+
+.. code-block:: bash
+
+  xbcloud get --swift-container=test_backup
+  --swift-auth-version=2.0 --swift-user=admin \
+  --swift-tenant=admin --swift-password=xoxoxoxo \
+  --swift-auth-url=http://127.0.0.1:35357/ full_backup \
+  ibdata1 sakila/payment.ibd \
+  > /storage/partial/partial.xbs
+
+  xbstream -xv -C /storage/partial < /storage/partial/partial.xbs
+
+This command will download just ``ibdata1`` and ``sakila/payment.ibd`` table
+from the full backup.
+
+Command-line options
+--------------------
+
+|xbcloud| has following command line options:
+
+.. option:: --storage
+
+   Cloud storage option. Only support for Swift is currently implemented.
+   Default is ``Swift``
+
+.. option:: --swift-auth-url
+
+   URL of Swift cluster.
+
+.. option:: --swift-storage-url
+
+   xbcloud will try to get object-store URL for given region (if any specified)
+   from the keystone response. One can override that URL by passing
+   --swift-storage-url=URL argument.
+
+.. option:: --swift-user
+
+   Swift username (X-Auth-User, specific to Swift)
+
+.. option:: --swift-key
+
+   Swift key/password (X-Auth-Key, specific to Swift)
+
+.. option:: --swift-container
+
+   Container to backup into (specific to Swift)
+
+.. option:: --parallel=N
+
+   Maximum number of concurrent upload/download threads. Default is ``1``.
+
+.. option:: --cacert
+
+   Path to the file with CA certificates
+
+.. option:: --insecure
+
+   Do not verify servers certificate
+
+.. _swift_auth:
+
+Swift authentication options
+----------------------------
+
+Swift specification describe several `authentication options
+<http://docs.openstack.org/developer/swift/overview_auth.html>`_. |xbcloud| can
+authenticate against keystone with API version 2 and 3.
+
+.. option:: --swift-auth-version
+
+   Specifies the swift authentication version. Possible values are: ``1.0`` -
+   TempAuth, ``2.0`` - Keystone v2.0, and ``3`` - Keystone v3. Default value is
+   ``1.0``.
+
+For v2 additional options are:
+
+.. option:: --swift-tenant
+
+   Swift tenant name.
+
+.. option:: --swift-tenant-id
+
+   Swift tenant ID.
+
+.. option:: --swift-region
+
+   Swift endpoint region.
+
+.. option:: --swift-password
+
+   Swift password for the user.
+
+For v3 additional options are:
+
+.. option:: --swift-user-id
+
+   Swift user ID.
+
+.. option:: --swift-project
+
+   Swift project name.
+
+.. option:: --swift-project-id
+
+   Swift project ID.
+
+.. option:: --swift-domain
+
+   Swift domain name.
+
+.. option:: --swift-domain-id
+
+   Swift domain ID.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/choosing_binary.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/choosing_binary.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/choosing_binary.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/choosing_binary.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-.. _ibk-right-binary:
-
-===========================
- Choosing the Right Binary
-===========================
-
-The |xtrabackup| binary actually exists as four separate binaries:
-``xtrabackup``, ``xtrabackup_51``, ``xtrabackup_55`` and ``xtrabackup_56``. This is to ensure binary compatibility of |InnoDB| data files across releases. Which binary you should use depends on the version of the server that produced the data files you want to back up. It's important to use the correct binary. Whichever binary is used to :doc:`create a backup <creating_a_backup>` should also be the binary used :doc:`to prepare that backup <preparing_the_backup>`.
-
-Throughout the documentation, whenever the |xtrabackup| binary is mentioned, it's assumed that the name of the correct binary will be substituted. The following table summarizes which binary should be used with different server versions.
-
-==============================  ===================
-Server                          |xtrabackup| binary
-==============================  ===================
-MySQL 5.1.*                     ``xtrabackup_51``
-MySQL 5.1.* with InnoDB plugin  ``xtrabackup``
-MySQL 5.5.*                     ``xtrabackup_55``
-MySQL 5.6.*                     ``xtrabackup_56``
-MariaDB 5.1.*                   ``xtrabackup``
-MariaDB 5.2.*                   ``xtrabackup``
-MariaDB 5.3.*                   ``xtrabackup``
-MariaDB 5.5.*                   ``xtrabackup_55``
-MariaDB 10.0.*                  ``xtrabackup_56``
-Percona Server 5.0		``xtrabackup_51``
-Percona Server 5.1		``xtrabackup``
-Percona Server 5.5  		``xtrabackup_55``
-Percona Server 5.6              ``xtrabackup_56``
-==============================  ===================
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/configuring.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/configuring.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/configuring.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/configuring.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-Configuring xtrabackup
-======================
-
-All of the |xtrabackup| configuration is done through options, which behave exactly like standard |MySQL| program options: they can be specified either at the command-line, or through a file such as :file:`/etc/my.cnf`.
-
-The |xtrabackup| binary reads the ``[mysqld]`` and ``[xtrabackup]`` sections from any configuration files, in that order. That is so that it can read its options from your existing |MySQL| installation, such as the :term:`datadir` or some of the |InnoDB| options. If you want to override these, just specify them in the ``[xtrabackup]`` section, and because it is read later, it will take precedence.
-
-You don't need to put any configuration in your :file:`my.cnf` if you don't want to. You can simply specify the options on the command-line. Normally, the only thing you might find convenient to place in the ``[xtrabackup]`` section of your :file:`my.cnf` file is the ``target_dir`` option to default the directory in which the backups will be placed, for example,
-
-.. code-block:: guess
-
-  [xtrabackup]
-  target_dir = /data/backups/mysql/
-
-This manual will assume that you do not have any file-based configuration for |xtrabackup|, so it will always show command-line options being used explicitly. Please see the :doc:`option and variable reference <xbk_option_reference>` for details on all of the configuration options.
-
-The |xtrabackup| binary does not accept exactly the same syntax in the :file:`my.cnf` file as the :program:`mysqld` server binary does. For historical reasons, the :program:`mysqld` server binary accepts parameters with a ``--set-variable=<variable>=<value>`` syntax, which |xtrabackup| does not understand. If your :file:`my.cnf` file has such configuration directives, you should rewrite them in the ``--variable=value`` syntax.
-
-System Configuration and NFS Volumes
-------------------------------------
-
-The |xtrabackup| tool requires no special configuration on most systems. However, the storage where the :option:`--target-dir` is located must behave properly when ``fsync()`` is called. In particular, we have noticed that NFS volumes not mounted with the ``sync`` option might not really sync the data. As a result, if you back up to an NFS volume mounted with the async option, and then try to prepare the backup from a different server that also mounts that volume, the data might appear to be corrupt. You can use the ``sync`` mount option to avoid this problem.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-.. _xb_incremental_ps_56:
-
-===================================================
- Incremental Backups with Log Archiving for XtraDB
-===================================================
-
-|Percona Server| 5.6.11-60.3 has introduced a new feature called `Log Archiving for XtraDB <http://www.percona.com/doc/percona-server/5.6/management/log_archiving.html>`_. This feature makes copies of the old log files before they are overwritten, thus saving all the redo log for a write workload.
-
-When log archiving is enabled, it duplicates all redo log writes in a separate set of files in addition to normal redo log writing, creating new files as necessary.
-
-Archived log file name format is ``ib_log_archive_<startlsn>``. The start LSN marks the log sequence number when the archive was started. An example of the archived log files should look like this: :: 
-
- ib_log_archive_00000000010145937920
- ib_log_archive_00000000010196267520
-
-In order to enable this feature, variable :option:`innodb_log_archive` should be set to ``ON``. Once the feature has been enabled, directory specified with :option:`innodb_log_arch_dir` (|MySQL| datadir by default) will contain the archived log files. 
-
-Creating the Backup
-===================
-
-To make an incremental backup, begin with a full backup as usual. The |xtrabackup| binary writes a file called :file:`xtrabackup_checkpoints` into the backup's target directory. This file contains a line showing the ``to_lsn``, which is the database's :term:`LSN` at the end of the backup. :doc:`Create the full backup <creating_a_backup>` with a command such as the following: ::
-
-  xtrabackup_56 --backup --target-dir=/data/backup/ --datadir=/var/lib/mysql/
-
-If you want a usable full backup, use :doc:`innobackupex <../innobackupex/innobackupex_script>` since `xtrabackup` itself won't copy table definitions, triggers, or anything else that's not .ibd.
-
-If you look at the :file:`xtrabackup_checkpoints` file, you should see some contents similar to the following: ::
-
-  backup_type = full-backuped
-  from_lsn = 0
-  to_lsn = 1546908388
-  last_lsn = 1574827339
-  compact = 0
-
-Using the Log Archiving to prepare the backup
-=============================================
-
-In order to prepare the backup we need to specify the directory that contains the archived logs with the :option:`xtrabackup --innodb-log-arch-dir` option: ::
-
- xtrabackup_56 --prepare --target-dir=/data/backup/ --innodb-log-arch-dir=/data/archived-logs/
-
-This command will use archived logs, replay them against the backup folder and bring them up to date with the latest archived log.
-
-Output should look like this: ::
-
-  xtrabackup_56 version 2.1.5 for MySQL server 5.6.11 Linux (x86_64) (revision id: 680)
-  xtrabackup: cd to /tmp/backup-01/
-  xtrabackup: using the following InnoDB configuration for recovery:
-  xtrabackup:   innodb_data_home_dir = ./
-  xtrabackup:   innodb_data_file_path = ibdata1:10M:autoextend
-  xtrabackup:   innodb_log_group_home_dir = ./
-  xtrabackup:   innodb_log_files_in_group = 2
-  xtrabackup:   innodb_log_file_size = 50331648
-  InnoDB: Allocated tablespace 4, old maximum was 0
-  xtrabackup: using the following InnoDB configuration for recovery:
-  xtrabackup:   innodb_data_home_dir = ./
-  xtrabackup:   innodb_data_file_path = ibdata1:10M:autoextend
-  xtrabackup:   innodb_log_group_home_dir = ./
-  xtrabackup:   innodb_log_files_in_group = 2
-  xtrabackup:   innodb_log_file_size = 50331648
-  xtrabackup: Starting InnoDB instance for recovery.
-  xtrabackup: Using 104857600 bytes for buffer pool (set by --use-memory parameter)
-  InnoDB: The InnoDB memory heap is disabled
-  InnoDB: Mutexes and rw_locks use GCC atomic builtins
-  InnoDB: Compressed tables use zlib 1.2.3
-  InnoDB: Not using CPU crc32 instructions
-  InnoDB: Initializing buffer pool, size = 100.0M
-  InnoDB: Completed initialization of buffer pool
-  InnoDB: Setting log file ./ib_logfile101 size to 48 MB
-  InnoDB: Setting log file ./ib_logfile1 size to 48 MB
-  InnoDB: Renaming log file ./ib_logfile101 to ./ib_logfile0
-  InnoDB: New log files created, LSN=1627148
-  InnoDB:  Starting archive recovery from a backup...
-  InnoDB: Allocated tablespace 4, old maximum was 0
-  InnoDB: Opened archived log file /var/lib/mysql/ib_log_archive_00000000000000045568
-  InnoDB: Starting an apply batch of log records to the database...
-  InnoDB: Progress in percent: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 
-
-  ...
-
-  InnoDB: Apply batch completed
-  InnoDB: Starting an apply batch of log records to the database...
-  InnoDB: Progress in percent: 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 
-  InnoDB: Apply batch completed
-  InnoDB: 1 transaction(s) which must be rolled back or cleaned up
-  InnoDB: in total 5063 row operations to undo
-  InnoDB: Trx id counter is 4096
-
-  [notice (again)]
-  If you use binary log and don't use any hack of group commit,
-  the binary log position seems to be:
-
-  xtrabackup: starting shutdown with innodb_fast_shutdown = 1
-  InnoDB: Starting shutdown...
-  InnoDB: Shutdown completed; log sequence number 2013229561
-
-After this is completed successfully backup can be restored.
-
-You can check the :file:`xtrabackup_checkpoints` file and see that the backup_type has changed: ::
-
-   backup_type = full-prepared
-   from_lsn = 0
-   to_lsn = 1546908388
-   last_lsn = 1574827339
-   compact = 0
-
-.. note:: 
-
-   Archived logs can be applied to backup data several times, for example to decrease the backup size or time required for preparing the backup.
-
-Additional option is available if you need to restore a backup to specific point in time. By adding the :option:`xtrabackup --to-archived-lsn` option you can specify the LSN to which the backup will be prepared. ::
-
- xtrabackup_56 --prepare --target-dir=/data/backup/ --innodb-log-arch-dir=/data/archived-logs/ --to-archived-lsn=5536301566
-
-This will prepare the backup up to the specified Log Sequence Number.
- 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/limitation.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/limitation.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/limitation.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/limitation.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Limitations of xtrabackup
-=========================
-
-The ``xtrabackup`` binary has some limitations you should be aware of to ensure that your backups go smoothly and are recoverable.
-
-* If the ``xtrabackup_logfile`` is larger than 4GB, the ``--prepare`` step will fail on 32-bit versions of ``xtrabackup``.
-
-* ``xtrabackup`` does not currently create new InnoDB log files (``ib_logfile0``, etc) during the initial ``--prepare`` step. You must prepare the backup a second time to do this, if you wish.
-
-* ``xtrabackup`` copies only the InnoDB data and logs. It does not copy table definition files (``.frm`` files), MyISAM data, users, privileges, or any other portions of the overall database that lie outside of the InnoDB data. To back up this data, you need a wrapper script such as :doc:`innobackupex <../innobackupex/innobackupex_script>`.
-
-* ``xtrabackup`` doesn't understand the very old ``--set-variable`` ``my.cnf`` syntax that MySQL uses. See :doc:`configuring`.
-
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst	2017-02-27 07:47:02.000000000 +0000
@@ -2,7 +2,7 @@
 LRU dump backup
 ================
 
-This feature reduces the warm up time by restoring buffer pool state from :file:`ib_lru_dump` file after restart. |Percona Xtrabackup| discovers :file:`ib_lru_dump` and backs it up automatically.
+This feature reduces the warm up time by restoring buffer pool state from :file:`ib_lru_dump` file after restart. |Percona XtraBackup| discovers :file:`ib_lru_dump` and backs it up automatically.
 
 .. image:: /_static/lru_dump.png
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/partial_backups.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/partial_backups.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/partial_backups.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/partial_backups.rst	2017-02-27 07:47:02.000000000 +0000
@@ -2,7 +2,7 @@
  Partial Backups
 =================
 
-|xtrabackup| supports taking partial backups when the :term:`innodb_file_per_table` option is enabled. There are two ways to create partial backups: matching the tables' names with a regular expression or providing a list of them in a file.
+|xtrabackup| supports taking partial backups when the :term:`innodb_file_per_table` option is enabled. There are three ways to create partial backups: matching the tables' names with a regular expression, providing a list of them in a file or providing a list of databases.
 
 .. warning:: If any of the matched or listed tables is deleted during the backup, |xtrabackup| will fail.
 
@@ -28,9 +28,16 @@
 
 The ``--tables-file`` option specifies a file that can contain multiple table names, one table name per line in the file. Only the tables named in the file will be backed up. Names are matched exactly, case-sensitive, with no pattern or regular expression matching. The table names must be fully qualified, in ``databasename.tablename`` format. 
 
+.. code-block:: bash
+
   $ echo "mydatabase.mytable" > /tmp/tables.txt
   $ xtrabackup --backup --tables-file=/tmp/tables.txt 
 
+Using the :option:`--databases` and :option:`--databases-file` options
+======================================================================
+
+The ``--databases`` option accepts a space-separated list of the databases and tables to backup - in the ``databasename[.tablename]`` form. The ``--databases-file`` option specifies a file that can contain multiple databases and tables in the ``databasename[.tablename]`` form, one element name per line in the file. Only named databases and tables will be backed up. Names are matched exactly, case-sensitive, with no pattern or regular expression matching.
+
 Preparing the Backup
 ====================
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/preparing_the_backup.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/preparing_the_backup.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/preparing_the_backup.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/preparing_the_backup.rst	2017-02-27 07:47:02.000000000 +0000
@@ -6,9 +6,13 @@
 
 .. note:: 
 
-  For prepare "innobackupex --apply-log" should be used which will read |InnoDB| configuration from backup-my.cnf automatically, or --defaults-file=backup-my.cnf should be passed to the xtrabackup binary if it is used for preparing the backup. Otherwise it could lead to incorrect restore because xtrabackup could use wrong configuration options. 
+  For prepare :option:`innobackupex --apply-log` should be used which will read |InnoDB| configuration from :file:`backup-my.cnf` automatically, or ``--defaults-file=backup-my.cnf`` option should be passed to the xtrabackup binary if it is used for preparing the backup. Otherwise it could lead to incorrect restore because xtrabackup could use wrong configuration options. 
 
-You can run the prepare operation on any machine; it does not need to be on the originating server or the server to which you intend to restore. You can copy the backup to a utility server and prepare it there, for example. It is important, however, that you use the same version of the xtrabackup binary that you used to create the backup to do the prepare.
+You can run the prepare operation on any machine; it does not need to be on the originating server or the server to which you intend to restore. You can copy the backup to a utility server and prepare it there, for example. 
+
+.. note:: 
+
+  You can prepare a backup created with older |Percona XtraBackup| version with a newer one, but not vice versa. Preparing a backup on an unsupported server version should be done with the latest |Percona XtraBackup| release which supports that server version. For example, if one has a backup of MySQL 5.0 created with |Percona XtraBackup| 1.6, then preparing the backup with |Percona XtraBackup| 2.2 is not supported, because support for MySQL 5.0 was removed in 2.1. Instead, the latest release in the 2.0 series should be used.
 
 During the prepare operation, |xtrabackup| boots up a kind of modified InnoDB that's embedded inside it (the libraries it was linked against). The modifications are necessary to disable InnoDB's standard safety checks, such as complaining that the log file isn't the right size, which aren't appropriate for working with backups. These modifications are only for the xtrabackup binary; you don't need a modified |InnoDB| to use |xtrabackup| for your backups.
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/restoring_individual_tables.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/restoring_individual_tables.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/restoring_individual_tables.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/restoring_individual_tables.rst	2017-02-27 07:47:02.000000000 +0000
@@ -4,56 +4,95 @@
  Restoring Individual Tables
 =============================
 
-In server versions prior to 5.6, it is not possible to copy tables between servers by copying the files, even with :term:`innodb_file_per_table`. However, with |Percona XtraBackup|, you can export individual tables from any |InnoDB| database, and import them into |Percona Server| with |XtraDB| or |MySQL| 5.6. (The source doesn't have to be |XtraDB| or or |MySQL| 5.6, but the destination does.) This only works on individual :term:`.ibd` files, and cannot export a table that is not contained in its own :term:`.ibd` file.
+In server versions prior to 5.6, it is not possible to copy tables between
+servers by copying the files, even with :term:`innodb_file_per_table`. However,
+with |Percona XtraBackup|, you can export individual tables from any |InnoDB|
+database, and import them into |Percona Server| with |XtraDB| or |MySQL| 5.6.
+(The source doesn't have to be |XtraDB| or or |MySQL| 5.6, but the destination
+does.) This only works on individual :term:`.ibd` files, and cannot export a
+table that is not contained in its own :term:`.ibd` file.
 
-Let's see how to export and import the following table: ::
+Let's see how to export and import the following table:
+
+.. code-block:: mysql
 
   CREATE TABLE export_test (
     a int(11) DEFAULT NULL
   ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
-.. note:: 
+.. note::
 
-   If you're running |Percona Server| version older than 5.5.10-20.1, variable `innodb_expand_import <http://www.percona.com/doc/percona-server/5.5/management/innodb_expand_import.html#innodb_expand_import>`_ should be used instead of `innodb_import_table_from_xtrabackup <http://www.percona.com/doc/percona-server/5.5/management/innodb_expand_import.html#innodb_import_table_from_xtrabackup>`_.
+   If you're running |Percona Server| version older than 5.5.10-20.1, variable
+   `innodb_expand_import <http://www.percona.com/doc/percona-server/5.5/management/innodb_expand_import.html#innodb_expand_import>`_
+   should be used instead of `innodb_import_table_from_xtrabackup <http://www.percona.com/doc/percona-server/5.5/management/innodb_expand_import.html#innodb_import_table_from_xtrabackup>`_.
 
 Exporting the Table
 ===================
 
-This table should have been created in :term:`innodb_file_per_table` mode, so after taking a backup as usual with :option:`--backup`, the :term:`.ibd` file should exist in the target directory: ::
+This table should have been created in :term:`innodb_file_per_table` mode, so
+after taking a backup as usual with :option:`--backup`, the :term:`.ibd` file
+should exist in the target directory:
+
+.. code-block:: bash
 
   $ find /data/backups/mysql/ -name export_test.*
   /data/backups/mysql/test/export_test.ibd
 
-when you prepare the backup, add the extra parameter :option:`--export` to the command. Here is an example: ::
+when you prepare the backup, add the extra parameter :option:`--export` to the
+command. Here is an example:
+
+.. code-block:: bash
 
   $ xtrabackup --prepare --export --target-dir=/data/backups/mysql/
 
-Now you should see a :term:`.exp` file in the target directory: ::
+Now you should see a :term:`.exp` file in the target directory:
+
+.. code-block:: bash
 
   $ find /data/backups/mysql/ -name export_test.*
   /data/backups/mysql/test/export_test.exp
   /data/backups/mysql/test/export_test.ibd
   /data/backups/mysql/test/export_test.cfg
 
-These three files are all you need to import the table into a server running |Percona Server| with |XtraDB| or |MySQL| 5.6.
+These three files are all you need to import the table into a server running
+|Percona Server| with |XtraDB| or |MySQL| 5.6.
 
-.. note:: 
+.. note::
 
-  |MySQL| uses ``.cfg`` file which contains |InnoDB| dictionary dump in special format. This format is different from the ``.exp`` one which is used in |XtraDB| for the same purpose. Strictly speaking, a ``.cfg`` file is not required to import a tablespace to |MySQL| 5.6 or |Percona Server| 5.6. A tablespace will be imported successfully even if it is from another server, but |InnoDB| will do schema validation if the corresponding ``.cfg`` file is present in the same directory.
+  |MySQL| uses :file:`.cfg` file which contains |InnoDB| dictionary dump in
+  special format. This format is different from the :file:`.exp`` one which is
+  used in |XtraDB| for the same purpose. Strictly speaking, a :file:`.cfg``
+  file is not required to import a tablespace to |MySQL| 5.6 or |Percona
+  Server| 5.6. A tablespace will be imported successfully even if it is from
+  another server, but |InnoDB| will do schema validation if the corresponding
+  :file:`.cfg` file is present in the same directory.
 
 Importing the Table
 ===================
 
-On the destination server running |Percona Server| with |XtraDB| and `innodb_import_table_from_xtrabackup <http://www.percona.com/doc/percona-server/5.5/management/innodb_expand_import.html#innodb_import_table_from_xtrabackup>`_ option enabled, or |MySQL| 5.6, create a table with the same structure, and then perform the following steps:
+On the destination server running |Percona Server| with |XtraDB| and
+`innodb_import_table_from_xtrabackup <http://www.percona.com/doc/percona-server/5.5/management/innodb_expand_import.html#innodb_import_table_from_xtrabackup>`_
+option enabled, or |MySQL| 5.6, create a table with the same structure, and
+then perform the following steps:
 
 * Execute ``ALTER TABLE test.export_test DISCARD TABLESPACE;``
-  
-  * If you see the following message, then you must enable :term:`innodb_file_per_table` and create the table again: ``ERROR 1030 (HY000): Got error -1 from storage engine``
 
-* Copy the exported files to the ``test/`` subdirectory of the destination server's data directory 
+  * If you see the following message, then you must enable
+    :term:`innodb_file_per_table` and create the table again: ``ERROR 1030
+    (HY000): Got error -1 from storage engine``
+
+* Copy the exported files to the ``test/`` subdirectory of the destination
+  server's data directory
 
 * Execute ``ALTER TABLE test.export_test IMPORT TABLESPACE;``
 
-The table should now be imported, and you should be able to ``SELECT`` from it and see the imported data.
+The table should now be imported, and you should be able to ``SELECT`` from it
+and see the imported data.
 
+.. note::
 
+  Persistent statistics for imported tablespace will be empty until you run the
+  ``ANALYZE TABLE`` on the imported table. They will be empty because they are
+  stored in the system tables ``mysql.innodb_table_stats`` and
+  ``mysql.innodb_index_stats`` and they aren't updated by server during the
+  import. This is due to upstream bug :mysqlbug:`72368`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/working_with_binary_logs.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/working_with_binary_logs.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/working_with_binary_logs.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/working_with_binary_logs.rst	2017-02-27 07:47:02.000000000 +0000
@@ -8,7 +8,7 @@
 Finding the Binary Log Position
 -------------------------------
 
-You can find the binary log position corresponding to a backup performing the ``--prepare`` process. If your backup is from a server with binary logging enabled, ``xtrabackup`` will create a file named ``xtrabackup_binlog_info`` in the target directory. This file contains the binary log file name and position of the exact point in the binary log to which the prepared backup corresponds.
+You can find the binary log position corresponding to a backup once the backup has been prepared. This can be done by either running the |xtrabackup| with :option:`--prepare` or |innobackupex| with :option:`--apply-log` option. If your backup is from a server with binary logging enabled, |xtrabackup| will create a file named :file:`xtrabackup_binlog_info` in the target directory. This file contains the binary log file name and position of the exact point in the binary log to which the prepared backup corresponds.
 
 You will also see output similar to the following during the prepare stage: ::
 
@@ -36,6 +36,6 @@
 Setting Up a New Replication Slave
 ----------------------------------
 
-To set up a new replica, you should prepare the backup, and restore it to the data directory of your new replication slave. Then in your ``CHANGE MASTER TO`` command, use the binary log filename and position shown in the ``xtrabackup_binlog_info`` file to start replication.
+To set up a new replica, you should prepare the backup, and restore it to the data directory of your new replication slave. Then in your ``CHANGE MASTER TO`` command, use the binary log filename and position shown in the :file:`xtrabackup_binlog_info` file to start replication.
 
 A more detailed procedure is found in  :doc:`../howtos/setting_up_replication`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2017-02-27 07:47:02.000000000 +0000
@@ -1,89 +1,150 @@
+.. _xbk_option_reference:
+
 ============================================
  The :program:`xtrabackup` Option Reference
 ============================================
 
 .. program:: xtrabackup
 
-This page documents all of the command-line options for the :program:`xtrabackup` binary.
+This page documents all of the command-line options for the
+:program:`xtrabackup` binary.
 
 Options
 =======
 
 .. option:: --apply-log-only
 
-   This option causes only the redo stage to be performed when preparing a backup. It is very important for incremental backups.
+   This option causes only the redo stage to be performed when preparing a
+   backup. It is very important for incremental backups.
 
 .. option:: --backup
 
-   Make a backup and place it in :option:`--target-dir`. See :doc:`Creating a backup <creating_a_backup>`.
+   Make a backup and place it in :option:`--target-dir`. See :doc:`Creating a
+   backup <creating_a_backup>`.
+
+.. option:: --binlog-info
 
-.. option::  --compact     
+   This option controls how |Percona XtraBackup| should retrieve server's
+   binary log coordinates corresponding to the backup. Possible values are
+   ``OFF``, ``ON``, ``LOCKLESS`` and ``AUTO``. See the |Percona XtraBackup|
+   :ref:`lockless_bin-log`  manual page for more information.
+
+.. option:: --close-files
+
+   Do not keep files opened. When |xtrabackup| opens tablespace it normally
+   doesn't close its file handle in order to handle the DDL operations
+   correctly. However, if the number of tablespaces is really huge and can not
+   fit into any limit, there is an option to close file handles once they are
+   no longer accessed. |Percona XtraBackup| can produce inconsistent backups
+   with this option enabled. Use at your own risk.
+
+.. option::  --compact
 
    Create a compact backup by skipping secondary index pages.
 
-.. option:: --compress 
+.. option:: --compress
 
-   This option tells |xtrabackup| to compress all output data, including the transaction log file and meta data files, using the specified compression algorithm. The only currently supported algorithm is 'quicklz'. The resulting files have the qpress archive format, i.e. every `*.qp` file produced by xtrabackup is essentially a one-file qpress archive and can be extracted and uncompressed by the `qpress <http://www.quicklz.com/>`_  file archiver.
+   This option tells |xtrabackup| to compress all output data, including the
+   transaction log file and meta data files, using the specified compression
+   algorithm. The only currently supported algorithm is ``quicklz``. The
+   resulting files have the qpress archive format, i.e. every ``*.qp`` file
+   produced by xtrabackup is essentially a one-file qpress archive and can be
+   extracted and uncompressed by the `qpress <http://www.quicklz.com/>`_  file
+   archiver.
 
 .. option:: --compress-chunk-size=#
 
-   Size of working buffer(s) for compression threads in bytes. The default value is 64K.
+   Size of working buffer(s) for compression threads in bytes. The default
+   value is 64K.
 
-.. option:: --compress-threads=# 
+.. option:: --compress-threads=#
 
-   This option specifies the number of worker threads used by |xtrabackup| for parallel data compression. This option defaults to 1. Parallel compression ('--compress-threads') can be used together with parallel file copying ('--parallel'). For example, '--parallel=4 --compress --compress-threads=2' will create 4 IO threads that will read the data and pipe it to 2 compression threads. 
+   This option specifies the number of worker threads used by |xtrabackup| for
+   parallel data compression. This option defaults to ``1``. Parallel
+   compression (:option:`--compress-threads`) can be used together with
+   parallel file copying (:option:`--parallel`). For example, ``--parallel=4
+   --compress --compress-threads=2`` will create 4 IO threads that will read
+   the data and pipe it to 2 compression threads.
 
 .. option:: --create-ib-logfile
 
-   This option is not currently implemented. To create the InnoDB log files, you must prepare the backup twice at present.
+   This option is not currently implemented. To create the InnoDB log files,
+   you must prepare the backup twice at present.
 
 .. option:: --datadir=DIRECTORY
 
-   The source directory for the backup. This should be the same as the datadir for your MySQL server, so it should be read from :file:`my.cnf` if that exists; otherwise you must specify it on the command line.
+   The source directory for the backup. This should be the same as the datadir
+   for your |MySQL| server, so it should be read from :file:`my.cnf` if that
+   exists; otherwise you must specify it on the command line.
 
 .. option:: --defaults-extra-file=[MY.CNF]
 
-   Read this file after the global files are read. Must be given as the first option on the command-line.
+   Read this file after the global files are read. Must be given as the first
+   option on the command-line.
 
 .. option:: --defaults-file=[MY.CNF]
 
-   Only read default options from the given file. Must be given as the first option on the command-line. Must be a real file; it cannot be a symbolic link.
+   Only read default options from the given file. Must be given as the first
+   option on the command-line. Must be a real file; it cannot be a symbolic
+   link.
 
 .. option:: --defaults-group=GROUP-NAME
 
-   This option is to set the group which should be read from the configuration file. This is used by innobackupex if you use the `--defaults-group` option. It is needed for mysqld_multi deployments.
+   This option is to set the group which should be read from the configuration
+   file. This is used by |innobackupex| if you use the
+   :option:`--defaults-group` option. It is needed for ``mysqld_multi``
+   deployments.
 
 .. option:: --export
 
-   Create files necessary for exporting tables. See :doc:`Restoring Individual Tables <restoring_individual_tables>`.
+   Create files necessary for exporting tables. See :doc:`Restoring Individual
+   Tables <restoring_individual_tables>`.
 
 .. option:: --extra-lsndir=DIRECTORY
 
-   (for --backup): save an extra copy of the xtrabackup_checkpoints file in this directory.
+   (for --backup): save an extra copy of the :file:`xtrabackup_checkpoints`
+   file in this directory.
 
 .. option:: --incremental-basedir=DIRECTORY
 
-   When creating an incremental backup, this is the directory containing the full backup that is the base dataset for the incremental backups.
+   When creating an incremental backup, this is the directory containing the
+   full backup that is the base dataset for the incremental backups.
 
 .. option:: --incremental-dir=DIRECTORY
 
-   When preparing an incremental backup, this is the directory where the incremental backup is combined with the full backup to make a new full backup.
+   When preparing an incremental backup, this is the directory where the
+   incremental backup is combined with the full backup to make a new full
+   backup.
 
 .. option:: --incremental-force-scan
 
-   When creating an incremental backup, force a full scan of the data pages in the instance being backuped even if the complete changed page bitmap data is available.
+   When creating an incremental backup, force a full scan of the data pages in
+   the instance being backuped even if the complete changed page bitmap data is
+   available.
 
 .. option:: --incremental-lsn=LSN
 
-   When creating an incremental backup, you can specify the log sequence number (:term:`LSN`) instead of specifying :option:`--incremental-basedir`. For databases created by *MySQL* and *Percona Server* 5.0-series versions, specify the :term:`LSN` as two 32-bit integers in high:low format. For databases created in 5.1 and later, specify the :term:`LSN` as a single 64-bit integer.  ##ATTENTION##: If a wrong LSN value is specified (a user error which XtraBackup is unable to detect), the backup will be unusable. Be careful!
+   When creating an incremental backup, you can specify the log sequence number
+   (:term:`LSN`) instead of specifying :option:`--incremental-basedir`. For
+   databases created by *MySQL* and *Percona Server* 5.0-series versions,
+   specify the :term:`LSN` as two 32-bit integers in high:low format. For
+   databases created in 5.1 and later, specify the :term:`LSN` as a single
+   64-bit integer.  **ATTENTION**: If a wrong LSN value is specified (a user
+   error which |Percona XtraBackup| is unable to detect), the backup will be
+   unusable. Be careful!
 
 .. option:: --innodb-log-arch-dir=DIRECTORY
 
-   This option is used to specify the directory containing the archived logs. It can only be used with the :option:`xtrabackup --prepare` option.
+   This option is used to specify the directory containing the archived logs.
+   It can only be used with the :option:`xtrabackup --prepare` option.
 
 .. option:: --innodb-miscellaneous
 
-   There is a large group of InnoDB options that are normally read from the :term:`my.cnf` configuration file, so that xtrabackup boots up its embedded InnoDB in the same configuration as your current server. You normally do not need to specify these explicitly. These options have the same behavior that they have in InnoDB or XtraDB. They are as follows: ::
+   There is a large group of InnoDB options that are normally read from the
+   :file:`my.cnf` configuration file, so that |xtrabackup| boots up its
+   embedded InnoDB in the same configuration as your current server. You
+   normally do not need to specify these explicitly. These options have the
+   same behavior that they have in InnoDB or XtraDB. They are as follows: ::
 
     --innodb-adaptive-hash-index
     --innodb-additional-mem-pool-size
@@ -115,81 +176,212 @@
 
 .. option:: --log-copy-interval=#
 
-   This option specifies time interval between checks done by log copying thread in milliseconds (default is 1 second).
+   This option specifies time interval between checks done by log copying
+   thread in milliseconds (default is 1 second).
 
 .. option:: --log-stream
 
-   Makes xtrabackup not copy data files, and output the contents of the InnoDB log files to STDOUT until the :option:`--suspend-at-end` file is deleted. This option enables :option:`--suspend-at-end` automatically.
+   Makes |xtrabackup| not copy data files, and output the contents of the
+   InnoDB log files to ``STDOUT`` until the :option:`--suspend-at-end` file is
+   deleted. This option enables :option:`--suspend-at-end` automatically.
 
 .. option:: --no-defaults
 
-   Don't read default options from any option file. Must be given as the first option on the command-line.
+   Don't read default options from any option file. Must be given as the first
+   option on the command-line.
+
+.. option:: --databases=#
+
+   This option specifies the list of databases and tables that should be backed
+   up. The option accepts the list of the form ``"databasename1[.table_name1]
+   databasename2[.table_name2] . . ."``.
+
+.. option:: --databases-file=#
+
+   This option specifies the path to the file containing the list of databases
+   and tables that should be backed up. The file can contain the list elements
+   of the form ``databasename1[.table_name1]``, one element per line.
 
 .. option:: --parallel=#
 
-   This option specifies the number of threads to use to copy multiple data files concurrently when creating a backup. The default value is 1 (i.e., no concurrent transfer).
+   This option specifies the number of threads to use to copy multiple data
+   files concurrently when creating a backup. The default value is 1 (i.e., no
+   concurrent transfer).
+
+.. option:: --password=PASSWORD
+
+   This option specifies the password to use when connecting to the database.
+   It accepts a string argument. See mysql --help for details.
 
 .. option:: --prepare
 
-   Makes :program:`xtrabackup` perform recovery on a backup created with :option:`--backup`, so that it is ready to use. See :doc:`preparing a backup <preparing_the_backup>`.
+   Makes :program:`xtrabackup` perform recovery on a backup created with
+   :option:`--backup`, so that it is ready to use. See :doc:`preparing a backup
+   <preparing_the_backup>`.
 
 .. option:: --print-defaults
 
-   Print the program argument list and exit. Must be given as the first option on the command-line.
+   Print the program argument list and exit. Must be given as the first option
+   on the command-line.
 
 .. option:: --print-param
 
-   Makes :program:`xtrabackup` print out parameters that can be used for copying the data files back to their original locations to restore them. See :ref:`scripting-xtrabackup`.
+   Makes :program:`xtrabackup` print out parameters that can be used for
+   copying the data files back to their original locations to restore them. See
+   :ref:`scripting-xtrabackup`.
 
 .. option:: --rebuild_indexes
 
-   Rebuild secondary indexes in InnoDB tables after applying the log. Only has effect with --prepare. 
+   Rebuild secondary indexes in InnoDB tables after applying the log. Only has
+   effect with --prepare.
+
+.. option::  --rebuild_threads=#
+
+   Use this number of threads to rebuild indexes in a compact backup. Only has
+   effect with --prepare and --rebuild-indexes.
+
+.. option:: --secure-auth
+
+   Refuse client connecting to server if it uses old (pre-4.1.1) protocol.
+   (Enabled by default; use --skip-secure-auth to disable.)
+
+.. option:: --ssl
+
+   Enable secure connection. More information can be found in `--ssl
+   <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl>`_
+   MySQL server documentation.
+
+.. option:: --ssl-ca
+
+   Path of the file which contains list of trusted SSL CAs. More information
+   can be found in `--ssl-ca
+   <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl-ca>`_
+   MySQL server documentation.
+
+.. option:: --ssl-capath
+
+   Directory path that contains trusted SSL CA certificates in PEM format. More
+   information can be found in `--ssl-capath
+   <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl-capath>`_
+   MySQL server documentation.
+
+.. option:: --ssl-cert
+
+   Path of the file which contains X509 certificate in PEM format. More
+   information can be found in `--ssl-cert
+   <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl-cert>`_
+   MySQL server documentation.
+
+.. option:: --ssl-cipher
+
+   List of permitted ciphers to use for connection encryption. More information
+   can be found in `--ssl-cipher
+   <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl-cipher>`_
+   MySQL server documentation.
+
+.. option:: --ssl-crl
+
+   Path of the file that contains certificate revocation lists. More
+   information can be found in `--ssl-crl
+   <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl-crl>`_
+   MySQL server documentation.
+
+.. option:: --ssl-crlpath
+
+   Path of directory that contains certificate revocation list files. More
+   information can be found in `--ssl-crlpath
+   <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl-crlpath>`_
+   MySQL server documentation.
+
+.. option:: --ssl-key
+
+   Path of file that contains X509 key in PEM format. More information can be
+   found in `--ssl-key
+   <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl-key>`_
+   MySQL server documentation.
 
-.. option::  --rebuild_threads=# 
+.. option:: --ssl-verify-server-cert
 
-   Use this number of threads to rebuild indexes in a compact backup. Only has effect with --prepare and --rebuild-indexes.
+   Verify server certificate Common Name value against host name used when
+   connecting to server. More information can be found in
+   `--ssl-verify-server-cert
+   <https://dev.mysql.com/doc/refman/5.6/en/secure-connection-options.html#option_general_ssl-verify-server-cert>`_
+   MySQL server documentation.
 
 .. option:: --stats
 
-   Causes :program:`xtrabackup` to scan the specified data files and print out index statistics.
+   Causes :program:`xtrabackup` to scan the specified data files and print out
+   index statistics.
 
-.. option:: --stream=name 
+.. option:: --stream=name
 
-   Stream all backup files to the standard output in the specified format. Currently supported formats are 'xbstream' and 'tar'.
+   Stream all backup files to the standard output in the specified format.
+   Currently supported formats are ``xbstream`` and ``tar``.
 
 .. option:: --suspend-at-end
 
-   Causes :program:`xtrabackup` to create a file called :file:`xtrabackup_suspended` in the :option:`--target-dir`. Instead of exiting after copying data files, :program:`xtrabackup` continues to copy the log file, and waits until the :file:`xtrabackup_suspended` file is deleted. This enables xtrabackup and other programs to coordinate their work. See :ref:`scripting-xtrabackup`.
+   Causes :program:`xtrabackup` to create a file called
+   :file:`xtrabackup_suspended` in the :option:`--target-dir`. Instead of
+   exiting after copying data files, :program:`xtrabackup` continues to copy
+   the log file, and waits until the :file:`xtrabackup_suspended` file is
+   deleted. This enables xtrabackup and other programs to coordinate their
+   work. See :ref:`scripting-xtrabackup`.
 
 .. option:: --tables=name
 
-   A regular expression against which the full tablename, in ``databasename.tablename`` format, is matched. If the name matches, the table is backed up. See :doc:`partial backups <partial_backups>`.
+   A regular expression against which the full tablename, in
+   ``databasename.tablename`` format, is matched. If the name matches, the
+   table is backed up. See :doc:`partial backups <partial_backups>`.
 
 .. option:: --tables-file=name
 
-   A file containing one table name per line, in databasename.tablename format. The backup will be limited to the specified tables. See :ref:`scripting-xtrabackup`.
+   A file containing one table name per line, in databasename.tablename format.
+   The backup will be limited to the specified tables. See
+   :ref:`scripting-xtrabackup`.
 
 .. option:: --target-dir=DIRECTORY
 
-   This option specifies the destination directory for the backup. If the directory does not exist, :program:`xtrabackup` creates it. If the directory does exist and is empty, :program:`xtrabackup` will succeed. :program:`xtrabackup` will not overwrite existing files, however; it will fail with operating system error 17, ``file exists``.
+   This option specifies the destination directory for the backup. If the
+   directory does not exist, :program:`xtrabackup` creates it. If the directory
+   does exist and is empty, :program:`xtrabackup` will succeed.
+   :program:`xtrabackup` will not overwrite existing files, however; it will
+   fail with operating system error 17, ``file exists``.
 
-   If this option is a relative path, it is interpreted as being relative to the current working directory from which :program:`xtrabackup` is executed.
+   If this option is a relative path, it is interpreted as being relative to
+   the current working directory from which :program:`xtrabackup` is executed.
 
 .. option:: --throttle=#
 
-   This option limits :option:`--backup` to the specified number of read+write pairs of operations per second. See :doc:`throttling a backup <throttling_backups>`.
+   This option limits :option:`--backup` to the specified number of read+write
+   pairs of operations per second. See :doc:`throttling a backup
+   <throttling_backups>`.
 
 .. option:: --tmpdir=name
 
-   This option is currently not used for anything except printing out the correct tmpdir parameter when :option:`--print-param` is used.
+   This option is currently not used for anything except printing out the
+   correct tmpdir parameter when :option:`--print-param` is used.
 
 .. option:: --to-archived-lsn=LSN
 
-   This option is used to specify the LSN to which the logs should be applied when backups are being prepared. It can only be used with the :option:`xtrabackup --prepare` option.
+   This option is used to specify the LSN to which the logs should be applied
+   when backups are being prepared. It can only be used with the
+   :option:`xtrabackup --prepare` option.
 
 .. option:: --use-memory=#
 
-   This option affects how much memory is allocated for preparing a backup with :option:`--prepare`, or analyzing statistics with :option:`--stats`. Its purpose is similar to :term:`innodb_buffer_pool_size`. It does not do the same thing as the similarly named option in Oracle's InnoDB Hot Backup tool. The default value is 100MB, and if you have enough available memory, 1GB to 2GB is a good recommended value. Multiples are supported providing the unit (e.g. 1MB, 1M, 1GB, 1G).
+   This option affects how much memory is allocated for preparing a backup with
+   :option:`--prepare`, or analyzing statistics with :option:`--stats`. Its
+   purpose is similar to :term:`innodb_buffer_pool_size`. It does not do the
+   same thing as the similarly named option in Oracle's InnoDB Hot Backup tool.
+   The default value is 100MB, and if you have enough available memory, 1GB to
+   2GB is a good recommended value. Multiples are supported providing the unit
+   (e.g. 1MB, 1M, 1GB, 1G).
+
+.. option:: --user=USERNAME
+
+   This option specifies the MySQL username used when connecting to the server,
+   if that's not the current user. The option accepts a string argument. See
+   mysql --help for details.
 
 .. option:: --version
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xtrabackup_binary.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xtrabackup_binary.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xtrabackup_binary.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xtrabackup_binary.rst	2017-02-27 07:47:02.000000000 +0000
@@ -6,15 +6,6 @@
 
 The tool runs in either :option:`--backup` or :option:`--prepare` mode, corresponding to the two main functions it performs. There are several variations on these functions to accomplish different tasks, and there are two less commonly used modes, :option:`--stats` and :option:`--print-param`. 
 
-Getting Started with |xtrabackup|
-=================================
-
-.. toctree::
-   :maxdepth: 1
-
-   choosing_binary
-   configuring
-
 The Backup Cycle - Full Backups
 ===============================
 
@@ -32,7 +23,6 @@
    :maxdepth: 1
 
    incremental_backups
-   incremental_backups_with_ps_56
    partial_backups
    compact_backups
 
@@ -49,15 +39,12 @@
    restoring_individual_tables
    lru_dump
    
-..    performance_tunning_innobackupex
-
 Implementation
 ==============
 
 .. toctree::
    :maxdepth: 1
 
-   limitation
    implementation_details
    xtrabackup_exit_codes
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup-files.rst percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup-files.rst
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/doc/source/xtrabackup-files.rst	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/doc/source/xtrabackup-files.rst	2017-02-27 07:47:02.000000000 +0000
@@ -7,53 +7,89 @@
 * Information related to the backup and the server
 
     * :file:`backup-my.cnf`
-       This file contains information to start the mini instance of InnoDB during the :option:`--apply-log`. This is **NOT** a backup of original :file:`my.cnf`.  The InnoDB configuration is read from the file :file:`backup-my.cnf` created by |innobackupex| when the backup was made. :option:`innobackupex --apply-log` uses InnoDB configuration from ``backup-my.cnf`` by default, or from :option:`innobackupex --defaults-file`, if specified. InnoDB configuration in this context means server variables that affect data format, i.e. :option:`innodb_page_size`, :option:`innodb_log_block_size`, etc. Location-related variables, like :option:`innodb_log_group_home_dir` or :option:`innodb_data_file_path` are always ignored by :option:`innobackupex --apply-log`, so preparing a backup always works with data files from the backup directory, rather than any external ones.
-
+       This file contains information to start the mini instance of InnoDB
+       during the :option:`--apply-log`. This is **NOT** a backup of original
+       :file:`my.cnf`. The InnoDB configuration is read from the file
+       :file:`backup-my.cnf` created by |innobackupex| when the backup was
+       made. :option:`innobackupex --apply-log` uses InnoDB configuration from
+       ``backup-my.cnf`` by default, or from
+       :option:`innobackupex --defaults-file`, if specified. InnoDB
+       configuration in this context means server variables that affect data
+       format, i.e. :option:`innodb_page_size`,
+       :option:`innodb_log_block_size`, etc. Location-related variables, like
+       :option:`innodb_log_group_home_dir` or :option:`innodb_data_file_path`
+       are always ignored by :option:`innobackupex --apply-log`, so preparing
+       a backup always works with data files from the backup directory, rather
+       than any external ones.
 
     * :file:`xtrabackup_checkpoints`
-       The type of the backup (e.g. full or incremental), its state (e.g. prepared) and the |LSN| range contained in it. This information is used for incremental backups.
-       Example of the :file:`xtrabackup_checkpoints` after taking a full backup: :: 
-        
-        backup_type = full-backuped
-        from_lsn = 0
-        to_lsn = 15188961605
-        last_lsn = 15188961605
-
-       Example of the :file:`xtrabackup_checkpoints` after taking an incremental backup: :: 
-      
-        backup_type = incremental
-        from_lsn = 15188961605
-        to_lsn = 15189350111
-        last_lsn = 15189350111
+       The type of the backup (e.g. full or incremental), its state (e.g.
+       prepared) and the |LSN| range contained in it. This information is used
+       for incremental backups.
+       Example of the :file:`xtrabackup_checkpoints` after taking a full
+       backup:
+
+       .. code-block:: text
+
+         backup_type = full-backuped
+         from_lsn = 0
+         to_lsn = 15188961605
+         last_lsn = 15188961605
+
+       Example of the :file:`xtrabackup_checkpoints` after taking an incremental
+       backup:
+
+       .. code-block:: text
+
+         backup_type = incremental
+         from_lsn = 15188961605
+         to_lsn = 15189350111
+         last_lsn = 15189350111
 
     * :file:`xtrabackup_binlog_info`
-       The binary log file used by the server and its position at the moment of the backup. Result of the :command:`SHOW MASTER STATUS`.
+       The binary log file used by the server and its position at the moment of
+       the backup. Result of the :command:`SHOW MASTER STATUS`.
 
     * :file:`xtrabackup_binlog_pos_innodb`
-       The binary log file and its current position for |InnoDB| or |XtraDB| tables.
+       The binary log file and its current position for |InnoDB| or |XtraDB|
+       tables.
 
     * :file:`xtrabackup_binary`
        The |xtrabackup| binary used in the process.
-    
-    * :file:`xtrabackup_logfile` 
-       Contains data needed for running the: :option:`--apply-log`. The bigger this file is the :option:`--apply-log` process will take longer to finish. 
+
+    * :file:`xtrabackup_logfile`
+       Contains data needed for running the: :option:`--apply-log`. The bigger
+       this file is the :option:`--apply-log` process will take longer to
+       finish.
 
     * :file:`<table_name>.delta.meta`
-       This file is going to be created when performing the incremental backup. It contains the per-table delta metadata: page size, size of compressed page (if the value is 0 it means the tablespace isn't compressed) and space id. Example of this file could looks like this: :: 
+       This file is going to be created when performing the incremental backup.
+       It contains the per-table delta metadata: page size, size of compressed
+       page (if the value is 0 it means the tablespace isn't compressed) and
+       space id. Example of this file could looks like this:
+
+       .. code-block:: text
 
         page_size = 16384
         zip_size = 0
         space_id = 0
 
     * :file:`<table_name>.ibd.pmap`
-       This file contains ranges of skipped secondary index pages. These files are created only when doing the compact backup. The file format is a series of 2-value tuples, with each value being a 4-byte page offset corresponding to the first and the last endpoints of skipped ranges, respectively.
+       This file contains ranges of skipped secondary index pages. These files
+       are created only when doing the compact backup. The file format is a
+       series of 2-value tuples, with each value being a 4-byte page offset
+       corresponding to the first and the last endpoints of skipped ranges,
+       respectively.
 
-* Information related to the replication environment (if using the :option:`--slave-info` option):
+* Information related to the replication environment (if using the
+  :option:`--slave-info` option):
 
     * :file:`xtrabackup_slave_info`
        The ``CHANGE MASTER`` statement needed for setting up a slave.
 
-* Information related to the *Galera* and *Percona XtraDB Cluster* (if using the :option:`--galera-info` option):
+* Information related to the *Galera* and *Percona XtraDB Cluster* (if using
+  the :option:`--galera-info` option):
 
     * :file:`xtrabackup_galera_info`
-       Contains the values of status variables :option:`wsrep_local_state_uuid` and :option:`wsrep_last_committed`.
+       Contains the values of status variables :option:`wsrep_local_state_uuid`
+       and :option:`wsrep_last_committed`.
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/.gitignore percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/.gitignore
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/.gitignore	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2 @@
+doc/source/CMakeCache.txt
+doc/source/build/
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/innobackupex.pl percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/innobackupex.pl
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/innobackupex.pl	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/innobackupex.pl	1970-01-01 00:00:00.000000000 +0000
@@ -1,5486 +0,0 @@
-#!/usr/bin/env perl
-#
-# A script for making backups of InnoDB and MyISAM tables, indexes and .frm
-# files.
-#
-# Copyright 2003, 2009 Innobase Oy. All Rights Reserved.
-# Copyright Percona LLC and/or its affiliates, 2009-2013.  All Rights Reserved.
-#
-
-use warnings FATAL => 'all';
-use strict;
-use Getopt::Long;
-use File::Spec;
-use Pod::Usage qw(pod2usage);
-use POSIX "strftime";
-use POSIX ":sys_wait_h";
-use FileHandle;
-use File::Basename;
-use File::Temp;
-use File::Find;
-use File::Copy;
-use English qw(-no_match_vars);
-use Time::HiRes qw(usleep);
-
-# version of this script
-my $innobackup_version = '1.5.1-xtrabackup';
-my $innobackup_script = basename($0);
-
-# copyright notice
-my $copyright_notice =
-"InnoDB Backup Utility v${innobackup_version}; Copyright 2003, 2009 Innobase Oy
-and Percona LLC and/or its affiliates 2009-2013.  All Rights Reserved.
-
-This software is published under
-the GNU GENERAL PUBLIC LICENSE Version 2, June 1991.
-
-";
-
-# required Perl version (5.005)
-my @required_perl_version = (5, 0, 5);
-my $required_perl_version_old_style = 5.005;
-
-# check existence of DBD::mysql module
-eval {
-    require DBD::mysql;
-};
-my $dbd_mysql_installed = $EVAL_ERROR ? 0 : 1;
-
-# force flush after every write and print
-$| = 1;
-
-# disable nlink count optimization, see File::Find documentation for details
-$File::Find::dont_use_nlink=1;
-
-######################################################################
-# modifiable parameters
-######################################################################
-
-# maximum number of files in a database directory which are
-# separately printed when a backup is made
-my $backup_file_print_limit = 9;
-
-# default compression level (this is an argument to ibbackup)
-my $default_compression_level = 1;
-
-# time in seconds after which a dummy query is sent to mysql server
-# in order to keep the database connection alive
-my $mysql_keep_alive = 5;
-
-######################################################################
-# end of modifiable parameters
-######################################################################
-
-#######################
-# Server capabilities #
-#######################
-my $have_changed_page_bitmaps = 0;
-my $have_backup_locks = 0;
-my $have_galera_enabled = 0;
-my $have_flush_engine_logs = 0;
-
-# command line options
-my $option_help = '';
-my $option_version = '';
-my $option_apply_log = '';
-my $option_redo_only = '';
-my $option_copy_back = '';
-my $option_move_back = '';
-my $option_include = '';
-my $option_databases = '';
-my $option_tables_file = '';
-my $option_throttle = '';
-my $option_sleep = '';
-my $option_compress = 999;
-my $option_decompress = '';
-my $option_compress_threads = 1;
-my $option_compress_chunk_size = '';
-my $option_encrypt = '';
-my $option_decrypt = '';
-my $option_encrypt_key = '';
-my $option_encrypt_key_file = '';
-my $encrypt_cmd = '';
-my $option_encrypt_threads = 1;
-my $option_encrypt_chunk_size = '';
-my $option_export = '';
-my $option_use_memory = '';
-my $option_mysql_password = '';
-my $option_mysql_user = '';
-my $option_mysql_port = '';
-my $option_mysql_socket = '';
-my $option_mysql_host = '';
-my $option_defaults_group = 'mysqld';
-my $option_no_timestamp = '';
-my $option_slave_info = '';
-my $option_galera_info = '';
-my $option_no_lock = '';
-my $option_ibbackup_binary = 'xtrabackup';
-my $option_log_copy_interval = 0;
-
-my $option_defaults_file = '';
-my $option_defaults_extra_file = '';
-my $option_incremental = '';
-my $option_incremental_basedir = '';
-my $option_incremental_dir = '';
-my $option_incremental_force_scan = 0;
-my $option_incremental_lsn = '';
-my $option_extra_lsndir = '';
-my $option_rsync = '';
-my $option_stream = '';
-my $stream_cmd = '';
-my $option_tmpdir = '';
-
-my $option_tar4ibd = '';
-my $option_scp_opt = '-Cp -c arcfour';
-my $option_ssh_opt = '';
-
-my $option_parallel = '';
-
-my $option_safe_slave_backup = '';
-my $option_safe_slave_backup_timeout = 300;
-
-my $option_compact = '';
-my $option_rebuild_indexes = '';
-my $option_rebuild_threads = 0;
-
-my $option_debug_sleep_before_unlock = '';
-
-my $option_version_check = '';
-
-my $option_force_non_empty_dirs = '';
-
-my %mysql;
-my $option_backup = '';
-
-my $option_history;
-my $option_incremental_history_name = '';
-my $option_incremental_history_uuid = '';
-
-# name of the my.cnf configuration file
-#my $config_file = '';
-
-# root of the backup directory
-my $backup_root = '';
-
-# backup directory pathname
-my $backup_dir = '';
-
-# directory where innobackupex aux files are cretead
-my $work_dir;
-
-# home directory of innoDB log files
-my $innodb_log_group_home_dir = '';
-
-# backup my.cnf file
-my $backup_config_file = '';
-
-# whether slave SQL thread is running when wait_for_safe_slave() is called
-my $sql_thread_started = 0;
-
-# options from the options file
-my %config;
-
-# options from the backup options file
-#my %backup_config;
-
-# list of databases to be included in a backup
-my %databases_list;
-
-# list of tables to be included in a backup
-my %table_list;
-
-# prefix for output lines
-my $prefix = "$innobackup_script:";
-
-# mysql server version string
-my $mysql_server_version = '';
-
-# name of the file where binlog position info is written
-my $binlog_info;
-
-# name of the file where galera position info is written
-my $galera_info;
-
-# name of the file where slave info is written
-my $slave_info;
-
-# name of the file where version and backup history is written 
-my $backup_history;
-
-# mysql binlog position as given by "SHOW MASTER STATUS" command
-my $mysql_binlog_position = '';
-
-# mysql master's binlog position as given by "SHOW SLAVE STATUS" command
-# run on a slave server
-my $mysql_slave_position = '';
-
-# process id if the script itself
-my $innobackupex_pid = $$;
-
-# process id of ibbackup program (runs as a child process of this script)
-my $ibbackup_pid = '';
-
-# process id of long queries killer
-my $query_killer_pid;
-
-# set kill long queries timeout in seconds
-my $option_kill_long_queries_timeout = 0;
-
-# waiting for an appropriate time to start FTWRL timeout
-my $option_lock_wait_timeout = 0;
-
-# how old should be query to be waited for
-my $option_lock_wait_threshold = 60;
-
-# which type of queries we are waiting for during the pre-FTWRL phase
-# possible values are "update" and "all"
-my $option_lock_wait_query_type = "all";
-
-# which type of queries wa are waiting when clearing the way for FTWRL
-# by killing; possible values are "select" and "all"
-my $option_kill_long_query_type = "all";
-
-# a counter for numbering mysql connection checks
-my $hello_id = 0;
-
-# escape sequences for options files
-my %option_value_escapes = ('b' => "\b",
-                            't' => "\t",
-                            'n' => "\n",
-                            'r' => "\r",
-                            "\\" => "\\",
-                            's' => ' ');
-
-# signal that is sent to child processes when they are killed
-my $kill_signal = 9;
-
-# current local time
-my $now;
-
-# incremental backup base directory
-my $incremental_basedir = '';
-
-my $src_name;
-my $dst_name;
-my $win = ($^O eq 'MSWin32' ? 1 : 0);
-my $CP_CMD = ($win eq 1 ? "copy /Y" : "cp");
-my $xtrabackup_pid_file = 'xtrabackup_pid';
-my %rsync_files_hash;
-my %processed_files;
-
-my $xb_fn_suspended_at_start = "/xtrabackup_suspended_1";
-my $xb_fn_suspended_at_end = "/xtrabackup_suspended_2";
-my $xb_fn_log_copied = "/xtrabackup_log_copied";
-my @xb_suspend_files = ($xb_fn_suspended_at_start, $xb_fn_suspended_at_end,
-                        $xb_fn_log_copied);
-
-my $copy_dir_src;
-my $copy_dir_dst;
-my $cleanup_dir_dst;
-my $process_dir_exclude_regexp;
-my $copy_dir_overwrite;
-my $copy_dir_resolve_isl;
-
-# for history on server record
-my $history_tool_command = "@ARGV";
-my $history_start_time = time();
-my $history_lock_time = 0;
-my $history_delete_checkpoints = 0;
-
-# ###########################################################################
-# HTTPMicro package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
-#   lib/HTTPMicro.pm
-#   t/lib/HTTPMicro.t
-# See https://launchpad.net/percona-toolkit for more information.
-# ###########################################################################
-{
-
-package HTTPMicro;
-BEGIN {
-  $HTTPMicro::VERSION = '0.001';
-}
-use strict;
-use warnings;
-
-use Carp ();
-
-
-my @attributes;
-BEGIN {
-    @attributes = qw(agent timeout);
-    no strict 'refs';
-    for my $accessor ( @attributes ) {
-        *{$accessor} = sub {
-            @_ > 1 ? $_[0]->{$accessor} = $_[1] : $_[0]->{$accessor};
-        };
-    }
-}
-
-sub new {
-    my($class, %args) = @_;
-    (my $agent = $class) =~ s{::}{-}g;
-    my $self = {
-        agent        => $agent . "/" . ($class->VERSION || 0),
-        timeout      => 60,
-    };
-    for my $key ( @attributes ) {
-        $self->{$key} = $args{$key} if exists $args{$key}
-    }
-    return bless $self, $class;
-}
-
-my %DefaultPort = (
-    http => 80,
-    https => 443,
-);
-
-sub request {
-    my ($self, $method, $url, $args) = @_;
-    @_ == 3 || (@_ == 4 && ref $args eq 'HASH')
-      or Carp::croak(q/Usage: $http->request(METHOD, URL, [HASHREF])/);
-    $args ||= {}; # we keep some state in this during _request
-
-    my $response;
-    for ( 0 .. 1 ) {
-        $response = eval { $self->_request($method, $url, $args) };
-        last unless $@ && $method eq 'GET'
-            && $@ =~ m{^(?:Socket closed|Unexpected end)};
-    }
-
-    if (my $e = "$@") {
-        $response = {
-            success => q{},
-            status  => 599,
-            reason  => 'Internal Exception',
-            content => $e,
-            headers => {
-                'content-type'   => 'text/plain',
-                'content-length' => length $e,
-            }
-        };
-    }
-    return $response;
-}
-
-sub _request {
-    my ($self, $method, $url, $args) = @_;
-
-    my ($scheme, $host, $port, $path_query) = $self->_split_url($url);
-
-    my $request = {
-        method    => $method,
-        scheme    => $scheme,
-        host_port => ($port == $DefaultPort{$scheme} ? $host : "$host:$port"),
-        uri       => $path_query,
-        headers   => {},
-    };
-
-    my $handle  = HTTPMicro::Handle->new(timeout => $self->{timeout});
-
-    $handle->connect($scheme, $host, $port);
-
-    $self->_prepare_headers_and_cb($request, $args);
-    $handle->write_request_header(@{$request}{qw/method uri headers/});
-    $handle->write_content_body($request) if $request->{content};
-
-    my $response;
-    do { $response = $handle->read_response_header }
-        until (substr($response->{status},0,1) ne '1');
-
-    if (!($method eq 'HEAD' || $response->{status} =~ /^[23]04/)) {
-        $response->{content} = '';
-        $handle->read_content_body(sub { $_[1]->{content} .= $_[0] }, $response);
-    }
-
-    $handle->close;
-    $response->{success} = substr($response->{status},0,1) eq '2';
-    return $response;
-}
-
-sub _prepare_headers_and_cb {
-    my ($self, $request, $args) = @_;
-
-    for ($args->{headers}) {
-        next unless defined;
-        while (my ($k, $v) = each %$_) {
-            $request->{headers}{lc $k} = $v;
-        }
-    }
-    $request->{headers}{'host'}         = $request->{host_port};
-    $request->{headers}{'connection'}   = "close";
-    $request->{headers}{'user-agent'} ||= $self->{agent};
-
-    if (defined $args->{content}) {
-        $request->{headers}{'content-type'} ||= "application/octet-stream";
-        utf8::downgrade($args->{content}, 1)
-            or Carp::croak(q/Wide character in request message body/);
-        $request->{headers}{'content-length'} = length $args->{content};
-        $request->{content} = $args->{content};
-    }
-    return;
-}
-
-sub _split_url {
-    my $url = pop;
-
-    my ($scheme, $authority, $path_query) = $url =~ m<\A([^:/?#]+)://([^/?#]*)([^#]*)>
-      or Carp::croak(qq/Cannot parse URL: '$url'/);
-
-    $scheme     = lc $scheme;
-    $path_query = "/$path_query" unless $path_query =~ m<\A/>;
-
-    my $host = (length($authority)) ? lc $authority : 'localhost';
-       $host =~ s/\A[^@]*@//;   # userinfo
-    my $port = do {
-       $host =~ s/:([0-9]*)\z// && length $1
-         ? $1
-         : $DefaultPort{$scheme}
-    };
-
-    return ($scheme, $host, $port, $path_query);
-}
-
-package
-    HTTPMicro::Handle; # hide from PAUSE/indexers
-use strict;
-use warnings;
-
-use Carp       qw[croak];
-use Errno      qw[EINTR EPIPE];
-use IO::Socket qw[SOCK_STREAM];
-
-sub BUFSIZE () { 32768 }
-
-my $Printable = sub {
-    local $_ = shift;
-    s/\r/\\r/g;
-    s/\n/\\n/g;
-    s/\t/\\t/g;
-    s/([^\x20-\x7E])/sprintf('\\x%.2X', ord($1))/ge;
-    $_;
-};
-
-sub new {
-    my ($class, %args) = @_;
-    return bless {
-        rbuf             => '',
-        timeout          => 60,
-        max_line_size    => 16384,
-        %args
-    }, $class;
-}
-
-my $ssl_verify_args = {
-    check_cn => "when_only",
-    wildcards_in_alt => "anywhere",
-    wildcards_in_cn => "anywhere"
-};
-
-sub connect {
-    @_ == 4 || croak(q/Usage: $handle->connect(scheme, host, port)/);
-    my ($self, $scheme, $host, $port) = @_;
-
-    if ( $scheme eq 'https' ) {
-        eval "require IO::Socket::SSL"
-            unless exists $INC{'IO/Socket/SSL.pm'};
-        croak(qq/IO::Socket::SSL must be installed for https support\n/)
-            unless $INC{'IO/Socket/SSL.pm'};
-    }
-    elsif ( $scheme ne 'http' ) {
-      croak(qq/Unsupported URL scheme '$scheme'\n/);
-    }
-
-    $self->{fh} = 'IO::Socket::INET'->new(
-        PeerHost  => $host,
-        PeerPort  => $port,
-        Proto     => 'tcp',
-        Type      => SOCK_STREAM,
-        Timeout   => $self->{timeout}
-    ) or croak(qq/Could not connect to '$host:$port': $@/);
-
-    binmode($self->{fh})
-      or croak(qq/Could not binmode() socket: '$!'/);
-
-    if ( $scheme eq 'https') {
-        IO::Socket::SSL->start_SSL($self->{fh});
-        ref($self->{fh}) eq 'IO::Socket::SSL'
-            or die(qq/SSL connection failed for $host\n/);
-        if ( $self->{fh}->can("verify_hostname") ) {
-            $self->{fh}->verify_hostname( $host, $ssl_verify_args );
-        }
-        else {
-         my $fh = $self->{fh};
-         _verify_hostname_of_cert($host, _peer_certificate($fh), $ssl_verify_args)
-               or die(qq/SSL certificate not valid for $host\n/);
-         }
-    }
-      
-    $self->{host} = $host;
-    $self->{port} = $port;
-
-    return $self;
-}
-
-sub close {
-    @_ == 1 || croak(q/Usage: $handle->close()/);
-    my ($self) = @_;
-    CORE::close($self->{fh})
-      or croak(qq/Could not close socket: '$!'/);
-}
-
-sub write {
-    @_ == 2 || croak(q/Usage: $handle->write(buf)/);
-    my ($self, $buf) = @_;
-
-    my $len = length $buf;
-    my $off = 0;
-
-    local $SIG{PIPE} = 'IGNORE';
-
-    while () {
-        $self->can_write
-          or croak(q/Timed out while waiting for socket to become ready for writing/);
-        my $r = syswrite($self->{fh}, $buf, $len, $off);
-        if (defined $r) {
-            $len -= $r;
-            $off += $r;
-            last unless $len > 0;
-        }
-        elsif ($! == EPIPE) {
-            croak(qq/Socket closed by remote server: $!/);
-        }
-        elsif ($! != EINTR) {
-            croak(qq/Could not write to socket: '$!'/);
-        }
-    }
-    return $off;
-}
-
-sub read {
-    @_ == 2 || @_ == 3 || croak(q/Usage: $handle->read(len)/);
-    my ($self, $len) = @_;
-
-    my $buf  = '';
-    my $got = length $self->{rbuf};
-
-    if ($got) {
-        my $take = ($got < $len) ? $got : $len;
-        $buf  = substr($self->{rbuf}, 0, $take, '');
-        $len -= $take;
-    }
-
-    while ($len > 0) {
-        $self->can_read
-          or croak(q/Timed out while waiting for socket to become ready for reading/);
-        my $r = sysread($self->{fh}, $buf, $len, length $buf);
-        if (defined $r) {
-            last unless $r;
-            $len -= $r;
-        }
-        elsif ($! != EINTR) {
-            croak(qq/Could not read from socket: '$!'/);
-        }
-    }
-    if ($len) {
-        croak(q/Unexpected end of stream/);
-    }
-    return $buf;
-}
-
-sub readline {
-    @_ == 1 || croak(q/Usage: $handle->readline()/);
-    my ($self) = @_;
-
-    while () {
-        if ($self->{rbuf} =~ s/\A ([^\x0D\x0A]* \x0D?\x0A)//x) {
-            return $1;
-        }
-        $self->can_read
-          or croak(q/Timed out while waiting for socket to become ready for reading/);
-        my $r = sysread($self->{fh}, $self->{rbuf}, BUFSIZE, length $self->{rbuf});
-        if (defined $r) {
-            last unless $r;
-        }
-        elsif ($! != EINTR) {
-            croak(qq/Could not read from socket: '$!'/);
-        }
-    }
-    croak(q/Unexpected end of stream while looking for line/);
-}
-
-sub read_header_lines {
-    @_ == 1 || @_ == 2 || croak(q/Usage: $handle->read_header_lines([headers])/);
-    my ($self, $headers) = @_;
-    $headers ||= {};
-    my $lines   = 0;
-    my $val;
-
-    while () {
-         my $line = $self->readline;
-
-         if ($line =~ /\A ([^\x00-\x1F\x7F:]+) : [\x09\x20]* ([^\x0D\x0A]*)/x) {
-             my ($field_name) = lc $1;
-             $val = \($headers->{$field_name} = $2);
-         }
-         elsif ($line =~ /\A [\x09\x20]+ ([^\x0D\x0A]*)/x) {
-             $val
-               or croak(q/Unexpected header continuation line/);
-             next unless length $1;
-             $$val .= ' ' if length $$val;
-             $$val .= $1;
-         }
-         elsif ($line =~ /\A \x0D?\x0A \z/x) {
-            last;
-         }
-         else {
-            croak(q/Malformed header line: / . $Printable->($line));
-         }
-    }
-    return $headers;
-}
-
-sub write_header_lines {
-    (@_ == 2 && ref $_[1] eq 'HASH') || croak(q/Usage: $handle->write_header_lines(headers)/);
-    my($self, $headers) = @_;
-
-    my $buf = '';
-    while (my ($k, $v) = each %$headers) {
-        my $field_name = lc $k;
-         $field_name =~ /\A [\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]+ \z/x
-            or croak(q/Invalid HTTP header field name: / . $Printable->($field_name));
-         $field_name =~ s/\b(\w)/\u$1/g;
-         $buf .= "$field_name: $v\x0D\x0A";
-    }
-    $buf .= "\x0D\x0A";
-    return $self->write($buf);
-}
-
-sub read_content_body {
-    @_ == 3 || @_ == 4 || croak(q/Usage: $handle->read_content_body(callback, response, [read_length])/);
-    my ($self, $cb, $response, $len) = @_;
-    $len ||= $response->{headers}{'content-length'};
-
-    croak("No content-length in the returned response, and this "
-        . "UA doesn't implement chunking") unless defined $len;
-
-    while ($len > 0) {
-        my $read = ($len > BUFSIZE) ? BUFSIZE : $len;
-        $cb->($self->read($read), $response);
-        $len -= $read;
-    }
-
-    return;
-}
-
-sub write_content_body {
-    @_ == 2 || croak(q/Usage: $handle->write_content_body(request)/);
-    my ($self, $request) = @_;
-    my ($len, $content_length) = (0, $request->{headers}{'content-length'});
-
-    $len += $self->write($request->{content});
-
-    $len == $content_length
-      or croak(qq/Content-Length missmatch (got: $len expected: $content_length)/);
-
-    return $len;
-}
-
-sub read_response_header {
-    @_ == 1 || croak(q/Usage: $handle->read_response_header()/);
-    my ($self) = @_;
-
-    my $line = $self->readline;
-
-    $line =~ /\A (HTTP\/(0*\d+\.0*\d+)) [\x09\x20]+ ([0-9]{3}) [\x09\x20]+ ([^\x0D\x0A]*) \x0D?\x0A/x
-      or croak(q/Malformed Status-Line: / . $Printable->($line));
-
-    my ($protocol, $version, $status, $reason) = ($1, $2, $3, $4);
-
-    return {
-        status   => $status,
-        reason   => $reason,
-        headers  => $self->read_header_lines,
-        protocol => $protocol,
-    };
-}
-
-sub write_request_header {
-    @_ == 4 || croak(q/Usage: $handle->write_request_header(method, request_uri, headers)/);
-    my ($self, $method, $request_uri, $headers) = @_;
-
-    return $self->write("$method $request_uri HTTP/1.1\x0D\x0A")
-         + $self->write_header_lines($headers);
-}
-
-sub _do_timeout {
-    my ($self, $type, $timeout) = @_;
-    $timeout = $self->{timeout}
-        unless defined $timeout && $timeout >= 0;
-
-    my $fd = fileno $self->{fh};
-    defined $fd && $fd >= 0
-      or croak(q/select(2): 'Bad file descriptor'/);
-
-    my $initial = time;
-    my $pending = $timeout;
-    my $nfound;
-
-    vec(my $fdset = '', $fd, 1) = 1;
-
-    while () {
-        $nfound = ($type eq 'read')
-            ? select($fdset, undef, undef, $pending)
-            : select(undef, $fdset, undef, $pending) ;
-        if ($nfound == -1) {
-            $! == EINTR
-              or croak(qq/select(2): '$!'/);
-            redo if !$timeout || ($pending = $timeout - (time - $initial)) > 0;
-            $nfound = 0;
-        }
-        last;
-    }
-    $! = 0;
-    return $nfound;
-}
-
-sub can_read {
-    @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_read([timeout])/);
-    my $self = shift;
-    return $self->_do_timeout('read', @_)
-}
-
-sub can_write {
-    @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_write([timeout])/);
-    my $self = shift;
-    return $self->_do_timeout('write', @_)
-}
-
-my $prog = <<'EOP';
-BEGIN {
-   if ( defined &IO::Socket::SSL::CAN_IPV6 ) {
-      *CAN_IPV6 = \*IO::Socket::SSL::CAN_IPV6;
-   }
-   else {
-      constant->import( CAN_IPV6 => '' );
-   }
-   my %const = (
-      NID_CommonName => 13,
-      GEN_DNS => 2,
-      GEN_IPADD => 7,
-   );
-   while ( my ($name,$value) = each %const ) {
-      no strict 'refs';
-      *{$name} = UNIVERSAL::can( 'Net::SSLeay', $name ) || sub { $value };
-   }
-}
-{
-   my %dispatcher = (
-      issuer =>  sub { Net::SSLeay::X509_NAME_oneline( Net::SSLeay::X509_get_issuer_name( shift )) },
-      subject => sub { Net::SSLeay::X509_NAME_oneline( Net::SSLeay::X509_get_subject_name( shift )) },
-   );
-   if ( $Net::SSLeay::VERSION >= 1.30 ) {
-      $dispatcher{commonName} = sub {
-         my $cn = Net::SSLeay::X509_NAME_get_text_by_NID(
-            Net::SSLeay::X509_get_subject_name( shift ), NID_CommonName);
-         $cn =~s{\0$}{}; # work around Bug in Net::SSLeay <1.33
-         $cn;
-      }
-   } else {
-      $dispatcher{commonName} = sub {
-         croak "you need at least Net::SSLeay version 1.30 for getting commonName"
-      }
-   }
-
-   if ( $Net::SSLeay::VERSION >= 1.33 ) {
-      $dispatcher{subjectAltNames} = sub { Net::SSLeay::X509_get_subjectAltNames( shift ) };
-   } else {
-      $dispatcher{subjectAltNames} = sub {
-         return;
-      };
-   }
-
-   $dispatcher{authority} = $dispatcher{issuer};
-   $dispatcher{owner}     = $dispatcher{subject};
-   $dispatcher{cn}        = $dispatcher{commonName};
-
-   sub _peer_certificate {
-      my ($self, $field) = @_;
-      my $ssl = $self->_get_ssl_object or return;
-
-      my $cert = ${*$self}{_SSL_certificate}
-         ||= Net::SSLeay::get_peer_certificate($ssl)
-         or return $self->error("Could not retrieve peer certificate");
-
-      if ($field) {
-         my $sub = $dispatcher{$field} or croak
-            "invalid argument for peer_certificate, valid are: ".join( " ",keys %dispatcher ).
-            "\nMaybe you need to upgrade your Net::SSLeay";
-         return $sub->($cert);
-      } else {
-         return $cert
-      }
-   }
-
-
-   my %scheme = (
-      ldap => {
-         wildcards_in_cn    => 0,
-         wildcards_in_alt => 'leftmost',
-         check_cn         => 'always',
-      },
-      http => {
-         wildcards_in_cn    => 'anywhere',
-         wildcards_in_alt => 'anywhere',
-         check_cn         => 'when_only',
-      },
-      smtp => {
-         wildcards_in_cn    => 0,
-         wildcards_in_alt => 0,
-         check_cn         => 'always'
-      },
-      none => {}, # do not check
-   );
-
-   $scheme{www}  = $scheme{http}; # alias
-   $scheme{xmpp} = $scheme{http}; # rfc 3920
-   $scheme{pop3} = $scheme{ldap}; # rfc 2595
-   $scheme{imap} = $scheme{ldap}; # rfc 2595
-   $scheme{acap} = $scheme{ldap}; # rfc 2595
-   $scheme{nntp} = $scheme{ldap}; # rfc 4642
-   $scheme{ftp}  = $scheme{http}; # rfc 4217
-
-
-   sub _verify_hostname_of_cert {
-      my $identity = shift;
-      my $cert = shift;
-      my $scheme = shift || 'none';
-      if ( ! ref($scheme) ) {
-         $scheme = $scheme{$scheme} or croak "scheme $scheme not defined";
-      }
-
-      return 1 if ! %$scheme; # 'none'
-
-      my $commonName = $dispatcher{cn}->($cert);
-      my @altNames   = $dispatcher{subjectAltNames}->($cert);
-
-      if ( my $sub = $scheme->{callback} ) {
-         return $sub->($identity,$commonName,@altNames);
-      }
-
-
-      my $ipn;
-      if ( CAN_IPV6 and $identity =~m{:} ) {
-         $ipn = IO::Socket::SSL::inet_pton(IO::Socket::SSL::AF_INET6,$identity)
-            or croak "'$identity' is not IPv6, but neither IPv4 nor hostname";
-      } elsif ( $identity =~m{^\d+\.\d+\.\d+\.\d+$} ) {
-         $ipn = IO::Socket::SSL::inet_aton( $identity ) or croak "'$identity' is not IPv4, but neither IPv6 nor hostname";
-      } else {
-         if ( $identity =~m{[^a-zA-Z0-9_.\-]} ) {
-            $identity =~m{\0} and croak("name '$identity' has \\0 byte");
-            $identity = IO::Socket::SSL::idn_to_ascii($identity) or
-               croak "Warning: Given name '$identity' could not be converted to IDNA!";
-         }
-      }
-
-      my $check_name = sub {
-         my ($name,$identity,$wtyp) = @_;
-         $wtyp ||= '';
-         my $pattern;
-         if ( $wtyp eq 'anywhere' and $name =~m{^([a-zA-Z0-9_\-]*)\*(.+)} ) {
-            $pattern = qr{^\Q$1\E[a-zA-Z0-9_\-]*\Q$2\E$}i;
-         } elsif ( $wtyp eq 'leftmost' and $name =~m{^\*(\..+)$} ) {
-            $pattern = qr{^[a-zA-Z0-9_\-]*\Q$1\E$}i;
-         } else {
-            $pattern = qr{^\Q$name\E$}i;
-         }
-         return $identity =~ $pattern;
-      };
-
-      my $alt_dnsNames = 0;
-      while (@altNames) {
-         my ($type, $name) = splice (@altNames, 0, 2);
-         if ( $ipn and $type == GEN_IPADD ) {
-            return 1 if $ipn eq $name;
-
-         } elsif ( ! $ipn and $type == GEN_DNS ) {
-            $name =~s/\s+$//; $name =~s/^\s+//;
-            $alt_dnsNames++;
-            $check_name->($name,$identity,$scheme->{wildcards_in_alt})
-               and return 1;
-         }
-      }
-
-      if ( ! $ipn and (
-         $scheme->{check_cn} eq 'always' or
-         $scheme->{check_cn} eq 'when_only' and !$alt_dnsNames)) {
-         $check_name->($commonName,$identity,$scheme->{wildcards_in_cn})
-            and return 1;
-      }
-
-      return 0; # no match
-   }
-}
-EOP
-
-eval { require IO::Socket::SSL };
-if ( $INC{"IO/Socket/SSL.pm"} ) {
-   eval $prog;
-   die $@ if $@;
-}
-
-1;
-}
-# ###########################################################################
-# End HTTPMicro package
-# ###########################################################################
-
-# ###########################################################################
-# VersionCheck package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
-#   lib/VersionCheck.pm
-#   t/lib/VersionCheck.t
-# See https://launchpad.net/percona-toolkit for more information.
-# ###########################################################################
-{
-package VersionCheck;
-
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Data::Dumper;
-local $Data::Dumper::Indent    = 1;
-local $Data::Dumper::Sortkeys  = 1;
-local $Data::Dumper::Quotekeys = 0;
-
-use Digest::MD5 qw(md5_hex);
-use Sys::Hostname qw(hostname);
-use File::Basename qw();
-use File::Spec;
-use FindBin qw();
-
-eval {
-   require Percona::Toolkit;
-   require HTTPMicro;
-};
-
-{
-   my $file    = 'percona-version-check';
-   my $home    = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.';
-   my @vc_dirs = (
-      '/etc/percona',
-      '/etc/percona-toolkit',
-      '/tmp',
-      "$home",
-   );
-
-   if ($ENV{PTDEBUG_VERSION_CHECK_HOME}) {
-       @vc_dirs = ( $ENV{PTDEBUG_VERSION_CHECK_HOME} );
-   }
-
-   sub version_check_file {
-      foreach my $dir ( @vc_dirs ) {
-         if ( -d $dir && -w $dir ) {
-            PTDEBUG && _d('Version check file', $file, 'in', $dir);
-            return $dir . '/' . $file;
-         }
-      }
-      PTDEBUG && _d('Version check file', $file, 'in', $ENV{PWD});
-      return $file;  # in the CWD
-   } 
-}
-
-sub version_check_time_limit {
-   return 60 * 60 * 24;  # one day
-}
-
-
-sub version_check {
-   my (%args) = @_;
-
-   my $instances = $args{instances} || [];
-   my $instances_to_check;
-
-   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
-   if ( !$args{force} ) {
-      if ( $FindBin::Bin
-           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
-         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
-         return;
-      }
-   }
-
-   eval {
-      foreach my $instance ( @$instances ) {
-         my ($name, $id) = get_instance_id($instance);
-         $instance->{name} = $name;
-         $instance->{id}   = $id;
-      }
-
-      push @$instances, { name => 'system', id => 0 };
-
-      $instances_to_check = get_instances_to_check(
-         instances => $instances,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-      PTDEBUG && _d(scalar @$instances_to_check, 'instances to check');
-      return unless @$instances_to_check;
-
-      my $protocol = 'https';  # optimistic, but...
-      eval { require IO::Socket::SSL; };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d($EVAL_ERROR);
-         $protocol = 'http';
-      }
-      PTDEBUG && _d('Using', $protocol);
-
-      my $advice = pingback(
-         instances => $instances_to_check,
-         protocol  => $protocol,
-         url       => $args{url}                       # testing
-                   || $ENV{PERCONA_VERSION_CHECK_URL}  # testing
-                   || "$protocol://v.percona.com",
-      );
-      if ( $advice ) {
-         PTDEBUG && _d('Advice:', Dumper($advice));
-         if ( scalar @$advice > 1) {
-            print "\n# " . scalar @$advice . " software updates are "
-               . "available:\n";
-         }
-         else {
-            print "\n# A software update is available:\n";
-         }
-         print join("\n", map { "#   * $_" } @$advice), "\n\n";
-      }
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
-   }
-
-   if ( @$instances_to_check ) {
-      eval {
-         update_check_times(
-            instances => $instances_to_check,
-            vc_file   => $args{vc_file},  # testing
-            now       => $args{now},      # testing
-         );
-      };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
-      }
-   }
-
-   if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
-      warn "Exiting because the PTDEBUG_VERSION_CHECK "
-         . "environment variable is defined.\n";
-      exit 255;
-   }
-
-   return;
-}
-
-sub get_instances_to_check {
-   my (%args) = @_;
-
-   my $instances = $args{instances};
-   my $now       = $args{now}     || int(time);
-   my $vc_file   = $args{vc_file} || version_check_file();
-
-   if ( !-f $vc_file ) {
-      PTDEBUG && _d('Version check file', $vc_file, 'does not exist;',
-         'version checking all instances');
-      return $instances;
-   }
-
-   open my $fh, '<', $vc_file or die "Cannot open $vc_file: $OS_ERROR";
-   chomp(my $file_contents = do { local $/ = undef; <$fh> });
-   PTDEBUG && _d('Version check file', $vc_file, 'contents:', $file_contents);
-   close $fh;
-   my %last_check_time_for = $file_contents =~ /^([^,]+),(.+)$/mg;
-
-   my $check_time_limit = version_check_time_limit();
-   my @instances_to_check;
-   foreach my $instance ( @$instances ) {
-      my $last_check_time = $last_check_time_for{ $instance->{id} };
-      PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
-         $last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
-         'hours until next check',
-         sprintf '%.2f',
-            ($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
-      if ( !defined $last_check_time
-           || ($now - $last_check_time) >= $check_time_limit ) {
-         PTDEBUG && _d('Time to check', Dumper($instance));
-         push @instances_to_check, $instance;
-      }
-   }
-
-   return \@instances_to_check;
-}
-
-sub update_check_times {
-   my (%args) = @_;
-
-   my $instances = $args{instances};
-   my $now       = $args{now}     || int(time);
-   my $vc_file   = $args{vc_file} || version_check_file();
-   PTDEBUG && _d('Updating last check time:', $now);
-
-   my %all_instances = map {
-      $_->{id} => { name => $_->{name}, ts => $now }
-   } @$instances;
-
-   if ( -f $vc_file ) {
-      open my $fh, '<', $vc_file or die "Cannot read $vc_file: $OS_ERROR";
-      my $contents = do { local $/ = undef; <$fh> };
-      close $fh;
-
-      foreach my $line ( split("\n", ($contents || '')) ) {
-         my ($id, $ts) = split(',', $line);
-         if ( !exists $all_instances{$id} ) {
-            $all_instances{$id} = { ts => $ts };  # original ts, not updated
-         }
-      }
-   }
-
-   open my $fh, '>', $vc_file or die "Cannot write to $vc_file: $OS_ERROR";
-   foreach my $id ( sort keys %all_instances ) {
-      PTDEBUG && _d('Updated:', $id, Dumper($all_instances{$id}));
-      print { $fh } $id . ',' . $all_instances{$id}->{ts} . "\n";
-   }
-   close $fh;
-
-   return;
-}
-
-sub get_instance_id {
-   my ($instance) = @_;
-
-   my $dbh = $instance->{dbh};
-   my $dsn = $instance->{dsn};
-
-   my $sql = q{SELECT CONCAT(@@hostname, @@port)};
-   PTDEBUG && _d($sql);
-   my ($name) = eval { $dbh->selectrow_array($sql) };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d($EVAL_ERROR);
-      $sql = q{SELECT @@hostname};
-      PTDEBUG && _d($sql);
-      ($name) = eval { $dbh->selectrow_array($sql) };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d($EVAL_ERROR);
-         $name = ($dsn->{h} || 'localhost') . ($dsn->{P} || 3306);
-      }
-      else {
-         $sql = q{SHOW VARIABLES LIKE 'port'};
-         PTDEBUG && _d($sql);
-         my (undef, $port) = eval { $dbh->selectrow_array($sql) };
-         PTDEBUG && _d('port:', $port);
-         $name .= $port || '';
-      }
-   }
-   my $id = md5_hex($name);
-
-   PTDEBUG && _d('MySQL instance:', $id, $name, Dumper($dsn));
-
-   return $name, $id;
-}
-
-
-sub pingback {
-   my (%args) = @_;
-   my @required_args = qw(url instances);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg arugment" unless $args{$arg};
-   }
-   my $url       = $args{url};
-   my $instances = $args{instances};
-
-   my $ua = $args{ua} || HTTPMicro->new( timeout => 3 );
-
-   my $response = $ua->request('GET', $url);
-   PTDEBUG && _d('Server response:', Dumper($response));
-   die "No response from GET $url"
-      if !$response;
-   die("GET on $url returned HTTP status $response->{status}; expected 200\n",
-       ($response->{content} || '')) if $response->{status} != 200;
-   die("GET on $url did not return any programs to check")
-      if !$response->{content};
-
-   my $items = parse_server_response(
-      response => $response->{content}
-   );
-   die "Failed to parse server requested programs: $response->{content}"
-      if !scalar keys %$items;
-      
-   my $versions = get_versions(
-      items     => $items,
-      instances => $instances,
-   );
-   die "Failed to get any program versions; should have at least gotten Perl"
-      if !scalar keys %$versions;
-
-   my $client_content = encode_client_response(
-      items      => $items,
-      versions   => $versions,
-      general_id => md5_hex( hostname() ),
-   );
-
-   my $client_response = {
-      headers => { "X-Percona-Toolkit-Tool" => File::Basename::basename($0) },
-      content => $client_content,
-   };
-   PTDEBUG && _d('Client response:', Dumper($client_response));
-
-   $response = $ua->request('POST', $url, $client_response);
-   PTDEBUG && _d('Server suggestions:', Dumper($response));
-   die "No response from POST $url $client_response"
-      if !$response;
-   die "POST $url returned HTTP status $response->{status}; expected 200"
-      if $response->{status} != 200;
-
-   return unless $response->{content};
-
-   $items = parse_server_response(
-      response   => $response->{content},
-      split_vars => 0,
-   );
-   die "Failed to parse server suggestions: $response->{content}"
-      if !scalar keys %$items;
-   my @suggestions = map { $_->{vars} }
-                     sort { $a->{item} cmp $b->{item} }
-                     values %$items;
-
-   return \@suggestions;
-}
-
-sub encode_client_response {
-   my (%args) = @_;
-   my @required_args = qw(items versions general_id);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg arugment" unless $args{$arg};
-   }
-   my ($items, $versions, $general_id) = @args{@required_args};
-
-   my @lines;
-   foreach my $item ( sort keys %$items ) {
-      next unless exists $versions->{$item};
-      if ( ref($versions->{$item}) eq 'HASH' ) {
-         my $mysql_versions = $versions->{$item};
-         for my $id ( sort keys %$mysql_versions ) {
-            push @lines, join(';', $id, $item, $mysql_versions->{$id});
-         }
-      }
-      else {
-         push @lines, join(';', $general_id, $item, $versions->{$item});
-      }
-   }
-
-   my $client_response = join("\n", @lines) . "\n";
-   return $client_response;
-}
-
-sub parse_server_response {
-   my (%args) = @_;
-   my @required_args = qw(response);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg arugment" unless $args{$arg};
-   }
-   my ($response) = @args{@required_args};
-
-   my %items = map {
-      my ($item, $type, $vars) = split(";", $_);
-      if ( !defined $args{split_vars} || $args{split_vars} ) {
-         $vars = [ split(",", ($vars || '')) ];
-      }
-      $item => {
-         item => $item,
-         type => $type,
-         vars => $vars,
-      };
-   } split("\n", $response);
-
-   PTDEBUG && _d('Items:', Dumper(\%items));
-
-   return \%items;
-}
-
-my %sub_for_type = (
-   os_version          => \&get_os_version,
-   perl_version        => \&get_perl_version,
-   perl_module_version => \&get_perl_module_version,
-   mysql_variable      => \&get_mysql_variable,
-);
-
-sub valid_item {
-   my ($item) = @_;
-   return unless $item;
-   if ( !exists $sub_for_type{ $item->{type} } ) {
-      PTDEBUG && _d('Invalid type:', $item->{type});
-      return 0;
-   }
-   return 1;
-}
-
-sub get_versions {
-   my (%args) = @_;
-   my @required_args = qw(items);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg arugment" unless $args{$arg};
-   }
-   my ($items) = @args{@required_args};
-
-   my %versions;
-   foreach my $item ( values %$items ) {
-      next unless valid_item($item);
-      eval {
-         my $version = $sub_for_type{ $item->{type} }->(
-            item      => $item,
-            instances => $args{instances},
-         );
-         if ( $version ) {
-            chomp $version unless ref($version);
-            $versions{$item->{item}} = $version;
-         }
-      };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d('Error getting version for', Dumper($item), $EVAL_ERROR);
-      }
-   }
-
-   return \%versions;
-}
-
-
-sub get_os_version {
-   if ( $OSNAME eq 'MSWin32' ) {
-      require Win32;
-      return Win32::GetOSDisplayName();
-   }
-
-  chomp(my $platform = `uname -s`);
-  PTDEBUG && _d('platform:', $platform);
-  return $OSNAME unless $platform;
-
-   chomp(my $lsb_release
-            = `which lsb_release 2>/dev/null | awk '{print \$1}'` || '');
-   PTDEBUG && _d('lsb_release:', $lsb_release);
-
-   my $release = "";
-
-   if ( $platform eq 'Linux' ) {
-      if ( -f "/etc/fedora-release" ) {
-         $release = `cat /etc/fedora-release`;
-      }
-      elsif ( -f "/etc/redhat-release" ) {
-         $release = `cat /etc/redhat-release`;
-      }
-      elsif ( -f "/etc/system-release" ) {
-         $release = `cat /etc/system-release`;
-      }
-      elsif ( $lsb_release ) {
-         $release = `$lsb_release -ds`;
-      }
-      elsif ( -f "/etc/lsb-release" ) {
-         $release = `grep DISTRIB_DESCRIPTION /etc/lsb-release`;
-         $release =~ s/^\w+="([^"]+)".+/$1/;
-      }
-      elsif ( -f "/etc/debian_version" ) {
-         chomp(my $rel = `cat /etc/debian_version`);
-         $release = "Debian $rel";
-         if ( -f "/etc/apt/sources.list" ) {
-             chomp(my $code_name = `awk '/^deb/ {print \$3}' /etc/apt/sources.list | awk -F/ '{print \$1}'| awk 'BEGIN {FS="|"} {print \$1}' | sort | uniq -c | sort -rn | head -n1 | awk '{print \$2}'`);
-             $release .= " ($code_name)" if $code_name;
-         }
-      }
-      elsif ( -f "/etc/os-release" ) { # openSUSE
-         chomp($release = `grep PRETTY_NAME /etc/os-release`);
-         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
-      }
-      elsif ( `ls /etc/*release 2>/dev/null` ) {
-         if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
-            $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
-         }
-         else {
-            $release = `cat /etc/*release | head -n1`;
-         }
-      }
-   }
-   elsif ( $platform =~ m/(?:BSD|^Darwin)$/ ) {
-      my $rel = `uname -r`;
-      $release = "$platform $rel";
-   }
-   elsif ( $platform eq "SunOS" ) {
-      my $rel = `head -n1 /etc/release` || `uname -r`;
-      $release = "$platform $rel";
-   }
-
-   if ( !$release ) {
-      PTDEBUG && _d('Failed to get the release, using platform');
-      $release = $platform;
-   }
-   chomp($release);
-
-   $release =~ s/^"|"$//g;
-
-   PTDEBUG && _d('OS version =', $release);
-   return $release;
-}
-
-sub get_perl_version {
-   my (%args) = @_;
-   my $item = $args{item};
-   return unless $item;
-
-   my $version = sprintf '%vd', $PERL_VERSION;
-   PTDEBUG && _d('Perl version', $version);
-   return $version;
-}
-
-sub get_perl_module_version {
-   my (%args) = @_;
-   my $item = $args{item};
-   return unless $item;
-
-   my $var     = '$' . $item->{item} . '::VERSION';
-   my $version = eval "use $item->{item}; $var;";
-   PTDEBUG && _d('Perl version for', $var, '=', $version);
-   return $version;
-}
-
-sub get_mysql_variable {
-   return get_from_mysql(
-      show => 'VARIABLES',
-      @_,
-   );
-}
-
-sub get_from_mysql {
-   my (%args) = @_;
-   my $show      = $args{show};
-   my $item      = $args{item};
-   my $instances = $args{instances};
-   return unless $show && $item;
-
-   if ( !$instances || !@$instances ) {
-      PTDEBUG && _d('Cannot check', $item,
-         'because there are no MySQL instances');
-      return;
-   }
-
-   my @versions;
-   my %version_for;
-   foreach my $instance ( @$instances ) {
-      next unless $instance->{id};  # special system instance has id=0
-      my $dbh = $instance->{dbh};
-      local $dbh->{FetchHashKeyName} = 'NAME_lc';
-      my $sql = qq/SHOW $show/;
-      PTDEBUG && _d($sql);
-      my $rows = $dbh->selectall_hashref($sql, 'variable_name');
-
-      my @versions;
-      foreach my $var ( @{$item->{vars}} ) {
-         $var = lc($var);
-         my $version = $rows->{$var}->{value};
-         PTDEBUG && _d('MySQL version for', $item->{item}, '=', $version,
-            'on', $instance->{name});
-         push @versions, $version;
-      }
-      $version_for{ $instance->{id} } = join(' ', @versions);
-   }
-
-   return \%version_for;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End VersionCheck package
-# ###########################################################################
-
-######################################################################
-# program execution begins here
-######################################################################
-
-# check command-line args
-check_args();
-
-# print program version and copyright
-print_version();
-
-# initialize global variables and perform some checks
-if ($option_backup) {
-    # backup
-    %mysql = mysql_connect(abort_on_error => 1);
-
-    check_server_version();
-
-    if ($option_version_check) {
-        $now = current_time();
-        print STDERR
-            "$now  $prefix Executing a version check against the server...\n";
-
-        # Redirect STDOUT to STDERR, as VersionCheck prints alerts to STDOUT
-        select STDERR;
-
-        VersionCheck::version_check(
-                                    force => 1,
-                                    instances => [ {
-                                                    dbh => $mysql{dbh},
-                                                    dsn => $mysql{dsn}
-                                                   }
-                                                 ]
-                                    );
-        # Restore STDOUT as the default filehandle
-        select STDOUT;
-
-        $now = current_time();
-        print STDERR "$now  $prefix Done.\n";
-    }
-}
-init();
-
-my $ibbackup_exit_code = 0;
-
-if ($option_decompress || $option_decrypt) {
-    # decrypt/decompress files
-    if ($option_decompress && $option_decrypt) {
-      # Call mode 0 first as it is fastest but may cause stream buffer overruns
-      # requiring user invoke innobackupex twice, once for decrypt and again
-      # for decompress. Mode 0 will take .qb.xbcrypt and run it through
-      # xbcrypt | qpress > result. This should get all InnoDB files but any
-      # metadata or MyISAM, etc. will not be .qp.xbcrypt, only .xbcrypt
-      decrypt_decompress(0);
-      # Now call mode 1 to decrypt any uncompressed files, those with only a
-      # .xbcrypt extension
-      decrypt_decompress(1);
-      # Now, just in case there were any compressed files only, run throuh and
-      # decompress any .qp files
-      decrypt_decompress(2);
-    } elsif ($option_decompress) {
-      decrypt_decompress(2);
-    } else {
-      decrypt_decompress(1);
-    }
-} elsif ($option_copy_back) {
-    # copy files from backup directory back to their original locations
-    copy_back(0);
-} elsif ($option_move_back) {
-    # move files from backup directory back to their original locations
-    copy_back(1);
-} elsif ($option_apply_log) {
-    # expand data files in backup directory by applying log files to them
-    apply_log();
-} else {
-    # make a backup of InnoDB and MyISAM tables, indexes and .frm files.
-    $ibbackup_exit_code = backup();
-
-    mysql_close(\%mysql);
-}
-
-$now = current_time();
-
-if ($option_stream eq 'tar') {
-   print STDERR "$prefix You must use -i (--ignore-zeros) option for extraction of the tar stream.\n";
-}
-
-if ( $ibbackup_exit_code == 0 ) {
-   # program has completed successfully
-   print STDERR "$now  $prefix completed OK!\n";
-}
-else {
-   print STDERR "$now  $prefix $option_ibbackup_binary failed! (exit code $ibbackup_exit_code)  The backup may not be complete.\n";
-}
-
-exit $ibbackup_exit_code;
-
-######################################################################
-# end of program execution
-######################################################################
-
-
-#
-# print_version subroutine prints program version and copyright.
-#
-sub print_version {
-    my $distribution = "@XB_DISTRIBUTION@";
-
-    printf(STDERR $copyright_notice);
-
-    if ($distribution) {
-        printf STDERR "Get the latest version of Percona XtraBackup, " .
-            "documentation, and help resources:\n";
-        printf STDERR "http://www.percona.com/xb/$distribution\n\n";
-    }
-}
-
-
-#
-# usage subroutine prints instructions of how to use this program to stdout.
-#
-sub usage {
-   my $msg = shift || '';
-   pod2usage({ -msg => $msg, -verbose => 1, -exitval => "NOEXIT"});
-   return 0;
-}
-
-
-#
-# return current local time as string in form "070816 12:23:15"
-#
-sub current_time {
-    return strftime("%y%m%d %H:%M:%S", localtime());
-}
-
-#
-# Global initialization:
-#
-# - embed the HTTPMicro and VersionCheck modules by setting %INC to this
-#   file, so Perl does not try to load those modules from @INC
-#
-# - Override the 'die' builtin to customize the format of error messages
-#
-# - Setup signal handlers to terminate gracefully on fatal signals
-#
-BEGIN {
-    $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
-      HTTPMicro
-      VersionCheck
-      ));
-
-    *CORE::GLOBAL::die = sub {
-
-        print STDERR "$prefix Error: @_";
-
-        # Mimic the default 'die' behavior: append information about the caller
-        # and the new line, if the argument does not already end with a newline
-        if ($_[-1] !~ m(\n$)) {
-            my ($pkg, $file, $line) = caller 0;
-
-            print STDERR " at $file line $line.\n";
-        }
-
-        exit(1);
-    };
-
-    foreach ('HUP', 'INT', 'QUIT', 'ABRT', 'PIPE', 'TERM', 'XFSZ') {
-        $SIG{$_} = \&catch_fatal_signal;
-    }
-}
-
-#
-# Make sure all child processes are killed on exit. This doesn't cover cases
-# when innobackupex is terminated with a signal.
-#
-END {
-    # We only want to execute this in the parent script process, and ignore
-    # for all child processes it may spawn
-    if ($$ == $innobackupex_pid) {
-        kill_child_processes();
-    }
-}
-
-#
-# kill child processes spawned by the script
-#
-sub kill_child_processes {
-    if ($ibbackup_pid) {
-        kill($kill_signal, $ibbackup_pid);
-        wait_for_ibbackup_finish();
-    }
-    stop_query_killer();
-}
-
-sub catch_fatal_signal {
-    # Don't print anything if a child process is terminated with a signal
-    if ($$ == $innobackupex_pid) {
-        die "Terminated with SIG$_[0]"
-    } else {
-        exit(1);
-    }
-}
-
-#
-# Finds all files that match the given pattern recursively beneath
-# the given directory. Returns a list of files with their paths relative 
-# to the starting search directory.
-#
-sub find_all_matching_files {
-  my $dir = shift;
-  my $pattern = shift;
-  my $child;
-  my @dirlist;
-  my @retlist;
- 
-  opendir(FINDDIR, $dir)
-        || die "Can't open directory '$dir': $!";
-
-  while (defined($child = readdir(FINDDIR))) {
-    next if $child eq "." || $child eq "..";
-    if ($child =~ m/$pattern/) { push(@retlist, "$dir/$child"); }
-    elsif ( -d "$dir/$child") { push(@dirlist, "$dir/$child"); }
-  }
-  closedir(FINDDIR);
-
-  foreach $child (@dirlist) {
-    push(@retlist, find_all_matching_files("$child", "$pattern"));
-  }
-  return (@retlist);
-}
-
-#
-# decrypts and/or decompresses an individual file amd removes the source
-# on success.
-# mode is same mode as defined for sub decrypt_decompress()
-sub decrypt_decompress_file {
-  my $mode = shift;
-  my $file = shift;
-  my $file_ext = shift;
-  my $decrypt_opts = shift;
-
-  my $file_cmd;
-  my $dest_file=substr($file, 0, length($file) - length($file_ext));
-
-  if ($mode == 0) {
-    $file_cmd = "xbcrypt --decrypt $decrypt_opts --input=" . $file . " | qpress -dio > " . $dest_file;
-  } elsif ($mode == 1) {
-    $file_cmd = "xbcrypt --decrypt $decrypt_opts --input=" . $file . " --output=" . $dest_file;
-  } elsif ($mode == 2) {
-    $file_cmd = "qpress -do " . $file . " > " . $dest_file;
-  } else {
-    die "Unknown decrypt_decompress mode : $mode";
-  }
-  print STDERR "$prefix $file_cmd\n";
-  system("$file_cmd") && die "$file_cmd failed with $!";
-  system("rm -f $file");
-}
-
-#
-# Decrypts and decompresses a backup made with --compress and/or --encrypt
-#
-# mode 0 = decrypt and decompress .qp.xbcrypt files
-# mode 1 = decrypt .xbcrypt files
-# mode 2 = decompress .qp files
-#
-sub decrypt_decompress {
-  my $mode = shift;
-  my $file_ext;
-  my $decrypt_opts = '';
-  my @files;
-
-  # first, build out the decryption opts. They will not be used and option
-  # values may not be specified if doing decompress only.
-  if ($mode != 2) {
-    if ($option_decrypt) {
-      $decrypt_opts = "--encrypt-algo=$option_decrypt"
-    }
-    if ($option_encrypt_key) {
-      $decrypt_opts = $decrypt_opts . " --encrypt-key=$option_encrypt_key";
-    } elsif ($option_encrypt_key_file) {
-      $decrypt_opts = $decrypt_opts . " --encrypt-key-file=$option_encrypt_key_file";
-    }
-  }
-
-  # based on the mode, determine which files we are interested in
-  if ($mode == 0) {
-    $file_ext = ".qp.xbcrypt";
-  } elsif ($mode == 1) {
-    $file_ext = ".xbcrypt";
-  } elsif ($mode == 2) {
-    $file_ext = ".qp";
-  } else {
-    die "Unknown decrypt_decompress mode : $mode";
-  }
-
-  # recursively find all files of interest in the backup set
-  @files = find_all_matching_files("$backup_dir", "\\$file_ext\$");
-
-  # runing serially
-  if (!$option_parallel) {
-    my $file;
-    foreach $file (@files) {
-      decrypt_decompress_file($mode, $file, $file_ext, $decrypt_opts);
-    }
-  # running parallel, FUN!
-  } else {
-    my @pids;
-    my @workingfiles;
-    my $file;
-    my $freepidindex;
-    
-    # this will maintain the list of forks so we can wait for completion
-    # and check return status as well as stay within the limits of the 
-    # --parallel value
-    $pids[$option_parallel - 1] = undef;
-
-    # this is the file for which each fork is currently working on. just
-    # used for logging/reporting purposed in case of a failure.
-    $workingfiles[$option_parallel - 1] = undef;
-
-    foreach $file (@files) {
-      # this while loop below tries to find an unused child/fork slot, ie, one
-      # that is not currently working/running. it will loop indefinitely,
-      # iterating the number of slots and watching for a child to finish
-      # and use that now vacant slot.
-      $freepidindex=$option_parallel;
-      while ($freepidindex >= $option_parallel) {
-        for ($freepidindex = 0; $freepidindex < $option_parallel; $freepidindex++) {
-          last if not defined $pids[$freepidindex];
-
-          my $status = waitpid($pids[$freepidindex], WNOHANG);
-          if ($status == $pids[$freepidindex]) {
-            my $childretcode = $? >> 8;
-            if ($childretcode != 0) {
-              die "Child failed on $workingfiles[$freepidindex] : $childretcode";
-            }
-            last;
-          } elsif ($status == -1) {
-            die "waitpid failed on $workingfiles[$freepidindex] : $status";
-          }
-        }
-        # couldn't find a free slot yet so sleep for 1/10 th of a second or so.
-        # sleeping for a much longer (even a second) can make the whole process
-        # take longer when there are a lot of smaller files to process as they
-        # can be done very quickly. 1/10th doesn't seem to add any real overhead
-        # to this controlling process when compared to letting it spin freely.
-        if ($freepidindex >= $option_parallel) {
-          usleep(100000);
-        }
-      }
-      # so now we have a slot identified by freepidindex, set up the workingfiles,
-      # fork and do the work.
-      $workingfiles[$freepidindex] = $file;
-      $pids[$freepidindex] = fork();
-      if ($pids[$freepidindex] == 0) {
-        decrypt_decompress_file($mode, $file, $file_ext, $decrypt_opts);
-        exit 0;
-      }
-    }
-    # we've started processing of all files that we know about, now just need
-    # to wait for the last bunch to finish up and check for any errors before
-    # returning.
-    for ($freepidindex = 0; $freepidindex < $option_parallel; $freepidindex++) {
-      next if not defined $pids[$freepidindex];
-      my $status = waitpid($pids[$freepidindex], 0);
-      my $childretcode = $? >> 8;
-      if ($status == $pids[$freepidindex]) {
-        if ($childretcode != 0) {
-          die "Child failed on $workingfiles[$freepidindex] : $childretcode";
-        }
-      } else {
-        die "waitpid failed on $workingfiles[$freepidindex] : $status";
-      }
-    }
-  }
-}
- 
-#
-# backup subroutine makes a backup of InnoDB and MyISAM tables, indexes and 
-# .frm files. It connects to the database server and runs ibbackup as a child
-# process.
-#
-sub backup {
-    my $orig_datadir = get_option(\%config, $option_defaults_group, 'datadir');
-    my $suspend_file;
-    my $buffer_pool_filename = get_option(\%config, $option_defaults_group,
-                                          'innodb_buffer_pool_filename');
-
-    detect_mysql_capabilities_for_backup(\%mysql);
-
-    #
-    # if one of the history incrementals is being used, try to grab the
-    # innodb_to_lsn from the history table and set the option_incremental_lsn
-    #
-    if ($option_incremental && !$option_incremental_lsn) {
-        if ($option_incremental_history_name) {
-            my $query = "SELECT innodb_to_lsn ".
-                        "FROM PERCONA_SCHEMA.xtrabackup_history ".
-                        "WHERE name = '$option_incremental_history_name' ".
-                        "AND innodb_to_lsn IS NOT NULL ".
-                        "ORDER BY innodb_to_lsn DESC LIMIT 1";
-
-            eval {
-                $option_incremental_lsn =
-                    $mysql{dbh}->selectrow_hashref($query)->{innodb_to_lsn};
-            } || die("Error while attempting to find history record for name ".
-                     "'$option_incremental_history_name'\n");
-            print STDERR "$prefix --incremental-history-name=".
-                "$option_incremental_history_name specified.".
-                "Found and using lsn: $option_incremental_lsn";
-        } elsif ($option_incremental_history_uuid) {
-            my $query = "SELECT innodb_to_lsn ".
-                        "FROM PERCONA_SCHEMA.xtrabackup_history ".
-                        "WHERE uuid = '$option_incremental_history_uuid' ".
-                        "AND innodb_to_lsn IS NOT NULL";
-
-            eval {
-                $option_incremental_lsn =
-                    $mysql{dbh}->selectrow_hashref($query)->{innodb_to_lsn};
-            } || die("Error while attempting to find history record for uuid ".
-                     "'$option_incremental_history_uuid'\n");
-            print STDERR "$prefix --incremental-history-uuid=".
-                "$option_incremental_history_uuid specified.".
-                "Found and using lsn: $option_incremental_lsn";
-        }
-    }
-
-    # start ibbackup as a child process
-    start_ibbackup();
-
-    if ($option_incremental && $have_changed_page_bitmaps
-        && !$option_incremental_force_scan) {
-        $suspend_file = $work_dir . $xb_fn_suspended_at_start;
-        wait_for_ibbackup_suspend($suspend_file);
-        mysql_query(\%mysql, 'FLUSH NO_WRITE_TO_BINLOG CHANGED_PAGE_BITMAPS');
-        resume_ibbackup($suspend_file);
-    }
-
-    # wait for ibbackup to suspend itself
-    $suspend_file = $work_dir . $xb_fn_suspended_at_end;
-    wait_for_ibbackup_suspend($suspend_file);
-
-    if (!$option_no_lock) {
-      if ($option_safe_slave_backup) {
-        wait_for_safe_slave(\%mysql);
-      }
-
-      # make a prep copy before locking tables, if using rsync
-      backup_files(1);
-
-      # start counting how long lock is held for history
-      $history_lock_time = time();
-
-      # lock tables
-      mysql_lock_tables(\%mysql);
-    }
-
-    # backup non-InnoDB files and tables
-    # (or finalize the backup by syncing changes if using rsync)
-    backup_files(0);
-
-    # There is no need to stop slave thread before coping non-Innodb data when
-    # --no-lock option is used because --no-lock option requires that no DDL or
-    # DML to non-transaction tables can occur.
-    if ($option_no_lock) {
-        if ($option_safe_slave_backup) {
-            wait_for_safe_slave(\%mysql);
-        }
-        if ($option_slave_info) {
-            write_slave_info(\%mysql);
-        }
-    } else {
-        mysql_lock_binlog(\%mysql);
-
-        if ($option_slave_info) {
-            write_slave_info(\%mysql);
-        }
-    }
-
-    # The only reason why Galera/binlog info is written before
-    # wait_for_ibbackup_log_copy_finish() is that after that call the xtrabackup
-    # binary will start streamig a temporary copy of REDO log to stdout and
-    # thus, any streaming from innobackupex would interfere. The only way to
-    # avoid that is to have a single process, i.e. merge innobackupex and
-    # xtrabackup.
-    if ($option_galera_info) {
-        write_galera_info(\%mysql);
-    }
-
-    write_binlog_info(\%mysql);
-
-    if ($have_flush_engine_logs) {
-        my $now = current_time();
-        print STDERR "$now  $prefix Executing FLUSH ENGINE LOGS...\n";
-        mysql_query(\%mysql, "FLUSH ENGINE LOGS");
-    }
-
-    # resume XtraBackup and wait till it has finished
-    resume_ibbackup($suspend_file);
-    $suspend_file = $work_dir . $xb_fn_log_copied;
-    wait_for_ibbackup_log_copy_finish($suspend_file);
-
-    # release all locks
-    if (!$option_no_lock) {
-        mysql_unlock_all(\%mysql);
-    }
-
-    # calculate how long lock was held for history
-    if ($option_no_lock) {
-      $history_lock_time = 0;
-    } else {
-      $history_lock_time = time() - $history_lock_time;
-    }
-
-    if ( $option_safe_slave_backup && $sql_thread_started) {
-      print STDERR "$prefix: Starting slave SQL thread\n";
-      mysql_query(\%mysql, 'START SLAVE SQL_THREAD;');
-    }
-
-    my $ibbackup_exit_code = wait_for_ibbackup_finish();
-
-    # copy ib_lru_dump
-    # Copy buffer poll dump and/or LRU dump
-    foreach my $dump_name ($buffer_pool_filename, 'ib_lru_dump') {
-      if (!$option_rsync && -e "$orig_datadir/$dump_name") {
-        backup_file("$orig_datadir", "$dump_name", "$backup_dir/$dump_name")
-      }
-    }
-
-    print STDERR "\n$prefix Backup created in directory '$backup_dir'\n";
-    if ($mysql_binlog_position) {
-        print STDERR "$prefix MySQL binlog position: $mysql_binlog_position\n";
-    }
-    if ($mysql_slave_position && $option_slave_info) {
-        print STDERR "$prefix MySQL slave binlog position: $mysql_slave_position\n";
-    }
-
-    write_xtrabackup_info(\%mysql);
-
-    return $ibbackup_exit_code;
-}
-
-
-#
-# are_equal_innodb_data_file_paths subroutine checks if the given
-# InnoDB data file option values are equal.
-#   Parameters:
-#     str1    InnoDB data file path option value
-#     str2    InnoDB data file path option value
-#   Return value:
-#     1  if values are equal
-#     0  otherwise
-#
-sub are_equal_innodb_data_file_paths {
-    my $str1 = shift;
-    my $str2 = shift;
-    my @array1 = split(/;/, $str1);
-    my @array2 = split(/;/, $str2);
-    
-    if ($#array1 != $#array2) { return 0; }
-
-    for (my $i = 0; $i <= $#array1; $i++) {
-        my @def1 = split(/:/, $array1[$i]);
-        my @def2 = split(/:/, $array2[$i]);
-        
-        if ($#def1 != $#def2) { return 0; }
-
-        for (my $j = 0; $j <= $#def1; $j++) {
-            if ($def1[$j] ne $def2[$j]) { return 0; }
-        }
-    }
-    return 1;
-}        
-
-
-#
-# copy_if_exists subroutin attempt to copy a file from $src to $dst
-# If the copy fails due to the file not existing, the error is ignored
-#  Parameters:
-#    $src    The source file to copy
-#    $dst    The destination to copy to
-#  Return value:
-#    1  if copy was successful, or unsuccessful but the source file didn't exist
-#    0  otherwise
-#
-sub copy_if_exists {
-    my $src = shift;
-    my $dst = shift;
-
-    # Copy the file
-    if( system("$CP_CMD \"$src\" \"$dst\"") != 0 ) {
-        # if the copy failed, check if the file exists
-        if( -e "$src" ) {
-            # if the file exists, we had a real error
-            return 0;
-        }
-    }
-    # Success otherwise
-    return 1;
-}
-
-
-#
-# is_in_array subroutine checks if the given string is in the array.
-#   Parameters:
-#     str       a string
-#     array_ref a reference to an array of strings
-#   Return value:
-#     1  if string is in the array
-#     0  otherwise
-# 
-sub is_in_array {
-    my $str = shift;
-    my $array_ref = shift;
-
-    if (grep { $str eq $_ } @{$array_ref}) {
-        return 1;
-    }
-    return 0;
-}
-
-#
-# Check if a given directory exists, or fail with an error otherwise
-#
-
-sub if_directory_exists {
-    my $empty_dir = shift;
-    my $is_directory_empty_comment = shift;
-    if (! -d $empty_dir) {
-        die "$is_directory_empty_comment directory '$empty_dir' does not exist!";
-    }
-}
-
-#
-# if_directory_exists_and_empty accepts two arguments:
-# variable with directory name and comment.
-# Sub checks that directory exists and is empty
-# usage: is_directory_exists_and_empty($directory,"Comment");
-#
-
-sub if_directory_exists_and_empty {
-    my $empty_dir = shift;
-    my $is_directory_empty_comment = shift;
-
-    if_directory_exists($empty_dir, $is_directory_empty_comment);
-
-    if (!$option_force_non_empty_dirs) {
-        opendir (my $dh, $empty_dir) or
-            die "$is_directory_empty_comment directory '$empty_dir': Not a directory";
-        if ( ! scalar( grep { $_ ne "." && $_ ne ".." && $_ ne "my.cnf" &&
-                                  $_ ne "master.info"} readdir($dh)) == 0) {
-            die "$is_directory_empty_comment directory '$empty_dir' is not empty!";
-        }
-        closedir($dh);
-    }
-}
-
-#
-# Fail with an error if file exists
-#
-
-sub die_if_exists {
-    my $path = shift;
-
-    if (-e $path) {
-        die "Cannot overwrite file: $path";
-    }
-}
-
-#
-# copy() wrapper with error handling
-#
-sub copy_file {
-    my $src_path = shift;
-    my $dst_path = shift;
-
-    print STDERR "$prefix Copying '$src_path' to '$dst_path'\n";
-    copy($src_path, $dst_path) or die "copy failed: $!";
-}
-
-#
-# move() wrapper with error handling
-#
-sub move_file {
-    my $src_path = shift;
-    my $dst_path = shift;
-
-    print STDERR "$prefix Moving '$src_path' to '$dst_path'\n";
-    move($src_path, $dst_path) or die "move failed: $!";
-}
-
-
-#
-# Auxiliary function called from find() callbacks to copy or move files and create directories
-# when necessary.
-#
-# SYNOPSIS
-#
-#     process_file(\&process_func);
-#
-#       &process_func is a code reference that does the actual file operation
-#
-sub process_file {
-    my $process_func = shift;
-    my $dst_path;
-
-    if (/$process_dir_exclude_regexp/) {
-	return;
-    }
-
-    # If requested, check if there is a "link" in the .isl file for an InnoDB
-    # tablespace and use it as a destination path.
-    if ($copy_dir_resolve_isl && $File::Find::name =~ m/\.ibd$/) {
-        my $isl_path;
-
-        ($isl_path = $File::Find::name) =~ s/\.ibd$/.isl/;
-        if (-e "$isl_path") {
-            my @lines;
-            print STDERR "Found an .isl file for $File::Find::name\n";
-            file_to_array($isl_path, \@lines);
-            $dst_path = $lines[0];
-            print STDERR "Using $dst_path as the destination path\n";
-        }
-    }
-
-    if (! defined $dst_path) {
-        ($dst_path = $File::Find::name) =~ s/^$copy_dir_src/$copy_dir_dst/;
-    }
-
-    if (-d "$File::Find::name") {
-	# Create the directory in the destination if necessary
-	if (! -e "$dst_path") {
-	    print STDERR "$prefix Creating directory '$dst_path'\n";
-	    mkdir "$dst_path" or die "mkdir failed: $!";
-	} elsif (! -d "$dst_path") {
-	    die "$dst_path exists, but is not a directory";
-	}
-    } else {
-	# Don't overwrite files unless $copy_dir_overwrite is 1
-	if (!$copy_dir_overwrite && -e "$copy_dir_dst/$_") {
-	    die "Failed to process file $File::Find::name: " .
-		"not overwriting file $copy_dir_dst/$_";
-	}
-
-	&$process_func($File::Find::name, $dst_path);
-        (my $rel_path = $File::Find::name) =~ s/^$copy_dir_src//;
-        $processed_files{$rel_path} = 1;
-    }
-}
-
-#
-# find() callback to copy files
-#
-sub copy_file_callback {
-    process_file(\&copy_file);
-}
-
-#
-# find() callback to move files
-#
-sub move_file_callback {
-    process_file(\&move_file);
-}
-
-#
-# find() callback to remove files
-#
-sub remove_file_callback {
-    if (/$process_dir_exclude_regexp/) {
-        return;
-    }
-    if (-d "$File::Find::name") {
-        return;
-    }
-    (my $rel_path = $File::Find::name) =~ s/^$cleanup_dir_dst//;
-    if (!($rel_path =~ m/\//)) {
-        return;
-    }
-    if (! exists $processed_files{$rel_path}) {
-        unlink($File::Find::name) or
-            die "Cannot remove file $File::Find::name";
-    }
-}
-
-# copy_dir_recursively subroutine does a recursive copy of a specified directory
-# excluding files matching a specifies regexp. If $overwrite is 1, it overwrites
-# the existing files. If $resolve_isl is 1, it also resolves InnoDB .isl files,
-# i.e. copies to the absolute path specified in the corresponding .isl file
-# rather than the default location
-#
-# SYNOPSIS 
-#
-#     copy_dir_recursively($src_dir, $dst_dir, $exclude_regexp,
-#                          $overwrite, $resolve_isl);
-#
-# TODO
-#
-#     use rsync when --rsync is specified
-#
-sub copy_dir_recursively {
-    # Clean paths and remove trailing slashes if any
-    $copy_dir_src = File::Spec->canonpath(shift);
-    $copy_dir_dst = File::Spec->canonpath(shift);
-    $process_dir_exclude_regexp = shift;
-    $copy_dir_overwrite = shift;
-    $copy_dir_resolve_isl = shift;
-
-    undef %processed_files;
-    find(\&copy_file_callback, $copy_dir_src);
-}
-
-#
-# Similar to copy_dir_recursively, but moves files instead.
-#
-# SYNOPSIS
-#
-#     move_dir_recursively($src_dir, $dst_dir, $exclude_regexp,
-#                          $overwrite, $resolve_isl);
-#
-# TODO
-#
-#     use rsync when --rsync is specified
-#
-sub move_dir_recursively {
-    # Clean paths and remove trailing slashes if any
-    $copy_dir_src = File::Spec->canonpath(shift);
-    $copy_dir_dst = File::Spec->canonpath(shift);
-    $process_dir_exclude_regexp = shift;
-    $copy_dir_overwrite = shift;
-    $copy_dir_resolve_isl = shift;
-
-    undef %processed_files;
-    find(\&move_file_callback, $copy_dir_src);
-}
-
-#
-# cleanup_dir_recursively subroutine removes files from directory
-# excluding files matching a specifies regexp and files listed in
-# processed_files.
-#
-# SYNOPSIS 
-#
-#     cleanup_dir_recursively($dir, $exclude_regexp);
-#
-sub cleanup_dir_recursively {
-    # Clean paths and remove trailing slashes if any
-    $cleanup_dir_dst = File::Spec->canonpath(shift);
-    $process_dir_exclude_regexp = shift;
-    find(\&remove_file_callback, $cleanup_dir_dst);
-}
-
-#
-# parse_innodb_data_file_path parse innodb_data_file_path and returns
-# it components as array of hash refs. Each hash ref has two components
-# the one named 'path' is the data file path as specified in the
-# innodb-data-file-path, second one named 'filename' is the data file name
-#
-sub parse_innodb_data_file_path {
-    my $innodb_data_file_path = shift;
-    my @data_file_paths = ();
-
-    foreach my $data_file (split(/;/, $innodb_data_file_path)) {
-        my $data_file_path = (split(/:/,$data_file))[0];
-        my $data_file_name = (split(/\/+/, $data_file_path))[-1];
-        push(@data_file_paths, {path => $data_file_path,
-                                filename => $data_file_name});
-    }
-
-    return @data_file_paths;
-}
-
-#
-# copy_back subroutine copies data and index files from backup directory 
-# back to their original locations.
-#
-sub copy_back {
-    my $move_flag = shift;
-    my $orig_datadir = get_option(\%config, $option_defaults_group, 'datadir');
-    my $orig_ibdata_dir = 
-        get_option(\%config, $option_defaults_group, 'innodb_data_home_dir');
-    my $orig_innodb_data_file_path = 
-        get_option(\%config, $option_defaults_group, 'innodb_data_file_path');
-    my $orig_iblog_dir =
-        get_option(\%config, $option_defaults_group, 'innodb_log_group_home_dir');
-    my $orig_undo_dir = $orig_ibdata_dir;
-    my $iblog_files = 'ib_logfile.*';
-    my $ibundo_files = 'undo[0-9]{3}';
-    my $excluded_files = 
-        '\.\.?|backup-my\.cnf|xtrabackup_logfile|' .
-        'xtrabackup_binary|xtrabackup_binlog_info|xtrabackup_checkpoints|' .
-        '.*\.qp|' .
-        '.*\.pmap|.*\.tmp|' .
-        $iblog_files . '|'.
-        $ibundo_files;
-    my $compressed_data_file = '.*\.ibz$';
-    my $file;
-    my $backup_innodb_data_file_path;
-
-    if (has_option(\%config, $option_defaults_group, 'innodb_doublewrite_file')) {
-        my $doublewrite_file =
-                get_option(\%config, $option_defaults_group,
-                            'innodb_doublewrite_file');
-        $excluded_files = $excluded_files . '|' . $doublewrite_file;
-    }
-
-    if (has_option(\%config, $option_defaults_group, 'innodb_undo_directory')) {
-        $orig_undo_dir = get_option(\%config, $option_defaults_group,
-                                    'innodb_undo_directory');
-    }
-    # check whether files should be copied or moved to dest directory
-    my $move_or_copy_file = $move_flag ? \&move_file : \&copy_file;
-    my $move_or_copy_dir = $move_flag ?
-        \&move_dir_recursively : \&copy_dir_recursively;
-    my $operation = $move_flag ? "move" : "copy";
-
-
-    # check that original data directories exist and they are empty
-    if_directory_exists_and_empty($orig_datadir, "Original data");
-    if ($orig_ibdata_dir) {
-        if_directory_exists($orig_ibdata_dir, "Original InnoDB data");
-    }
-    if_directory_exists($orig_iblog_dir, "Original InnoDB log");
-    if ($orig_undo_dir) {
-        if_directory_exists($orig_undo_dir,
-                                      "Original undo directory");
-    }
-
-    # make a list of all ibdata files in the backup directory and all
-    # directories in the backup directory under which there are ibdata files
-    foreach my $c (parse_innodb_data_file_path($orig_innodb_data_file_path)) {
-
-        # check that the backup data file exists
-        if (! -e "$backup_dir/$c->{filename}") {
-            if (-e "$backup_dir/$c->{filename}.ibz") {
-                die "Backup data file '$backup_dir/$c->{filename}' "
-                  . "does not exist, but "
-                  . "its compressed copy '$c->{path}.ibz' exists. Check "
-                  . "that you have decompressed "
-                  . " before attempting "
-                  . "'$innobackup_script --copy-back ...'  "
-                  . "or '$innobackup_script --move-back ...' !";
-            } elsif (-e "$backup_dir/$c->{filename}.qp") {
-                die "Backup data file '$backup_dir/$c->{filename}' "
-                  . "does not exist, but "
-                  . "its compressed copy '$c->{path}.qp' exists. Check "
-                  . "that you have run "
-                  . "'$innobackup_script --decompress "
-                  . "...' before attempting "
-                  . "'$innobackup_script --copy-back ...'  "
-                  . "or '$innobackup_script --move-back ...' !";
-            } elsif (-e "$backup_dir/$c->{filename}.xbcrypt") {
-                die "Backup data file '$backup_dir/$c->{filename}' "
-                  . "does not exist, but "
-                  . "its compressed copy '$c->{path}.xbcrypt' exists. Check "
-                  . "that you have run "
-                  . "'$innobackup_script --decrypt "
-                  . "...' before attempting "
-                  . "'$innobackup_script --copy-back ...'  "
-                  . "or '$innobackup_script --move-back ...' !";
-            } else {
-                die "Backup data file '$backup_dir/$c->{filename}' "
-                    . "does not exist.";
-            }
-        }
-	
-        $excluded_files .= "|\Q$c->{filename}\E";
-    }
-
-    # copy files from backup dir to their original locations
-
-    # copy files to original data directory
-    my $excluded_regexp = '^(' . $excluded_files . ')$';
-    print STDERR "$prefix Starting to $operation files in '$backup_dir'\n"; 
-    print STDERR "$prefix back to original data directory '$orig_datadir'\n";
-    &$move_or_copy_dir($backup_dir, $orig_datadir, $excluded_regexp, 0, 1);
-
-    # copy InnoDB data files to original InnoDB data directory
-    print STDERR "\n$prefix Starting to $operation InnoDB system tablespace\n";
-    print STDERR "$prefix in '$backup_dir'\n";
-    print STDERR "$prefix back to original InnoDB data directory '$orig_ibdata_dir'\n";
-    foreach my $c (parse_innodb_data_file_path($orig_innodb_data_file_path)) {
-        # get the relative pathname of a data file
-        $src_name = escape_path("$backup_dir/$c->{filename}");
-        if ($orig_ibdata_dir) {
-            $dst_name = escape_path("$orig_ibdata_dir/$c->{path}");
-        } else {
-            # If innodb_data_home_dir is empty, but file path(s) in
-            # innodb_data_file_path are relative, InnoDB treats them as if
-            # innodb_data_home_dir was the same as datadir.
-
-            my $dst_root = ($c->{path} =~ /^\//) ? "" : $orig_datadir;
-            $dst_name = escape_path("$dst_root/$c->{path}");
-        }
-        die_if_exists($dst_name);
-        &$move_or_copy_file($src_name, $dst_name);
-    }
-
-    # copy InnoDB undo tablespaces to innodb_undo_directory (if specified), or
-    # to the InnoDB data directory
-    print STDERR "\n$prefix Starting to $operation InnoDB undo tablespaces\n";
-    print STDERR "$prefix in '$backup_dir'\n";
-    print STDERR "$prefix back to '$orig_undo_dir'\n";
-    opendir(DIR, $backup_dir)
-        || die "Can't open directory '$backup_dir': $!";
-    while (defined($file = readdir(DIR))) {
-        if ($file =~ /^$ibundo_files$/ && -f "$backup_dir/$file") {
-            $src_name = escape_path("$backup_dir/$file");
-            $dst_name = escape_path("$orig_undo_dir/$file");
-            die_if_exists($dst_name);
-            &$move_or_copy_file($src_name, $dst_name);
-        }
-    }
-    closedir(DIR);
-
-    # copy InnoDB log files to original InnoDB log directory
-    opendir(DIR, $backup_dir) 
-        || die "Can't open directory '$backup_dir': $!";
-    print STDERR "\n$prefix Starting to $operation InnoDB log files\n";
-    print STDERR "$prefix in '$backup_dir'\n";
-    print STDERR "$prefix back to original InnoDB log directory '$orig_iblog_dir'\n";
-    while (defined($file = readdir(DIR))) {
-        if ($file =~ /^$iblog_files$/ && -f "$backup_dir/$file") {
-            $src_name = escape_path("$backup_dir/$file");
-            $dst_name = escape_path("$orig_iblog_dir/$file");
-            die_if_exists($dst_name);
-            &$move_or_copy_file($src_name, $dst_name);
-        }
-    }
-    closedir(DIR);
-
-    print STDERR "$prefix Finished copying back files.\n\n";
-}
-
-
-#
-# apply_log subroutine prepares a backup for starting database server
-# on the backup. It applies InnoDB log files to the InnoDB data files.
-#
-sub apply_log {
-    my $rcode;
-    my $cmdline = '';
-    my $cmdline_copy = '';
-    my $options = '';
-
-    if ($option_defaults_file) {
-        $options = $options . " --defaults-file=\"$option_defaults_file\" ";
-    } else {
-        $options = $options . " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
-    }
-
-    if ($option_defaults_extra_file) {
-        $options = $options . " --defaults-extra-file=\"$option_defaults_extra_file\" ";
-    }
-
-    if ($option_defaults_group) {
-        $options = $options . " --defaults-group=\"$option_defaults_group\" ";
-    }
-
-    $options = $options . "--prepare --target-dir=$backup_dir";
-
-    if ($option_export) {
-        $options = $options . ' --export';
-    }
-    if ($option_redo_only) {
-        $options = $options . ' --apply-log-only';
-    }
-    if ($option_use_memory) {
-        $options = $options . " --use-memory=$option_use_memory";
-    }
-
-    if ($option_incremental_dir) {
-        $options = $options . " --incremental-dir=$option_incremental_dir";
-    }
-
-    if ($option_tmpdir) {
-        $options .= " --tmpdir=$option_tmpdir";
-    }
-
-    my $innodb_data_file_path = 
-        get_option(\%config, $option_defaults_group, 'innodb_data_file_path');
-
-    # run ibbackup as a child process
-    $cmdline = "$option_ibbackup_binary $options";
-
-    # Only use --rebuild-indexes in the first xtrabackup call
-    $cmdline_copy = $cmdline;
-    if ($option_rebuild_indexes) {
-        $cmdline = $cmdline . " --rebuild-indexes"
-    }
-    if ($option_rebuild_threads) {
-        $cmdline = $cmdline . " --rebuild-threads=$option_rebuild_threads"
-    }
-
-    $now = current_time();
-    print STDERR "\n$now  $prefix Starting ibbackup with command: $cmdline\n\n";
-    $rcode = system("$cmdline");
-    if ($rcode) {
-        # failure
-        die "\n$prefix ibbackup failed";
-    }
-
-    # We should not create ib_logfile files if we prepare for following incremental applies
-    # Also we do not prepare ib_logfile if we applied incremental changes
-    if (!( ($option_redo_only) or ($option_incremental_dir))) { 
-        $cmdline = $cmdline_copy;
-        $now = current_time();
-        print STDERR "\n$now  $prefix Restarting xtrabackup with command: $cmdline\nfor creating ib_logfile*\n\n";
-        $rcode = system("$cmdline");
-        if ($rcode) {
-            # failure
-            die "\n$prefix xtrabackup (2nd execution) failed";
-        }
-    }
-
-    # If we were applying an incremental change set, we need to make
-    # sure non-InnoDB files and xtrabackup_* metainfo files are copied
-    # to the full backup directory.
-    if ( $option_incremental_dir ) {
-	print STDERR "$prefix Starting to copy non-InnoDB files in '$option_incremental_dir'\n"; 
-	print STDERR "$prefix to the full backup directory '$backup_dir'\n";
-        my @skip_list = ('\.\.?','backup-my\.cnf','xtrabackup_logfile',
-                        'xtrabackup_binary','xtrabackup_checkpoints',
-                        '.*\.delta','.*\.meta','ib_logfile.*');
-        copy_dir_recursively($option_incremental_dir, $backup_dir,
-                             '^(' . join('|', @skip_list) . ')$', 1, 0);
-    foreach my $c (parse_innodb_data_file_path($innodb_data_file_path)) {
-            push(@skip_list, "\Q$c->{filename}\E");
-        }
-        cleanup_dir_recursively($backup_dir,
-                             '^(' . join('|', @skip_list, '.*\.ibd') . ')$');
-    }
-
-}
-
-#
-# Loops until the specified file is created or the ibbackup process dies.
-#
-#
-# If this function detects that the xtrabackup process has terminated, it also
-# sets ibbackup_exit_code and resets ibbackup_pid to avoid trying to reap a
-# non-existing process later
-#
-sub wait_for_ibbackup_file_create {
-
-    my $suspend_file = shift;
-    my $pid = -1;
-
-    for (;;) {
-        # check if the xtrabackup process is still alive _before_ checking if
-        # the file exists to avoid a race condition when the file is created
-        # and the process terminates right after we do the file check
-        $pid = waitpid($ibbackup_pid, &WNOHANG);
-
-        last if -e $suspend_file;
-
-        if ($ibbackup_pid == $pid) {
-            # The file doesn't exist, but the process has terminated
-            $ibbackup_pid = '';
-            die "The xtrabackup child process has died";
-        }
-
-        sleep 1;
-    }
-
-    if ($pid == $ibbackup_pid) {
-        $ibbackup_exit_code = $CHILD_ERROR >> 8;
-        $ibbackup_pid = '';
-    }
-}
-
-#
-# wait_for_ibbackup_suspend subroutine waits until ibbackup has suspended
-# itself.
-#
-sub wait_for_ibbackup_suspend {
-    my $suspend_file = shift;
-    print STDERR "$prefix Waiting for ibbackup (pid=$ibbackup_pid) to suspend\n";
-    print STDERR "$prefix Suspend file '$suspend_file'\n\n";
-    wait_for_ibbackup_file_create($suspend_file);
-    $now = current_time();
-    open XTRABACKUP_PID, "> $option_tmpdir/$xtrabackup_pid_file";
-    print XTRABACKUP_PID $ibbackup_pid;
-    close XTRABACKUP_PID;
-    print STDERR "\n$now  $prefix Continuing after ibbackup has suspended\n";
-}
-
-#
-# resume_ibbackup subroutine signals ibbackup to finish log copying by deleting
-# $suspend_file.
-#
-sub resume_ibbackup {
-    my $suspend_file = shift;
-    unlink $suspend_file || die "Failed to delete '$suspend_file': $!";
-}
-
-#
-# Wait until xtrabackup finishes copying log or dies.  The log copying is
-# signaled by a sync file creation.  If this function detects that the
-# xtrabackup process has terminated, it also sets ibbackup_exit_code and resets
-# ibbackup_pid to avoid trying to reap a non-existing process later.
-#
-sub wait_for_ibbackup_log_copy_finish {
-    my $suspend_file = shift;
-    my $now = current_time();
-    print STDERR "$now  $prefix Waiting for log copying to finish\n\n";
-
-    wait_for_ibbackup_file_create($suspend_file);
-
-    unlink $suspend_file || die "Failed to delete '$suspend_file': $!";
-}
-
-#
-# wait for ibbackup to finish and return its exit code
-#
-sub wait_for_ibbackup_finish {
-    if (!$ibbackup_pid) {
-        # The process has already been reaped.
-        unlink "$option_tmpdir/$xtrabackup_pid_file";
-        return $ibbackup_exit_code;
-    }
-
-    $now = current_time();
-    print STDERR "$now  $prefix Waiting for ibbackup (pid=$ibbackup_pid) to finish\n";
-
-    # wait for ibbackup to finish
-    waitpid($ibbackup_pid, 0);
-    unlink "$option_tmpdir/$xtrabackup_pid_file";
-    $ibbackup_pid = '';
-    return $CHILD_ERROR >> 8;
-}
-
-#
-# start_ibbackup subroutine spawns a child process running ibbackup
-# program for backing up InnoDB tables and indexes.
-#
-sub start_ibbackup {
-    my $options = '';
-    my $cmdline = '';
-    my $pid = undef;
-
-    if ($option_defaults_file) {
-        $options = $options . " --defaults-file=\"$option_defaults_file\" ";
-    }
-
-    if ($option_defaults_extra_file) {
-        $options = $options . " --defaults-extra-file=\"$option_defaults_extra_file\" ";
-    }
-
-    if ($option_defaults_group) {
-        $options = $options . " --defaults-group=\"$option_defaults_group\" ";
-    }
-
-    $options = $options . "--backup --suspend-at-end";
-
-    if ($option_stream) {
-        #(datadir) for 'xtrabackup_suspended' and 'xtrabackup_checkpoints'
-        $options = $options . " --target-dir=" . $option_tmpdir;
-    } else {
-        $options = $options . " --target-dir=$backup_dir";
-    }
-
-    if ($option_tmpdir) {
-        $options .= " --tmpdir=$option_tmpdir";
-    }
-
-    # prepare command line for running ibbackup
-    if ($option_throttle) {
-        $options = $options . " --throttle=$option_throttle";
-    }
-    if ($option_log_copy_interval) {
-        $options = $options . " --log-copy-interval=$option_log_copy_interval";
-    }
-    if ($option_sleep) {
-        $options = $options . " --sleep=$option_sleep";
-    }
-    if ($option_compress) {
-        $options = $options . " --compress";
-        $options = $options . " --compress-threads=$option_compress_threads";
-	if ($option_compress_chunk_size) {
-	        $options = $options . " --compress-chunk-size=$option_compress_chunk_size";
-	}
-    }
-    if ($option_encrypt) {
-        $options = $options . " --encrypt=$option_encrypt";
-        if ($option_encrypt_key) {
-            $options = $options . " --encrypt-key=$option_encrypt_key";
-        }
-        if ($option_encrypt_key_file) {
-            $options = $options . " --encrypt-key-file=$option_encrypt_key_file";
-        }
-        $options = $options . " --encrypt-threads=$option_encrypt_threads";
-	if ($option_encrypt_chunk_size) {
-	        $options = $options . " --encrypt-chunk-size=$option_encrypt_chunk_size";
-	}
-    }
-    if ($option_use_memory) {
-        $options = $options . " --use-memory=$option_use_memory";
-    }
-    if ($option_include) {
-        $options = $options . " --tables='$option_include'";
-    }
-    if ($option_extra_lsndir) {
-        $options = $options . " --extra-lsndir='$option_extra_lsndir'";
-    }
-
-    if ($option_incremental) {
-        if($option_incremental_lsn) {
-          $options = $options . " --incremental-lsn='$option_incremental_lsn'";
-        } else {
-          $options = $options . " --incremental-basedir='$incremental_basedir'";
-        }
-        if ($option_incremental_force_scan) {
-          $options = $options . " --incremental-force-scan";
-        } elsif ($have_changed_page_bitmaps) {
-          $options = $options . " --suspend-at-start";
-        }
-    }
-
-    if ($option_tables_file) {
-        $options = $options . " --tables_file='$option_tables_file'";
-    }
-    if ($option_parallel) {
-        $options = $options . " --parallel=$option_parallel";
-    }
-    if ($option_stream) {
-        $options = $options . " --stream=$option_stream";
-    }
-
-    if ($option_compact) {
-	$options = $options . " --compact";
-    }
-
-    $cmdline = "$option_ibbackup_binary $options";
-
-    # run ibbackup as a child process
-    $now = current_time();
-    print STDERR "\n$now  $prefix Starting ibbackup with command: $cmdline\n";
-    if (defined($pid = fork)) {
-        if ($pid) {
-            # parent process
-            $ibbackup_pid = $pid;
-        } else {
-            # child process
-            exec($cmdline) || die "Failed to exec ibbackup: $!";
-        }
-    } else {
-        die "failed to fork ibbackup child process: $!";
-    }
-}
-                  
-
-#
-# parse_connection_options() subroutine parses connection-related command line
-# options
-#
-sub parse_connection_options {
-    my $con = shift;
-
-    $con->{dsn} = 'dbi:mysql:';
-
-    # this option has to be first
-    if ($option_defaults_file) {
-        $con->{dsn} .= ";mysql_read_default_file=$option_defaults_file";
-    }
-
-    if ($option_defaults_extra_file) {
-        $con->{dsn} .= ";mysql_read_default_file=$option_defaults_extra_file";
-    }
-
-    $con->{dsn} .= ";mysql_read_default_group=xtrabackup";
-
-    if ($option_mysql_password) {
-        $con->{dsn_password} = "$option_mysql_password";
-    }
-    if ($option_mysql_user) {
-        $con->{dsn_user} = "$option_mysql_user";
-    }
-    if ($option_mysql_host) {
-        $con->{dsn} .= ";host=$option_mysql_host";
-    }
-    if ($option_mysql_port) {
-        $con->{dsn} .= ";port=$option_mysql_port";
-    }
-    if ($option_mysql_socket) {
-        $con->{dsn} .= ";mysql_socket=$option_mysql_socket";
-    }
-}
-
-#
-# Start a background process that will send keep-alive queries periodically
-# using the connection passed as a 'mysql' hash reference
-#
-sub start_keepalives {
-    my $con = shift;
-
-    if (defined($con->{keep_alive_pid})) {
-        die "Keep-alive process has already been started for this connection."
-    }
-
-    my $keep_alive_pid = fork();
-
-    if ($keep_alive_pid) {
-        # parent process
-        $con->{keep_alive_pid} = $keep_alive_pid;
-
-        return;
-    }
-
-    # child process
-    $con->{dbh}->{InactiveDestroy} = 1;
-
-    my $rc = 0;
-    my $hello_id = 0;
-
-    # send dummy queries to connection until interrupted with SIGINT or a
-    # connection error
-    while (!$rc) {
-        sleep $mysql_keep_alive;
-
-        my $hello_message = "xtrabackup ping " . $hello_id++;
-
-        eval {
-            $con->{dbh}->selectrow_array("select '$hello_message'");
-        };
-
-        if ($EVAL_ERROR) {
-            $rc = 255;
-        }
-    }
-
-    exit $rc;
-}
-
-#
-# Stop the background keep-alive process
-#
-sub stop_keepalives {
-    my $con = shift;
-
-    if (!defined($con->{keep_alive_pid})) {
-        die "Keep-alive process has never been started for this connection."
-    }
-
-    kill 'INT', $con->{keep_alive_pid};
-    waitpid($con->{keep_alive_pid}, 0);
-    my $rc = $? >> 8;
-
-    if ($rc != 0) {
-        die "Keep-alive process died with exit code " . $rc;
-    }
-    undef $con->{keep_alive_pid};
-}
-
-#
-# mysql_connect subroutine connects to MySQL server
-#
-sub mysql_connect {
-    my %con;
-    my %args = (
-                  # Defaults
-                  abort_on_error => 1,
-                  keepalives => 0,
-                  @_
-               );
-
-    $con{abort_on_error} = $args{abort_on_error};
-    $con{keepalives} = $args{keepalives};
-
-    parse_connection_options(\%con);
-
-    $now = current_time();
-    print STDERR "$now  $prefix Connecting to MySQL server with DSN '$con{dsn}'" .
-        (defined($con{dsn_user}) ? " as '$con{dsn_user}' " : "") .
-        " (using password: ";
-    if (defined($con{dsn_password})) {
-        print STDERR "YES).\n";
-    } else {
-        print STDERR "NO).\n";
-    }
-
-    eval {
-        $con{dbh}=DBI->connect($con{dsn}, $con{dsn_user},
-                                 $con{dsn_password}, { RaiseError => 1 });
-    };
-
-    if ($EVAL_ERROR) {
-        $con{connect_error}=$EVAL_ERROR;
-    } else {
-        $now = current_time();
-        print STDERR "$now  $prefix Connected to MySQL server\n";
-    }
-
-    if ($args{abort_on_error}) {
-        if (!$dbd_mysql_installed) {
-            die "Failed to connect to MySQL server as " .
-                "DBD::mysql module is not installed";
-        } else {
-            if (!$con{dbh}) {
-                die "Failed to connect to MySQL server: " .
-                    $con{connect_error};
-            }
-        }
-    }
-
-    if ($con{dbh}) {
-        $con{dbh}->do("SET SESSION wait_timeout=2147483");
-        if ($con{keepalives}) {
-            start_keepalives(\%con);
-        }
-    }
-
-    return %con;
-}
-
-#
-# mysql_query subroutine send a query to MySQL server child process.
-# Parameters:
-#    con       mysql connection
-#    query     query to execute
-#
-sub mysql_query {
-  my ($con, $query) = @_;
-
-  eval {
-      if ($con->{keepalives}) {
-          stop_keepalives($con);
-      }
-
-      if ($query eq 'SHOW VARIABLES') {
-          $con->{vars} = $con->{dbh}->selectall_hashref('SHOW VARIABLES',
-                                                        'Variable_name');
-      } elsif ($query eq 'SHOW STATUS') {
-          $con->{status} = $con->{dbh}->selectall_hashref('SHOW STATUS',
-                                                        'Variable_name');
-      } elsif ($query eq 'SHOW MASTER STATUS') {
-          $con->{master_status} =
-              $con->{dbh}->selectrow_hashref("SHOW MASTER STATUS");
-      } elsif ($query eq 'SHOW SLAVE STATUS') {
-          $con->{slave_status} =
-              $con->{dbh}->selectrow_hashref("SHOW SLAVE STATUS");
-      } elsif ($query eq 'SHOW PROCESSLIST' or
-               $query eq "SHOW FULL PROCESSLIST") {
-          $con->{processlist} =
-              $con->{dbh}->selectall_hashref($query, "Id");
-      } else {
-          $con->{dbh}->do($query);
-      }
-
-      if ($con->{keepalives}) {
-          start_keepalives($con);
-      }
-  };
-  if ($EVAL_ERROR) {
-      die "\nError executing '$query': $EVAL_ERROR";
-  }
-}
-
-
-sub get_mysql_vars {
-  mysql_query($_[0], 'SHOW VARIABLES')
-}
-
-sub get_mysql_status {
-  mysql_query($_[0], 'SHOW STATUS');
-}
-
-sub get_mysql_master_status {
-  mysql_query($_[0], "SHOW MASTER STATUS");
-}
-
-sub get_mysql_slave_status {
-  mysql_query($_[0], "SHOW SLAVE STATUS");
-}
-
-#
-# mysql_close subroutine closes connection to MySQL server gracefully.
-# 
-sub mysql_close {
-    my $con = shift;
-
-    if ($con->{keepalives}) {
-        stop_keepalives($con);
-    };
-
-    $con->{dbh}->disconnect();
-
-    $now = current_time();
-    print STDERR "$now  $prefix Connection to database server closed\n";
-}
-
-#
-# write_binlog_info subroutine retrieves MySQL binlog position and
-# saves it in a file. It also prints it to stdout.
-#
-sub write_binlog_info {
-    my $con = shift;
-
-    # get binlog position
-    get_mysql_master_status($con);
-
-    # get the name of the last binlog file and position in it
-    # from the SHOW MASTER STATUS output
-    my $filename = $con->{master_status}->{File};
-    my $position = $con->{master_status}->{Position};
-    my $gtid = $con->{master_status}->{Executed_Gtid_Set} || '';
-
-    # Do not create xtrabackup_binlog_info if binary log is disabled
-    if (!defined($filename) or !defined($position)) {
-        return;
-    }
-
-    # write binlog info file
-    write_to_backup_file("$binlog_info", "$filename\t$position\t\t$gtid\n");
-    
-    $mysql_binlog_position = "filename '$filename', position $position";
-    if ($gtid) {
-        $mysql_binlog_position .= ", gtid_executed $gtid";
-    }
-}
-
-#
-# write_galera_info subroutine retrieves MySQL Galera and
-# saves it in a file. It also prints it to stdout.
-#
-sub write_galera_info {
-    my $con = shift;
-    my @lines;
-    my @info_lines = ();
-    my $state_uuid = '';
-    my $last_committed = '';
-
-    # get binlog position
-    get_mysql_status($con);
-
-    $state_uuid = $con->{status}->{wsrep_local_state_uuid}->{Value};
-    $last_committed = $con->{status}->{wsrep_last_committed}->{Value};
-
-    if (!defined($state_uuid) || !defined($last_committed)) {
-        my $now = current_time();
-
-        die "Failed to get master wsrep state from SHOW STATUS.";
-    }
-
-    write_to_backup_file("$galera_info", "$state_uuid" .
-      ":" . "$last_committed" . "\n");
-
-    if (!defined($con->{master_status})) {
-        get_mysql_master_status($con);
-    }
-
-    my $gtid = $con->{master_status}->{Executed_Gtid_Set} || '';
-
-    if ($gtid) {
-        my $log_bin_dir;
-        my $log_bin_file;
-
-        mysql_query($con, "FLUSH BINARY LOGS");
-        get_mysql_master_status($con);
-
-        $log_bin_file = $con->{master_status}->{File};
-        $log_bin_dir = File::Basename::dirname($mysql{vars}->{log_bin_basename}->{Value});
-
-        if (!defined($log_bin_file) || !defined($log_bin_dir)) {
-            die "Failed to get master binlog coordinates from SHOW MASTER STATUS";
-        }
-
-        backup_file("$log_bin_dir", "$log_bin_file",
-                    "$backup_dir/$log_bin_file");
-    }
-}
-
-
-# 
-# write_slave_info subroutine retrieves MySQL binlog position of the
-# master server in a replication setup and saves it in a file. It
-# also saves it in $msql_slave_position variable.
-#
-sub write_slave_info {
-    my $con = shift;
-
-    my @lines;
-    my @info_lines;
-
-    # get slave status
-    get_mysql_slave_status($con);
-
-    # get output of the "show slave status" command from mysql output
-    # and extract binlog position of the master server
-    my $master = $con->{slave_status}->{Master_Host};
-    my $filename = $con->{slave_status}->{Relay_Master_Log_File};
-    my $position = $con->{slave_status}->{Exec_Master_Log_Pos};
-    my $gtid_executed = $con->{slave_status}->{Executed_Gtid_Set};
-
-    if (!defined($master) || !defined($filename) || !defined($position)) {
-        my $now = current_time();
-
-        print STDERR "$now  $prefix Failed to get master binlog coordinates " .
-            "from SHOW SLAVE STATUS\n";
-        print STDERR "$now  $prefix This means that the server is not a " .
-            "replication slave. Ignoring the --slave-info option\n";
-
-        return;
-    }
-
-    # Print slave status to a file.
-    # If GTID mode is used, construct a CHANGE MASTER statement with
-    # MASTER_AUTO_POSITION and correct a gtid_purged value.
-    if (defined($gtid_executed) && $gtid_executed) {
-        $gtid_executed =~ s/\n/ /;
-        write_to_backup_file("$slave_info",
-                             "SET GLOBAL gtid_purged='$gtid_executed';\n" .
-                             "CHANGE MASTER TO MASTER_AUTO_POSITION=1\n");
-        $mysql_slave_position = "master host '$master', ".
-            "purge list '$gtid_executed'";
-    } else {
-        write_to_backup_file("$slave_info",
-                             "CHANGE MASTER TO MASTER_LOG_FILE='$filename', " .
-                             "MASTER_LOG_POS=$position\n");
-
-        $mysql_slave_position = "master host '$master', " .
-            "filename '$filename', " .
-            "position $position";
-    }
-}
-
-sub eat_sql_whitespace {
-    my ($query) = @_;
-
-    while (1) {
-        if ($query =~ m/^\/\*/) {
-            $query =~ s/^\/\*.*?\*\///s;
-        } elsif ($query =~ m/^[ \t\n\r]/s) {
-            $query =~ s/^[ \t\n\r]+//s;
-        } elsif ($query =~ m/^\(/) {
-            $query =~ s/^\(//;
-        } else {
-            return $query;
-        }
-    }
-
-}
-
-
-sub is_query {
-    my ($query) = @_;
-
-    $query = eat_sql_whitespace($query);
-    if ($query =~
-        m/^(insert|update|delete|replace|alter|load|select|do|handler|call|execute|begin)/i) {
-        return 1;
-    }
-
-    return 0;
-}
-
-
-sub is_select_query {
-    my ($query) = @_;
-
-    $query = eat_sql_whitespace($query);
-    if ($query =~ m/^select/i) {
-        return 1;
-    }
-
-    return 0;
-}
-
-
-sub is_update_query {
-    my ($query) = @_;
-
-    $query = eat_sql_whitespace($query);
-    if ($query =~ m/^(insert|update|delete|replace|alter|load)/i) {
-        return 1;
-    }
-
-    return 0;
-}
-
-
-sub have_queries_to_wait_for {
-    my ($con, $threshold) = @_;
-
-    $now = current_time();
-
-    mysql_query($con, "SHOW FULL PROCESSLIST");
-
-    my $processlist = $con->{processlist};
-
-    while (my ($id, $process) = each %$processlist) {
-        if (defined($process->{Info}) &&
-            $process->{Time} >= $threshold &&
-            (($option_lock_wait_query_type eq "all" &&
-             is_query($process->{Info})) ||
-             is_update_query($process->{Info}))) {
-            print STDERR "\n$now  $prefix Waiting for query $id (duration " .
-                            "$process->{Time} sec): $process->{Info}\n";
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-
-sub kill_long_queries {
-    my ($con, $timeout) = @_;
-
-    $now = current_time();
-
-    mysql_query($con, "SHOW FULL PROCESSLIST");
-
-    my $processlist = $con->{processlist};
-
-    while (my ($id, $process) = each %$processlist) {
-        if (defined($process->{Info}) &&
-            $process->{Time} >= $timeout &&
-            (($option_kill_long_query_type eq "all" &&
-              is_query($process->{Info})) ||
-             is_select_query($process->{Info}))) {
-            print STDERR "\n$now  $prefix Killing query $id (duration " .
-                           "$process->{Time} sec): $process->{Info}\n";
-            mysql_query($con, "KILL $id");
-        }
-    }
-}
-
-
-sub wait_for_no_updates {
-    my ($con, $timeout, $threshold) = @_;
-    my $start_time = time();
-
-    while (time() <= $start_time + $timeout) {
-        if (!(have_queries_to_wait_for($con, $threshold))) {
-            return;
-        }
-        sleep(1);
-    }
-
-    die "Unable to obtain lock. Please try again.";
-}
-
-
-sub start_query_killer {
-
-    my ($kill_timeout, $pcon) = @_;
-    my $start_time = time();
-    my $pid = fork();
-
-    if ($pid) {
-        # parent process
-        $query_killer_pid = $pid;
-    } else {
-        # child process
-        my $end = 0;
-        local $SIG{HUP} = sub { $end = 1 };
-
-        $pcon->{dbh}->{InactiveDestroy} = 1;
-        kill('USR1', $innobackupex_pid);
-
-        sleep($kill_timeout);
-
-        my %con = mysql_connect(abort_on_error => 1, keepalives => 0);
-
-        while (!$end) {
-            kill_long_queries(\%con, time() - $start_time);
-            sleep(1);
-        }
-
-        mysql_close(\%con);
-
-        exit(0);
-    }
-}
-
-sub stop_query_killer {
-    if (defined($query_killer_pid)) {
-        kill 'HUP' => $query_killer_pid;
-        waitpid($query_killer_pid, 0);
-        undef $query_killer_pid;
-        print STDERR "Query killing process is finished\n";
-    }
-}
-
-
-#
-# mysql_lock_tables subroutine acquires either a backup tables lock, if
-# supported by the server, or a global read lock (FLUSH TABLES WITH READ LOCK)
-# otherwise.
-#
-sub mysql_lock_tables {
-    my $con = shift;
-    my $queries_hash_ref;
-
-    if ($have_backup_locks) {
-        $now = current_time();
-        print STDERR "$now  $prefix Executing LOCK TABLES FOR BACKUP...\n";
-
-        mysql_query($con, "LOCK TABLES FOR BACKUP");
-
-        $now = current_time();
-        print STDERR "$now  $prefix Backup tables lock acquired\n";
-
-        return;
-    }
-
-    if ($option_lock_wait_timeout) {
-        wait_for_no_updates($con, $option_lock_wait_timeout,
-                            $option_lock_wait_threshold);
-    }
-
-    $now = current_time();
-    print STDERR "$now  $prefix Executing FLUSH TABLES WITH READ LOCK...\n";
-
-    my $query_killer_init = 0;
-
-    # start query killer process
-    if ($option_kill_long_queries_timeout) {
-        local $SIG{'USR1'} = sub { $query_killer_init = 1 };
-        start_query_killer($option_kill_long_queries_timeout, $con);
-        while (!$query_killer_init) {
-            usleep(1);
-        }
-    }
-
-    if ($have_galera_enabled) {
-        mysql_query($con, "SET SESSION wsrep_causal_reads=0");
-    }
-
-    mysql_query($con, "FLUSH TABLES WITH READ LOCK");
-
-    $now = current_time();
-    print STDERR "$now  $prefix All tables locked and flushed to disk\n";
-
-    # stop query killer process
-    if ($option_kill_long_queries_timeout) {
-        stop_query_killer();
-    }
-}
-
-#
-# If backup locks are used, execete LOCK BINLOG FOR BACKUP.
-#
-sub mysql_lock_binlog {
-    if ($have_backup_locks) {
-        $now = current_time();
-        print STDERR "$now  $prefix Executing LOCK BINLOG FOR BACKUP...\n";
-
-        mysql_query($_[0], "LOCK BINLOG FOR BACKUP");
-    }
-}
-
-#
-# mysql_unlock_all subroutine releases either global read lock acquired with
-# FTWRL and the binlog lock acquired with LOCK BINLOG FOR BACKUP, depending on
-# the locking strategy being used
-#
-sub mysql_unlock_all {
-    my $con = shift;
-
-    if ($option_debug_sleep_before_unlock) {
-        my $now = current_time();
-        print STDERR "$now  $prefix Debug sleep for ".
-            "$option_debug_sleep_before_unlock seconds\n";
-        sleep $option_debug_sleep_before_unlock;
-    }
-
-    if ($have_backup_locks) {
-        $now = current_time();
-        print STDERR "$now  $prefix Executing UNLOCK BINLOG\n";
-        mysql_query($con, "UNLOCK BINLOG");
-
-        $now = current_time();
-        print STDERR "$now  $prefix Executing UNLOCK TABLES\n";
-        mysql_query($con, "UNLOCK TABLES");
-    } else {
-        mysql_query ($con, "UNLOCK TABLES");
-    }
-
-    $now = current_time();
-    print STDERR "$now  $prefix All tables unlocked\n";
-}
-
-#
-# require_external subroutine checks that an external program is runnable
-# via the shell. This is tested by calling the program with the
-# given arguments. It is checked that the program returns 0 and does 
-# not print anything to stderr. If this check fails, this subroutine exits.
-#    Parameters:
-#       program      pathname of the program file
-#       args         arguments to the program
-#       pattern      a string containing a regular expression for finding 
-#                    the program version.
-#                    this pattern should contain a subpattern enclosed
-#                    in parentheses which is matched with the version.
-#       version_ref  a reference to a variable where the program version
-#                    string is returned. Example "2.0-beta2".
-#
-sub require_external {
-    my $program = shift;
-    my $args = shift;
-    my $pattern = shift;
-    my $version_ref = shift;
-    my @lines;
-    my $tmp_stdout = tmpnam();
-    my $tmp_stderr = tmpnam();
-    my $rcode;
-    my $error;
-
-    $rcode = system("$program $args >$tmp_stdout 2>$tmp_stderr");
-    if ($rcode) {
-        $error = $!;
-    }
-    my $stderr = `cat $tmp_stderr | grep -v ^Warning`;
-    unlink $tmp_stderr;
-    if ($stderr ne '') {
-        # failure
-        unlink $tmp_stdout;
-        die "Couldn't run $program: $stderr";
-    } elsif ($rcode) {
-        # failure
-        unlink $tmp_stdout;
-        die "Couldn't run $program: $error";
-    }
-
-    # success
-    my $stdout = `cat $tmp_stdout`;
-    unlink $tmp_stdout;
-    @lines = split(/\n|;/,$stdout);
-    print STDERR "$prefix Using $lines[0]\n";
-
-    # get version string from the first output line of the program
-    ${$version_ref} = '';
-    if ($lines[0] =~ /$pattern/) {
-        ${$version_ref} = $1;
-    }
-}
-
-#
-# init subroutine initializes global variables and performs some checks on the
-# system we are running on.
-#
-sub init {
-    my $mysql_version = '';
-    my $ibbackup_version = '';
-    my $run = '';
-
-    # print some instructions to the user
-    if (!$option_apply_log && !$option_copy_back && !$option_move_back
-        && !$option_decrypt && !$option_decompress) {
-        $run = 'backup';
-    } elsif ($option_decrypt || $option_decompress) {
-        $run = 'decryption and decompression';
-    } elsif ($option_copy_back) {
-        $run = 'copy-back';
-    } elsif ($option_move_back) {
-        $run = 'move-back';
-    } else {
-        $run = 'apply-log';
-    }
-    print STDERR "IMPORTANT: Please check that the $run run completes successfully.\n";
-    print STDERR "           At the end of a successful $run run $innobackup_script\n";
-    print STDERR "           prints \"completed OK!\".\n\n";
-
-    if (!$option_copy_back && !$option_move_back
-        && !$option_decrypt && !$option_decompress) {
-        # we are making a backup or applying log to backup
-        if (!$option_apply_log) {
-            # we are making a backup, we need mysql server
-            get_mysql_vars(\%mysql);
-            $mysql_server_version = $mysql{vars}->{version}->{Value};
-            print STDERR "$prefix Using mysql server version $mysql_server_version\n";
-        }
-        print STDERR "\n";
-        
-        if ($option_include 
-            && $ibbackup_version 
-            && $ibbackup_version le "2.0") {
-            # --include option was given, but ibbackup is too
-            # old to support it
-            die "--include option was given, but ibbackup is too old"
-                . " to support it. You must upgrade to InnoDB Hot Backup"
-                . " v2.0 in order to use --include option.\n";
-        }
-    }
-
-    if (!$option_decrypt && !$option_decompress) {
-      # read MySQL options file
-      #read_config_file($config_file, \%config);
-      read_config_file(\%config);
-
-      if(!$option_tmpdir) {
-          $option_tmpdir = get_option(\%config, $option_defaults_group, 'tmpdir');
-      }
-    }
-
-    # get innodb log home directory from options file
-    #$innodb_log_group_home_dir = 
-    #    get_option(\%config, 'mysqld', 'innodb_log_group_home_dir');
-
-    if (!$option_apply_log && !$option_copy_back && !$option_move_back
-        && !$option_decrypt && !$option_decompress) {
-        # we are making a backup, create a new backup directory
-        $backup_dir = File::Spec->rel2abs(make_backup_dir());
-        print STDERR "$prefix Created backup directory $backup_dir\n";
-        if (!$option_stream) {
-            $work_dir = $backup_dir;
-        } else {
-            $work_dir = $option_tmpdir;
-        }
-        $backup_config_file = $work_dir . '/backup-my.cnf';
-        $binlog_info = $work_dir . '/xtrabackup_binlog_info';
-        $galera_info = $work_dir . '/xtrabackup_galera_info';
-        $slave_info = $work_dir . '/xtrabackup_slave_info';
-        $backup_history = $work_dir . '/xtrabackup_info';
-        write_backup_config_file($backup_config_file);
-
-        if (!$option_extra_lsndir) {
-            $option_extra_lsndir = $option_tmpdir;
-            $history_delete_checkpoints = 1;
-        }
-
-        foreach (@xb_suspend_files) {
-            my $suspend_file = $work_dir . "$_";
-            if ( -e "$suspend_file" ) {
-                print STDERR
-                    "WARNING : A left over instance of " .
-                    "suspend file '$suspend_file' was found.\n";
-                unlink "$suspend_file"
-                    || die "Failed to delete '$suspend_file': $!";
-            }
-        }
-
-        if ( -e "$option_tmpdir/$xtrabackup_pid_file" ) {
-            print STDERR "WARNING : A left over instance of xtrabackup pid " .
-                         "file '$option_tmpdir/$xtrabackup_pid_file' " .
-                         "was found.\n";
-            unlink $option_tmpdir . "/" . $xtrabackup_pid_file || 
-                die "Failed to delete " .
-                    "'$option_tmpdir/$xtrabackup_pid_file': $!";
-        }
-
-    } elsif ($option_copy_back || $option_move_back) {
-        #$backup_config_file = $backup_dir . '/backup-my.cnf';
-        #read_config_file($backup_config_file, \%backup_config);
-    }
-}
-
-
-#
-# write_backup_config_file subroutine creates a backup options file for
-# ibbackup program. It writes to the file only those options that
-# are required by ibbackup.
-#    Parameters:
-#       filename  name for the created options file
-#
-sub write_backup_config_file {
-    my $filename = shift;
-
-    my @option_names = (
-        "innodb_checksum_algorithm",
-        "innodb_log_checksum_algorithm",
-        "innodb_data_file_path",
-        "innodb_log_files_in_group",
-        "innodb_log_file_size",
-        "innodb_fast_checksum",
-        "innodb_page_size",
-        "innodb_log_block_size",
-        "innodb_undo_directory",
-        "innodb_undo_tablespaces"
-        );
-
-    my $options_dump = "# This MySQL options file was generated by $innobackup_script.\n\n" .
-          "# The MySQL server\n" .
-          "[mysqld]\n";
-
-    my $option_name;
-    foreach $option_name (@option_names) {
-        if (has_option(\%config, $option_defaults_group, $option_name)) {
-            my $option_value = get_option(\%config, $option_defaults_group, $option_name);
-            $options_dump .= "$option_name=$option_value\n";
-        }
-    }
-    if (has_option(\%config,
-        $option_defaults_group, "innodb_doublewrite_file")) {
-        $options_dump .= "innodb_doublewrite_file=" . (split(/\/+/,
-                get_option(\%config, $option_defaults_group,
-                            'innodb_doublewrite_file')))[-1] . "\n";
-    }
-
-    write_to_backup_file("$filename", "$options_dump");
-}
-
-
-#
-# check_args subroutine checks command line arguments. If there is a problem,
-# this subroutine prints error message and exits.
-#
-sub check_args {
-    my $i;
-    my $rcode;
-    my $buf;
-    my $perl_version;
-
-    # check the version of the perl we are running
-    if (!defined $^V) {
-        # this perl is prior to 5.6.0 and uses old style version string
-        my $required_version = $required_perl_version_old_style;
-        if ($] lt $required_version) {
-            print STDERR "$prefix Warning: " . 
-                "Your perl is too old! Innobackup requires\n";
-            print STDERR "$prefix Warning: perl $required_version or newer!\n";
-        }
-    }
-
-    # read command line options
-    $rcode = GetOptions('compress' => \$option_compress,
-                        'decompress' => \$option_decompress,
-                        'compress-threads=i' => \$option_compress_threads,
-                        'compress-chunk-size=s' => \$option_compress_chunk_size,
-                        'encrypt=s' => \$option_encrypt,
-                        'decrypt=s' => \$option_decrypt,
-                        'encrypt-key=s' => \$option_encrypt_key,
-                        'encrypt-key-file=s' => \$option_encrypt_key_file,
-                        'encrypt-threads=i' => \$option_encrypt_threads,
-                        'encrypt-chunk-size=s' => \$option_encrypt_chunk_size,
-                        'help' => \$option_help,
-                        'history:s' => \$option_history,
-                        'version' => \$option_version,
-                        'throttle=i' => \$option_throttle,
-                        'log-copy-interval=i', \$option_log_copy_interval,
-                        'sleep=i' => \$option_sleep,
-                        'apply-log' => \$option_apply_log,
-                        'redo-only' => \$option_redo_only,
-                        'copy-back' => \$option_copy_back,
-                        'move-back' => \$option_move_back,
-                        'include=s' => \$option_include,
-                        'databases=s' => \$option_databases,
-                        'tables-file=s', => \$option_tables_file,
-                        'use-memory=s' => \$option_use_memory,
-                        'export' => \$option_export,
-                        'password:s' => \$option_mysql_password,
-                        'user=s' => \$option_mysql_user,
-                        'host=s' => \$option_mysql_host,
-                        'port=s' => \$option_mysql_port,
-                        'defaults-group=s' => \$option_defaults_group,
-                        'slave-info' => \$option_slave_info,
-                        'galera-info' => \$option_galera_info,
-                        'socket=s' => \$option_mysql_socket,
-                        'no-timestamp' => \$option_no_timestamp,
-                        'defaults-file=s' => \$option_defaults_file,
-                        'defaults-extra-file=s' => \$option_defaults_extra_file,
-                        'incremental' => \$option_incremental,
-                        'incremental-basedir=s' => \$option_incremental_basedir,
-                        'incremental-force-scan' => \$option_incremental_force_scan,
-                        'incremental-history-name=s' => \$option_incremental_history_name,
-                        'incremental-history-uuid=s' => \$option_incremental_history_uuid,
-                        'incremental-lsn=s' => \$option_incremental_lsn,
-                        'incremental-dir=s' => \$option_incremental_dir,
-                        'extra-lsndir=s' => \$option_extra_lsndir,
-                        'stream=s' => \$option_stream,
-                        'rsync' => \$option_rsync,
-                        'tmpdir=s' => \$option_tmpdir,
-                        'no-lock' => \$option_no_lock,
-                        'ibbackup=s' => \$option_ibbackup_binary,
-                        'parallel=i' => \$option_parallel,
-                        'safe-slave-backup' => \$option_safe_slave_backup,
-                        'safe-slave-backup-timeout=i' => \$option_safe_slave_backup_timeout,
-                        'compact' => \$option_compact,
-                        'rebuild-indexes' => \$option_rebuild_indexes,
-                        'rebuild-threads=i' => \$option_rebuild_threads,
-                        'debug-sleep-before-unlock=i' =>
-                        \$option_debug_sleep_before_unlock,
-                        'kill-long-queries-timeout=i' =>
-                        \$option_kill_long_queries_timeout,
-                        'kill-long-query-type=s' =>
-                        \$option_kill_long_query_type,
-                        'lock-wait-timeout=i' => \$option_lock_wait_timeout,
-                        'lock-wait-threshold=i' => \$option_lock_wait_threshold,
-                        'lock-wait-query-type=s' =>
-                        \$option_lock_wait_query_type,
-                        'version-check!' => \$option_version_check,
-                        'force-non-empty-directories' =>
-                        \$option_force_non_empty_dirs
-    );
-
-    if ($option_help) {
-        # print help text and exit
-        usage();
-        exit(0);
-    }
-    if ($option_version) {
-        # print program version and copyright
-        print_version();
-        exit(0);
-    }
-
-    if (@ARGV == 0) {
-        die "You must specify the backup directory.\n";
-    } elsif (@ARGV > 1) {
-        die "Too many command line arguments\n";
-    }
-
-    if (!$rcode) {
-        # failed to read options
-        die "Bad command line arguments\n";
-    }
-
-    if ($option_defaults_file && $option_defaults_extra_file) {
-        die "--defaults-file and --defaults-extra-file " .
-            "options are mutually exclusive";
-    }
-
-    if ($option_copy_back && $option_move_back) {
-        print STDERR "$prefix --copy-back and --move-back options are " .
-            "mutually exclusive";
-    }
-
-    if ($option_compress == 0) {
-        # compression level no specified, use default level
-        $option_compress = $default_compression_level;
-    } 
-
-    if ($option_compress == 999) {
-        # compress option not given in the command line
-        $option_compress = 0;
-    }
-
-    # validate lock-wait-query-type and kill-long-query-type values
-    if (!(grep {$_ eq $option_lock_wait_query_type} qw/all update/)) {
-        die "Wrong value of lock-wait-query-type. ".
-            "Possible values are all|update, but $option_lock_wait_query_type ".
-            "is specified.";
-    }
-    if (!(grep {$_ eq $option_kill_long_query_type} qw/all select/)) {
-        die "Wrong value of kill-long-query-type. ".
-            "Possible values are all|select, but $option_kill_long_query_type ".
-            "is specified.";
-    }
-
-    if ($option_parallel && $option_parallel < 1) {
-        die "--parallel must be a positive value.\n";
-    }
-
-    if ($option_stream eq 'tar') {
-      $stream_cmd = 'tar chf -';
-    } elsif ($option_stream eq 'xbstream') {
-      $stream_cmd = 'xbstream -c';
-    }
-
-    if ($option_encrypt) {
-      $encrypt_cmd = "xbcrypt --encrypt-algo=$option_encrypt";
-      if ($option_encrypt_key) {
-        $encrypt_cmd = $encrypt_cmd . " --encrypt-key=$option_encrypt_key";
-      }
-      if ($option_encrypt_key_file) {
-        $encrypt_cmd = $encrypt_cmd . " --encrypt-key-file=$option_encrypt_key_file";
-      }
-      if ($option_encrypt_chunk_size) {
-        $encrypt_cmd = $encrypt_cmd . " --encrypt-chunk-size=$option_encrypt_chunk_size";
-      }
-    }
-
-    if (!$option_apply_log && !$option_copy_back && !$option_move_back
-        && !$option_decrypt && !$option_decompress) {
-        # we are making a backup, get backup root directory
-        $option_backup = "1";
-        $backup_root = $ARGV[0];
-        if ($option_incremental && !$option_incremental_lsn &&
-            !$option_incremental_history_name &&
-            !$option_incremental_history_uuid) {
-            if ($option_incremental_basedir) {
-                $incremental_basedir = $option_incremental_basedir;
-            } else {
-                my @dirs = `ls -t $backup_root`;
-                my $inc_dir = $dirs[0];
-                chomp($inc_dir);
-                $incremental_basedir = File::Spec->catfile($backup_root, $inc_dir);
-            }
-        }
-    } else {
-        # get backup directory
-        $backup_dir = File::Spec->rel2abs($ARGV[0]);
-    }        
-
-    if ($option_slave_info) {
-        if ($option_no_lock and !$option_safe_slave_backup) {
-	  die "--slave-info is used with --no-lock but without --safe-slave-backup. The binlog position cannot be consistent with the backup data.\n";
-	}
-    }
-
-    if ($option_rsync && $option_stream) {
-        die "--rsync doesn't work with --stream\n";
-    }
-
-    if ($option_decompress) {
-      if (system("which qpress &>/dev/null") >> 8 != 0) {
-        die "--decompress requires qpress\n";
-      }
-    }
-
-    print STDERR "\n";
-
-    parse_databases_option_value();
-    parse_tables_file_option_value($option_tables_file);
-}
-
-
-#
-# make_backup_dir subroutine creates a new backup directory and returns
-# its name.
-#
-sub make_backup_dir {
-    my $dir;
-    my $innodb_data_file_path = 
-        get_option(\%config, $option_defaults_group, 'innodb_data_file_path');
-
-    # create backup directory
-    $dir = $backup_root;
-    if ($option_stream) {
-        return $dir;
-    }
-
-    $dir .= '/' . strftime("%Y-%m-%d_%H-%M-%S", localtime())
-       unless $option_no_timestamp;
-    mkdir($dir, 0777) || die "Failed to create backup directory $dir: $!";
-
-    # create subdirectories for ibdata files if needed
-#    foreach my $a (split(/;/, $innodb_data_file_path)) {
-#        my $path = (split(/:/,$a))[0];
-#        my @relative_path = split(/\/+/, $path);
-#        pop @relative_path;
-#        if (@relative_path) {
-#            # there is a non-trivial path from the backup directory
-#            # to the directory of this backup ibdata file, check
-#            # that all the directories in the path exist.
-#            create_path_if_needed($dir, \@relative_path);
-#        }
-#    }
-
-    return $dir;
-}
-
-
-#
-# create_path_if_needed subroutine checks that all components
-# in the given relative path are directories. If the
-# directories do not exist, they are created.
-#    Parameters:
-#       root           a path to the root directory of the relative pathname
-#       relative_path  a relative pathname (a reference to an array of 
-#                      pathname components) 
-#
-sub create_path_if_needed {
-    my $root = shift;
-    my $relative_path = shift;
-    my $path;
-
-    $path = $root;
-    foreach $a (@{$relative_path}) {
-        $path = $path . "/" . $a;
-        if (! -d $path) {
-            # this directory does not exist, create it !
-            mkdir($path, 0777) || die "Failed to create backup directory: $!";
-        }
-    }
-}
-
-
-#
-# remove_from_array subroutine removes excluded element from the array.
-#    Parameters:
-#       array_ref   a reference to an array of strings
-#       excluded   a string to be excluded from the copy
-#  
-sub remove_from_array {
-    my $array_ref = shift;
-    my $excluded = shift;
-    my @copy = ();
-    my $size = 0;
-
-    foreach my $str (@{$array_ref}) {
-        if ($str ne $excluded) {
-            $copy[$size] = $str;
-            $size = $size + 1;
-        }
-    }
-    @{$array_ref} = @copy;
-}
-
-
-#
-# backup_files subroutine copies .frm, .isl, .MRG, .MYD and .MYI files to 
-# backup directory.
-#
-sub backup_files {
-    my $prep_mode = shift;
-    my $source_dir = get_option(\%config, $option_defaults_group, 'datadir');
-    my $buffer_pool_filename = get_option(\%config, $option_defaults_group,
-                                          'innodb_buffer_pool_filename');
-    my @list;
-    my $file;
-    my $database;
-    my $wildcard = '*.{frm,isl,MYD,MYI,MAD,MAI,MRG,TRG,TRN,ARM,ARZ,CSM,CSV,opt,par}';
-    my $rsync_file_list;
-    my $operation;
-    my $rsync_tmpfile_pass1 = "$option_tmpdir/xtrabackup_rsyncfiles_pass1";
-    my $rsync_tmpfile_pass2 = "$option_tmpdir/xtrabackup_rsyncfiles_pass2";
-
-    # prep_mode will pre-copy the data, so that rsync is faster the 2nd time
-    # saving time while all tables are locked.
-    # currently only rsync mode is supported for prep.
-    if ($prep_mode and !$option_rsync) {
-        return;
-    }
-
-    if ($option_rsync) {
-	if ($prep_mode) {
-	    $rsync_file_list = $rsync_tmpfile_pass1;
-	} else {
-	    $rsync_file_list = $rsync_tmpfile_pass2;
-	}
-	open(RSYNC, ">$rsync_file_list")
-	    || die "Can't open $rsync_file_list for writing: $!";
-    }
-
-    opendir(DIR, $source_dir) 
-        || die "Can't open directory '$source_dir': $!";
-    $now = current_time();
-    if ($prep_mode) {
-	$operation = "a prep copy of";
-    } else {
-	$operation = "to backup";
-    }
-    print STDERR "\n$now  $prefix Starting $operation non-InnoDB tables and files\n";
-    print STDERR "$prefix in subdirectories of '$source_dir'\n";
-    # loop through all database directories
-    while (defined($database = readdir(DIR))) {
-        my $print_each_file = 0;
-        my $file_c;
-        my @scp_files;
-        # skip files that are not database directories
-        if ($database eq '.' || $database eq '..') { next; }
-        next unless -d "$source_dir/$database";
-	     next unless check_if_required($database);
-        
-        if (!$option_stream) {
-            if (! -e "$backup_dir/$database") {
-                # create database directory for the backup
-                mkdir("$backup_dir/$database", 0777)
-                    || die "Couldn't create directory '$backup_dir/$database': $!";
-            }
-        }
-
-        # copy files of this database
-	opendir(DBDIR, "$source_dir/$database");
-	@list = grep(/\.(frm|isl|MYD|MYI|MAD|MAI|MRG|TRG|TRN|ARM|ARZ|CSM|CSV|opt|par)$/, readdir(DBDIR));
-	closedir DBDIR;
-        $file_c = @list;
-        if ($file_c <= $backup_file_print_limit) {
-            $print_each_file = 1;
-        } else {
-            print STDERR "$prefix Backing up files " . 
-                "'$source_dir/$database/$wildcard' ($file_c files)\n";
-        }
-
-        if ($file_c == 0 && $option_stream) {
-            # Stream/encrypt empty directories by backing up a fake empty
-            # db.opt file, so that empty databases are created in the backup
-            mkdir("$option_tmpdir/$database") ||
-                die "Failed to create directory $option_tmpdir/$database: $!";
-
-            open XTRABACKUP_FH, "> $option_tmpdir/$database/db.opt"
-                || die "Cannot create file $option_tmpdir/db.opt: $!";
-            close XTRABACKUP_FH;
-
-            backup_file_via_stream("$option_tmpdir", "$database/db.opt");
-
-            unlink("$option_tmpdir/$database/db.opt") ||
-                die "Failed to remove file $database/db.opt: $!";
-            rmdir("$option_tmpdir/$database") ||
-                die "Failed to remove directory $database: $!";
-        }
-
-        foreach $file (@list) {
-            next unless check_if_required($database, $file);
-
-	    if($option_include) {
-                my $table = get_table_name($file);
-                my $table_part = get_table_name_with_part_suffix($file);
-
-                if (!("$database.$table_part" =~ /$option_include/ ||
-                      "$database.$table" =~ /$option_include/)) {
-
-                    if ($print_each_file) {
-                        print STDERR "$database.$file is skipped because it does not match '$option_include'.\n";
-                    }
-                    next;
-                }
-	    }
-               
-            if ($print_each_file) {
-                print STDERR "$prefix Backing up file '$source_dir/$database/$file'\n";
-            }
-
-	    if ($option_rsync) {
-		print RSYNC "$database/$file\n";
-		if (!$prep_mode) {
-		    $rsync_files_hash{"$database/$file"} = 1;
-		}
-            } else {
-              backup_file("$source_dir", "$database/$file", "$backup_dir/$database/$file")
-            }
-        }
-    }
-    closedir(DIR);
-
-    if ($option_rsync) {
-        foreach my $dump_name ($buffer_pool_filename, 'ib_lru_dump') {
-            if (-e "$source_dir/$dump_name") {
-                print RSYNC "$dump_name\n";
-                if (!$prep_mode) {
-                    $rsync_files_hash{"$dump_name"} = 1;
-                }
-            }
-        }
-	close(RSYNC);
-
-	# do the actual rsync now
-	$now = current_time();
-	my $rsync_cmd = "rsync -t \"$source_dir\" --files-from=\"$rsync_file_list\" \"$backup_dir\"";
-	print STDERR "$now Starting rsync as: $rsync_cmd\n";
-
-	# ignore errors in the prep mode, since we are running without lock,
-	# so some files may have disappeared.
-	if (system("$rsync_cmd") && !$prep_mode) {
-	    die "rsync failed: $!";
-	}
-
-	$now = current_time();
-	print STDERR "$now rsync finished successfully.\n";
-
-	# Remove from $backup_dir files that have been removed between first and
-	# second passes. Cannot use "rsync --delete" because it does not work
-	# with --files-from.
-	if (!$prep_mode && !$option_no_lock) {
-	    open(RSYNC, "<$rsync_tmpfile_pass1")
-		|| die "Can't open $rsync_tmpfile_pass1 for reading: $!";
-
-	    while (<RSYNC>) {
-		chomp;
-		if (!exists $rsync_files_hash{$_}) {
-		    print STDERR "Removing '$backup_dir/$_'\n";
-		    unlink "$backup_dir/$_";
-		}
-	    }
-
-	    close(RSYNC);
-	    unlink "$rsync_tmpfile_pass1" || \
-		die "Failed to delete $rsync_tmpfile_pass1: $!";
-	    unlink "$rsync_tmpfile_pass2" || \
-		die "Failed to delete $rsync_tmpfile_pass2: $!";
-	}
-    }
-
-    if ($prep_mode) {
-	$operation = "a prep copy of";
-    } else {
-	$operation = "backing up";
-    }
-    $now = current_time();
-    print STDERR "$now  $prefix Finished $operation non-InnoDB tables and files\n\n";
- }
-
-
-#
-# file_to_array subroutine reads the given text file into an array and
-# stores each line as an element of the array. The end-of-line
-# character(s) are removed from the lines stored in the array.
-#    Parameters:
-#       filename   name of a text file
-#       lines_ref  a reference to an array
-#
-sub file_to_array {
-    my $filename = shift;
-    my $lines_ref = shift;
-    
-    open(FILE, $filename) || die "can't open file '$filename': $!";
-    @{$lines_ref} = <FILE>;
-    close(FILE) || die "can't close file '$filename': $!";
-
-    foreach my $a (@{$lines_ref}) {
-        chomp($a);
-    }
-}
-
-
-#
-# unescape_string subroutine expands escape sequences found in the string and
-# returns the expanded string. It also removes possible single or double quotes
-# around the value.
-#    Parameters:
-#       value   a string
-#    Return value:
-#       a string with expanded escape sequences
-# 
-sub unescape_string {
-    my $value = shift;
-    my $result = '';
-    my $offset = 0;
-
-    # remove quotes around the value if they exist
-    if (length($value) >= 2) {
-        if ((substr($value, 0, 1) eq "'" && substr($value, -1, 1) eq "'")
-            || (substr($value, 0, 1) eq '"' && substr($value, -1, 1) eq '"')) {
-            $value = substr($value, 1, -1);
-        }
-    }
-    
-    # expand escape sequences
-    while ($offset < length($value)) {
-        my $pos = index($value, "\\", $offset);
-        if ($pos < 0) {
-            $pos = length($value);
-            $result = $result . substr($value, $offset, $pos - $offset);
-            $offset = $pos;
-        } else {
-            my $replacement = substr($value, $pos, 2);
-            my $escape_code = substr($value, $pos + 1, 1);
-            if (exists $option_value_escapes{$escape_code}) {
-                $replacement = $option_value_escapes{$escape_code};
-            }
-            $result = $result 
-                . substr($value, $offset, $pos - $offset)
-                . $replacement;
-            $offset = $pos + 2;
-        }
-    }
-
-    return $result;
-}
-
-
-#
-# read_config_file subroutine reads MySQL options file and
-# returns the options in a hash containing one hash per group.
-#    Parameters:
-#       filename    name of a MySQL options file
-#       groups_ref  a reference to hash variable where the read
-#                   options are returned
-#
-sub read_config_file {
-    #my $filename = shift;
-    my $groups_ref = shift;
-    my @lines ;
-    my $i;
-    my $group;
-    my $group_hash_ref;
-
-    my $cmdline = '';
-    my $options = '';
-
-
-    if ($option_defaults_file) {
-        $options = $options . " --defaults-file=\"$option_defaults_file\" ";
-    } elsif ($option_apply_log) {
-        $options = $options . " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
-    }
-
-    if ($option_defaults_extra_file) {
-        $options = $options . " --defaults-extra-file=\"$option_defaults_extra_file\" ";
-    }
-
-    if ($option_defaults_group) {
-        $options = $options . " --defaults-group=\"$option_defaults_group\" ";
-    }
-
-    $options = $options . "--print-param";
-
-
-    # read file to an array, one line per element
-    #file_to_array($filename, \@lines);
-    $cmdline = "$option_ibbackup_binary $options";
-    @lines = `$cmdline`;
-
-    # classify lines and save option values
-    $group = 'default';
-    $group_hash_ref = {}; 
-    ${$groups_ref}{$group} = $group_hash_ref;
-    # this pattern described an option value which may be
-    # quoted with single or double quotes. This pattern
-    # does not work by its own. It assumes that the first
-    # opening parenthesis in this string is the second opening
-    # parenthesis in the full pattern. 
-    my $value_pattern = q/((["'])([^\\\4]|(\\[^\4]))*\4)|([^\s]+)/;
-    for ($i = 0; $i < @lines; $i++) {
-      SWITCH: for ($lines[$i]) {
-          # comment
-          /^\s*(#|;)/
-             && do { last; };
-
-          # group      
-          /^\s*\[(.*)\]/ 
-                && do { 
-                    $group = $1; 
-                    if (!exists ${$groups_ref}{$group}) {
-                        $group_hash_ref = {}; 
-                        ${$groups_ref}{$group} = $group_hash_ref;
-                    } else {
-                        $group_hash_ref = ${$groups_ref}{$group};
-                    }
-                    last; 
-                };
-
-          # option
-          /^\s*([^\s=]+)\s*(#.*)?$/
-              && do { 
-                  ${$group_hash_ref}{$1} = '';
-                  last; 
-              };
-
-          # set-variable = option = value
-          /^\s*set-variable\s*=\s*([^\s=]+)\s*=\s*($value_pattern)\s*(#.*)?$/
-              && do { ${$group_hash_ref}{$1} = unescape_string($2); last; };
-
-          # option = value
-          /^\s*([^\s=]+)\s*=\s*($value_pattern)\s*(#.*)?$/
-              && do { ${$group_hash_ref}{$1} = unescape_string($2); last; };
-
-          # empty line
-          /^\s*$/
-              && do { last; };
-
-          # unknown
-          print("$prefix: Warning: Ignored unrecognized line ",
-                $i + 1,
-                " in options : '${lines[$i]}'\n"
-                );
-      }
-   }
-}
-    
-
-# has_option return whether the config has an option with the given name
-#    Parameters:
-#       config_ref   a reference to a config data
-#       group        option group name
-#       option_name  name of the option
-#    Return value:
-#       true if option exists, otherwise false
-#
-sub has_option {
-    my $config_ref = shift;
-    my $group = shift;
-    my $option_name = shift;
-    my $group_hash_ref;
-
-    if (!exists ${$config_ref}{$group}) {
-        # no group
-        die "no '$group' group in MySQL options";
-    }
-
-    $group_hash_ref = ${$config_ref}{$group};
-    
-    return exists ${$group_hash_ref}{$option_name};
-}
-    
-
-# get_option subroutine returns the value of given option in the config
-# structure. If option is missing, this subroutine calls exit.
-#    Parameters:
-#       config_ref   a reference to a config data
-#       group        option group name
-#       option_name  name of the option
-#    Return value:
-#       option value as a string
-#
-sub get_option {
-    my $config_ref = shift;
-    my $group = shift;
-    my $option_name = shift;
-    my $group_hash_ref;
-
-    if (!exists $config{$group}) {
-        # no group
-        die "no '$group' group in MySQL options";
-    }
-    
-    $group_hash_ref = ${$config_ref}{$group};
-    if (!exists ${$group_hash_ref}{$option_name}) {
-        # no option
-        die "no '$option_name' option in group '$group' in MySQL options";
-    }
-
-    return ${$group_hash_ref}{$option_name};
-}
-
-# get_table_name subroutine returns table name of specified file.
-#    Parameters:
-#       $_[0]        table path
-#    Return value:
-#       1 table name
-#
-sub get_table_name {
-   my $table;
-
-   $table = get_table_name_with_part_suffix($_[0]);
-   # trim partition suffix
-   $table = (split('#P#', $table))[0];
-
-   return $table;
-}
-
-# Like get_table_name(), but keeps the partition suffix if present
-sub get_table_name_with_part_suffix {
-   my $table_path = shift;
-   my $filename;
-   my $table;
-
-   # get the last component in the table pathname 
-   $filename = (reverse(split(/\//, $table_path)))[0];
-   # get name of the table by removing file suffix
-   $table = (split(/\./, $filename))[0];
-
-   return $table;
-}
-
-# check_if_required subroutine returns 1 if the specified database and
-# table needs to be backed up.
-#    Parameters:
-#       $_[0]        name of database to be checked 
-#       $_[1]        full path of table file (This argument is optional)
-#    Return value:
-#       1 if backup should be done and 0 if not
-#
-sub check_if_required {
-   my ( $db, $table_path ) = @_;
-   my $db_count  = scalar keys %databases_list;
-   my $tbl_count = scalar keys %table_list;
-   my $table;
-   my $table_part;
-
-   if ( $db_count == 0 && $tbl_count == 0 ) {
-      # No databases defined with --databases option, include all databases,
-      # and no tables defined with --tables-file option, include all tables.
-       return 1;
-   }
-   else {
-      if ( $table_path ) {
-         $table_part = get_table_name_with_part_suffix($table_path);
-         $table = get_table_name($table_path);
-      }
-   }
-
-   # Filter for --databases.
-   if ( $db_count ) {
-      if (defined $databases_list{$db}) {
-         if (defined $table_path) {
-            my $db_hash = $databases_list{$db};
-            $db_count = keys %$db_hash;
-            if ($db_count > 0 &&
-                !defined $databases_list{$db}->{$table_part} &&
-                !defined $databases_list{$db}->{$table}) {
-               # --databases option specified, but table is not included
-               return 0;
-            }
-         }
-         # include this database and table
-         return 1;
-      }
-      else {
-         # --databases option given, but database is not included
-         return 0;
-      }
-   }
-
-   # Filter for --tables-file.
-   if ( $tbl_count ) {
-      return 0 unless exists $table_list{$db};
-      return 0 if $table && !$table_list{$db}->{$table_part} &&
-          !$table_list{$db}->{$table};
-   }
-
-   return 1;  # backup the table
-}
-
-
-# parse_databases_option_value subroutine parses the value of 
-# --databases option. If the option value begins with a slash
-# it is considered a pathname and the option value is read
-# from the file.
-# 
-# This subroutine sets the global "databases_list" variable.
-#
-sub parse_databases_option_value {
-    my $item;
-
-    if ($option_databases =~ /^\//) {
-        # the value of the --databases option begins with a slash,
-        # the option value is pathname of the file containing
-        # list of databases
-        if (! -f $option_databases) {
-            die "can't find file '$option_databases'";
-        }
-
-        # read from file the value of --databases option
-        my @lines;
-    	file_to_array($option_databases, \@lines);
-	$option_databases = join(" ", @lines);
-    }
-
-    # mark each database or database.table definition in the
-    # global databases_list.
-    foreach $item (split(/\s/, $option_databases)) {
-        my $db = "";
-        my $table = "";
-        my %hash;
-
-        if ($item eq "") {
-            # ignore empty strings
-            next;
-        }
-
-        # get database and table names
-        if ($item =~ /(\S*)\.(\S*)/) {
-            # item is of the form DATABASE.TABLE
-            $db = $1;
-            $table = $2;
-        } else {
-            # item is database name, table is undefined
-            $db = $item;
-        }
-
-        if (! defined $databases_list{$db}) {
-            # create empty hash for the database
-            $databases_list{$db} = \%hash;
-        }
-        if ($table ne "") {
-            # add mapping table --> 1 to the database hash
-            my $h = $databases_list{$db};
-            $h->{$table} = 1;
-        }
-    }
-}
-
-# Parse the --tables-file file to determine which InnoDB tables
-# are backedup up.  Only backedup tables have their .frm, etc.
-# files copied.
-sub parse_tables_file_option_value {
-   my ( $filename ) = @_;
-
-   return unless $filename;
-
-   open my $fh, '<', $filename;
-   if ( $fh ) {
-      while ( my $line = <$fh> ) {
-         chomp $line;
-         my ( $db, $tbl ) = $line =~ m/\s*([^\.]+)\.([^\.]+)\s*/;
-         if ( $db && $tbl ) {
-            $table_list{$db}->{$tbl} = 1;
-         }
-         else {
-            warn "$prefix Invalid line in $filename: $line";
-         }
-      }
-   }
-   else {
-      warn "$prefix Cannot read --tables-file $filename: $OS_ERROR";
-   }
-
-   return;
-}
-
-sub escape_path {
-  my $str = shift;
-  if ($win eq 1) {
-    $str =~ s/\//\\/g;
-    $str =~ s/\\\\/\\/g;
-    }
-  else{
-    $str =~ s/\/\//\//g;
-    }
-  return $str;
-
-}
-
-sub check_server_version {
-    my $var_version = '';
-    my $var_innodb_version = '';
-
-    get_mysql_vars(\%mysql);
-
-    $var_version = $mysql{vars}->{version}->{Value};
-    $var_innodb_version = $mysql{vars}->{innodb_version}->{Value};
-
-    # Check supported versions
-    if(!(
-         # MySQL/Percona Server/MariaDB 5.1 or MariaDB 5.2/5.3 with InnoDB
-         # plugin
-         (
-          $var_version =~ m/5\.[123]\.\d/
-          && defined($var_innodb_version)) ||
-         # MySQL/Percona Server/MariaDB 5.5
-         $var_version =~ m/5\.5\.\d/ ||
-         # MySQL/Percona Server 5.6
-         $var_version =~ m/5\.6\.\d/ ||
-         # MariaDB 10.0
-         $var_version =~ m/10\.0\.\d/
-        )) {
-
-        die "Unsupported server version: '$var_version' " .
-            "Please report a bug at " .
-            "https://bugs.launchpad.net/percona-xtrabackup\n";
-    }
-}
-
-# Wait until it's safe to backup a slave.  Returns immediately if
-# the host isn't a slave.  Currently there's only one check:
-# Slave_open_temp_tables has to be zero.  Dies on timeout.
-sub wait_for_safe_slave {
-   my $con = shift;
-
-   my @lines;
-   # whether host is detected as slave in safe slave backup mode
-   my $host_is_slave = 0;
-
-   $sql_thread_started = 0;
-   get_mysql_slave_status($con);
-
-   if (defined($con->{slave_status}->{Read_Master_Log_Pos}) and
-       defined($con->{slave_status}->{Slave_SQL_Running})) {
-         $host_is_slave = 1;
-   }
-
-   if ( !$host_is_slave ) {
-      print STDERR "$prefix: Not checking slave open temp tables for --safe-slave-backup because host is not a slave\n";
-      return;
-   }
-
-   if ($con->{slave_status}->{Slave_SQL_Running} =~ m/Yes/ ) {
-         $sql_thread_started = 1;
-   }
-
-   if ($sql_thread_started) {
-       mysql_query($con, 'STOP SLAVE SQL_THREAD');
-   }
-
-   my $open_temp_tables = get_slave_open_temp_tables($con);
-   print STDERR "$prefix: Slave open temp tables: $open_temp_tables\n";
-
-   return if $open_temp_tables == 0;
-
-   my $sleep_time = 3;
-   my $n_attempts = int($option_safe_slave_backup_timeout / $sleep_time) || 1;
-   while ( $n_attempts-- ) {
-      print STDERR "$prefix: Starting slave SQL thread, waiting $sleep_time seconds, then checking Slave_open_temp_tables again ($n_attempts attempts remaining)...\n";
-      
-      mysql_query($con, 'START SLAVE SQL_THREAD');
-      sleep $sleep_time;
-      mysql_query($con, 'STOP SLAVE SQL_THREAD');
-
-      $open_temp_tables = get_slave_open_temp_tables($con);
-      print STDERR "$prefix: Slave open temp tables: $open_temp_tables\n";
-      if ( !$open_temp_tables ) {
-         print STDERR "$prefix: Slave is safe to backup\n";
-         return;
-      }
-   } 
-
-   # Restart the slave if it was running at start
-   if ($sql_thread_started) {
-       print STDERR "Restarting slave SQL thread.\n";
-       mysql_query($con, 'START SLAVE SQL_THREAD');
-   }
-
-   die "Slave_open_temp_tables did not become zero after $option_safe_slave_backup_timeout seconds";
-}
-
-sub get_slave_open_temp_tables {
-    my $con = shift;
-
-    get_mysql_status($con);
-
-    if (!defined($con->{status}->{Slave_open_temp_tables})) {
-        die "Failed to get Slave_open_temp_tables from SHOW STATUS"
-    }
-    if (!defined($con->{status}->{Slave_open_temp_tables}->{Value})) {
-        die "SHOW STATUS LIKE 'slave_open_temp_tables' did not return anything"
-    }
-
-   return $con->{status}->{Slave_open_temp_tables}->{Value};
-}
-
-#
-# Streams a file into the backup set,
-# handles any encryption.
-# Should not be called directly, only meant to be called from backup_file.
-#
-sub backup_file_via_stream {
-  my $src_path = shift;
-  my $src_file = shift;
-  my $ret = 0;
-
-  my $filepos = rindex($src_file, '/');
-  my $file_name = '';
-  my $rel_path = '';
-
-  if ($filepos >= 0) {
-    $file_name = substr($src_file, $filepos + 1);
-    $rel_path = substr($src_file, 0, $filepos);
-  } else {
-    $file_name = $src_file;
-    $rel_path = '.';
-  }
-  $file_name=~s/([\$\\\" ])/\\$1/g;
-  if ($encrypt_cmd) {
-    $ret = system("cd $src_path; $stream_cmd $rel_path/$file_name | $encrypt_cmd") >> 8;
-  } else {
-    $ret = system("cd $src_path; $stream_cmd $rel_path/$file_name") >> 8;
-  }
-
-  if ($ret == 1 && $option_stream eq 'tar') {
-    print STDERR "$prefix If you use GNU tar, this warning can be ignored.\n";
-  # Check for non-zero exit code
-  } elsif ($ret != 0) {
-    if ($encrypt_cmd) {
-      print STDERR "$prefix '$stream_cmd | $encrypt_cmd' returned with exit code $ret.\n";
-    } else {
-      print STDERR "$prefix '$stream_cmd' returned with exit code $ret.\n";
-    }
-    # Only treat as fatal cases where the file exists
-    if ( -e "$src_path/$src_file" ) {
-      die "Failed to stream '$src_path/$src_file': $ret";
-    } else {
-      print STDERR "$prefix Ignoring nonexistent file '$src_path/$src_file'.\n";
-    }
-  }
-}
-
-#
-# Copies a file into the backup set,
-# handles any encryption.
-# Should not be called directly, only meant to be called from backup_file.
-#
-sub backup_file_via_copy {
-  my $src_path = shift;
-  my $src_file = shift;
-  my $dst_file = shift;
-  my $ret = 0;
-
-  # Copy the file - If we get an error and the file actually exists, die with error msg
-  my $src_file_esc = escape_path("$src_path/$src_file");
-  my $dst_file_esc = escape_path("$dst_file");
-  if ($encrypt_cmd) {
-    $dst_file_esc = $dst_file_esc . ".xbcrypt";
-    $ret = system("$encrypt_cmd -i \"$src_file_esc\" -o \"$dst_file_esc\"");
-    if ($ret != 0) {
-      die "Failed to copy and encrypt file '$src_file': $ret";
-    }
-  } elsif ( -e "$src_file_esc" ) {
-    $ret = system("$CP_CMD \"$src_file_esc\" \"$dst_file_esc\"");
-    if ($ret != 0) {
-       die "Failed to copy file '$src_file': $ret";
-     }
-  }
-}
-
-#
-# Copies or streams a file into the backup set,
-# handles any streaming and/or encryption.
-# All files to be placed into the backup set should only be put there
-# through this call, write_backup_to_file ot xtrabackup itself. If any
-# other method is used, files may not be properly formatted
-# (stream, encryption, etc).
-#
-sub backup_file {
-  my $src_path = shift;
-  my $src_file = shift;
-  my $dst_file = shift;
-
-  if ($option_stream) {
-    backup_file_via_stream($src_path, $src_file);
-  } else {
-    backup_file_via_copy($src_path, $src_file, $dst_file);
-  }
-}
-
-#
-# Writes data directly into a file within the root of the backup set,
-# handles any streaming and/or encryption.
-#
-sub write_to_backup_file {
-  my $file_name = shift;
-  my $write_data = shift;
-
-  if ($option_stream) {
-    my $filepos = rindex($file_name, '/');
-    my $dst_file = substr($file_name, $filepos + 1);
-    my $dst_path = substr($file_name, 0, $filepos + 1);
- 
-    open XTRABACKUP_FH, "> $option_tmpdir/$dst_file"
-      || die "Cannot open file $option_tmpdir/$dst_file: $!\n";
-    print XTRABACKUP_FH $write_data;
-    close XTRABACKUP_FH;
-    backup_file($option_tmpdir, $dst_file, $file_name);
-    unlink "$option_tmpdir/$dst_file";
-  } else {
-    open XTRABACKUP_FH, "> $file_name"
-      || die "Cannot open file $file_name: $!\n";
-    print XTRABACKUP_FH $write_data;
-    close XTRABACKUP_FH;
-  }
-}
-
-#
-# Query the server to find out what backup capabilities it supports.
-#
-sub detect_mysql_capabilities_for_backup {
-    if ($option_incremental) {
-        $have_changed_page_bitmaps =
-            mysql_query($_[0], "SELECT COUNT(*) FROM " .
-                        "INFORMATION_SCHEMA.PLUGINS " .
-                        "WHERE PLUGIN_NAME LIKE 'INNODB_CHANGED_PAGES'");
-    }
-
-    if (!defined($_[0]->{vars})) {
-        get_mysql_vars($_[0]);
-    }
-
-    $have_backup_locks = defined($_[0]->{vars}->{have_backup_locks});
-
-    $have_galera_enabled = defined($_[0]->{vars}->{wsrep_on});
-
-    if ($option_galera_info && !$have_galera_enabled) {
-        my $now = current_time();
-
-        print STDERR "$now  $prefix --galera-info is specified on the command " .
-            "line, but the server does not support Galera replication. " .
-            "Ignoring the option.";
-
-        $option_galera_info = 0;
-    }
-
-    if ($mysql{vars}->{version}->{Value} =~ m/5.[123]\.\d/) {
-        my $now = current_time();
-
-        print STDERR "\n$now  $prefix Warning: FLUSH ENGINE LOGS " .
-            "is not supported " .
-            "by the server. Data may be inconsistent with " .
-            "binary log coordinates!\n";
-
-        $have_flush_engine_logs = 0;
-    } else {
-        $have_flush_engine_logs = 1;
-    }
-}
-
-#
-# Writes xtrabackup_info file and if backup_history is enable creates
-# PERCONA_SCHEMA.xtrabackup_history and writes a new history record to the
-# table containing all the history info particular to the just completed
-# backup.
-#
-sub write_xtrabackup_info()
-{
-  my $con = shift;
-  my $sth;
-  my $uuid;
-  my $tmp;
-  my $file_content;
-
-  eval {
-    $sth = $con->{dbh}->prepare("insert into PERCONA_SCHEMA.xtrabackup_history(".
-                  "uuid, name, tool_name, tool_command, tool_version, ".
-                  "ibbackup_version, server_version, start_time, end_time, ".
-                  "lock_time, binlog_pos, innodb_from_lsn, innodb_to_lsn, ".
-                  "partial, incremental, format, compact, compressed, ".
-                  "encrypted) ".
-                  "values(?,?,?,?,?,?,?,from_unixtime(?),from_unixtime(?),?,?,".
-                  "?,?,?,?,?,?,?,?)");
-  } || die("Eror while preparing history record\n");
-
-
-  # uuid
-  # we use the mysql UUID() function to avoid platform dependencies with uuidgen
-  # and Data::UUID. We select uuid here individually here so that it can be
-  # reported to stderr after successful history record insertion
-  eval {
-    $uuid = $con->{dbh}->selectrow_hashref("SELECT UUID() AS uuid")->{uuid};
-  } || die("Error while attempting to create UUID for history record.\n");
-  $sth->bind_param(1, $uuid);
-  $file_content = "uuid = $uuid";
-
-  # name
-  if ($option_history) {
-    $sth->bind_param(2, $option_history);
-    $file_content .= "\nname = $option_history";
-  } else {
-    $sth->bind_param(2, undef);
-    $file_content .= "\nname = ";
-  }
-
-  # tool_name
-  $tmp = basename($0);
-  $sth->bind_param(3, $tmp);
-  $file_content .= "\ntool_name = $tmp";
-
-  # tool_command
-  # scrub --password and --encrypt-key from tool_command
-  $tmp = $history_tool_command;
-  $tmp =~ s/--password=[^ ]+/--password=.../g;
-  $tmp =~ s/--encrypt-key=[^ ]+/--encrypt-key=.../g;
-  $sth->bind_param(4, $tmp);
-  $file_content .= "\ntool_command = $tmp";
-
-  # tool_version
-  $sth->bind_param(5, $innobackup_version);
-  $file_content .= "\ntool_version = $innobackup_version";
-
-  # ibbackup_version
-  $tmp = "$option_ibbackup_binary -v 2>&1";
-  $tmp = qx($tmp);
-  chomp($tmp);
-  if (length $tmp) {
-    $sth->bind_param(6, $tmp);
-    $file_content .= "\nibbackup_version = $tmp";
-  } else {
-    $sth->bind_param(6, undef);
-    $file_content .= "\nibbackup_version = ";
-  }
-
-  # server_version
-  $tmp =
-    $con->{dbh}->selectrow_hashref("SELECT VERSION() as version")->{version};
-  $sth->bind_param(7, $tmp);
-  $file_content .= "\nserver_version = $tmp";
-
-  # start_time
-  $sth->bind_param(8, $history_start_time);
-  $file_content .= "\nstart_time = " . strftime("%Y-%m-%d %H:%M:%S", localtime($history_start_time));
-
-  # end_time
-  $tmp = time();
-  $sth->bind_param(9, $tmp);
-  $file_content .= "\nend_time = " . strftime("%Y-%m-%d %H:%M:%S", localtime($tmp));
-
-  # lock_time
-  $sth->bind_param(10, $history_lock_time);
-  $file_content .= "\nlock_time = $history_lock_time";
-
-  # binlog_pos
-  if ($mysql_binlog_position) {
-    $sth->bind_param(11, $mysql_binlog_position);
-    $file_content .= "\nbinlog_pos = $mysql_binlog_position";
-  } else {
-    $sth->bind_param(11, undef);
-    $file_content .= "\nbinlog_pos = ";
-  }
-
-  # innodb_from_lsn
-  # grab the from_lsn from the extra checkpoints file, parse and delete it
-  # if necessary. This could generate an error if the checkpoints file
-  # isn't 100% correct in the format.
-  $tmp = "cat $option_extra_lsndir/xtrabackup_checkpoints | grep from_lsn";
-  $tmp = qx($tmp);
-  chomp($tmp);
-  substr($tmp, 0, 11, ""); # strip "from_lsn = "
-  if (length $tmp) {
-    $sth->bind_param(12, $tmp);
-    $file_content .= "\ninnodb_from_lsn = $tmp";
-  } else {
-    print STDERR "WARNING : Unable to obtain from_lsn from " .
-                 "$option_extra_lsndir/xtrabackup_checkpoints, " .
-                 "writing NULL to history record.\n";
-    $sth->bind_param(12, undef);
-    $file_content .= "\ninnodb_from_lsn = ";
-  }
-
-  # innodb_to_lsn
-  # grab the to_lsn from the extra checkpoints file, parse and delete it
-  # if necessary. This could generate an error if the checkpoints file
-  # isn't 100% correct in the format.
-  $tmp = "cat $option_extra_lsndir/xtrabackup_checkpoints | grep to_lsn";
-  $tmp = qx($tmp);
-  chomp($tmp);
-  substr($tmp, 0, 9, ""); # strip "to_lsn = "
-  if (length $tmp) {
-    $sth->bind_param(13, $tmp);
-    $file_content .= "\ninnodb_to_lsn = $tmp";
-  } else {
-    print STDERR "WARNING : Unable to obtain to_lsn from " .
-                 "$option_extra_lsndir/xtrabackup_checkpoints, " .
-                 "writing NULL to history record.\n";
-    $sth->bind_param(13, undef);
-    $file_content .= "\ninnodb_to_lsn = ";
-  }
-
-  # we're finished with the checkpoints file, delete it if it was a temp
-  # only for the history
-  if ($history_delete_checkpoints > 0) {
-    unlink("$option_extra_lsndir/xtrabackup_checkpoints");
-  }
-
-  # partial (Y | N)
-  if ($option_include || $option_databases || $option_tables_file || $option_export) {
-    $sth->bind_param(14, "Y");
-    $file_content .= "\npartial = Y";
-  } else {
-    $sth->bind_param(14, "N");
-    $file_content .= "\npartial = N";
-  }
-
-  # incremental (Y | N)
-  if ($option_incremental) {
-    $sth->bind_param(15, "Y");
-    $file_content .= "\nincremental = Y";
-  } else {
-    $sth->bind_param(15, "N");
-    $file_content .= "\nincremental = N";
-  }
-
-  # format (file | tar | xbsream)
-  if ($option_stream eq 'tar') {
-    $sth->bind_param(16, "tar");
-    $file_content .= "\nformat = tar";
-  } elsif ($option_stream eq 'xbstream') {
-    $sth->bind_param(16, "xbstream");
-    $file_content .= "\nformat = xbstream";
-  } else {
-    $sth->bind_param(16, "file");
-    $file_content .= "\nformat = file";
-  }
-
-  # compact (Y | N)
-  if ($option_compact) {
-    $sth->bind_param(17, "Y");
-    $file_content .= "\ncompact = Y";
-  } else {
-    $sth->bind_param(17, "N");
-    $file_content .= "\ncompact = N";
-  }
-
-  # compressed (Y | N)
-  if ($option_compress) {
-    $sth->bind_param(18, "Y");
-    $file_content .= "\ncompressed = Y";
-  } else {
-    $sth->bind_param(18, "N");
-    $file_content .= "\ncompressed = N";
-  }
-
-  # encrypted (Y | N)
-  if ($option_encrypt) {
-    $sth->bind_param(19, "Y");
-    $file_content .= "\nencrypted = Y";
-  } else {
-    $sth->bind_param(19, "N");
-    $file_content .= "\nencrypted = N";
-  }
-
-  # create the backup history file
-  write_to_backup_file("$backup_history", "$file_content");
-
-  if (!defined($option_history)) {
-    return;
-  }
-
-  mysql_query($con, "CREATE DATABASE IF NOT EXISTS PERCONA_SCHEMA");
-  mysql_query($con, "CREATE TABLE IF NOT EXISTS PERCONA_SCHEMA.xtrabackup_history(".
-                    "uuid VARCHAR(40) NOT NULL PRIMARY KEY,".
-                    "name VARCHAR(255) DEFAULT NULL,".
-                    "tool_name VARCHAR(255) DEFAULT NULL,".
-                    "tool_command TEXT DEFAULT NULL,".
-                    "tool_version VARCHAR(255) DEFAULT NULL,".
-                    "ibbackup_version VARCHAR(255) DEFAULT NULL,".
-                    "server_version VARCHAR(255) DEFAULT NULL,".
-                    "start_time TIMESTAMP NULL DEFAULT NULL,".
-                    "end_time TIMESTAMP NULL DEFAULT NULL,".
-                    "lock_time BIGINT UNSIGNED DEFAULT NULL,".
-                    "binlog_pos VARCHAR(128) DEFAULT NULL,".
-                    "innodb_from_lsn BIGINT UNSIGNED DEFAULT NULL,".
-                    "innodb_to_lsn BIGINT UNSIGNED DEFAULT NULL,".
-                    "partial ENUM('Y', 'N') DEFAULT NULL,".
-                    "incremental ENUM('Y', 'N') DEFAULT NULL,".
-                    "format ENUM('file', 'tar', 'xbstream') DEFAULT NULL,".
-                    "compact ENUM('Y', 'N') DEFAULT NULL,".
-                    "compressed ENUM('Y', 'N') DEFAULT NULL,".
-                    "encrypted ENUM('Y', 'N') DEFAULT NULL".
-                    ") CHARACTER SET utf8 ENGINE=innodb");
-
-  eval {
-    $sth->execute;
-  } || die("Error while attempting to insert history record.\n");
-
-  print STDERR "$prefix Backup history record uuid $uuid successfully written\n";
-}
-
-
-=pod
-
-=head1 NAME
-
-innobackupex - Non-blocking backup tool for InnoDB, XtraDB and HailDB databases
-
-=head1 SYNOPOSIS
-
-innobackupex [--compress] [--compress-threads=NUMBER-OF-THREADS] [--compress-chunk-size=CHUNK-SIZE]
-             [--encrypt=ENCRYPTION-ALGORITHM] [--encrypt-threads=NUMBER-OF-THREADS] [--encrypt-chunk-size=CHUNK-SIZE]
-             [--encrypt-key=LITERAL-ENCRYPTION-KEY] | [--encryption-key-file=MY.KEY]
-             [--include=REGEXP] [--user=NAME]
-             [--password=WORD] [--port=PORT] [--socket=SOCKET]
-             [--no-timestamp] [--ibbackup=IBBACKUP-BINARY]
-             [--slave-info] [--galera-info] [--stream=tar|xbstream]
-             [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME]
-             [--databases=LIST] [--no-lock] 
-             [--tmpdir=DIRECTORY] [--tables-file=FILE]
-             [--history=NAME]
-             [--incremental] [--incremental-basedir]
-             [--incremental-dir] [--incremental-force-scan] [--incremental-lsn]
-             [--incremental-history-name=NAME] [--incremental-history-uuid=UUID]
-             [--compact]     
-             BACKUP-ROOT-DIR
-
-innobackupex --apply-log [--use-memory=B]
-             [--defaults-file=MY.CNF]
-             [--export] [--redo-only] [--ibbackup=IBBACKUP-BINARY]
-             BACKUP-DIR
-
-innobackupex --copy-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR
-
-innobackupex --move-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR
-
-innobackupex [--decompress] [--decrypt=ENCRYPTION-ALGORITHM]
-             [--encrypt-key=LITERAL-ENCRYPTION-KEY] | [--encryption-key-file=MY.KEY]
-             [--parallel=NUMBER-OF-FORKS] BACKUP-DIR
-
-=head1 DESCRIPTION
-
-The first command line above makes a hot backup of a MySQL database.
-By default it creates a backup directory (named by the current date
-and time) in the given backup root directory.  With the --no-timestamp
-option it does not create a time-stamped backup directory, but it puts
-the backup in the given directory (which must not exist).  This
-command makes a complete backup of all MyISAM and InnoDB tables and
-indexes in all databases or in all of the databases specified with the
---databases option.  The created backup contains .frm, .MRG, .MYD,
-.MYI, .MAD, .MAI, .TRG, .TRN, .ARM, .ARZ, .CSM, CSV, .opt, .par, and
-InnoDB data and log files.  The MY.CNF options file defines the
-location of the database.  This command connects to the MySQL server
-using the mysql client program, and runs xtrabackup as a child
-process.
-
-The --apply-log command prepares a backup for starting a MySQL
-server on the backup. This command recovers InnoDB data files as specified
-in BACKUP-DIR/backup-my.cnf using BACKUP-DIR/xtrabackup_logfile,
-and creates new InnoDB log files as specified in BACKUP-DIR/backup-my.cnf.
-The BACKUP-DIR should be the path to a backup directory created by
-xtrabackup. This command runs xtrabackup as a child process, but it does not 
-connect to the database server.
-
-The --copy-back command copies data, index, and log files
-from the backup directory back to their original locations.
-The MY.CNF options file defines the original location of the database.
-The BACKUP-DIR is the path to a backup directory created by xtrabackup.
-
-The --move-back command is similar to --copy-back with the only difference that
-it moves files to their original locations rather than copies them. As this
-option removes backup files, it must be used with caution. It may be useful in
-cases when there is not enough free disk space to copy files.
-
-The --decompress --decrypt command will decrypt and/or decompress a backup made
-with the --compress and/or --encrypt options. When decrypting, the encryption
-algorithm and key used when the backup was taken MUST be provided via the
-specified options. --decrypt and --decompress may be used together at the same
-time to completely normalize a previously compressed and encrypted backup. The
---parallel option will allow multiple files to be decrypted and/or decompressed
-simultaneously. In order to decompress, the qpress utility MUST be installed
-and accessable within the path. This process will remove the original
-compressed/encrypted files and leave the results in the same location.
-
-On success the exit code innobackupex is 0. A non-zero exit code 
-indicates an error.
-
-
-=head1 OPTIONS
-
-=over
-
-=item --apply-log
-
-Prepare a backup in BACKUP-DIR by applying the transaction log file named "xtrabackup_logfile" located in the same directory. Also, create new transaction logs. The InnoDB configuration is read from the file "backup-my.cnf".
-
-=item --compact
-
-Create a compact backup with all secondary index pages omitted. This option is passed directly to xtrabackup. See xtrabackup documentation for details.
-
-=item --compress
-
-This option instructs xtrabackup to compress backup copies of InnoDB
-data files. It is passed directly to the xtrabackup child process. Try
-'xtrabackup --help' for more details.
-
-=item --compress-threads
-
-This option specifies the number of worker threads that will be used
-for parallel compression. It is passed directly to the xtrabackup
-child process. Try 'xtrabackup --help' for more details.
-
-=item --compress-chunk-size
-
-This option specifies the size of the internal working buffer for each
-compression thread, measured in bytes. It is passed directly to the
-xtrabackup child process. Try 'xtrabackup --help' for more details.
-
-=item --copy-back
-
-Copy all the files in a previously made backup from the backup directory to their original locations.
-
-=item --databases=LIST
-
-This option specifies the list of databases that innobackupex should back up. The option accepts a string argument or path to file that contains the list of databases to back up. The list is of the form "databasename1[.table_name1] databasename2[.table_name2] . . .". If this option is not specified, all databases containing MyISAM and InnoDB tables will be backed up.  Please make sure that --databases contains all of the InnoDB databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option --tables-file.)
-
-=item --decompress
-
-Decompresses all files with the .qp extension in a backup previously made with the --compress option.
-
-=item --decrypt=ENCRYPTION-ALGORITHM
-
-Decrypts all files with the .xbcrypt extension in a backup previously made with --encrypt option.
-
-=item --debug-sleep-before-unlock=SECONDS
-
-This is a debug-only option used by the XtraBackup test suite.
-
-=item --defaults-file=[MY.CNF]
-
-This option specifies what file to read the default MySQL options from.  The option accepts a string argument. It is also passed directly to xtrabackup's --defaults-file option. See the xtrabackup documentation for details.
-
-=item --defaults-group=GROUP-NAME
-
-This option specifies the group name in my.cnf which should be used. This is needed for mysqld_multi deployments.
-
-=item --defaults-extra-file=[MY.CNF]
-
-This option specifies what extra file to read the default MySQL options from before the standard defaults-file.  The option accepts a string argument. It is also passed directly to xtrabackup's --defaults-extra-file option. See the xtrabackup documentation for details.
-
-=item --encrypt=ENCRYPTION-ALGORITHM
-
-This option instructs xtrabackup to encrypt backup copies of InnoDB data
-files using the algorithm specified in the ENCRYPTION-ALGORITHM.
-It is passed directly to the xtrabackup child process.
-Try 'xtrabackup --help' for more details.
-
-=item --encrypt-key=ENCRYPTION-KEY
-
-This option instructs xtrabackup to use the given ENCRYPTION-KEY when using the --encrypt or --decrypt options.
-During backup it is passed directly to the xtrabackup child process.
-Try 'xtrabackup --help' for more details.
-
-=item --encrypt-key-file=ENCRYPTION-KEY-FILE
-
-This option instructs xtrabackup to use the encryption key stored in the given ENCRYPTION-KEY-FILE when using the --encrypt or --decrypt options.
-
-Try 'xtrabackup --help' for more details.
-
-=item --encrypt-threads
-
-This option specifies the number of worker threads that will be used
-for parallel encryption. It is passed directly to the xtrabackup
-child process. Try 'xtrabackup --help' for more details.
-
-=item --encrypt-chunk-size
-
-This option specifies the size of the internal working buffer for each
-encryption thread, measured in bytes. It is passed directly to the
-xtrabackup child process. Try 'xtrabackup --help' for more details.
-
-=item --export
-
-This option is passed directly to xtrabackup's --export option. It enables exporting individual tables for import into another server. See the xtrabackup documentation for details.
-
-=item --extra-lsndir=DIRECTORY
-
-This option specifies the directory in which to save an extra copy of the "xtrabackup_checkpoints" file.  The option accepts a string argument. It is passed directly to xtrabackup's --extra-lsndir option. See the xtrabackup documentation for details.
-
-==item --force-non-empty-directories 
-
-This option, when specified, makes --copy-back or --move-back transfer files to non-empty directories. Note that no existing files will be overwritten. If --copy-back or --nove-back has to copy a file from the backup directory which already exists in the destination directory, it will still fail with an error.
-
-=item --galera-info
-
-This options creates the xtrabackup_galera_info file which contains the local node state at the time of the backup. Option should be used when performing the backup of Percona-XtraDB-Cluster.
-
-=item --help
-
-This option displays a help screen and exits.
-
-=item --history=NAME
-
-This option enables the tracking of backup history in the PERCONA_SCHEMA.xtrabackup_history table. An optional history series name may be specified that will be placed with the history record for the current backup being taken.
-
-=item --host=HOST
-
-This option specifies the host to use when connecting to the database server with TCP/IP.  The option accepts a string argument. It is passed to the mysql child process without alteration. See mysql --help for details.
-
-=item --ibbackup=IBBACKUP-BINARY
-
-This option specifies which xtrabackup binary should be used.  The option accepts a string argument. IBBACKUP-BINARY should be the command used to run XtraBackup. The option can be useful if the xtrabackup binary is not in your search path or working directory. If this option is not specified, innobackupex attempts to determine the binary to use automatically. By default, "xtrabackup" is the command used. However, when option --copy-back is specified, "xtrabackup_51" is the command used. And when option --apply-log is specified, the binary is used whose name is in the file "xtrabackup_binary" in the backup directory, if that file exists.
-
-=item --include=REGEXP
-
-This option is a regular expression to be matched against table names in databasename.tablename format. It is passed directly to xtrabackup's --tables option. See the xtrabackup documentation for details.
-
-=item --incremental
-
-This option tells xtrabackup to create an incremental backup, rather than a full one. It is passed to the xtrabackup child process. When this option is specified, either --incremental-lsn or --incremental-basedir can also be given. If neither option is given, option --incremental-basedir is passed to xtrabackup by default, set to the first timestamped backup directory in the backup base directory.
-
-=item --incremental-basedir=DIRECTORY
-
-This option specifies the directory containing the full backup that is the base dataset for the incremental backup.  The option accepts a string argument. It is used with the --incremental option.
-
-=item --incremental-dir=DIRECTORY
-
-This option specifies the directory where the incremental backup will be combined with the full backup to make a new full backup.  The option accepts a string argument. It is used with the --incremental option.
-
-=item --incremental-history-name=NAME
-
-This option specifies the name of the backup series stored in the PERCONA_SCHEMA.xtrabackup_history history record to base an incremental backup on. Xtrabackup will search the history table looking for the most recent (highest innodb_to_lsn), successful backup in the series and take the to_lsn value to use as the starting lsn for the incremental backup. This will be mutually exclusive with --incremental-history-uuid, --incremental-basedir and --incremental-lsn. If no valid lsn can be found (no series by that name, no successful backups by that name) xtrabackup will return with an error. It is used with the --incremental option.
-
-=item --incremental-history-uuid=UUID
-
-This option specifies the UUID of the specific history record stored in the PERCONA_SCHEMA.xtrabackup_history to base an incremental backup on. --incremental-history-name, --incremental-basedir and --incremental-lsn. If no valid lsn can be found (no success record with that uuid) xtrabackup will return with an error. It is used with the --incremental option.
-
-=item --incremental-force-scan
-
-This options tells xtrabackup to perform full scan of data files for taking an incremental backup even if full changed page bitmap data is available to enable the backup without the full scan.
-
-=item --log-copy-interval
-
-This option specifies time interval between checks done by log copying thread in milliseconds.
-
-=item --incremental-lsn
-
-This option specifies the log sequence number (LSN) to use for the incremental backup.  The option accepts a string argument. It is used with the --incremental option. It is used instead of specifying --incremental-basedir. For databases created by MySQL and Percona Server 5.0-series versions, specify the LSN as two 32-bit integers in high:low format. For databases created in 5.1 and later, specify the LSN as a single 64-bit integer.
-
-=item --kill-long-queries-timeout=SECONDS
-
-This option specifies the number of seconds innobackupex waits between starting FLUSH TABLES WITH READ LOCK and killing those queries that block it. Default is 0 seconds, which means innobackupex will not attempt to kill any queries.
-
-=item --kill-long-query-type=all|update
-
-This option specifies which types of queries should be killed to unblock the global lock. Default is "all".
-
-=item --lock-wait-timeout=SECONDS
-
-This option specifies time in seconds that innobackupex should wait for queries that would block FTWRL before running it. If there are still such queries when the timeout expires, innobackupex terminates with an error.
-Default is 0, in which case innobackupex does not wait for queries to complete and starts FTWRL immediately.
-
-=item --lock-wait-threshold=SECONDS
-
-This option specifies the query run time threshold which is used by innobackupex to detect long-running queries with a non-zero value of --lock-wait-timeout. FTWRL is not started until such long-running queries exist. This option has no effect if --lock-wait-timeout is 0. Default value is 60 seconds.
-
-=item --lock-wait-query-type=all|update
-
-This option specifies which types of queries are allowed to complete before innobackupex will issue the global lock. Default is all.
-
-=item --move-back
-
-Move all the files in a previously made backup from the backup directory to the actual datadir location. Use with caution, as it removes backup files.
-
-=item --no-lock
-
-Use this option to disable table lock with "FLUSH TABLES WITH READ LOCK". Use it only if ALL your tables are InnoDB and you DO NOT CARE about the binary log position of the backup. This option shouldn't be used if there are any DDL statements being executed or if any updates are happening on non-InnoDB tables (this includes the system MyISAM tables in the mysql database), otherwise it could lead to an inconsistent backup. If you are considering to use --no-lock because your backups are failing to acquire the lock, this could be because of incoming replication events preventing the lock from succeeding. Please try using --safe-slave-backup to momentarily stop the replication slave thread, this may help the backup to succeed and you then don't need to resort to using this option.
-
-=item --no-timestamp
-
-This option prevents creation of a time-stamped subdirectory of the BACKUP-ROOT-DIR given on the command line. When it is specified, the backup is done in BACKUP-ROOT-DIR instead.
-
-=item --no-version-check
-
-This option disables the version check which is enabled by the --version-check option.
-
-=item --parallel=NUMBER-OF-THREADS
-
-On backup, this option specifies the number of threads the xtrabackup child process should use to back up files concurrently.  The option accepts an integer argument. It is passed directly to xtrabackup's --parallel option. See the xtrabackup documentation for details.
- 
-On --decrypt or --decompress it specifies the number of parallel forks that should be used to process the backup files.
-
-=item --password=WORD
-
-This option specifies the password to use when connecting to the database. It accepts a string argument.  It is passed to the mysql child process without alteration. See mysql --help for details.
-
-=item --port=PORT
-
-This option specifies the port to use when connecting to the database server with TCP/IP.  The option accepts a string argument. It is passed to the mysql child process. It is passed to the mysql child process without alteration. See mysql --help for details.
-
-=item --rebuild-indexes
-
-This option only has effect when used together with the --apply-log option and is passed directly to xtrabackup. When used, makes xtrabackup rebuild all secondary indexes after applying the log. This option is normally used to prepare compact backups. See the XtraBackup manual for more information.
-
-=item --rebuild-threads
-
-This option only has effect when used together with the --apply-log and --rebuild-indexes option and is passed directly to xtrabackup. When used, xtrabackup processes tablespaces in parallel with the specified number of threads when rebuilding indexes. See the XtraBackup manual for more information.
-
-=item --redo-only
-
-This option should be used when preparing the base full backup and when merging all incrementals except the last one. This option is passed directly to xtrabackup's --apply-log-only option. This forces xtrabackup to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the xtrabackup documentation for details. 
-
-=item --rsync
-
-Uses the rsync utility to optimize local file transfers. When this option is specified, innobackupex uses rsync to copy all non-InnoDB files instead of spawning a separate cp for each file, which can be much faster for servers with a large number of databases or tables.  This option cannot be used together with --stream.
-
-=item --safe-slave-backup
-
-Stop slave SQL thread and wait to start backup until Slave_open_temp_tables in "SHOW STATUS" is zero. If there are no open temporary tables, the backup will take place, otherwise the SQL thread will be started and stopped until there are no open temporary tables. The backup will fail if Slave_open_temp_tables does not become zero after --safe-slave-backup-timeout seconds. The slave SQL thread will be restarted when the backup finishes.
-
-=item --safe-slave-backup-timeout
-
-How many seconds --safe-slave-backup should wait for Slave_open_temp_tables to become zero. (default 300)
-
-=item --slave-info
-
-This option is useful when backing up a replication slave server. It prints the binary log position and name of the master server. It also writes this information to the "xtrabackup_slave_info" file as a "CHANGE MASTER" command. A new slave for this master can be set up by starting a slave server on this backup and issuing a "CHANGE MASTER" command with the binary log position saved in the "xtrabackup_slave_info" file.
-
-=item --socket=SOCKET
-
-This option specifies the socket to use when connecting to the local database server with a UNIX domain socket.  The option accepts a string argument. It is passed to the mysql child process without alteration. See mysql --help for details.
-
-=item --stream=STREAMNAME
-
-This option specifies the format in which to do the streamed backup.  The option accepts a string argument. The backup will be done to STDOUT in the specified format. Currently, the only supported formats are tar and xbstream. This option is passed directly to xtrabackup's --stream option.
-
-=item --tables-file=FILE
-
-This option specifies the file in which there are a list of names of the form database.  The option accepts a string argument.table, one per line. The option is passed directly to xtrabackup's --tables-file option.
-
-=item --throttle=IOS
-
-This option specifies a number of I/O operations (pairs of read+write) per second.  It accepts an integer argument.  It is passed directly to xtrabackup's --throttle option.
-
-=item --tmpdir=DIRECTORY
-
-This option specifies the location where a temporary file will be stored.  The option accepts a string argument. It should be used when --stream is specified. For these options, the transaction log will first be stored to a temporary file, before streaming. This option specifies the location where that temporary file will be stored. If the option is not specified, the default is to use the value of tmpdir read from the server configuration.
-
-=item --use-memory=B
-
-This option accepts a string argument that specifies the amount of memory in bytes for xtrabackup to use for crash recovery while preparing a backup. Multiples are supported providing the unit (e.g. 1MB, 1GB). It is used only with the option --apply-log. It is passed directly to xtrabackup's --use-memory option. See the xtrabackup documentation for details.
-
-=item --user=NAME
-
-This option specifies the MySQL username used when connecting to the server, if that's not the current user. The option accepts a string argument.  It is passed to the mysql child process without alteration. See mysql --help for details.
-
-=item --version
-
-This option displays the xtrabackup version and copyright notice and then exits.
-
-=item --version-check
-
-This option controls if the version check should be executed by innobackupex after connecting to the server on the backup stage. This option is enabled by default, disable with --no-version-check.
-
-=back
-
-=head1 BUGS
-
-Bugs can be reported on Launchpad: https://bugs.launchpad.net/percona-xtrabackup/+filebug
-
-=head1 COPYRIGHT
-
-InnoDB Backup Utility Copyright 2003, 2009 Innobase Oy and Percona, Inc 2009-2012. All Rights Reserved.
-
-This software is published under the GNU GENERAL PUBLIC LICENSE Version 2, June 1991.
-
-=cut
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/backup_copy.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/backup_copy.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/backup_copy.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/backup_copy.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2047 @@
+/******************************************************
+hot backup tool for InnoDB
+(c) 2009-2015 Percona LLC and/or its affiliates
+Originally Created 3/3/2009 Yasufumi Kinoshita
+Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
+Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
+
+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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+*******************************************************
+
+This file incorporates work covered by the following copyright and
+permission notice:
+
+Copyright (c) 2000, 2011, MySQL AB & Innobase Oy. 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., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+
+*******************************************************/
+
+#include <my_global.h>
+#include <os0file.h>
+#include <my_dir.h>
+#include <ut0mem.h>
+#include <srv0start.h>
+#include <fil0fil.h>
+#include <set>
+#include <string>
+#include <mysqld.h>
+#include <version_check_pl.h>
+#include <sstream>
+#include "fil_cur.h"
+#include "xtrabackup.h"
+#include "common.h"
+#include "backup_copy.h"
+#include "backup_mysql.h"
+
+
+/* list of files to sync for --rsync mode */
+static std::set<std::string> rsync_list;
+/* locations of tablespaces read from .isl files */
+static std::map<std::string, std::string> tablespace_locations;
+
+/* Whether LOCK BINLOG FOR BACKUP has been issued during backup */
+bool binlog_locked;
+
+/************************************************************************
+Struct represents file or directory. */
+struct datadir_node_t {
+	ulint		dbpath_len;
+	char		*filepath;
+	ulint		filepath_len;
+	char		*filepath_rel;
+	ulint		filepath_rel_len;
+	bool		is_empty_dir;
+	bool		is_file;
+};
+
+/************************************************************************
+Holds the state needed to enumerate files in MySQL data directory. */
+struct datadir_iter_t {
+	char		*datadir_path;
+	char		*dbpath;
+	ulint		dbpath_len;
+	char		*filepath;
+	ulint		filepath_len;
+	char		*filepath_rel;
+	ulint		filepath_rel_len;
+	os_ib_mutex_t	mutex;
+	os_file_dir_t	dir;
+	os_file_dir_t	dbdir;
+	os_file_stat_t	dbinfo;
+	os_file_stat_t	fileinfo;
+	dberr_t		err;
+	bool		is_empty_dir;
+	bool		is_file;
+	bool		skip_first_level;
+};
+
+
+/************************************************************************
+Represents the context of the thread processing MySQL data directory. */
+struct datadir_thread_ctxt_t {
+	datadir_iter_t		*it;
+	uint			n_thread;
+	uint			*count;
+	os_ib_mutex_t		count_mutex;
+	os_thread_id_t		id;
+	bool			ret;
+};
+
+
+/************************************************************************
+Retirn true if character if file separator */
+bool
+is_path_separator(char c)
+{
+	return(c == FN_LIBCHAR || c == FN_LIBCHAR2);
+}
+
+
+/************************************************************************
+Fill the node struct. Memory for node need to be allocated and freed by
+the caller. It is caller responsibility to initialize node with
+datadir_node_init and cleanup the memory with datadir_node_free.
+Node can not be shared between threads. */
+static
+void
+datadir_node_fill(datadir_node_t *node, datadir_iter_t *it)
+{
+	if (node->filepath_len < it->filepath_len) {
+		free(node->filepath);
+		node->filepath = (char*)(ut_malloc(it->filepath_len));
+		node->filepath_len = it->filepath_len;
+	}
+	if (node->filepath_rel_len < it->filepath_rel_len) {
+		free(node->filepath_rel);
+		node->filepath_rel = (char*)(ut_malloc(it->filepath_rel_len));
+		node->filepath_rel_len = it->filepath_rel_len;
+	}
+
+	strcpy(node->filepath, it->filepath);
+	strcpy(node->filepath_rel, it->filepath_rel);
+	node->is_empty_dir = it->is_empty_dir;
+	node->is_file = it->is_file;
+}
+
+static
+void
+datadir_node_free(datadir_node_t *node)
+{
+	ut_free(node->filepath);
+	ut_free(node->filepath_rel);
+	memset(node, 0, sizeof(datadir_node_t));
+}
+
+static
+void
+datadir_node_init(datadir_node_t *node)
+{
+	memset(node, 0, sizeof(datadir_node_t));
+}
+
+
+/************************************************************************
+Create the MySQL data directory iterator. Memory needs to be released
+with datadir_iter_free. Position should be advanced with
+datadir_iter_next_file. Iterator can be shared between multiple
+threads. It is guaranteed that each thread receives unique file from
+data directory into its local node struct. */
+static
+datadir_iter_t *
+datadir_iter_new(const char *path, bool skip_first_level = true)
+{
+	datadir_iter_t *it;
+
+	it = static_cast<datadir_iter_t *>(ut_malloc(sizeof(datadir_iter_t)));
+	memset(it, 0, sizeof(datadir_iter_t));
+
+	it->mutex = os_mutex_create();
+	it->datadir_path = strdup(path);
+
+	it->dir = os_file_opendir(it->datadir_path, TRUE);
+
+	if (it->dir == NULL) {
+
+		goto error;
+	}
+
+	it->err = DB_SUCCESS;
+
+	it->dbpath_len = FN_REFLEN;
+	it->dbpath = static_cast<char*>(ut_malloc(it->dbpath_len));
+
+	it->filepath_len = FN_REFLEN;
+	it->filepath = static_cast<char*>(ut_malloc(it->filepath_len));
+
+	it->filepath_rel_len = FN_REFLEN;
+	it->filepath_rel = static_cast<char*>(ut_malloc(it->filepath_rel_len));
+
+	it->skip_first_level = skip_first_level;
+
+	return(it);
+
+error:
+	ut_free(it);
+
+	return(NULL);
+}
+
+static
+bool
+datadir_iter_next_database(datadir_iter_t *it)
+{
+	if (it->dbdir != NULL) {
+		if (os_file_closedir(it->dbdir) != 0) {
+
+			msg("Warning: could not"
+			      " close database directory %s\n", it->dbpath);
+
+			it->err = DB_ERROR;
+
+		}
+		it->dbdir = NULL;
+	}
+
+	while (fil_file_readdir_next_file(&it->err, it->datadir_path,
+					  it->dir, &it->dbinfo) == 0) {
+		ulint	len;
+
+		if ((it->dbinfo.type == OS_FILE_TYPE_FILE
+		     && it->skip_first_level)
+		    || it->dbinfo.type == OS_FILE_TYPE_UNKNOWN) {
+
+			continue;
+		}
+
+		/* We found a symlink or a directory; try opening it to see
+		if a symlink is a directory */
+
+		len = strlen(it->datadir_path)
+			+ strlen (it->dbinfo.name) + 2;
+		if (len > it->dbpath_len) {
+			it->dbpath_len = len;
+
+			if (it->dbpath) {
+
+				ut_free(it->dbpath);
+			}
+
+			it->dbpath = static_cast<char*>
+					(ut_malloc(it->dbpath_len));
+		}
+		ut_snprintf(it->dbpath, it->dbpath_len,
+			    "%s/%s", it->datadir_path,
+			    it->dbinfo.name);
+		srv_normalize_path_for_win(it->dbpath);
+
+		if (it->dbinfo.type == OS_FILE_TYPE_FILE) {
+			it->is_file = true;
+			return(true);
+		}
+
+		/* We want wrong directory permissions to be a fatal error for
+		XtraBackup. */
+		it->dbdir = os_file_opendir(it->dbpath, TRUE);
+
+		if (it->dbdir != NULL) {
+
+			it->is_file = false;
+			return(true);
+		}
+
+	}
+
+	return(false);
+}
+
+/************************************************************************
+Concatenate n parts into single path */
+static
+void
+make_path_n(int n, char **path, ulint *path_len, ...)
+{
+	ulint len_needed = n + 1;
+	char *p;
+	int i;
+	va_list vl;
+
+	ut_ad(n > 0);
+
+	va_start(vl, path_len);
+	for (i = 0; i < n; i++) {
+		p = va_arg(vl, char*);
+		len_needed += strlen(p);
+	}
+	va_end(vl);
+
+	if (len_needed < *path_len) {
+		ut_free(*path);
+		*path = static_cast<char*>(ut_malloc(len_needed));
+	}
+
+	va_start(vl, path_len);
+	p = va_arg(vl, char*);
+	strcpy(*path, p);
+	for (i = 1; i < n; i++) {
+		size_t plen;
+		p = va_arg(vl, char*);
+		plen = strlen(*path);
+		if (!is_path_separator((*path)[plen - 1])) {
+			(*path)[plen] = FN_LIBCHAR;
+			(*path)[plen + 1] = 0;
+		}
+		strcat(*path + plen, p);
+	}
+	va_end(vl);
+}
+
+static
+bool
+datadir_iter_next_file(datadir_iter_t *it)
+{
+	if (it->is_file && it->dbpath) {
+		make_path_n(2, &it->filepath, &it->filepath_len,
+				it->datadir_path, it->dbinfo.name);
+
+		make_path_n(1, &it->filepath_rel, &it->filepath_rel_len,
+				it->dbinfo.name);
+
+		it->is_empty_dir = false;
+		it->is_file = false;
+
+		return(true);
+	}
+
+	if (!it->dbpath || !it->dbdir) {
+
+		return(false);
+	}
+
+	while (fil_file_readdir_next_file(&it->err, it->dbpath, it->dbdir,
+					  &it->fileinfo) == 0) {
+
+		if (it->fileinfo.type == OS_FILE_TYPE_DIR) {
+
+			continue;
+		}
+
+		/* We found a symlink or a file */
+		make_path_n(3, &it->filepath, &it->filepath_len,
+				it->datadir_path, it->dbinfo.name,
+				it->fileinfo.name);
+
+		make_path_n(2, &it->filepath_rel, &it->filepath_rel_len,
+				it->dbinfo.name, it->fileinfo.name);
+
+		it->is_empty_dir = false;
+
+		return(true);
+	}
+
+	return(false);
+}
+
+static
+bool
+datadir_iter_next(datadir_iter_t *it, datadir_node_t *node)
+{
+	bool	ret = true;
+
+	os_mutex_enter(it->mutex);
+
+	if (datadir_iter_next_file(it)) {
+
+		datadir_node_fill(node, it);
+
+		goto done;
+	}
+
+	while (datadir_iter_next_database(it)) {
+
+		if (datadir_iter_next_file(it)) {
+
+			datadir_node_fill(node, it);
+
+			goto done;
+		}
+
+		make_path_n(2, &it->filepath, &it->filepath_len,
+				it->datadir_path, it->dbinfo.name);
+
+		make_path_n(1, &it->filepath_rel, &it->filepath_rel_len,
+				it->dbinfo.name);
+
+		it->is_empty_dir = true;
+
+		datadir_node_fill(node, it);
+
+		goto done;
+	}
+
+	/* nothing found */
+	ret = false;
+
+done:
+	os_mutex_exit(it->mutex);
+
+	return(ret);
+}
+
+/************************************************************************
+Interface to read MySQL data file sequentially. One should open file
+with datafile_open to get cursor and close the cursor with
+datafile_close. Cursor can not be shared between multiple
+threads. */
+static
+void
+datadir_iter_free(datadir_iter_t *it)
+{
+	os_mutex_free(it->mutex);
+
+	if (it->dbdir) {
+
+		os_file_closedir(it->dbdir);
+	}
+
+	if (it->dir) {
+
+		os_file_closedir(it->dir);
+	}
+
+	ut_free(it->dbpath);
+	ut_free(it->filepath);
+	ut_free(it->filepath_rel);
+	free(it->datadir_path);
+	ut_free(it);
+}
+
+
+/************************************************************************
+Holds the state needed to copy single data file. */
+struct datafile_cur_t {
+	os_file_t	file;
+	char		rel_path[FN_REFLEN];
+	char		abs_path[FN_REFLEN];
+	MY_STAT		statinfo;
+	uint		thread_n;
+	byte*		orig_buf;
+	byte*		buf;
+	ib_int64_t	buf_size;
+	ib_int64_t	buf_read;
+	ib_int64_t	buf_offset;
+};
+
+static
+void
+datafile_close(datafile_cur_t *cursor)
+{
+	if (cursor->file != 0) {
+		os_file_close(cursor->file);
+	}
+	ut_free(cursor->buf);
+}
+
+static
+bool
+datafile_open(const char *file, datafile_cur_t *cursor, uint thread_n)
+{
+	ulint		success;
+
+	memset(cursor, 0, sizeof(datafile_cur_t));
+
+	strncpy(cursor->abs_path, file, sizeof(cursor->abs_path));
+
+	/* Get the relative path for the destination tablespace name, i.e. the
+	one that can be appended to the backup root directory. Non-system
+	tablespaces may have absolute paths for remote tablespaces in MySQL
+	5.6+. We want to make "local" copies for the backup. */
+	strncpy(cursor->rel_path,
+		xb_get_relative_path(cursor->abs_path, FALSE),
+		sizeof(cursor->rel_path));
+
+	cursor->file = os_file_create_simple_no_error_handling(0,
+							cursor->abs_path,
+							OS_FILE_OPEN,
+							OS_FILE_READ_ONLY,
+							&success);
+	if (!success) {
+		/* The following call prints an error message */
+		os_file_get_last_error(TRUE);
+
+		msg("[%02u] error: cannot open "
+			"file %s\n",
+			thread_n, cursor->abs_path);
+
+		return(false);
+	}
+
+	if (my_fstat(cursor->file, &cursor->statinfo, MYF(MY_WME))) {
+		msg("[%02u] error: cannot stat %s\n",
+			thread_n, cursor->abs_path);
+
+		datafile_close(cursor);
+
+		return(false);
+	}
+
+	posix_fadvise(cursor->file, 0, 0, POSIX_FADV_SEQUENTIAL);
+
+	cursor->buf_size = 10 * 1024 * 1024;
+	cursor->buf = static_cast<byte *>(ut_malloc(cursor->buf_size));
+
+	return(true);
+}
+
+
+static
+xb_fil_cur_result_t
+datafile_read(datafile_cur_t *cursor)
+{
+	ulint		success;
+	ulint		to_read;
+
+	xtrabackup_io_throttling();
+
+	to_read = min(cursor->statinfo.st_size - cursor->buf_offset, 
+		      cursor->buf_size);
+
+	if (to_read == 0) {
+		return(XB_FIL_CUR_EOF);
+	}
+
+	success = os_file_read(cursor->file, cursor->buf, cursor->buf_offset,
+			       to_read);
+	if (!success) {
+		return(XB_FIL_CUR_ERROR);
+	}
+
+	posix_fadvise(cursor->file, cursor->buf_offset, to_read,
+			POSIX_FADV_DONTNEED);
+
+	cursor->buf_read = to_read;
+	cursor->buf_offset += to_read;
+
+	return(XB_FIL_CUR_SUCCESS);
+}
+
+
+
+/************************************************************************
+Check to see if a file exists.
+Takes name of the file to check.
+@return true if file exists. */
+static
+bool
+file_exists(const char *filename)
+{
+	MY_STAT stat_arg;
+
+	if (!my_stat(filename, &stat_arg, MYF(0))) {
+
+		return(false);
+	}
+
+	return(true);
+}
+
+/************************************************************************
+Trim leading slashes from absolute path so it becomes relative */
+static
+const char *
+trim_dotslash(const char *path)
+{
+	while (*path) {
+		if (is_path_separator(*path)) {
+			++path;
+			continue;
+		}
+		if (*path == '.' && is_path_separator(path[1])) {
+			path += 2;
+			continue;
+		}
+		break;
+	}
+
+	return(path);
+}
+
+
+
+/************************************************************************
+Check if string ends with given suffix.
+@return true if string ends with given suffix. */
+static
+bool
+ends_with(const char *str, const char *suffix)
+{
+	size_t suffix_len = strlen(suffix);
+	size_t str_len = strlen(str);
+	return(str_len >= suffix_len
+	       && strcmp(str + str_len - suffix_len, suffix) == 0);
+}
+
+/************************************************************************
+Create directories recursively.
+@return 0 if directories created successfully. */
+static
+int
+mkdirp(const char *pathname, int Flags, myf MyFlags)
+{
+	char parent[PATH_MAX], *p;
+
+	/* make a parent directory path */
+	strncpy(parent, pathname, sizeof(parent));
+	parent[sizeof(parent) - 1] = 0;
+
+	for (p = parent + strlen(parent);
+	    !is_path_separator(*p) && p != parent; p--);
+
+	*p = 0;
+
+	/* try to make parent directory */
+	if (p != parent && mkdirp(parent, Flags, MyFlags) != 0) {
+		return(-1);
+	}
+
+	/* make this one if parent has been made */
+	if (my_mkdir(pathname, Flags, MyFlags) == 0) {
+		return(0);
+	}
+
+	/* if it already exists that is fine */
+	if (errno == EEXIST) {
+		return(0);
+	}
+
+	return(-1);
+}
+
+/************************************************************************
+Return true if first and second arguments are the same path. */
+bool
+equal_paths(const char *first, const char *second)
+{
+	char real_first[PATH_MAX];
+	char real_second[PATH_MAX];
+
+	if (realpath(first, real_first) == NULL) {
+		return false;
+	}
+	if (realpath(second, real_second) == NULL) {
+		return false;
+	}
+
+	return (strcmp(real_first, real_second) == 0);
+}
+
+/************************************************************************
+Check if directory exists. Optionally create directory if doesn't
+exist.
+@return true if directory exists and if it was created successfully. */
+bool
+directory_exists(const char *dir, bool create)
+{
+	os_file_dir_t os_dir;
+	MY_STAT stat_arg;
+	char errbuf[MYSYS_STRERROR_SIZE];
+
+	if (my_stat(dir, &stat_arg, MYF(0)) == NULL) {
+
+		if (!create) {
+			return(false);
+		}
+
+		if (mkdirp(dir, 0777, MYF(0)) < 0) {
+
+			msg("Can not create directory %s: %s\n", dir,
+			    my_strerror(errbuf, sizeof(errbuf), my_errno));
+
+			return(false);
+
+		}
+	}
+
+	/* could be symlink */
+	os_dir = os_file_opendir(dir, FALSE);
+
+	if (os_dir == NULL) {
+
+		msg("Can not open directory %s: %s\n", dir,
+			my_strerror(errbuf, sizeof(errbuf), my_errno));
+
+		return(false);
+	}
+
+	os_file_closedir(os_dir);
+
+	return(true);
+}
+
+/************************************************************************
+Check that directory exists and it is empty. */
+static
+bool
+directory_exists_and_empty(const char *dir, const char *comment)
+{
+	os_file_dir_t os_dir;
+	dberr_t err;
+	os_file_stat_t info;
+	bool empty;
+
+	if (!directory_exists(dir, true)) {
+		return(false);
+	}
+
+	os_dir = os_file_opendir(dir, FALSE);
+
+	if (os_dir == NULL) {
+		msg("%s can not open directory %s\n", comment, dir);
+		return(false);
+	}
+
+	empty = (fil_file_readdir_next_file(&err, dir, os_dir, &info) != 0);
+
+	os_file_closedir(os_dir);
+
+	if (!empty) {
+		msg("%s directory %s is not empty!\n", comment, dir);
+	}
+
+	return(empty);
+}
+
+
+/************************************************************************
+Check if file name ends with given set of suffixes.
+@return true if it does. */
+static
+bool
+filename_matches(const char *filename, const char **ext_list)
+{
+	const char **ext;
+
+	for (ext = ext_list; *ext; ext++) {
+		if (ends_with(filename, *ext)) {
+			return(true);
+		}
+	}
+
+	return(false);
+}
+
+
+/************************************************************************
+Copy data file for backup. Also check if it is allowed to copy by
+comparing its name to the list of known data file types and checking
+if passes the rules for partial backup.
+@return true if file backed up or skipped successfully. */
+static
+bool
+datafile_copy_backup(const char *filepath, uint thread_n)
+{
+	const char *ext_list[] = {"frm", "isl", "MYD", "MYI", "MAD", "MAI",
+		"MRG", "TRG", "TRN", "ARM", "ARZ", "CSM", "CSV", "opt", "par",
+		NULL};
+
+	/* Get the name and the path for the tablespace. node->name always
+	contains the path (which may be absolute for remote tablespaces in
+	5.6+). space->name contains the tablespace name in the form
+	"./database/table.ibd" (in 5.5-) or "database/table" (in 5.6+). For a
+	multi-node shared tablespace, space->name contains the name of the first
+	node, but that's irrelevant, since we only need node_name to match them
+	against filters, and the shared tablespace is always copied regardless
+	of the filters value. */
+
+	if (check_if_skip_table(filepath)) {
+		msg_ts("[%02u] Skipping %s.\n", thread_n, filepath);
+		return(true);
+	}
+
+	if (filename_matches(filepath, ext_list)) {
+		return copy_file(ds_data, filepath, filepath, thread_n);
+	}
+
+	return(true);
+}
+
+
+/************************************************************************
+Same as datafile_copy_backup, but put file name into the list for
+rsync command. */
+static
+bool
+datafile_rsync_backup(const char *filepath, bool save_to_list, FILE *f)
+{
+	const char *ext_list[] = {"frm", "isl", "MYD", "MYI", "MAD", "MAI",
+		"MRG", "TRG", "TRN", "ARM", "ARZ", "CSM", "CSV", "opt", "par",
+		NULL};
+
+	/* Get the name and the path for the tablespace. node->name always
+	contains the path (which may be absolute for remote tablespaces in
+	5.6+). space->name contains the tablespace name in the form
+	"./database/table.ibd" (in 5.5-) or "database/table" (in 5.6+). For a
+	multi-node shared tablespace, space->name contains the name of the first
+	node, but that's irrelevant, since we only need node_name to match them
+	against filters, and the shared tablespace is always copied regardless
+	of the filters value. */
+
+	if (check_if_skip_table(filepath)) {
+		return(true);
+	}
+
+	if (filename_matches(filepath, ext_list)) {
+		fprintf(f, "%s\n", filepath);
+		if (save_to_list) {
+			rsync_list.insert(filepath);
+		}
+	}
+
+	return(true);
+}
+
+
+static
+bool
+backup_file_vprintf(const char *filename, const char *fmt, va_list ap)
+{
+	ds_file_t	*dstfile	= NULL;
+	MY_STAT		 stat;			/* unused for now */
+	char		*buf		= 0;
+	int		 buf_len;
+	const char	*action;
+
+	memset(&stat, 0, sizeof(stat));
+
+	buf_len = vasprintf(&buf, fmt, ap);
+
+	stat.st_size = buf_len;
+	stat.st_mtime = my_time(0);
+
+	dstfile = ds_open(ds_data, filename, &stat);
+	if (dstfile == NULL) {
+		msg("[%02u] error: "
+			"cannot open the destination stream for %s\n",
+			0, filename);
+		goto error;
+	}
+
+	action = xb_get_copy_action("Writing");
+	msg_ts("[%02u] %s %s\n", 0, action, filename);
+
+	if (buf_len == -1) {
+		goto error;
+	}
+
+	if (ds_write(dstfile, buf, buf_len)) {
+		goto error;
+	}
+
+	/* close */
+	msg_ts("[%02u]        ...done\n", 0);
+	free(buf);
+
+	if (ds_close(dstfile)) {
+		goto error_close;
+	}
+
+	return(true);
+
+error:
+	free(buf);
+	if (dstfile != NULL) {
+		ds_close(dstfile);
+	}
+
+error_close:
+	msg("[%02u] Error: backup file failed.\n", 0);
+	return(false); /*ERROR*/
+}
+
+
+bool
+backup_file_printf(const char *filename, const char *fmt, ...)
+{
+	bool result;
+	va_list ap;
+
+	va_start(ap, fmt);
+
+	result = backup_file_vprintf(filename, fmt, ap);
+
+	va_end(ap);
+
+	return(result);
+}
+
+static
+bool
+run_data_threads(datadir_iter_t *it, os_thread_func_t func, uint n)
+{
+	datadir_thread_ctxt_t	*data_threads;
+	uint			i, count;
+	os_ib_mutex_t		count_mutex;
+	bool			ret;
+
+	data_threads = (datadir_thread_ctxt_t*)
+				(ut_malloc(sizeof(datadir_thread_ctxt_t) * n));
+
+	count_mutex = os_mutex_create();
+	count = n;
+
+	for (i = 0; i < n; i++) {
+		data_threads[i].it = it;
+		data_threads[i].n_thread = i + 1;
+		data_threads[i].count = &count;
+		data_threads[i].count_mutex = count_mutex;
+		os_thread_create(func, data_threads + i, &data_threads[i].id);
+	}
+
+	/* Wait for threads to exit */
+	while (1) {
+		os_thread_sleep(100000);
+		os_mutex_enter(count_mutex);
+		if (count == 0) {
+			os_mutex_exit(count_mutex);
+			break;
+		}
+		os_mutex_exit(count_mutex);
+	}
+
+	os_mutex_free(count_mutex);
+
+	ret = true;
+	for (i = 0; i < n; i++) {
+		ret = data_threads[i].ret && ret;
+		if (!data_threads[i].ret) {
+			msg("Error: thread %u failed.\n", i);
+		}
+	}
+
+	ut_free(data_threads);
+
+	return(ret);
+}
+
+
+/************************************************************************
+Copy file for backup/restore.
+@return true in case of success. */
+bool
+copy_file(ds_ctxt_t *datasink,
+	  const char *src_file_path,
+	  const char *dst_file_path,
+	  uint thread_n)
+{
+	char			 dst_name[FN_REFLEN];
+	ds_file_t		*dstfile = NULL;
+	datafile_cur_t		 cursor;
+	xb_fil_cur_result_t	 res;
+	const char		*action;
+
+	if (!datafile_open(src_file_path, &cursor, thread_n)) {
+		goto error;
+	}
+
+	strncpy(dst_name, cursor.rel_path, sizeof(dst_name));
+
+	dstfile = ds_open(datasink, trim_dotslash(dst_file_path),
+			  &cursor.statinfo);
+	if (dstfile == NULL) {
+		msg("[%02u] error: "
+			"cannot open the destination stream for %s\n",
+			thread_n, dst_name);
+		goto error;
+	}
+
+	action = xb_get_copy_action();
+	msg_ts("[%02u] %s %s to %s\n",
+	       thread_n, action, src_file_path, dstfile->path);
+
+	/* The main copy loop */
+	while ((res = datafile_read(&cursor)) == XB_FIL_CUR_SUCCESS) {
+
+		if (ds_write(dstfile, cursor.buf, cursor.buf_read)) {
+			goto error;
+		}
+	}
+
+	if (res == XB_FIL_CUR_ERROR) {
+		goto error;
+	}
+
+	/* close */
+	msg_ts("[%02u]        ...done\n", thread_n);
+	datafile_close(&cursor);
+	if (ds_close(dstfile)) {
+		goto error_close;
+	}
+	return(true);
+
+error:
+	datafile_close(&cursor);
+	if (dstfile != NULL) {
+		ds_close(dstfile);
+	}
+
+error_close:
+	msg("[%02u] Error: copy_file() failed.\n", thread_n);
+	return(false); /*ERROR*/
+}
+
+
+/************************************************************************
+Try to move file by renaming it. If source and destination are on
+different devices fall back to copy and unlink.
+@return true in case of success. */
+static
+bool
+move_file(ds_ctxt_t *datasink,
+	  const char *src_file_path,
+	  const char *dst_file_path,
+	  const char *dst_dir, uint thread_n)
+{
+	char errbuf[MYSYS_STRERROR_SIZE];
+	char dst_file_path_abs[FN_REFLEN];
+	char dst_dir_abs[FN_REFLEN];
+	size_t dirname_length;
+
+	ut_snprintf(dst_file_path_abs, sizeof(dst_file_path_abs),
+			"%s/%s", dst_dir, dst_file_path);
+
+	dirname_part(dst_dir_abs, dst_file_path_abs, &dirname_length);
+
+	if (!directory_exists(dst_dir_abs, true)) {
+		return(false);
+	}
+
+	if (file_exists(dst_file_path_abs)) {
+		msg("Error: Move file %s to %s failed: Destination "
+			"file exists\n",
+			src_file_path, dst_file_path_abs);
+		return(false);
+	}
+
+	msg_ts("[%02u] Moving %s to %s\n",
+	       thread_n, src_file_path, dst_file_path_abs);
+
+	if (my_rename(src_file_path, dst_file_path_abs, MYF(0)) != 0) {
+		if (my_errno == EXDEV) {
+			bool ret;
+			ret = copy_file(datasink, src_file_path,
+					dst_file_path, thread_n);
+			msg_ts("[%02u] Removing %s\n", thread_n, src_file_path);
+			if (unlink(src_file_path) != 0) {
+				msg("Error: unlink %s failed: %s\n",
+					src_file_path,
+					my_strerror(errbuf,
+						    sizeof(errbuf), errno));
+			}
+			return(ret);
+		}
+		msg("Can not move file %s to %s: %s\n",
+			src_file_path, dst_file_path_abs,
+			my_strerror(errbuf, sizeof(errbuf), my_errno));
+		return(false);
+	}
+
+	msg_ts("[%02u]        ...done\n", thread_n);
+
+	return(true);
+}
+
+
+/************************************************************************
+Read link from .isl file if any and store it in the global map associated
+with given tablespace. */
+static
+void
+read_link_file(const char *ibd_filepath, const char *link_filepath)
+{
+	char *filepath= NULL;
+
+	FILE *file = fopen(link_filepath, "r+b");
+	if (file) {
+		filepath = static_cast<char*>(malloc(OS_FILE_MAX_PATH));
+
+		os_file_read_string(file, filepath, OS_FILE_MAX_PATH);
+		fclose(file);
+
+		if (strlen(filepath)) {
+			/* Trim whitespace from end of filepath */
+			ulint lastch = strlen(filepath) - 1;
+			while (lastch > 4 && filepath[lastch] <= 0x20) {
+				filepath[lastch--] = 0x00;
+			}
+			srv_normalize_path_for_win(filepath);
+		}
+
+		tablespace_locations[ibd_filepath] = filepath;
+	}
+	free(filepath);
+}
+
+
+/************************************************************************
+Return the location of given .ibd if it was previously read
+from .isl file.
+@return NULL or destination .ibd file path. */
+static
+const char *
+tablespace_filepath(const char *ibd_filepath)
+{
+	std::map<std::string, std::string>::iterator it;
+
+	it = tablespace_locations.find(ibd_filepath);
+
+	if (it != tablespace_locations.end()) {
+		return it->second.c_str();
+	}
+
+	return NULL;
+}
+
+
+/************************************************************************
+Copy or move file depending on current mode.
+@return true in case of success. */
+static
+bool
+copy_or_move_file(const char *src_file_path,
+		  const char *dst_file_path,
+		  const char *dst_dir,
+		  uint thread_n)
+{
+	ds_ctxt_t *datasink = ds_data;		/* copy to datadir by default */
+	char filedir[FN_REFLEN];
+	size_t filedir_len;
+	bool ret;
+
+	/* read the link from .isl file */
+	if (ends_with(src_file_path, ".isl")) {
+		char *ibd_filepath;
+
+		ibd_filepath = strdup(src_file_path);
+		strcpy(ibd_filepath + strlen(ibd_filepath) - 3, "ibd");
+
+		read_link_file(ibd_filepath, src_file_path);
+
+		free(ibd_filepath);
+	}
+
+	/* check if there is .isl file */
+	if (ends_with(src_file_path, ".ibd")) {
+		char *link_filepath;
+		const char *filepath;
+
+		link_filepath = strdup(src_file_path);
+		strcpy(link_filepath + strlen(link_filepath) - 3, "isl");
+
+		read_link_file(src_file_path, link_filepath);
+
+		filepath = tablespace_filepath(src_file_path);
+
+		if (filepath != NULL) {
+			dirname_part(filedir, filepath, &filedir_len);
+
+			dst_file_path = filepath + filedir_len;
+			dst_dir = filedir;
+
+			if (!directory_exists(dst_dir, true)) {
+				ret = false;
+				goto cleanup;
+			}
+
+			datasink = ds_create(dst_dir, DS_TYPE_LOCAL);
+		}
+
+		free(link_filepath);
+	}
+
+	ret = (xtrabackup_copy_back ?
+		copy_file(datasink, src_file_path, dst_file_path, thread_n) :
+		move_file(datasink, src_file_path, dst_file_path,
+			  dst_dir, thread_n));
+
+cleanup:
+
+	if (datasink != ds_data) {
+		ds_destroy(datasink);
+	}
+
+	return(ret);
+}
+
+
+
+
+bool
+backup_files(const char *from, bool prep_mode)
+{
+	char rsync_tmpfile_name[FN_REFLEN];
+	FILE *rsync_tmpfile = NULL;
+	datadir_iter_t *it;
+	datadir_node_t node;
+	bool ret = true;
+
+	if (prep_mode && !opt_rsync) {
+		return(true);
+	}
+
+	if (opt_rsync) {
+		snprintf(rsync_tmpfile_name, sizeof(rsync_tmpfile_name),
+			"%s/%s%d", opt_mysql_tmpdir,
+			"xtrabackup_rsyncfiles_pass",
+			prep_mode ? 1 : 2);
+		rsync_tmpfile = fopen(rsync_tmpfile_name, "w");
+		if (rsync_tmpfile == NULL) {
+			msg("Error: can't create file %s\n",
+				rsync_tmpfile_name);
+			return(false);
+		}
+	}
+
+	msg_ts("Starting %s non-InnoDB tables and files\n",
+	       prep_mode ? "prep copy of" : "to backup");
+
+	datadir_node_init(&node);
+	it = datadir_iter_new(from);
+
+	while (datadir_iter_next(it, &node)) {
+
+		if (!node.is_empty_dir) {
+			if (opt_rsync) {
+				ret = datafile_rsync_backup(node.filepath,
+					!prep_mode, rsync_tmpfile);
+			} else {
+				ret = datafile_copy_backup(node.filepath, 1);
+			}
+			if (!ret) {
+				msg("Failed to copy file %s\n", node.filepath);
+				goto out;
+			}
+		} else if (!prep_mode) {
+			/* backup fake file into empty directory */
+			char path[FN_REFLEN];
+			ut_snprintf(path, sizeof(path),
+					"%s/db.opt", node.filepath);
+			if (!(ret = backup_file_printf(
+					trim_dotslash(path), "%s", ""))) {
+				msg("Failed to create file %s\n", path);
+				goto out;
+			}
+		}
+	}
+
+	if (opt_rsync) {
+		std::stringstream cmd;
+		int err;
+
+		if (buffer_pool_filename && file_exists(buffer_pool_filename)) {
+			fprintf(rsync_tmpfile, "%s\n", buffer_pool_filename);
+			rsync_list.insert(buffer_pool_filename);
+		}
+		if (file_exists("ib_lru_dump")) {
+			fprintf(rsync_tmpfile, "%s\n", "ib_lru_dump");
+			rsync_list.insert("ib_lru_dump");
+		}
+
+		fclose(rsync_tmpfile);
+		rsync_tmpfile = NULL;
+
+		cmd << "rsync -t . --files-from=" << rsync_tmpfile_name
+		    << " " << xtrabackup_target_dir;
+
+		msg_ts("Starting rsync as: %s\n", cmd.str().c_str());
+		if ((err = system(cmd.str().c_str()) && !prep_mode) != 0) {
+			msg_ts("Error: rsync failed with error code %d\n", err);
+			ret = false;
+			goto out;
+		}
+		msg_ts("rsync finished successfully.\n");
+
+		if (!prep_mode && !opt_no_lock) {
+			char path[FN_REFLEN];
+			char dst_path[FN_REFLEN];
+			char *newline;
+
+			/* Remove files that have been removed between first and
+			second passes. Cannot use "rsync --delete" because it
+			does not work with --files-from. */
+			snprintf(rsync_tmpfile_name, sizeof(rsync_tmpfile_name),
+				"%s/%s", opt_mysql_tmpdir,
+				"xtrabackup_rsyncfiles_pass1");
+
+			rsync_tmpfile = fopen(rsync_tmpfile_name, "r");
+			if (rsync_tmpfile == NULL) {
+				msg("Error: can't open file %s\n",
+					rsync_tmpfile_name);
+				return(false);
+			}
+
+			while (fgets(path, sizeof(path), rsync_tmpfile)) {
+
+				newline = strchr(path, '\n');
+				if (newline) {
+					*newline = 0;
+				}
+				if (rsync_list.count(path) < 1) {
+					snprintf(dst_path, sizeof(dst_path),
+						"%s/%s", xtrabackup_target_dir,
+						path);
+					msg_ts("Removing %s\n", dst_path);
+					unlink(dst_path);
+				}
+			}
+
+			fclose(rsync_tmpfile);
+			rsync_tmpfile = NULL;
+		}
+	}
+
+	msg_ts("Finished %s non-InnoDB tables and files\n",
+	       prep_mode ? "a prep copy of" : "backing up");
+
+out:
+	datadir_iter_free(it);
+	datadir_node_free(&node);
+
+	if (rsync_tmpfile != NULL) {
+		fclose(rsync_tmpfile);
+	}
+
+	return(ret);
+}
+
+bool
+backup_start()
+{
+	if (!opt_no_lock) {
+		if (opt_safe_slave_backup) {
+			if (!wait_for_safe_slave(mysql_connection)) {
+				return(false);
+			}
+		}
+
+		if (!backup_files(fil_path_to_mysql_datadir, true)) {
+			return(false);
+		}
+
+		history_lock_time = time(NULL);
+
+		if (!lock_tables(mysql_connection)) {
+			return(false);
+		}
+	}
+
+	if (!backup_files(fil_path_to_mysql_datadir, false)) {
+		return(false);
+	}
+
+	// There is no need to stop slave thread before coping non-Innodb data when
+	// --no-lock option is used because --no-lock option requires that no DDL or
+	// DML to non-transaction tables can occur.
+	if (opt_no_lock) {
+		if (opt_safe_slave_backup) {
+			if (!wait_for_safe_slave(mysql_connection)) {
+				return(false);
+			}
+		}
+	}
+
+	if (opt_slave_info) {
+		lock_binlog_maybe(mysql_connection);
+
+		if (!write_slave_info(mysql_connection)) {
+			return(false);
+		}
+	}
+
+	/* The only reason why Galera/binlog info is written before
+	wait_for_ibbackup_log_copy_finish() is that after that call the xtrabackup
+	binary will start streamig a temporary copy of REDO log to stdout and
+	thus, any streaming from innobackupex would interfere. The only way to
+	avoid that is to have a single process, i.e. merge innobackupex and
+	xtrabackup. */
+	if (opt_galera_info) {
+		if (!write_galera_info(mysql_connection)) {
+			return(false);
+		}
+		write_current_binlog_file(mysql_connection);
+	}
+
+	if (opt_binlog_info == BINLOG_INFO_ON) {
+
+		lock_binlog_maybe(mysql_connection);
+		write_binlog_info(mysql_connection);
+	}
+
+	if (have_flush_engine_logs) {
+		msg_ts("Executing FLUSH NO_WRITE_TO_BINLOG ENGINE LOGS...\n");
+		xb_mysql_query(mysql_connection,
+			"FLUSH NO_WRITE_TO_BINLOG ENGINE LOGS", false);
+	}
+
+	return(true);
+}
+
+
+bool
+backup_finish()
+{
+	/* release all locks */
+	if (!opt_no_lock) {
+		unlock_all(mysql_connection);
+		history_lock_time = 0;
+	} else {
+		history_lock_time = time(NULL) - history_lock_time;
+	}
+
+	if (opt_safe_slave_backup && sql_thread_started) {
+		msg("Starting slave SQL thread\n");
+		xb_mysql_query(mysql_connection,
+				"START SLAVE SQL_THREAD", false);
+	}
+
+	/* Copy buffer pool dump or LRU dump */
+	if (!opt_rsync) {
+		if (buffer_pool_filename && file_exists(buffer_pool_filename)) {
+			const char *dst_name;
+
+			dst_name = trim_dotslash(buffer_pool_filename);
+			copy_file(ds_data, buffer_pool_filename, dst_name, 0);
+		}
+		if (file_exists("ib_lru_dump")) {
+			copy_file(ds_data, "ib_lru_dump", "ib_lru_dump", 0);
+		}
+	}
+
+	msg_ts("Backup created in directory '%s'\n", xtrabackup_target_dir);
+	if (mysql_binlog_position != NULL) {
+		msg("MySQL binlog position: %s\n", mysql_binlog_position);
+	}
+	if (mysql_slave_position && opt_slave_info) {
+		msg("MySQL slave binlog position: %s\n",
+			mysql_slave_position);
+	}
+
+	if (!write_backup_config_file()) {
+		return(false);
+	}
+
+	if (!write_xtrabackup_info(mysql_connection)) {
+		return(false);
+	}
+
+
+
+	return(true);
+}
+
+bool
+ibx_copy_incremental_over_full()
+{
+	const char *ext_list[] = {"frm", "isl", "MYD", "MYI", "MAD", "MAI",
+		"MRG", "TRG", "TRN", "ARM", "ARZ", "CSM", "CSV", "opt", "par",
+		NULL};
+	const char *sup_files[] = {"xtrabackup_binlog_info",
+				   "xtrabackup_galera_info",
+				   "xtrabackup_slave_info",
+				   "xtrabackup_info",
+				   "ib_lru_dump",
+				   NULL};
+	datadir_iter_t *it = NULL;
+	datadir_node_t node;
+	bool ret = true;
+	char path[FN_REFLEN];
+	int i;
+
+	datadir_node_init(&node);
+
+	/* If we were applying an incremental change set, we need to make
+	sure non-InnoDB files and xtrabackup_* metainfo files are copied
+	to the full backup directory. */
+
+	if (xtrabackup_incremental) {
+
+		ds_data = ds_create(xtrabackup_target_dir, DS_TYPE_LOCAL);
+
+		it = datadir_iter_new(xtrabackup_incremental_dir);
+
+		while (datadir_iter_next(it, &node)) {
+
+			/* copy only non-innodb files */
+
+			if (node.is_empty_dir
+			    || !filename_matches(node.filepath, ext_list)) {
+				continue;
+			}
+
+			if (file_exists(node.filepath_rel)) {
+				unlink(node.filepath_rel);
+			}
+
+			if (!(ret = copy_file(ds_data, node.filepath,
+						node.filepath_rel, 1))) {
+				msg("Failed to copy file %s\n",
+					node.filepath);
+				goto cleanup;
+			}
+		}
+
+		/* copy buffer pool dump */
+		if (innobase_buffer_pool_filename) {
+			const char *src_name;
+
+			src_name = trim_dotslash(innobase_buffer_pool_filename);
+
+			snprintf(path, sizeof(path), "%s/%s",
+				xtrabackup_incremental_dir,
+				src_name);
+
+			if (file_exists(path)) {
+				copy_file(ds_data, path,
+					  innobase_buffer_pool_filename, 0);
+			}
+		}
+
+		/* copy supplementary files */
+
+		for (i = 0; sup_files[i]; i++) {
+			snprintf(path, sizeof(path), "%s/%s",
+				xtrabackup_incremental_dir,
+				sup_files[i]);
+
+			if (file_exists(path))
+			{
+				if (file_exists(sup_files[i])) {
+					unlink(sup_files[i]);
+				}
+				copy_file(ds_data, path, sup_files[i], 0);
+			}
+		}
+
+	}
+
+cleanup:
+	if (it != NULL) {
+		datadir_iter_free(it);
+	}
+
+	if (ds_data != NULL) {
+		ds_destroy(ds_data);
+	}
+
+	datadir_node_free(&node);
+
+	return(ret);
+}
+
+bool
+ibx_cleanup_full_backup()
+{
+	const char *ext_list[] = {"delta", "meta", "ibd", NULL};
+	datadir_iter_t *it = NULL;
+	datadir_node_t node;
+	bool ret = true;
+
+	datadir_node_init(&node);
+
+	/* If we are applying an incremental change set, we need to make
+	sure non-InnoDB files are cleaned up from full backup dir before
+	we copy files from incremental dir. */
+
+	it = datadir_iter_new(xtrabackup_target_dir);
+
+	while (datadir_iter_next(it, &node)) {
+
+		if (node.is_empty_dir) {
+			rmdir(node.filepath);
+		}
+
+		if (xtrabackup_incremental && !node.is_empty_dir
+		    && !filename_matches(node.filepath, ext_list)) {
+			unlink(node.filepath);
+		}
+	}
+
+	datadir_iter_free(it);
+
+	datadir_node_free(&node);
+
+	return(ret);
+}
+
+bool
+apply_log_finish()
+{
+	if (!ibx_cleanup_full_backup()
+		|| !ibx_copy_incremental_over_full()) {
+		return(false);
+	}
+
+	return(true);
+}
+
+bool
+copy_back()
+{
+	char *innobase_data_file_path_copy;
+	ulint i;
+	bool ret;
+	datadir_iter_t *it = NULL;
+	datadir_node_t node;
+	char *dst_dir;
+
+	memset(&node, 0, sizeof(node));
+
+	if (!opt_force_non_empty_dirs) {
+		if (!directory_exists_and_empty(mysql_data_home,
+							"Original data")) {
+			return(false);
+		}
+	} else {
+		if (!directory_exists(mysql_data_home, true)) {
+			return(false);
+		}
+	}
+	if (srv_undo_dir && *srv_undo_dir
+		&& !directory_exists(srv_undo_dir, true)) {
+			return(false);
+	}
+	if (innobase_data_home_dir && *innobase_data_home_dir
+		&& !directory_exists(innobase_data_home_dir, true)) {
+			return(false);
+	}
+	if (srv_log_group_home_dir && *srv_log_group_home_dir
+		&& !directory_exists(srv_log_group_home_dir, true)) {
+			return(false);
+	}
+
+	/* cd to backup directory */
+	if (my_setwd(xtrabackup_target_dir, MYF(MY_WME)))
+	{
+		msg("cannot my_setwd %s\n", xtrabackup_target_dir);
+		return(false);
+	}
+
+	/* parse data file path */
+
+	if (!innobase_data_file_path) {
+  		innobase_data_file_path = (char*) "ibdata1:10M:autoextend";
+	}
+	innobase_data_file_path_copy = strdup(innobase_data_file_path);
+
+	if (!(ret = srv_parse_data_file_paths_and_sizes(
+					innobase_data_file_path_copy))) {
+		msg("syntax error in innodb_data_file_path\n");
+		return(false);
+	}
+
+	srv_max_n_threads = 1000;
+	os_sync_mutex = NULL;
+	ut_mem_init();
+	/* temporally dummy value to avoid crash */
+	srv_page_size_shift = 14;
+	srv_page_size = (1 << srv_page_size_shift);
+	os_sync_init();
+	sync_init();
+	os_io_init_simple();
+	mem_init(srv_mem_pool_size);
+	ut_crc32_init();
+
+	/* copy undo tablespaces */
+	if (srv_undo_tablespaces > 0) {
+
+		dst_dir = (srv_undo_dir && *srv_undo_dir)
+				? srv_undo_dir : mysql_data_home;
+
+		ds_data = ds_create(dst_dir, DS_TYPE_LOCAL);
+
+		for (i = 1; i <= srv_undo_tablespaces; i++) {
+			char filename[20];
+			sprintf(filename, "undo%03lu", i);
+			if (!(ret = copy_or_move_file(filename, filename,
+				                      dst_dir, 1))) {
+				goto cleanup;
+			}
+		}
+
+		ds_destroy(ds_data);
+		ds_data = NULL;
+	}
+
+	/* copy redo logs */
+
+	dst_dir = (srv_log_group_home_dir && *srv_log_group_home_dir)
+				? srv_log_group_home_dir : mysql_data_home;
+
+	ds_data = ds_create(dst_dir, DS_TYPE_LOCAL);
+
+	for (i = 0; i < (ulong)innobase_log_files_in_group; i++) {
+		char filename[20];
+		sprintf(filename, "ib_logfile%lu", i);
+
+		if (!file_exists(filename)) {
+			continue;
+		}
+
+		if (!(ret = copy_or_move_file(filename, filename,
+					      dst_dir, 1))) {
+			goto cleanup;
+		}
+	}
+
+	ds_destroy(ds_data);
+	ds_data = NULL;
+
+	/* copy innodb system tablespace(s) */
+
+	dst_dir = (innobase_data_home_dir && *innobase_data_home_dir)
+				? innobase_data_home_dir : mysql_data_home;
+
+	ds_data = ds_create(dst_dir, DS_TYPE_LOCAL);
+
+	for (i = 0; i < srv_n_data_files; i++) {
+		const char *filename = base_name(srv_data_file_names[i]);
+
+		if (!(ret = copy_or_move_file(filename, srv_data_file_names[i],
+					      dst_dir, 1))) {
+			goto cleanup;
+		}
+	}
+
+	ds_destroy(ds_data);
+	ds_data = NULL;
+
+	/* copy the rest of tablespaces */
+	ds_data = ds_create(mysql_data_home, DS_TYPE_LOCAL);
+
+	it = datadir_iter_new(".", false);
+
+	datadir_node_init(&node);
+
+	while (datadir_iter_next(it, &node)) {
+		const char *ext_list[] = {"backup-my.cnf", "xtrabackup_logfile",
+			"xtrabackup_binary", "xtrabackup_binlog_info",
+			"xtrabackup_checkpoints", ".qp", ".pmap", ".tmp",
+			".xbcrypt", NULL};
+		const char *filename;
+		char c_tmp;
+		int i_tmp;
+		bool is_ibdata_file;
+
+		/* create empty directories */
+		if (node.is_empty_dir) {
+			char path[FN_REFLEN];
+
+			snprintf(path, sizeof(path), "%s/%s",
+				mysql_data_home, node.filepath_rel);
+
+			msg_ts("[%02u] Creating directory %s\n", 1, path);
+
+			if (mkdirp(path, 0777, MYF(0)) < 0) {
+				char errbuf[MYSYS_STRERROR_SIZE];
+
+				msg("Can not create directory %s: %s\n",
+					path, my_strerror(errbuf,
+						sizeof(errbuf), my_errno));
+				ret = false;
+
+				goto cleanup;
+
+			}
+
+			msg_ts("[%02u] ...done.", 1);
+
+			continue;
+		}
+
+		filename = base_name(node.filepath);
+
+		/* skip .qp and .xbcrypt files */
+		if (filename_matches(filename, ext_list)) {
+			continue;
+		}
+
+		/* skip undo tablespaces */
+		if (sscanf(filename, "undo%d%c", &i_tmp, &c_tmp) == 1) {
+			continue;
+		}
+
+		/* skip redo logs */
+		if (sscanf(filename, "ib_logfile%d%c", &i_tmp, &c_tmp) == 1) {
+			continue;
+		}
+
+		/* skip innodb data files */
+		is_ibdata_file = false;
+		for (i = 0; i < srv_n_data_files; i++) {
+			const char *ibfile;
+
+			ibfile = base_name(srv_data_file_names[i]);
+
+			if (strcmp(ibfile, filename) == 0) {
+				is_ibdata_file = true;
+				continue;
+			}
+		}
+		if (is_ibdata_file) {
+			continue;
+		}
+
+		if (!(ret = copy_or_move_file(node.filepath, node.filepath_rel,
+					      mysql_data_home, 1))) {
+			goto cleanup;
+		}
+	}
+
+	/* copy buufer pool dump */
+
+	if (innobase_buffer_pool_filename) {
+		const char *src_name;
+		char path[FN_REFLEN];
+
+		src_name = trim_dotslash(innobase_buffer_pool_filename);
+
+		snprintf(path, sizeof(path), "%s/%s",
+			mysql_data_home,
+			src_name);
+
+		/* could be already copied with other files
+		from data directory */
+		if (file_exists(src_name) &&
+			!file_exists(innobase_buffer_pool_filename)) {
+			copy_or_move_file(src_name,
+					  innobase_buffer_pool_filename,
+					  mysql_data_home, 0);
+		}
+	}
+
+cleanup:
+	if (it != NULL) {
+		datadir_iter_free(it);
+	}
+
+	datadir_node_free(&node);
+
+	free(innobase_data_file_path_copy);
+
+	if (ds_data != NULL) {
+		ds_destroy(ds_data);
+	}
+
+	ds_data = NULL;
+
+	sync_close();
+	sync_initialized = FALSE;
+	os_sync_free();
+	mem_close();
+	os_sync_mutex = NULL;
+	ut_free_all_mem();
+
+	return(ret);
+}
+
+bool
+decrypt_decompress_file(const char *filepath, uint thread_n)
+{
+	std::stringstream cmd, message;
+	char *dest_filepath = strdup(filepath);
+	bool needs_action = false;
+
+	cmd << "cat " << filepath;
+
+ 	if (ends_with(filepath, ".xbcrypt") && opt_decrypt) {
+ 		cmd << " | xbcrypt --decrypt --encrypt-algo="
+ 		    << xtrabackup_encrypt_algo_names[opt_decrypt_algo];
+ 		if (xtrabackup_encrypt_key) {
+ 			cmd << " --encrypt-key=" << xtrabackup_encrypt_key;
+ 		} else {
+ 			cmd << " --encrypt-key-file="
+ 			    << xtrabackup_encrypt_key_file;
+ 		}
+ 		dest_filepath[strlen(dest_filepath) - 8] = 0;
+ 		message << "decrypting";
+ 		needs_action = true;
+ 	}
+
+ 	if (opt_decompress
+ 	    && (ends_with(filepath, ".qp")
+		|| (ends_with(filepath, ".qp.xbcrypt")
+		    && opt_decrypt))) {
+ 		cmd << " | qpress -dio ";
+ 		dest_filepath[strlen(dest_filepath) - 3] = 0;
+ 		if (needs_action) {
+ 			message << " and ";
+ 		}
+ 		message << "decompressing";
+ 		needs_action = true;
+ 	}
+
+ 	cmd << " > " << dest_filepath;
+ 	message << " " << filepath;
+
+ 	free(dest_filepath);
+
+ 	if (needs_action) {
+
+		msg_ts("[%02u] %s\n", thread_n, message.str().c_str());
+
+	 	if (system(cmd.str().c_str()) != 0) {
+	 		return(false);
+	 	}
+
+	 	if (opt_remove_original) {
+	 		msg_ts("[%02u] removing %s\n", thread_n, filepath);
+	 		if (my_delete(filepath, MYF(MY_WME)) != 0) {
+	 			return(false);
+	 		}
+	 	}
+	 }
+
+ 	return(true);
+}
+
+static
+os_thread_ret_t
+decrypt_decompress_thread_func(void *arg)
+{
+	bool ret = true;
+	datadir_node_t node;
+	datadir_thread_ctxt_t *ctxt = (datadir_thread_ctxt_t *)(arg);
+
+	datadir_node_init(&node);
+
+	while (datadir_iter_next(ctxt->it, &node)) {
+
+		/* skip empty directories in backup */
+		if (node.is_empty_dir) {
+			continue;
+		}
+
+		if (!ends_with(node.filepath, ".qp")
+		    && !ends_with(node.filepath, ".xbcrypt")) {
+			continue;
+		}
+
+		if (!(ret = decrypt_decompress_file(node.filepath,
+							ctxt->n_thread))) {
+			goto cleanup;
+		}
+	}
+
+cleanup:
+
+	datadir_node_free(&node);
+
+	os_mutex_enter(ctxt->count_mutex);
+	--(*ctxt->count);
+	os_mutex_exit(ctxt->count_mutex);
+
+	ctxt->ret = ret;
+
+	os_thread_exit(NULL);
+	OS_THREAD_DUMMY_RETURN;
+}
+
+bool
+decrypt_decompress()
+{
+	bool ret;
+	datadir_iter_t *it = NULL;
+
+	srv_max_n_threads = 1000;
+	os_sync_mutex = NULL;
+	ut_mem_init();
+	os_sync_init();
+	sync_init();
+
+	/* cd to backup directory */
+	if (my_setwd(xtrabackup_target_dir, MYF(MY_WME)))
+	{
+		msg("cannot my_setwd %s\n", xtrabackup_target_dir);
+		return(false);
+	}
+
+	/* copy the rest of tablespaces */
+	ds_data = ds_create(".", DS_TYPE_LOCAL);
+
+	it = datadir_iter_new(".", false);
+
+	ut_a(xtrabackup_parallel >= 0);
+
+	ret = run_data_threads(it, decrypt_decompress_thread_func,
+		xtrabackup_parallel ? xtrabackup_parallel : 1);
+
+	if (it != NULL) {
+		datadir_iter_free(it);
+	}
+
+	if (ds_data != NULL) {
+		ds_destroy(ds_data);
+	}
+
+	ds_data = NULL;
+
+	sync_close();
+	sync_initialized = FALSE;
+	os_sync_free();
+	os_sync_mutex = NULL;
+	ut_free_all_mem();
+
+	return(ret);
+}
+
+void
+version_check()
+{
+	if (opt_password != NULL) {
+		setenv("option_mysql_password", opt_password, 1);
+	}
+	if (opt_user != NULL) {
+		setenv("option_mysql_user", opt_user, 1);
+	}
+	if (opt_host != NULL) {
+		setenv("option_mysql_host", opt_host, 1);
+	}
+	if (opt_socket != NULL) {
+		setenv("option_mysql_socket", opt_socket, 1);
+	}
+	if (opt_port != 0) {
+		char port[20];
+		snprintf(port, sizeof(port), "%u", opt_port);
+		setenv("option_mysql_port", port, 1);
+	}
+
+	FILE *pipe = popen("perl", "w");
+	if (pipe == NULL) {
+		return;
+	}
+
+	fputs((const char *)version_check_pl, pipe);
+
+	pclose(pipe);
+}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/backup_copy.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/backup_copy.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/backup_copy.h	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/backup_copy.h	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,51 @@
+
+#ifndef XTRABACKUP_BACKUP_COPY_H
+#define XTRABACKUP_BACKUP_COPY_H
+
+#include <my_global.h>
+#include "datasink.h"
+
+/* special files */
+#define XTRABACKUP_SLAVE_INFO "xtrabackup_slave_info"
+#define XTRABACKUP_GALERA_INFO "xtrabackup_galera_info"
+#define XTRABACKUP_BINLOG_INFO "xtrabackup_binlog_info"
+#define XTRABACKUP_INFO "xtrabackup_info"
+
+extern bool binlog_locked;
+
+bool
+backup_file_printf(const char *filename, const char *fmt, ...)
+		ATTRIBUTE_FORMAT(printf, 2, 0);
+
+/************************************************************************
+Return true if first and second arguments are the same path. */
+bool
+equal_paths(const char *first, const char *second);
+
+/************************************************************************
+Copy file for backup/restore.
+@return true in case of success. */
+bool
+copy_file(ds_ctxt_t *datasink,
+	  const char *src_file_path,
+	  const char *dst_file_path,
+	  uint thread_n);
+
+bool
+backup_start();
+bool
+backup_finish();
+bool
+apply_log_finish();
+bool
+copy_back();
+bool
+decrypt_decompress();
+void
+version_check();
+bool
+is_path_separator(char);
+bool
+directory_exists(const char *dir, bool create);
+
+#endif
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/backup_mysql.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/backup_mysql.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/backup_mysql.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/backup_mysql.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,1756 @@
+/******************************************************
+hot backup tool for InnoDB
+(c) 2009-2015 Percona LLC and/or its affiliates
+Originally Created 3/3/2009 Yasufumi Kinoshita
+Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
+Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
+
+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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+*******************************************************
+
+This file incorporates work covered by the following copyright and
+permission notice:
+
+Copyright (c) 2000, 2011, MySQL AB & Innobase Oy. 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., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+
+*******************************************************/
+
+#include <my_global.h>
+#include <mysql.h>
+#include <mysqld.h>
+#include <my_sys.h>
+#include <string.h>
+#include <limits>
+#include "common.h"
+#include "xtrabackup.h"
+#include "xtrabackup_version.h"
+#include "backup_copy.h"
+#include "backup_mysql.h"
+#include "mysqld.h"
+
+
+char *tool_name;
+char tool_args[2048];
+
+/* mysql flavor and version */
+mysql_flavor_t server_flavor = FLAVOR_UNKNOWN;
+unsigned long mysql_server_version = 0;
+
+/* server capabilities */
+bool have_changed_page_bitmaps = false;
+bool have_backup_locks = false;
+bool have_backup_safe_binlog_info = false;
+bool have_lock_wait_timeout = false;
+bool have_galera_enabled = false;
+bool have_flush_engine_logs = false;
+bool have_multi_threaded_slave = false;
+bool have_gtid_slave = false;
+
+/* Kill long selects */
+os_thread_id_t	kill_query_thread_id;
+os_event_t	kill_query_thread_started;
+os_event_t	kill_query_thread_stopped;
+os_event_t	kill_query_thread_stop;
+
+bool sql_thread_started = false;
+char *mysql_slave_position = NULL;
+char *mysql_binlog_position = NULL;
+char *buffer_pool_filename = NULL;
+
+/* History on server */
+time_t history_start_time;
+time_t history_end_time;
+time_t history_lock_time;
+
+MYSQL *mysql_connection;
+
+extern "C" {
+MYSQL * STDCALL
+cli_mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
+		       const char *passwd, const char *db,
+		       uint port, const char *unix_socket,ulong client_flag);
+}
+
+#define mysql_real_connect cli_mysql_real_connect
+
+
+MYSQL *
+xb_mysql_connect()
+{
+	MYSQL *connection = mysql_init(NULL);
+	char mysql_port_str[std::numeric_limits<int>::digits10 + 3];
+
+	sprintf(mysql_port_str, "%d", opt_port);
+
+	if (connection == NULL) {
+		msg("Failed to init MySQL struct: %s.\n",
+			mysql_error(connection));
+		return(NULL);
+	}
+
+	if (!opt_secure_auth) {
+		mysql_options(connection, MYSQL_SECURE_AUTH,
+			      (char *) &opt_secure_auth);
+	}
+
+	msg_ts("Connecting to MySQL server host: %s, user: %s, password: %s, "
+	       "port: %s, socket: %s\n", opt_host ? opt_host : "localhost",
+	       opt_user ? opt_user : "not set",
+	       opt_password ? "set" : "not set",
+	       opt_port != 0 ? mysql_port_str : "not set",
+	       opt_socket ? opt_socket : "not set");
+
+#ifdef HAVE_OPENSSL
+	if (opt_use_ssl)
+	{
+		mysql_ssl_set(connection, opt_ssl_key, opt_ssl_cert,
+			      opt_ssl_ca, opt_ssl_capath,
+			      opt_ssl_cipher);
+		mysql_options(connection, MYSQL_OPT_SSL_CRL, opt_ssl_crl);
+		mysql_options(connection, MYSQL_OPT_SSL_CRLPATH,
+			      opt_ssl_crlpath);
+	}
+	mysql_options(connection,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+		      (char*)&opt_ssl_verify_server_cert);
+#if !defined(HAVE_YASSL)
+	  if (opt_server_public_key && *opt_server_public_key)
+		mysql_options(connection, MYSQL_SERVER_PUBLIC_KEY,
+			      opt_server_public_key);
+#endif
+#endif
+
+	if (!mysql_real_connect(connection,
+				opt_host ? opt_host : "localhost",
+				opt_user,
+				opt_password,
+				"" /*database*/, opt_port,
+				opt_socket, 0)) {
+		msg("Failed to connect to MySQL server: %s.\n",
+			mysql_error(connection));
+		mysql_close(connection);
+		return(NULL);
+	}
+
+	xb_mysql_query(connection, "SET SESSION wait_timeout=2147483",
+		       false, true);
+
+	return(connection);
+}
+
+/*********************************************************************//**
+Execute mysql query. */
+MYSQL_RES *
+xb_mysql_query(MYSQL *connection, const char *query, bool use_result,
+		bool die_on_error)
+{
+	MYSQL_RES *mysql_result = NULL;
+
+	if (mysql_query(connection, query)) {
+		msg("Error: failed to execute query %s: %s\n", query,
+			mysql_error(connection));
+		if (die_on_error) {
+			exit(EXIT_FAILURE);
+		}
+		return(NULL);
+	}
+
+	/* store result set on client if there is a result */
+	if (mysql_field_count(connection) > 0) {
+		if ((mysql_result = mysql_store_result(connection)) == NULL) {
+			msg("Error: failed to fetch query result %s: %s\n",
+				query, mysql_error(connection));
+			exit(EXIT_FAILURE);
+		}
+
+		if (!use_result) {
+			mysql_free_result(mysql_result);
+		}
+	}
+
+	return mysql_result;
+}
+
+
+struct mysql_variable {
+	const char *name;
+	char **value;
+};
+
+
+static
+void
+read_mysql_variables(MYSQL *connection, const char *query, mysql_variable *vars,
+	bool vertical_result)
+{
+	MYSQL_RES *mysql_result;
+	MYSQL_ROW row;
+	mysql_variable *var;
+
+	mysql_result = xb_mysql_query(connection, query, true);
+
+	ut_ad(!vertical_result || mysql_num_fields(mysql_result) == 2);
+
+	if (vertical_result) {
+		while ((row = mysql_fetch_row(mysql_result))) {
+			char *name = row[0];
+			char *value = row[1];
+			for (var = vars; var->name; var++) {
+				if (strcmp(var->name, name) == 0
+				    && value != NULL) {
+					*(var->value) = strdup(value);
+				}
+			}
+		}
+	} else {
+		MYSQL_FIELD *field;
+
+		if ((row = mysql_fetch_row(mysql_result)) != NULL) {
+			int i = 0;
+			while ((field = mysql_fetch_field(mysql_result))
+				!= NULL) {
+				char *name = field->name;
+				char *value = row[i];
+				for (var = vars; var->name; var++) {
+					if (strcmp(var->name, name) == 0
+					    && value != NULL) {
+						*(var->value) = strdup(value);
+					}
+				}
+				++i;
+			}
+		}
+	}
+
+	mysql_free_result(mysql_result);
+}
+
+
+static
+void
+free_mysql_variables(mysql_variable *vars)
+{
+	mysql_variable *var;
+
+	for (var = vars; var->name; var++) {
+		free(*(var->value));
+	}
+}
+
+
+static
+char *
+read_mysql_one_value(MYSQL *connection, const char *query)
+{
+	MYSQL_RES *mysql_result;
+	MYSQL_ROW row;
+	char *result = NULL;
+
+	mysql_result = xb_mysql_query(connection, query, true);
+
+	ut_ad(mysql_num_fields(mysql_result) == 1);
+
+	if ((row = mysql_fetch_row(mysql_result))) {
+		result = strdup(row[0]);
+	}
+
+	mysql_free_result(mysql_result);
+
+	return(result);
+}
+
+static
+bool
+check_server_version(unsigned long version_number,
+		     const char *version_string,
+		     const char *version_comment,
+		     const char *innodb_version)
+{
+	bool version_supported = false;
+	bool mysql51 = false;
+
+	mysql_server_version = version_number;
+
+	server_flavor = FLAVOR_UNKNOWN;
+	if (strstr(version_comment, "Percona") != NULL) {
+		server_flavor = FLAVOR_PERCONA_SERVER;
+	} else if (strstr(version_comment, "MariaDB") != NULL ||
+		   strstr(version_string, "MariaDB") != NULL) {
+		server_flavor = FLAVOR_MARIADB;
+	} else if (strstr(version_comment, "MySQL") != NULL) {
+		server_flavor = FLAVOR_MYSQL;
+	}
+
+	mysql51 = version_number > 50100 && version_number < 50500;
+	version_supported = version_supported
+		|| (mysql51 && innodb_version != NULL);
+	version_supported = version_supported
+		|| (version_number > 50500 && version_number < 50700);
+	version_supported = version_supported
+		|| ((version_number > 100000 && version_number < 100300)
+		    && server_flavor == FLAVOR_MARIADB);
+
+	if (mysql51 && innodb_version == NULL) {
+		msg("Error: Built-in InnoDB in MySQL 5.1 is not "
+		    "supported in this release. You can either use "
+		    "Percona XtraBackup 2.0, or upgrade to InnoDB "
+		    "plugin.\n");
+	} else if (!version_supported) {
+		msg("Error: Unsupported server version: '%s'. Please "
+		    "report a bug at "
+		    "https://bugs.launchpad.net/percona-xtrabackup\n",
+		    version_string);
+	}
+
+	return(version_supported);
+}
+
+/*********************************************************************//**
+Receive options important for XtraBackup from MySQL server.
+@return	true on success. */
+bool
+get_mysql_vars(MYSQL *connection)
+{
+	char *gtid_mode_var = NULL;
+	char *version_var = NULL;
+	char *version_comment_var = NULL;
+	char *innodb_version_var = NULL;
+	char *have_backup_locks_var = NULL;
+	char *have_backup_safe_binlog_info_var = NULL;
+	char *log_bin_var = NULL;
+	char *lock_wait_timeout_var= NULL;
+	char *wsrep_on_var = NULL;
+	char *slave_parallel_workers_var = NULL;
+	char *gtid_slave_pos_var = NULL;
+	char *innodb_buffer_pool_filename_var = NULL;
+	char *datadir_var = NULL;
+	char *innodb_log_group_home_dir_var = NULL;
+	char *innodb_log_file_size_var = NULL;
+	char *innodb_log_files_in_group_var = NULL;
+	char *innodb_data_file_path_var = NULL;
+	char *innodb_data_home_dir_var = NULL;
+	char *innodb_undo_directory_var = NULL;
+	char *innodb_page_size_var = NULL;
+
+	unsigned long server_version = mysql_get_server_version(connection);
+
+	bool ret = true;
+
+	mysql_variable mysql_vars[] = {
+		{"have_backup_locks", &have_backup_locks_var},
+		{"have_backup_safe_binlog_info",
+		 &have_backup_safe_binlog_info_var},
+		{"log_bin", &log_bin_var},
+		{"lock_wait_timeout", &lock_wait_timeout_var},
+		{"gtid_mode", &gtid_mode_var},
+		{"version", &version_var},
+		{"version_comment", &version_comment_var},
+		{"innodb_version", &innodb_version_var},
+		{"wsrep_on", &wsrep_on_var},
+		{"slave_parallel_workers", &slave_parallel_workers_var},
+		{"gtid_slave_pos", &gtid_slave_pos_var},
+		{"innodb_buffer_pool_filename",
+			&innodb_buffer_pool_filename_var},
+		{"datadir", &datadir_var},
+		{"innodb_log_group_home_dir", &innodb_log_group_home_dir_var},
+		{"innodb_log_file_size", &innodb_log_file_size_var},
+		{"innodb_log_files_in_group", &innodb_log_files_in_group_var},
+		{"innodb_data_file_path", &innodb_data_file_path_var},
+		{"innodb_data_home_dir", &innodb_data_home_dir_var},
+		{"innodb_undo_directory", &innodb_undo_directory_var},
+		{"innodb_page_size", &innodb_page_size_var},
+		{NULL, NULL}
+	};
+
+	read_mysql_variables(connection, "SHOW VARIABLES",
+				mysql_vars, true);
+
+	if (have_backup_locks_var != NULL && !opt_no_backup_locks) {
+		have_backup_locks = true;
+	}
+
+	if (opt_binlog_info == BINLOG_INFO_AUTO) {
+
+		if (have_backup_safe_binlog_info_var != NULL)
+			opt_binlog_info = BINLOG_INFO_LOCKLESS;
+		else if (log_bin_var != NULL && !strcmp(log_bin_var, "ON"))
+			opt_binlog_info = BINLOG_INFO_ON;
+		else
+			opt_binlog_info = BINLOG_INFO_OFF;
+	}
+
+	if (have_backup_safe_binlog_info_var == NULL &&
+	    opt_binlog_info == BINLOG_INFO_LOCKLESS) {
+
+		msg("Error: --binlog-info=LOCKLESS is not supported by the "
+		    "server\n");
+		return(false);
+	}
+
+	if (lock_wait_timeout_var != NULL) {
+		have_lock_wait_timeout = true;
+	}
+
+	if (wsrep_on_var != NULL) {
+		have_galera_enabled = true;
+	}
+
+	/* Check server version compatibility and detect server flavor */
+
+	if (!(ret = check_server_version(server_version, version_var,
+					 version_comment_var,
+					 innodb_version_var))) {
+		goto out;
+	}
+
+	if (server_version > 50500) {
+		have_flush_engine_logs = true;
+	}
+
+	if (slave_parallel_workers_var != NULL
+		&& atoi(slave_parallel_workers_var) > 0) {
+		have_multi_threaded_slave = true;
+	}
+
+	if (innodb_buffer_pool_filename_var != NULL) {
+		buffer_pool_filename = strdup(innodb_buffer_pool_filename_var);
+	}
+
+	if ((gtid_mode_var && strcmp(gtid_mode_var, "ON") == 0) ||
+	    (gtid_slave_pos_var && *gtid_slave_pos_var)) {
+		have_gtid_slave = true;
+	}
+
+	msg("Using server version %s\n", version_var);
+
+	if (!(ret = detect_mysql_capabilities_for_backup())) {
+		goto out;
+	}
+
+	/* make sure datadir value is the same in configuration file */
+	if (check_if_param_set("datadir")) {
+		if (!directory_exists(mysql_data_home, false)) {
+			msg("Warning: option 'datadir' points to "
+			    "nonexistent directory '%s'\n", mysql_data_home);
+		}
+		if (!directory_exists(datadir_var, false)) {
+			msg("Warning: MySQL variable 'datadir' points to "
+			    "nonexistent directory '%s'\n", datadir_var);
+		}
+		if (!equal_paths(mysql_data_home, datadir_var)) {
+			msg("Warning: option 'datadir' has different "
+				"values:\n"
+				"  '%s' in defaults file\n"
+				"  '%s' in SHOW VARIABLES\n",
+				mysql_data_home, datadir_var);
+		}
+	}
+
+	/* get some default values is they are missing from my.cnf */
+	if (!check_if_param_set("datadir") && datadir_var && *datadir_var) {
+		strmake(mysql_real_data_home, datadir_var, FN_REFLEN - 1);
+		mysql_data_home= mysql_real_data_home;
+	}
+
+	if (!check_if_param_set("innodb_data_file_path")
+	    && innodb_data_file_path_var && *innodb_data_file_path_var) {
+		innobase_data_file_path = my_strdup(
+			innodb_data_file_path_var, MYF(MY_FAE));
+	}
+
+	if (!check_if_param_set("innodb_data_home_dir")
+	    && innodb_data_home_dir_var && *innodb_data_home_dir_var) {
+		innobase_data_home_dir = my_strdup(
+			innodb_data_home_dir_var, MYF(MY_FAE));
+	}
+
+	if (!check_if_param_set("innodb_log_group_home_dir")
+	    && innodb_log_group_home_dir_var
+	    && *innodb_log_group_home_dir_var) {
+		srv_log_group_home_dir = my_strdup(
+			innodb_log_group_home_dir_var, MYF(MY_FAE));
+	}
+
+	if (!check_if_param_set("innodb_undo_directory")
+	    && innodb_undo_directory_var && *innodb_undo_directory_var) {
+		srv_undo_dir = my_strdup(
+			innodb_undo_directory_var, MYF(MY_FAE));
+	}
+
+	if (!check_if_param_set("innodb_log_files_in_group")
+	    && innodb_log_files_in_group_var) {
+		char *endptr;
+
+		innobase_log_files_in_group = strtol(
+			innodb_log_files_in_group_var, &endptr, 10);
+		ut_ad(*endptr == 0);
+	}
+
+	if (!check_if_param_set("innodb_log_file_size")
+	    && innodb_log_file_size_var) {
+		char *endptr;
+
+		innobase_log_file_size = strtoll(
+			innodb_log_file_size_var, &endptr, 10);
+		ut_ad(*endptr == 0);
+	}
+
+	if (!check_if_param_set("innodb_page_size") && innodb_page_size_var) {
+		char *endptr;
+
+		innobase_page_size = strtoll(
+			innodb_page_size_var, &endptr, 10);
+		ut_ad(*endptr == 0);
+	}
+
+out:
+	free_mysql_variables(mysql_vars);
+
+	return(ret);
+}
+
+/*********************************************************************//**
+Query the server to find out what backup capabilities it supports.
+@return	true on success. */
+bool
+detect_mysql_capabilities_for_backup()
+{
+	const char *query = "SELECT 'INNODB_CHANGED_PAGES', COUNT(*) FROM "
+				"INFORMATION_SCHEMA.PLUGINS "
+			    "WHERE PLUGIN_NAME LIKE 'INNODB_CHANGED_PAGES'";
+	char *innodb_changed_pages = NULL;
+	mysql_variable vars[] = {
+		{"INNODB_CHANGED_PAGES", &innodb_changed_pages}, {NULL, NULL}};
+
+	if (xtrabackup_incremental) {
+
+		read_mysql_variables(mysql_connection, query, vars, true);
+
+		ut_ad(innodb_changed_pages != NULL);
+
+		have_changed_page_bitmaps = (atoi(innodb_changed_pages) == 1);
+
+		/* INNODB_CHANGED_PAGES are listed in
+		INFORMATION_SCHEMA.PLUGINS in MariaDB, but
+		FLUSH NO_WRITE_TO_BINLOG CHANGED_PAGE_BITMAPS
+		is not supported for versions below 10.1.6
+		(see MDEV-7472) */
+		if (server_flavor == FLAVOR_MARIADB &&
+		    mysql_server_version < 100106) {
+			have_changed_page_bitmaps = false;
+		}
+
+		free_mysql_variables(vars);
+	}
+
+	/* do some sanity checks */
+	if (opt_galera_info && !have_galera_enabled) {
+		msg("--galera-info is specified on the command "
+		 	"line, but the server does not support Galera "
+		 	"replication. Ignoring the option.\n");
+		opt_galera_info = false;
+	}
+
+	if (opt_slave_info && have_multi_threaded_slave &&
+	    !have_gtid_slave) {
+	    	msg("The --slave-info option requires GTID enabled for a "
+			"multi-threaded slave.\n");
+		return(false);
+	}
+
+	return(true);
+}
+
+static
+bool
+select_incremental_lsn_from_history(lsn_t *incremental_lsn)
+{
+	MYSQL_RES *mysql_result;
+	MYSQL_ROW row;
+	char query[1000];
+	char buf[100];
+
+	if (opt_incremental_history_name) {
+		mysql_real_escape_string(mysql_connection, buf,
+				opt_incremental_history_name,
+				strlen(opt_incremental_history_name));
+		ut_snprintf(query, sizeof(query),
+			"SELECT innodb_to_lsn "
+			"FROM PERCONA_SCHEMA.xtrabackup_history "
+			"WHERE name = '%s' "
+			"AND innodb_to_lsn IS NOT NULL "
+			"ORDER BY innodb_to_lsn DESC LIMIT 1",
+			buf);
+	}
+
+	if (opt_incremental_history_uuid) {
+		mysql_real_escape_string(mysql_connection, buf,
+				opt_incremental_history_uuid,
+				strlen(opt_incremental_history_uuid));
+		ut_snprintf(query, sizeof(query),
+			"SELECT innodb_to_lsn "
+			"FROM PERCONA_SCHEMA.xtrabackup_history "
+			"WHERE uuid = '%s' "
+			"AND innodb_to_lsn IS NOT NULL "
+			"ORDER BY innodb_to_lsn DESC LIMIT 1",
+			buf);
+	}
+
+	mysql_result = xb_mysql_query(mysql_connection, query, true);
+
+	ut_ad(mysql_num_fields(mysql_result) == 1);
+	if (!(row = mysql_fetch_row(mysql_result))) {
+		msg("Error while attempting to find history record "
+			"for %s %s\n",
+			opt_incremental_history_uuid ? "uuid" : "name",
+			opt_incremental_history_uuid ?
+		    		opt_incremental_history_uuid :
+		    		opt_incremental_history_name);
+		return(false);
+	}
+
+	*incremental_lsn = strtoull(row[0], NULL, 10);
+
+	mysql_free_result(mysql_result);
+
+	msg("Found and using lsn: " LSN_PF " for %s %s\n", *incremental_lsn,
+		opt_incremental_history_uuid ? "uuid" : "name",
+		opt_incremental_history_uuid ?
+	    		opt_incremental_history_uuid :
+	    		opt_incremental_history_name);
+
+	return(true);
+}
+
+static
+const char *
+eat_sql_whitespace(const char *query)
+{
+	bool comment = false;
+
+	while (*query) {
+		if (comment) {
+			if (query[0] == '*' && query[1] == '/') {
+				query += 2;
+				comment = false;
+				continue;
+			}
+			++query;
+			continue;
+		}
+		if (query[0] == '/' && query[1] == '*') {
+			query += 2;
+			comment = true;
+			continue;
+		}
+		if (strchr("\t\n\r (", query[0])) {
+			++query;
+			continue;
+		}
+		break;
+	}
+
+	return(query);
+}
+
+static
+bool
+is_query_from_list(const char *query, const char **list)
+{
+	const char **item;
+
+	query = eat_sql_whitespace(query);
+
+	item = list;
+	while (*item) {
+		if (strncasecmp(query, *item, strlen(*item)) == 0) {
+			return(true);
+		}
+		++item;
+	}
+
+	return(false);
+}
+
+static
+bool
+is_query(const char *query)
+{
+	const char *query_list[] = {"insert", "update", "delete", "replace",
+		"alter", "load", "select", "do", "handler", "call", "execute",
+		"begin", NULL};
+
+	return is_query_from_list(query, query_list);
+}
+
+static
+bool
+is_select_query(const char *query)
+{
+	const char *query_list[] = {"select", NULL};
+
+	return is_query_from_list(query, query_list);
+}
+
+static
+bool
+is_update_query(const char *query)
+{
+	const char *query_list[] = {"insert", "update", "delete", "replace",
+					"alter", "load", NULL};
+
+	return is_query_from_list(query, query_list);
+}
+
+static
+bool
+have_queries_to_wait_for(MYSQL *connection, uint threshold)
+{
+	MYSQL_RES *result;
+	MYSQL_ROW row;
+	bool all_queries;
+
+	result = xb_mysql_query(connection, "SHOW FULL PROCESSLIST", true);
+
+	all_queries = (opt_lock_wait_query_type == QUERY_TYPE_ALL);
+	while ((row = mysql_fetch_row(result)) != NULL) {
+		const char	*info		= row[7];
+		int		duration	= atoi(row[5]);
+		char		*id		= row[0];
+
+		if (info != NULL
+		    && duration >= (int)threshold
+		    && ((all_queries && is_query(info))
+		    	|| is_update_query(info))) {
+			msg_ts("Waiting for query %s (duration %d sec): %s",
+			       id, duration, info);
+			return(true);
+		}
+	}
+
+	return(false);
+}
+
+static
+void
+kill_long_queries(MYSQL *connection, uint timeout)
+{
+	MYSQL_RES *result;
+	MYSQL_ROW row;
+	bool all_queries;
+	char kill_stmt[100];
+
+	result = xb_mysql_query(connection, "SHOW FULL PROCESSLIST", true);
+
+	all_queries = (opt_kill_long_query_type == QUERY_TYPE_ALL);
+	while ((row = mysql_fetch_row(result)) != NULL) {
+		const char	*info		= row[7];
+		int		duration	= atoi(row[5]);
+		char		*id		= row[0];
+
+		if (info != NULL &&
+		    duration >= (int)timeout &&
+		    ((all_queries && is_query(info)) ||
+		    	is_select_query(info))) {
+			msg_ts("Killing query %s (duration %d sec): %s\n",
+			       id, duration, info);
+			ut_snprintf(kill_stmt, sizeof(kill_stmt),
+				    "KILL %s", id);
+			xb_mysql_query(connection, kill_stmt, false, false);
+		}
+	}
+}
+
+static
+bool
+wait_for_no_updates(MYSQL *connection, uint timeout, uint threshold)
+{
+	time_t	start_time;
+
+	start_time = time(NULL);
+
+	msg_ts("Waiting %u seconds for queries running longer than %u seconds "
+	       "to finish\n", timeout, threshold);
+
+	while (time(NULL) <= (time_t)(start_time + timeout)) {
+		if (!have_queries_to_wait_for(connection, threshold)) {
+			return(true);
+		}
+		os_thread_sleep(1000000);
+	}
+
+	msg_ts("Unable to obtain lock. Please try again later.");
+
+	return(false);
+}
+
+static
+os_thread_ret_t
+kill_query_thread(
+/*===============*/
+	void *arg __attribute__((unused)))
+{
+	MYSQL	*mysql;
+	time_t	start_time;
+
+	start_time = time(NULL);
+
+	os_event_set(kill_query_thread_started);
+
+	msg_ts("Kill query timeout %d seconds.\n",
+	       opt_kill_long_queries_timeout);
+
+	while (time(NULL) - start_time <
+				(time_t)opt_kill_long_queries_timeout) {
+		if (os_event_wait_time(kill_query_thread_stop, 1000) !=
+		    OS_SYNC_TIME_EXCEEDED) {
+			goto stop_thread;
+		}
+	}
+
+	if ((mysql = xb_mysql_connect()) == NULL) {
+		msg("Error: kill query thread failed\n");
+		goto stop_thread;
+	}
+
+	while (true) {
+		kill_long_queries(mysql, time(NULL) - start_time);
+		if (os_event_wait_time(kill_query_thread_stop, 1000) !=
+		    OS_SYNC_TIME_EXCEEDED) {
+			break;
+		}
+	}
+
+	mysql_close(mysql);
+
+stop_thread:
+	msg_ts("Kill query thread stopped\n");
+
+	os_event_set(kill_query_thread_stopped);
+
+	os_thread_exit(NULL);
+	OS_THREAD_DUMMY_RETURN;
+}
+
+
+static
+void
+start_query_killer()
+{
+	kill_query_thread_stop		= os_event_create();
+	kill_query_thread_started	= os_event_create();
+	kill_query_thread_stopped	= os_event_create();
+
+	os_thread_create(kill_query_thread, NULL, &kill_query_thread_id);
+
+	os_event_wait(kill_query_thread_started);
+}
+
+static
+void
+stop_query_killer()
+{
+	os_event_set(kill_query_thread_stop);
+	os_event_wait_time(kill_query_thread_stopped, 60000);
+}
+
+/*********************************************************************//**
+Function acquires either a backup tables lock, if supported
+by the server, or a global read lock (FLUSH TABLES WITH READ LOCK)
+otherwise.
+@returns true if lock acquired */
+bool
+lock_tables(MYSQL *connection)
+{
+	if (have_lock_wait_timeout) {
+		/* Set the maximum supported session value for
+		lock_wait_timeout to prevent unnecessary timeouts when the
+		global value is changed from the default */
+		xb_mysql_query(connection,
+			"SET SESSION lock_wait_timeout=31536000", false);
+	}
+
+	if (have_backup_locks) {
+		msg_ts("Executing LOCK TABLES FOR BACKUP...\n");
+		xb_mysql_query(connection, "LOCK TABLES FOR BACKUP", false);
+		return(true);
+	}
+
+	if (!opt_lock_wait_timeout && !opt_kill_long_queries_timeout) {
+
+		/* We do first a FLUSH TABLES. If a long update is running, the
+		FLUSH TABLES will wait but will not stall the whole mysqld, and
+		when the long update is done the FLUSH TABLES WITH READ LOCK
+		will start and succeed quickly. So, FLUSH TABLES is to lower
+		the probability of a stage where both mysqldump and most client
+		connections are stalled. Of course, if a second long update
+		starts between the two FLUSHes, we have that bad stall.
+
+		Option lock_wait_timeout serve the same purpose and is not
+		compatible with this trick.
+		*/
+
+		msg_ts("Executing FLUSH NO_WRITE_TO_BINLOG TABLES...\n");
+
+		xb_mysql_query(connection,
+			       "FLUSH NO_WRITE_TO_BINLOG TABLES", false);
+	}
+
+	if (opt_lock_wait_timeout) {
+		if (!wait_for_no_updates(connection, opt_lock_wait_timeout,
+					 opt_lock_wait_threshold)) {
+			return(false);
+		}
+	}
+
+	msg_ts("Executing FLUSH TABLES WITH READ LOCK...\n");
+
+	if (opt_kill_long_queries_timeout) {
+		start_query_killer();
+	}
+
+	if (have_galera_enabled) {
+		xb_mysql_query(connection,
+				"SET SESSION wsrep_causal_reads=0", false);
+	}
+
+	xb_mysql_query(connection, "FLUSH TABLES WITH READ LOCK", false);
+
+	if (opt_kill_long_queries_timeout) {
+		stop_query_killer();
+	}
+
+	return(true);
+}
+
+
+/*********************************************************************//**
+If backup locks are used, execute LOCK BINLOG FOR BACKUP provided that we are
+not in the --no-lock mode and the lock has not been acquired already.
+@returns true if lock acquired */
+bool
+lock_binlog_maybe(MYSQL *connection)
+{
+	if (have_backup_locks && !opt_no_lock && !binlog_locked) {
+		msg_ts("Executing LOCK BINLOG FOR BACKUP...\n");
+		xb_mysql_query(connection, "LOCK BINLOG FOR BACKUP", false);
+		binlog_locked = true;
+
+		return(true);
+	}
+
+	return(false);
+}
+
+
+/*********************************************************************//**
+Releases either global read lock acquired with FTWRL and the binlog
+lock acquired with LOCK BINLOG FOR BACKUP, depending on
+the locking strategy being used */
+void
+unlock_all(MYSQL *connection)
+{
+	if (opt_debug_sleep_before_unlock) {
+		msg_ts("Debug sleep for %u seconds\n",
+		       opt_debug_sleep_before_unlock);
+		os_thread_sleep(opt_debug_sleep_before_unlock * 1000);
+	}
+
+	if (binlog_locked) {
+		msg_ts("Executing UNLOCK BINLOG\n");
+		xb_mysql_query(connection, "UNLOCK BINLOG", false);
+	}
+
+	msg_ts("Executing UNLOCK TABLES\n");
+	xb_mysql_query(connection, "UNLOCK TABLES", false);
+
+	msg_ts("All tables unlocked\n");
+}
+
+
+static
+int
+get_open_temp_tables(MYSQL *connection)
+{
+	char *slave_open_temp_tables = NULL;
+	mysql_variable status[] = {
+		{"Slave_open_temp_tables", &slave_open_temp_tables},
+		{NULL, NULL}
+	};
+	int result = false;
+
+	read_mysql_variables(connection,
+		"SHOW STATUS LIKE 'slave_open_temp_tables'", status, true);
+
+	result = slave_open_temp_tables ? atoi(slave_open_temp_tables) : 0;
+
+	free_mysql_variables(status);
+
+	return(result);
+}
+
+/*********************************************************************//**
+Wait until it's safe to backup a slave.  Returns immediately if
+the host isn't a slave.  Currently there's only one check:
+Slave_open_temp_tables has to be zero.  Dies on timeout. */
+bool
+wait_for_safe_slave(MYSQL *connection)
+{
+	char *read_master_log_pos = NULL;
+	char *slave_sql_running = NULL;
+	int n_attempts = 1;
+	const int sleep_time = 3;
+	int open_temp_tables = 0;
+	bool result = true;
+
+	mysql_variable status[] = {
+		{"Read_Master_Log_Pos", &read_master_log_pos},
+		{"Slave_SQL_Running", &slave_sql_running},
+		{NULL, NULL}
+	};
+
+	sql_thread_started = false;
+
+	read_mysql_variables(connection, "SHOW SLAVE STATUS", status, false);
+
+	if (!(read_master_log_pos && slave_sql_running)) {
+		msg("Not checking slave open temp tables for "
+			"--safe-slave-backup because host is not a slave\n");
+		goto cleanup;
+	}
+
+	if (strcmp(slave_sql_running, "Yes") == 0) {
+		sql_thread_started = true;
+		xb_mysql_query(connection, "STOP SLAVE SQL_THREAD", false);
+	}
+
+	if (opt_safe_slave_backup_timeout > 0) {
+		n_attempts = opt_safe_slave_backup_timeout / sleep_time;
+	}
+
+	open_temp_tables = get_open_temp_tables(connection);
+	msg_ts("Slave open temp tables: %d\n", open_temp_tables);
+
+	while (open_temp_tables && n_attempts--) {
+		msg_ts("Starting slave SQL thread, waiting %d seconds, then "
+		       "checking Slave_open_temp_tables again (%d attempts "
+		       "remaining)...\n", sleep_time, n_attempts);
+
+		xb_mysql_query(connection, "START SLAVE SQL_THREAD", false);
+		os_thread_sleep(sleep_time * 1000000);
+		xb_mysql_query(connection, "STOP SLAVE SQL_THREAD", false);
+
+		open_temp_tables = get_open_temp_tables(connection);
+		msg_ts("Slave open temp tables: %d\n", open_temp_tables);
+	}
+
+	/* Restart the slave if it was running at start */
+	if (open_temp_tables == 0) {
+		msg_ts("Slave is safe to backup\n");
+		goto cleanup;
+	}
+
+	result = false;
+
+	if (sql_thread_started) {
+		msg_ts("Restarting slave SQL thread.\n");
+		xb_mysql_query(connection, "START SLAVE SQL_THREAD", false);
+	}
+
+	msg_ts("Slave_open_temp_tables did not become zero after "
+	       "%d seconds\n", opt_safe_slave_backup_timeout);
+
+cleanup:
+	free_mysql_variables(status);
+
+	return(result);
+}
+
+
+/*********************************************************************//**
+Retrieves MySQL binlog position of the master server in a replication
+setup and saves it in a file. It also saves it in mysql_slave_position
+variable. */
+bool
+write_slave_info(MYSQL *connection)
+{
+	char *master = NULL;
+	char *filename = NULL;
+	char *gtid_executed = NULL;
+	char *position = NULL;
+	char *gtid_slave_pos = NULL;
+	char *ptr;
+	bool result = false;
+
+	mysql_variable status[] = {
+		{"Master_Host", &master},
+		{"Relay_Master_Log_File", &filename},
+		{"Exec_Master_Log_Pos", &position},
+		{"Executed_Gtid_Set", &gtid_executed},
+		{NULL, NULL}
+	};
+
+	mysql_variable variables[] = {
+		{"gtid_slave_pos", &gtid_slave_pos},
+		{NULL, NULL}
+	};
+
+	read_mysql_variables(connection, "SHOW SLAVE STATUS", status, false);
+	read_mysql_variables(connection, "SHOW VARIABLES", variables, true);
+
+	if (master == NULL || filename == NULL || position == NULL) {
+		msg("Failed to get master binlog coordinates "
+			"from SHOW SLAVE STATUS\n");
+		msg("This means that the server is not a "
+			"replication slave. Ignoring the --slave-info "
+			"option\n");
+		/* we still want to continue the backup */
+		result = true;
+		goto cleanup;
+	}
+
+	/* Print slave status to a file.
+	If GTID mode is used, construct a CHANGE MASTER statement with
+	MASTER_AUTO_POSITION and correct a gtid_purged value. */
+	if (gtid_executed != NULL && *gtid_executed) {
+		/* MySQL >= 5.6 with GTID enabled */
+
+		for (ptr = strchr(gtid_executed, '\n');
+		     ptr;
+		     ptr = strchr(ptr, '\n')) {
+			*ptr = ' ';
+		}
+
+		result = backup_file_printf(XTRABACKUP_SLAVE_INFO,
+			"SET GLOBAL gtid_purged='%s';\n"
+			"CHANGE MASTER TO MASTER_AUTO_POSITION=1\n",
+			gtid_executed);
+
+		ut_a(asprintf(&mysql_slave_position,
+			"master host '%s', purge list '%s'",
+			master, gtid_executed) != -1);
+	} else if (gtid_slave_pos && *gtid_slave_pos) {
+		/* MariaDB >= 10.0 with GTID enabled */
+		result = backup_file_printf(XTRABACKUP_SLAVE_INFO,
+			"SET GLOBAL gtid_slave_pos = '%s';\n"
+			"CHANGE MASTER TO master_use_gtid = slave_pos\n",
+			gtid_slave_pos);
+		ut_a(asprintf(&mysql_slave_position,
+			"master host '%s', gtid_slave_pos %s",
+			master, gtid_slave_pos) != -1);
+	} else {
+		result = backup_file_printf(XTRABACKUP_SLAVE_INFO,
+			"CHANGE MASTER TO MASTER_LOG_FILE='%s', "
+			"MASTER_LOG_POS=%s\n", filename, position);
+		ut_a(asprintf(&mysql_slave_position,
+			"master host '%s', filename '%s', position '%s'",
+			master, filename, position) != -1);
+	}
+
+cleanup:
+	free_mysql_variables(status);
+	free_mysql_variables(variables);
+
+	return(result);
+}
+
+
+/*********************************************************************//**
+Retrieves MySQL Galera and
+saves it in a file. It also prints it to stdout. */
+bool
+write_galera_info(MYSQL *connection)
+{
+	char *state_uuid = NULL, *state_uuid55 = NULL;
+	char *last_committed = NULL, *last_committed55 = NULL;
+	bool result;
+
+	mysql_variable status[] = {
+		{"Wsrep_local_state_uuid", &state_uuid},
+		{"wsrep_local_state_uuid", &state_uuid55},
+		{"Wsrep_last_committed", &last_committed},
+		{"wsrep_last_committed", &last_committed55},
+		{NULL, NULL}
+	};
+
+	/* When backup locks are supported by the server, we should skip
+	creating xtrabackup_galera_info file on the backup stage, because
+	wsrep_local_state_uuid and wsrep_last_committed will be inconsistent
+	without blocking commits. The state file will be created on the prepare
+	stage using the WSREP recovery procedure. */
+	if (have_backup_locks) {
+		return(true);
+	}
+
+	read_mysql_variables(connection, "SHOW STATUS", status, true);
+
+	if ((state_uuid == NULL && state_uuid55 == NULL)
+		|| (last_committed == NULL && last_committed55 == NULL)) {
+		msg("Failed to get master wsrep state from SHOW STATUS.\n");
+		result = false;
+		goto cleanup;
+	}
+
+	result = backup_file_printf(XTRABACKUP_GALERA_INFO,
+		"%s:%s\n", state_uuid ? state_uuid : state_uuid55,
+			last_committed ? last_committed : last_committed55);
+
+cleanup:
+	free_mysql_variables(status);
+
+	return(result);
+}
+
+
+/*********************************************************************//**
+Flush and copy the current binary log file into the backup,
+if GTID is enabled */
+bool
+write_current_binlog_file(MYSQL *connection)
+{
+	char *executed_gtid_set = NULL;
+	char *gtid_binlog_state = NULL;
+	char *log_bin_file = NULL;
+	char *log_bin_dir = NULL;
+	bool gtid_exists;
+	bool result = true;
+	char filepath[FN_REFLEN];
+
+	mysql_variable status[] = {
+		{"Executed_Gtid_Set", &executed_gtid_set},
+		{NULL, NULL}
+	};
+
+	mysql_variable status_after_flush[] = {
+		{"File", &log_bin_file},
+		{NULL, NULL}
+	};
+
+	mysql_variable vars[] = {
+		{"gtid_binlog_state", &gtid_binlog_state},
+		{"log_bin_basename", &log_bin_dir},
+		{NULL, NULL}
+	};
+
+	read_mysql_variables(connection, "SHOW MASTER STATUS", status, false);
+	read_mysql_variables(connection, "SHOW VARIABLES", vars, true);
+
+	gtid_exists = (executed_gtid_set && *executed_gtid_set)
+			|| (gtid_binlog_state && *gtid_binlog_state);
+
+	if (gtid_exists) {
+		size_t log_bin_dir_length;
+
+		lock_binlog_maybe(connection);
+
+		xb_mysql_query(connection, "FLUSH BINARY LOGS", false);
+
+		read_mysql_variables(connection, "SHOW MASTER STATUS",
+			status_after_flush, false);
+
+		if (opt_log_bin != NULL && strchr(opt_log_bin, FN_LIBCHAR)) {
+			/* If log_bin is set, it has priority */
+			if (log_bin_dir) {
+				free(log_bin_dir);
+			}
+			log_bin_dir = strdup(opt_log_bin);
+		} else if (log_bin_dir == NULL) {
+			/* Default location is MySQL datadir */
+			log_bin_dir = strdup("./");
+		}
+
+		dirname_part(log_bin_dir, log_bin_dir, &log_bin_dir_length);
+
+		/* strip final slash if it is not the only path component */
+		if (log_bin_dir_length > 1 &&
+		    log_bin_dir[log_bin_dir_length - 1] == FN_LIBCHAR) {
+			log_bin_dir[log_bin_dir_length - 1] = 0;
+		}
+
+		if (log_bin_dir == NULL || log_bin_file == NULL) {
+			msg("Failed to get master binlog coordinates from "
+				"SHOW MASTER STATUS");
+			result = false;
+			goto cleanup;
+		}
+
+		ut_snprintf(filepath, sizeof(filepath), "%s%c%s",
+				log_bin_dir, FN_LIBCHAR, log_bin_file);
+		result = copy_file(ds_data, filepath, log_bin_file, 0);
+	}
+
+cleanup:
+	free_mysql_variables(status_after_flush);
+	free_mysql_variables(status);
+	free_mysql_variables(vars);
+
+	return(result);
+}
+
+
+/*********************************************************************//**
+Retrieves MySQL binlog position and
+saves it in a file. It also prints it to stdout. */
+bool
+write_binlog_info(MYSQL *connection)
+{
+	char *filename = NULL;
+	char *position = NULL;
+	char *gtid_mode = NULL;
+	char *gtid_current_pos = NULL;
+	char *gtid_executed = NULL;
+	char *gtid = NULL;
+	bool result;
+	bool mysql_gtid;
+	bool mariadb_gtid;
+
+	mysql_variable status[] = {
+		{"File", &filename},
+		{"Position", &position},
+		{"Executed_Gtid_Set", &gtid_executed},
+		{NULL, NULL}
+	};
+
+	mysql_variable vars[] = {
+		{"gtid_mode", &gtid_mode},
+		{"gtid_current_pos", &gtid_current_pos},
+		{NULL, NULL}
+	};
+
+	read_mysql_variables(connection, "SHOW MASTER STATUS", status, false);
+	read_mysql_variables(connection, "SHOW VARIABLES", vars, true);
+
+	if (filename == NULL || position == NULL) {
+		/* Do not create xtrabackup_binlog_info if binary
+		log is disabled */
+		result = true;
+		goto cleanup;
+	}
+
+	mysql_gtid = ((gtid_mode != NULL) && (strcmp(gtid_mode, "ON") == 0));
+	mariadb_gtid = (gtid_current_pos != NULL);
+
+	gtid = (gtid_executed != NULL ? gtid_executed : gtid_current_pos);
+
+	if (mariadb_gtid || mysql_gtid) {
+		ut_a(asprintf(&mysql_binlog_position,
+			"filename '%s', position '%s', "
+			"GTID of the last change '%s'",
+			filename, position, gtid) != -1);
+		result = backup_file_printf(XTRABACKUP_BINLOG_INFO,
+					    "%s\t%s\t%s\n", filename, position,
+					    gtid);
+	} else {
+		ut_a(asprintf(&mysql_binlog_position,
+			"filename '%s', position '%s'",
+			filename, position) != -1);
+		result = backup_file_printf(XTRABACKUP_BINLOG_INFO,
+					    "%s\t%s\n", filename, position);
+	}
+
+cleanup:
+	free_mysql_variables(status);
+	free_mysql_variables(vars);
+
+	return(result);
+}
+
+
+
+/*********************************************************************//**
+Writes xtrabackup_info file and if backup_history is enable creates
+PERCONA_SCHEMA.xtrabackup_history and writes a new history record to the
+table containing all the history info particular to the just completed
+backup. */
+bool
+write_xtrabackup_info(MYSQL *connection)
+{
+	MYSQL_STMT *stmt;
+	MYSQL_BIND bind[19];
+	char *uuid = NULL;
+	char *server_version = NULL;
+	char buf_start_time[100];
+	char buf_end_time[100];
+	int idx;
+	tm tm;
+	my_bool null = TRUE;
+
+	const char *xb_stream_name[] = {"file", "tar", "xbstream"};
+	const char *ins_query = "insert into PERCONA_SCHEMA.xtrabackup_history("
+		"uuid, name, tool_name, tool_command, tool_version, "
+		"ibbackup_version, server_version, start_time, end_time, "
+		"lock_time, binlog_pos, innodb_from_lsn, innodb_to_lsn, "
+		"partial, incremental, format, compact, compressed, "
+		"encrypted) "
+		"values(?,?,?,?,?,?,?,from_unixtime(?),from_unixtime(?),"
+		"?,?,?,?,?,?,?,?,?,?)";
+
+	ut_ad(xtrabackup_stream_fmt < 3);
+
+	uuid = read_mysql_one_value(connection, "SELECT UUID()");
+	server_version = read_mysql_one_value(connection, "SELECT VERSION()");
+	localtime_r(&history_start_time, &tm);
+	strftime(buf_start_time, sizeof(buf_start_time),
+		 "%Y-%m-%d %H:%M:%S", &tm);
+	history_end_time = time(NULL);
+	localtime_r(&history_end_time, &tm);
+	strftime(buf_end_time, sizeof(buf_end_time),
+		 "%Y-%m-%d %H:%M:%S", &tm);
+	backup_file_printf(XTRABACKUP_INFO,
+		"uuid = %s\n"
+		"name = %s\n"
+		"tool_name = %s\n"
+		"tool_command = %s\n"
+		"tool_version = %s\n"
+		"ibbackup_version = %s\n"
+		"server_version = %s\n"
+		"start_time = %s\n"
+		"end_time = %s\n"
+		"lock_time = %d\n"
+		"binlog_pos = %s\n"
+		"innodb_from_lsn = %llu\n"
+		"innodb_to_lsn = %llu\n"
+		"partial = %s\n"
+		"incremental = %s\n"
+		"format = %s\n"
+		"compact = %s\n"
+		"compressed = %s\n"
+		"encrypted = %s\n",
+		uuid, /* uuid */
+		opt_history ? opt_history : "",  /* name */
+		tool_name,  /* tool_name */
+		tool_args,  /* tool_command */
+		XTRABACKUP_VERSION,  /* tool_version */
+		XTRABACKUP_VERSION,  /* ibbackup_version */
+		server_version,  /* server_version */
+		buf_start_time,  /* start_time */
+		buf_end_time,  /* end_time */
+		history_lock_time, /* lock_time */
+		mysql_binlog_position ?
+			mysql_binlog_position : "", /* binlog_pos */
+		incremental_lsn, /* innodb_from_lsn */
+		metadata_to_lsn, /* innodb_to_lsn */
+		(xtrabackup_tables /* partial */
+		 || xtrabackup_tables_file
+		 || xtrabackup_databases
+		 || xtrabackup_databases_file) ? "Y" : "N",
+		xtrabackup_incremental ? "Y" : "N", /* incremental */
+		xb_stream_name[xtrabackup_stream_fmt], /* format */
+		xtrabackup_compact ? "Y" : "N", /* compact */
+		xtrabackup_compress ? "compressed" : "N", /* compressed */
+		xtrabackup_encrypt ? "Y" : "N"); /* encrypted */
+
+	if (!opt_history) {
+		goto cleanup;
+	}
+
+	xb_mysql_query(connection,
+		"CREATE DATABASE IF NOT EXISTS PERCONA_SCHEMA", false);
+	xb_mysql_query(connection,
+		"CREATE TABLE IF NOT EXISTS PERCONA_SCHEMA.xtrabackup_history("
+		"uuid VARCHAR(40) NOT NULL PRIMARY KEY,"
+		"name VARCHAR(255) DEFAULT NULL,"
+		"tool_name VARCHAR(255) DEFAULT NULL,"
+		"tool_command TEXT DEFAULT NULL,"
+		"tool_version VARCHAR(255) DEFAULT NULL,"
+		"ibbackup_version VARCHAR(255) DEFAULT NULL,"
+		"server_version VARCHAR(255) DEFAULT NULL,"
+		"start_time TIMESTAMP NULL DEFAULT NULL,"
+		"end_time TIMESTAMP NULL DEFAULT NULL,"
+		"lock_time BIGINT UNSIGNED DEFAULT NULL,"
+		"binlog_pos VARCHAR(128) DEFAULT NULL,"
+		"innodb_from_lsn BIGINT UNSIGNED DEFAULT NULL,"
+		"innodb_to_lsn BIGINT UNSIGNED DEFAULT NULL,"
+		"partial ENUM('Y', 'N') DEFAULT NULL,"
+		"incremental ENUM('Y', 'N') DEFAULT NULL,"
+		"format ENUM('file', 'tar', 'xbstream') DEFAULT NULL,"
+		"compact ENUM('Y', 'N') DEFAULT NULL,"
+		"compressed ENUM('Y', 'N') DEFAULT NULL,"
+		"encrypted ENUM('Y', 'N') DEFAULT NULL"
+		") CHARACTER SET utf8 ENGINE=innodb", false);
+
+	stmt = mysql_stmt_init(connection);
+
+	mysql_stmt_prepare(stmt, ins_query, strlen(ins_query));
+
+	memset(bind, 0, sizeof(bind));
+	idx = 0;
+
+	/* uuid */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = uuid;
+	bind[idx].buffer_length = strlen(uuid);
+	++idx;
+
+	/* name */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = (char*)(opt_history);
+	bind[idx].buffer_length = strlen(opt_history);
+	if (!(opt_history && *opt_history)) {
+		bind[idx].is_null = &null;
+	}
+	++idx;
+
+	/* tool_name */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = tool_name;
+	bind[idx].buffer_length = strlen(tool_name);
+	++idx;
+
+	/* tool_command */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = tool_args;
+	bind[idx].buffer_length = strlen(tool_args);
+	++idx;
+
+	/* tool_version */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = (char*)(XTRABACKUP_VERSION);
+	bind[idx].buffer_length = strlen(XTRABACKUP_VERSION);
+	++idx;
+
+	/* ibbackup_version */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = (char*)(XTRABACKUP_VERSION);
+	bind[idx].buffer_length = strlen(XTRABACKUP_VERSION);
+	++idx;
+
+	/* server_version */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = server_version;
+	bind[idx].buffer_length = strlen(server_version);
+	++idx;
+
+	/* start_time */
+	bind[idx].buffer_type = MYSQL_TYPE_LONG;
+	bind[idx].buffer = &history_start_time;
+	++idx;
+
+	/* end_time */
+	bind[idx].buffer_type = MYSQL_TYPE_LONG;
+	bind[idx].buffer = &history_end_time;
+	++idx;
+
+	/* lock_time */
+	bind[idx].buffer_type = MYSQL_TYPE_LONG;
+	bind[idx].buffer = &history_lock_time;
+	++idx;
+
+	/* binlog_pos */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = mysql_binlog_position;
+	if (mysql_binlog_position != NULL) {
+		bind[idx].buffer_length = strlen(mysql_binlog_position);
+	} else {
+		bind[idx].is_null = &null;
+	}
+	++idx;
+
+	/* innodb_from_lsn */
+	bind[idx].buffer_type = MYSQL_TYPE_LONGLONG;
+	bind[idx].buffer = (char*)(&incremental_lsn);
+	++idx;
+
+	/* innodb_to_lsn */
+	bind[idx].buffer_type = MYSQL_TYPE_LONGLONG;
+	bind[idx].buffer = (char*)(&metadata_to_lsn);
+	++idx;
+
+	/* partial (Y | N) */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = (char*)((xtrabackup_tables
+				    || xtrabackup_tables_file
+				    || xtrabackup_databases
+				    || xtrabackup_databases_file) ? "Y" : "N");
+	bind[idx].buffer_length = 1;
+	++idx;
+
+	/* incremental (Y | N) */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = (char*)(
+		(xtrabackup_incremental
+		 || xtrabackup_incremental_basedir
+		 || opt_incremental_history_name
+		 || opt_incremental_history_uuid) ? "Y" : "N");
+	bind[idx].buffer_length = 1;
+	++idx;
+
+	/* format (file | tar | xbstream) */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = (char*)(xb_stream_name[xtrabackup_stream_fmt]);
+	bind[idx].buffer_length = strlen(xb_stream_name[xtrabackup_stream_fmt]);
+	++idx;
+
+	/* compact (Y | N) */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = (char*)(xtrabackup_compact ? "Y" : "N");
+	bind[idx].buffer_length = 1;
+	++idx;
+
+	/* compressed (Y | N) */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = (char*)(xtrabackup_compress ? "Y" : "N");
+	bind[idx].buffer_length = 1;
+	++idx;
+
+	/* encrypted (Y | N) */
+	bind[idx].buffer_type = MYSQL_TYPE_STRING;
+	bind[idx].buffer = (char*)(xtrabackup_encrypt ? "Y" : "N");
+	bind[idx].buffer_length = 1;
+	++idx;
+
+	ut_ad(idx == 19);
+
+	mysql_stmt_bind_param(stmt, bind);
+
+	mysql_stmt_execute(stmt);
+	mysql_stmt_close(stmt);
+
+cleanup:
+
+	free(uuid);
+	free(server_version);
+
+	return(true);
+}
+
+bool
+write_backup_config_file()
+{
+	return backup_file_printf("backup-my.cnf",
+		"# This MySQL options file was generated by innobackupex.\n\n"
+		"# The MySQL server\n"
+		"[mysqld]\n"
+		"innodb_checksum_algorithm=%s\n"
+		"innodb_log_checksum_algorithm=%s\n"
+		"innodb_data_file_path=%s\n"
+		"innodb_log_files_in_group=%lu\n"
+		"innodb_log_file_size=%lld\n"
+		"innodb_fast_checksum=%s\n"
+		"innodb_page_size=%lu\n"
+		"innodb_log_block_size=%lu\n"
+		"innodb_undo_directory=%s\n"
+		"innodb_undo_tablespaces=%lu\n"
+		"%s%s\n"
+		"%s%s\n",
+		innodb_checksum_algorithm_names[srv_checksum_algorithm],
+		innodb_checksum_algorithm_names[srv_log_checksum_algorithm],
+		innobase_data_file_path,
+		srv_n_log_files,
+		innobase_log_file_size,
+		srv_fast_checksum ? "true" : "false",
+		srv_page_size,
+		srv_log_block_size,
+		srv_undo_dir,
+		srv_undo_tablespaces,
+		innobase_doublewrite_file ? "innodb_doublewrite_file=" : "",
+		innobase_doublewrite_file ? innobase_doublewrite_file : "",
+		innobase_buffer_pool_filename ?
+			"innodb_buffer_pool_filename=" : "",
+		innobase_buffer_pool_filename ?
+			innobase_buffer_pool_filename : "");
+}
+
+
+static
+char *make_argv(char *buf, size_t len, int argc, char **argv)
+{
+	size_t left= len;
+	const char *arg;
+
+	buf[0]= 0;
+	++argv; --argc;
+	while (argc > 0 && left > 0)
+	{
+		arg = *argv;
+		if (strncmp(*argv, "--password", strlen("--password")) == 0) {
+			arg = "--password=...";
+		}
+		if (strncmp(*argv, "--encrypt-key",
+				strlen("--encrypt-key")) == 0) {
+			arg = "--encrypt-key=...";
+		}
+		if (strncmp(*argv, "--encrypt_key",
+				strlen("--encrypt_key")) == 0) {
+			arg = "--encrypt_key=...";
+		}
+		left-= ut_snprintf(buf + len - left, left,
+			"%s%c", arg, argc > 1 ? ' ' : 0);
+		++argv; --argc;
+	}
+
+	return buf;
+}
+
+void
+capture_tool_command(int argc, char **argv)
+{
+	/* capture tool name tool args */
+	tool_name = strrchr(argv[0], '/');
+	tool_name = tool_name ? tool_name + 1 : argv[0];
+
+	make_argv(tool_args, sizeof(tool_args), argc, argv);
+}
+
+
+bool
+select_history()
+{
+	if (opt_incremental_history_name || opt_incremental_history_uuid) {
+		if (!select_incremental_lsn_from_history(
+			&incremental_lsn)) {
+			return(false);
+		}
+	}
+	return(true);
+}
+
+bool
+flush_changed_page_bitmaps()
+{
+	if (xtrabackup_incremental && have_changed_page_bitmaps &&
+	    !xtrabackup_incremental_force_scan) {
+		xb_mysql_query(mysql_connection,
+			"FLUSH NO_WRITE_TO_BINLOG CHANGED_PAGE_BITMAPS", false);
+	}
+	return(true);
+}
+
+
+/*********************************************************************//**
+Deallocate memory, disconnect from MySQL server, etc.
+@return	true on success. */
+void
+backup_cleanup()
+{
+	free(mysql_slave_position);
+	free(mysql_binlog_position);
+	free(buffer_pool_filename);
+
+	if (mysql_connection) {
+		mysql_close(mysql_connection);
+	}
+}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/backup_mysql.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/backup_mysql.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/backup_mysql.h	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/backup_mysql.h	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,92 @@
+#ifndef XTRABACKUP_BACKUP_MYSQL_H
+#define XTRABACKUP_BACKUP_MYSQL_H
+
+#include <mysql.h>
+
+/* mysql flavor and version */
+enum mysql_flavor_t { FLAVOR_UNKNOWN, FLAVOR_MYSQL,
+		      FLAVOR_PERCONA_SERVER, FLAVOR_MARIADB };
+extern mysql_flavor_t server_flavor;
+extern unsigned long mysql_server_version;
+
+/* server capabilities */
+extern bool have_changed_page_bitmaps;
+extern bool have_backup_locks;
+extern bool have_lock_wait_timeout;
+extern bool have_galera_enabled;
+extern bool have_flush_engine_logs;
+extern bool have_multi_threaded_slave;
+extern bool have_gtid_slave;
+
+
+/* History on server */
+extern time_t history_start_time;
+extern time_t history_end_time;
+extern time_t history_lock_time;
+
+
+extern bool sql_thread_started;
+extern char *mysql_slave_position;
+extern char *mysql_binlog_position;
+extern char *buffer_pool_filename;
+
+/** connection to mysql server */
+extern MYSQL *mysql_connection;
+
+void
+capture_tool_command(int argc, char **argv);
+
+bool
+select_history();
+
+bool
+flush_changed_page_bitmaps();
+
+void
+backup_cleanup();
+
+bool
+get_mysql_vars(MYSQL *connection);
+
+bool
+detect_mysql_capabilities_for_backup();
+
+MYSQL *
+xb_mysql_connect();
+
+MYSQL_RES *
+xb_mysql_query(MYSQL *connection, const char *query, bool use_result,
+		bool die_on_error = true);
+
+void
+unlock_all(MYSQL *connection);
+
+bool
+write_current_binlog_file(MYSQL *connection);
+
+bool
+write_binlog_info(MYSQL *connection);
+
+bool
+write_xtrabackup_info(MYSQL *connection);
+
+bool
+write_backup_config_file();
+
+bool
+lock_binlog_maybe(MYSQL *connection);
+
+bool
+lock_tables(MYSQL *connection);
+
+bool
+wait_for_safe_slave(MYSQL *connection);
+
+bool
+write_galera_info(MYSQL *connection);
+
+bool
+write_slave_info(MYSQL *connection);
+
+
+#endif
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/changed_page_bitmap.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/changed_page_bitmap.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/changed_page_bitmap.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/changed_page_bitmap.cc	2017-02-27 07:47:02.000000000 +0000
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/changed_page_bitmap.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/changed_page_bitmap.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/changed_page_bitmap.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/changed_page_bitmap.h	2017-02-27 07:47:02.000000000 +0000
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/CMakeLists.txt percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -11,13 +11,25 @@
 
 # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 INCLUDE(gcrypt)
+INCLUDE(curl)
+INCLUDE(libev)
 
 ADD_SUBDIRECTORY(libarchive)
+ADD_SUBDIRECTORY(jsmn)
 
 FIND_GCRYPT()
+FIND_CURL()
+FIND_EV()
+
+# xxd is needed to embed version_check script
+FIND_PROGRAM(XXD_PATH xxd)
+
+IF(NOT XXD_PATH)
+  MESSAGE(FATAL_ERROR "xxd not found. Try to install vim-common.")
+ENDIF(NOT XXD_PATH)
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
@@ -25,18 +37,37 @@
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/libarchive/libarchive
   ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/quicklz
+  ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/jsmn
   ${GCRYPT_INCLUDE_DIR}
+  ${CURL_INCLUDE_DIRS}
+  ${LIBEV_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
   )
 
+ADD_DEFINITIONS(${SSL_DEFINES})
+
 ########################################################################
 # xtrabackup binary
 ########################################################################
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrabackup_version.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/xtrabackup_version.h )
 
+ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h
+                   COMMAND ${XXD_PATH} --include version_check.pl
+                   ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+ADD_CUSTOM_TARGET(GenVersionCheck
+                  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h)
+
+SET_SOURCE_FILES_PROPERTIES(
+  xtrabackup.cc
+  backup_mysql.cc
+  PROPERTIES COMPILE_FLAGS -DMYSQL_CLIENT)
 
 MYSQL_ADD_EXECUTABLE(xtrabackup
   xtrabackup.cc
+  innobackupex.cc
   changed_page_bitmap.cc
   compact.cc
   datasink.c
@@ -52,17 +83,33 @@
   quicklz/quicklz.c
   read_filt.cc
   write_filt.cc
+  wsrep.cc
   xbcrypt_common.c
   xbcrypt_write.c
   xbstream_write.c
+  backup_mysql.cc
+  backup_copy.cc
+  ../../../../sql-common/client_authentication.cc
   )
 
+SET_TARGET_PROPERTIES(xtrabackup PROPERTIES ENABLE_EXPORTS TRUE)
+
 TARGET_LINK_LIBRARIES(xtrabackup 
   mysqlserver 
   ${GCRYPT_LIBS} 
   archive_static
   )
 
+ADD_DEPENDENCIES(xtrabackup GenVersionCheck)
+
+########################################################################
+# innobackupex symlink
+########################################################################
+ADD_CUSTOM_COMMAND(TARGET xtrabackup
+                   COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink
+                           xtrabackup innobackupex)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/innobackupex DESTINATION bin)
+
 ########################################################################
 # xbstream binary
 ########################################################################
@@ -104,3 +151,23 @@
   mysys
   mysys_ssl
   )
+
+########################################################################
+# xbcloud binary
+########################################################################
+MYSQL_ADD_EXECUTABLE(xbcloud
+  xbcloud.cc
+  )
+
+SET_TARGET_PROPERTIES(xbcloud
+        PROPERTIES LINKER_LANGUAGE CXX
+        )
+
+TARGET_LINK_LIBRARIES(xbcloud
+  ${GCRYPT_LIBS}
+  ${LIBEV_LIBRARIES}
+  ${CURL_LIBRARIES}
+  mysys
+  mysys_ssl
+  jsmn
+  )
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/common.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/common.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/common.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/common.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -47,11 +47,35 @@
 static inline int msg(const char *fmt, ...)
 {
 	int	result;
-	va_list args;
+	va_list	args;
 
 	va_start(args, fmt);
 	result = vfprintf(stderr, fmt, args);
 	va_end(args);
+
+	return result;
+}
+
+static inline int msg_ts(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
+static inline int msg_ts(const char *fmt, ...)
+{
+	int	result;
+	time_t 	t = time(NULL);
+	char	date[100];
+	char	*line;
+	va_list	args;
+
+	strftime(date, sizeof(date), "%y%m%d %H:%M:%S", localtime(&t));
+
+	va_start(args, fmt);
+	result = vasprintf(&line, fmt, args);
+	va_end(args);
+
+	if (result != -1) {
+		result = fprintf(stderr, "%s %s", date, line);
+		free(line);
+	}
+
 	return result;
 }
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/compact.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/compact.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/compact.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/compact.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /******************************************************
 XtraBackup: hot backup tool for InnoDB
-(c) 2009-2013 Percona LLC and/or its affiliates.
+(c) 2009-2014 Percona LLC and/or its affiliates.
 Originally Created 3/3/2009 Yasufumi Kinoshita
 Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
 Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -321,6 +321,7 @@
 {
 	xb_fil_cur_t		*cursor = ctxt->cursor;
 	xb_wf_compact_ctxt_t	*cp = &(ctxt->u.wf_compact_ctxt);
+	my_bool			rc = TRUE;
 
 	/* Write the last endpoint of the current range, if the last pages of
 	the space have been skipped. */
@@ -336,13 +337,15 @@
 	}
 
 	if (cp->buffer) {
-		ds_close(cp->buffer);
+		if (ds_close(cp->buffer)) {
+			rc = FALSE;
+		}
 	}
 	if (cp->ds_buffer) {
 		ds_destroy(cp->ds_buffer);
 	}
 
-	return(TRUE);
+	return(rc);
 }
 
 /************************************************************************
@@ -419,6 +422,8 @@
 
 	rc = my_close(pmap_cur->fd, MY_WME);
 	xb_a(rc == 0);
+
+	my_free(pmap_cur);
 }
 
 /****************************************************************************
@@ -581,11 +586,11 @@
 
 	my_delete(pmapfile_path, MYF(MY_WME));
 
-	ds_close(tmpfile);
+	if (!ds_close(tmpfile)) {
+		success = TRUE;
+	}
 	tmpfile = NULL;
 
-	success = TRUE;
-
 	goto end;
 
 write_error:
@@ -795,9 +800,7 @@
 
 	ut_ad(i == n_indexes);
 
-	ut_d(table->n_ref_count++);
 	row_merge_drop_indexes(trx, table, TRUE);
-	ut_d(table->n_ref_count--);
 
 	index = dict_table_get_first_index(table);
 	ut_a(dict_index_is_clust(index));
@@ -898,6 +901,8 @@
 
 		table = dict_table_get_low(rebuild_table->name);
 
+		ut_d(table->n_ref_count++);
+
 		row_mysql_unlock_data_dictionary(trx);
 
 		ut_a(table != NULL);
@@ -913,6 +918,8 @@
 
 		xb_rebuild_indexes_for_table(table, trx, thread->num);
 
+		ut_d(table->n_ref_count--);
+
 		mem_free(rebuild_table->name);
 		mem_free(rebuild_table);
 	}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/compact.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/compact.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/compact.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/compact.h	2017-02-27 07:47:02.000000000 +0000
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/datasink.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/datasink.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/datasink.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/datasink.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/datasink.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/datasink.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/datasink.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/datasink.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_archive.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_archive.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_archive.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_archive.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -27,6 +27,7 @@
 typedef struct {
 	struct archive	*archive;
 	ds_file_t	*dest_file;
+	pthread_mutex_t	mutex;
 } ds_archive_ctxt_t;
 
 typedef struct {
@@ -99,6 +100,10 @@
 			 MYF(MY_FAE));
 	archive_ctxt = (ds_archive_ctxt_t *)(ctxt + 1);
 
+	if (pthread_mutex_init(&archive_ctxt->mutex, NULL)) {
+		msg("archive_init: pthread_mutex_init() failed.\n");
+		goto err;
+	}
 
 	a = archive_write_new();
 	if (a == NULL) {
@@ -153,12 +158,14 @@
 
 	archive_ctxt = (ds_archive_ctxt_t *) ctxt->ptr;
 
+	pthread_mutex_lock(&archive_ctxt->mutex);
 	if (archive_ctxt->dest_file == NULL) {
 		archive_ctxt->dest_file = ds_open(dest_ctxt, path, mystat);
 		if (archive_ctxt->dest_file == NULL) {
 			return NULL;
 		}
 	}
+	pthread_mutex_unlock(&archive_ctxt->mutex);
 
 	file = (ds_file_t *) my_malloc(sizeof(ds_file_t) +
 				       sizeof(ds_archive_file_t),
@@ -262,5 +269,7 @@
 		archive_ctxt->dest_file = NULL;
 	}
 
+	pthread_mutex_destroy(&archive_ctxt->mutex);
+
 	my_free(ctxt);
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_archive.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_archive.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_archive.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_archive.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_buffer.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_buffer.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_buffer.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_buffer.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -166,6 +166,7 @@
 buffer_close(ds_file_t *file)
 {
 	ds_buffer_file_t	*buffer_file;
+	int			ret;
 
 	buffer_file = (ds_buffer_file_t *) file->ptr;
 	if (buffer_file->pos > 0) {
@@ -173,11 +174,11 @@
 			 buffer_file->pos);
 	}
 
-	ds_close(buffer_file->dst_file);
+	ret = ds_close(buffer_file->dst_file);
 
 	my_free(file);
 
-	return 0;
+	return ret;
 }
 
 static void
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_buffer.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_buffer.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_buffer.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_buffer.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_compress.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_compress.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_compress.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_compress.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -271,6 +271,7 @@
 {
 	ds_compress_file_t	*comp_file;
 	ds_file_t		*dest_file;
+	int			rc;
 
 	comp_file = (ds_compress_file_t *) file->ptr;
 	dest_file = comp_file->dest_file;
@@ -284,11 +285,11 @@
 
 	write_uint64_le(dest_file, 0);
 
-	ds_close(dest_file);
+	rc = ds_close(dest_file);
 
 	my_free(file);
 
-	return 0;
+	return rc;
 }
 
 static
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_compress.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_compress.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_compress.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_compress.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_encrypt.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_encrypt.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_encrypt.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_encrypt.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -36,7 +36,9 @@
 
 #include "xbcrypt.h"
 
+#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 
 #define XB_CRYPT_CHUNK_SIZE ((size_t) (xtrabackup_encrypt_chunk_size))
 
@@ -101,7 +103,6 @@
 static uint encrypt_algo;
 static const uint encrypt_mode = GCRY_CIPHER_MODE_CTR;
 static uint encrypt_key_len = 0;
-static const unsigned char encrypt_iv[] = "Percona Xtrabackup is Awesome!!!";
 static size_t encrypt_iv_len = 0;
 
 static
@@ -132,6 +133,7 @@
 
 	/* Acording to gcrypt docs (and my testing), setting up the threading
 	   callbacks must be done first, so, lets give it a shot */
+#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
 	gcry_error = gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 	if (gcry_error) {
 		msg("encrypt: unable to set libgcrypt thread cbs - "
@@ -140,6 +142,7 @@
 		    gcry_strerror(gcry_error));
 		return NULL;
 	}
+#endif
 
 	/* Version check should be the very next call because it
 	makes sure that important subsystems are intialized. */
@@ -181,7 +184,6 @@
 	/* Set up the iv length */
 	encrypt_iv_len = gcry_cipher_get_algo_blklen(encrypt_algo);
 	xb_a(encrypt_iv_len > 0);
-	xb_a(encrypt_iv_len <= sizeof(encrypt_iv));
 
 	/* Now set up the key */
 	if (xtrabackup_encrypt_key == NULL &&
@@ -345,7 +347,8 @@
 
 			if (xb_crypt_write_chunk(crypt_file->xbcrypt_file,
 						 threads[i].to,
-						 threads[i].from_len,
+						 threads[i].from_len +
+							XB_CRYPT_HASH_LEN,
 						 threads[i].to_len,
 						 threads[i].iv,
 						 encrypt_iv_len)) {
@@ -377,7 +380,9 @@
 
 	rc = xb_crypt_write_close(crypt_file->xbcrypt_file);
 
-	ds_close(dest_file);
+	if (ds_close(dest_file)) {
+		rc = 1;
+	}
 
 	my_free(file);
 
@@ -422,8 +427,8 @@
 		thd->cancelled = FALSE;
 		thd->data_avail = FALSE;
 
-		thd->to = (char *) my_malloc(XB_CRYPT_CHUNK_SIZE,
-						   MYF(MY_FAE));
+		thd->to = (char *) my_malloc(XB_CRYPT_CHUNK_SIZE +
+					     XB_CRYPT_HASH_LEN, MYF(MY_FAE));
 
 		thd->iv = (char *) my_malloc(encrypt_iv_len,
 						   MYF(MY_FAE));
@@ -550,6 +555,14 @@
 		if (thd->cancelled)
 			break;
 
+		/* ensure that XB_CRYPT_HASH_LEN is the correct length
+		of XB_CRYPT_HASH hashing algorithm output */
+		assert(gcry_md_get_algo_dlen(XB_CRYPT_HASH) ==
+		       XB_CRYPT_HASH_LEN);
+
+		memcpy(thd->to, thd->from, thd->from_len);
+		gcry_md_hash_buffer(XB_CRYPT_HASH, thd->to + thd->from_len,
+				    thd->from, thd->from_len);
 		thd->to_len = thd->from_len;
 
 		if (encrypt_algo != GCRY_CIPHER_NONE) {
@@ -566,7 +579,7 @@
 			}
 
 			xb_crypt_create_iv(thd->iv, encrypt_iv_len);
-			gcry_error = gcry_cipher_setiv(thd->cipher_handle,
+			gcry_error = gcry_cipher_setctr(thd->cipher_handle,
 							thd->iv,
 							encrypt_iv_len);
 			if (gcry_error) {
@@ -580,9 +593,11 @@
 
 			gcry_error = gcry_cipher_encrypt(thd->cipher_handle,
 							 thd->to,
-							 thd->to_len,
-							 thd->from,
-							 thd->from_len);
+							 thd->to_len +
+							 XB_CRYPT_HASH_LEN,
+							 thd->to,
+							 thd->from_len +
+							 XB_CRYPT_HASH_LEN);
 			if (gcry_error) {
 				msg("encrypt: unable to encrypt buffer - "
 				    "%s : %s\n", gcry_strsource(gcry_error),
@@ -590,8 +605,10 @@
 				thd->to_len = 0;
 			}
 		} else {
-			memcpy(thd->to, thd->from, thd->from_len);
+			memcpy(thd->to, thd->from,
+			       thd->from_len + XB_CRYPT_HASH_LEN);
 		}
+		thd->to_len += XB_CRYPT_HASH_LEN;
 	}
 
 	pthread_mutex_unlock(&thd->data_mutex);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_encrypt.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_encrypt.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_encrypt.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_encrypt.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_local.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_local.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_local.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_local.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -49,10 +49,13 @@
 {
 	ds_ctxt_t *ctxt;
 
-	if (my_mkdir(root, 0777, MYF(0)) < 0 && my_errno != EEXIST)
+	if (my_mkdir(root, 0777, MYF(0)) < 0
+	    && my_errno != EEXIST && my_errno != EISDIR)
 	{
+		char errbuf[MYSYS_STRERROR_SIZE];
 		my_error(EE_CANT_MKDIR, MYF(ME_BELL | ME_WAITTANG),
-			 root, my_errno);
+			 root, my_errno, my_strerror(errbuf, sizeof(errbuf),
+			 my_errno));
 		return NULL;
 	}
 
@@ -81,8 +84,10 @@
 	/* Create the directory if needed */
 	dirname_part(dirpath, fullpath, &dirpath_len);
 	if (my_mkdir(dirpath, 0777, MYF(0)) < 0 && my_errno != EEXIST) {
+		char errbuf[MYSYS_STRERROR_SIZE];
 		my_error(EE_CANT_MKDIR, MYF(ME_BELL | ME_WAITTANG),
-			 dirpath, my_errno);
+			 dirpath, my_errno, my_strerror(errbuf, sizeof(errbuf),
+			 my_errno));
 		return NULL;
 	}
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_local.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_local.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_local.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_local.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_stdout.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_stdout.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_stdout.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_stdout.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_stdout.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_stdout.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_stdout.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_stdout.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_tmpfile.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_tmpfile.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_tmpfile.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_tmpfile.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -177,7 +177,7 @@
 	ds_file_t		*dst_file;
 	ds_ctxt_t		*pipe_ctxt;
 	void			*buf = NULL;
-	const size_t		 buf_size = 1024 * 1024;
+	const size_t		 buf_size = 10 * 1024 * 1024;
 	size_t			 bytes;
 	size_t			 offset;
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_tmpfile.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_tmpfile.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_tmpfile.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_tmpfile.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_xbstream.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_xbstream.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_xbstream.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_xbstream.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -27,6 +27,7 @@
 typedef struct {
 	xb_wstream_t	*xbstream;
 	ds_file_t	*dest_file;
+	pthread_mutex_t	mutex;
 } ds_stream_ctxt_t;
 
 typedef struct {
@@ -82,6 +83,11 @@
 			 MYF(MY_FAE));
 	stream_ctxt = (ds_stream_ctxt_t *)(ctxt + 1);
 
+	if (pthread_mutex_init(&stream_ctxt->mutex, NULL)) {
+		msg("xbstream_init: pthread_mutex_init() failed.\n");
+		goto err;
+	}
+
 	xbstream = xb_stream_write_new();
 	if (xbstream == NULL) {
 		msg("xb_stream_write_new() failed.\n");
@@ -116,12 +122,14 @@
 
 	stream_ctxt = (ds_stream_ctxt_t *) ctxt->ptr;
 
+	pthread_mutex_lock(&stream_ctxt->mutex);
 	if (stream_ctxt->dest_file == NULL) {
 		stream_ctxt->dest_file = ds_open(dest_ctxt, path, mystat);
 		if (stream_ctxt->dest_file == NULL) {
 			return NULL;
 		}
 	}
+	pthread_mutex_unlock(&stream_ctxt->mutex);
 
 	file = (ds_file_t *) my_malloc(sizeof(ds_file_t) +
 				       sizeof(ds_stream_file_t),
@@ -208,5 +216,8 @@
 		ds_close(stream_ctxt->dest_file);
 		stream_ctxt->dest_file = NULL;
 	}
+
+	pthread_mutex_destroy(&stream_ctxt->mutex);
+
 	my_free(ctxt);
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_xbstream.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_xbstream.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/ds_xbstream.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/ds_xbstream.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/fil_cur.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/fil_cur.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/fil_cur.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/fil_cur.cc	2017-02-27 07:47:02.000000000 +0000
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -34,8 +34,8 @@
 #include "read_filt.h"
 #include "xtrabackup.h"
 
-/* Size of read buffer in pages */
-#define XB_FIL_CUR_PAGES 64
+/* Size of read buffer in pages (640 pages = 10M for 16K sized pages) */
+#define XB_FIL_CUR_PAGES 640
 
 /***********************************************************************
 Extracts the relative path ("database/table.ibd") of a tablespace from a
@@ -46,7 +46,6 @@
 
 For system tablepsaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1"
 and "./ibdata1" yield "ibdata1" in the output. */
-static
 const char *
 xb_get_relative_path(
 /*=================*/
@@ -163,7 +162,7 @@
 	/* In the backup mode we should already have a tablespace handle created
 	by fil_load_single_table_tablespace() unless it is a system
 	tablespace. Otherwise we open the file here. */
-	if (cursor->is_system || !srv_backup_mode) {
+	if (cursor->is_system || !srv_backup_mode || srv_close_files) {
 		node->handle =
 			os_file_create_simple_no_error_handling(0, node->name,
 								OS_FILE_OPEN,
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/fil_cur.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/fil_cur.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/fil_cur.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/fil_cur.h	2017-02-27 07:47:02.000000000 +0000
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -102,4 +102,22 @@
 /*=============*/
 	xb_fil_cur_t *cursor);	/*!< in/out: source file cursor */
 
+/***********************************************************************
+Extracts the relative path ("database/table.ibd") of a tablespace from a
+specified possibly absolute path.
+
+For user tablespaces both "./database/table.ibd" and
+"/remote/dir/database/table.ibd" result in "database/table.ibd".
+
+For system tablepsaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1"
+and "./ibdata1" yield "ibdata1" in the output. */
+const char *
+xb_get_relative_path(
+/*=================*/
+	const char*	path,		/*!< in: tablespace path (either
+			  		relative or absolute) */
+	ibool		is_system);	/*!< in: TRUE for system tablespaces,
+					i.e. when only the filename must be
+					returned. */
+
 #endif
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/innobackupex.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/innobackupex.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/innobackupex.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/innobackupex.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,1153 @@
+/******************************************************
+hot backup tool for InnoDB
+(c) 2009-2015 Percona LLC and/or its affiliates
+Originally Created 3/3/2009 Yasufumi Kinoshita
+Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
+Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
+
+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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+*******************************************************
+
+This file incorporates work covered by the following copyright and
+permission notice:
+
+Copyright (c) 2000, 2011, MySQL AB & Innobase Oy. 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., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+
+*******************************************************/
+
+#include <my_global.h>
+#include <stdio.h>
+#include <string.h>
+#include <mysql.h>
+#include <my_dir.h>
+#include <ut0mem.h>
+#include <os0sync.h>
+#include <os0file.h>
+#include <srv0start.h>
+#include <algorithm>
+#include <mysqld.h>
+#include <my_default.h>
+#include <my_getopt.h>
+#include <strings.h>
+#include <string>
+#include <sstream>
+#include <set>
+#include "common.h"
+#include "innobackupex.h"
+#include "xtrabackup.h"
+#include "xtrabackup_version.h"
+#include "xbstream.h"
+#include "fil_cur.h"
+#include "write_filt.h"
+#include "backup_copy.h"
+
+using std::min;
+using std::max;
+
+/* options */
+my_bool opt_ibx_version = FALSE;
+my_bool opt_ibx_help = FALSE;
+my_bool opt_ibx_apply_log = FALSE;
+my_bool opt_ibx_redo_only = FALSE;
+my_bool opt_ibx_incremental = FALSE;
+my_bool opt_ibx_notimestamp = FALSE;
+
+my_bool opt_ibx_copy_back = FALSE;
+my_bool opt_ibx_move_back = FALSE;
+my_bool opt_ibx_galera_info = FALSE;
+my_bool opt_ibx_slave_info = FALSE;
+my_bool opt_ibx_no_lock = FALSE;
+my_bool opt_ibx_safe_slave_backup = FALSE;
+my_bool opt_ibx_rsync = FALSE;
+my_bool opt_ibx_force_non_empty_dirs = FALSE;
+my_bool opt_ibx_noversioncheck = FALSE;
+my_bool opt_ibx_no_backup_locks = FALSE;
+my_bool opt_ibx_decompress = FALSE;
+
+char *opt_ibx_incremental_history_name = NULL;
+char *opt_ibx_incremental_history_uuid = NULL;
+
+char *opt_ibx_user = NULL;
+char *opt_ibx_password = NULL;
+char *opt_ibx_host = NULL;
+char *opt_ibx_defaults_group = NULL;
+char *opt_ibx_socket = NULL;
+uint opt_ibx_port = 0;
+char *opt_ibx_login_path = NULL;
+
+
+ulong opt_ibx_lock_wait_query_type;
+ulong opt_ibx_kill_long_query_type;
+
+ulong opt_ibx_decrypt_algo = 0;
+
+uint opt_ibx_kill_long_queries_timeout = 0;
+uint opt_ibx_lock_wait_timeout = 0;
+uint opt_ibx_lock_wait_threshold = 0;
+uint opt_ibx_debug_sleep_before_unlock = 0;
+uint opt_ibx_safe_slave_backup_timeout = 0;
+
+const char *opt_ibx_history = NULL;
+bool opt_ibx_decrypt = false;
+
+char *opt_ibx_include = NULL;
+char *opt_ibx_databases = NULL;
+bool ibx_partial_backup = false;
+
+char *ibx_position_arg = NULL;
+char *ibx_backup_directory = NULL;
+
+/* copy of proxied xtrabackup options */
+my_bool ibx_xb_close_files;
+my_bool	ibx_xtrabackup_compact;
+const char *ibx_xtrabackup_compress_alg;
+uint ibx_xtrabackup_compress_threads;
+ulonglong ibx_xtrabackup_compress_chunk_size;
+ulong ibx_xtrabackup_encrypt_algo;
+char *ibx_xtrabackup_encrypt_key;
+char *ibx_xtrabackup_encrypt_key_file;
+uint ibx_xtrabackup_encrypt_threads;
+ulonglong ibx_xtrabackup_encrypt_chunk_size;
+my_bool ibx_xtrabackup_export;
+char *ibx_xtrabackup_extra_lsndir;
+char *ibx_xtrabackup_incremental_basedir;
+char *ibx_xtrabackup_incremental_dir;
+my_bool	ibx_xtrabackup_incremental_force_scan;
+ulint ibx_xtrabackup_log_copy_interval;
+char *ibx_xtrabackup_incremental;
+int ibx_xtrabackup_parallel;
+my_bool ibx_xtrabackup_rebuild_indexes;
+ulint ibx_xtrabackup_rebuild_threads;
+char *ibx_xtrabackup_stream_str;
+char *ibx_xtrabackup_tables_file;
+long ibx_xtrabackup_throttle;
+char *ibx_opt_mysql_tmpdir;
+longlong ibx_xtrabackup_use_memory;
+
+
+static inline int ibx_msg(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
+static inline int ibx_msg(const char *fmt, ...)
+{
+	int	result;
+	time_t	t = time(NULL);
+	char	date[100];
+	char	*line;
+	va_list args;
+
+	strftime(date, sizeof(date), "%y%m%d %H:%M:%S", localtime(&t));
+
+	va_start(args, fmt);
+
+	result = vasprintf(&line, fmt, args);
+
+	va_end(args);
+
+	if (result != -1) {
+		result = fprintf(stderr, "%s %s: %s",
+					date, INNOBACKUPEX_BIN_NAME, line);
+		free(line);
+	}
+
+	return result;
+}
+
+enum innobackupex_options
+{
+	OPT_APPLY_LOG = 256,
+	OPT_COPY_BACK,
+	OPT_MOVE_BACK,
+	OPT_REDO_ONLY,
+	OPT_GALERA_INFO,
+	OPT_SLAVE_INFO,
+	OPT_INCREMENTAL,
+	OPT_INCREMENTAL_HISTORY_NAME,
+	OPT_INCREMENTAL_HISTORY_UUID,
+	OPT_LOCK_WAIT_QUERY_TYPE,
+	OPT_KILL_LONG_QUERY_TYPE,
+	OPT_KILL_LONG_QUERIES_TIMEOUT,
+	OPT_LOCK_WAIT_TIMEOUT,
+	OPT_LOCK_WAIT_THRESHOLD,
+	OPT_DEBUG_SLEEP_BEFORE_UNLOCK,
+	OPT_NO_LOCK,
+	OPT_SAFE_SLAVE_BACKUP,
+	OPT_SAFE_SLAVE_BACKUP_TIMEOUT,
+	OPT_RSYNC,
+	OPT_HISTORY,
+	OPT_INCLUDE,
+	OPT_FORCE_NON_EMPTY_DIRS,
+	OPT_NO_TIMESTAMP,
+	OPT_NO_VERSION_CHECK,
+	OPT_NO_BACKUP_LOCKS,
+	OPT_DATABASES,
+	OPT_DECRYPT,
+	OPT_DECOMPRESS,
+
+	/* options wich are passed directly to xtrabackup */
+	OPT_CLOSE_FILES,
+	OPT_COMPACT,
+	OPT_COMPRESS,
+	OPT_COMPRESS_THREADS,
+	OPT_COMPRESS_CHUNK_SIZE,
+	OPT_ENCRYPT,
+	OPT_ENCRYPT_KEY,
+	OPT_ENCRYPT_KEY_FILE,
+	OPT_ENCRYPT_THREADS,
+	OPT_ENCRYPT_CHUNK_SIZE,
+	OPT_EXPORT,
+	OPT_EXTRA_LSNDIR,
+	OPT_INCREMENTAL_BASEDIR,
+	OPT_INCREMENTAL_DIR,
+	OPT_INCREMENTAL_FORCE_SCAN,
+	OPT_LOG_COPY_INTERVAL,
+	OPT_PARALLEL,
+	OPT_REBUILD_INDEXES,
+	OPT_REBUILD_THREADS,
+	OPT_STREAM,
+	OPT_TABLES_FILE,
+	OPT_THROTTLE,
+	OPT_USE_MEMORY
+};
+
+ibx_mode_t ibx_mode = IBX_MODE_BACKUP;
+
+static struct my_option ibx_long_options[] =
+{
+	{"version", 'v', "print xtrabackup version information",
+	 (uchar *) &opt_ibx_version, (uchar *) &opt_ibx_version, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"help", '?', "This option displays a help screen and exits.",
+	 (uchar *) &opt_ibx_help, (uchar *) &opt_ibx_help, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"apply-log", OPT_APPLY_LOG, "Prepare a backup in BACKUP-DIR by "
+	"applying the transaction log file named \"xtrabackup_logfile\" "
+	"located in the same directory. Also, create new transaction logs. "
+	"The InnoDB configuration is read from the file \"backup-my.cnf\".",
+	(uchar*) &opt_ibx_apply_log, (uchar*) &opt_ibx_apply_log,
+	0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"redo-only", OPT_REDO_ONLY, "This option should be used when "
+	 "preparing the base full backup and when merging all incrementals "
+	 "except the last one. This forces xtrabackup to skip the \"rollback\" "
+	 "phase and do a \"redo\" only. This is necessary if the backup will "
+	 "have incremental changes applied to it later. See the xtrabackup "
+	 "documentation for details.",
+	 (uchar *) &opt_ibx_redo_only, (uchar *) &opt_ibx_redo_only, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"copy-back", OPT_COPY_BACK, "Copy all the files in a previously made "
+	 "backup from the backup directory to their original locations.",
+	 (uchar *) &opt_ibx_copy_back, (uchar *) &opt_ibx_copy_back, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"move-back", OPT_MOVE_BACK, "Move all the files in a previously made "
+	 "backup from the backup directory to the actual datadir location. "
+	 "Use with caution, as it removes backup files.",
+	 (uchar *) &opt_ibx_move_back, (uchar *) &opt_ibx_move_back, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"galera-info", OPT_GALERA_INFO, "This options creates the "
+	 "xtrabackup_galera_info file which contains the local node state at "
+	 "the time of the backup. Option should be used when performing the "
+	 "backup of Percona-XtraDB-Cluster. Has no effect when backup locks "
+	 "are used to create the backup.",
+	 (uchar *) &opt_ibx_galera_info, (uchar *) &opt_ibx_galera_info, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"slave-info", OPT_SLAVE_INFO, "This option is useful when backing "
+	 "up a replication slave server. It prints the binary log position "
+	 "and name of the master server. It also writes this information to "
+	 "the \"xtrabackup_slave_info\" file as a \"CHANGE MASTER\" command. "
+	 "A new slave for this master can be set up by starting a slave server "
+	 "on this backup and issuing a \"CHANGE MASTER\" command with the "
+	 "binary log position saved in the \"xtrabackup_slave_info\" file.",
+	 (uchar *) &opt_ibx_slave_info, (uchar *) &opt_ibx_slave_info, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"incremental", OPT_INCREMENTAL, "This option tells xtrabackup to "
+	 "create an incremental backup, rather than a full one. It is passed "
+	 "to the xtrabackup child process. When this option is specified, "
+	 "either --incremental-lsn or --incremental-basedir can also be given. "
+	 "If neither option is given, option --incremental-basedir is passed "
+	 "to xtrabackup by default, set to the first timestamped backup "
+	 "directory in the backup base directory.",
+	 (uchar *) &opt_ibx_incremental, (uchar *) &opt_ibx_incremental, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"no-lock", OPT_NO_LOCK, "Use this option to disable table lock "
+	 "with \"FLUSH TABLES WITH READ LOCK\". Use it only if ALL your "
+	 "tables are InnoDB and you DO NOT CARE about the binary log "
+	 "position of the backup. This option shouldn't be used if there "
+	 "are any DDL statements being executed or if any updates are "
+	 "happening on non-InnoDB tables (this includes the system MyISAM "
+	 "tables in the mysql database), otherwise it could lead to an "
+	 "inconsistent backup. If you are considering to use --no-lock "
+	 "because your backups are failing to acquire the lock, this could "
+	 "be because of incoming replication events preventing the lock "
+	 "from succeeding. Please try using --safe-slave-backup to "
+	 "momentarily stop the replication slave thread, this may help "
+	 "the backup to succeed and you then don't need to resort to "
+	 "using this option.",
+	 (uchar *) &opt_ibx_no_lock, (uchar *) &opt_ibx_no_lock, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"safe-slave-backup", OPT_SAFE_SLAVE_BACKUP, "Stop slave SQL thread "
+	 "and wait to start backup until Slave_open_temp_tables in "
+	 "\"SHOW STATUS\" is zero. If there are no open temporary tables, "
+	 "the backup will take place, otherwise the SQL thread will be "
+	 "started and stopped until there are no open temporary tables. "
+	 "The backup will fail if Slave_open_temp_tables does not become "
+	 "zero after --safe-slave-backup-timeout seconds. The slave SQL "
+	 "thread will be restarted when the backup finishes.",
+	 (uchar *) &opt_ibx_safe_slave_backup,
+	 (uchar *) &opt_ibx_safe_slave_backup,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"rsync", OPT_RSYNC, "Uses the rsync utility to optimize local file "
+	 "transfers. When this option is specified, innobackupex uses rsync "
+	 "to copy all non-InnoDB files instead of spawning a separate cp for "
+	 "each file, which can be much faster for servers with a large number "
+	 "of databases or tables.  This option cannot be used together with "
+	 "--stream.",
+	 (uchar *) &opt_ibx_rsync, (uchar *) &opt_ibx_rsync,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"force-non-empty-directories", OPT_FORCE_NON_EMPTY_DIRS, "This "
+	 "option, when specified, makes --copy-back or --move-back transfer "
+	 "files to non-empty directories. Note that no existing files will be "
+	 "overwritten. If --copy-back or --nove-back has to copy a file from "
+	 "the backup directory which already exists in the destination "
+	 "directory, it will still fail with an error.",
+	 (uchar *) &opt_ibx_force_non_empty_dirs,
+	 (uchar *) &opt_ibx_force_non_empty_dirs,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"no-timestamp", OPT_NO_TIMESTAMP, "This option prevents creation of a "
+	 "time-stamped subdirectory of the BACKUP-ROOT-DIR given on the "
+	 "command line. When it is specified, the backup is done in "
+	 "BACKUP-ROOT-DIR instead.",
+	 (uchar *) &opt_ibx_notimestamp,
+	 (uchar *) &opt_ibx_notimestamp,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"no-version-check", OPT_NO_VERSION_CHECK, "This option disables the "
+	 "version check which is enabled by the --version-check option.",
+	 (uchar *) &opt_ibx_noversioncheck,
+	 (uchar *) &opt_ibx_noversioncheck,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"no-backup-locks", OPT_NO_BACKUP_LOCKS, "This option controls if "
+	 "backup locks should be used instead of FLUSH TABLES WITH READ LOCK "
+	 "on the backup stage. The option has no effect when backup locks are "
+	 "not supported by the server. This option is enabled by default, "
+	 "disable with --no-backup-locks.",
+	 (uchar *) &opt_ibx_no_backup_locks,
+	 (uchar *) &opt_ibx_no_backup_locks,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"decompress", OPT_DECOMPRESS, "Decompresses all files with the .qp "
+	 "extension in a backup previously made with the --compress option.",
+	 (uchar *) &opt_ibx_decompress,
+	 (uchar *) &opt_ibx_decompress,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"user", 'u', "This option specifies the MySQL username used "
+	 "when connecting to the server, if that's not the current user. "
+	 "The option accepts a string argument. See mysql --help for details.",
+	 (uchar*) &opt_ibx_user, (uchar*) &opt_ibx_user, 0, GET_STR,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"host", 'H', "This option specifies the host to use when "
+	 "connecting to the database server with TCP/IP.  The option accepts "
+	 "a string argument. See mysql --help for details.",
+	 (uchar*) &opt_ibx_host, (uchar*) &opt_ibx_host, 0, GET_STR,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"port", 'P', "This option specifies the port to use when "
+	 "connecting to the database server with TCP/IP.  The option accepts "
+	 "a string argument. See mysql --help for details.",
+	 &opt_ibx_port, &opt_ibx_port, 0, GET_UINT, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"password", 'p', "This option specifies the password to use "
+	 "when connecting to the database. It accepts a string argument.  "
+	 "See mysql --help for details.",
+	 0, 0, 0, GET_STR,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"socket", 'S', "This option specifies the socket to use when "
+	 "connecting to the local database server with a UNIX domain socket.  "
+	 "The option accepts a string argument. See mysql --help for details.",
+	 (uchar*) &opt_ibx_socket, (uchar*) &opt_ibx_socket, 0, GET_STR,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"incremental-history-name", OPT_INCREMENTAL_HISTORY_NAME,
+	 "This option specifies the name of the backup series stored in the "
+	 "PERCONA_SCHEMA.xtrabackup_history history record to base an "
+	 "incremental backup on. Xtrabackup will search the history table "
+	 "looking for the most recent (highest innodb_to_lsn), successful "
+	 "backup in the series and take the to_lsn value to use as the "
+	 "starting lsn for the incremental backup. This will be mutually "
+	 "exclusive with --incremental-history-uuid, --incremental-basedir "
+	 "and --incremental-lsn. If no valid lsn can be found (no series by "
+	 "that name, no successful backups by that name) xtrabackup will "
+	 "return with an error. It is used with the --incremental option.",
+	 (uchar*) &opt_ibx_incremental_history_name,
+	 (uchar*) &opt_ibx_incremental_history_name, 0, GET_STR,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"incremental-history-uuid", OPT_INCREMENTAL_HISTORY_UUID,
+	 "This option specifies the UUID of the specific history record "
+	 "stored in the PERCONA_SCHEMA.xtrabackup_history to base an "
+	 "incremental backup on. --incremental-history-name, "
+	 "--incremental-basedir and --incremental-lsn. If no valid lsn can be "
+	 "found (no success record with that uuid) xtrabackup will return "
+	 "with an error. It is used with the --incremental option.",
+	 (uchar*) &opt_ibx_incremental_history_uuid,
+	 (uchar*) &opt_ibx_incremental_history_uuid, 0, GET_STR,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"decrypt", OPT_DECRYPT, "Decrypts all files with the .xbcrypt "
+	 "extension in a backup previously made with --encrypt option.",
+	 &opt_ibx_decrypt_algo, &opt_ibx_decrypt_algo,
+	 &xtrabackup_encrypt_algo_typelib, GET_ENUM, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"ftwrl-wait-query-type", OPT_LOCK_WAIT_QUERY_TYPE,
+	 "This option specifies which types of queries are allowed to complete "
+	 "before innobackupex will issue the global lock. Default is all.",
+	 (uchar*) &opt_ibx_lock_wait_query_type,
+	 (uchar*) &opt_ibx_lock_wait_query_type, &query_type_typelib,
+	 GET_ENUM, REQUIRED_ARG, QUERY_TYPE_ALL, 0, 0, 0, 0, 0},
+
+	{"kill-long-query-type", OPT_KILL_LONG_QUERY_TYPE,
+	 "This option specifies which types of queries should be killed to "
+	 "unblock the global lock. Default is \"all\".",
+	 (uchar*) &opt_ibx_kill_long_query_type,
+	 (uchar*) &opt_ibx_kill_long_query_type, &query_type_typelib,
+	 GET_ENUM, REQUIRED_ARG, QUERY_TYPE_SELECT, 0, 0, 0, 0, 0},
+
+	{"history", OPT_HISTORY,
+	 "This option enables the tracking of backup history in the "
+	 "PERCONA_SCHEMA.xtrabackup_history table. An optional history "
+	 "series name may be specified that will be placed with the history "
+	 "record for the current backup being taken.",
+	 NULL, NULL, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"include", OPT_INCLUDE,
+	 "This option is a regular expression to be matched against table "
+	 "names in databasename.tablename format. It is passed directly to "
+	 "xtrabackup's --tables option. See the xtrabackup documentation for "
+	 "details.",
+	 (uchar*) &opt_ibx_include,
+	 (uchar*) &opt_ibx_include, 0, GET_STR,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"databases", OPT_DATABASES,
+	 "This option specifies the list of databases that innobackupex should "
+	 "back up. The option accepts a string argument or path to file that "
+	 "contains the list of databases to back up. The list is of the form "
+	 "\"databasename1[.table_name1] databasename2[.table_name2] . . .\". "
+	 "If this option is not specified, all databases containing MyISAM and "
+	 "InnoDB tables will be backed up.  Please make sure that --databases "
+	 "contains all of the InnoDB databases and tables, so that all of the "
+	 "innodb.frm files are also backed up. In case the list is very long, "
+	 "this can be specified in a file, and the full path of the file can "
+	 "be specified instead of the list. (See option --tables-file.)",
+	 (uchar*) &opt_ibx_databases,
+	 (uchar*) &opt_ibx_databases, 0, GET_STR,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"kill-long-queries-timeout", OPT_KILL_LONG_QUERIES_TIMEOUT,
+	 "This option specifies the number of seconds innobackupex waits "
+	 "between starting FLUSH TABLES WITH READ LOCK and killing those "
+	 "queries that block it. Default is 0 seconds, which means "
+	 "innobackupex will not attempt to kill any queries.",
+	 (uchar*) &opt_ibx_kill_long_queries_timeout,
+	 (uchar*) &opt_ibx_kill_long_queries_timeout, 0, GET_UINT,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"ftwrl-wait-timeout", OPT_LOCK_WAIT_TIMEOUT,
+	 "This option specifies time in seconds that innobackupex should wait "
+	 "for queries that would block FTWRL before running it. If there are "
+	 "still such queries when the timeout expires, innobackupex terminates "
+	 "with an error. Default is 0, in which case innobackupex does not "
+	 "wait for queries to complete and starts FTWRL immediately.",
+	 (uchar*) &opt_ibx_lock_wait_timeout,
+	 (uchar*) &opt_ibx_lock_wait_timeout, 0, GET_UINT,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"ftwrl-wait-threshold", OPT_LOCK_WAIT_THRESHOLD,
+	 "This option specifies the query run time threshold which is used by "
+	 "innobackupex to detect long-running queries with a non-zero value "
+	 "of --ftwrl-wait-timeout. FTWRL is not started until such "
+	 "long-running queries exist. This option has no effect if "
+	 "--ftwrl-wait-timeout is 0. Default value is 60 seconds.",
+	 (uchar*) &opt_ibx_lock_wait_threshold,
+	 (uchar*) &opt_ibx_lock_wait_threshold, 0, GET_UINT,
+	 REQUIRED_ARG, 60, 0, 0, 0, 0, 0},
+
+	{"debug-sleep-before-unlock", OPT_DEBUG_SLEEP_BEFORE_UNLOCK,
+	 "This is a debug-only option used by the XtraBackup test suite.",
+	 (uchar*) &opt_ibx_debug_sleep_before_unlock,
+	 (uchar*) &opt_ibx_debug_sleep_before_unlock, 0, GET_UINT,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"safe-slave-backup-timeout", OPT_SAFE_SLAVE_BACKUP_TIMEOUT,
+	 "How many seconds --safe-slave-backup should wait for "
+	 "Slave_open_temp_tables to become zero. (default 300)",
+	 (uchar*) &opt_ibx_safe_slave_backup_timeout,
+	 (uchar*) &opt_ibx_safe_slave_backup_timeout, 0, GET_UINT,
+	 REQUIRED_ARG, 300, 0, 0, 0, 0, 0},
+
+
+	/* Following command-line options are actually handled by xtrabackup.
+	We put them here with only purpose for them to showup in
+	innobackupex --help output */
+
+	{"close_files", OPT_CLOSE_FILES, "Do not keep files opened. This "
+	 "option is passed directly to xtrabackup. Use at your own risk.",
+	 (uchar*) &ibx_xb_close_files, (uchar*) &ibx_xb_close_files, 0,
+	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"compact", OPT_COMPACT, "Create a compact backup with all secondary "
+	 "index pages omitted. This option is passed directly to xtrabackup. "
+	 "See xtrabackup documentation for details.",
+	 (uchar*) &ibx_xtrabackup_compact, (uchar*) &ibx_xtrabackup_compact,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"compress", OPT_COMPRESS, "This option instructs xtrabackup to "
+	 "compress backup copies of InnoDB data files. It is passed directly "
+	 "to the xtrabackup child process. Try 'xtrabackup --help' for more "
+	 "details.", (uchar*) &ibx_xtrabackup_compress_alg,
+	 (uchar*) &ibx_xtrabackup_compress_alg, 0,
+	 GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"compress-threads", OPT_COMPRESS_THREADS,
+	 "This option specifies the number of worker threads that will be used "
+	 "for parallel compression. It is passed directly to the xtrabackup "
+	 "child process. Try 'xtrabackup --help' for more details.",
+	 (uchar*) &ibx_xtrabackup_compress_threads,
+	 (uchar*) &ibx_xtrabackup_compress_threads,
+	 0, GET_UINT, REQUIRED_ARG, 1, 1, UINT_MAX, 0, 0, 0},
+
+	{"compress-chunk-size", OPT_COMPRESS_CHUNK_SIZE, "Size of working "
+	 "buffer(s) for compression threads in bytes. The default value "
+	 "is 64K.", (uchar*) &ibx_xtrabackup_compress_chunk_size,
+	 (uchar*) &ibx_xtrabackup_compress_chunk_size,
+	 0, GET_ULL, REQUIRED_ARG, (1 << 16), 1024, ULONGLONG_MAX, 0, 0, 0},
+
+	{"encrypt", OPT_ENCRYPT, "This option instructs xtrabackup to encrypt "
+	 "backup copies of InnoDB data files using the algorithm specified in "
+	 "the ENCRYPTION-ALGORITHM. It is passed directly to the xtrabackup "
+	 "child process. Try 'xtrabackup --help' for more details.",
+	 &ibx_xtrabackup_encrypt_algo, &ibx_xtrabackup_encrypt_algo,
+	 &xtrabackup_encrypt_algo_typelib, GET_ENUM, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"encrypt-key", OPT_ENCRYPT_KEY, "This option instructs xtrabackup to "
+	 "use the given ENCRYPTION-KEY when using the --encrypt or --decrypt "
+	 "options. During backup it is passed directly to the xtrabackup child "
+	 "process. Try 'xtrabackup --help' for more details.",
+	 (uchar*) &ibx_xtrabackup_encrypt_key,
+	 (uchar*) &ibx_xtrabackup_encrypt_key, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"encrypt-key-file", OPT_ENCRYPT_KEY_FILE, "This option instructs "
+	 "xtrabackup to use the encryption key stored in the given "
+	 "ENCRYPTION-KEY-FILE when using the --encrypt or --decrypt options.",
+	 (uchar*) &ibx_xtrabackup_encrypt_key_file,
+	 (uchar*) &ibx_xtrabackup_encrypt_key_file, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"encrypt-threads", OPT_ENCRYPT_THREADS,
+	 "This option specifies the number of worker threads that will be used "
+	 "for parallel encryption. It is passed directly to the xtrabackup "
+	 "child process. Try 'xtrabackup --help' for more details.",
+	 (uchar*) &ibx_xtrabackup_encrypt_threads,
+	 (uchar*) &ibx_xtrabackup_encrypt_threads,
+	 0, GET_UINT, REQUIRED_ARG, 1, 1, UINT_MAX, 0, 0, 0},
+
+	{"encrypt-chunk-size", OPT_ENCRYPT_CHUNK_SIZE,
+	 "This option specifies the size of the internal working buffer for "
+	 "each encryption thread, measured in bytes. It is passed directly to "
+	 "the xtrabackup child process. Try 'xtrabackup --help' for more "
+	 "details.",
+	 (uchar*) &ibx_xtrabackup_encrypt_chunk_size,
+	 (uchar*) &ibx_xtrabackup_encrypt_chunk_size,
+	 0, GET_ULL, REQUIRED_ARG, (1 << 16), 1024, ULONGLONG_MAX, 0, 0, 0},
+
+	{"export", OPT_EXPORT, "This option is passed directly to xtrabackup's "
+	 "--export option. It enables exporting individual tables for import "
+	 "into another server. See the xtrabackup documentation for details.",
+	 (uchar*) &ibx_xtrabackup_export, (uchar*) &ibx_xtrabackup_export,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"extra-lsndir", OPT_EXTRA_LSNDIR, "This option specifies the "
+	 "directory in which to save an extra copy of the "
+	 "\"xtrabackup_checkpoints\" file. The option accepts a string "
+	 "argument. It is passed directly to xtrabackup's --extra-lsndir "
+	 "option. See the xtrabackup documentation for details.",
+	 (uchar*) &ibx_xtrabackup_extra_lsndir,
+	 (uchar*) &ibx_xtrabackup_extra_lsndir,
+	 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"incremental-basedir", OPT_INCREMENTAL_BASEDIR, "This option "
+	 "specifies the directory containing the full backup that is the base "
+	 "dataset for the incremental backup.  The option accepts a string "
+	 "argument. It is used with the --incremental option.",
+	 (uchar*) &ibx_xtrabackup_incremental_basedir,
+	 (uchar*) &ibx_xtrabackup_incremental_basedir,
+	 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"incremental-dir", OPT_INCREMENTAL_DIR, "This option specifies the "
+	 "directory where the incremental backup will be combined with the "
+	 "full backup to make a new full backup.  The option accepts a string "
+	 "argument. It is used with the --incremental option.",
+	 (uchar*) &ibx_xtrabackup_incremental_dir,
+	 (uchar*) &ibx_xtrabackup_incremental_dir,
+	 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"incremental-force-scan", OPT_INCREMENTAL_FORCE_SCAN,
+	 "This options tells xtrabackup to perform full scan of data files "
+	 "for taking an incremental backup even if full changed page bitmap "
+	 "data is available to enable the backup without the full scan.",
+	 (uchar*)&ibx_xtrabackup_incremental_force_scan,
+	 (uchar*)&ibx_xtrabackup_incremental_force_scan, 0, GET_BOOL, NO_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"log-copy-interval", OPT_LOG_COPY_INTERVAL, "This option specifies "
+	 "time interval between checks done by log copying thread in "
+	 "milliseconds.", (uchar*) &ibx_xtrabackup_log_copy_interval,
+	 (uchar*) &ibx_xtrabackup_log_copy_interval,
+	 0, GET_LONG, REQUIRED_ARG, 1000, 0, LONG_MAX, 0, 1, 0},
+
+	{"incremental-lsn", OPT_INCREMENTAL, "This option specifies the log "
+	 "sequence number (LSN) to use for the incremental backup.  The option "
+	 "accepts a string argument. It is used with the --incremental option. "
+	 "It is used instead of specifying --incremental-basedir. For "
+	 "databases created by MySQL and Percona Server 5.0-series versions, "
+	 "specify the LSN as two 32-bit integers in high:low format. For "
+	 "databases created in 5.1 and later, specify the LSN as a single "
+	 "64-bit integer.",
+	 (uchar*) &ibx_xtrabackup_incremental,
+	 (uchar*) &ibx_xtrabackup_incremental,
+	 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"parallel", OPT_PARALLEL, "On backup, this option specifies the "
+	 "number of threads the xtrabackup child process should use to back "
+	 "up files concurrently.  The option accepts an integer argument. It "
+	 "is passed directly to xtrabackup's --parallel option. See the "
+	 "xtrabackup documentation for details.",
+	 (uchar*) &ibx_xtrabackup_parallel, (uchar*) &ibx_xtrabackup_parallel,
+	 0, GET_INT, REQUIRED_ARG, 1, 1, INT_MAX, 0, 0, 0},
+
+	{"rebuild-indexes", OPT_REBUILD_INDEXES,
+	 "This option only has effect when used together with the --apply-log "
+	 "option and is passed directly to xtrabackup. When used, makes "
+	 "xtrabackup rebuild all secondary indexes after applying the log. "
+	 "This option is normally used to prepare compact backups. See the "
+	 "XtraBackup manual for more information.",
+	 (uchar*) &ibx_xtrabackup_rebuild_indexes,
+	 (uchar*) &ibx_xtrabackup_rebuild_indexes,
+	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"rebuild-threads", OPT_REBUILD_THREADS,
+	 "Use this number of threads to rebuild indexes in a compact backup. "
+	 "Only has effect with --prepare and --rebuild-indexes.",
+	 (uchar*) &ibx_xtrabackup_rebuild_threads,
+	 (uchar*) &ibx_xtrabackup_rebuild_threads,
+	 0, GET_UINT, REQUIRED_ARG, 1, 1, UINT_MAX, 0, 0, 0},
+
+	{"stream", OPT_STREAM, "This option specifies the format in which to "
+	 "do the streamed backup.  The option accepts a string argument. The "
+	 "backup will be done to STDOUT in the specified format. Currently, "
+	 "the only supported formats are tar and xbstream. This option is "
+	 "passed directly to xtrabackup's --stream option.",
+	 (uchar*) &ibx_xtrabackup_stream_str,
+	 (uchar*) &ibx_xtrabackup_stream_str, 0, GET_STR,
+	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"tables-file", OPT_TABLES_FILE, "This option specifies the file in "
+	 "which there are a list of names of the form database.  The option "
+	 "accepts a string argument.table, one per line. The option is passed "
+	 "directly to xtrabackup's --tables-file option.",
+	 (uchar*) &ibx_xtrabackup_tables_file,
+	 (uchar*) &ibx_xtrabackup_tables_file,
+	 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"throttle", OPT_THROTTLE, "This option specifies a number of I/O "
+	 "operations (pairs of read+write) per second.  It accepts an integer "
+	 "argument.  It is passed directly to xtrabackup's --throttle option.",
+	 (uchar*) &ibx_xtrabackup_throttle, (uchar*) &ibx_xtrabackup_throttle,
+	 0, GET_LONG, REQUIRED_ARG, 0, 0, LONG_MAX, 0, 1, 0},
+
+	{"tmpdir", 't', "This option specifies the location where a temporary "
+	 "files will be stored. If the option is not specified, the default is "
+	 "to use the value of tmpdir read from the server configuration.",
+	 (uchar*) &ibx_opt_mysql_tmpdir,
+	 (uchar*) &ibx_opt_mysql_tmpdir, 0, GET_STR, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"use-memory", OPT_USE_MEMORY, "This option accepts a string argument "
+	 "that specifies the amount of memory in bytes for xtrabackup to use "
+	 "for crash recovery while preparing a backup. Multiples are supported "
+	 "providing the unit (e.g. 1MB, 1GB). It is used only with the option "
+	 "--apply-log. It is passed directly to xtrabackup's --use-memory "
+	 "option. See the xtrabackup documentation for details.",
+	 (uchar*) &ibx_xtrabackup_use_memory,
+	 (uchar*) &ibx_xtrabackup_use_memory,
+	 0, GET_LL, REQUIRED_ARG, 100*1024*1024L, 1024*1024L, LONGLONG_MAX, 0,
+	 1024*1024L, 0},
+
+	{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+
+
+static void usage(void)
+{
+	puts("Open source backup tool for InnoDB and XtraDB\n\
+\n\
+Copyright (C) 2009-2015 Percona LLC and/or its affiliates.\n\
+Portions Copyright (C) 2000, 2011, MySQL AB & Innobase Oy. All Rights Reserved.\n\
+\n\
+This program is free software; you can redistribute it and/or\n\
+modify it under the terms of the GNU General Public License\n\
+as published by the Free Software Foundation version 2\n\
+of the License.\n\
+\n\
+This program is distributed in the hope that it will be useful,\n\
+but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
+GNU General Public License for more details.\n\
+\n\
+You can download full text of the license on http://www.gnu.org/licenses/gpl-2.0.txt\n\n");
+
+	puts("innobackupex - Non-blocking backup tool for InnoDB, XtraDB and HailDB databases\n\
+\n\
+SYNOPOSIS\n\
+\n\
+innobackupex [--compress] [--compress-threads=NUMBER-OF-THREADS] [--compress-chunk-size=CHUNK-SIZE]\n\
+             [--encrypt=ENCRYPTION-ALGORITHM] [--encrypt-threads=NUMBER-OF-THREADS] [--encrypt-chunk-size=CHUNK-SIZE]\n\
+             [--encrypt-key=LITERAL-ENCRYPTION-KEY] | [--encryption-key-file=MY.KEY]\n\
+             [--include=REGEXP] [--user=NAME]\n\
+             [--password=WORD] [--port=PORT] [--socket=SOCKET]\n\
+             [--no-timestamp] [--ibbackup=IBBACKUP-BINARY]\n\
+             [--slave-info] [--galera-info] [--stream=tar|xbstream]\n\
+             [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME]\n\
+             [--databases=LIST] [--no-lock] \n\
+             [--tmpdir=DIRECTORY] [--tables-file=FILE]\n\
+             [--history=NAME]\n\
+             [--incremental] [--incremental-basedir]\n\
+             [--incremental-dir] [--incremental-force-scan] [--incremental-lsn]\n\
+             [--incremental-history-name=NAME] [--incremental-history-uuid=UUID]\n\
+             [--close-files] [--compact]     \n\
+             BACKUP-ROOT-DIR\n\
+\n\
+innobackupex --apply-log [--use-memory=B]\n\
+             [--defaults-file=MY.CNF]\n\
+             [--export] [--redo-only] [--ibbackup=IBBACKUP-BINARY]\n\
+             BACKUP-DIR\n\
+\n\
+innobackupex --copy-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR\n\
+\n\
+innobackupex --move-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR\n\
+\n\
+innobackupex [--decompress] [--decrypt=ENCRYPTION-ALGORITHM]\n\
+             [--encrypt-key=LITERAL-ENCRYPTION-KEY] | [--encryption-key-file=MY.KEY]\n\
+             [--parallel=NUMBER-OF-FORKS] BACKUP-DIR\n\
+\n\
+DESCRIPTION\n\
+\n\
+The first command line above makes a hot backup of a MySQL database.\n\
+By default it creates a backup directory (named by the current date\n\
+	and time) in the given backup root directory.  With the --no-timestamp\n\
+option it does not create a time-stamped backup directory, but it puts\n\
+the backup in the given directory (which must not exist).  This\n\
+command makes a complete backup of all MyISAM and InnoDB tables and\n\
+indexes in all databases or in all of the databases specified with the\n\
+--databases option.  The created backup contains .frm, .MRG, .MYD,\n\
+.MYI, .MAD, .MAI, .TRG, .TRN, .ARM, .ARZ, .CSM, CSV, .opt, .par, and\n\
+InnoDB data and log files.  The MY.CNF options file defines the\n\
+location of the database.  This command connects to the MySQL server\n\
+using the mysql client program, and runs xtrabackup as a child\n\
+process.\n\
+\n\
+The --apply-log command prepares a backup for starting a MySQL\n\
+server on the backup. This command recovers InnoDB data files as specified\n\
+in BACKUP-DIR/backup-my.cnf using BACKUP-DIR/xtrabackup_logfile,\n\
+and creates new InnoDB log files as specified in BACKUP-DIR/backup-my.cnf.\n\
+The BACKUP-DIR should be the path to a backup directory created by\n\
+xtrabackup. This command runs xtrabackup as a child process, but it does not \n\
+connect to the database server.\n\
+\n\
+The --copy-back command copies data, index, and log files\n\
+from the backup directory back to their original locations.\n\
+The MY.CNF options file defines the original location of the database.\n\
+The BACKUP-DIR is the path to a backup directory created by xtrabackup.\n\
+\n\
+The --move-back command is similar to --copy-back with the only difference that\n\
+it moves files to their original locations rather than copies them. As this\n\
+option removes backup files, it must be used with caution. It may be useful in\n\
+cases when there is not enough free disk space to copy files.\n\
+\n\
+The --decompress --decrypt command will decrypt and/or decompress a backup made\n\
+with the --compress and/or --encrypt options. When decrypting, the encryption\n\
+algorithm and key used when the backup was taken MUST be provided via the\n\
+specified options. --decrypt and --decompress may be used together at the same\n\
+time to completely normalize a previously compressed and encrypted backup. The\n\
+--parallel option will allow multiple files to be decrypted and/or decompressed\n\
+simultaneously. In order to decompress, the qpress utility MUST be installed\n\
+and accessable within the path. This process will remove the original\n\
+compressed/encrypted files and leave the results in the same location.\n\
+\n\
+On success the exit code innobackupex is 0. A non-zero exit code \n\
+indicates an error.\n");
+	printf("Usage: [%s [--defaults-file=#] --backup | %s [--defaults-file=#] --prepare] [OPTIONS]\n", my_progname, my_progname);
+	my_print_help(ibx_long_options);
+}
+
+
+static
+my_bool
+ibx_get_one_option(int optid,
+		const struct my_option *opt __attribute__((unused)),
+		char *argument)
+{
+	switch(optid) {
+	case '?':
+		usage();
+		exit(0);
+		break;
+	case 'v':
+		msg("innobackupex version %s %s (%s) (revision id: %s)\n",
+			XTRABACKUP_VERSION,
+			SYSTEM_TYPE, MACHINE_TYPE, XTRABACKUP_REVISION);
+		exit(0);
+		break;
+	case OPT_HISTORY:
+		if (argument) {
+			opt_ibx_history = argument;
+		} else {
+			opt_ibx_history = "";
+		}
+		break;
+	case OPT_DECRYPT:
+		if (argument == NULL) {
+			ibx_msg("Missing --decrypt argument, must specify a "
+				"valid encryption  algorithm.\n");
+			return(1);
+		}
+		opt_ibx_decrypt = true;
+		break;
+	case OPT_STREAM:
+		if (!strcasecmp(argument, "tar"))
+			xtrabackup_stream_fmt = XB_STREAM_FMT_TAR;
+		else if (!strcasecmp(argument, "xbstream"))
+			xtrabackup_stream_fmt = XB_STREAM_FMT_XBSTREAM;
+		else {
+			ibx_msg("Invalid --stream argument: %s\n", argument);
+			return 1;
+		}
+		xtrabackup_stream = TRUE;
+		break;
+	case OPT_COMPRESS:
+		if (argument == NULL)
+			xtrabackup_compress_alg = "quicklz";
+		else if (strcasecmp(argument, "quicklz"))
+		{
+			ibx_msg("Invalid --compress argument: %s\n", argument);
+			return 1;
+		}
+		xtrabackup_compress = TRUE;
+		break;
+	case OPT_ENCRYPT:
+		if (argument == NULL)
+		{
+			msg("Missing --encrypt argument, must specify a "
+				"valid encryption algorithm.\n");
+			return 1;
+		}
+		xtrabackup_encrypt = TRUE;
+		break;
+	case 'p':
+		if (argument)
+		{
+		        char *start = argument;
+			my_free(opt_ibx_password);
+			opt_ibx_password= my_strdup(argument, MYF(MY_FAE));
+			/*  Destroy argument */
+			while (*argument)
+				*argument++= 'x';
+			if (*start)
+				start[1]=0 ;
+		}
+		break;
+        }
+	return(0);
+}
+
+bool
+make_backup_dir()
+{
+	time_t t = time(NULL);
+	char buf[100];
+
+	if (!opt_ibx_notimestamp && !ibx_xtrabackup_stream_str) {
+		strftime(buf, sizeof(buf), "%Y-%m-%d_%H-%M-%S", localtime(&t));
+		ut_a(asprintf(&ibx_backup_directory, "%s/%s",
+				ibx_position_arg, buf) != -1);
+	} else {
+		ibx_backup_directory = strdup(ibx_position_arg);
+	}
+
+	if (!directory_exists(ibx_backup_directory, true)) {
+		return(false);
+	}
+
+	return(true);
+}
+
+bool
+ibx_handle_options(int *argc, char ***argv)
+{
+	int i, n_arguments;
+
+	if (handle_options(argc, argv, ibx_long_options, ibx_get_one_option)) {
+		return(false);
+	}
+
+	if (opt_ibx_apply_log) {
+		ibx_mode = IBX_MODE_APPLY_LOG;
+	} else if (opt_ibx_copy_back) {
+		ibx_mode = IBX_MODE_COPY_BACK;
+	} else if (opt_ibx_move_back) {
+		ibx_mode = IBX_MODE_MOVE_BACK;
+	} else if (opt_ibx_decrypt || opt_ibx_decompress) {
+		ibx_mode = IBX_MODE_DECRYPT_DECOMPRESS;
+	} else {
+		ibx_mode = IBX_MODE_BACKUP;
+	}
+
+	/* find and save position argument */
+	i = 0;
+	n_arguments = 0;
+	while (i < *argc) {
+		char *opt = (*argv)[i];
+
+		if (strncmp(opt, "--", 2) != 0
+		    && !(strlen(opt) == 2 && opt[0] == '-')) {
+			if (ibx_position_arg != NULL
+				&& ibx_position_arg != opt) {
+				ibx_msg("Error: extra argument found %s\n",
+					opt);
+			}
+			ibx_position_arg = opt;
+			++n_arguments;
+		}
+		++i;
+	}
+
+	*argc -= n_arguments;
+	if (n_arguments > 1) {
+		return(false);
+	}
+
+	if (ibx_position_arg == NULL) {
+		ibx_msg("Missing argument\n");
+		return(false);
+	}
+
+	/* set argv[0] to be the program name */
+	--(*argv);
+	++(*argc);
+
+	return(true);
+}
+
+/*********************************************************************//**
+Parse command-line options, connect to MySQL server,
+detect server capabilities, etc.
+@return	true on success. */
+bool
+ibx_init()
+{
+	const char *run;
+
+	/*=====================*/
+	xtrabackup_copy_back = opt_ibx_copy_back;
+	xtrabackup_move_back = opt_ibx_move_back;
+	opt_galera_info = opt_ibx_galera_info;
+	opt_slave_info = opt_ibx_slave_info;
+	opt_no_lock = opt_ibx_no_lock;
+	opt_safe_slave_backup = opt_ibx_safe_slave_backup;
+	opt_rsync = opt_ibx_rsync;
+	opt_force_non_empty_dirs = opt_ibx_force_non_empty_dirs;
+	opt_noversioncheck = opt_ibx_noversioncheck;
+	opt_no_backup_locks = opt_ibx_no_backup_locks;
+	opt_decompress = opt_ibx_decompress;
+
+	opt_incremental_history_name = opt_ibx_incremental_history_name;
+	opt_incremental_history_uuid = opt_ibx_incremental_history_uuid;
+
+	opt_user = opt_ibx_user;
+	opt_password = opt_ibx_password;
+	opt_host = opt_ibx_host;
+	opt_defaults_group = opt_ibx_defaults_group;
+	opt_socket = opt_ibx_socket;
+	opt_port = opt_ibx_port;
+	opt_login_path = opt_ibx_login_path;
+
+	opt_lock_wait_query_type = opt_ibx_lock_wait_query_type;
+	opt_kill_long_query_type = opt_ibx_kill_long_query_type;
+
+	opt_decrypt_algo = opt_ibx_decrypt_algo;
+
+	opt_kill_long_queries_timeout = opt_ibx_kill_long_queries_timeout;
+	opt_lock_wait_timeout = opt_ibx_lock_wait_timeout;
+	opt_lock_wait_threshold = opt_ibx_lock_wait_threshold;
+	opt_debug_sleep_before_unlock = opt_ibx_debug_sleep_before_unlock;
+	opt_safe_slave_backup_timeout = opt_ibx_safe_slave_backup_timeout;
+
+	opt_history = opt_ibx_history;
+	opt_decrypt = opt_ibx_decrypt;
+
+	/* setup xtrabackup options */
+	xb_close_files = ibx_xb_close_files;
+	xtrabackup_compact = ibx_xtrabackup_compact;
+	xtrabackup_compress_alg = ibx_xtrabackup_compress_alg;
+	xtrabackup_compress_threads = ibx_xtrabackup_compress_threads;
+	xtrabackup_compress_chunk_size = ibx_xtrabackup_compress_chunk_size;
+	xtrabackup_encrypt_algo = ibx_xtrabackup_encrypt_algo;
+	xtrabackup_encrypt_key = ibx_xtrabackup_encrypt_key;
+	xtrabackup_encrypt_key_file = ibx_xtrabackup_encrypt_key_file;
+	xtrabackup_encrypt_threads = ibx_xtrabackup_encrypt_threads;
+	xtrabackup_encrypt_chunk_size = ibx_xtrabackup_encrypt_chunk_size;
+	xtrabackup_export = ibx_xtrabackup_export;
+	xtrabackup_extra_lsndir = ibx_xtrabackup_extra_lsndir;
+	xtrabackup_incremental_basedir = ibx_xtrabackup_incremental_basedir;
+	xtrabackup_incremental_dir = ibx_xtrabackup_incremental_dir;
+	xtrabackup_incremental_force_scan =
+					ibx_xtrabackup_incremental_force_scan;
+	xtrabackup_log_copy_interval = ibx_xtrabackup_log_copy_interval;
+	xtrabackup_incremental = ibx_xtrabackup_incremental;
+	xtrabackup_parallel = ibx_xtrabackup_parallel;
+	xtrabackup_rebuild_indexes = ibx_xtrabackup_rebuild_indexes;
+	xtrabackup_rebuild_threads = ibx_xtrabackup_rebuild_threads;
+	xtrabackup_stream_str = ibx_xtrabackup_stream_str;
+	xtrabackup_tables_file = ibx_xtrabackup_tables_file;
+	xtrabackup_throttle = ibx_xtrabackup_throttle;
+	opt_mysql_tmpdir = ibx_opt_mysql_tmpdir;
+	xtrabackup_use_memory = ibx_xtrabackup_use_memory;
+
+	if (!opt_ibx_incremental
+	    && (xtrabackup_incremental
+	    	|| xtrabackup_incremental_basedir
+	    	|| opt_ibx_incremental_history_name
+	    	|| opt_ibx_incremental_history_uuid)) {
+		ibx_msg("Error: --incremental-lsn, --incremental-basedir, "
+			"--incremental-history-name and "
+			"--incremental-history-uuid require the "
+			"--incremental option.\n");
+		return(false);
+	}
+
+	if (opt_ibx_databases != NULL) {
+		if (is_path_separator(*opt_ibx_databases)) {
+			xtrabackup_databases_file = opt_ibx_databases;
+		} else {
+			xtrabackup_databases = opt_ibx_databases;
+		}
+	}
+
+	/* --tables and --tables-file options are xtrabackup only */
+	ibx_partial_backup = (opt_ibx_include || opt_ibx_databases);
+
+	if (ibx_mode == IBX_MODE_BACKUP) {
+
+		if (!make_backup_dir()) {
+			return(false);
+		}
+	}
+
+	/* --binlog-info is xtrabackup only, so force
+	--binlog-info=ON. i.e. behavior before the feature had been
+	implemented */
+	opt_binlog_info = BINLOG_INFO_ON;
+
+	switch (ibx_mode) {
+	case IBX_MODE_APPLY_LOG:
+		xtrabackup_prepare = TRUE;
+		if (opt_ibx_redo_only) {
+			xtrabackup_apply_log_only = TRUE;
+		}
+		xtrabackup_target_dir = ibx_position_arg;
+		run = "apply-log";
+		break;
+	case IBX_MODE_BACKUP:
+		xtrabackup_backup = TRUE;
+		xtrabackup_target_dir = ibx_backup_directory;
+		if (opt_ibx_include != NULL) {
+			xtrabackup_tables = opt_ibx_include;
+		}
+		run = "backup";
+		break;
+	case IBX_MODE_COPY_BACK:
+		xtrabackup_copy_back = TRUE;
+		xtrabackup_target_dir = ibx_position_arg;
+		run = "copy-back";
+		break;
+	case IBX_MODE_MOVE_BACK:
+		xtrabackup_move_back = TRUE;
+		xtrabackup_target_dir = ibx_position_arg;
+		run = "move-back";
+		break;
+	case IBX_MODE_DECRYPT_DECOMPRESS:
+		xtrabackup_decrypt_decompress = TRUE;
+		xtrabackup_target_dir = ibx_position_arg;
+		run = "decrypt and decompress";
+		break;
+	default:
+		ut_error;
+	}
+
+	ibx_msg("Starting the %s operation\n\n"
+		"IMPORTANT: Please check that the %s run completes "
+		"successfully.\n"
+		"           At the end of a successful %s run innobackupex\n"
+		"           prints \"completed OK!\".\n\n", run, run, run);
+
+
+	return(true);
+}
+
+void
+ibx_cleanup()
+{
+	free(ibx_backup_directory);
+}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/innobackupex.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/innobackupex.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/innobackupex.h	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/innobackupex.h	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,45 @@
+/******************************************************
+Copyright (c) 2011-2014 Percona LLC and/or its affiliates.
+
+Declarations for innobackupex.cc
+
+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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+*******************************************************/
+
+#ifndef INNOBACKUPEX_H
+#define INNOBACKUPEX_H
+
+#define INNOBACKUPEX_BIN_NAME "innobackupex"
+
+enum ibx_mode_t {
+	IBX_MODE_BACKUP,
+	IBX_MODE_APPLY_LOG,
+	IBX_MODE_COPY_BACK,
+	IBX_MODE_MOVE_BACK,
+	IBX_MODE_DECRYPT_DECOMPRESS
+};
+
+extern ibx_mode_t ibx_mode;
+
+bool
+ibx_handle_options(int *argc, char ***argv);
+
+bool
+ibx_init();
+
+void
+ibx_cleanup();
+
+#endif
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/CMakeLists.txt percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,3 @@
+PROJECT(jsmn C)
+
+ADD_LIBRARY(jsmn jsmn.c)
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/jsmn.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/jsmn.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/jsmn.c	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/jsmn.c	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,311 @@
+#include <stdlib.h>
+
+#include "jsmn.h"
+
+/**
+ * Allocates a fresh unused token from the token pull.
+ */
+static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
+		jsmntok_t *tokens, size_t num_tokens) {
+	jsmntok_t *tok;
+	if (parser->toknext >= num_tokens) {
+		return NULL;
+	}
+	tok = &tokens[parser->toknext++];
+	tok->start = tok->end = -1;
+	tok->size = 0;
+#ifdef JSMN_PARENT_LINKS
+	tok->parent = -1;
+#endif
+	return tok;
+}
+
+/**
+ * Fills token type and boundaries.
+ */
+static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type,
+                            int start, int end) {
+	token->type = type;
+	token->start = start;
+	token->end = end;
+	token->size = 0;
+}
+
+/**
+ * Fills next available token with JSON primitive.
+ */
+static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js,
+		size_t len, jsmntok_t *tokens, size_t num_tokens) {
+	jsmntok_t *token;
+	int start;
+
+	start = parser->pos;
+
+	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
+		switch (js[parser->pos]) {
+#ifndef JSMN_STRICT
+			/* In strict mode primitive must be followed by "," or "}" or "]" */
+			case ':':
+#endif
+			case '\t' : case '\r' : case '\n' : case ' ' :
+			case ','  : case ']'  : case '}' :
+				goto found;
+		}
+		if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
+			parser->pos = start;
+			return JSMN_ERROR_INVAL;
+		}
+	}
+#ifdef JSMN_STRICT
+	/* In strict mode primitive must be followed by a comma/object/array */
+	parser->pos = start;
+	return JSMN_ERROR_PART;
+#endif
+
+found:
+	if (tokens == NULL) {
+		parser->pos--;
+		return 0;
+	}
+	token = jsmn_alloc_token(parser, tokens, num_tokens);
+	if (token == NULL) {
+		parser->pos = start;
+		return JSMN_ERROR_NOMEM;
+	}
+	jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
+#ifdef JSMN_PARENT_LINKS
+	token->parent = parser->toksuper;
+#endif
+	parser->pos--;
+	return 0;
+}
+
+/**
+ * Filsl next token with JSON string.
+ */
+static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js,
+		size_t len, jsmntok_t *tokens, size_t num_tokens) {
+	jsmntok_t *token;
+
+	int start = parser->pos;
+
+	parser->pos++;
+
+	/* Skip starting quote */
+	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
+		char c = js[parser->pos];
+
+		/* Quote: end of string */
+		if (c == '\"') {
+			if (tokens == NULL) {
+				return 0;
+			}
+			token = jsmn_alloc_token(parser, tokens, num_tokens);
+			if (token == NULL) {
+				parser->pos = start;
+				return JSMN_ERROR_NOMEM;
+			}
+			jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
+#ifdef JSMN_PARENT_LINKS
+			token->parent = parser->toksuper;
+#endif
+			return 0;
+		}
+
+		/* Backslash: Quoted symbol expected */
+		if (c == '\\' && parser->pos + 1 < len) {
+			int i;
+			parser->pos++;
+			switch (js[parser->pos]) {
+				/* Allowed escaped symbols */
+				case '\"': case '/' : case '\\' : case 'b' :
+				case 'f' : case 'r' : case 'n'  : case 't' :
+					break;
+				/* Allows escaped symbol \uXXXX */
+				case 'u':
+					parser->pos++;
+					for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) {
+						/* If it isn't a hex character we have an error */
+						if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */
+									(js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */
+									(js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */
+							parser->pos = start;
+							return JSMN_ERROR_INVAL;
+						}
+						parser->pos++;
+					}
+					parser->pos--;
+					break;
+				/* Unexpected symbol */
+				default:
+					parser->pos = start;
+					return JSMN_ERROR_INVAL;
+			}
+		}
+	}
+	parser->pos = start;
+	return JSMN_ERROR_PART;
+}
+
+/**
+ * Parse JSON string and fill tokens.
+ */
+jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
+		jsmntok_t *tokens, unsigned int num_tokens) {
+	jsmnerr_t r;
+	int i;
+	jsmntok_t *token;
+	int count = 0;
+
+	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
+		char c;
+		jsmntype_t type;
+
+		c = js[parser->pos];
+		switch (c) {
+			case '{': case '[':
+				count++;
+				if (tokens == NULL) {
+					break;
+				}
+				token = jsmn_alloc_token(parser, tokens, num_tokens);
+				if (token == NULL)
+					return JSMN_ERROR_NOMEM;
+				if (parser->toksuper != -1) {
+					tokens[parser->toksuper].size++;
+#ifdef JSMN_PARENT_LINKS
+					token->parent = parser->toksuper;
+#endif
+				}
+				token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
+				token->start = parser->pos;
+				parser->toksuper = parser->toknext - 1;
+				break;
+			case '}': case ']':
+				if (tokens == NULL)
+					break;
+				type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
+#ifdef JSMN_PARENT_LINKS
+				if (parser->toknext < 1) {
+					return JSMN_ERROR_INVAL;
+				}
+				token = &tokens[parser->toknext - 1];
+				for (;;) {
+					if (token->start != -1 && token->end == -1) {
+						if (token->type != type) {
+							return JSMN_ERROR_INVAL;
+						}
+						token->end = parser->pos + 1;
+						parser->toksuper = token->parent;
+						break;
+					}
+					if (token->parent == -1) {
+						break;
+					}
+					token = &tokens[token->parent];
+				}
+#else
+				for (i = parser->toknext - 1; i >= 0; i--) {
+					token = &tokens[i];
+					if (token->start != -1 && token->end == -1) {
+						if (token->type != type) {
+							return JSMN_ERROR_INVAL;
+						}
+						parser->toksuper = -1;
+						token->end = parser->pos + 1;
+						break;
+					}
+				}
+				/* Error if unmatched closing bracket */
+				if (i == -1) return JSMN_ERROR_INVAL;
+				for (; i >= 0; i--) {
+					token = &tokens[i];
+					if (token->start != -1 && token->end == -1) {
+						parser->toksuper = i;
+						break;
+					}
+				}
+#endif
+				break;
+			case '\"':
+				r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
+				if (r < 0) return r;
+				count++;
+				if (parser->toksuper != -1 && tokens != NULL)
+					tokens[parser->toksuper].size++;
+				break;
+			case '\t' : case '\r' : case '\n' : case ' ':
+				break;
+			case ':':
+				parser->toksuper = parser->toknext - 1;
+				break;
+			case ',':
+				if (tokens != NULL &&
+						tokens[parser->toksuper].type != JSMN_ARRAY &&
+						tokens[parser->toksuper].type != JSMN_OBJECT) {
+#ifdef JSMN_PARENT_LINKS
+					parser->toksuper = tokens[parser->toksuper].parent;
+#else
+					for (i = parser->toknext - 1; i >= 0; i--) {
+						if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) {
+							if (tokens[i].start != -1 && tokens[i].end == -1) {
+								parser->toksuper = i;
+								break;
+							}
+						}
+					}
+#endif
+				}
+				break;
+#ifdef JSMN_STRICT
+			/* In strict mode primitives are: numbers and booleans */
+			case '-': case '0': case '1' : case '2': case '3' : case '4':
+			case '5': case '6': case '7' : case '8': case '9':
+			case 't': case 'f': case 'n' :
+				/* And they must not be keys of the object */
+				if (tokens != NULL) {
+					jsmntok_t *t = &tokens[parser->toksuper];
+					if (t->type == JSMN_OBJECT ||
+							(t->type == JSMN_STRING && t->size != 0)) {
+						return JSMN_ERROR_INVAL;
+					}
+				}
+#else
+			/* In non-strict mode every unquoted value is a primitive */
+			default:
+#endif
+				r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
+				if (r < 0) return r;
+				count++;
+				if (parser->toksuper != -1 && tokens != NULL)
+					tokens[parser->toksuper].size++;
+				break;
+
+#ifdef JSMN_STRICT
+			/* Unexpected char in strict mode */
+			default:
+				return JSMN_ERROR_INVAL;
+#endif
+		}
+	}
+
+	for (i = parser->toknext - 1; i >= 0; i--) {
+		/* Unmatched opened object or array */
+		if (tokens[i].start != -1 && tokens[i].end == -1) {
+			return JSMN_ERROR_PART;
+		}
+	}
+
+	return count;
+}
+
+/**
+ * Creates a new parser based over a given  buffer with an array of tokens
+ * available.
+ */
+void jsmn_init(jsmn_parser *parser) {
+	parser->pos = 0;
+	parser->toknext = 0;
+	parser->toksuper = -1;
+}
+
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/jsmn.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/jsmn.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/jsmn.h	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/jsmn.h	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,75 @@
+#ifndef __JSMN_H_
+#define __JSMN_H_
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * JSON type identifier. Basic types are:
+ * 	o Object
+ * 	o Array
+ * 	o String
+ * 	o Other primitive: number, boolean (true/false) or null
+ */
+typedef enum {
+	JSMN_PRIMITIVE = 0,
+	JSMN_OBJECT = 1,
+	JSMN_ARRAY = 2,
+	JSMN_STRING = 3
+} jsmntype_t;
+
+typedef enum {
+	/* Not enough tokens were provided */
+	JSMN_ERROR_NOMEM = -1,
+	/* Invalid character inside JSON string */
+	JSMN_ERROR_INVAL = -2,
+	/* The string is not a full JSON packet, more bytes expected */
+	JSMN_ERROR_PART = -3
+} jsmnerr_t;
+
+/**
+ * JSON token description.
+ * @param		type	type (object, array, string etc.)
+ * @param		start	start position in JSON data string
+ * @param		end		end position in JSON data string
+ */
+typedef struct {
+	jsmntype_t type;
+	int start;
+	int end;
+	int size;
+#ifdef JSMN_PARENT_LINKS
+	int parent;
+#endif
+} jsmntok_t;
+
+/**
+ * JSON parser. Contains an array of token blocks available. Also stores
+ * the string being parsed now and current position in that string
+ */
+typedef struct {
+	unsigned int pos; /* offset in the JSON string */
+	unsigned int toknext; /* next token to allocate */
+	int toksuper; /* superior token node, e.g parent object or array */
+} jsmn_parser;
+
+/**
+ * Create JSON parser over an array of tokens
+ */
+void jsmn_init(jsmn_parser *parser);
+
+/**
+ * Run JSON parser. It parses a JSON data string into and array of tokens, each describing
+ * a single JSON object.
+ */
+jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
+		jsmntok_t *tokens, unsigned int num_tokens);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __JSMN_H_ */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/LICENSE percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/LICENSE
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/LICENSE	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+Copyright (c) 2010 Serge A. Zaitsev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/README.md percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/README.md
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/jsmn/README.md	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/jsmn/README.md	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,167 @@
+
+JSMN
+====
+
+jsmn (pronounced like 'jasmine') is a minimalistic JSON parser in C.  It can be
+easily integrated into resource-limited or embedded projects.
+
+You can find more information about JSON format at [json.org][1]
+
+Library sources are available at [bitbucket.org/zserge/jsmn][2]
+
+The web page with some information about jsmn can be found at
+[http://zserge.com/jsmn.html][3]
+
+Philosophy
+----------
+
+Most JSON parsers offer you a bunch of functions to load JSON data, parse it
+and extract any value by its name. jsmn proves that checking the correctness of
+every JSON packet or allocating temporary objects to store parsed JSON fields
+often is an overkill. 
+
+JSON format itself is extremely simple, so why should we complicate it?
+
+jsmn is designed to be	**robust** (it should work fine even with erroneous
+data), **fast** (it should parse data on the fly), **portable** (no superfluous
+dependencies or non-standard C extensions). An of course, **simplicity** is a
+key feature - simple code style, simple algorithm, simple integration into
+other projects.
+
+Features
+--------
+
+* compatible with C89
+* no dependencies (even libc!)
+* highly portable (tested on x86/amd64, ARM, AVR)
+* about 200 lines of code
+* extremely small code footprint
+* API contains only 2 functions
+* no dynamic memory allocation
+* incremental single-pass parsing
+* library code is covered with unit-tests
+
+Design
+------
+
+The rudimentary jsmn object is a **token**. Let's consider a JSON string:
+
+	'{ "name" : "Jack", "age" : 27 }'
+
+It holds the following tokens:
+
+* Object: `{ "name" : "Jack", "age" : 27}` (the whole object)
+* Strings: `"name"`, `"Jack"`, `"age"` (keys and some values)
+* Number: `27`
+
+In jsmn, tokens do not hold any data, but point to token boundaries in JSON
+string instead. In the example above jsmn will create tokens like: Object
+[0..31], String [3..7], String [12..16], String [20..23], Number [27..29].
+
+Every jsmn token has a type, which indicates the type of corresponding JSON
+token. jsmn supports the following token types:
+
+* Object - a container of key-value pairs, e.g.:
+	`{ "foo":"bar", "x":0.3 }`
+* Array - a sequence of values, e.g.:
+	`[ 1, 2, 3 ]`
+* String - a quoted sequence of chars, e.g.: `"foo"`
+* Primitive - a number, a boolean (`true`, `false`) or `null`
+
+Besides start/end positions, jsmn tokens for complex types (like arrays
+or objects) also contain a number of child items, so you can easily follow
+object hierarchy.
+
+This approach provides enough information for parsing any JSON data and makes
+it possible to use zero-copy techniques.
+
+Install
+-------
+
+To clone the repository you should have mercurial installed. Just run:
+
+	$ hg clone http://bitbucket.org/zserge/jsmn jsmn
+
+Repository layout is simple: jsmn.c and jsmn.h are library files, tests are in
+the jsmn\_test.c, you will also find README, LICENSE and Makefile files inside.
+
+To build the library, run `make`. It is also recommended to run `make test`.
+Let me know, if some tests fail.
+
+If build was successful, you should get a `libjsmn.a` library.
+The header file you should include is called `"jsmn.h"`.
+
+API
+---
+
+Token types are described by `jsmntype_t`:
+
+	typedef enum {
+		JSMN_PRIMITIVE = 0,
+		JSMN_OBJECT = 1,
+		JSMN_ARRAY = 2,
+		JSMN_STRING = 3
+	} jsmntype_t;
+
+**Note:** Unlike JSON data types, primitive tokens are not divided into
+numbers, booleans and null, because one can easily tell the type using the
+first character:
+
+* <code>'t', 'f'</code> - boolean 
+* <code>'n'</code> - null
+* <code>'-', '0'..'9'</code> - number
+
+Token is an object of `jsmntok_t` type:
+
+	typedef struct {
+		jsmntype_t type; // Token type
+		int start;       // Token start position
+		int end;         // Token end position
+		int size;        // Number of child (nested) tokens
+	} jsmntok_t;
+
+**Note:** string tokens point to the first character after
+the opening quote and the previous symbol before final quote. This was made 
+to simplify string extraction from JSON data.
+
+All job is done by `jsmn_parser` object. You can initialize a new parser using:
+
+	jsmn_parser parser;
+	jsmntok_t tokens[10];
+
+	jsmn_init(&parser);
+
+	// js - pointer to JSON string
+	// tokens - an array of tokens available
+	// 10 - number of tokens available
+	jsmn_parse(&parser, js, tokens, 10);
+
+This will create a parser, and then it tries to parse up to 10 JSON tokens from
+the `js` string.
+
+A non-negative reutrn value of `jsmn_parse` is the number of tokens actually
+used by the parser.
+Passing NULL instead of the tokens array would not store parsing results, but
+instead the function will return the value of tokens needed to parse the given
+string. This can be useful if you don't know yet how many tokens to allocate.
+
+If something goes wrong, you will get an error. Error will be one of these:
+
+* `JSMN_ERROR_INVAL` - bad token, JSON string is corrupted
+* `JSMN_ERROR_NOMEM` - not enough tokens, JSON string is too large
+* `JSMN_ERROR_PART` - JSON string is too short, expecting more JSON data
+
+If you get `JSON_ERROR_NOMEM`, you can re-allocate more tokens and call
+`jsmn_parse` once more.  If you read json data from the stream, you can
+periodically call `jsmn_parse` and check if return value is `JSON_ERROR_PART`.
+You will get this error until you reach the end of JSON data.
+
+Other info
+----------
+
+This software is distributed under [MIT license](http://www.opensource.org/licenses/mit-license.php),
+ so feel free to integrate it in your commercial products.
+
+[1]: http://www.json.org/
+[2]: https://bitbucket.org/zserge/jsmn/wiki/Home
+[3]: http://zserge.com/jsmn.html
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/read_filt.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/read_filt.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/read_filt.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/read_filt.cc	2017-02-27 07:47:02.000000000 +0000
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/read_filt.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/read_filt.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/read_filt.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/read_filt.h	2017-02-27 07:47:02.000000000 +0000
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/version_check.pl percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/version_check.pl
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/version_check.pl	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/version_check.pl	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,1373 @@
+use warnings FATAL => 'all';
+use strict;
+use English qw(-no_match_vars);
+use POSIX "strftime";
+
+my @required_perl_version = (5, 0, 5);
+my $required_perl_version_old_style = 5.005;
+
+# check existence of DBD::mysql module
+eval {
+    require DBD::mysql;
+};
+my $dbd_mysql_installed = $EVAL_ERROR ? 0 : 1;
+
+my $now;
+my %mysql;
+my $prefix = "version_check";
+
+
+# ###########################################################################
+# HTTPMicro package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/HTTPMicro.pm
+#   t/lib/HTTPMicro.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+
+package HTTPMicro;
+BEGIN {
+  $HTTPMicro::VERSION = '0.001';
+}
+use strict;
+use warnings;
+
+use Carp ();
+
+
+my @attributes;
+BEGIN {
+    @attributes = qw(agent timeout);
+    no strict 'refs';
+    for my $accessor ( @attributes ) {
+        *{$accessor} = sub {
+            @_ > 1 ? $_[0]->{$accessor} = $_[1] : $_[0]->{$accessor};
+        };
+    }
+}
+
+sub new {
+    my($class, %args) = @_;
+    (my $agent = $class) =~ s{::}{-}g;
+    my $self = {
+        agent        => $agent . "/" . ($class->VERSION || 0),
+        timeout      => 60,
+    };
+    for my $key ( @attributes ) {
+        $self->{$key} = $args{$key} if exists $args{$key}
+    }
+    return bless $self, $class;
+}
+
+my %DefaultPort = (
+    http => 80,
+    https => 443,
+);
+
+sub request {
+    my ($self, $method, $url, $args) = @_;
+    @_ == 3 || (@_ == 4 && ref $args eq 'HASH')
+      or Carp::croak(q/Usage: $http->request(METHOD, URL, [HASHREF])/);
+    $args ||= {}; # we keep some state in this during _request
+
+    my $response;
+    for ( 0 .. 1 ) {
+        $response = eval { $self->_request($method, $url, $args) };
+        last unless $@ && $method eq 'GET'
+            && $@ =~ m{^(?:Socket closed|Unexpected end)};
+    }
+
+    if (my $e = "$@") {
+        $response = {
+            success => q{},
+            status  => 599,
+            reason  => 'Internal Exception',
+            content => $e,
+            headers => {
+                'content-type'   => 'text/plain',
+                'content-length' => length $e,
+            }
+        };
+    }
+    return $response;
+}
+
+sub _request {
+    my ($self, $method, $url, $args) = @_;
+
+    my ($scheme, $host, $port, $path_query) = $self->_split_url($url);
+
+    my $request = {
+        method    => $method,
+        scheme    => $scheme,
+        host_port => ($port == $DefaultPort{$scheme} ? $host : "$host:$port"),
+        uri       => $path_query,
+        headers   => {},
+    };
+
+    my $handle  = HTTPMicro::Handle->new(timeout => $self->{timeout});
+
+    $handle->connect($scheme, $host, $port);
+
+    $self->_prepare_headers_and_cb($request, $args);
+    $handle->write_request_header(@{$request}{qw/method uri headers/});
+    $handle->write_content_body($request) if $request->{content};
+
+    my $response;
+    do { $response = $handle->read_response_header }
+        until (substr($response->{status},0,1) ne '1');
+
+    if (!($method eq 'HEAD' || $response->{status} =~ /^[23]04/)) {
+        $response->{content} = '';
+        $handle->read_content_body(sub { $_[1]->{content} .= $_[0] }, $response);
+    }
+
+    $handle->close;
+    $response->{success} = substr($response->{status},0,1) eq '2';
+    return $response;
+}
+
+sub _prepare_headers_and_cb {
+    my ($self, $request, $args) = @_;
+
+    for ($args->{headers}) {
+        next unless defined;
+        while (my ($k, $v) = each %$_) {
+            $request->{headers}{lc $k} = $v;
+        }
+    }
+    $request->{headers}{'host'}         = $request->{host_port};
+    $request->{headers}{'connection'}   = "close";
+    $request->{headers}{'user-agent'} ||= $self->{agent};
+
+    if (defined $args->{content}) {
+        $request->{headers}{'content-type'} ||= "application/octet-stream";
+        utf8::downgrade($args->{content}, 1)
+            or Carp::croak(q/Wide character in request message body/);
+        $request->{headers}{'content-length'} = length $args->{content};
+        $request->{content} = $args->{content};
+    }
+    return;
+}
+
+sub _split_url {
+    my $url = pop;
+
+    my ($scheme, $authority, $path_query) = $url =~ m<\A([^:/?#]+)://([^/?#]*)([^#]*)>
+      or Carp::croak(qq/Cannot parse URL: '$url'/);
+
+    $scheme     = lc $scheme;
+    $path_query = "/$path_query" unless $path_query =~ m<\A/>;
+
+    my $host = (length($authority)) ? lc $authority : 'localhost';
+       $host =~ s/\A[^@]*@//;   # userinfo
+    my $port = do {
+       $host =~ s/:([0-9]*)\z// && length $1
+         ? $1
+         : $DefaultPort{$scheme}
+    };
+
+    return ($scheme, $host, $port, $path_query);
+}
+
+package
+    HTTPMicro::Handle; # hide from PAUSE/indexers
+use strict;
+use warnings;
+
+use Carp       qw[croak];
+use Errno      qw[EINTR EPIPE];
+use IO::Socket qw[SOCK_STREAM];
+
+sub BUFSIZE () { 32768 }
+
+my $Printable = sub {
+    local $_ = shift;
+    s/\r/\\r/g;
+    s/\n/\\n/g;
+    s/\t/\\t/g;
+    s/([^\x20-\x7E])/sprintf('\\x%.2X', ord($1))/ge;
+    $_;
+};
+
+sub new {
+    my ($class, %args) = @_;
+    return bless {
+        rbuf             => '',
+        timeout          => 60,
+        max_line_size    => 16384,
+        %args
+    }, $class;
+}
+
+my $ssl_verify_args = {
+    check_cn => "when_only",
+    wildcards_in_alt => "anywhere",
+    wildcards_in_cn => "anywhere"
+};
+
+sub connect {
+    @_ == 4 || croak(q/Usage: $handle->connect(scheme, host, port)/);
+    my ($self, $scheme, $host, $port) = @_;
+
+    if ( $scheme eq 'https' ) {
+        eval "require IO::Socket::SSL"
+            unless exists $INC{'IO/Socket/SSL.pm'};
+        croak(qq/IO::Socket::SSL must be installed for https support\n/)
+            unless $INC{'IO/Socket/SSL.pm'};
+    }
+    elsif ( $scheme ne 'http' ) {
+      croak(qq/Unsupported URL scheme '$scheme'\n/);
+    }
+
+    $self->{fh} = 'IO::Socket::INET'->new(
+        PeerHost  => $host,
+        PeerPort  => $port,
+        Proto     => 'tcp',
+        Type      => SOCK_STREAM,
+        Timeout   => $self->{timeout}
+    ) or croak(qq/Could not connect to '$host:$port': $@/);
+
+    binmode($self->{fh})
+      or croak(qq/Could not binmode() socket: '$!'/);
+
+    if ( $scheme eq 'https') {
+        IO::Socket::SSL->start_SSL($self->{fh});
+        ref($self->{fh}) eq 'IO::Socket::SSL'
+            or die(qq/SSL connection failed for $host\n/);
+        if ( $self->{fh}->can("verify_hostname") ) {
+            $self->{fh}->verify_hostname( $host, $ssl_verify_args )
+                or die(qq/SSL certificate not valid for $host\n/);
+        }
+        else {
+         my $fh = $self->{fh};
+         _verify_hostname_of_cert($host, _peer_certificate($fh), $ssl_verify_args)
+               or die(qq/SSL certificate not valid for $host\n/);
+         }
+    }
+      
+    $self->{host} = $host;
+    $self->{port} = $port;
+
+    return $self;
+}
+
+sub close {
+    @_ == 1 || croak(q/Usage: $handle->close()/);
+    my ($self) = @_;
+    CORE::close($self->{fh})
+      or croak(qq/Could not close socket: '$!'/);
+}
+
+sub write {
+    @_ == 2 || croak(q/Usage: $handle->write(buf)/);
+    my ($self, $buf) = @_;
+
+    my $len = length $buf;
+    my $off = 0;
+
+    local $SIG{PIPE} = 'IGNORE';
+
+    while () {
+        $self->can_write
+          or croak(q/Timed out while waiting for socket to become ready for writing/);
+        my $r = syswrite($self->{fh}, $buf, $len, $off);
+        if (defined $r) {
+            $len -= $r;
+            $off += $r;
+            last unless $len > 0;
+        }
+        elsif ($! == EPIPE) {
+            croak(qq/Socket closed by remote server: $!/);
+        }
+        elsif ($! != EINTR) {
+            croak(qq/Could not write to socket: '$!'/);
+        }
+    }
+    return $off;
+}
+
+sub read {
+    @_ == 2 || @_ == 3 || croak(q/Usage: $handle->read(len)/);
+    my ($self, $len) = @_;
+
+    my $buf  = '';
+    my $got = length $self->{rbuf};
+
+    if ($got) {
+        my $take = ($got < $len) ? $got : $len;
+        $buf  = substr($self->{rbuf}, 0, $take, '');
+        $len -= $take;
+    }
+
+    while ($len > 0) {
+        $self->can_read
+          or croak(q/Timed out while waiting for socket to become ready for reading/);
+        my $r = sysread($self->{fh}, $buf, $len, length $buf);
+        if (defined $r) {
+            last unless $r;
+            $len -= $r;
+        }
+        elsif ($! != EINTR) {
+            croak(qq/Could not read from socket: '$!'/);
+        }
+    }
+    if ($len) {
+        croak(q/Unexpected end of stream/);
+    }
+    return $buf;
+}
+
+sub readline {
+    @_ == 1 || croak(q/Usage: $handle->readline()/);
+    my ($self) = @_;
+
+    while () {
+        if ($self->{rbuf} =~ s/\A ([^\x0D\x0A]* \x0D?\x0A)//x) {
+            return $1;
+        }
+        $self->can_read
+          or croak(q/Timed out while waiting for socket to become ready for reading/);
+        my $r = sysread($self->{fh}, $self->{rbuf}, BUFSIZE, length $self->{rbuf});
+        if (defined $r) {
+            last unless $r;
+        }
+        elsif ($! != EINTR) {
+            croak(qq/Could not read from socket: '$!'/);
+        }
+    }
+    croak(q/Unexpected end of stream while looking for line/);
+}
+
+sub read_header_lines {
+    @_ == 1 || @_ == 2 || croak(q/Usage: $handle->read_header_lines([headers])/);
+    my ($self, $headers) = @_;
+    $headers ||= {};
+    my $lines   = 0;
+    my $val;
+
+    while () {
+         my $line = $self->readline;
+
+         if ($line =~ /\A ([^\x00-\x1F\x7F:]+) : [\x09\x20]* ([^\x0D\x0A]*)/x) {
+             my ($field_name) = lc $1;
+             $val = \($headers->{$field_name} = $2);
+         }
+         elsif ($line =~ /\A [\x09\x20]+ ([^\x0D\x0A]*)/x) {
+             $val
+               or croak(q/Unexpected header continuation line/);
+             next unless length $1;
+             $$val .= ' ' if length $$val;
+             $$val .= $1;
+         }
+         elsif ($line =~ /\A \x0D?\x0A \z/x) {
+            last;
+         }
+         else {
+            croak(q/Malformed header line: / . $Printable->($line));
+         }
+    }
+    return $headers;
+}
+
+sub write_header_lines {
+    (@_ == 2 && ref $_[1] eq 'HASH') || croak(q/Usage: $handle->write_header_lines(headers)/);
+    my($self, $headers) = @_;
+
+    my $buf = '';
+    while (my ($k, $v) = each %$headers) {
+        my $field_name = lc $k;
+         $field_name =~ /\A [\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]+ \z/x
+            or croak(q/Invalid HTTP header field name: / . $Printable->($field_name));
+         $field_name =~ s/\b(\w)/\u$1/g;
+         $buf .= "$field_name: $v\x0D\x0A";
+    }
+    $buf .= "\x0D\x0A";
+    return $self->write($buf);
+}
+
+sub read_content_body {
+    @_ == 3 || @_ == 4 || croak(q/Usage: $handle->read_content_body(callback, response, [read_length])/);
+    my ($self, $cb, $response, $len) = @_;
+    $len ||= $response->{headers}{'content-length'};
+
+    croak("No content-length in the returned response, and this "
+        . "UA doesn't implement chunking") unless defined $len;
+
+    while ($len > 0) {
+        my $read = ($len > BUFSIZE) ? BUFSIZE : $len;
+        $cb->($self->read($read), $response);
+        $len -= $read;
+    }
+
+    return;
+}
+
+sub write_content_body {
+    @_ == 2 || croak(q/Usage: $handle->write_content_body(request)/);
+    my ($self, $request) = @_;
+    my ($len, $content_length) = (0, $request->{headers}{'content-length'});
+
+    $len += $self->write($request->{content});
+
+    $len == $content_length
+      or croak(qq/Content-Length missmatch (got: $len expected: $content_length)/);
+
+    return $len;
+}
+
+sub read_response_header {
+    @_ == 1 || croak(q/Usage: $handle->read_response_header()/);
+    my ($self) = @_;
+
+    my $line = $self->readline;
+
+    $line =~ /\A (HTTP\/(0*\d+\.0*\d+)) [\x09\x20]+ ([0-9]{3}) [\x09\x20]+ ([^\x0D\x0A]*) \x0D?\x0A/x
+      or croak(q/Malformed Status-Line: / . $Printable->($line));
+
+    my ($protocol, $version, $status, $reason) = ($1, $2, $3, $4);
+
+    return {
+        status   => $status,
+        reason   => $reason,
+        headers  => $self->read_header_lines,
+        protocol => $protocol,
+    };
+}
+
+sub write_request_header {
+    @_ == 4 || croak(q/Usage: $handle->write_request_header(method, request_uri, headers)/);
+    my ($self, $method, $request_uri, $headers) = @_;
+
+    return $self->write("$method $request_uri HTTP/1.1\x0D\x0A")
+         + $self->write_header_lines($headers);
+}
+
+sub _do_timeout {
+    my ($self, $type, $timeout) = @_;
+    $timeout = $self->{timeout}
+        unless defined $timeout && $timeout >= 0;
+
+    my $fd = fileno $self->{fh};
+    defined $fd && $fd >= 0
+      or croak(q/select(2): 'Bad file descriptor'/);
+
+    my $initial = time;
+    my $pending = $timeout;
+    my $nfound;
+
+    vec(my $fdset = '', $fd, 1) = 1;
+
+    while () {
+        $nfound = ($type eq 'read')
+            ? select($fdset, undef, undef, $pending)
+            : select(undef, $fdset, undef, $pending) ;
+        if ($nfound == -1) {
+            $! == EINTR
+              or croak(qq/select(2): '$!'/);
+            redo if !$timeout || ($pending = $timeout - (time - $initial)) > 0;
+            $nfound = 0;
+        }
+        last;
+    }
+    $! = 0;
+    return $nfound;
+}
+
+sub can_read {
+    @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_read([timeout])/);
+    my $self = shift;
+    return $self->_do_timeout('read', @_)
+}
+
+sub can_write {
+    @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_write([timeout])/);
+    my $self = shift;
+    return $self->_do_timeout('write', @_)
+}
+
+my $prog = <<'EOP';
+BEGIN {
+   if ( defined &IO::Socket::SSL::CAN_IPV6 ) {
+      *CAN_IPV6 = \*IO::Socket::SSL::CAN_IPV6;
+   }
+   else {
+      constant->import( CAN_IPV6 => '' );
+   }
+   my %const = (
+      NID_CommonName => 13,
+      GEN_DNS => 2,
+      GEN_IPADD => 7,
+   );
+   while ( my ($name,$value) = each %const ) {
+      no strict 'refs';
+      *{$name} = UNIVERSAL::can( 'Net::SSLeay', $name ) || sub { $value };
+   }
+}
+{
+   my %dispatcher = (
+      issuer =>  sub { Net::SSLeay::X509_NAME_oneline( Net::SSLeay::X509_get_issuer_name( shift )) },
+      subject => sub { Net::SSLeay::X509_NAME_oneline( Net::SSLeay::X509_get_subject_name( shift )) },
+   );
+   if ( $Net::SSLeay::VERSION >= 1.30 ) {
+      $dispatcher{commonName} = sub {
+         my $cn = Net::SSLeay::X509_NAME_get_text_by_NID(
+            Net::SSLeay::X509_get_subject_name( shift ), NID_CommonName);
+         $cn =~s{\0$}{}; # work around Bug in Net::SSLeay <1.33
+         $cn;
+      }
+   } else {
+      $dispatcher{commonName} = sub {
+         croak "you need at least Net::SSLeay version 1.30 for getting commonName"
+      }
+   }
+
+   if ( $Net::SSLeay::VERSION >= 1.33 ) {
+      $dispatcher{subjectAltNames} = sub { Net::SSLeay::X509_get_subjectAltNames( shift ) };
+   } else {
+      $dispatcher{subjectAltNames} = sub {
+         return;
+      };
+   }
+
+   $dispatcher{authority} = $dispatcher{issuer};
+   $dispatcher{owner}     = $dispatcher{subject};
+   $dispatcher{cn}        = $dispatcher{commonName};
+
+   sub _peer_certificate {
+      my ($self, $field) = @_;
+      my $ssl = $self->_get_ssl_object or return;
+
+      my $cert = ${*$self}{_SSL_certificate}
+         ||= Net::SSLeay::get_peer_certificate($ssl)
+         or return $self->error("Could not retrieve peer certificate");
+
+      if ($field) {
+         my $sub = $dispatcher{$field} or croak
+            "invalid argument for peer_certificate, valid are: ".join( " ",keys %dispatcher ).
+            "\nMaybe you need to upgrade your Net::SSLeay";
+         return $sub->($cert);
+      } else {
+         return $cert
+      }
+   }
+
+
+   my %scheme = (
+      ldap => {
+         wildcards_in_cn    => 0,
+         wildcards_in_alt => 'leftmost',
+         check_cn         => 'always',
+      },
+      http => {
+         wildcards_in_cn    => 'anywhere',
+         wildcards_in_alt => 'anywhere',
+         check_cn         => 'when_only',
+      },
+      smtp => {
+         wildcards_in_cn    => 0,
+         wildcards_in_alt => 0,
+         check_cn         => 'always'
+      },
+      none => {}, # do not check
+   );
+
+   $scheme{www}  = $scheme{http}; # alias
+   $scheme{xmpp} = $scheme{http}; # rfc 3920
+   $scheme{pop3} = $scheme{ldap}; # rfc 2595
+   $scheme{imap} = $scheme{ldap}; # rfc 2595
+   $scheme{acap} = $scheme{ldap}; # rfc 2595
+   $scheme{nntp} = $scheme{ldap}; # rfc 4642
+   $scheme{ftp}  = $scheme{http}; # rfc 4217
+
+
+   sub _verify_hostname_of_cert {
+      my $identity = shift;
+      my $cert = shift;
+      my $scheme = shift || 'none';
+      if ( ! ref($scheme) ) {
+         $scheme = $scheme{$scheme} or croak "scheme $scheme not defined";
+      }
+
+      return 1 if ! %$scheme; # 'none'
+
+      my $commonName = $dispatcher{cn}->($cert);
+      my @altNames   = $dispatcher{subjectAltNames}->($cert);
+
+      if ( my $sub = $scheme->{callback} ) {
+         return $sub->($identity,$commonName,@altNames);
+      }
+
+
+      my $ipn;
+      if ( CAN_IPV6 and $identity =~m{:} ) {
+         $ipn = IO::Socket::SSL::inet_pton(IO::Socket::SSL::AF_INET6,$identity)
+            or croak "'$identity' is not IPv6, but neither IPv4 nor hostname";
+      } elsif ( $identity =~m{^\d+\.\d+\.\d+\.\d+$} ) {
+         $ipn = IO::Socket::SSL::inet_aton( $identity ) or croak "'$identity' is not IPv4, but neither IPv6 nor hostname";
+      } else {
+         if ( $identity =~m{[^a-zA-Z0-9_.\-]} ) {
+            $identity =~m{\0} and croak("name '$identity' has \\0 byte");
+            $identity = IO::Socket::SSL::idn_to_ascii($identity) or
+               croak "Warning: Given name '$identity' could not be converted to IDNA!";
+         }
+      }
+
+      my $check_name = sub {
+         my ($name,$identity,$wtyp) = @_;
+         $wtyp ||= '';
+         my $pattern;
+         if ( $wtyp eq 'anywhere' and $name =~m{^([a-zA-Z0-9_\-]*)\*(.+)} ) {
+            $pattern = qr{^\Q$1\E[a-zA-Z0-9_\-]*\Q$2\E$}i;
+         } elsif ( $wtyp eq 'leftmost' and $name =~m{^\*(\..+)$} ) {
+            $pattern = qr{^[a-zA-Z0-9_\-]*\Q$1\E$}i;
+         } else {
+            $pattern = qr{^\Q$name\E$}i;
+         }
+         return $identity =~ $pattern;
+      };
+
+      my $alt_dnsNames = 0;
+      while (@altNames) {
+         my ($type, $name) = splice (@altNames, 0, 2);
+         if ( $ipn and $type == GEN_IPADD ) {
+            return 1 if $ipn eq $name;
+
+         } elsif ( ! $ipn and $type == GEN_DNS ) {
+            $name =~s/\s+$//; $name =~s/^\s+//;
+            $alt_dnsNames++;
+            $check_name->($name,$identity,$scheme->{wildcards_in_alt})
+               and return 1;
+         }
+      }
+
+      if ( ! $ipn and (
+         $scheme->{check_cn} eq 'always' or
+         $scheme->{check_cn} eq 'when_only' and !$alt_dnsNames)) {
+         $check_name->($commonName,$identity,$scheme->{wildcards_in_cn})
+            and return 1;
+      }
+
+      return 0; # no match
+   }
+}
+EOP
+
+eval { require IO::Socket::SSL };
+if ( $INC{"IO/Socket/SSL.pm"} ) {
+   eval $prog;
+   die $@ if $@;
+}
+
+1;
+}
+# ###########################################################################
+# End HTTPMicro package
+# ###########################################################################
+
+# ###########################################################################
+# VersionCheck package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+package VersionCheck;
+
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Data::Dumper;
+local $Data::Dumper::Indent    = 1;
+local $Data::Dumper::Sortkeys  = 1;
+local $Data::Dumper::Quotekeys = 0;
+
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
+use File::Basename qw();
+use File::Spec;
+use FindBin qw();
+
+eval {
+   require Percona::Toolkit;
+   require HTTPMicro;
+};
+
+{
+   my $file    = 'percona-version-check';
+   my $home    = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.';
+   my @vc_dirs = (
+      '/etc/percona',
+      '/etc/percona-toolkit',
+      '/tmp',
+      "$home",
+   );
+
+   if ($ENV{PTDEBUG_VERSION_CHECK_HOME}) {
+       @vc_dirs = ( $ENV{PTDEBUG_VERSION_CHECK_HOME} );
+   }
+
+   sub version_check_file {
+      foreach my $dir ( @vc_dirs ) {
+         if ( -d $dir && -w $dir ) {
+            PTDEBUG && _d('Version check file', $file, 'in', $dir);
+            return $dir . '/' . $file;
+         }
+      }
+      PTDEBUG && _d('Version check file', $file, 'in', $ENV{PWD});
+      return $file;  # in the CWD
+   } 
+}
+
+sub version_check_time_limit {
+   return 60 * 60 * 24;  # one day
+}
+
+
+sub version_check {
+   my (%args) = @_;
+
+   my $instances = $args{instances} || [];
+   my $instances_to_check;
+
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
+         return;
+      }
+   }
+
+   eval {
+      foreach my $instance ( @$instances ) {
+         my ($name, $id) = get_instance_id($instance);
+         $instance->{name} = $name;
+         $instance->{id}   = $id;
+      }
+
+      push @$instances, { name => 'system', id => 0 };
+
+      $instances_to_check = get_instances_to_check(
+         instances => $instances,
+         vc_file   => $args{vc_file},  # testing
+         now       => $args{now},      # testing
+      );
+      PTDEBUG && _d(scalar @$instances_to_check, 'instances to check');
+      return unless @$instances_to_check;
+
+      my $protocol = 'https';
+      eval { require IO::Socket::SSL; };
+      if ( $EVAL_ERROR ) {
+          PTDEBUG && _d($EVAL_ERROR);
+          PTDEBUG && _d("SSL not available, won't run version_check");
+          return;
+      }
+      PTDEBUG && _d('Using', $protocol);
+
+      my $advice = pingback(
+         instances => $instances_to_check,
+         protocol  => $protocol,
+         url       => $args{url}                       # testing
+                   || $ENV{PERCONA_VERSION_CHECK_URL}  # testing
+                   || "$protocol://v.percona.com",
+      );
+      if ( $advice ) {
+         PTDEBUG && _d('Advice:', Dumper($advice));
+         if ( scalar @$advice > 1) {
+            print "\n# " . scalar @$advice . " software updates are "
+               . "available:\n";
+         }
+         else {
+            print "\n# A software update is available:\n";
+         }
+         print join("\n", map { "#   * $_" } @$advice), "\n\n";
+      }
+   };
+   if ( $EVAL_ERROR ) {
+      PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
+   }
+
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
+   }
+
+   if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
+      warn "Exiting because the PTDEBUG_VERSION_CHECK "
+         . "environment variable is defined.\n";
+      exit 255;
+   }
+
+   return;
+}
+
+sub get_instances_to_check {
+   my (%args) = @_;
+
+   my $instances = $args{instances};
+   my $now       = $args{now}     || int(time);
+   my $vc_file   = $args{vc_file} || version_check_file();
+
+   if ( !-f $vc_file ) {
+      PTDEBUG && _d('Version check file', $vc_file, 'does not exist;',
+         'version checking all instances');
+      return $instances;
+   }
+
+   open my $fh, '<', $vc_file or die "Cannot open $vc_file: $OS_ERROR";
+   chomp(my $file_contents = do { local $/ = undef; <$fh> });
+   PTDEBUG && _d('Version check file', $vc_file, 'contents:', $file_contents);
+   close $fh;
+   my %last_check_time_for = $file_contents =~ /^([^,]+),(.+)$/mg;
+
+   my $check_time_limit = version_check_time_limit();
+   my @instances_to_check;
+   foreach my $instance ( @$instances ) {
+      my $last_check_time = $last_check_time_for{ $instance->{id} };
+      PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
+         $last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
+         'hours until next check',
+         sprintf '%.2f',
+            ($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
+      if ( !defined $last_check_time
+           || ($now - $last_check_time) >= $check_time_limit ) {
+         PTDEBUG && _d('Time to check', Dumper($instance));
+         push @instances_to_check, $instance;
+      }
+   }
+
+   return \@instances_to_check;
+}
+
+sub update_check_times {
+   my (%args) = @_;
+
+   my $instances = $args{instances};
+   my $now       = $args{now}     || int(time);
+   my $vc_file   = $args{vc_file} || version_check_file();
+   PTDEBUG && _d('Updating last check time:', $now);
+
+   my %all_instances = map {
+      $_->{id} => { name => $_->{name}, ts => $now }
+   } @$instances;
+
+   if ( -f $vc_file ) {
+      open my $fh, '<', $vc_file or die "Cannot read $vc_file: $OS_ERROR";
+      my $contents = do { local $/ = undef; <$fh> };
+      close $fh;
+
+      foreach my $line ( split("\n", ($contents || '')) ) {
+         my ($id, $ts) = split(',', $line);
+         if ( !exists $all_instances{$id} ) {
+            $all_instances{$id} = { ts => $ts };  # original ts, not updated
+         }
+      }
+   }
+
+   open my $fh, '>', $vc_file or die "Cannot write to $vc_file: $OS_ERROR";
+   foreach my $id ( sort keys %all_instances ) {
+      PTDEBUG && _d('Updated:', $id, Dumper($all_instances{$id}));
+      print { $fh } $id . ',' . $all_instances{$id}->{ts} . "\n";
+   }
+   close $fh;
+
+   return;
+}
+
+sub get_instance_id {
+   my ($instance) = @_;
+
+   my $dbh = $instance->{dbh};
+   my $dsn = $instance->{dsn};
+
+   my $sql = q{SELECT CONCAT(@@hostname, @@port)};
+   PTDEBUG && _d($sql);
+   my ($name) = eval { $dbh->selectrow_array($sql) };
+   if ( $EVAL_ERROR ) {
+      PTDEBUG && _d($EVAL_ERROR);
+      $sql = q{SELECT @@hostname};
+      PTDEBUG && _d($sql);
+      ($name) = eval { $dbh->selectrow_array($sql) };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d($EVAL_ERROR);
+         $name = ($dsn->{h} || 'localhost') . ($dsn->{P} || 3306);
+      }
+      else {
+         $sql = q{SHOW VARIABLES LIKE 'port'};
+         PTDEBUG && _d($sql);
+         my (undef, $port) = eval { $dbh->selectrow_array($sql) };
+         PTDEBUG && _d('port:', $port);
+         $name .= $port || '';
+      }
+   }
+   my $id = md5_hex($name);
+
+   PTDEBUG && _d('MySQL instance:', $id, $name, Dumper($dsn));
+
+   return $name, $id;
+}
+
+
+sub pingback {
+   my (%args) = @_;
+   my @required_args = qw(url instances);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg arugment" unless $args{$arg};
+   }
+   my $url       = $args{url};
+   my $instances = $args{instances};
+
+   my $ua = $args{ua} || HTTPMicro->new( timeout => 3 );
+
+   my $response = $ua->request('GET', $url);
+   PTDEBUG && _d('Server response:', Dumper($response));
+   die "No response from GET $url"
+      if !$response;
+   die("GET on $url returned HTTP status $response->{status}; expected 200\n",
+       ($response->{content} || '')) if $response->{status} != 200;
+   die("GET on $url did not return any programs to check")
+      if !$response->{content};
+
+   my $items = parse_server_response(
+      response => $response->{content}
+   );
+   die "Failed to parse server requested programs: $response->{content}"
+      if !scalar keys %$items;
+      
+   my $versions = get_versions(
+      items     => $items,
+      instances => $instances,
+   );
+   die "Failed to get any program versions; should have at least gotten Perl"
+      if !scalar keys %$versions;
+
+   my $client_content = encode_client_response(
+      items      => $items,
+      versions   => $versions,
+      general_id => md5_hex( hostname() ),
+   );
+
+   my $client_response = {
+      headers => { "X-Percona-Toolkit-Tool" => File::Basename::basename($0) },
+      content => $client_content,
+   };
+   PTDEBUG && _d('Client response:', Dumper($client_response));
+
+   $response = $ua->request('POST', $url, $client_response);
+   PTDEBUG && _d('Server suggestions:', Dumper($response));
+   die "No response from POST $url $client_response"
+      if !$response;
+   die "POST $url returned HTTP status $response->{status}; expected 200"
+      if $response->{status} != 200;
+
+   return unless $response->{content};
+
+   $items = parse_server_response(
+      response   => $response->{content},
+      split_vars => 0,
+   );
+   die "Failed to parse server suggestions: $response->{content}"
+      if !scalar keys %$items;
+   my @suggestions = map { $_->{vars} }
+                     sort { $a->{item} cmp $b->{item} }
+                     values %$items;
+
+   return \@suggestions;
+}
+
+sub encode_client_response {
+   my (%args) = @_;
+   my @required_args = qw(items versions general_id);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg arugment" unless $args{$arg};
+   }
+   my ($items, $versions, $general_id) = @args{@required_args};
+
+   my @lines;
+   foreach my $item ( sort keys %$items ) {
+      next unless exists $versions->{$item};
+      if ( ref($versions->{$item}) eq 'HASH' ) {
+         my $mysql_versions = $versions->{$item};
+         for my $id ( sort keys %$mysql_versions ) {
+            push @lines, join(';', $id, $item, $mysql_versions->{$id});
+         }
+      }
+      else {
+         push @lines, join(';', $general_id, $item, $versions->{$item});
+      }
+   }
+
+   my $client_response = join("\n", @lines) . "\n";
+   return $client_response;
+}
+
+sub parse_server_response {
+   my (%args) = @_;
+   my @required_args = qw(response);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg arugment" unless $args{$arg};
+   }
+   my ($response) = @args{@required_args};
+
+   my %items = map {
+      my ($item, $type, $vars) = split(";", $_);
+      if ( !defined $args{split_vars} || $args{split_vars} ) {
+         $vars = [ split(",", ($vars || '')) ];
+      }
+      $item => {
+         item => $item,
+         type => $type,
+         vars => $vars,
+      };
+   } split("\n", $response);
+
+   PTDEBUG && _d('Items:', Dumper(\%items));
+
+   return \%items;
+}
+
+my %sub_for_type = (
+   os_version          => \&get_os_version,
+   perl_version        => \&get_perl_version,
+   perl_module_version => \&get_perl_module_version,
+   mysql_variable      => \&get_mysql_variable,
+);
+
+sub valid_item {
+   my ($item) = @_;
+   return unless $item;
+   if ( !exists $sub_for_type{ $item->{type} } ) {
+      PTDEBUG && _d('Invalid type:', $item->{type});
+      return 0;
+   }
+   return 1;
+}
+
+sub get_versions {
+   my (%args) = @_;
+   my @required_args = qw(items);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg arugment" unless $args{$arg};
+   }
+   my ($items) = @args{@required_args};
+
+   my %versions;
+   foreach my $item ( values %$items ) {
+      next unless valid_item($item);
+      eval {
+         my $version = $sub_for_type{ $item->{type} }->(
+            item      => $item,
+            instances => $args{instances},
+         );
+         if ( $version ) {
+            chomp $version unless ref($version);
+            $versions{$item->{item}} = $version;
+         }
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error getting version for', Dumper($item), $EVAL_ERROR);
+      }
+   }
+
+   return \%versions;
+}
+
+
+sub get_os_version {
+   if ( $OSNAME eq 'MSWin32' ) {
+      require Win32;
+      return Win32::GetOSDisplayName();
+   }
+
+  chomp(my $platform = `uname -s`);
+  PTDEBUG && _d('platform:', $platform);
+  return $OSNAME unless $platform;
+
+   chomp(my $lsb_release
+            = `which lsb_release 2>/dev/null | awk '{print \$1}'` || '');
+   PTDEBUG && _d('lsb_release:', $lsb_release);
+
+   my $release = "";
+
+   if ( $platform eq 'Linux' ) {
+      if ( -f "/etc/fedora-release" ) {
+         $release = `cat /etc/fedora-release`;
+      }
+      elsif ( -f "/etc/redhat-release" ) {
+         $release = `cat /etc/redhat-release`;
+      }
+      elsif ( -f "/etc/system-release" ) {
+         $release = `cat /etc/system-release`;
+      }
+      elsif ( $lsb_release ) {
+         $release = `$lsb_release -ds`;
+      }
+      elsif ( -f "/etc/lsb-release" ) {
+         $release = `grep DISTRIB_DESCRIPTION /etc/lsb-release`;
+         $release =~ s/^\w+="([^"]+)".+/$1/;
+      }
+      elsif ( -f "/etc/debian_version" ) {
+         chomp(my $rel = `cat /etc/debian_version`);
+         $release = "Debian $rel";
+         if ( -f "/etc/apt/sources.list" ) {
+             chomp(my $code_name = `awk '/^deb/ {print \$3}' /etc/apt/sources.list | awk -F/ '{print \$1}'| awk 'BEGIN {FS="|"} {print \$1}' | sort | uniq -c | sort -rn | head -n1 | awk '{print \$2}'`);
+             $release .= " ($code_name)" if $code_name;
+         }
+      }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
+      elsif ( `ls /etc/*release 2>/dev/null` ) {
+         if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
+            $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
+         }
+         else {
+            $release = `cat /etc/*release | head -n1`;
+         }
+      }
+   }
+   elsif ( $platform =~ m/(?:BSD|^Darwin)$/ ) {
+      my $rel = `uname -r`;
+      $release = "$platform $rel";
+   }
+   elsif ( $platform eq "SunOS" ) {
+      my $rel = `head -n1 /etc/release` || `uname -r`;
+      $release = "$platform $rel";
+   }
+
+   if ( !$release ) {
+      PTDEBUG && _d('Failed to get the release, using platform');
+      $release = $platform;
+   }
+   chomp($release);
+
+   $release =~ s/^"|"$//g;
+
+   PTDEBUG && _d('OS version =', $release);
+   return $release;
+}
+
+sub get_perl_version {
+   my (%args) = @_;
+   my $item = $args{item};
+   return unless $item;
+
+   my $version = sprintf '%vd', $PERL_VERSION;
+   PTDEBUG && _d('Perl version', $version);
+   return $version;
+}
+
+sub get_perl_module_version {
+   my (%args) = @_;
+   my $item = $args{item};
+   return unless $item;
+
+   my $var     = '$' . $item->{item} . '::VERSION';
+   my $version = eval "use $item->{item}; $var;";
+   PTDEBUG && _d('Perl version for', $var, '=', $version);
+   return $version;
+}
+
+sub get_mysql_variable {
+   return get_from_mysql(
+      show => 'VARIABLES',
+      @_,
+   );
+}
+
+sub get_from_mysql {
+   my (%args) = @_;
+   my $show      = $args{show};
+   my $item      = $args{item};
+   my $instances = $args{instances};
+   return unless $show && $item;
+
+   if ( !$instances || !@$instances ) {
+      PTDEBUG && _d('Cannot check', $item,
+         'because there are no MySQL instances');
+      return;
+   }
+
+   if ($item->{item} eq 'MySQL' && $item->{type} eq 'mysql_variable') {
+       $item->{vars} = ['version_comment', 'version'];
+   }
+
+   my @versions;
+   my %version_for;
+   foreach my $instance ( @$instances ) {
+      next unless $instance->{id};  # special system instance has id=0
+      my $dbh = $instance->{dbh};
+      local $dbh->{FetchHashKeyName} = 'NAME_lc';
+      my $sql = qq/SHOW $show/;
+      PTDEBUG && _d($sql);
+      my $rows = $dbh->selectall_hashref($sql, 'variable_name');
+
+      my @versions;
+      foreach my $var ( @{$item->{vars}} ) {
+         $var = lc($var);
+         my $version = $rows->{$var}->{value};
+         PTDEBUG && _d('MySQL version for', $item->{item}, '=', $version,
+            'on', $instance->{name});
+         push @versions, $version;
+      }
+      $version_for{ $instance->{id} } = join(' ', @versions);
+   }
+
+   return \%version_for;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End VersionCheck package
+# ###########################################################################
+
+#
+# parse_connection_options() subroutine parses connection-related command line
+# options
+#
+sub parse_connection_options {
+    my $con = shift;
+
+    $con->{dsn} = 'dbi:mysql:';
+
+    # this option has to be first
+    if ($ENV{option_defaults_file}) {
+        $con->{dsn} .= ";mysql_read_default_file=$ENV{option_defaults_file}";
+    }
+
+    if ($ENV{option_defaults_extra_file}) {
+        $con->{dsn} .= ";mysql_read_default_file=$ENV{option_defaults_extra_file}";
+    }
+
+    $con->{dsn} .= ";mysql_read_default_group=xtrabackup";
+
+    if ($ENV{option_mysql_password}) {
+        $con->{dsn_password} = "$ENV{option_mysql_password}";
+    }
+    if ($ENV{option_mysql_user}) {
+        $con->{dsn_user} = "$ENV{option_mysql_user}";
+    }
+    if ($ENV{option_mysql_host}) {
+        $con->{dsn} .= ";host=$ENV{option_mysql_host}";
+    }
+    if ($ENV{option_mysql_port}) {
+        $con->{dsn} .= ";port=$ENV{option_mysql_port}";
+    }
+    if ($ENV{option_mysql_socket}) {
+        $con->{dsn} .= ";mysql_socket=$ENV{option_mysql_socket}";
+    }
+}
+
+#
+# mysql_connect subroutine connects to MySQL server
+#
+sub mysql_connect {
+    my %con;
+    my %args = (
+                  # Defaults
+                  abort_on_error => 1,
+                  @_
+               );
+
+    $con{abort_on_error} = $args{abort_on_error};
+
+    parse_connection_options(\%con);
+
+    $now = current_time();
+    print STDERR "$now  $prefix Connecting to MySQL server with DSN '$con{dsn}'" .
+        (defined($con{dsn_user}) ? " as '$con{dsn_user}' " : "") .
+        " (using password: ";
+    if (defined($con{dsn_password})) {
+        print STDERR "YES).\n";
+    } else {
+        print STDERR "NO).\n";
+    }
+
+    eval {
+        $con{dbh}=DBI->connect($con{dsn}, $con{dsn_user},
+                                 $con{dsn_password}, { RaiseError => 1 });
+    };
+
+    if ($EVAL_ERROR) {
+        $con{connect_error}=$EVAL_ERROR;
+    } else {
+        $now = current_time();
+        print STDERR "$now  $prefix Connected to MySQL server\n";
+    }
+
+    if ($args{abort_on_error}) {
+        if (!$dbd_mysql_installed) {
+            die "Failed to connect to MySQL server as " .
+                "DBD::mysql module is not installed";
+        } else {
+            if (!$con{dbh}) {
+                die "Failed to connect to MySQL server: " .
+                    $con{connect_error};
+            }
+        }
+    }
+
+    if ($con{dbh}) {
+        $con{dbh}->do("SET SESSION wait_timeout=2147483");
+    }
+
+    return %con;
+}
+
+#
+# return current local time as string in form "070816 12:23:15"
+#
+sub current_time {
+    return strftime("%y%m%d %H:%M:%S", localtime());
+}
+
+
+%mysql = mysql_connect(abort_on_error => 1);
+
+$now = current_time();
+print STDERR
+    "$now  $prefix Executing a version check against the server...\n";
+
+# Redirect STDOUT to STDERR, as VersionCheck prints alerts to STDOUT
+select STDERR;
+
+VersionCheck::version_check(
+                            force => 1,
+                            instances => [ {
+                                            dbh => $mysql{dbh},
+                                            dsn => $mysql{dsn}
+                                           }
+                                         ]
+                            );
+# Restore STDOUT as the default filehandle
+select STDOUT;
+
+$now = current_time();
+print STDERR "$now  $prefix Done.\n";
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/write_filt.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/write_filt.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/write_filt.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/write_filt.cc	2017-02-27 07:47:02.000000000 +0000
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/write_filt.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/write_filt.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/write_filt.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/write_filt.h	2017-02-27 07:47:02.000000000 +0000
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/wsrep.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/wsrep.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/wsrep.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/wsrep.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,219 @@
+/******************************************************
+Percona XtraBackup: hot backup tool for InnoDB
+(c) 2009-2014 Percona LLC and/or its affiliates
+Originally Created 3/3/2009 Yasufumi Kinoshita
+Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
+Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
+
+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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+*******************************************************
+
+This file incorporates work covered by the following copyright and
+permission notice:
+
+   Copyright 2010 Codership Oy <http://www.codership.com>
+
+   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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+*******************************************************/
+
+#include <mysql_version.h>
+#include <my_base.h>
+#include <handler.h>
+#include <trx0sys.h>
+
+#include "common.h"
+
+#define WSREP_XID_PREFIX "WSREPXid"
+#define WSREP_XID_PREFIX_LEN MYSQL_XID_PREFIX_LEN
+#define WSREP_XID_UUID_OFFSET 8
+#define WSREP_XID_SEQNO_OFFSET (WSREP_XID_UUID_OFFSET + sizeof(wsrep_uuid_t))
+#define WSREP_XID_GTRID_LEN (WSREP_XID_SEQNO_OFFSET + sizeof(wsrep_seqno_t))
+
+/*! undefined seqno */
+#define WSREP_SEQNO_UNDEFINED (-1)
+
+/*! Name of file where Galera info is stored on recovery */
+#define XB_GALERA_INFO_FILENAME "xtrabackup_galera_info"
+
+/* Galera UUID type - for all unique IDs */
+typedef struct wsrep_uuid {
+    uint8_t data[16];
+} wsrep_uuid_t;
+
+/* sequence number of a writeset, etc. */
+typedef int64_t  wsrep_seqno_t;
+
+/* Undefined UUID */
+static const wsrep_uuid_t WSREP_UUID_UNDEFINED = {{0,}};
+
+/***********************************************************************//**
+Check if a given WSREP XID is valid.
+
+@return true if valid.
+*/
+static
+bool
+wsrep_is_wsrep_xid(
+/*===============*/
+	const void*	xid_ptr)
+{
+	const XID*	xid = reinterpret_cast<const XID*>(xid_ptr);
+
+	return((xid->formatID      == 1                   &&
+		xid->gtrid_length  == WSREP_XID_GTRID_LEN &&
+		xid->bqual_length  == 0                   &&
+		!memcmp(xid->data, WSREP_XID_PREFIX, WSREP_XID_PREFIX_LEN)));
+}
+
+/***********************************************************************//**
+Retrieve binary WSREP UUID from XID.
+
+@return binary WSREP UUID represenataion, if UUID is valid, or
+	WSREP_UUID_UNDEFINED otherwise.
+*/
+static
+const wsrep_uuid_t*
+wsrep_xid_uuid(
+/*===========*/
+	const XID*	xid)
+{
+	if (wsrep_is_wsrep_xid(xid)) {
+		return(reinterpret_cast<const wsrep_uuid_t*>
+		       (xid->data + WSREP_XID_UUID_OFFSET));
+	} else {
+		return(&WSREP_UUID_UNDEFINED);
+	}
+}
+
+/***********************************************************************//**
+Retrieve WSREP seqno from XID.
+
+@return WSREP seqno, if it is valid, or WSREP_SEQNO_UNDEFINED otherwise.
+*/
+wsrep_seqno_t wsrep_xid_seqno(
+/*==========================*/
+	const XID*	xid)
+{
+	if (wsrep_is_wsrep_xid(xid)) {
+		wsrep_seqno_t seqno;
+		memcpy(&seqno, xid->data + WSREP_XID_SEQNO_OFFSET,
+		       sizeof(wsrep_seqno_t));
+
+		return(seqno);
+	} else {
+		return(WSREP_SEQNO_UNDEFINED);
+	}
+}
+
+/***********************************************************************//**
+Write UUID to string.
+
+@return length of UUID string representation or -EMSGSIZE if string is too
+short.
+*/
+static
+int
+wsrep_uuid_print(
+/*=============*/
+	const wsrep_uuid_t*	uuid,
+	char*			str,
+	size_t			str_len)
+{
+	if (str_len > 36) {
+		const unsigned char* u = uuid->data;
+		return snprintf(str, str_len,
+				"%02x%02x%02x%02x-%02x%02x-%02x%02x-"
+				"%02x%02x-%02x%02x%02x%02x%02x%02x",
+				u[ 0], u[ 1], u[ 2], u[ 3], u[ 4], u[ 5], u[ 6],
+				u[ 7], u[ 8], u[ 9], u[10], u[11], u[12], u[13],
+				u[14], u[15]);
+	}
+	else {
+		return -EMSGSIZE;
+	}
+}
+
+/***********************************************************************
+Store Galera checkpoint info in the 'xtrabackup_galera_info' file, if that
+information is present in the trx system header. Otherwise, do nothing. */
+void
+xb_write_galera_info(bool incremental_prepare)
+/*==================*/
+{
+	FILE*		fp;
+	XID		xid;
+	char		uuid_str[40];
+	wsrep_seqno_t	seqno;
+	MY_STAT		statinfo;
+
+	/* Do not overwrite existing an existing file to be compatible with
+	servers with older server versions */
+	if (!incremental_prepare &&
+		my_stat(XB_GALERA_INFO_FILENAME, &statinfo, MYF(0)) != NULL) {
+
+		return;
+	}
+
+	memset(&xid, 0, sizeof(xid));
+	xid.formatID = -1;
+
+	if (!trx_sys_read_wsrep_checkpoint(&xid)) {
+
+		return;
+	}
+
+	if (wsrep_uuid_print(wsrep_xid_uuid(&xid), uuid_str,
+			     sizeof(uuid_str)) < 0) {
+		return;
+	}
+
+	fp = fopen(XB_GALERA_INFO_FILENAME, "w");
+	if (fp == NULL) {
+
+		msg("xtrabackup: error: "
+		    "could not create " XB_GALERA_INFO_FILENAME
+		    ", errno = %d\n",
+		    errno);
+		exit(EXIT_FAILURE);
+	}
+
+	seqno = wsrep_xid_seqno(&xid);
+
+	msg("xtrabackup: Recovered WSREP position: %s:%lld\n",
+	    uuid_str, (long long) seqno);
+
+	if (fprintf(fp, "%s:%lld", uuid_str, (long long) seqno) < 0) {
+
+		msg("xtrabackup: error: "
+		    "could not write to " XB_GALERA_INFO_FILENAME
+		    ", errno = %d\n",
+		    errno);
+		exit(EXIT_FAILURE);
+	}
+
+	fclose(fp);
+}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/wsrep.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/wsrep.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/wsrep.h	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/wsrep.h	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,32 @@
+/******************************************************
+Percona XtraBackup: hot backup tool for InnoDB
+(c) 2009-2014 Percona LLC and/or its affiliates
+Originally Created 3/3/2009 Yasufumi Kinoshita
+Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
+Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
+
+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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+*******************************************************/
+
+#ifndef WSREP_H
+#define WSREP_H
+
+/***********************************************************************
+Store Galera checkpoint info in the 'xtrabackup_galera_info' file, if that
+information is present in the trx system header. Otherwise, do nothing. */
+void
+xb_write_galera_info(bool incremental_prepare);
+/*==================*/
+
+#endif
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcloud.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcloud.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcloud.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcloud.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,2721 @@
+/******************************************************
+Copyright (c) 2014 Percona LLC and/or its affiliates.
+
+The xbstream utility: serialize/deserialize files in the XBSTREAM format.
+
+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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+*******************************************************/
+
+#include <my_global.h>
+#include <my_default.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <curl/curl.h>
+#include <ev.h>
+#include <unistd.h>
+#include <errno.h>
+#include <gcrypt.h>
+#include <assert.h>
+#include <my_sys.h>
+#include <my_dir.h>
+#include <my_getopt.h>
+#include <algorithm>
+#include <map>
+#include <string>
+#include <jsmn.h>
+#include "xbstream.h"
+
+using std::min;
+using std::max;
+using std::map;
+using std::string;
+
+#define XBCLOUD_VERSION "1.0"
+
+#define SWIFT_MAX_URL_SIZE 8192
+#define SWIFT_MAX_HDR_SIZE 8192
+
+#define SWIFT_CHUNK_SIZE 11 * 1024 * 1024
+
+#if ((LIBCURL_VERSION_MAJOR >= 7) && (LIBCURL_VERSION_MINOR >= 16))
+#define OLD_CURL_MULTI 0
+#else
+#define OLD_CURL_MULTI 1
+#endif
+
+/*****************************************************************************/
+
+typedef struct swift_auth_info_struct swift_auth_info;
+typedef struct connection_info_struct connection_info;
+typedef struct socket_info_struct socket_info;
+typedef struct global_io_info_struct global_io_info;
+typedef struct slo_chunk_struct slo_chunk;
+typedef struct container_list_struct container_list;
+typedef struct object_info_struct object_info;
+
+struct swift_auth_info_struct {
+	char url[SWIFT_MAX_URL_SIZE];
+	char token[SWIFT_MAX_HDR_SIZE];
+};
+
+struct global_io_info_struct {
+	struct ev_loop *loop;
+	struct ev_io input_event;
+	struct ev_timer timer_event;
+	CURLM *multi;
+	int still_running;
+	int eof;
+	curl_socket_t input_fd;
+	connection_info **connections;
+	long chunk_no;
+	connection_info *current_connection;
+	const char *url;
+	const char *container;
+	const char *token;
+	const char *backup_name;
+};
+
+struct socket_info_struct {
+	curl_socket_t sockfd;
+	CURL *easy;
+	int action;
+	long timeout;
+	struct ev_io ev;
+	int evset;
+	global_io_info *global;
+};
+
+struct connection_info_struct {
+	CURL *easy;
+	global_io_info *global;
+	char *buffer;
+	size_t buffer_size;
+	size_t filled_size;
+	size_t upload_size;
+	bool chunk_uploaded;
+	bool chunk_acked;
+	char error[CURL_ERROR_SIZE];
+	struct curl_slist *slist;
+	char *name;
+	size_t name_len;
+	char hash[33];
+	size_t chunk_no;
+	bool magic_verified;
+	size_t chunk_path_len;
+	xb_chunk_type_t chunk_type;
+	size_t payload_size;
+	size_t chunk_size;
+	int retry_count;
+	bool upload_started;
+	ulong global_idx;
+};
+
+struct slo_chunk_struct {
+	char name[SWIFT_MAX_URL_SIZE];
+	char md5[33];
+	int idx;
+	size_t size;
+};
+
+struct object_info_struct {
+	char hash[33];
+	char name[SWIFT_MAX_URL_SIZE];
+	size_t bytes;
+};
+
+struct container_list_struct {
+	size_t content_length;
+	size_t content_bufsize;
+	char *content_json;
+	size_t object_count;
+	size_t idx;
+	object_info *objects;
+	bool final;
+};
+
+enum {SWIFT, S3};
+const char *storage_names[] =
+{ "SWIFT", "S3", NullS};
+
+static my_bool opt_verbose = 0;
+static ulong opt_storage = SWIFT;
+static const char *opt_swift_user = NULL; 
+static const char *opt_swift_user_id = NULL; 
+static const char *opt_swift_password = NULL; 
+static const char *opt_swift_tenant = NULL; 
+static const char *opt_swift_tenant_id = NULL; 
+static const char *opt_swift_project = NULL; 
+static const char *opt_swift_project_id = NULL; 
+static const char *opt_swift_domain = NULL; 
+static const char *opt_swift_domain_id = NULL; 
+static const char *opt_swift_region = NULL; 
+static const char *opt_swift_container = NULL;
+static const char *opt_swift_storage_url = NULL;
+static const char *opt_swift_auth_url = NULL;
+static const char *opt_swift_key = NULL;
+static const char *opt_swift_auth_version = NULL;
+static const char *opt_name = NULL;
+static const char *opt_cacert = NULL;
+static ulong opt_parallel = 1;
+static my_bool opt_insecure = 0;
+static enum {MODE_GET, MODE_PUT, MODE_DELETE} opt_mode;
+
+static char **file_list = NULL;
+static int file_list_size = 0;
+
+TYPELIB storage_typelib =
+{array_elements(storage_names)-1, "", storage_names, NULL};
+
+enum {
+	OPT_STORAGE = 256,
+	OPT_SWIFT_CONTAINER,
+	OPT_SWIFT_AUTH_URL,
+	OPT_SWIFT_KEY,
+	OPT_SWIFT_USER,
+	OPT_SWIFT_USER_ID,
+	OPT_SWIFT_PASSWORD,
+	OPT_SWIFT_TENANT,
+	OPT_SWIFT_TENANT_ID,
+	OPT_SWIFT_PROJECT,
+	OPT_SWIFT_PROJECT_ID,
+	OPT_SWIFT_DOMAIN,
+	OPT_SWIFT_DOMAIN_ID,
+	OPT_SWIFT_REGION,
+	OPT_SWIFT_STORAGE_URL,
+	OPT_SWIFT_AUTH_VERSION,
+	OPT_PARALLEL,
+	OPT_CACERT,
+	OPT_INSECURE,
+	OPT_VERBOSE
+};
+
+
+static struct my_option my_long_options[] =
+{
+	{"help", '?', "Display this help and exit.",
+	 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"storage", OPT_STORAGE, "Specify storage type S3/SWIFT.",
+	 &opt_storage, &opt_storage, &storage_typelib,
+	 GET_ENUM, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+	{"swift-auth-version", OPT_SWIFT_AUTH_VERSION,
+	 "Swift authentication verison to use.",
+	 &opt_swift_auth_version, &opt_swift_auth_version, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-container", OPT_SWIFT_CONTAINER,
+	 "Swift container to store backups into.",
+	 &opt_swift_container, &opt_swift_container, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-user", OPT_SWIFT_USER,
+	 "Swift user name.",
+	 &opt_swift_user, &opt_swift_user, 0, GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-user-id", OPT_SWIFT_USER_ID,
+	 "Swift user ID.",
+	 &opt_swift_user_id, &opt_swift_user_id, 0, GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-auth-url", OPT_SWIFT_AUTH_URL,
+	 "Base URL of SWIFT authentication service.",
+	 &opt_swift_auth_url, &opt_swift_auth_url, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-storage-url", OPT_SWIFT_STORAGE_URL,
+	 "URL of object-store endpoint. Usually received from authentication "
+	 "service. Specify to override this value.",
+	 &opt_swift_storage_url, &opt_swift_storage_url, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-key", OPT_SWIFT_KEY,
+	 "Swift key.",
+	 &opt_swift_key, &opt_swift_key, 0, GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-tenant", OPT_SWIFT_TENANT,
+	 "The tenant name. Both the --swift-tenant and --swift-tenant-id "
+	 "options are optional, but should not be specified together.",
+	 &opt_swift_tenant, &opt_swift_tenant, 0, GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-tenant-id", OPT_SWIFT_TENANT_ID,
+	 "The tenant ID. Both the --swift-tenant and --swift-tenant-id "
+	 "options are optional, but should not be specified together.",
+	 &opt_swift_tenant_id, &opt_swift_tenant_id, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-project", OPT_SWIFT_PROJECT,
+	 "The project name.",
+	 &opt_swift_project, &opt_swift_project, 0, GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-project-id", OPT_SWIFT_PROJECT_ID,
+	 "The project ID.",
+	 &opt_swift_project_id, &opt_swift_project_id, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-domain", OPT_SWIFT_DOMAIN,
+	 "The domain name.",
+	 &opt_swift_domain, &opt_swift_domain, 0, GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-domain-id", OPT_SWIFT_DOMAIN_ID,
+	 "The domain ID.",
+	 &opt_swift_domain_id, &opt_swift_domain_id, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-password", OPT_SWIFT_PASSWORD,
+	 "The password of the user.",
+	 &opt_swift_password, &opt_swift_password, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"swift-region", OPT_SWIFT_REGION,
+	 "The region object-store endpoint.",
+	 &opt_swift_region, &opt_swift_region, 0,
+	 GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"parallel", OPT_PARALLEL,
+	 "Number of parallel chunk uploads.",
+	 &opt_parallel, &opt_parallel, 0, GET_ULONG, REQUIRED_ARG,
+	 1, 0, 0, 0, 0, 0},
+
+	{"cacert", OPT_CACERT,
+	 "CA certificate file.",
+	 &opt_cacert, &opt_cacert, 0, GET_STR_ALLOC, REQUIRED_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"insecure", OPT_INSECURE,
+	 "Do not verify server SSL certificate.",
+	 &opt_insecure, &opt_insecure, 0, GET_BOOL, NO_ARG,
+	 0, 0, 0, 0, 0, 0},
+
+	{"verbose", OPT_VERBOSE,
+	 "Turn ON cURL tracing.",
+	 &opt_verbose, &opt_verbose, 0, GET_BOOL, 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}
+};
+
+/* The values of these arguments should be masked
+   on the command line */
+static const char * const masked_args[] = {
+        "--swift-password",
+        "--swift-key",
+        "--swift-auth-url",
+        "--swift-storage-url",
+        "--swift-container",
+        "--swift-user",
+        "--swift-tenant",
+        "--swift-user-id",
+        "--swift-tenant-id",
+        0
+};
+
+static map<string, ulonglong> file_chunk_count;
+
+static
+void
+print_version()
+{
+	printf("%s  Ver %s for %s (%s)\n", my_progname, XBCLOUD_VERSION,
+	       SYSTEM_TYPE, MACHINE_TYPE);
+}
+
+static
+void
+usage()
+{
+	print_version();
+	puts("Copyright (C) 2015 Percona LLC and/or its affiliates.");
+	puts("This software comes with ABSOLUTELY NO WARRANTY. "
+	     "This is free software,\nand you are welcome to modify and "
+	     "redistribute it under the GPL license.\n");
+
+	puts("Manage backups on Cloud services.\n");
+
+	puts("Usage: ");
+	printf("  %s -c put [OPTIONS...] <NAME> upload backup from STDIN into "
+	       "the cloud service with given name.\n", my_progname);
+	printf("  %s -c get [OPTIONS...] <NAME> [FILES...] stream specified "
+	       "backup or individual files from cloud service into STDOUT.\n",
+	       my_progname);
+
+	puts("\nOptions:");
+	my_print_help(my_long_options);
+}
+
+static
+my_bool
+get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
+	       char *argument __attribute__((unused)))
+{
+	switch (optid) {
+	case '?':
+		usage();
+		exit(0);
+	}
+
+	return(FALSE);
+}
+
+static const char *load_default_groups[]=
+	{ "xbcloud", 0 };
+
+/*********************************************************************//**
+mask sensitive values on the command line */
+static
+void
+mask_args(int argc, char **argv)
+{
+        int i;
+        for (i = 0; i < argc-1; i++) {
+                int j = 0;
+                if (argv[i]) while (masked_args[j]) {
+                        char *p;
+                        if ((p = strstr(argv[i], masked_args[j]))) {
+                                p += strlen(masked_args[j]);
+                                while (*p && *p != '=') {
+                                        p++;
+                                }
+                                if (*p == '=') {
+                                        p++;
+                                        while (*p) {
+                                                *p++ = 'x';
+                                        }
+                                }
+                        }
+                        j++;
+                }
+        }
+}
+
+static
+int parse_args(int argc, char **argv)
+{
+	const char *command;
+
+	if (argc < 2) {
+		fprintf(stderr, "Command isn't specified. "
+			"Supported commands are put and get\n");
+		usage();
+		exit(EXIT_FAILURE);
+	}
+
+	command = argv[1];
+	argc--; argv++;
+
+	if (strcasecmp(command, "put") == 0) {
+		opt_mode = MODE_PUT;
+	} else if (strcasecmp(command, "get") == 0) {
+		opt_mode = MODE_GET;
+	} else if (strcasecmp(command, "delete") == 0) {
+		opt_mode = MODE_DELETE;
+	} else {
+		fprintf(stderr, "Unknown command %s. "
+			"Supported commands are put and get\n", command);
+		usage();
+		exit(EXIT_FAILURE);
+	}
+
+	if (load_defaults("my", load_default_groups, &argc, &argv)) {
+		exit(EXIT_FAILURE);
+	}
+
+	if (handle_options(&argc, &argv, my_long_options, get_one_option)) {
+		exit(EXIT_FAILURE);
+	}
+
+	/* make sure name is specified */
+	if (argc < 1) {
+		fprintf(stderr, "Backup name is required argument\n");
+		exit(EXIT_FAILURE);
+	}
+	opt_name = argv[0];
+	argc--; argv++;
+
+	/* validate arguments */
+	if (opt_storage == SWIFT) {
+		if (opt_swift_user == NULL) {
+			fprintf(stderr, "Swift user is not specified\n");
+			exit(EXIT_FAILURE);
+		}
+		if (opt_swift_container == NULL) {
+			fprintf(stderr,
+				"Swift container is not specified\n");
+			exit(EXIT_FAILURE);
+		}
+		if (opt_swift_auth_url == NULL) {
+			fprintf(stderr, "Swift auth URL is not specified\n");
+			exit(EXIT_FAILURE);
+		}
+	} else {
+		fprintf(stderr, "Swift is only supported storage API\n");
+	}
+
+	if (argc > 0) {
+		file_list = argv;
+		file_list_size = argc;
+	}
+
+	return(0);
+}
+
+static char *hex_md5(const unsigned char *hash, char *out)
+{
+	enum { hash_len = 16 };
+	char *p;
+	int i;
+
+	for (i = 0, p = out; i < hash_len; i++, p+=2) {
+		sprintf(p, "%02x", hash[i]);
+	}
+
+	return out;
+}
+
+/* If header starts with prefix it's value will be copied into output buffer */
+static
+int get_http_header(const char *prefix, const char *buffer,
+		    char *out, size_t out_size)
+{
+	const char *beg, *end;
+	size_t len, prefix_len;
+
+	prefix_len = strlen(prefix);
+
+	if (strncasecmp(buffer, prefix, prefix_len) == 0) {
+		beg = buffer + prefix_len;
+		end = strchr(beg, '\r');
+
+		len = min<size_t>(end - beg, out_size - 1);
+
+		strncpy(out, beg, len);
+
+		out[len] = 0;
+
+		return 1;
+	}
+
+	return 0;
+}
+
+static
+size_t swift_auth_header_read_cb(char *ptr, size_t size, size_t nmemb,
+				 void *data)
+{
+	swift_auth_info *info = (swift_auth_info*)(data);
+
+	get_http_header("X-Storage-Url: ", ptr,
+			info->url, array_elements(info->url));
+	get_http_header("X-Auth-Token: ", ptr,
+			info->token, array_elements(info->token));
+
+	return nmemb * size;
+}
+
+/*********************************************************************//**
+Authenticate against Swift TempAuth. Fills swift_auth_info struct.
+Uses creadentials privided as global variables.
+@returns true if access is granted and token received. */
+static
+bool
+swift_temp_auth(const char *auth_url, swift_auth_info *info)
+{
+	CURL *curl;
+	CURLcode res;
+	long http_code;
+	char *hdr_buf = NULL;
+	struct curl_slist *slist = NULL;
+
+	if (opt_swift_user == NULL) {
+		fprintf(stderr, "Swift user must be specified for TempAuth.\n");
+		return(false);
+	}
+
+	if (opt_swift_key == NULL) {
+		fprintf(stderr, "Swift key must be specified for TempAuth.\n");
+		return(false);
+	}
+
+	curl = curl_easy_init();
+
+	if (curl != NULL) {
+
+		hdr_buf = (char *)(calloc(14 + max(strlen(opt_swift_user),
+						   strlen(opt_swift_key)), 1));
+
+		if (!hdr_buf) {
+			res = CURLE_FAILED_INIT;
+			goto cleanup;
+		}
+
+		sprintf(hdr_buf, "X-Auth-User: %s", opt_swift_user);
+		slist = curl_slist_append(slist, hdr_buf);
+
+		sprintf(hdr_buf, "X-Auth-Key: %s", opt_swift_key);
+		slist = curl_slist_append(slist, hdr_buf);
+
+		curl_easy_setopt(curl, CURLOPT_VERBOSE, opt_verbose);
+		curl_easy_setopt(curl, CURLOPT_URL, auth_url);
+		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+		curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION,
+				 swift_auth_header_read_cb);
+		curl_easy_setopt(curl, CURLOPT_HEADERDATA, info);
+		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+		if (opt_cacert != NULL)
+			curl_easy_setopt(curl, CURLOPT_CAINFO, opt_cacert);
+		if (opt_insecure)
+			curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+
+		res = curl_easy_perform(curl);
+
+		if (res != CURLE_OK) {
+			fprintf(stderr, "error: authentication failed: "
+				"curl_easy_perform(): %s\n",
+				curl_easy_strerror(res));
+			goto cleanup;
+		}
+		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+		if (http_code != 200 &&
+		    http_code != 204) {
+			fprintf(stderr, "error: authentication failed "
+				"with response code: %ld\n", http_code);
+			res = CURLE_LOGIN_DENIED;
+			goto cleanup;
+		}
+	} else {
+		res = CURLE_FAILED_INIT;
+		fprintf(stderr, "error: curl_easy_init() failed\n");
+		goto cleanup;
+	}
+
+cleanup:
+	if (hdr_buf) {
+		free(hdr_buf);
+	}
+	if (slist) {
+		curl_slist_free_all(slist);
+	}
+	if (curl) {
+		curl_easy_cleanup(curl);
+	}
+
+	if (res == CURLE_OK) {
+		/* check that we received token and storage URL */
+		if (*info->url == 0) {
+			fprintf(stderr, "error: malformed response: "
+					"X-Storage-Url is missing\n");
+			return(false);
+		}
+		if (*info->token == 0) {
+			fprintf(stderr, "error: malformed response: "
+					"X-Auth-Token is missing\n");
+			return(false);
+		}
+		return(true);
+	}
+
+	return(false);
+}
+
+static
+size_t
+write_null_cb(char *buffer, size_t size, size_t nmemb, void *stream)
+{
+	return fwrite(buffer, size, nmemb, stderr);
+}
+
+
+static
+size_t
+read_null_cb(char *ptr, size_t size, size_t nmemb, void *data)
+{
+	return 0;
+}
+
+
+static
+int
+swift_create_container(swift_auth_info *info, const char *name)
+{
+	char url[SWIFT_MAX_URL_SIZE];
+	char auth_token[SWIFT_MAX_HDR_SIZE];
+	CURLcode res;
+	long http_code;
+	CURL *curl;
+	struct curl_slist *slist = NULL;
+
+	snprintf(url, array_elements(url), "%s/%s", info->url, name);
+	snprintf(auth_token, array_elements(auth_token), "X-Auth-Token: %s",
+		 info->token);
+
+	curl = curl_easy_init();
+
+	if (curl != NULL) {
+		slist = curl_slist_append(slist, auth_token);
+		slist = curl_slist_append(slist, "Content-Length: 0");
+
+		curl_easy_setopt(curl, CURLOPT_VERBOSE, opt_verbose);
+		curl_easy_setopt(curl, CURLOPT_URL, url);
+		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_null_cb);
+		curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_null_cb);
+		curl_easy_setopt(curl, CURLOPT_INFILESIZE, 0L);
+		curl_easy_setopt(curl, CURLOPT_PUT, 1L);
+		if (opt_cacert != NULL)
+			curl_easy_setopt(curl, CURLOPT_CAINFO, opt_cacert);
+		if (opt_insecure)
+			curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+
+		res = curl_easy_perform(curl);
+
+		if (res != CURLE_OK) {
+			fprintf(stderr,
+				"error: curl_easy_perform() failed: %s\n",
+				curl_easy_strerror(res));
+			goto cleanup;
+		}
+		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+		if (http_code != 201 && /* created */
+		    http_code != 202    /* accepted (already exists) */) {
+			fprintf(stderr, "error: request failed "
+				"with response code: %ld\n", http_code);
+			res = CURLE_LOGIN_DENIED;
+			goto cleanup;
+		}
+	} else {
+		res = CURLE_FAILED_INIT;
+		fprintf(stderr, "error: curl_easy_init() failed\n");
+		goto cleanup;
+	}
+
+cleanup:
+	if (slist) {
+		curl_slist_free_all(slist);
+	}
+	if (curl) {
+		curl_easy_cleanup(curl);
+	}
+
+	return res;
+}
+
+
+/*********************************************************************//**
+Delete object with given url.
+@returns true if object deleted successfully. */
+static
+bool
+swift_delete_object(swift_auth_info *info, const char *url)
+{
+	char auth_token[SWIFT_MAX_HDR_SIZE];
+	CURLcode res;
+	long http_code;
+	CURL *curl;
+	struct curl_slist *slist = NULL;
+	bool ret = false;
+
+	snprintf(auth_token, array_elements(auth_token), "X-Auth-Token: %s",
+		 info->token);
+
+	curl = curl_easy_init();
+
+	if (curl != NULL) {
+		slist = curl_slist_append(slist, auth_token);
+
+		curl_easy_setopt(curl, CURLOPT_VERBOSE, opt_verbose);
+		curl_easy_setopt(curl, CURLOPT_URL, url);
+		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+		curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		if (opt_cacert != NULL)
+			curl_easy_setopt(curl, CURLOPT_CAINFO, opt_cacert);
+		if (opt_insecure)
+			curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+
+		res = curl_easy_perform(curl);
+
+		if (res != CURLE_OK) {
+			fprintf(stderr,
+				"error: curl_easy_perform() failed: %s\n",
+				curl_easy_strerror(res));
+			goto cleanup;
+		}
+		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+		if (http_code != 200 && /* OK */
+		    http_code != 204    /* no content */) {
+			fprintf(stderr, "error: request failed "
+				"with response code: %ld\n", http_code);
+			goto cleanup;
+		}
+		ret = true;
+	} else {
+		fprintf(stderr, "error: curl_easy_init() failed\n");
+		goto cleanup;
+	}
+
+cleanup:
+	if (slist) {
+		curl_slist_free_all(slist);
+	}
+	if (curl) {
+		curl_easy_cleanup(curl);
+	}
+
+	return ret;
+}
+
+static int conn_upload_init(connection_info *conn);
+static void conn_buffer_updated(connection_info *conn);
+static connection_info *conn_new(global_io_info *global, ulong global_idx);
+static void conn_cleanup(connection_info *conn);
+static void conn_upload_retry(connection_info *conn);
+
+/* Check for completed transfers, and remove their easy handles */
+static void check_multi_info(global_io_info *g)
+{
+	char *eff_url;
+	CURLMsg *msg;
+	int msgs_left;
+	connection_info *conn;
+	CURL *easy;
+
+	while ((msg = curl_multi_info_read(g->multi, &msgs_left))) {
+		if (msg->msg == CURLMSG_DONE) {
+			easy = msg->easy_handle;
+			curl_easy_getinfo(easy, CURLINFO_PRIVATE, &conn);
+			curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL,
+					  &eff_url);
+			curl_multi_remove_handle(g->multi, easy);
+			curl_easy_cleanup(easy);
+			conn->easy = NULL;
+			if (conn->chunk_acked) {
+				conn->chunk_uploaded = true;
+				fprintf(stderr, "%s is done\n", conn->hash);
+			} else {
+				fprintf(stderr, "error: chunk %zu '%s' %s "
+					"is not uploaded, but socket closed "
+					"(%zu bytes of %zu left to upload)\n",
+					conn->chunk_no,
+					conn->name,
+					conn->hash,
+					conn->chunk_size - conn->upload_size,
+					conn->chunk_size);
+				conn_upload_retry(conn);
+			}
+		}
+	}
+}
+
+/* Die if we get a bad CURLMcode somewhere */ 
+static void mcode_or_die(const char *where, CURLMcode code)
+{
+	if (code != CURLM_OK)
+	{
+		const char *s;
+		switch (code)
+		{
+		case CURLM_BAD_HANDLE:
+			s = "CURLM_BAD_HANDLE";
+			break;
+		case CURLM_BAD_EASY_HANDLE:
+			s = "CURLM_BAD_EASY_HANDLE";
+			break;
+		case CURLM_OUT_OF_MEMORY:
+			s = "CURLM_OUT_OF_MEMORY";
+			break;
+		case CURLM_INTERNAL_ERROR:
+			s = "CURLM_INTERNAL_ERROR";
+			break;
+		case CURLM_UNKNOWN_OPTION:
+			s = "CURLM_UNKNOWN_OPTION";
+			break;
+		case CURLM_LAST:
+			s = "CURLM_LAST";
+			break;
+		default:
+			s = "CURLM_unknown";
+			break;
+		case CURLM_BAD_SOCKET:
+			s = "CURLM_BAD_SOCKET";
+			fprintf(stderr, "error: %s returns (%d) %s\n",
+				where, code, s);
+			/* ignore this error */
+			return;
+		}
+		fprintf(stderr, "error: %s returns (%d) %s\n",
+			where, code, s);
+		assert(0);
+	}
+}
+
+/* Called by libev when we get action on a multi socket */ 
+static void event_cb(EV_P_ struct ev_io *w, int revents)
+{
+	global_io_info *global = (global_io_info*)(w->data);
+	CURLMcode rc;
+
+#if !(OLD_CURL_MULTI)
+	int action = (revents & EV_READ  ? CURL_POLL_IN  : 0) |
+		(revents & EV_WRITE ? CURL_POLL_OUT : 0);
+
+	do {
+		rc = curl_multi_socket_action(global->multi, w->fd, action,
+					      &global->still_running);
+	} while (rc == CURLM_CALL_MULTI_PERFORM);
+#else
+	do {
+		rc = curl_multi_socket(global->multi, w->fd,
+				       &global->still_running);
+	} while (rc == CURLM_CALL_MULTI_PERFORM);
+#endif
+	mcode_or_die("error: event_cb: curl_multi_socket_action", rc);
+	check_multi_info(global);
+	if (global->still_running <= 0) {
+		ev_timer_stop(global->loop, &global->timer_event);
+	}
+}
+
+static void remsock(curl_socket_t s, socket_info *fdp, global_io_info *global)
+{
+	if (fdp) {
+		if (fdp->evset) {
+			ev_io_stop(global->loop, &fdp->ev);
+		}
+		free(fdp);
+	}
+}
+
+static void setsock(socket_info *fdp, curl_socket_t s, CURL *easy, int action,
+		    global_io_info *global)
+{
+	int kind = (action & CURL_POLL_IN  ? (int)(EV_READ)  : 0) |
+		(action & CURL_POLL_OUT ? (int)(EV_WRITE) : 0);
+
+	fdp->sockfd = s;
+	fdp->action = action;
+	fdp->easy = easy;
+	if (fdp->evset)
+		ev_io_stop(global->loop, &fdp->ev);
+	ev_io_init(&fdp->ev, event_cb, fdp->sockfd, kind);
+	fdp->ev.data = global;
+	fdp->evset = 1;
+	ev_io_start(global->loop, &fdp->ev);
+}
+
+static void addsock(curl_socket_t s, CURL *easy, int action,
+		    global_io_info *global)
+{
+	socket_info *fdp = (socket_info *)(calloc(sizeof(socket_info), 1));
+
+	fdp->global = global;
+	setsock(fdp, s, easy, action, global);
+	curl_multi_assign(global->multi, s, fdp);
+}
+
+static int sock_cb(CURL *easy, curl_socket_t s, int what, void *cbp,
+		   void *sockp)
+{
+	global_io_info *global = (global_io_info*)(cbp);
+	socket_info *fdp = (socket_info*)(sockp);
+
+	if (what == CURL_POLL_REMOVE) {
+		remsock(s, fdp, global);
+	} else {
+		if (!fdp) {
+			addsock(s, easy, what, global);
+		} else {
+			setsock(fdp, s, easy, what, global);
+		}
+	}
+	return 0;
+}
+
+/* Called by libev when our timeout expires */
+static void timer_cb(EV_P_ struct ev_timer *w, int revents)
+{
+	global_io_info *io_global = (global_io_info*)(w->data);
+	CURLMcode rc;
+
+#if !(OLD_CURL_MULTI)
+	do {
+		rc = curl_multi_socket_action(io_global->multi,
+					      CURL_SOCKET_TIMEOUT, 0,
+					      &io_global->still_running);
+	} while (rc == CURLM_CALL_MULTI_PERFORM);
+#else
+	do {
+		rc = curl_multi_socket_all(io_global->multi,
+					   &io_global->still_running);
+	} while (rc == CURLM_CALL_MULTI_PERFORM);
+#endif
+	mcode_or_die("timer_cb: curl_multi_socket_action", rc);
+	check_multi_info(io_global);
+}
+
+static connection_info *get_current_connection(global_io_info *global)
+{
+	connection_info *conn = global->current_connection;
+	ulong i;
+
+	if (conn && conn->filled_size < conn->chunk_size)
+		return conn;
+
+	for (i = 0; i < opt_parallel; i++) {
+		conn = global->connections[i];
+		if (conn->chunk_uploaded || conn->filled_size == 0) {
+			global->current_connection = conn;
+			conn_upload_init(conn);
+			return conn;
+		}
+	}
+
+	return NULL;
+}
+
+/* This gets called whenever data is received from the input */ 
+static void input_cb(EV_P_ struct ev_io *w, int revents)
+{
+	global_io_info *io_global = (global_io_info *)(w->data);
+	connection_info *conn = get_current_connection(io_global);
+
+	if (conn == NULL)
+		return;
+
+	if (conn->filled_size < conn->chunk_size) {
+		if (revents & EV_READ) {
+			ssize_t nbytes = read(io_global->input_fd,
+					      conn->buffer + conn->filled_size,
+					      conn->chunk_size -
+					      conn->filled_size);
+			if (nbytes > 0) {
+				conn->filled_size += nbytes;
+				conn_buffer_updated(conn);
+			} else if (nbytes < 0) {
+				if (errno != EAGAIN && errno != EINTR) {
+					char error[200];
+					my_strerror(error, sizeof(error),
+						    errno);
+					fprintf(stderr, "error: failed to read "
+						"input stream (%s)\n", error);
+					/* failed to read input */
+					exit(1);
+				}
+			} else {
+				io_global->eof = 1;
+				ev_io_stop(io_global->loop, w);
+			}
+		}
+	}
+
+	assert(conn->filled_size <= conn->chunk_size);
+}
+
+static int swift_upload_read_cb(char *ptr, size_t size, size_t nmemb,
+				void *data)
+{
+	size_t realsize;
+
+	connection_info *conn = (connection_info*)(data);
+
+	if (conn->filled_size == conn->upload_size &&
+	    conn->upload_size < conn->chunk_size && !conn->global->eof) {
+		ssize_t nbytes;
+		assert(conn->global->current_connection == conn);
+		do {
+			nbytes = read(conn->global->input_fd,
+				      conn->buffer + conn->filled_size,
+				      conn->chunk_size - conn->filled_size);
+		} while (nbytes == -1 && errno == EAGAIN);
+		if (nbytes > 0) {
+			conn->filled_size += nbytes;
+			conn_buffer_updated(conn);
+		} else {
+			conn->global->eof = 1;
+		}
+	}
+
+	realsize = min(size * nmemb, conn->filled_size - conn->upload_size);
+
+	memcpy(ptr, conn->buffer + conn->upload_size, realsize);
+	conn->upload_size += realsize;
+
+	assert(conn->filled_size <= conn->chunk_size);
+	assert(conn->upload_size <= conn->filled_size);
+
+	return realsize;
+}
+
+static
+size_t upload_header_read_cb(char *ptr, size_t size, size_t nmemb,
+			     void *data)
+{
+	connection_info *conn = (connection_info *)(data);
+	char etag[33];
+
+	if (get_http_header("Etag: ", ptr, etag, array_elements(etag))) {
+		if (strcmp(conn->hash, etag) != 0) {
+			fprintf(stderr, "error: ETag mismatch\n");
+			exit(EXIT_FAILURE);
+		}
+		fprintf(stderr, "acked chunk %s\n", etag);
+		conn->chunk_acked = true;
+	}
+
+	return nmemb * size;
+}
+
+static int conn_upload_init(connection_info *conn)
+{
+	conn->filled_size = 0;
+	conn->upload_size = 0;
+	conn->chunk_uploaded = false;
+	conn->chunk_acked = false;
+	conn->chunk_size = CHUNK_HEADER_CONSTANT_LEN;
+	conn->magic_verified = false;
+	conn->chunk_path_len = 0;
+	conn->chunk_type = XB_CHUNK_TYPE_UNKNOWN;
+	conn->payload_size = 0;
+	conn->upload_started = false;
+	conn->retry_count = 0;
+	if (conn->name != NULL) {
+		conn->name[0] = 0;
+	}
+
+	if (conn->easy != NULL) {
+		conn->easy = 0;
+	}
+
+	if (conn->slist != NULL) {
+		curl_slist_free_all(conn->slist);
+		conn->slist = NULL;
+	}
+
+	return 0;
+}
+
+static void conn_upload_prepare(connection_info *conn)
+{
+	gcry_md_hd_t md5;
+
+	gcry_md_open(&md5, GCRY_MD_MD5, 0);
+	gcry_md_write(md5, conn->buffer, conn->chunk_size);
+	hex_md5(gcry_md_read(md5, GCRY_MD_MD5), conn->hash);
+	gcry_md_close(md5);
+}
+
+static int conn_upload_start(connection_info *conn)
+{
+	char token_header[SWIFT_MAX_HDR_SIZE];
+	char object_url[SWIFT_MAX_URL_SIZE];
+	char content_len[200], etag[200];
+	global_io_info *global;
+	CURLMcode rc;
+
+	global = conn->global;
+
+	fprintf(stderr, "uploading chunk %s/%s/%s.%020zu "
+			"(md5: %s, size: %zu)\n",
+			global->container, global->backup_name, conn->name,
+			conn->chunk_no, conn->hash, conn->chunk_size);
+
+	snprintf(object_url, array_elements(object_url), "%s/%s/%s/%s.%020zu",
+		 global->url, global->container, global->backup_name,
+		 conn->name, conn->chunk_no);
+
+	snprintf(content_len, sizeof(content_len), "Content-Length: %lu",
+		(ulong)(conn->chunk_size));
+
+	snprintf(etag, sizeof(etag), "ETag: %s", conn->hash);
+
+	snprintf(token_header, array_elements(token_header),
+		 "X-Auth-Token: %s", global->token);
+
+	conn->slist = curl_slist_append(conn->slist, token_header);
+	conn->slist = curl_slist_append(conn->slist,
+					"Connection: keep-alive");
+	conn->slist = curl_slist_append(conn->slist,
+					"Content-Type: "
+					"application/octet-stream");
+	conn->slist = curl_slist_append(conn->slist, content_len);
+	conn->slist = curl_slist_append(conn->slist, etag);
+
+	conn->easy = curl_easy_init();
+	if (!conn->easy) {
+		fprintf(stderr, "error: curl_easy_init() failed\n");
+		return 1;
+	}
+	curl_easy_setopt(conn->easy, CURLOPT_URL, object_url);
+	curl_easy_setopt(conn->easy, CURLOPT_READFUNCTION,
+				     swift_upload_read_cb);
+	curl_easy_setopt(conn->easy, CURLOPT_READDATA, conn);
+	curl_easy_setopt(conn->easy, CURLOPT_VERBOSE, opt_verbose);
+	curl_easy_setopt(conn->easy, CURLOPT_ERRORBUFFER, conn->error);
+	curl_easy_setopt(conn->easy, CURLOPT_PRIVATE, conn);
+	curl_easy_setopt(conn->easy, CURLOPT_NOPROGRESS, 1L);
+	curl_easy_setopt(conn->easy, CURLOPT_LOW_SPEED_TIME, 5L);
+	curl_easy_setopt(conn->easy, CURLOPT_LOW_SPEED_LIMIT, 1024L);
+	curl_easy_setopt(conn->easy, CURLOPT_PUT, 1L);
+	curl_easy_setopt(conn->easy, CURLOPT_HTTPHEADER, conn->slist);
+	curl_easy_setopt(conn->easy, CURLOPT_HEADERFUNCTION,
+				     upload_header_read_cb);
+	curl_easy_setopt(conn->easy, CURLOPT_HEADERDATA, conn);
+	curl_easy_setopt(conn->easy, CURLOPT_INFILESIZE,
+				     (long) conn->chunk_size);
+	if (opt_cacert != NULL)
+		curl_easy_setopt(conn->easy, CURLOPT_CAINFO, opt_cacert);
+	if (opt_insecure)
+		curl_easy_setopt(conn->easy, CURLOPT_SSL_VERIFYPEER, FALSE);
+
+	rc = curl_multi_add_handle(conn->global->multi, conn->easy);
+	mcode_or_die("conn_upload_init: curl_multi_add_handle", rc);
+
+#if (OLD_CURL_MULTI)
+	do {
+		rc = curl_multi_socket_all(global->multi,
+					   &global->still_running);
+	} while(rc == CURLM_CALL_MULTI_PERFORM);
+#endif
+
+	conn->upload_started = true;
+
+	return 0;
+}
+
+static void conn_cleanup(connection_info *conn)
+{
+	if (conn) {
+		free(conn->name);
+		free(conn->buffer);
+		if (conn->slist) {
+			curl_slist_free_all(conn->slist);
+			conn->slist = NULL;
+		}
+		if (conn->easy) {
+			curl_easy_cleanup(conn->easy);
+			conn->easy = NULL;
+		}
+	}
+	free(conn);
+}
+
+static void conn_upload_retry(connection_info *conn)
+{
+	/* already closed by cURL */
+	conn->easy = NULL;
+
+	if (conn->slist != NULL) {
+		curl_slist_free_all(conn->slist);
+		conn->slist = NULL;
+	}
+
+	if (conn->retry_count++ > 3) {
+		fprintf(stderr, "error: retry count limit reached\n");
+		exit(EXIT_FAILURE);
+	}
+
+	fprintf(stderr, "warning: retrying to upload chunk %zu of '%s'\n",
+		conn->chunk_no, conn->name);
+
+	conn->upload_size = 0;
+
+	conn_upload_start(conn);
+}
+
+static connection_info *conn_new(global_io_info *global, ulong global_idx)
+{
+	connection_info *conn;
+
+	conn = (connection_info *)(calloc(1, sizeof(connection_info)));
+	if (conn == NULL) {
+		goto error;
+	}
+
+	conn->global = global;
+	conn->global_idx = global_idx;
+	conn->buffer_size = SWIFT_CHUNK_SIZE;
+	if ((conn->buffer = (char *)(calloc(conn->buffer_size, 1))) ==
+	    NULL) {
+		goto error;
+	}
+
+	return conn;
+
+error:
+	if (conn != NULL) {
+		conn_cleanup(conn);
+	}
+
+	fprintf(stderr, "error: out of memory\n");
+	exit(EXIT_FAILURE);
+
+	return NULL;
+}
+
+/*********************************************************************//**
+Handle input buffer updates. Parse chunk header and set appropriate
+buffer size. */
+static
+void
+conn_buffer_updated(connection_info *conn)
+{
+	bool ready_for_upload = false;
+
+	/* chunk header */
+	if (!conn->magic_verified &&
+	    conn->filled_size >= CHUNK_HEADER_CONSTANT_LEN) {
+		if (strncmp(XB_STREAM_CHUNK_MAGIC, conn->buffer,
+			sizeof(XB_STREAM_CHUNK_MAGIC) - 1) != 0) {
+
+			fprintf(stderr, "Error: magic expected\n");
+			exit(EXIT_FAILURE);
+		}
+		conn->magic_verified = true;
+		conn->chunk_path_len = uint4korr(conn->buffer
+						 + PATH_LENGTH_OFFSET);
+		conn->chunk_type = (xb_chunk_type_t)
+					(conn->buffer[CHUNK_TYPE_OFFSET]);
+		conn->chunk_size = CHUNK_HEADER_CONSTANT_LEN +
+					conn->chunk_path_len;
+		if (conn->chunk_type != XB_CHUNK_TYPE_EOF) {
+			conn->chunk_size += 16;
+		}
+	}
+
+	/* ordinary chunk */
+	if (conn->magic_verified &&
+	    conn->payload_size == 0 &&
+	    conn->chunk_type != XB_CHUNK_TYPE_EOF &&
+	    conn->filled_size >= CHUNK_HEADER_CONSTANT_LEN
+					+ conn->chunk_path_len + 16) {
+
+		conn->payload_size = uint8korr(conn->buffer +
+					CHUNK_HEADER_CONSTANT_LEN + 
+					conn->chunk_path_len);
+
+		conn->chunk_size = conn->payload_size + 4 + 16 +
+					conn->chunk_path_len +
+					CHUNK_HEADER_CONSTANT_LEN;
+
+		if (conn->name == NULL) {
+			conn->name = (char*)(malloc(conn->chunk_path_len + 1));
+		} else if (conn->name_len < conn->chunk_path_len + 1) {
+			conn->name = (char*)(realloc(conn->name,
+						conn->chunk_path_len + 1));
+		}
+		conn->name_len = conn->chunk_path_len + 1;
+
+		memcpy(conn->name, conn->buffer + CHUNK_HEADER_CONSTANT_LEN,
+			conn->chunk_path_len);
+		conn->name[conn->chunk_path_len] = 0;
+
+		if (conn->buffer_size < conn->chunk_size) {
+			conn->buffer =
+			      (char *)(realloc(conn->buffer, conn->chunk_size));
+			conn->buffer_size = conn->chunk_size;
+		}
+	}
+
+	/* EOF chunk has no payload */
+	if (conn->magic_verified &&
+	    conn->chunk_type == XB_CHUNK_TYPE_EOF &&
+	    conn->filled_size >= CHUNK_HEADER_CONSTANT_LEN
+					+ conn->chunk_path_len) {
+
+		if (conn->name == NULL) {
+			conn->name = (char*)(malloc(conn->chunk_path_len + 1));
+		} else if (conn->name_len < conn->chunk_path_len + 1) {
+			conn->name = (char*)(realloc(conn->name,
+						conn->chunk_path_len + 1));
+		}
+		conn->name_len = conn->chunk_path_len + 1;
+
+		memcpy(conn->name, conn->buffer + CHUNK_HEADER_CONSTANT_LEN,
+			conn->chunk_path_len);
+		conn->name[conn->chunk_path_len] = 0;
+	}
+
+	if (conn->filled_size > 0 && conn->filled_size == conn->chunk_size) {
+		ready_for_upload = true;
+	}
+
+	/* start upload once recieved the size of the chunk */
+	if (!conn->upload_started && ready_for_upload) {
+		conn->chunk_no = file_chunk_count[conn->name]++;
+		conn_upload_prepare(conn);
+		conn_upload_start(conn);
+	}
+}
+
+static int init_input(global_io_info *io_global)
+{
+	ev_io_init(&io_global->input_event, input_cb, STDIN_FILENO, EV_READ);
+	io_global->input_event.data = io_global;
+	ev_io_start(io_global->loop, &io_global->input_event);
+
+	return 0;
+}
+
+/* Update the event timer after curl_multi library calls */ 
+static int multi_timer_cb(CURLM *multi, long timeout_ms, global_io_info *global)
+{
+	ev_timer_stop(global->loop, &global->timer_event);
+	if (timeout_ms > 0) {
+		double  t = timeout_ms / 1000.0;
+		ev_timer_init(&global->timer_event, timer_cb, t, 0.);
+		ev_timer_start(global->loop, &global->timer_event);
+	} else {
+		timer_cb(global->loop, &global->timer_event, 0);
+	}
+	return 0;
+}
+
+static
+int swift_upload_parts(swift_auth_info *auth, const char *container,
+		       const char *name)
+{
+	global_io_info io_global;
+	ulong i;
+#if (OLD_CURL_MULTI)
+	long timeout;
+#endif
+	CURLMcode rc;
+	int n_dirty_buffers;
+
+	memset(&io_global, 0, sizeof(io_global));
+
+	io_global.loop = ev_default_loop(0);
+	init_input(&io_global);
+	io_global.multi = curl_multi_init();
+	ev_timer_init(&io_global.timer_event, timer_cb, 0., 0.);
+	io_global.timer_event.data = &io_global;
+	io_global.connections = (connection_info **)
+		(calloc(opt_parallel, sizeof(connection_info)));
+	io_global.url = auth->url;
+	io_global.container = container;
+	io_global.backup_name = name;
+	io_global.token = auth->token;
+	for (i = 0; i < opt_parallel; i++) {
+		io_global.connections[i] = conn_new(&io_global, i);
+	}
+
+	/* setup the generic multi interface options we want */
+	curl_multi_setopt(io_global.multi, CURLMOPT_SOCKETFUNCTION, sock_cb);
+	curl_multi_setopt(io_global.multi, CURLMOPT_SOCKETDATA, &io_global);
+#if !(OLD_CURL_MULTI)
+	curl_multi_setopt(io_global.multi, CURLMOPT_TIMERFUNCTION, multi_timer_cb);
+	curl_multi_setopt(io_global.multi, CURLMOPT_TIMERDATA, &io_global);
+	do {
+		rc = curl_multi_socket_action(io_global.multi,
+					      CURL_SOCKET_TIMEOUT, 0,
+					      &io_global.still_running);
+	} while (rc == CURLM_CALL_MULTI_PERFORM);
+#else
+	curl_multi_timeout(io_global.multi, &timeout);
+	if (timeout >= 0) {
+		multi_timer_cb(io_global.multi, timeout, &io_global);
+	}
+	do {
+		rc = curl_multi_socket_all(io_global.multi, &io_global.still_running);
+	} while(rc == CURLM_CALL_MULTI_PERFORM);
+#endif
+
+	ev_loop(io_global.loop, 0);
+	check_multi_info(&io_global);
+	curl_multi_cleanup(io_global.multi);
+
+	n_dirty_buffers = 0;
+	for (i = 0; i < opt_parallel; i++) {
+		connection_info *conn = io_global.connections[i];
+		if (conn && conn->upload_size != conn->filled_size) {
+			fprintf(stderr, "error: upload failed: %lu bytes left "
+				"in the buffer %s (uploaded = %d)\n",
+				(ulong)(conn->filled_size - conn->upload_size),
+				conn->name, conn->chunk_uploaded);
+			++n_dirty_buffers;
+		}
+	}
+
+	for (i = 0; i < opt_parallel; i++) {
+		if (io_global.connections[i] != NULL) {
+			conn_cleanup(io_global.connections[i]);
+		}
+	}
+	free(io_global.connections);
+
+	if (n_dirty_buffers > 0) {
+		return(EXIT_FAILURE);
+	}
+
+	return 0;
+}
+
+struct download_buffer_info {
+	off_t offset;
+	size_t size;
+	size_t result_len;
+	char *buf;
+	curl_read_callback custom_header_callback;
+	void *custom_header_callback_data;
+};
+
+/*********************************************************************//**
+Callback to parse header of GET request on swift contaier. */
+static
+size_t fetch_buffer_header_cb(char *ptr, size_t size, size_t nmemb,
+				      void *data)
+{
+	download_buffer_info *buffer_info = (download_buffer_info*)(data);
+	size_t buf_size;
+	char content_length_str[100];
+	char *endptr;
+
+	if (get_http_header("Content-Length: ", ptr,
+			content_length_str, sizeof(content_length_str))) {
+
+		buf_size = strtoull(content_length_str, &endptr, 10);
+
+		if (buffer_info->buf == NULL) {
+			buffer_info->buf = (char*)(malloc(buf_size));
+			buffer_info->size = buf_size;
+		}
+
+		if (buf_size > buffer_info->size) {
+			buffer_info->buf = (char*)
+				(realloc(buffer_info->buf, buf_size));
+			buffer_info->size = buf_size;
+		}
+
+		buffer_info->result_len = buf_size;
+	}
+
+	if (buffer_info->custom_header_callback) {
+		buffer_info->custom_header_callback(ptr, size, nmemb,
+				buffer_info->custom_header_callback_data);
+	}
+
+	return nmemb * size;
+}
+
+/*********************************************************************//**
+Write contents into string buffer */
+static
+size_t
+fetch_buffer_cb(char *buffer, size_t size, size_t nmemb, void *out_buffer)
+{
+	download_buffer_info *buffer_info = (download_buffer_info*)(out_buffer);
+
+	assert(buffer_info->size >= buffer_info->offset + size * nmemb);
+
+	memcpy(buffer_info->buf + buffer_info->offset, buffer, size * nmemb);
+	buffer_info->offset += size * nmemb;
+
+	return size * nmemb;
+}
+
+
+/*********************************************************************//**
+Downloads contents of URL into buffer. Caller is responsible for
+deallocating the buffer.
+@return	pointer to a buffer or NULL */
+static
+char *
+swift_fetch_into_buffer(swift_auth_info *auth, const char *url,
+			char **buf, size_t *buf_size, size_t *result_len,
+			curl_read_callback header_callback,
+			void *header_callback_data)
+{
+	char auth_token[SWIFT_MAX_HDR_SIZE];
+	download_buffer_info buffer_info;
+	struct curl_slist *slist = NULL;
+	long http_code;
+	CURL *curl;
+	CURLcode res;
+
+	memset(&buffer_info, 0, sizeof(buffer_info));
+	buffer_info.buf = *buf;
+	buffer_info.size = *buf_size;
+	buffer_info.custom_header_callback = header_callback;
+	buffer_info.custom_header_callback_data = header_callback_data;
+
+	snprintf(auth_token, array_elements(auth_token), "X-Auth-Token: %s",
+		 auth->token);
+
+	curl = curl_easy_init();
+
+	if (curl != NULL) {
+		slist = curl_slist_append(slist, auth_token);
+
+		curl_easy_setopt(curl, CURLOPT_VERBOSE, opt_verbose);
+		curl_easy_setopt(curl, CURLOPT_URL, url);
+		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fetch_buffer_cb);
+		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer_info);
+		curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION,
+				 fetch_buffer_header_cb);
+		curl_easy_setopt(curl, CURLOPT_HEADERDATA,
+				 &buffer_info);
+		if (opt_cacert != NULL)
+			curl_easy_setopt(curl, CURLOPT_CAINFO, opt_cacert);
+		if (opt_insecure)
+			curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+
+		res = curl_easy_perform(curl);
+
+		if (res != CURLE_OK) {
+			fprintf(stderr,
+				"error: curl_easy_perform() failed: %s\n",
+				curl_easy_strerror(res));
+			goto cleanup;
+		}
+		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+		if (http_code < 200 || http_code >= 300) {
+			fprintf(stderr, "error: request failed "
+				"with response code: %ld\n", http_code);
+			res = CURLE_LOGIN_DENIED;
+			goto cleanup;
+		}
+	} else {
+		res = CURLE_FAILED_INIT;
+		fprintf(stderr, "error: curl_easy_init() failed\n");
+		goto cleanup;
+	}
+
+cleanup:
+	if (slist) {
+		curl_slist_free_all(slist);
+	}
+	if (curl) {
+		curl_easy_cleanup(curl);
+	}
+
+	if (res == CURLE_OK) {
+		*buf = buffer_info.buf;
+		*buf_size = buffer_info.size;
+		*result_len = buffer_info.result_len;
+		return(buffer_info.buf);
+	}
+
+	free(buffer_info.buf);
+	*buf = NULL;
+	*buf_size = 0;
+	*result_len = 0;
+
+	return(NULL);
+}
+
+static
+container_list *
+container_list_new()
+{
+	container_list *list =
+			(container_list *)(calloc(1, sizeof(container_list)));
+
+	list->object_count = 1000;
+	list->objects = (object_info*)
+		(calloc(list->object_count, sizeof(object_info)));
+
+	if (list->objects == NULL) {
+		fprintf(stderr, "error: out of memory\n");
+		free(list);
+		return(NULL);
+	}
+
+	return(list);
+}
+
+static
+void
+container_list_free(container_list *list)
+{
+	free(list->content_json);
+	free(list->objects);
+	free(list);
+}
+
+static
+void
+container_list_add_object(container_list *list, const char *name,
+			  const char *hash, size_t bytes)
+{
+	const size_t object_count_step = 1000;
+
+	if (list->idx >= list->object_count) {
+		list->objects = (object_info*)
+			realloc(list->objects,
+				(list->object_count + object_count_step) *
+					sizeof(object_info));
+		memset(list->objects + list->object_count, 0,
+		       object_count_step * sizeof(object_info));
+		list->object_count += object_count_step;
+	}
+	assert(list->idx <= list->object_count);
+	strcpy(list->objects[list->idx].name, name);
+	strcpy(list->objects[list->idx].hash, hash);
+	list->objects[list->idx].bytes = bytes;
+	++list->idx;
+}
+
+
+/*********************************************************************//**
+Tokenize json string. Return array of tokens. Caller is responsoble for
+deallocating the array. */
+jsmntok_t *
+json_tokenise(char *json, size_t len, int initial_tokens)
+{
+	jsmn_parser parser;
+	jsmn_init(&parser);
+
+	unsigned int n = initial_tokens;
+	jsmntok_t *tokens = (jsmntok_t *)(malloc(sizeof(jsmntok_t) * n));
+
+	int ret = jsmn_parse(&parser, json, len, tokens, n);
+
+	while (ret == JSMN_ERROR_NOMEM)
+	{
+		n = n * 2 + 1;
+		tokens = (jsmntok_t*)(realloc(tokens, sizeof(jsmntok_t) * n));
+		ret = jsmn_parse(&parser, json, len, tokens, n);
+	}
+
+	if (ret == JSMN_ERROR_INVAL) {
+		fprintf(stderr, "error: invalid JSON string\n");
+
+	}
+	if (ret == JSMN_ERROR_PART) {
+		fprintf(stderr, "error: truncated JSON string\n");
+	}
+
+	return tokens;
+}
+
+/*********************************************************************//**
+Return true if token representation equal to given string. */
+static
+bool
+json_token_eq(const char *buf, jsmntok_t *t, const char *s)
+{
+	size_t len = strlen(s);
+
+	assert(t->end > t->start);
+
+	return((size_t)(t->end - t->start) == len &&
+		(strncmp(buf + t->start, s, len) == 0));
+}
+
+/*********************************************************************//**
+Copy given token as string. */
+static
+bool
+json_token_str(const char *buf, jsmntok_t *t, char *out, int out_size)
+{
+	size_t len = min(t->end - t->start, out_size - 1);
+
+	memcpy(out, buf + t->start, len);
+	out[len] = 0;
+
+	return(true);
+}
+
+/*********************************************************************//**
+Parse SWIFT container list response and fill output array with values
+sorted by object name. */
+static
+bool
+swift_parse_container_list(container_list *list)
+{
+	enum {MAX_DEPTH=20};
+	enum label_t {NONE, OBJECT};
+
+	char name[SWIFT_MAX_URL_SIZE];
+	char hash[33];
+	char bytes[30];
+	char *response = list->content_json;
+
+	struct stack_t {
+		jsmntok_t *t;
+		int n_items;
+		label_t label;
+	};
+
+	stack_t stack[MAX_DEPTH];
+	jsmntok_t *tokens;
+	int level;
+	size_t count = 0;
+
+	tokens = json_tokenise(list->content_json, list->content_length, 200);
+
+	stack[0].t = &tokens[0];
+	stack[0].label = NONE;
+	stack[0].n_items = 1;
+	level = 0;
+
+	for (size_t i = 0, j = 1; j > 0; i++, j--) {
+		jsmntok_t *t = &tokens[i];
+
+		assert(t->start != -1 && t->end != -1);
+		assert(level >= 0);
+
+		--stack[level].n_items;
+
+		switch (t->type) {
+		case JSMN_ARRAY:
+		case JSMN_OBJECT:
+			if (level < MAX_DEPTH - 1) {
+				level++;
+			}
+			stack[level].t = t;
+			stack[level].label = NONE;
+			if (t->type == JSMN_ARRAY) {
+				stack[level].n_items = t->size;
+				j += t->size;
+			} else {
+				stack[level].n_items = t->size * 2;
+				j += t->size * 2;
+			}
+			break;
+		case JSMN_PRIMITIVE:
+		case JSMN_STRING:
+			if (stack[level].t->type == JSMN_OBJECT &&
+			    stack[level].n_items % 2 == 1) {
+				/* key */
+				if (json_token_eq(response, t, "name")) {
+					json_token_str(response, &tokens[i + 1],
+							name, sizeof(name));
+				}
+				if (json_token_eq(response, t, "hash")) {
+					json_token_str(response, &tokens[i + 1],
+							hash, sizeof(hash));
+				}
+				if (json_token_eq(response, t, "bytes")) {
+					json_token_str(response, &tokens[i + 1],
+							bytes, sizeof(bytes));
+				}
+			}
+			break;
+		}
+
+		while (stack[level].n_items == 0 && level > 0) {
+			if (stack[level].t->type == JSMN_OBJECT
+			    && level == 2) {
+				char *endptr;
+				container_list_add_object(list, name, hash,
+						strtoull(bytes, &endptr, 10));
+				++count;
+			}
+			--level;
+		}
+	}
+
+	if (count == 0) {
+		list->final = true;
+	}
+
+	free(tokens);
+
+	return(true);
+}
+
+/*********************************************************************//**
+List swift container with given name. Return list of objects sorted by
+object name. */
+static
+container_list *
+swift_list(swift_auth_info *auth, const char *container, const char *path)
+{
+	container_list *list;
+	char url[SWIFT_MAX_URL_SIZE];
+
+	list = container_list_new();
+
+	while (!list->final) {
+
+		/* download the list in json format */
+		snprintf(url, array_elements(url),
+			 "%s/%s?format=json&limit=1000%s%s%s%s",
+			 auth->url, container, path ? "&prefix=" : "",
+			 path ? path : "", list->idx > 0 ? "&marker=" : "",
+			 list->idx > 0 ?
+			 	list->objects[list->idx - 1].name : "");
+
+		list->content_json = swift_fetch_into_buffer(auth, url,
+				&list->content_json, &list->content_bufsize,
+				&list->content_length, NULL, NULL);
+
+		if (list->content_json == NULL) {
+			container_list_free(list);
+			return(NULL);
+		}
+
+		/* parse downloaded list */
+		if (!swift_parse_container_list(list)) {
+			fprintf(stderr, "error: unable to parse "
+					"container list\n");
+			container_list_free(list);
+			return(NULL);
+		}
+	}
+
+	return(list);
+}
+
+
+/*********************************************************************//**
+Return true if chunk is a part of backup with given name. */
+static
+bool
+chunk_belongs_to(const char *chunk_name, const char *backup_name)
+{
+	size_t backup_name_len = strlen(backup_name);
+
+	return((strlen(chunk_name) > backup_name_len)
+		&& (chunk_name[backup_name_len] == '/')
+		&& strncmp(chunk_name, backup_name, backup_name_len) == 0);
+}
+
+/*********************************************************************//**
+Return true if chunk is in given list. */
+static
+bool
+chunk_in_list(const char *chunk_name, char **list, int list_size)
+{
+	size_t chunk_name_len;
+
+	if (list_size == 0) {
+		return(true);
+	}
+
+	chunk_name_len = strlen(chunk_name);
+	if (chunk_name_len < 20) {
+		return(false);
+	}
+
+	for (int i = 0; i < list_size; i++) {
+		size_t item_len = strlen(list[i]);
+
+		if ((strncmp(chunk_name - item_len + chunk_name_len - 21,
+			     list[i], item_len) == 0)
+		    && (chunk_name[chunk_name_len - 21] == '.')
+		    && (chunk_name[chunk_name_len - item_len - 22] == '/')) {
+			return(true);
+		}
+	}
+
+	return(false);
+}
+
+static
+int swift_download(swift_auth_info *auth, const char *container,
+		   const char *name)
+{
+	container_list *list;
+	char *buf = NULL;
+	size_t buf_size = 0;
+	size_t result_len = 0;
+
+	if ((list = swift_list(auth, container, name)) == NULL) {
+		return(CURLE_FAILED_INIT);
+	}
+
+	for (size_t i = 0; i < list->idx; i++) {
+		const char *chunk_name = list->objects[i].name;
+
+		if (chunk_belongs_to(chunk_name, name)
+		    && chunk_in_list(chunk_name, file_list, file_list_size)) {
+			char url[SWIFT_MAX_URL_SIZE];
+
+			snprintf(url, sizeof(url), "%s/%s/%s",
+				 auth->url, container, chunk_name);
+
+			if ((buf = swift_fetch_into_buffer(
+					auth, url, &buf, &buf_size, &result_len,
+					NULL, NULL)) == NULL) {
+				fprintf(stderr, "error: failed to download "
+						"chunk %s\n", chunk_name);
+				container_list_free(list);
+				return(CURLE_FAILED_INIT);
+			}
+
+			fwrite(buf, 1, result_len, stdout);
+		}
+	}
+
+	free(buf);
+
+	container_list_free(list);
+
+	return(CURLE_OK);
+}
+
+
+/*********************************************************************//**
+Delete backup with given name from given container.
+@return	true if backup deleted successfully */
+static
+bool swift_delete(swift_auth_info *auth, const char *container,
+		  const char *name)
+{
+	container_list *list;
+
+	if ((list = swift_list(auth, container, name)) == NULL) {
+		return(CURLE_FAILED_INIT);
+	}
+
+	for (size_t i = 0; i < list->object_count; i++) {
+		const char *chunk_name = list->objects[i].name;
+
+		if (chunk_belongs_to(chunk_name, name)) {
+			char url[SWIFT_MAX_URL_SIZE];
+
+			snprintf(url, sizeof(url), "%s/%s/%s",
+				 auth->url, container, chunk_name);
+
+			fprintf(stderr, "delete %s\n", chunk_name);
+			if (!swift_delete_object(auth, url)) {
+				fprintf(stderr, "error: failed to delete "
+						"chunk %s\n", chunk_name);
+				container_list_free(list);
+				return(CURLE_FAILED_INIT);
+			}
+		}
+	}
+
+	container_list_free(list);
+
+	return(CURLE_OK);
+}
+
+/*********************************************************************//**
+Check if backup with given name exists.
+@return	true if backup exists */
+static
+bool swift_backup_exists(swift_auth_info *auth, const char *container,
+			 const char *backup_name)
+{
+	container_list *list;
+
+	if ((list = swift_list(auth, container, backup_name)) == NULL) {
+		fprintf(stderr, "error: unable to list container %s\n",
+			container);
+		exit(EXIT_FAILURE);
+	}
+
+	for (size_t i = 0; i < list->object_count; i++) {
+		if (chunk_belongs_to(list->objects[i].name, backup_name)) {
+			container_list_free(list);
+			return(true);
+		}
+	}
+
+	container_list_free(list);
+
+	return(false);
+}
+
+/*********************************************************************//**
+Fills auth_info with response from keystone response.
+@return	true is response parsed successfully */
+static
+bool
+swift_parse_keystone_response_v2(char *response, size_t response_length,
+				swift_auth_info *auth_info)
+{
+	enum {MAX_DEPTH=20};
+	enum label_t {NONE, ACCESS, CATALOG, ENDPOINTS, TOKEN};
+
+	char filtered_url[SWIFT_MAX_URL_SIZE];
+	char public_url[SWIFT_MAX_URL_SIZE];
+	char region[SWIFT_MAX_URL_SIZE];
+	char id[SWIFT_MAX_URL_SIZE];
+	char token_id[SWIFT_MAX_URL_SIZE];
+	char type[SWIFT_MAX_URL_SIZE];
+
+	struct stack_t {
+		jsmntok_t *t;
+		int n_items;
+		label_t label;
+	};
+
+	stack_t stack[MAX_DEPTH];
+	jsmntok_t *tokens;
+	int level;
+
+	tokens = json_tokenise(response, response_length, 200);
+
+	stack[0].t = &tokens[0];
+	stack[0].label = NONE;
+	stack[0].n_items = 1;
+	level = 0;
+
+	for (size_t i = 0, j = 1; j > 0; i++, j--) {
+		jsmntok_t *t = &tokens[i];
+
+		assert(t->start != -1 && t->end != -1);
+		assert(level >= 0);
+
+		--stack[level].n_items;
+
+		switch (t->type) {
+		case JSMN_ARRAY:
+		case JSMN_OBJECT:
+			if (level < MAX_DEPTH - 1) {
+				level++;
+			}
+			stack[level].t = t;
+			stack[level].label = NONE;
+			if (t->type == JSMN_ARRAY) {
+				stack[level].n_items = t->size;
+				j += t->size;
+			} else {
+				stack[level].n_items = t->size * 2;
+				j += t->size * 2;
+			}
+			break;
+		case JSMN_PRIMITIVE:
+		case JSMN_STRING:
+			if (stack[level].t->type == JSMN_OBJECT &&
+			    stack[level].n_items % 2 == 1) {
+				/* key */
+				if (json_token_eq(response, t, "access")) {
+					stack[level].label = ACCESS;
+				}
+				if (json_token_eq(response, t,
+							"serviceCatalog")) {
+					stack[level].label = CATALOG;
+				}
+				if (json_token_eq(response, t, "endpoints")) {
+					stack[level].label = ENDPOINTS;
+				}
+				if (json_token_eq(response, t, "token")) {
+					stack[level].label = TOKEN;
+				}
+				if (json_token_eq(response, t, "id")) {
+					json_token_str(response, &tokens[i + 1],
+							id, sizeof(id));
+				}
+				if (json_token_eq(response, t, "id")
+				    && stack[level - 1].label == TOKEN) {
+					json_token_str(response, &tokens[i + 1],
+						token_id, sizeof(token_id));
+				}
+				if (json_token_eq(response, t, "region")) {
+					json_token_str(response, &tokens[i + 1],
+						region, sizeof(region));
+				}
+				if (json_token_eq(response, t, "publicURL")) {
+					json_token_str(response, &tokens[i + 1],
+						public_url, sizeof(public_url));
+				}
+				if (json_token_eq(response, t, "type")) {
+					json_token_str(response, &tokens[i + 1],
+						type, sizeof(type));
+				}
+			}
+			break;
+		}
+
+		while (stack[level].n_items == 0 && level > 0) {
+			if (stack[level].t->type == JSMN_OBJECT
+			    && level == 6
+			    && stack[level - 1].t->type == JSMN_ARRAY
+			    && stack[level - 2].label == ENDPOINTS) {
+				if (opt_swift_region == NULL
+				    || strcmp(opt_swift_region, region) == 0) {
+					strncpy(filtered_url, public_url,
+						sizeof(filtered_url));
+				}
+			}
+			if (stack[level].t->type == JSMN_OBJECT &&
+				level == 4 &&
+				stack[level - 1].t->type == JSMN_ARRAY &&
+				stack[level - 2].label == CATALOG) {
+				if (strcmp(type, "object-store") == 0) {
+					strncpy(auth_info->url, filtered_url,
+						sizeof(auth_info->url));
+				}
+			}
+			--level;
+		}
+	}
+
+	free(tokens);
+
+	strncpy(auth_info->token, token_id, sizeof(auth_info->token));
+
+	assert(level == 0);
+
+	if (*auth_info->token == 0) {
+		fprintf(stderr, "error: can not receive token from response\n");
+		return(false);
+	}
+
+	if (*auth_info->url == 0) {
+		fprintf(stderr, "error: can not get URL from response\n");
+		return(false);
+	}
+
+	return(true);
+}
+
+/*********************************************************************//**
+Authenticate against Swift TempAuth. Fills swift_auth_info struct.
+Uses creadentials privided as global variables.
+@returns true if access is granted and token received. */
+static
+bool
+swift_keystone_auth_v2(const char *auth_url, swift_auth_info *info)
+{
+	char tenant_arg[SWIFT_MAX_URL_SIZE];
+	char payload[SWIFT_MAX_URL_SIZE];
+	struct curl_slist *slist = NULL;
+	download_buffer_info buf_info;
+	long http_code;
+	CURLcode res;
+	CURL *curl;
+	bool auth_res = false;
+
+	memset(&buf_info, 0, sizeof(buf_info));
+
+	if (opt_swift_user == NULL) {
+		fprintf(stderr, "error: both --swift-user is required "
+			"for keystone authentication.\n");
+		return(false);
+	}
+
+	if (opt_swift_password == NULL) {
+		fprintf(stderr, "error: both --swift-password is required "
+			"for keystone authentication.\n");
+		return(false);
+	}
+
+	if (opt_swift_tenant != NULL && opt_swift_tenant_id != NULL) {
+		fprintf(stderr, "error: both --swift-tenant and "
+			"--swift-tenant-id specified for keystone "
+			"authentication.\n");
+		return(false);
+	}
+
+	if (opt_swift_tenant != NULL) {
+		snprintf(tenant_arg, sizeof(tenant_arg), ",\"%s\":\"%s\"",
+			"tenantName", opt_swift_tenant);
+	} else if (opt_swift_tenant_id != NULL) {
+		snprintf(tenant_arg, sizeof(tenant_arg), ",\"%s\":\"%s\"",
+			"tenantId", opt_swift_tenant_id);
+	} else {
+		*tenant_arg = 0;
+	}
+
+	snprintf(payload, sizeof(payload), "{\"auth\": "
+		"{\"passwordCredentials\": {\"username\":\"%s\","
+		"\"password\":\"%s\"}%s}}",
+		opt_swift_user, opt_swift_password, tenant_arg);
+
+	curl = curl_easy_init();
+
+	if (curl != NULL) {
+
+		slist = curl_slist_append(slist,
+					  "Content-Type: application/json");
+		slist = curl_slist_append(slist,
+					  "Accept: application/json");
+
+		curl_easy_setopt(curl, CURLOPT_VERBOSE, opt_verbose);
+		curl_easy_setopt(curl, CURLOPT_POST, 1L);
+		curl_easy_setopt(curl, CURLOPT_URL, auth_url);
+		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+		curl_easy_setopt(curl, CURLOPT_POSTFIELDS, payload);
+		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fetch_buffer_cb);
+		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buf_info);
+		curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION,
+				 fetch_buffer_header_cb);
+		curl_easy_setopt(curl, CURLOPT_HEADERDATA,
+				 &buf_info);
+		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+
+		if (opt_cacert != NULL)
+			curl_easy_setopt(curl, CURLOPT_CAINFO, opt_cacert);
+		if (opt_insecure)
+			curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+
+		res = curl_easy_perform(curl);
+
+		if (res != CURLE_OK) {
+			fprintf(stderr,
+				"error: curl_easy_perform() failed: %s\n",
+				curl_easy_strerror(res));
+			goto cleanup;
+		}
+		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+		if (http_code < 200 || http_code >= 300) {
+			fprintf(stderr, "error: request failed "
+				"with response code: %ld\n", http_code);
+			res = CURLE_LOGIN_DENIED;
+			goto cleanup;
+		}
+	} else {
+		res = CURLE_FAILED_INIT;
+		fprintf(stderr, "error: curl_easy_init() failed\n");
+		goto cleanup;
+	}
+
+	if (!swift_parse_keystone_response_v2(buf_info.buf,
+				buf_info.size, info)) {
+		goto cleanup;
+	}
+
+	auth_res = true;
+
+cleanup:
+	if (slist) {
+		curl_slist_free_all(slist);
+	}
+	if (curl) {
+		curl_easy_cleanup(curl);
+	}
+
+	free(buf_info.buf);
+
+	return(auth_res);
+}
+
+
+/*********************************************************************//**
+Fills auth_info with response from keystone response.
+@return	true is response parsed successfully */
+static
+bool
+swift_parse_keystone_response_v3(char *response, size_t response_length,
+				swift_auth_info *auth_info)
+{
+	enum {MAX_DEPTH=20};
+	enum label_t {NONE, TOKEN, CATALOG, ENDPOINTS};
+
+	char url[SWIFT_MAX_URL_SIZE];
+	char filtered_url[SWIFT_MAX_URL_SIZE];
+	char region[SWIFT_MAX_URL_SIZE];
+	char interface[SWIFT_MAX_URL_SIZE];
+	char type[SWIFT_MAX_URL_SIZE];
+
+	struct stack_t {
+		jsmntok_t *t;
+		int n_items;
+		label_t label;
+	};
+
+	stack_t stack[MAX_DEPTH];
+	jsmntok_t *tokens;
+	int level;
+
+	tokens = json_tokenise(response, response_length, 200);
+
+	stack[0].t = &tokens[0];
+	stack[0].label = NONE;
+	stack[0].n_items = 1;
+	level = 0;
+
+	for (size_t i = 0, j = 1; j > 0; i++, j--) {
+		jsmntok_t *t = &tokens[i];
+
+		assert(t->start != -1 && t->end != -1);
+		assert(level >= 0);
+
+		--stack[level].n_items;
+
+		switch (t->type) {
+		case JSMN_ARRAY:
+		case JSMN_OBJECT:
+			if (level < MAX_DEPTH - 1) {
+				level++;
+			}
+			stack[level].t = t;
+			stack[level].label = NONE;
+			if (t->type == JSMN_ARRAY) {
+				stack[level].n_items = t->size;
+				j += t->size;
+			} else {
+				stack[level].n_items = t->size * 2;
+				j += t->size * 2;
+			}
+			break;
+		case JSMN_PRIMITIVE:
+		case JSMN_STRING:
+			if (stack[level].t->type == JSMN_OBJECT &&
+			    stack[level].n_items % 2 == 1) {
+				/* key */
+				if (json_token_eq(response, t, "token")) {
+					stack[level].label = TOKEN;
+					fprintf(stderr, "token\n");
+				}
+				if (json_token_eq(response, t,
+							"catalog")) {
+					stack[level].label = CATALOG;
+					fprintf(stderr, "catalog\n");
+				}
+				if (json_token_eq(response, t, "endpoints")) {
+					stack[level].label = ENDPOINTS;
+				}
+				if (json_token_eq(response, t, "region")) {
+					json_token_str(response, &tokens[i + 1],
+						region, sizeof(region));
+				}
+				if (json_token_eq(response, t, "url")) {
+					json_token_str(response, &tokens[i + 1],
+						url, sizeof(url));
+				}
+				if (json_token_eq(response, t, "interface")) {
+					json_token_str(response, &tokens[i + 1],
+						interface, sizeof(interface));
+				}
+				if (json_token_eq(response, t, "type")) {
+					json_token_str(response, &tokens[i + 1],
+						type, sizeof(type));
+				}
+			}
+			break;
+		}
+
+		while (stack[level].n_items == 0 && level > 0) {
+			if (stack[level].t->type == JSMN_OBJECT
+			    && level == 6
+			    && stack[level - 1].t->type == JSMN_ARRAY
+			    && stack[level - 2].label == ENDPOINTS) {
+				if ((opt_swift_region == NULL
+				     || strcmp(opt_swift_region, region) == 0)
+				    && strcmp(interface, "public") == 0) {
+					strncpy(filtered_url, url,
+						sizeof(filtered_url));
+				}
+			}
+			if (stack[level].t->type == JSMN_OBJECT &&
+				level == 4 &&
+				stack[level - 1].t->type == JSMN_ARRAY &&
+				stack[level - 2].label == CATALOG) {
+				if (strcmp(type, "object-store") == 0) {
+					strncpy(auth_info->url, filtered_url,
+						sizeof(auth_info->url));
+				}
+			}
+			--level;
+		}
+	}
+
+	free(tokens);
+
+	assert(level == 0);
+
+	if (*auth_info->url == 0) {
+		fprintf(stderr, "error: can not get URL from response\n");
+		return(false);
+	}
+
+	return(true);
+}
+
+/*********************************************************************//**
+Captures X-Subject-Token header. */
+static
+size_t keystone_v3_header_cb(char *ptr, size_t size, size_t nmemb, void *data)
+{
+	swift_auth_info *info = (swift_auth_info*)(data);
+
+	get_http_header("X-Subject-Token: ", ptr,
+			info->token, array_elements(info->token));
+
+	return nmemb * size;
+}
+
+/*********************************************************************//**
+Authenticate against Swift TempAuth. Fills swift_auth_info struct.
+Uses creadentials privided as global variables.
+@returns true if access is granted and token received. */
+static
+bool
+swift_keystone_auth_v3(const char *auth_url, swift_auth_info *info)
+{
+	char scope[SWIFT_MAX_URL_SIZE];
+	char domain[SWIFT_MAX_URL_SIZE];
+	char payload[SWIFT_MAX_URL_SIZE];
+	struct curl_slist *slist = NULL;
+	download_buffer_info buf_info;
+	long http_code;
+	CURLcode res;
+	CURL *curl;
+	bool auth_res = false;
+
+	memset(&buf_info, 0, sizeof(buf_info));
+	buf_info.custom_header_callback = keystone_v3_header_cb;
+	buf_info.custom_header_callback_data = info;
+
+	if (opt_swift_user == NULL) {
+		fprintf(stderr, "error: both --swift-user is required "
+			"for keystone authentication.\n");
+		return(false);
+	}
+
+	if (opt_swift_password == NULL) {
+		fprintf(stderr, "error: both --swift-password is required "
+			"for keystone authentication.\n");
+		return(false);
+	}
+
+	if (opt_swift_project_id != NULL && opt_swift_project != NULL) {
+		fprintf(stderr, "error: both --swift-project and "
+			"--swift-project-id specified for keystone "
+			"authentication.\n");
+		return(false);
+	}
+
+	if (opt_swift_domain_id != NULL && opt_swift_domain != NULL) {
+		fprintf(stderr, "error: both --swift-domain and "
+			"--swift-domain-id specified for keystone "
+			"authentication.\n");
+		return(false);
+	}
+
+	if (opt_swift_project_id != NULL && opt_swift_domain != NULL) {
+		fprintf(stderr, "error: both --swift-project-id and "
+			"--swift-domain specified for keystone "
+			"authentication.\n");
+		return(false);
+	}
+
+	if (opt_swift_project_id != NULL && opt_swift_domain_id != NULL) {
+		fprintf(stderr, "error: both --swift-project-id and "
+			"--swift-domain-id specified for keystone "
+			"authentication.\n");
+		return(false);
+	}
+
+	scope[0] = 0; domain[0] = 0;
+
+	if (opt_swift_domain != NULL) {
+		snprintf(domain, sizeof(domain),
+			",{\"domain\":{\"name\":\"%s\"}}",
+			opt_swift_domain);
+	} else if (opt_swift_domain_id != NULL) {
+		snprintf(domain, sizeof(domain),
+			",{\"domain\":{\"id\":\"%s\"}}",
+			opt_swift_domain_id);
+	}
+
+	if (opt_swift_project_id != NULL) {
+		snprintf(scope, sizeof(scope),
+			",\"scope\":{\"project\":{\"id\":\"%s\"}}",
+			opt_swift_project_id);
+	} else if (opt_swift_project != NULL) {
+		snprintf(scope, sizeof(scope),
+			",\"scope\":{\"project\":{\"name\":\"%s\"%s}}",
+			opt_swift_project_id, domain);
+	}
+
+	snprintf(payload, sizeof(payload), "{\"auth\":{\"identity\":"
+		"{\"methods\":[\"password\"],\"password\":{\"user\":"
+		"{\"name\":\"%s\",\"password\":\"%s\"%s}}}%s}}",
+		opt_swift_user, opt_swift_password,
+		*scope ? "" : ",\"domain\":{\"id\":\"default\"}",
+		scope);
+
+	curl = curl_easy_init();
+
+	if (curl != NULL) {
+
+		slist = curl_slist_append(slist,
+					  "Content-Type: application/json");
+		slist = curl_slist_append(slist,
+					  "Accept: application/json");
+
+		curl_easy_setopt(curl, CURLOPT_VERBOSE, opt_verbose);
+		curl_easy_setopt(curl, CURLOPT_POST, 1L);
+		curl_easy_setopt(curl, CURLOPT_URL, auth_url);
+		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+		curl_easy_setopt(curl, CURLOPT_POSTFIELDS, payload);
+		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fetch_buffer_cb);
+		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buf_info);
+		curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION,
+				 fetch_buffer_header_cb);
+		curl_easy_setopt(curl, CURLOPT_HEADERDATA,
+				 &buf_info);
+		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+
+		if (opt_cacert != NULL)
+			curl_easy_setopt(curl, CURLOPT_CAINFO, opt_cacert);
+		if (opt_insecure)
+			curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+
+		res = curl_easy_perform(curl);
+
+		if (res != CURLE_OK) {
+			fprintf(stderr,
+				"error: curl_easy_perform() failed: %s\n",
+				curl_easy_strerror(res));
+			goto cleanup;
+		}
+		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+		if (http_code < 200 || http_code >= 300) {
+			fprintf(stderr, "error: request failed "
+				"with response code: %ld\n", http_code);
+			res = CURLE_LOGIN_DENIED;
+			goto cleanup;
+		}
+	} else {
+		res = CURLE_FAILED_INIT;
+		fprintf(stderr, "error: curl_easy_init() failed\n");
+		goto cleanup;
+	}
+
+	if (!swift_parse_keystone_response_v3(buf_info.buf,
+				buf_info.size, info)) {
+		goto cleanup;
+	}
+
+	auth_res = true;
+
+cleanup:
+	if (slist) {
+		curl_slist_free_all(slist);
+	}
+	if (curl) {
+		curl_easy_cleanup(curl);
+	}
+
+	free(buf_info.buf);
+
+	return(auth_res);
+}
+
+int main(int argc, char **argv)
+{
+	swift_auth_info info;
+	char auth_url[SWIFT_MAX_URL_SIZE];
+
+	MY_INIT(argv[0]);
+
+        /* handle_options in parse_args is destructive so
+         * we make a copy of our argument pointers so we can
+         * mask the sensitive values afterwards */
+        char **mask_argv = (char **)malloc(sizeof(char *) * (argc - 1));
+        memcpy(mask_argv, argv + 1, sizeof(char *) * (argc - 1));
+
+	if (parse_args(argc, argv)) {
+		return(EXIT_FAILURE);
+	}
+
+        mask_args(argc, mask_argv);  /* mask args on cmdline */
+
+	curl_global_init(CURL_GLOBAL_ALL);
+
+	if (opt_swift_auth_version == NULL || *opt_swift_auth_version == '1') {
+		/* TempAuth */
+		snprintf(auth_url, SWIFT_MAX_URL_SIZE, "%sauth/v%s/",
+			 opt_swift_auth_url, opt_swift_auth_version ?
+			 			opt_swift_auth_version : "1.0");
+
+		if (!swift_temp_auth(auth_url, &info)) {
+			fprintf(stderr, "error: failed to authenticate\n");
+			return(EXIT_FAILURE);
+		}
+
+	} else if (*opt_swift_auth_version == '2') {
+		/* Keystone v2 */
+		snprintf(auth_url, SWIFT_MAX_URL_SIZE, "%sv%s/tokens",
+			 opt_swift_auth_url, opt_swift_auth_version);
+
+		if (!swift_keystone_auth_v2(auth_url, &info)) {
+			fprintf(stderr, "error: failed to authenticate\n");
+			return(EXIT_FAILURE);
+		}
+
+	} else if (*opt_swift_auth_version == '3') {
+		/* Keystone v3 */
+		snprintf(auth_url, SWIFT_MAX_URL_SIZE, "%sv%s/auth/tokens",
+			 opt_swift_auth_url, opt_swift_auth_version);
+
+		if (!swift_keystone_auth_v3(auth_url, &info)) {
+			fprintf(stderr, "error: failed to authenticate\n");
+			exit(EXIT_FAILURE);
+		}
+
+	}
+
+	if (opt_swift_storage_url != NULL) {
+		snprintf(info.url, sizeof(info.url), "%s",
+			 opt_swift_storage_url);
+	}
+
+	fprintf(stderr, "Object store URL: %s\n", info.url);
+
+	if (opt_mode == MODE_PUT) {
+
+		if (swift_create_container(&info, opt_swift_container) != 0) {
+			fprintf(stderr, "error: failed to create "
+				"container %s\n",
+				opt_swift_container);
+			return(EXIT_FAILURE);
+		}
+
+		if (swift_backup_exists(&info, opt_swift_container, opt_name)) {
+			fprintf(stderr, "error: backup named '%s' "
+				"already exists!\n",
+				opt_name);
+			return(EXIT_FAILURE);
+		}
+
+		if (swift_upload_parts(&info, opt_swift_container,
+					opt_name) != 0) {
+			fprintf(stderr, "error: upload failed\n");
+			return(EXIT_FAILURE);
+		}
+
+	} else if (opt_mode == MODE_GET) {
+
+		if (swift_download(&info, opt_swift_container, opt_name)
+				   != CURLE_OK) {
+			fprintf(stderr, "error: download failed\n");
+			return(EXIT_FAILURE);
+		}
+
+	} else if (opt_mode == MODE_DELETE) {
+
+		if (swift_delete(&info, opt_swift_container, opt_name)
+				   != CURLE_OK) {
+			fprintf(stderr, "error: delete failed\n");
+			return(EXIT_FAILURE);
+		}
+
+	} else {
+		fprintf(stderr, "Unknown command supplied.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	curl_global_cleanup();
+
+	return(EXIT_SUCCESS);
+}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -24,9 +24,11 @@
 #include "xbcrypt.h"
 #include <gcrypt.h>
 
+#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 
-#define XBCRYPT_VERSION "1.0"
+#define XBCRYPT_VERSION "1.1"
 
 typedef enum {
 	RUN_MODE_NONE,
@@ -56,8 +58,6 @@
 static int		encrypt_algo = 0;
 static int		encrypt_mode = GCRY_CIPHER_MODE_CTR;
 static uint 		encrypt_key_len = 0;
-static const unsigned char v1_encrypt_iv[] =
-			    "Percona Xtrabackup is Awesome!!!";
 static size_t 		encrypt_iv_len = 0;
 
 static struct my_option my_long_options[] =
@@ -130,7 +130,9 @@
 int
 main(int argc, char **argv)
 {
+#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
 	gcry_error_t 		gcry_error;
+#endif
 	File filein = 0;
 	File fileout = 0;
 
@@ -142,6 +144,7 @@
 
 	/* Acording to gcrypt docs (and my testing), setting up the threading
 	   callbacks must be done first, so, lets give it a shot */
+#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
 	gcry_error = gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 	if (gcry_error) {
 		msg("%s: unable to set libgcrypt thread cbs - "
@@ -150,6 +153,7 @@
 		    gcry_strerror(gcry_error));
 		return 1;
 	}
+#endif
 
 	/* Version check should be the very first call because it
 	makes sure that important subsystems are intialized. */
@@ -303,6 +307,7 @@
 	xb_rcrypt_result_t	result;
 	gcry_cipher_hd_t	cipher_handle;
 	gcry_error_t		gcry_error;
+	my_bool			hash_appended;
 
 	if (encrypt_algo != GCRY_CIPHER_NONE) {
 		gcry_error = gcry_cipher_open(&cipher_handle,
@@ -338,7 +343,7 @@
 	/* Walk the encrypted chunks, decrypting them and writing out */
 	while ((result = xb_crypt_read_chunk(xbcrypt_file, &chunkbuf,
 					     &originalsize, &chunksize,
-					     &ivbuf, &ivsize))
+					     &ivbuf, &ivsize, &hash_appended))
 		== XB_CRYPT_READ_CHUNK) {
 
 		if (encrypt_algo != GCRY_CIPHER_NONE) {
@@ -352,13 +357,9 @@
 			}
 
 			if (ivsize) {
-				gcry_error = gcry_cipher_setiv(cipher_handle,
-							       ivbuf,
-							       ivsize);
-			} else {
-				gcry_error = gcry_cipher_setiv(cipher_handle,
-							       v1_encrypt_iv,
-							       encrypt_iv_len);
+				gcry_error = gcry_cipher_setctr(cipher_handle,
+								ivbuf,
+								ivsize);
 			}
 			if (gcry_error) {
 				msg("%s:decrypt: unable to set cipher iv - "
@@ -369,16 +370,10 @@
 			}
 
 			if (decryptbufsize < originalsize) {
-				if (decryptbufsize) {
-					decryptbuf = my_realloc(decryptbuf,
-								originalsize,
-								MYF(MY_WME));
-					decryptbufsize = originalsize;
-				} else {
-					decryptbuf = my_malloc(originalsize,
-							       MYF(MY_WME));
-					decryptbufsize = originalsize;
-				}
+				decryptbuf = my_realloc(decryptbuf,
+					originalsize,
+					MYF(MY_WME | MY_ALLOW_ZERO_PTR));
+				decryptbufsize = originalsize;
 			}
 
 			/* Try to decrypt it */
@@ -400,8 +395,29 @@
 			decryptbuf = chunkbuf;
 		}
 
+		if (hash_appended) {
+			uchar hash[XB_CRYPT_HASH_LEN];
+
+			originalsize -= XB_CRYPT_HASH_LEN;
+
+			/* ensure that XB_CRYPT_HASH_LEN is the correct length
+			of XB_CRYPT_HASH hashing algorithm output */
+			assert(gcry_md_get_algo_dlen(XB_CRYPT_HASH) ==
+			       XB_CRYPT_HASH_LEN);
+			gcry_md_hash_buffer(XB_CRYPT_HASH, hash, decryptbuf,
+					    originalsize);
+			if (memcmp(hash, (char *) decryptbuf + originalsize,
+				   XB_CRYPT_HASH_LEN) != 0) {
+				msg("%s:%s invalid plaintext hash. "
+				    "Wrong encrytion key specified?\n",
+				    my_progname, __FUNCTION__);
+				result = XB_CRYPT_READ_ERROR;
+				goto err;
+			}
+		}
+
 		/* Write it out */
-		if (my_write(fileout, decryptbuf, originalsize,
+		if (my_write(fileout, (const uchar *) decryptbuf, originalsize,
 			     MYF(MY_WME | MY_NABP))) {
 			msg("%s:decrypt: unable to write output chunk.\n",
 			    my_progname);
@@ -456,7 +472,7 @@
 {
 	size_t			bytesread;
 	size_t			chunkbuflen;
-	void			*chunkbuf = NULL;
+	uchar			*chunkbuf = NULL;
 	void			*ivbuf = NULL;
 	size_t			encryptbuflen = 0;
 	size_t			encryptedlen = 0;
@@ -504,11 +520,20 @@
 	ivbuf = my_malloc(encrypt_iv_len, MYF(MY_FAE));
 
 	/* now read in data in chunk size, encrypt and write out */
-	chunkbuflen = opt_encrypt_chunk_size;
-	chunkbuf = my_malloc(chunkbuflen, MYF(MY_FAE));
-	while ((bytesread = my_read(filein, chunkbuf, chunkbuflen,
+	chunkbuflen = opt_encrypt_chunk_size + XB_CRYPT_HASH_LEN;
+	chunkbuf = (uchar *) my_malloc(chunkbuflen, MYF(MY_FAE));
+	while ((bytesread = my_read(filein, chunkbuf, opt_encrypt_chunk_size,
 				    MYF(MY_WME))) > 0) {
 
+		size_t origbuflen = bytesread + XB_CRYPT_HASH_LEN;
+
+		/* ensure that XB_CRYPT_HASH_LEN is the correct length
+		of XB_CRYPT_HASH hashing algorithm output */
+		assert(XB_CRYPT_HASH_LEN ==
+		       gcry_md_get_algo_dlen(XB_CRYPT_HASH));
+		gcry_md_hash_buffer(XB_CRYPT_HASH, chunkbuf + bytesread,
+				    chunkbuf, bytesread);
+
 		if (encrypt_algo != GCRY_CIPHER_NONE) {
 			gcry_error = gcry_cipher_reset(cipher_handle);
 
@@ -521,7 +546,7 @@
 			}
 
 			xb_crypt_create_iv(ivbuf, encrypt_iv_len);
-			gcry_error = gcry_cipher_setiv(cipher_handle,
+			gcry_error = gcry_cipher_setctr(cipher_handle,
 							ivbuf,
 							encrypt_iv_len);
 
@@ -533,26 +558,19 @@
 				continue;
 			}
 
-			if (encryptbuflen < bytesread) {
-				if (encryptbuflen) {
-					encryptbuf = my_realloc(encryptbuf,
-								bytesread,
-								MYF(MY_WME));
-					encryptbuflen = bytesread;
-				} else {
-					encryptbuf = my_malloc(bytesread,
-							       MYF(MY_WME));
-					encryptbuflen = bytesread;
-				}
+			if (encryptbuflen < origbuflen) {
+				encryptbuf = my_realloc(encryptbuf, origbuflen,
+					MYF(MY_WME | MY_ALLOW_ZERO_PTR));
+				encryptbuflen = origbuflen;
 			}
 
 			gcry_error = gcry_cipher_encrypt(cipher_handle,
 							 encryptbuf,
 							 encryptbuflen,
 							 chunkbuf,
-							 bytesread);
+							 origbuflen);
 
-			encryptedlen = bytesread;
+			encryptedlen = origbuflen;
 
 			if (gcry_error) {
 				msg("%s:encrypt: unable to encrypt chunk - "
@@ -563,11 +581,12 @@
 				goto err;
 			}
 		} else {
-			encryptedlen = bytesread;
+			encryptedlen = origbuflen;
 			encryptbuf = chunkbuf;
 		}
 
-		if (xb_crypt_write_chunk(xbcrypt_file, encryptbuf, bytesread,
+		if (xb_crypt_write_chunk(xbcrypt_file, encryptbuf,
+					 bytesread + XB_CRYPT_HASH_LEN,
 					 encryptedlen, ivbuf, encrypt_iv_len)) {
 			msg("%s:encrypt: abcrypt_write_chunk() failed.\n",
 			    my_progname);
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt_common.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt_common.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt_common.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt_common.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -25,9 +25,14 @@
 #include "common.h"
 
 #define XB_CRYPT_CHUNK_MAGIC1 "XBCRYP01"
-#define XB_CRYPT_CHUNK_MAGIC2 "XBCRYP02" /* must be same size as ^^ */
+#define XB_CRYPT_CHUNK_MAGIC2 "XBCRYP02"
+#define XB_CRYPT_CHUNK_MAGIC3 "XBCRYP03" /* must be same size as ^^ */
+#define XB_CRYPT_CHUNK_MAGIC_CURRENT XB_CRYPT_CHUNK_MAGIC3
 #define XB_CRYPT_CHUNK_MAGIC_SIZE (sizeof(XB_CRYPT_CHUNK_MAGIC1)-1)
 
+#define XB_CRYPT_HASH GCRY_MD_SHA256
+#define XB_CRYPT_HASH_LEN 32
+
 /******************************************************************************
 Write interface */
 typedef struct xb_wcrypt_struct xb_wcrypt_t;
@@ -66,7 +71,7 @@
 
 xb_rcrypt_result_t xb_crypt_read_chunk(xb_rcrypt_t *crypt, void **buf,
 				       size_t *olen, size_t *elen, void **iv,
-				       size_t *ivlen);
+				       size_t *ivlen, my_bool *hash_appended);
 
 int xb_crypt_read_close(xb_rcrypt_t *crypt);
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt_read.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt_read.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt_read.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt_read.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -51,7 +51,7 @@
 
 xb_rcrypt_result_t
 xb_crypt_read_chunk(xb_rcrypt_t *crypt, void **buf, size_t *olen, size_t *elen,
-		    void **iv, size_t *ivlen)
+		    void **iv, size_t *ivlen, my_bool *hash_appended)
 
 {
 	uchar		tmpbuf[XB_CRYPT_CHUNK_MAGIC_SIZE + 8 + 8 + 8 + 4];
@@ -77,10 +77,15 @@
 
 	ptr = tmpbuf;
 
-	if (memcmp(ptr, XB_CRYPT_CHUNK_MAGIC1, XB_CRYPT_CHUNK_MAGIC_SIZE) == 0) {
-		version = 1;
-	} else if (memcmp(ptr, XB_CRYPT_CHUNK_MAGIC2, XB_CRYPT_CHUNK_MAGIC_SIZE) == 0) {
+	if (memcmp(ptr, XB_CRYPT_CHUNK_MAGIC3,
+		   XB_CRYPT_CHUNK_MAGIC_SIZE) == 0) {
+		version = 3;
+	} else if (memcmp(ptr, XB_CRYPT_CHUNK_MAGIC2,
+			  XB_CRYPT_CHUNK_MAGIC_SIZE) == 0) {
 		version = 2;
+	} else if (memcmp(ptr, XB_CRYPT_CHUNK_MAGIC1,
+			  XB_CRYPT_CHUNK_MAGIC_SIZE) == 0) {
+		version = 1;
 	} else {
 		msg("%s:%s: wrong chunk magic at offset 0x%llx.\n",
 		    my_progname, __FUNCTION__, crypt->offset);
@@ -152,25 +157,14 @@
 	}
 
 	if (*ivlen > crypt->ivbufsize) {
-		if (crypt->ivbuffer) {
-			crypt->ivbuffer = my_realloc(crypt->ivbuffer, *ivlen,
-						   MYF(MY_WME));
-			if (crypt->ivbuffer == NULL) {
-				msg("%s:%s: failed to increase iv buffer to "
-				    "%llu bytes.\n", my_progname, __FUNCTION__,
-				    (ulonglong)*ivlen);
-				result = XB_CRYPT_READ_ERROR;
-				goto err;
-			}
-		} else {
-			crypt->ivbuffer = my_malloc(*ivlen, MYF(MY_WME));
-			if (crypt->ivbuffer == NULL) {
-				msg("%s:%s: failed to allocate iv buffer of "
-				    "%llu bytes.\n", my_progname, __FUNCTION__,
-				    (ulonglong)*ivlen);
-				result = XB_CRYPT_READ_ERROR;
-				goto err;
-			}
+		crypt->ivbuffer = my_realloc(crypt->ivbuffer, *ivlen,
+					     MYF(MY_WME | MY_ALLOW_ZERO_PTR));
+		if (crypt->ivbuffer == NULL) {
+			msg("%s:%s: failed to increase iv buffer to "
+			    "%llu bytes.\n", my_progname, __FUNCTION__,
+			    (ulonglong)*ivlen);
+			result = XB_CRYPT_READ_ERROR;
+			goto err;
 		}
 		crypt->ivbufsize = *ivlen;
 	}
@@ -187,26 +181,22 @@
 		*iv = crypt->ivbuffer;
 	}
 
+	/* for version euqals 2 we need to read in the iv data but do not init
+	CTR with it */
+	if (version == 2) {
+		*ivlen = 0;
+		*iv = 0;
+	}
+
 	if (*olen > crypt->bufsize) {
-		if (crypt->buffer) {
-			crypt->buffer = my_realloc(crypt->buffer, *olen,
-						   MYF(MY_WME));
-			if (crypt->buffer == NULL) {
-				msg("%s:%s: failed to increase buffer to "
-				    "%llu bytes.\n", my_progname, __FUNCTION__,
-				    (ulonglong)*olen);
-				result = XB_CRYPT_READ_ERROR;
-				goto err;
-			}
-		} else {
-			crypt->buffer = my_malloc(*olen, MYF(MY_WME));
-			if (crypt->buffer == NULL) {
-				msg("%s:%s: failed to allocate buffer of "
-				    "%llu bytes.\n", my_progname, __FUNCTION__,
-				    (ulonglong)*olen);
-				result = XB_CRYPT_READ_ERROR;
-				goto err;
-			}
+		crypt->buffer = my_realloc(crypt->buffer, *olen,
+					   MYF(MY_WME | MY_ALLOW_ZERO_PTR));
+		if (crypt->buffer == NULL) {
+			msg("%s:%s: failed to increase buffer to "
+			    "%llu bytes.\n", my_progname, __FUNCTION__,
+			    (ulonglong)*olen);
+			result = XB_CRYPT_READ_ERROR;
+			goto err;
 		}
 		crypt->bufsize = *olen;
 	}
@@ -233,6 +223,9 @@
 
 	crypt->offset += *elen;
 	*buf = crypt->buffer;
+
+	*hash_appended = version > 2;
+
 	goto exit;
 
 err:
@@ -249,6 +242,8 @@
 {
 	if (crypt->buffer)
 		my_free(crypt->buffer);
+	if (crypt->ivbuffer)
+		my_free(crypt->ivbuffer);
 	my_free(crypt);
 
 	return 0;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt_write.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt_write.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbcrypt_write.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbcrypt_write.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -61,7 +61,7 @@
 
 	ptr = tmpbuf;
 
-	memcpy(ptr, XB_CRYPT_CHUNK_MAGIC2, XB_CRYPT_CHUNK_MAGIC_SIZE);
+	memcpy(ptr, XB_CRYPT_CHUNK_MAGIC_CURRENT, XB_CRYPT_CHUNK_MAGIC_SIZE);
 	ptr += XB_CRYPT_CHUNK_MAGIC_SIZE;
 
 	int8store(ptr, (ulonglong)0);	/* reserved */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xb_regex.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xb_regex.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xb_regex.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xb_regex.h	2017-02-27 07:47:02.000000000 +0000
@@ -12,7 +12,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbstream.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbstream.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbstream.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbstream.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -28,7 +28,7 @@
 #include "ds_stdout.h"
 
 #define XBSTREAM_VERSION "1.0"
-#define XBSTREAM_BUFFER_SIZE (1024 * 1024UL)
+#define XBSTREAM_BUFFER_SIZE (10 * 1024 * 1024UL)
 
 #define START_FILE_HASH_SIZE 16
 
@@ -207,18 +207,21 @@
 int
 stream_one_file(File file, xb_wstream_file_t *xbfile)
 {
-	uchar	buf[XBSTREAM_BUFFER_SIZE];
+	uchar	*buf;
 	size_t	bytes;
 	size_t	offset;
 
 	posix_fadvise(file, 0, 0, POSIX_FADV_SEQUENTIAL);
 	offset = my_tell(file, MYF(MY_WME));
 
+	buf = (uchar*)(my_malloc(XBSTREAM_BUFFER_SIZE, MYF(MY_FAE)));
+
 	while ((bytes = my_read(file, buf, XBSTREAM_BUFFER_SIZE,
 				MYF(MY_WME))) > 0) {
 		if (xb_stream_write_data(xbfile, buf, bytes)) {
 			msg("%s: xb_stream_write_data() failed.\n",
 			    my_progname);
+			my_free(buf);
 			return 1;
 		}
 		posix_fadvise(file, offset, XBSTREAM_BUFFER_SIZE,
@@ -227,6 +230,8 @@
 
 	}
 
+	my_free(buf);
+
 	if (bytes == (size_t) -1) {
 		return 1;
 	}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbstream.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbstream.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbstream.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbstream.h	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -30,6 +30,12 @@
 /* Chunk can be ignored if unknown version/format */
 #define XB_STREAM_FLAG_IGNORABLE 0x01
 
+/* Magic + flags + type + path len */
+#define CHUNK_HEADER_CONSTANT_LEN ((sizeof(XB_STREAM_CHUNK_MAGIC) - 1) + \
+				   1 + 1 + 4)
+#define CHUNK_TYPE_OFFSET (sizeof(XB_STREAM_CHUNK_MAGIC) - 1 + 1)
+#define PATH_LENGTH_OFFSET (sizeof(XB_STREAM_CHUNK_MAGIC) - 1 + 1 + 1)
+
 typedef struct xb_wstream_struct xb_wstream_t;
 
 typedef struct xb_wstream_file_struct xb_wstream_file_t;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbstream_read.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbstream_read.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbstream_read.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbstream_read.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -79,10 +79,6 @@
 		}							\
 	} while (0)
 
-/* Magic + flags + type + path len */
-#define CHUNK_HEADER_CONSTANT_LEN ((sizeof(XB_STREAM_CHUNK_MAGIC) - 1) + \
-				   1 + 1 + 4)
-
 xb_rstream_result_t
 xb_stream_read_chunk(xb_rstream_t *stream, xb_rstream_chunk_t *chunk)
 {
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbstream_write.c percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbstream_write.c
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xbstream_write.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xbstream_write.c	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
@@ -25,7 +25,7 @@
 #include "xbstream.h"
 
 /* Group writes smaller than this into a single chunk */
-#define XB_STREAM_MIN_CHUNK_SIZE (64 * 1024)
+#define XB_STREAM_MIN_CHUNK_SIZE (10 * 1024 * 1024)
 
 struct xb_wstream_struct {
 	pthread_mutex_t	mutex;
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xtrabackup.cc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xtrabackup.cc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xtrabackup.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xtrabackup.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 /******************************************************
 XtraBackup: hot backup tool for InnoDB
-(c) 2009-2013 Percona LLC and/or its affiliates
+(c) 2009-2015 Percona LLC and/or its affiliates
 Originally Created 3/3/2009 Yasufumi Kinoshita
 Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
 Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
@@ -16,7 +16,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************
 
@@ -49,6 +49,7 @@
 #include <mysqld.h>
 
 #include <fcntl.h>
+#include <string.h>
 
 #ifdef __linux__
 # include <sys/prctl.h>
@@ -64,6 +65,11 @@
 #include <row0mysql.h>
 #include <row0quiesce.h>
 #include <srv0start.h>
+#include <buf0dblwr.h>
+
+#include <sstream>
+#include <set>
+#include <mysql.h>
 
 #define G_PTR uchar*
 
@@ -80,6 +86,11 @@
 #include "xbstream.h"
 #include "changed_page_bitmap.h"
 #include "read_filt.h"
+#include "wsrep.h"
+#include "innobackupex.h"
+#include "backup_mysql.h"
+#include "backup_copy.h"
+#include "backup_mysql.h"
 
 /* TODO: replace with appropriate macros used in InnoDB 5.6 */
 #define PAGE_ZIP_MIN_SIZE_SHIFT	10
@@ -87,10 +98,7 @@
 #define DICT_TF_FORMAT_ZIP	1
 #define DICT_TF_FORMAT_SHIFT		5
 
-/* === File name constants === */
-#define XB_FN_SUSPENDED_AT_START "xtrabackup_suspended_1"
-#define XB_FN_SUSPENDED_AT_END "xtrabackup_suspended_2"
-#define XB_FN_LOG_COPIED "xtrabackup_log_copied"
+int sys_var_init();
 
 my_bool innodb_inited= 0;
 
@@ -101,13 +109,14 @@
 my_bool xtrabackup_backup = FALSE;
 my_bool xtrabackup_stats = FALSE;
 my_bool xtrabackup_prepare = FALSE;
+my_bool xtrabackup_copy_back = FALSE;
+my_bool xtrabackup_move_back = FALSE;
+my_bool xtrabackup_decrypt_decompress = FALSE;
 my_bool xtrabackup_print_param = FALSE;
 
 my_bool xtrabackup_export = FALSE;
 my_bool xtrabackup_apply_log_only = FALSE;
 
-static my_bool	xtrabackup_suspend_at_start = FALSE;
-my_bool xtrabackup_suspend_at_end = FALSE;
 longlong xtrabackup_use_memory = 100*1024*1024L;
 my_bool xtrabackup_create_ib_logfile = FALSE;
 
@@ -126,23 +135,39 @@
 char *xtrabackup_extra_lsndir = NULL; /* for --backup with --extra-lsndir */
 char *xtrabackup_incremental_dir = NULL; /* for --prepare */
 
+char xtrabackup_real_incremental_basedir[FN_REFLEN];
+char xtrabackup_real_extra_lsndir[FN_REFLEN];
+char xtrabackup_real_incremental_dir[FN_REFLEN];
+
 lsn_t xtrabackup_archived_to_lsn = 0; /* for --archived-to-lsn */
 
 char *xtrabackup_tables = NULL;
-int tables_regex_num;
-xb_regex_t *tables_regex;
-xb_regmatch_t tables_regmatch[1];
+
+/* List of regular expressions for filtering */
+typedef struct xb_regex_list_node_struct xb_regex_list_node_t;
+struct xb_regex_list_node_struct {
+	UT_LIST_NODE_T(xb_regex_list_node_t)	regex_list;
+	xb_regex_t				regex;
+};
+static UT_LIST_BASE_NODE_T(xb_regex_list_node_t) regex_list;
+
+static xb_regmatch_t tables_regmatch[1];
 
 char *xtrabackup_tables_file = NULL;
-hash_table_t* tables_hash;
+static hash_table_t* tables_hash = NULL;
+
+char *xtrabackup_databases = NULL;
+char *xtrabackup_databases_file = NULL;
+static hash_table_t* databases_hash = NULL;
 
-hash_table_t* inc_dir_tables_hash;
+static hash_table_t* inc_dir_tables_hash;
 
-struct xtrabackup_tables_struct{
+struct xb_filter_entry_struct{
 	char*		name;
+	ibool		has_tables;
 	hash_node_t	name_hash;
 };
-typedef struct xtrabackup_tables_struct	xtrabackup_tables_t;
+typedef struct xb_filter_entry_struct	xb_filter_entry_t;
 
 static ulint		thread_nr[SRV_MAX_N_IO_THREADS + 6];
 static os_thread_id_t	thread_ids[SRV_MAX_N_IO_THREADS + 6];
@@ -152,16 +177,17 @@
 lsn_t log_copy_scanned_lsn;
 ibool log_copying = TRUE;
 ibool log_copying_running = FALSE;
+ibool io_watching_thread_running = FALSE;
 
 ibool xtrabackup_logfile_is_renamed = FALSE;
 
 int xtrabackup_parallel;
 
 char *xtrabackup_stream_str = NULL;
-xb_stream_fmt_t xtrabackup_stream_fmt;
+xb_stream_fmt_t xtrabackup_stream_fmt = XB_STREAM_FMT_NONE;
 ibool xtrabackup_stream = FALSE;
 
-static const char *xtrabackup_compress_alg = NULL;
+const char *xtrabackup_compress_alg = NULL;
 ibool xtrabackup_compress = FALSE;
 uint xtrabackup_compress_threads;
 ulonglong xtrabackup_compress_chunk_size = 0;
@@ -183,11 +209,15 @@
 
 /* sleep interval beetween log copy iterations in log copying thread
 in milliseconds (default is 1 second) */
-int xtrabackup_log_copy_interval = 1000;
+ulint xtrabackup_log_copy_interval = 1000;
+
+/* Ignored option (--log) for MySQL option compatibility */
+char*	log_ignored_opt				= NULL;
 
 /* === metadata of backup === */
 #define XTRABACKUP_METADATA_FILENAME "xtrabackup_checkpoints"
-char metadata_type[30] = ""; /*[full-backuped|full-prepared|incremental]*/
+char metadata_type[30] = ""; /*[full-backuped|log-applied|
+			     full-prepared|incremental]*/
 lsn_t metadata_from_lsn = 0;
 lsn_t metadata_to_lsn = 0;
 lsn_t metadata_last_lsn = 0;
@@ -269,10 +299,10 @@
 
 static char *xtrabackup_debug_sync = NULL;
 
-static my_bool xtrabackup_compact = FALSE;
-static my_bool xtrabackup_rebuild_indexes = FALSE;
+my_bool xtrabackup_compact = FALSE;
+my_bool xtrabackup_rebuild_indexes = FALSE;
 
-static my_bool xtrabackup_incremental_force_scan = FALSE;
+my_bool xtrabackup_incremental_force_scan = FALSE;
 
 /* The flushed lsn which is read from data files */
 lsn_t	min_flushed_lsn= 0;
@@ -286,10 +316,87 @@
 lsn_t xtrabackup_arch_last_file_lsn = 0ULL;
 
 ulong xb_open_files_limit= 0;
+my_bool xb_close_files= FALSE;
 
 /* Datasinks */
 ds_ctxt_t       *ds_data     = NULL;
 ds_ctxt_t       *ds_meta     = NULL;
+ds_ctxt_t       *ds_redo     = NULL;
+
+static bool	innobackupex_mode = false;
+
+static long	innobase_log_files_in_group_save;
+static char	*srv_log_group_home_dir_save;
+static longlong	innobase_log_file_size_save;
+
+/* String buffer used by --print-param to accumulate server options as they are
+parsed from the defaults file */
+static std::ostringstream print_param_str;
+
+/* Set of specified parameters */
+std::set<std::string> param_set;
+
+static ulonglong global_max_value;
+
+extern "C" sig_handler handle_fatal_signal(int sig);
+
+my_bool opt_galera_info = FALSE;
+my_bool opt_slave_info = FALSE;
+my_bool opt_no_lock = FALSE;
+my_bool opt_safe_slave_backup = FALSE;
+my_bool opt_rsync = FALSE;
+my_bool opt_force_non_empty_dirs = FALSE;
+my_bool opt_noversioncheck = FALSE;
+my_bool opt_no_backup_locks = FALSE;
+my_bool opt_decompress = FALSE;
+my_bool opt_remove_original = FALSE;
+
+static const char *binlog_info_values[] = {"off", "lockless", "on", "auto",
+					   NullS};
+static TYPELIB binlog_info_typelib = {array_elements(binlog_info_values)-1, "",
+				      binlog_info_values, NULL};
+ulong opt_binlog_info;
+
+char *opt_incremental_history_name = NULL;
+char *opt_incremental_history_uuid = NULL;
+
+char *opt_user = NULL;
+char *opt_password = NULL;
+char *opt_host = NULL;
+char *opt_defaults_group = NULL;
+char *opt_socket = NULL;
+uint opt_port = 0;
+char *opt_login_path = NULL;
+char *opt_log_bin = NULL;
+
+const char *query_type_names[] = { "ALL", "UPDATE", "SELECT", NullS};
+
+TYPELIB query_type_typelib= {array_elements(query_type_names) - 1, "",
+	query_type_names, NULL};
+
+ulong opt_lock_wait_query_type;
+ulong opt_kill_long_query_type;
+
+ulong opt_decrypt_algo = 0;
+
+uint opt_kill_long_queries_timeout = 0;
+uint opt_lock_wait_timeout = 0;
+uint opt_lock_wait_threshold = 0;
+uint opt_debug_sleep_before_unlock = 0;
+uint opt_safe_slave_backup_timeout = 0;
+
+const char *opt_history = NULL;
+my_bool opt_decrypt = FALSE;
+
+#if defined(HAVE_OPENSSL)
+my_bool opt_ssl_verify_server_cert = FALSE;
+#if !defined(HAVE_YASSL)
+char *opt_server_public_key = NULL;
+#endif
+#endif
+
+/* Whether xtrabackup_binlog_info should be created on recovery */
+static bool recover_binlog_info;
 
 /* Simple datasink creation tracking...add datasinks in the reverse order you
 want them destroyed. */
@@ -380,15 +487,14 @@
 
 enum options_xtrabackup
 {
-  OPT_XTRA_TARGET_DIR=256,
+  OPT_XTRA_TARGET_DIR = 1000,     /* make sure it is larger
+                                     than OPT_MAX_CLIENT_OPTION */
   OPT_XTRA_BACKUP,
   OPT_XTRA_STATS,
   OPT_XTRA_PREPARE,
   OPT_XTRA_EXPORT,
   OPT_XTRA_APPLY_LOG_ONLY,
   OPT_XTRA_PRINT_PARAM,
-  OPT_XTRA_SUSPEND_AT_START,
-  OPT_XTRA_SUSPEND_AT_END,
   OPT_XTRA_USE_MEMORY,
   OPT_XTRA_THROTTLE,
   OPT_XTRA_LOG_COPY_INTERVAL,
@@ -399,6 +505,8 @@
   OPT_XTRA_ARCHIVED_TO_LSN,
   OPT_XTRA_TABLES,
   OPT_XTRA_TABLES_FILE,
+  OPT_XTRA_DATABASES,
+  OPT_XTRA_DATABASES_FILE,
   OPT_XTRA_CREATE_IB_LOGFILE,
   OPT_XTRA_PARALLEL,
   OPT_XTRA_STREAM,
@@ -410,6 +518,7 @@
   OPT_XTRA_ENCRYPT_KEY_FILE,
   OPT_XTRA_ENCRYPT_THREADS,
   OPT_XTRA_ENCRYPT_CHUNK_SIZE,
+  OPT_LOG,
   OPT_INNODB,
   OPT_INNODB_CHECKSUMS,
   OPT_INNODB_DATA_FILE_PATH,
@@ -460,14 +569,47 @@
   OPT_XTRA_REBUILD_THREADS,
   OPT_INNODB_CHECKSUM_ALGORITHM,
   OPT_INNODB_UNDO_DIRECTORY,
-  OPT_UNDO_TABLESPACES,
+  OPT_INNODB_UNDO_TABLESPACES,
   OPT_INNODB_LOG_CHECKSUM_ALGORITHM,
   OPT_XTRA_INCREMENTAL_FORCE_SCAN,
   OPT_DEFAULTS_GROUP,
-  OPT_OPEN_FILES_LIMIT
+  OPT_OPEN_FILES_LIMIT,
+  OPT_CLOSE_FILES,
+  OPT_CORE_FILE,
+
+  OPT_COPY_BACK,
+  OPT_MOVE_BACK,
+  OPT_GALERA_INFO,
+  OPT_SLAVE_INFO,
+  OPT_NO_LOCK,
+  OPT_SAFE_SLAVE_BACKUP,
+  OPT_RSYNC,
+  OPT_FORCE_NON_EMPTY_DIRS,
+  OPT_NO_VERSION_CHECK,
+  OPT_NO_BACKUP_LOCKS,
+  OPT_DECOMPRESS,
+  OPT_INCREMENTAL_HISTORY_NAME,
+  OPT_INCREMENTAL_HISTORY_UUID,
+  OPT_DECRYPT,
+  OPT_REMOVE_ORIGINAL,
+  OPT_LOCK_WAIT_QUERY_TYPE,
+  OPT_KILL_LONG_QUERY_TYPE,
+  OPT_HISTORY,
+  OPT_KILL_LONG_QUERIES_TIMEOUT,
+  OPT_LOCK_WAIT_TIMEOUT,
+  OPT_LOCK_WAIT_THRESHOLD,
+  OPT_DEBUG_SLEEP_BEFORE_UNLOCK,
+  OPT_SAFE_SLAVE_BACKUP_TIMEOUT,
+  OPT_BINLOG_INFO,
+  OPT_XB_SECURE_AUTH,
+
+  OPT_SSL_SSL,
+  OPT_SSL_VERIFY_SERVER_CERT,
+  OPT_SERVER_PUBLIC_KEY,
+
 };
 
-static struct my_option xb_long_options[] =
+struct my_option xb_client_options[] =
 {
   {"version", 'v', "print xtrabackup version information",
    (G_PTR *) &xtrabackup_version, (G_PTR *) &xtrabackup_version, 0, GET_BOOL,
@@ -497,24 +639,12 @@
    (G_PTR*) &xtrabackup_use_memory, (G_PTR*) &xtrabackup_use_memory,
    0, GET_LL, REQUIRED_ARG, 100*1024*1024L, 1024*1024L, LONGLONG_MAX, 0,
    1024*1024L, 0},
-
-  {"suspend-at-start", OPT_XTRA_SUSPEND_AT_START,
-   "creates a file '" XB_FN_SUSPENDED_AT_START "' and waits until the user "
-   "deletes that file after the background log copying thread is started "
-   "during backup",
-   (G_PTR*) &xtrabackup_suspend_at_start,
-   (G_PTR*) &xtrabackup_suspend_at_start, 0, GET_BOOL, NO_ARG,
-   0, 0, 0, 0, 0, 0},
-
-  {"suspend-at-end", OPT_XTRA_SUSPEND_AT_END, "creates a file '"
-   XB_FN_SUSPENDED_AT_END "' and waits until the user deletes that file at "
-   "the end of '--backup'",
-   (G_PTR*) &xtrabackup_suspend_at_end, (G_PTR*) &xtrabackup_suspend_at_end,
-   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-
   {"throttle", OPT_XTRA_THROTTLE, "limit count of IO operations (pairs of read&write) per second to IOS values (for '--backup')",
    (G_PTR*) &xtrabackup_throttle, (G_PTR*) &xtrabackup_throttle,
    0, GET_LONG, REQUIRED_ARG, 0, 0, LONG_MAX, 0, 1, 0},
+  {"log", OPT_LOG, "Ignored option for MySQL option compatibility",
+   (G_PTR*) &log_ignored_opt, (G_PTR*) &log_ignored_opt, 0,
+   GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"log-copy-interval", OPT_XTRA_LOG_COPY_INTERVAL, "time interval between checks done by log copying thread in milliseconds (default is 1 second).",
    (G_PTR*) &xtrabackup_log_copy_interval, (G_PTR*) &xtrabackup_log_copy_interval,
    0, GET_LONG, REQUIRED_ARG, 1000, 0, LONG_MAX, 0, 1, 0},
@@ -540,28 +670,17 @@
   {"tables_file", OPT_XTRA_TABLES_FILE, "filtering by list of the exact database.table name in the file.",
    (G_PTR*) &xtrabackup_tables_file, (G_PTR*) &xtrabackup_tables_file,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"databases", OPT_XTRA_DATABASES, "filtering by list of databases.",
+   (G_PTR*) &xtrabackup_databases, (G_PTR*) &xtrabackup_databases,
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"databases_file", OPT_XTRA_TABLES_FILE,
+   "filtering by list of databases in the file.",
+   (G_PTR*) &xtrabackup_databases_file, (G_PTR*) &xtrabackup_databases_file,
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"create-ib-logfile", OPT_XTRA_CREATE_IB_LOGFILE, "** not work for now** creates ib_logfile* also after '--prepare'. ### If you want create ib_logfile*, only re-execute this command in same options. ###",
    (G_PTR*) &xtrabackup_create_ib_logfile, (G_PTR*) &xtrabackup_create_ib_logfile,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 
-  {"datadir", 'h', "Path to the database root.", (G_PTR*) &mysql_data_home,
-   (G_PTR*) &mysql_data_home, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"tmpdir", 't',
-   "Path for temporary files. Several paths may be specified, separated by a "
-#if defined(__WIN__) || defined(OS2) || defined(__NETWARE__)
-   "semicolon (;)"
-#else
-   "colon (:)"
-#endif
-   ", in this case they are used in a round-robin fashion.",
-   (G_PTR*) &opt_mysql_tmpdir,
-   (G_PTR*) &opt_mysql_tmpdir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"parallel", OPT_XTRA_PARALLEL,
-   "Number of threads to use for parallel datafiles transfer. Does not have "
-   "any effect in the stream mode. The default value is 1.",
-   (G_PTR*) &xtrabackup_parallel, (G_PTR*) &xtrabackup_parallel, 0, GET_INT,
-   REQUIRED_ARG, 1, 1, INT_MAX, 0, 0, 0},
-
   {"stream", OPT_XTRA_STREAM, "Stream all backup files to the standard output "
    "in the specified format. Currently the only supported format is 'tar'.",
    (G_PTR*) &xtrabackup_stream_str, (G_PTR*) &xtrabackup_stream_str, 0, GET_STR,
@@ -607,6 +726,320 @@
    (G_PTR*) &xtrabackup_encrypt_chunk_size, (G_PTR*) &xtrabackup_encrypt_chunk_size,
    0, GET_ULL, REQUIRED_ARG, (1 << 16), 1024, ULONGLONG_MAX, 0, 0, 0},
 
+  {"compact", OPT_XTRA_COMPACT,
+   "Create a compact backup by skipping secondary index pages.",
+   (G_PTR*) &xtrabackup_compact, (G_PTR*) &xtrabackup_compact,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"rebuild_indexes", OPT_XTRA_REBUILD_INDEXES,
+   "Rebuild secondary indexes in InnoDB tables after applying the log. "
+   "Only has effect with --prepare.",
+   (G_PTR*) &xtrabackup_rebuild_indexes, (G_PTR*) &xtrabackup_rebuild_indexes,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"rebuild_threads", OPT_XTRA_REBUILD_THREADS,
+   "Use this number of threads to rebuild indexes in a compact backup. "
+   "Only has effect with --prepare and --rebuild-indexes.",
+   (G_PTR*) &xtrabackup_rebuild_threads, (G_PTR*) &xtrabackup_rebuild_threads,
+   0, GET_UINT, REQUIRED_ARG, 1, 1, UINT_MAX, 0, 0, 0},
+
+  {"incremental-force-scan", OPT_XTRA_INCREMENTAL_FORCE_SCAN,
+   "Perform a full-scan incremental backup even in the presence of changed "
+   "page bitmap data",
+   (G_PTR*)&xtrabackup_incremental_force_scan,
+   (G_PTR*)&xtrabackup_incremental_force_scan, 0, GET_BOOL, NO_ARG,
+   0, 0, 0, 0, 0, 0},
+
+
+  {"close_files", OPT_CLOSE_FILES, "do not keep files opened. Use at your own "
+   "risk.", (G_PTR*) &xb_close_files, (G_PTR*) &xb_close_files, 0, GET_BOOL,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"core-file", OPT_CORE_FILE, "Write core on fatal signals", 0, 0, 0,
+   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+
+  {"copy-back", OPT_COPY_BACK, "Copy all the files in a previously made "
+   "backup from the backup directory to their original locations.",
+   (uchar *) &xtrabackup_copy_back, (uchar *) &xtrabackup_copy_back, 0,
+   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"move-back", OPT_MOVE_BACK, "Move all the files in a previously made "
+   "backup from the backup directory to the actual datadir location. "
+   "Use with caution, as it removes backup files.",
+   (uchar *) &xtrabackup_move_back, (uchar *) &xtrabackup_move_back, 0,
+   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"galera-info", OPT_GALERA_INFO, "This options creates the "
+   "xtrabackup_galera_info file which contains the local node state at "
+   "the time of the backup. Option should be used when performing the "
+   "backup of Percona-XtraDB-Cluster. Has no effect when backup locks "
+   "are used to create the backup.",
+   (uchar *) &opt_galera_info, (uchar *) &opt_galera_info, 0,
+   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"slave-info", OPT_SLAVE_INFO, "This option is useful when backing "
+   "up a replication slave server. It prints the binary log position "
+   "and name of the master server. It also writes this information to "
+   "the \"xtrabackup_slave_info\" file as a \"CHANGE MASTER\" command. "
+   "A new slave for this master can be set up by starting a slave server "
+   "on this backup and issuing a \"CHANGE MASTER\" command with the "
+   "binary log position saved in the \"xtrabackup_slave_info\" file.",
+   (uchar *) &opt_slave_info, (uchar *) &opt_slave_info, 0,
+   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"no-lock", OPT_NO_LOCK, "Use this option to disable table lock "
+   "with \"FLUSH TABLES WITH READ LOCK\". Use it only if ALL your "
+   "tables are InnoDB and you DO NOT CARE about the binary log "
+   "position of the backup. This option shouldn't be used if there "
+   "are any DDL statements being executed or if any updates are "
+   "happening on non-InnoDB tables (this includes the system MyISAM "
+   "tables in the mysql database), otherwise it could lead to an "
+   "inconsistent backup. If you are considering to use --no-lock "
+   "because your backups are failing to acquire the lock, this could "
+   "be because of incoming replication events preventing the lock "
+   "from succeeding. Please try using --safe-slave-backup to "
+   "momentarily stop the replication slave thread, this may help "
+   "the backup to succeed and you then don't need to resort to "
+   "using this option.",
+   (uchar *) &opt_no_lock, (uchar *) &opt_no_lock, 0,
+   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"safe-slave-backup", OPT_SAFE_SLAVE_BACKUP, "Stop slave SQL thread "
+   "and wait to start backup until Slave_open_temp_tables in "
+   "\"SHOW STATUS\" is zero. If there are no open temporary tables, "
+   "the backup will take place, otherwise the SQL thread will be "
+   "started and stopped until there are no open temporary tables. "
+   "The backup will fail if Slave_open_temp_tables does not become "
+   "zero after --safe-slave-backup-timeout seconds. The slave SQL "
+   "thread will be restarted when the backup finishes.",
+   (uchar *) &opt_safe_slave_backup,
+   (uchar *) &opt_safe_slave_backup,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"rsync", OPT_RSYNC, "Uses the rsync utility to optimize local file "
+   "transfers. When this option is specified, innobackupex uses rsync "
+   "to copy all non-InnoDB files instead of spawning a separate cp for "
+   "each file, which can be much faster for servers with a large number "
+   "of databases or tables.  This option cannot be used together with "
+   "--stream.",
+   (uchar *) &opt_rsync, (uchar *) &opt_rsync,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"force-non-empty-directories", OPT_FORCE_NON_EMPTY_DIRS, "This "
+   "option, when specified, makes --copy-back or --move-back transfer "
+   "files to non-empty directories. Note that no existing files will be "
+   "overwritten. If --copy-back or --nove-back has to copy a file from "
+   "the backup directory which already exists in the destination "
+   "directory, it will still fail with an error.",
+   (uchar *) &opt_force_non_empty_dirs,
+   (uchar *) &opt_force_non_empty_dirs,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"no-version-check", OPT_NO_VERSION_CHECK, "This option disables the "
+   "version check which is enabled by the --version-check option.",
+   (uchar *) &opt_noversioncheck,
+   (uchar *) &opt_noversioncheck,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"no-backup-locks", OPT_NO_BACKUP_LOCKS, "This option controls if "
+   "backup locks should be used instead of FLUSH TABLES WITH READ LOCK "
+   "on the backup stage. The option has no effect when backup locks are "
+   "not supported by the server. This option is enabled by default, "
+   "disable with --no-backup-locks.",
+   (uchar *) &opt_no_backup_locks,
+   (uchar *) &opt_no_backup_locks,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"decompress", OPT_DECOMPRESS, "Decompresses all files with the .qp "
+   "extension in a backup previously made with the --compress option.",
+   (uchar *) &opt_decompress,
+   (uchar *) &opt_decompress,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"user", 'u', "This option specifies the MySQL username used "
+   "when connecting to the server, if that's not the current user. "
+   "The option accepts a string argument. See mysql --help for details.",
+   (uchar*) &opt_user, (uchar*) &opt_user, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"host", 'H', "This option specifies the host to use when "
+   "connecting to the database server with TCP/IP.  The option accepts "
+   "a string argument. See mysql --help for details.",
+   (uchar*) &opt_host, (uchar*) &opt_host, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"port", 'P', "This option specifies the port to use when "
+   "connecting to the database server with TCP/IP.  The option accepts "
+   "a string argument. See mysql --help for details.",
+   &opt_port, &opt_port, 0, GET_UINT, REQUIRED_ARG,
+   0, 0, 0, 0, 0, 0},
+
+  {"password", 'p', "This option specifies the password to use "
+   "when connecting to the database. It accepts a string argument.  "
+   "See mysql --help for details.",
+   0, 0, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"socket", 'S', "This option specifies the socket to use when "
+   "connecting to the local database server with a UNIX domain socket.  "
+   "The option accepts a string argument. See mysql --help for details.",
+   (uchar*) &opt_socket, (uchar*) &opt_socket, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"incremental-history-name", OPT_INCREMENTAL_HISTORY_NAME,
+   "This option specifies the name of the backup series stored in the "
+   "PERCONA_SCHEMA.xtrabackup_history history record to base an "
+   "incremental backup on. Xtrabackup will search the history table "
+   "looking for the most recent (highest innodb_to_lsn), successful "
+   "backup in the series and take the to_lsn value to use as the "
+   "starting lsn for the incremental backup. This will be mutually "
+   "exclusive with --incremental-history-uuid, --incremental-basedir "
+   "and --incremental-lsn. If no valid lsn can be found (no series by "
+   "that name, no successful backups by that name) xtrabackup will "
+   "return with an error. It is used with the --incremental option.",
+   (uchar*) &opt_incremental_history_name,
+   (uchar*) &opt_incremental_history_name, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"incremental-history-uuid", OPT_INCREMENTAL_HISTORY_UUID,
+   "This option specifies the UUID of the specific history record "
+   "stored in the PERCONA_SCHEMA.xtrabackup_history to base an "
+   "incremental backup on. --incremental-history-name, "
+   "--incremental-basedir and --incremental-lsn. If no valid lsn can be "
+   "found (no success record with that uuid) xtrabackup will return "
+   "with an error. It is used with the --incremental option.",
+   (uchar*) &opt_incremental_history_uuid,
+   (uchar*) &opt_incremental_history_uuid, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"decrypt", OPT_DECRYPT, "Decrypts all files with the .xbcrypt "
+   "extension in a backup previously made with --encrypt option.",
+   &opt_decrypt_algo, &opt_decrypt_algo,
+   &xtrabackup_encrypt_algo_typelib, GET_ENUM, REQUIRED_ARG,
+   0, 0, 0, 0, 0, 0},
+
+  {"remove-original", OPT_REMOVE_ORIGINAL, "Remove .qp and .xbcrypt files "
+   "after decryption and decompression.",
+   (uchar *) &opt_remove_original,
+   (uchar *) &opt_remove_original,
+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"ftwrl-wait-query-type", OPT_LOCK_WAIT_QUERY_TYPE,
+   "This option specifies which types of queries are allowed to complete "
+   "before innobackupex will issue the global lock. Default is all.",
+   (uchar*) &opt_lock_wait_query_type,
+   (uchar*) &opt_lock_wait_query_type, &query_type_typelib,
+   GET_ENUM, REQUIRED_ARG, QUERY_TYPE_ALL, 0, 0, 0, 0, 0},
+
+  {"kill-long-query-type", OPT_KILL_LONG_QUERY_TYPE,
+   "This option specifies which types of queries should be killed to "
+   "unblock the global lock. Default is \"all\".",
+   (uchar*) &opt_kill_long_query_type,
+   (uchar*) &opt_kill_long_query_type, &query_type_typelib,
+   GET_ENUM, REQUIRED_ARG, QUERY_TYPE_SELECT, 0, 0, 0, 0, 0},
+
+  {"history", OPT_HISTORY,
+   "This option enables the tracking of backup history in the "
+   "PERCONA_SCHEMA.xtrabackup_history table. An optional history "
+   "series name may be specified that will be placed with the history "
+   "record for the current backup being taken.",
+   NULL, NULL, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"kill-long-queries-timeout", OPT_KILL_LONG_QUERIES_TIMEOUT,
+   "This option specifies the number of seconds innobackupex waits "
+   "between starting FLUSH TABLES WITH READ LOCK and killing those "
+   "queries that block it. Default is 0 seconds, which means "
+   "innobackupex will not attempt to kill any queries.",
+   (uchar*) &opt_kill_long_queries_timeout,
+   (uchar*) &opt_kill_long_queries_timeout, 0, GET_UINT,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"ftwrl-wait-timeout", OPT_LOCK_WAIT_TIMEOUT,
+   "This option specifies time in seconds that innobackupex should wait "
+   "for queries that would block FTWRL before running it. If there are "
+   "still such queries when the timeout expires, innobackupex terminates "
+   "with an error. Default is 0, in which case innobackupex does not "
+   "wait for queries to complete and starts FTWRL immediately.",
+   (uchar*) &opt_lock_wait_timeout,
+   (uchar*) &opt_lock_wait_timeout, 0, GET_UINT,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"ftwrl-wait-threshold", OPT_LOCK_WAIT_THRESHOLD,
+   "This option specifies the query run time threshold which is used by "
+   "innobackupex to detect long-running queries with a non-zero value "
+   "of --ftwrl-wait-timeout. FTWRL is not started until such "
+   "long-running queries exist. This option has no effect if "
+   "--ftwrl-wait-timeout is 0. Default value is 60 seconds.",
+   (uchar*) &opt_lock_wait_threshold,
+   (uchar*) &opt_lock_wait_threshold, 0, GET_UINT,
+   REQUIRED_ARG, 60, 0, 0, 0, 0, 0},
+
+  {"debug-sleep-before-unlock", OPT_DEBUG_SLEEP_BEFORE_UNLOCK,
+   "This is a debug-only option used by the XtraBackup test suite.",
+   (uchar*) &opt_debug_sleep_before_unlock,
+   (uchar*) &opt_debug_sleep_before_unlock, 0, GET_UINT,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"safe-slave-backup-timeout", OPT_SAFE_SLAVE_BACKUP_TIMEOUT,
+   "How many seconds --safe-slave-backup should wait for "
+   "Slave_open_temp_tables to become zero. (default 300)",
+   (uchar*) &opt_safe_slave_backup_timeout,
+   (uchar*) &opt_safe_slave_backup_timeout, 0, GET_UINT,
+   REQUIRED_ARG, 300, 0, 0, 0, 0, 0},
+
+  {"binlog-info", OPT_BINLOG_INFO,
+   "This option controls how XtraBackup should retrieve server's binary log "
+   "coordinates corresponding to the backup. Possible values are OFF, ON, "
+   "LOCKLESS and AUTO. See the XtraBackup manual for more information",
+   &opt_binlog_info, &opt_binlog_info,
+   &binlog_info_typelib, GET_ENUM, OPT_ARG, BINLOG_INFO_AUTO, 0, 0, 0, 0, 0},
+
+  {"secure-auth", OPT_XB_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
+
+#include "sslopt-longopts.h"
+
+#if !defined(HAVE_YASSL)
+  {"server-public-key-path", OPT_SERVER_PUBLIC_KEY,
+   "File path to the server public RSA key in PEM format.",
+   &opt_server_public_key, &opt_server_public_key, 0,
+   GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#endif
+
+  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+
+uint xb_client_options_count = array_elements(xb_client_options);
+
+struct my_option xb_server_options[] =
+{
+  {"datadir", 'h', "Path to the database root.", (G_PTR*) &mysql_data_home,
+   (G_PTR*) &mysql_data_home, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"tmpdir", 't',
+   "Path for temporary files. Several paths may be specified, separated by a "
+#if defined(__WIN__) || defined(OS2) || defined(__NETWARE__)
+   "semicolon (;)"
+#else
+   "colon (:)"
+#endif
+   ", in this case they are used in a round-robin fashion.",
+   (G_PTR*) &opt_mysql_tmpdir,
+   (G_PTR*) &opt_mysql_tmpdir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"parallel", OPT_XTRA_PARALLEL,
+   "Number of threads to use for parallel datafiles transfer. Does not have "
+   "any effect in the stream mode. The default value is 1.",
+   (G_PTR*) &xtrabackup_parallel, (G_PTR*) &xtrabackup_parallel, 0, GET_INT,
+   REQUIRED_ARG, 1, 1, INT_MAX, 0, 0, 0},
+
+   {"log", OPT_LOG, "Ignored option for MySQL option compatibility",
+   (G_PTR*) &log_ignored_opt, (G_PTR*) &log_ignored_opt, 0,
+   GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+
+   {"log_bin", OPT_LOG, "Base name for the log sequence",
+   &opt_log_bin, &opt_log_bin, 0, GET_STR_ALLOC, OPT_ARG, 0, 0, 0, 0, 0, 0},
+
    {"innodb", OPT_INNODB, "Ignored option for MySQL option compatibility",
    (G_PTR*) &innobase_ignored_opt, (G_PTR*) &innobase_ignored_opt, 0,
    GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
@@ -635,27 +1068,12 @@
   {"innodb_checksums", OPT_INNODB_CHECKSUMS, "Enable InnoDB checksums validation (enabled by default). \
 Disable with --skip-innodb-checksums.", (G_PTR*) &innobase_use_checksums,
    (G_PTR*) &innobase_use_checksums, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
-/*
-  {"innodb_commit_concurrency", OPT_INNODB_COMMIT_CONCURRENCY,
-   "Helps in performance tuning in heavily concurrent environments.",
-   (G_PTR*) &srv_commit_concurrency, (G_PTR*) &srv_commit_concurrency,
-   0, GET_ULONG, REQUIRED_ARG, 0, 0, 1000, 0, 1, 0},
-*/
-/*
-  {"innodb_concurrency_tickets", OPT_INNODB_CONCURRENCY_TICKETS,
-   "Number of times a thread is allowed to enter InnoDB within the same \
-    SQL query after it has once got the ticket",
-   (G_PTR*) &srv_n_free_tickets_to_enter,
-   (G_PTR*) &srv_n_free_tickets_to_enter,
-   0, GET_ULONG, REQUIRED_ARG, 500L, 1L, ULONG_MAX, 0, 1L, 0},
-*/
   {"innodb_data_file_path", OPT_INNODB_DATA_FILE_PATH,
-   "Path to individual files and their sizes.", (G_PTR*) &innobase_data_file_path,
-   (G_PTR*) &innobase_data_file_path, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   "Path to individual files and their sizes.", &innobase_data_file_path,
+   &innobase_data_file_path, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"innodb_data_home_dir", OPT_INNODB_DATA_HOME_DIR,
-   "The common part for InnoDB table spaces.", (G_PTR*) &innobase_data_home_dir,
-   (G_PTR*) &innobase_data_home_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0,
-   0},
+   "The common part for InnoDB table spaces.", &innobase_data_home_dir,
+   &innobase_data_home_dir, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"innodb_doublewrite", OPT_INNODB_DOUBLEWRITE, "Enable InnoDB doublewrite buffer (enabled by default). \
 Disable with --skip-innodb-doublewrite.", (G_PTR*) &innobase_use_doublewrite,
    (G_PTR*) &innobase_use_doublewrite, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
@@ -663,16 +1081,6 @@
    "Number of IOPs the server can do. Tunes the background IO rate",
    (G_PTR*) &srv_io_capacity, (G_PTR*) &srv_io_capacity,
    0, GET_ULONG, OPT_ARG, 200, 100, ~0UL, 0, 0, 0},
-/*
-  {"innodb_fast_shutdown", OPT_INNODB_FAST_SHUTDOWN,
-   "Speeds up the shutdown process of the InnoDB storage engine. Possible "
-   "values are 0, 1 (faster)"
-   " or 2 (fastest - crash-like)"
-   ".",
-   (G_PTR*) &innobase_fast_shutdown,
-   (G_PTR*) &innobase_fast_shutdown, 0, GET_ULONG, OPT_ARG, 1, 0,
-   2, 0, 0, 0},
-*/
   {"innodb_file_io_threads", OPT_INNODB_FILE_IO_THREADS,
    "Number of file I/O threads in InnoDB.", (G_PTR*) &innobase_file_io_threads,
    (G_PTR*) &innobase_file_io_threads, 0, GET_LONG, REQUIRED_ARG, 4, 4, 64, 0,
@@ -719,13 +1127,13 @@
    GET_LL, REQUIRED_ARG, 48*1024*1024L, 1*1024*1024L, LONGLONG_MAX, 0,
    1024*1024L, 0},
   {"innodb_log_files_in_group", OPT_INNODB_LOG_FILES_IN_GROUP,
-   "Number of log files in the log group. InnoDB writes to the files in a circular fashion. Value 3 is recommended here.",
-   (G_PTR*) &innobase_log_files_in_group, (G_PTR*) &innobase_log_files_in_group,
+   "Number of log files in the log group. InnoDB writes to the files in a "
+   "circular fashion. Value 3 is recommended here.",
+   &innobase_log_files_in_group, &innobase_log_files_in_group,
    0, GET_LONG, REQUIRED_ARG, 2, 2, 100, 0, 1, 0},
   {"innodb_log_group_home_dir", OPT_INNODB_LOG_GROUP_HOME_DIR,
-   "Path to InnoDB log files.", (G_PTR*) &srv_log_group_home_dir,
-   (G_PTR*) &srv_log_group_home_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0,
-   0, 0},
+   "Path to InnoDB log files.", &srv_log_group_home_dir,
+   &srv_log_group_home_dir, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"innodb_max_dirty_pages_pct", OPT_INNODB_MAX_DIRTY_PAGES_PCT,
    "Percentage of dirty pages allowed in bufferpool.", (G_PTR*) &srv_max_buf_pool_modified_pct,
    (G_PTR*) &srv_max_buf_pool_modified_pct, 0, GET_ULONG, REQUIRED_ARG, 90, 0, 100, 0, 0, 0},
@@ -771,23 +1179,6 @@
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
 
-  {"compact", OPT_XTRA_COMPACT,
-   "Create a compact backup by skipping secondary index pages.",
-   (G_PTR*) &xtrabackup_compact, (G_PTR*) &xtrabackup_compact,
-   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-
-  {"rebuild_indexes", OPT_XTRA_REBUILD_INDEXES,
-   "Rebuild secondary indexes in InnoDB tables after applying the log. "
-   "Only has effect with --prepare.",
-   (G_PTR*) &xtrabackup_rebuild_indexes, (G_PTR*) &xtrabackup_rebuild_indexes,
-   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-
-  {"rebuild_threads", OPT_XTRA_REBUILD_INDEXES,
-   "Use this number of threads to rebuild indexes in a compact backup. "
-   "Only has effect with --prepare and --rebuild-indexes.",
-   (G_PTR*) &xtrabackup_rebuild_threads, (G_PTR*) &xtrabackup_rebuild_threads,
-   0, GET_UINT, REQUIRED_ARG, 1, 1, UINT_MAX, 0, 0, 0},
-
   {"innodb_checksum_algorithm", OPT_INNODB_CHECKSUM_ALGORITHM,
   "The algorithm InnoDB uses for page checksumming. [CRC32, STRICT_CRC32, "
    "INNODB, STRICT_INNODB, NONE, STRICT_NONE]", &srv_checksum_algorithm,
@@ -800,21 +1191,14 @@
    REQUIRED_ARG, SRV_CHECKSUM_ALGORITHM_INNODB, 0, 0, 0, 0, 0},
   {"innodb_undo_directory", OPT_INNODB_UNDO_DIRECTORY,
    "Directory where undo tablespace files live, this path can be absolute.",
-   (G_PTR*) &srv_undo_dir, (G_PTR*) &srv_undo_dir,
-   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   &srv_undo_dir, &srv_undo_dir, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0,
+   0},
 
-  {"innodb_undo_tablespaces", OPT_UNDO_TABLESPACES,
+  {"innodb_undo_tablespaces", OPT_INNODB_UNDO_TABLESPACES,
    "Number of undo tablespaces to use.",
    (G_PTR*)&srv_undo_tablespaces, (G_PTR*)&srv_undo_tablespaces,
    0, GET_ULONG, REQUIRED_ARG, 0, 0, 126, 0, 1, 0},
 
-  {"incremental-force-scan", OPT_XTRA_INCREMENTAL_FORCE_SCAN,
-   "Perform a full-scan incremental backup even in the presence of changed "
-   "page bitmap data",
-   (G_PTR*)&xtrabackup_incremental_force_scan,
-   (G_PTR*)&xtrabackup_incremental_force_scan, 0, GET_BOOL, NO_ARG,
-   0, 0, 0, 0, 0, 0},
-
   {"defaults_group", OPT_DEFAULTS_GROUP, "defaults group in config file (default \"mysqld\").",
    (G_PTR*) &defaults_group, (G_PTR*) &defaults_group,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -827,6 +1211,8 @@
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
+uint xb_server_options_count = array_elements(xb_server_options);
+
 #ifndef __WIN__
 static int debug_sync_resumed;
 
@@ -882,7 +1268,11 @@
 #endif
 }
 
-static const char *xb_load_default_groups[]= { "mysqld", "xtrabackup", 0, 0 };
+static const char *xb_client_default_groups[]=
+	{ "xtrabackup", "client", 0, 0, 0 };
+
+static const char *xb_server_default_groups[]=
+	{ "xtrabackup", "mysqld", 0, 0, 0 };
 
 static void print_version(void)
 {
@@ -895,7 +1285,7 @@
 {
   puts("Open source backup tool for InnoDB and XtraDB\n\
 \n\
-Copyright (C) 2009-2013 Percona LLC and/or its affiliates.\n\
+Copyright (C) 2009-2015 Percona LLC and/or its affiliates.\n\
 Portions Copyright (C) 2000, 2011, MySQL AB & Innobase Oy. All Rights Reserved.\n\
 \n\
 This program is free software; you can redistribute it and/or\n\
@@ -911,20 +1301,125 @@
 You can download full text of the license on http://www.gnu.org/licenses/gpl-2.0.txt\n");
 
   printf("Usage: [%s [--defaults-file=#] --backup | %s [--defaults-file=#] --prepare] [OPTIONS]\n",my_progname,my_progname);
-  print_defaults("my", xb_load_default_groups);
-  my_print_help(xb_long_options);
-  my_print_variables(xb_long_options);
+  print_defaults("my", xb_server_default_groups);
+  my_print_help(xb_client_options);
+  my_print_help(xb_server_options);
+  my_print_variables(xb_server_options);
+  my_print_variables(xb_client_options);
 }
 
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
+#define ADD_PRINT_PARAM_OPT(value)              \
+  { \
+    print_param_str << opt->name << "=" << value << "\n"; \
+    param_set.insert(opt->name); \
+  }
+
+/************************************************************************
+Check if parameter is set in defaults file or via command line argument
+@return true if parameter is set. */
+bool
+check_if_param_set(const char *param)
+{
+	return param_set.find(param) != param_set.end();
+}
+
+my_bool
+xb_get_one_option(int optid,
+		  const struct my_option *opt __attribute__((unused)),
+		  char *argument)
 {
   switch(optid) {
   case 'h':
     strmake(mysql_real_data_home,argument, FN_REFLEN - 1);
     mysql_data_home= mysql_real_data_home;
+
+    ADD_PRINT_PARAM_OPT(mysql_real_data_home);
+    break;
+
+  case 't':
+
+    ADD_PRINT_PARAM_OPT(opt_mysql_tmpdir);
+    break;
+
+  case OPT_INNODB_DATA_HOME_DIR:
+
+    ADD_PRINT_PARAM_OPT(innobase_data_home_dir);
+    break;
+
+  case OPT_INNODB_DATA_FILE_PATH:
+
+    ADD_PRINT_PARAM_OPT(innobase_data_file_path);
+    break;
+
+  case OPT_INNODB_LOG_GROUP_HOME_DIR:
+
+    ADD_PRINT_PARAM_OPT(srv_log_group_home_dir);
+    break;
+
+  case OPT_INNODB_LOG_FILES_IN_GROUP:
+
+    ADD_PRINT_PARAM_OPT(innobase_log_files_in_group);
+    break;
+
+  case OPT_INNODB_LOG_FILE_SIZE:
+
+    ADD_PRINT_PARAM_OPT(innobase_log_file_size);
+    break;
+
+  case OPT_INNODB_FLUSH_METHOD:
+
+    ADD_PRINT_PARAM_OPT(innobase_unix_file_flush_method);
+    break;
+
+  case OPT_INNODB_PAGE_SIZE:
+
+    ADD_PRINT_PARAM_OPT(innobase_page_size);
+    break;
+
+  case OPT_INNODB_FAST_CHECKSUM:
+
+    ADD_PRINT_PARAM_OPT(!!innobase_fast_checksum);
+    break;
+
+  case OPT_INNODB_LOG_BLOCK_SIZE:
+
+    ADD_PRINT_PARAM_OPT(innobase_log_block_size);
+    break;
+
+  case OPT_INNODB_DOUBLEWRITE_FILE:
+
+    ADD_PRINT_PARAM_OPT(innobase_doublewrite_file);
+    break;
+
+  case OPT_INNODB_UNDO_DIRECTORY:
+
+    ADD_PRINT_PARAM_OPT(srv_undo_dir);
     break;
+
+  case OPT_INNODB_UNDO_TABLESPACES:
+
+    ADD_PRINT_PARAM_OPT(srv_undo_tablespaces);
+    break;
+
+  case OPT_INNODB_CHECKSUM_ALGORITHM:
+
+    ut_a(srv_checksum_algorithm <= SRV_CHECKSUM_ALGORITHM_STRICT_NONE);
+
+    ADD_PRINT_PARAM_OPT(innodb_checksum_algorithm_names[srv_checksum_algorithm]);
+    break;
+
+  case OPT_INNODB_LOG_CHECKSUM_ALGORITHM:
+
+    ut_a(srv_log_checksum_algorithm <= SRV_CHECKSUM_ALGORITHM_STRICT_NONE);
+
+    ADD_PRINT_PARAM_OPT(innodb_checksum_algorithm_names[srv_log_checksum_algorithm]);
+    break;
+
+  case OPT_INNODB_BUFFER_POOL_FILENAME:
+
+    ADD_PRINT_PARAM_OPT(innobase_buffer_pool_filename);
+    break;
+
   case OPT_XTRA_TARGET_DIR:
     strmake(xtrabackup_real_target_dir,argument, sizeof(xtrabackup_real_target_dir)-1);
     xtrabackup_target_dir= xtrabackup_real_target_dir;
@@ -960,6 +1455,44 @@
     }
     xtrabackup_encrypt = TRUE;
     break;
+  case OPT_DECRYPT:
+    if (argument == NULL) {
+      msg("Missing --decrypt argument, must specify a "
+          "valid encryption  algorithm.\n");
+      return(1);
+    }
+    opt_decrypt = TRUE;
+    xtrabackup_decrypt_decompress = true;
+    break;
+  case OPT_DECOMPRESS:
+    opt_decompress = TRUE;
+    xtrabackup_decrypt_decompress = true;
+    break;
+  case (int) OPT_CORE_FILE:
+    test_flags |= TEST_CORE_ON_SIGNAL;
+    break;
+  case OPT_HISTORY:
+    if (argument) {
+      opt_history = argument;
+    } else {
+      opt_history = "";
+    }
+    break;
+  case 'p':
+    if (argument)
+    {
+      char *start= argument;
+      my_free(opt_password);
+      opt_password= my_strdup(argument, MYF(MY_FAE));
+      while (*argument) *argument++= 'x';               // Destroy argument
+      if (*start)
+        start[1]=0 ;
+    }
+    break;
+
+
+#include "sslopt-case.h"
+
   case '?':
     usage();
     exit(EXIT_SUCCESS);
@@ -1119,10 +1652,11 @@
 	ret = (my_bool) srv_parse_data_file_paths_and_sizes(
 			internal_innobase_data_file_path);
 	if (ret == FALSE) {
-	  	msg("xtrabackup: syntax error in innodb_data_file_path\n");
+		msg("xtrabackup: syntax error in innodb_data_file_path\n");
 mem_free_and_error:
-	  	free(internal_innobase_data_file_path);
-                goto error;
+		free(internal_innobase_data_file_path);
+		internal_innobase_data_file_path = NULL;
+		goto error;
 	}
 
 	if (xtrabackup_prepare) {
@@ -1297,7 +1831,8 @@
 	directory. */
 
 	if (!srv_undo_dir || !xtrabackup_backup) {
-		srv_undo_dir = (char *) ".";
+		my_free(srv_undo_dir);
+		srv_undo_dir = my_strdup(".", MYF(MY_FAE));
 	}
 
 	innodb_log_checksum_func_update(srv_log_checksum_algorithm);
@@ -1317,8 +1852,9 @@
 	err = innobase_start_or_create_for_mysql();
 
 	if (err != DB_SUCCESS) {
-	  	free(internal_innobase_data_file_path);
-                goto error;
+		free(internal_innobase_data_file_path);
+		internal_innobase_data_file_path = NULL;
+		goto error;
 	}
 
 	/* They may not be needed for now */
@@ -1352,6 +1888,7 @@
 		goto error;
 	}
 	free(internal_innobase_data_file_path);
+	internal_innobase_data_file_path = NULL;
 
 	/* They may not be needed for now */
 //	hash_free(&innobase_open_tables);
@@ -1408,12 +1945,17 @@
 			!= 1) {
 		metadata_last_lsn = 0;
 	}
-	/* Optional field */
+	/* Optional fields */
+
 	if (fscanf(fp, "compact = %d\n", &t) == 1) {
 		xtrabackup_compact = (t == 1);
 	} else {
 		xtrabackup_compact = 0;
 	}
+
+	if (fscanf(fp, "recover_binlog_info = %d\n", &t) == 1) {
+		recover_binlog_info = (t == 1);
+	}
 end:
 	fclose(fp);
 
@@ -1433,12 +1975,14 @@
 		 "from_lsn = " UINT64PF "\n"
 		 "to_lsn = " UINT64PF "\n"
 		 "last_lsn = " UINT64PF "\n"
-		 "compact = %d\n",
+		 "compact = %d\n"
+		 "recover_binlog_info = %d\n",
 		 metadata_type,
 		 metadata_from_lsn,
 		 metadata_to_lsn,
 		 metadata_last_lsn,
-		 xtrabackup_compact == TRUE);
+		 MY_TEST(xtrabackup_compact == TRUE),
+		 MY_TEST(opt_binlog_info == BINLOG_INFO_LOCKLESS));
 }
 
 /***********************************************************************
@@ -1452,6 +1996,7 @@
 	size_t		len;
 	ds_file_t	*stream;
 	MY_STAT		mystat;
+	my_bool		rc = TRUE;
 
 	xtrabackup_print_metadata(buf, sizeof(buf));
 
@@ -1468,13 +2013,14 @@
 	}
 
 	if (ds_write(stream, buf, len)) {
-		ds_close(stream);
-		return(FALSE);
+		rc = FALSE;
 	}
 
-	ds_close(stream);
+	if (ds_close(stream)) {
+		rc = FALSE;
+	}
 
-	return(TRUE);
+	return(rc);
 }
 
 /***********************************************************************
@@ -1587,7 +2133,9 @@
 
 	ret = (ds_write(f, buf, len) == 0);
 
-	ds_close(f);
+	if (ds_close(f)) {
+		ret = FALSE;
+	}
 
 	return(ret);
 }
@@ -1611,15 +2159,14 @@
 check_if_table_matches_filters(const char *name)
 {
 	int 			regres;
-	int 			i;
-	xtrabackup_tables_t*	table;
+	xb_filter_entry_t*	table;
+	xb_regex_list_node_t*	node;
 
-	if (xtrabackup_tables) {
-
-		regres = REG_NOMATCH;
-
-		for (i = 0; i < tables_regex_num; i++) {
-			regres = xb_regexec(&tables_regex[i], name, 1,
+	if (UT_LIST_GET_LEN(regex_list)) {
+		/* Check against regular expressions list */
+		for (node = UT_LIST_GET_FIRST(regex_list); node;
+		     node = UT_LIST_GET_NEXT(regex_list, node)) {
+			regres = xb_regexec(&node->regex, name, 1,
 					    tables_regmatch, 0);
 			if (regres != REG_NOMATCH) {
 
@@ -1628,10 +2175,9 @@
 		}
 	}
 
-	if (xtrabackup_tables_file) {
-
+	if (tables_hash) {
 		HASH_SEARCH(name_hash, tables_hash, ut_fold_string(name),
-			    xtrabackup_tables_t*,
+			    xb_filter_entry_t*,
 			    table, (void) 0,
 			    !strcmp(table->name, name));
 		if (table) {
@@ -1649,7 +2195,6 @@
 the --tables or --tables-file options.
 
 @return TRUE if the table should be skipped. */
-static
 my_bool
 check_if_skip_table(
 /******************/
@@ -1660,7 +2205,9 @@
 	const char *ptr;
 	char *eptr;
 
-	if (xtrabackup_tables == NULL && xtrabackup_tables_file == NULL) {
+	if (UT_LIST_GET_LEN(regex_list) == 0 &&
+	    tables_hash == NULL &&
+	    databases_hash == NULL) {
 		return(FALSE);
 	}
 
@@ -1676,13 +2223,34 @@
 	}
 
 	strncpy(buf, dbname, FN_REFLEN);
-	buf[FN_REFLEN - 1] = '\0';
-	buf[tbname - 1 - dbname] = '.';
+	buf[tbname - 1 - dbname] = 0;
 
-	/* Check if there's a suffix in the table name. If so, truncate it. We
-	rely on the fact that a dot cannot be a part of a table name (it is
-	encoded by the server with the @NNNN syntax). */
-	if ((eptr = strchr(&buf[tbname - dbname], '.')) != NULL) {
+	if (databases_hash) {
+		/* There are some filters for databases, check them */
+		xb_filter_entry_t*	database;
+
+		HASH_SEARCH(name_hash, databases_hash, ut_fold_string(buf),
+			    xb_filter_entry_t*,
+			    database, (void) 0,
+			    !strcmp(database->name, buf));
+		/* Table's database isn't found, skip the table */
+		if (!database) {
+			return(TRUE);
+		}
+		/* There aren't tables specified for the database,
+		it should be backed up entirely */
+		if (!database->has_tables) {
+			return(FALSE);
+		}
+	}
+
+	buf[FN_REFLEN - 1] = '\0';
+	buf[tbname - 1 - dbname] = '.';
+
+	/* Check if there's a suffix in the table name. If so, truncate it. We
+	rely on the fact that a dot cannot be a part of a table name (it is
+	encoded by the server with the @NNNN syntax). */
+	if ((eptr = strchr(&buf[tbname - dbname], '.')) != NULL) {
 
 		*eptr = '\0';
 	}
@@ -1736,6 +2304,40 @@
 	return(zip_size);
 }
 
+const char*
+xb_get_copy_action(const char *dflt)
+{
+	const char *action;
+
+	if (xtrabackup_stream) {
+		if (xtrabackup_compress) {
+			if (xtrabackup_encrypt) {
+				action = "Compressing, encrypting and streaming";
+			} else {
+				action = "Compressing and streaming";
+			}
+		} else if (xtrabackup_encrypt) {
+			action = "Encrypting and streaming";
+		} else {
+			action = "Streaming";
+		}
+	} else {
+		if (xtrabackup_compress) {
+			if (xtrabackup_encrypt) {
+				action = "Compressing and encrypting";
+			} else {
+				action = "Compressing";
+			}
+		} else if (xtrabackup_encrypt) {
+			action = "Encrypting";
+		} else {
+			action = dflt;
+		}
+	}
+
+	return(action);
+}
+
 /* TODO: We may tune the behavior (e.g. by fil_aio)*/
 
 static
@@ -1751,6 +2353,7 @@
 	const char		*action;
 	xb_read_filt_t		*read_filter;
 	ibool			is_system;
+	my_bool			rc = FALSE;
 
 	/* Get the name and the path for the tablespace. node->name always
 	contains the path (which may be absolute for remote tablespaces in
@@ -1813,33 +2416,13 @@
 		goto error;
 	}
 
+	action = xb_get_copy_action();
+
 	if (xtrabackup_stream) {
-		if (xtrabackup_compress) {
-			if (xtrabackup_encrypt) {
-				action = "Compressing, encrypting and streaming";
-			} else {
-				action = "Compressing and streaming";
-			}
-		} else if (xtrabackup_encrypt) {
-			action = "Encrypting and streaming";
-		} else {
-			action = "Streaming";
-		}
-		msg("[%02u] %s %s\n", thread_n, action, node_path);
+		msg_ts("[%02u] %s %s\n", thread_n, action, node_path);
 	} else {
-		if (xtrabackup_compress) {
-			if (xtrabackup_encrypt) {
-				action = "Compressing and encrypting";
-			} else {
-				action = "Compressing";
-			}
-		} else if (xtrabackup_encrypt) {
-			action = "Encrypting";
-		} else {
-			action = "Copying";
-		}
-		msg("[%02u] %s %s to %s\n", thread_n, action,
-		    node_path, dstfile->path);
+		msg_ts("[%02u] %s %s to %s\n", thread_n, action,
+		       node_path, dstfile->path);
 	}
 
 	/* The main copy loop */
@@ -1859,13 +2442,15 @@
 	}
 
 	/* close */
-	msg("[%02u]        ...done\n", thread_n);
+	msg_ts("[%02u]        ...done\n", thread_n);
 	xb_fil_cur_close(&cursor);
-	ds_close(dstfile);
+	if (ds_close(dstfile)) {
+		rc = TRUE;
+	}
 	if (write_filter && write_filter->deinit) {
 		write_filter->deinit(&write_filt_ctxt);
 	}
-	return(FALSE);
+	return(rc);
 
 error:
 	xb_fil_cur_close(&cursor);
@@ -1895,58 +2480,125 @@
 	return(FALSE);
 }
 
-static my_bool
-xtrabackup_copy_logfile(lsn_t from_lsn, my_bool is_last)
+static
+void
+xtrabackup_choose_lsn_offset(lsn_t start_lsn)
 {
-	/* definition from recv_recovery_from_checkpoint_start() */
-	log_group_t*	group;
-	lsn_t		group_scanned_lsn;
-	lsn_t		contiguous_lsn;
-
-	ut_a(dst_log_file != NULL);
+	ulint no, alt_no, expected_no;
+	ulint blocks_in_group;
+	lsn_t tmp_offset, end_lsn;
+	int lsn_chosen = 0;
+	log_group_t *group;
 
-	/* read from checkpoint_lsn_start to current */
-	contiguous_lsn = ut_uint64_align_down(from_lsn, OS_FILE_LOG_BLOCK_SIZE);
-
-	/* TODO: We must check the contiguous_lsn still exists in log file.. */
+	start_lsn = ut_uint64_align_down(start_lsn, OS_FILE_LOG_BLOCK_SIZE);
+	end_lsn = start_lsn + RECV_SCAN_SIZE;
 
 	group = UT_LIST_GET_FIRST(log_sys->log_groups);
 
-	while (group) {
-		ibool	finished;
-		lsn_t	start_lsn;
-		lsn_t	end_lsn;
+	if (mysql_server_version < 50500 || mysql_server_version > 50600) {
+		/* only make sense for Percona Server 5.5 */
+		return;
+	}
 
-		/* reference recv_group_scan_log_recs() */
-	finished = FALSE;
+	if (server_flavor == FLAVOR_PERCONA_SERVER) {
+		/* it is Percona Server 5.5 */
+		group->alt_offset_chosen = true;
+		group->lsn_offset = group->lsn_offset_alt;
+		return;
+	}
 
-	start_lsn = contiguous_lsn;
+	if (group->lsn_offset_alt == group->lsn_offset ||
+	    group->lsn_offset_alt == (lsn_t) -1) {
+		/* we have only one option */
+		return;
+	}
 
-	while (!finished) {
-		end_lsn = start_lsn + RECV_SCAN_SIZE;
+	no = alt_no = (ulint) -1;
+	lsn_chosen = 0;
 
-		xtrabackup_io_throttling();
+	blocks_in_group = log_block_convert_lsn_to_no(
+		log_group_get_capacity(group)) - 1;
 
-		mutex_enter(&log_sys->mutex);
+	/* read log block number from usual offset */
+	if (group->lsn_offset < group->file_size * group->n_files &&
+	    (log_group_calc_lsn_offset(start_lsn, group) %
+	     UNIV_PAGE_SIZE) % OS_MIN_LOG_BLOCK_SIZE == 0) {
+		log_group_read_log_seg(LOG_RECOVER, log_sys->buf,
+				       group, start_lsn, end_lsn);
+		no = log_block_get_hdr_no(log_sys->buf);
+	}
 
+	/* read log block number from Percona Server 5.5 offset */
+	tmp_offset = group->lsn_offset;
+	group->lsn_offset = group->lsn_offset_alt;
+
+	if (group->lsn_offset < group->file_size * group->n_files &&
+	    (log_group_calc_lsn_offset(start_lsn, group) %
+	     UNIV_PAGE_SIZE) % OS_MIN_LOG_BLOCK_SIZE == 0) {
 		log_group_read_log_seg(LOG_RECOVER, log_sys->buf,
 				       group, start_lsn, end_lsn);
+		alt_no = log_block_get_hdr_no(log_sys->buf);
+	}
 
+	expected_no = log_block_convert_lsn_to_no(start_lsn);
 
-		/* reference recv_scan_log_recs() */
-		{
-	byte*	log_block;
-	lsn_t	scanned_lsn;
-	ulint	data_len;
+	ut_a(!(no == expected_no && alt_no == expected_no));
 
-	ulint	scanned_checkpoint_no = 0;
+	group->lsn_offset = tmp_offset;
 
-	finished = FALSE;
+	if ((no <= expected_no &&
+		((expected_no - no) % blocks_in_group) == 0) ||
+	    ((expected_no | 0x40000000UL) - no) % blocks_in_group == 0) {
+		/* default offset looks ok */
+		++lsn_chosen;
+	}
 
-	log_block = log_sys->buf;
+	if ((alt_no <= expected_no &&
+		((expected_no - alt_no) % blocks_in_group) == 0) ||
+	    ((expected_no | 0x40000000UL) - alt_no) % blocks_in_group == 0) {
+		/* PS 5.5 style offset looks ok */
+		++lsn_chosen;
+		group->alt_offset_chosen = true;
+		group->lsn_offset = group->lsn_offset_alt;
+	}
+
+	/* We are in trouble, because we can not make a
+	decision to choose one over the other. Die just
+	like a Buridan's ass */
+	ut_a(lsn_chosen == 1);
+}
+
+/*******************************************************//**
+Scans log from a buffer and writes new log data to the outpud datasinc.
+@return true if success */
+static
+bool
+xtrabackup_scan_log_recs(
+/*===============*/
+	log_group_t*	group,		/*!< in: log group */
+	bool		is_last,	/*!< in: whether it is last segment
+					to copy */
+	lsn_t		start_lsn,	/*!< in: buffer start lsn */
+	lsn_t*		contiguous_lsn,	/*!< in/out: it is known that all log
+					groups contain contiguous log data up
+					to this lsn */
+	lsn_t*		group_scanned_lsn,/*!< out: scanning succeeded up to
+					this lsn */
+	bool*		finished)	/*!< out: false if is not able to scan
+					any more in this log group */
+{
+	lsn_t		scanned_lsn;
+	ulint		data_len;
+	ulint		write_size;
+	const byte*	log_block;
+
+	ulint		scanned_checkpoint_no = 0;
+
+	*finished = false;
 	scanned_lsn = start_lsn;
+	log_block = log_sys->buf;
 
-	while (log_block < log_sys->buf + RECV_SCAN_SIZE && !finished) {
+	while (log_block < log_sys->buf + RECV_SCAN_SIZE && !*finished) {
 		ulint	no = log_block_get_hdr_no(log_block);
 		ulint	scanned_no = log_block_convert_lsn_to_no(scanned_lsn);
 		ibool	checksum_is_ok =
@@ -1958,14 +2610,15 @@
 			blocks_in_group = log_block_convert_lsn_to_no(
 				log_group_get_capacity(group)) - 1;
 
-			if (no < scanned_no ||
+			if ((no < scanned_no &&
+			    ((scanned_no - no) % blocks_in_group) == 0) ||
+			    no == 0 ||
 			    /* Log block numbers wrap around at 0x3FFFFFFF */
-			    ((scanned_no | 0x4000000UL) - no) %
+			    ((scanned_no | 0x40000000UL) - no) %
 			    blocks_in_group == 0) {
 
 				/* old log block, do nothing */
-				finished = TRUE;
-
+				*finished = true;
 				break;
 			}
 
@@ -1984,7 +2637,7 @@
 				    " log files being too small.\n");
 			}
 
-			goto error;
+			return(false);
 		} else if (!checksum_is_ok) {
 			/* Garbage or an incompletely written log block */
 
@@ -1998,7 +2651,7 @@
 			msg("xtrabackup: warning: this is possible when the "
 			    "log block has not been fully written by the "
 			    "server, will retry later.\n");
-			finished = TRUE;
+			*finished = true;
 			break;
 		}
 
@@ -2010,9 +2663,9 @@
 			we know that log data is contiguous up to scanned_lsn
 			in all non-corrupt log groups. */
 
-			if (scanned_lsn > contiguous_lsn) {
+			if (scanned_lsn > *contiguous_lsn) {
 
-				contiguous_lsn = scanned_lsn;
+				*contiguous_lsn = scanned_lsn;
 			}
 		}
 
@@ -2029,7 +2682,7 @@
 			/* Garbage from a log buffer flush which was made
 			before the most recent database recovery */
 
-			finished = TRUE;
+			*finished = true;
 			break;
 		}
 
@@ -2039,54 +2692,88 @@
 		if (data_len < OS_FILE_LOG_BLOCK_SIZE) {
 			/* Log data for this group ends here */
 
-			finished = TRUE;
+			*finished = true;
 		} else {
 			log_block += OS_FILE_LOG_BLOCK_SIZE;
 		}
-	} /* while (log_block < log_sys->buf + RECV_SCAN_SIZE && !finished) */
+	}
 
-	group_scanned_lsn = scanned_lsn;
+	*group_scanned_lsn = scanned_lsn;
 
+	/* ===== write log to 'xtrabackup_logfile' ====== */
+	if (!*finished) {
+		write_size = RECV_SCAN_SIZE;
+	} else {
+		write_size = ut_uint64_align_up(scanned_lsn,
+					OS_FILE_LOG_BLOCK_SIZE) - start_lsn;
+		if (!is_last && scanned_lsn % OS_FILE_LOG_BLOCK_SIZE) {
+			write_size -= OS_FILE_LOG_BLOCK_SIZE;
+		}
+	}
 
+	if (ds_write(dst_log_file, log_sys->buf, write_size)) {
+		msg("xtrabackup: Error: "
+		    "write to logfile failed\n");
+		return(false);
+	}
 
-		}
+	return(true);
+}
 
-		/* ===== write log to 'xtrabackup_logfile' ====== */
-		{
-		ulint 	write_size;
+static my_bool
+xtrabackup_copy_logfile(lsn_t from_lsn, my_bool is_last)
+{
+	/* definition from recv_recovery_from_checkpoint_start() */
+	log_group_t*	group;
+	lsn_t		group_scanned_lsn;
+	lsn_t		contiguous_lsn;
 
-		if (!finished) {
-			write_size = RECV_SCAN_SIZE;
-		} else {
-			write_size = ut_uint64_align_up(group_scanned_lsn,
-							OS_FILE_LOG_BLOCK_SIZE) -
-				start_lsn;
-			if (!is_last &&
-			    group_scanned_lsn % OS_FILE_LOG_BLOCK_SIZE
-			    )
-				write_size -= OS_FILE_LOG_BLOCK_SIZE;
-		}
+	ut_a(dst_log_file != NULL);
 
+	/* read from checkpoint_lsn_start to current */
+	contiguous_lsn = ut_uint64_align_down(from_lsn, OS_FILE_LOG_BLOCK_SIZE);
 
-		if (ds_write(dst_log_file, log_sys->buf, write_size)) {
-			msg("xtrabackup: Error: write to logfile failed\n");
-			goto error;
-		}
+	/* TODO: We must check the contiguous_lsn still exists in log file.. */
 
+	group = UT_LIST_GET_FIRST(log_sys->log_groups);
 
-		}
+	while (group) {
+		bool	finished;
+		lsn_t	start_lsn;
+		lsn_t	end_lsn;
 
-		mutex_exit(&log_sys->mutex);
+		/* reference recv_group_scan_log_recs() */
+		finished = false;
 
-		start_lsn = end_lsn;
-	}
+		start_lsn = contiguous_lsn;
+
+		while (!finished) {
+
+			end_lsn = start_lsn + RECV_SCAN_SIZE;
+
+			xtrabackup_io_throttling();
+
+			mutex_enter(&log_sys->mutex);
+
+			log_group_read_log_seg(LOG_RECOVER, log_sys->buf,
+					       group, start_lsn, end_lsn);
+
+			 if (!xtrabackup_scan_log_recs(group, is_last,
+				start_lsn, &contiguous_lsn, &group_scanned_lsn,
+				&finished)) {
+				goto error;
+			 }
 
+			mutex_exit(&log_sys->mutex);
+
+			start_lsn = end_lsn;
 
+		}
 
 		group->scanned_lsn = group_scanned_lsn;
 
-		msg(">> log scanned up to (" LSN_PF ")\n",
-		    group->scanned_lsn);
+		msg_ts(">> log scanned up to (" LSN_PF ")\n",
+		       group->scanned_lsn);
 
 		group = UT_LIST_GET_NEXT(log_groups, group);
 
@@ -2170,14 +2857,10 @@
 	/* currently, for --backup only */
 	ut_a(xtrabackup_backup);
 
+	io_watching_thread_running = TRUE;
+
 	while (log_copying) {
 		os_thread_sleep(1000000); /*1 sec*/
-
-		//for DEBUG
-		//if (io_ticket == xtrabackup_throttle) {
-		//	msg("There seem to be no IO...?\n");
-		//}
-
 		io_ticket = xtrabackup_throttle;
 		os_event_set(wait_throttle);
 	}
@@ -2186,6 +2869,8 @@
 	xtrabackup_throttle = 0;
 	os_event_set(wait_throttle);
 
+	io_watching_thread_running = FALSE;
+
 	os_thread_exit(NULL);
 
 	return(0);
@@ -2288,28 +2973,17 @@
 	/* Start building out the pipelines from the terminus back */
 	if (xtrabackup_stream) {
 		/* All streaming goes to stdout */
-		ds_data = ds_meta = ds_create(xtrabackup_target_dir,
-					      DS_TYPE_STDOUT);
+		ds_data = ds_meta = ds_redo = ds_create(xtrabackup_target_dir,
+						        DS_TYPE_STDOUT);
 	} else {
 		/* Local filesystem */
-		ds_data = ds_meta = ds_create(xtrabackup_target_dir,
-					      DS_TYPE_LOCAL);
+		ds_data = ds_meta = ds_redo = ds_create(xtrabackup_target_dir,
+						        DS_TYPE_LOCAL);
 	}
 
 	/* Track it for destruction */
 	xtrabackup_add_datasink(ds_data);
 
-	/* Encryption always done just before final output */
-	if (xtrabackup_encrypt) {
-		ds_ctxt_t	*ds;
-
-		ds = ds_create(xtrabackup_target_dir, DS_TYPE_ENCRYPT);
-		xtrabackup_add_datasink(ds);
-
-		ds_set_pipe(ds, ds_data);
-		ds_data = ds_meta = ds;
-	}
-
 	/* Stream formatting */
 	if (xtrabackup_stream) {
 		ds_ctxt_t	*ds;
@@ -2327,25 +3001,39 @@
 		ds_set_pipe(ds, ds_data);
 		ds_data = ds;
 
-		if (xtrabackup_stream_fmt != XB_STREAM_FMT_XBSTREAM ||
-		    xtrabackup_suspend_at_end ||
-		    xtrabackup_suspend_at_start) {
-
-			/* 'xbstream' allow parallel streams, but we
-			still can't stream directly to stdout when
-			xtrabackup is invoked from innobackupex
-			(i.e. with --suspend_at_and), because
-			innobackupex and xtrabackup streams would
-			interfere. Use temporary files instead. */
-			ds_meta = ds_create(xtrabackup_target_dir, DS_TYPE_TMPFILE);
+		if (xtrabackup_stream_fmt != XB_STREAM_FMT_XBSTREAM) {
+
+			/* 'tar' does not allow parallel streams */
+			ds_redo = ds_meta = ds_create(xtrabackup_target_dir,
+						      DS_TYPE_TMPFILE);
 			xtrabackup_add_datasink(ds_meta);
 			ds_set_pipe(ds_meta, ds);
 		} else {
-			ds_meta = ds_data;
+			ds_redo = ds_meta = ds_data;
+		}
+	}
+
+	/* Encryption */
+	if (xtrabackup_encrypt) {
+		ds_ctxt_t	*ds;
+
+		ds = ds_create(xtrabackup_target_dir, DS_TYPE_ENCRYPT);
+		xtrabackup_add_datasink(ds);
+
+		ds_set_pipe(ds, ds_data);
+		if (ds_data != ds_meta) {
+			ds_data = ds;
+			ds = ds_create(xtrabackup_target_dir, DS_TYPE_ENCRYPT);
+			xtrabackup_add_datasink(ds);
+
+			ds_set_pipe(ds, ds_meta);
+			ds_redo = ds_meta = ds;
+		} else {
+			ds_redo = ds_data = ds_meta = ds;
 		}
 	}
 
-	/* Compression for ds_data */
+	/* Compression for ds_data and ds_redo */
 	if (xtrabackup_compress) {
 		ds_ctxt_t	*ds;
 
@@ -2354,12 +3042,29 @@
 		ds_buffer_set_size(ds, 1024 * 1024);
 		xtrabackup_add_datasink(ds);
 		ds_set_pipe(ds, ds_data);
-		ds_data = ds;
+		if (ds_data != ds_redo) {
+			ds_data = ds;
+			ds = ds_create(xtrabackup_target_dir, DS_TYPE_BUFFER);
+			ds_buffer_set_size(ds, 1024 * 1024);
+			xtrabackup_add_datasink(ds);
+			ds_set_pipe(ds, ds_redo);
+			ds_redo = ds;
+		} else {
+			ds_redo = ds_data = ds;
+		}
 
 		ds = ds_create(xtrabackup_target_dir, DS_TYPE_COMPRESS);
 		xtrabackup_add_datasink(ds);
 		ds_set_pipe(ds, ds_data);
-		ds_data = ds;
+		if (ds_data != ds_redo) {
+			ds_data = ds;
+			ds = ds_create(xtrabackup_target_dir, DS_TYPE_COMPRESS);
+			xtrabackup_add_datasink(ds);
+			ds_set_pipe(ds, ds_redo);
+			ds_redo = ds;
+		} else {
+			ds_redo = ds_data = ds;
+		}
 	}
 }
 
@@ -2376,6 +3081,7 @@
 	}
 	ds_data = NULL;
 	ds_meta = NULL;
+	ds_redo = NULL;
 }
 
 #define SRV_N_PENDING_IOS_PER_THREAD 	OS_AIO_N_PENDING_IOS_PER_THREAD
@@ -2478,11 +3184,15 @@
 	srv_undo_tablespaces_init(), because fil_is_user_tablespace_id() *
 	relies on srv_undo_tablespaces_open to be properly initialized */
 
+	msg("xtrabackup: Generating a list of tablespaces\n");
+
 	err = fil_load_single_table_tablespaces(xb_check_if_open_tablespace);
 	if (err != DB_SUCCESS) {
 		return(err);
 	}
 
+	debug_sync_point("xtrabackup_load_tablespaces_pause");
+
 	return(DB_SUCCESS);
 }
 
@@ -2540,7 +3250,11 @@
 	os_aio_free();
 
 	fil_close_all_files();
-	fil_system = NULL;
+
+	/* Free the double write data structures. */
+	if (buf_dblwr) {
+		buf_dblwr_free();
+	}
 
 	/* Reset srv_file_io_threads to its default value to avoid confusing
 	warning on --prepare in innobase_start_or_create_for_mysql()*/
@@ -2550,167 +3264,269 @@
 }
 
 /***********************************************************************
-Prepare a sync file path. */
-static void
-xb_make_sync_file_name(
-/*===================*/
-	const char*	name,	/*!<in: sync file name */
-	char*		path)	/*!<in/out: path to the sync file */
-{
-	snprintf(path, FN_REFLEN, "%s/%s", xtrabackup_target_dir, name);
-	srv_normalize_path_for_win(path);
-}
-
-/***********************************************************************
-Create an empty file with a given path and close it.
-@return TRUE on succees, FALSE on error. */
-static ibool
-xb_create_sync_file(
+Allocate and initialize the entry for databases and tables filtering
+hash tables. If memory allocation is not successful, terminate program.
+@return pointer to the created entry.  */
+static
+xb_filter_entry_t *
+xb_new_filter_entry(
 /*================*/
-	const char*	path)	/*!<in: path to the sync file */
+	const char*	name)	/*!< in: name of table/database */
 {
-	File	suspend_file;
-	pid_t	pid;
-	char	buffer[64];
+	xb_filter_entry_t	*entry;
+	ulint namelen = strlen(name);
 
-	pid = getpid();
-	snprintf(buffer, sizeof(buffer), "%u", (uint) pid);
+	ut_a(namelen <= NAME_LEN * 2 + 1);
 
-	msg("xtrabackup: Creating suspend file '%s' with pid '%u'\n",
-	    path, (uint) pid);
+	entry = static_cast<xb_filter_entry_t *>
+		(ut_malloc(sizeof(xb_filter_entry_t) + namelen + 1));
+	memset(entry, '\0', sizeof(xb_filter_entry_t) + namelen + 1);
+	entry->name = ((char*)entry) + sizeof(xb_filter_entry_t);
+	strcpy(entry->name, name);
+	entry->has_tables = FALSE;
 
-	suspend_file = my_create(path, 0, O_WRONLY | O_EXCL | O_NOFOLLOW,
-				 MYF(MY_WME));
+	return entry;
+}
 
-	if (suspend_file >= 0) {
-		ibool rc;
+/***********************************************************************
+Add entry to hash table. If hash table is NULL, allocate and initialize
+new hash table */
+static
+xb_filter_entry_t*
+xb_add_filter(
+/*========================*/
+	const char*	name,	/*!< in: name of table/database */
+	hash_table_t**	hash)	/*!< in/out: hash to insert into */
+{
+	xb_filter_entry_t*	entry;
 
-		rc = my_write(suspend_file, (uchar *) buffer, strlen(buffer),
-			      MYF(MY_WME | MY_NABP)) == 0;
+	entry = xb_new_filter_entry(name);
 
-		my_close(suspend_file, MYF(MY_WME));
-		return(rc);
+	if (UNIV_UNLIKELY(*hash == NULL)) {
+		*hash = hash_create(1000);
 	}
+	HASH_INSERT(xb_filter_entry_t,
+		name_hash, *hash,
+		ut_fold_string(entry->name),
+		entry);
 
-	msg("xtrabackup: Error: failed to create file '%s'\n",
-	    path);
-	return(FALSE);
+	return entry;
 }
 
+/***********************************************************************
+Validate name of table or database. If name is invalid, program will
+be finished with error code */
 static
 void
-xb_filters_init()
-{
-	if (xtrabackup_tables) {
-		/* init regexp */
-		char *p, *next;
-		int i;
-		char errbuf[100];
-
-		tables_regex_num = 1;
+xb_validate_name(
+/*=============*/
+	const char*	name,	/*!< in: name */
+	size_t		len)	/*!< in: length of name */
+{
+	const char*	p;
+
+	/* perform only basic validation. validate length and
+	path symbols */
+	if (len > NAME_LEN) {
+		msg("xtrabackup: name `%s` is too long.\n", name);
+		exit(EXIT_FAILURE);
+	}
+	p = strpbrk(name, "/\\~");
+	if (p && p - name < NAME_LEN) {
+		msg("xtrabackup: name `%s` is not valid.\n", name);
+		exit(EXIT_FAILURE);
+	}
+}
 
-		p = xtrabackup_tables;
-		while ((p = strchr(p, ',')) != NULL) {
-			p++;
-			tables_regex_num++;
+/***********************************************************************
+Register new filter entry which can be either database
+or table name.  */
+static
+void
+xb_register_filter_entry(
+/*=====================*/
+	const char*	name)	/*!< in: name */
+{
+	const char*		p;
+	size_t			namelen;
+	xb_filter_entry_t*	db_entry = NULL;
+
+	namelen = strlen(name);
+	if ((p = strchr(name, '.')) != NULL) {
+		char dbname[NAME_LEN + 1];
+
+		xb_validate_name(name, p - name);
+		xb_validate_name(p + 1, namelen - (p - name));
+
+		strncpy(dbname, name, p - name);
+		dbname[p - name] = 0;
+
+		if (databases_hash) {
+			HASH_SEARCH(name_hash, databases_hash,
+					ut_fold_string(dbname),
+					xb_filter_entry_t*,
+					db_entry, (void) 0,
+					!strcmp(db_entry->name, dbname));
+		}
+		if (!db_entry) {
+			db_entry = xb_add_filter(dbname, &databases_hash);
 		}
+		db_entry->has_tables = TRUE;
+		xb_add_filter(name, &tables_hash);
+	} else {
+		xb_validate_name(name, namelen);
+
+		xb_add_filter(name, &databases_hash);
+	}
+}
 
-		tables_regex = static_cast<xb_regex_t *>
-			(ut_malloc(sizeof(xb_regex_t) * tables_regex_num));
+/***********************************************************************
+Register new table for the filter.  */
+static
+void
+xb_register_table(
+/*==============*/
+	const char* name)	/*!< in: name of table */
+{
+	if (strchr(name, '.') == NULL) {
+		msg("xtrabackup: `%s` is not fully qualified name.\n", name);
+		exit(EXIT_FAILURE);
+	}
 
-		p = xtrabackup_tables;
-		for (i=0; i < tables_regex_num; i++) {
-			int	rc;
+	xb_register_filter_entry(name);
+}
 
-			next = strchr(p, ',');
-			ut_a(next || i == tables_regex_num - 1);
+/***********************************************************************
+Register new regex for the filter.  */
+static
+void
+xb_register_regex(
+/*==============*/
+	const char* regex)	/*!< in: regex */
+{
+	xb_regex_list_node_t*	node;
+	char			errbuf[100];
+	int			ret;
+
+	node = static_cast<xb_regex_list_node_t *>
+		(ut_malloc(sizeof(xb_regex_list_node_t)));
+
+	ret = xb_regcomp(&node->regex, regex, REG_EXTENDED);
+	if (ret != 0) {
+		xb_regerror(ret, &node->regex, errbuf, sizeof(errbuf));
+		msg("xtrabackup: error: tables regcomp(%s): %s\n",
+			regex, errbuf);
+		exit(EXIT_FAILURE);
+	}
 
-			next++;
-			if (i != tables_regex_num - 1)
-				*(next - 1) = '\0';
+	UT_LIST_ADD_LAST(regex_list, regex_list, node);
+}
 
-			rc = xb_regcomp(&tables_regex[i], p,
-					REG_EXTENDED);
+typedef void (*insert_entry_func_t)(const char*);
 
-			if (rc) {
+/***********************************************************************
+Scan string and load filter entries from it.  */
+static
+void
+xb_load_list_string(
+/*================*/
+	char* list,			/*!< in: string representing a list */
+	const char* delimiters,		/*!< in: delimiters of entries */
+	insert_entry_func_t ins)	/*!< in: callback to add entry */
+{
+	char*	p;
+	char*	saveptr;
 
-				xb_regerror(rc, &tables_regex[i], errbuf,
-					    sizeof(errbuf));
-				msg("xtrabackup: regcomp(%s) failed: %s\n",
-				    p, errbuf);
+	p = strtok_r(list, delimiters, &saveptr);
+	while (p) {
 
-				exit(EXIT_FAILURE);
-			}
+		ins(p);
 
-			if (i != tables_regex_num - 1)
-				*(next - 1) = ',';
-			p = next;
-		}
+		p = strtok_r(NULL, delimiters, &saveptr);
 	}
+}
 
-	if (xtrabackup_tables_file) {
-		char name_buf[NAME_LEN*2+2];
-		FILE *fp;
+/***********************************************************************
+Scan file and load filter entries from it.  */
+static
+void
+xb_load_list_file(
+/*==============*/
+	const char* filename,		/*!< in: name of file */
+	insert_entry_func_t ins)	/*!< in: callback to add entry */
+{
+	char	name_buf[NAME_LEN*2+2];
+	FILE*	fp;
 
-		name_buf[NAME_LEN*2+1] = '\0';
-
-		/* init tables_hash */
-		tables_hash = hash_create(1000);
-
-		/* read and store the filenames */
-		fp = fopen(xtrabackup_tables_file,"r");
-		if (!fp) {
-			msg("xtrabackup: cannot open %s\n",
-			    xtrabackup_tables_file);
+	/* read and store the filenames */
+	fp = fopen(filename, "r");
+	if (!fp) {
+		msg("xtrabackup: cannot open %s\n",
+		    filename);
+		exit(EXIT_FAILURE);
+	}
+	while (fgets(name_buf, sizeof(name_buf), fp) != NULL) {
+		char*	p = strchr(name_buf, '\n');
+		if (p) {
+			*p = '\0';
+		} else {
+			msg("xtrabackup: `%s...` name is too long", name_buf);
 			exit(EXIT_FAILURE);
 		}
-		for (;;) {
-			xtrabackup_tables_t*	table;
-			char*	p = name_buf;
 
-			if ( fgets(name_buf, NAME_LEN*2+1, fp) == 0 ) {
-				break;
-			}
+		ins(name_buf);
+	}
 
-			p = strchr(name_buf, '\n');
-			if (p)
-			{
-				*p = '\0';
-			}
+	fclose(fp);
+}
 
-			table = static_cast<xtrabackup_tables_t *>
-				(ut_malloc(sizeof(xtrabackup_tables_t)
-					+ strlen(name_buf) + 1));
-			memset(table, '\0', sizeof(xtrabackup_tables_t) + strlen(name_buf) + 1);
-			table->name = ((char*)table) + sizeof(xtrabackup_tables_t);
-			strcpy(table->name, name_buf);
 
-			HASH_INSERT(xtrabackup_tables_t, name_hash, tables_hash,
-					ut_fold_string(table->name), table);
-		}
+static
+void
+xb_filters_init()
+{
+	UT_LIST_INIT(regex_list);
+
+	if (xtrabackup_databases) {
+		xb_load_list_string(xtrabackup_databases, " \t",
+					xb_register_filter_entry);
+	}
+
+	if (xtrabackup_databases_file) {
+		xb_load_list_file(xtrabackup_databases_file,
+					xb_register_filter_entry);
+	}
+
+	if (xtrabackup_tables) {
+		xb_load_list_string(xtrabackup_tables, ",",
+					xb_register_regex);
+	}
+
+	if (xtrabackup_tables_file) {
+		xb_load_list_file(xtrabackup_tables_file, xb_register_table);
 	}
 }
 
 static
 void
-xb_tables_hash_free(hash_table_t* hash)
+xb_filter_hash_free(hash_table_t* hash)
 {
 	ulint	i;
 
 	/* free the hash elements */
 	for (i = 0; i < hash_get_n_cells(hash); i++) {
-		xtrabackup_tables_t*	table;
+		xb_filter_entry_t*	table;
 
-		table = static_cast<xtrabackup_tables_t *>
+		table = static_cast<xb_filter_entry_t *>
 			(HASH_GET_FIRST(hash, i));
 
 		while (table) {
-			xtrabackup_tables_t*	prev_table = table;
+			xb_filter_entry_t*	prev_table = table;
 
-			table = static_cast<xtrabackup_tables_t *>
+			table = static_cast<xb_filter_entry_t *>
 				(HASH_GET_NEXT(name_hash, prev_table));
 
-			HASH_DELETE(xtrabackup_tables_t, name_hash, hash,
+			HASH_DELETE(xb_filter_entry_t, name_hash, hash,
 				ut_fold_string(prev_table->name), prev_table);
 			ut_free(prev_table);
 		}
@@ -2726,45 +3542,19 @@
 void
 xb_filters_free()
 {
-	if (xtrabackup_tables) {
-		/* free regexp */
-		int i;
-
-		for (i = 0; i < tables_regex_num; i++) {
-			xb_regfree(&tables_regex[i]);
-		}
-		ut_free(tables_regex);
+	while (UT_LIST_GET_LEN(regex_list) > 0) {
+		xb_regex_list_node_t*	node = UT_LIST_GET_FIRST(regex_list);
+		UT_LIST_REMOVE(regex_list, regex_list, node);
+		xb_regfree(&node->regex);
+		ut_free(node);
 	}
 
-	if (xtrabackup_tables_file) {
-		xb_tables_hash_free(tables_hash);
-	}
-}
-
-/***********************************************************************
-Create a specified sync file and wait until it's removed.  */
-static void
-xtrabackup_suspend(
-/*===============*/
-	const char*	sync_fn)	/*!<in: sync file name */
-{
-	char		suspend_path[FN_REFLEN];
-	ibool		success = TRUE;
-	ibool		exists = TRUE;
-	os_file_type_t	type;
-
-	xb_make_sync_file_name(sync_fn, suspend_path);
-
-	if (!xb_create_sync_file(suspend_path)) {
-		return;
+	if (tables_hash) {
+		xb_filter_hash_free(tables_hash);
 	}
 
-	while (exists && success) {
-		os_thread_sleep(200000); /*0.2 sec*/
-		success = os_file_status(suspend_path, &exists, &type);
-		/* success == FALSE if file exists, but stat() failed.
-		os_file_status() prints an error message in this case */
-		ut_a(success);
+	if (databases_hash) {
+		xb_filter_hash_free(databases_hash);
 	}
 }
 
@@ -2941,7 +3731,7 @@
 #endif
 }
 
-static void
+void
 xtrabackup_backup_func(void)
 {
 	MY_STAT			 stat_info;
@@ -2975,6 +3765,13 @@
 	srv_read_only_mode = TRUE;
 
 	srv_backup_mode = TRUE;
+	srv_close_files = xb_close_files;
+
+	if (srv_close_files)
+		msg("xtrabackup: warning: close-files specified. Use it "
+		    "at your own risk. If there are DDL operations like table DROP TABLE "
+		    "or RENAME TABLE during the backup, inconsistent backup will be "
+		    "produced.\n");
 
 	/* initialize components */
         if(innodb_init_param())
@@ -3097,7 +3894,7 @@
 	/* create extra LSN dir if it does not exist. */
 	if (xtrabackup_extra_lsndir
 		&&!my_stat(xtrabackup_extra_lsndir,&stat_info,MYF(0))
-		&& (my_mkdir(xtrabackup_extra_lsndir,0777,MYF(0)) < 0)){
+		&& (my_mkdir(xtrabackup_extra_lsndir,0777,MYF(0)) < 0)) {
 		msg("xtrabackup: Error: cannot mkdir %d: %s\n",
 		    my_errno, xtrabackup_extra_lsndir);
 		exit(EXIT_FAILURE);
@@ -3184,9 +3981,13 @@
 
 	xtrabackup_init_datasinks();
 
+	if (!select_history()) {
+		exit(EXIT_FAILURE);
+	}
+
 	/* open the log file */
 	memset(&stat_info, 0, sizeof(MY_STAT));
-	dst_log_file = ds_open(ds_meta, XB_LOG_FILENAME, &stat_info);
+	dst_log_file = ds_open(ds_redo, XB_LOG_FILENAME, &stat_info);
 	if (dst_log_file == NULL) {
 		msg("xtrabackup: error: failed to open the target stream for "
 		    "'%s'.\n", XB_LOG_FILENAME);
@@ -3219,9 +4020,13 @@
 		io_ticket = xtrabackup_throttle;
 		wait_throttle = os_event_create();
 
-		os_thread_create(io_watching_thread, NULL, &io_watching_thread_id);
+		os_thread_create(io_watching_thread, NULL,
+				 &io_watching_thread_id);
 	}
 
+	mutex_enter(&log_sys->mutex);
+	xtrabackup_choose_lsn_offset(checkpoint_lsn_start);
+	mutex_exit(&log_sys->mutex);
 
 	/* copy log file by current position */
 	if(xtrabackup_copy_logfile(checkpoint_lsn_start, FALSE))
@@ -3239,10 +4044,11 @@
 		exit(EXIT_FAILURE);
 	}
 
-	/* Suspend at start, for the FLUSH CHANGED_PAGE_BITMAPS call */
-	if (xtrabackup_suspend_at_start) {
-		xtrabackup_suspend(XB_FN_SUSPENDED_AT_START);
+	/* FLUSH CHANGED_PAGE_BITMAPS call */
+	if (!flush_changed_page_bitmaps()) {
+		exit(EXIT_FAILURE);
 	}
+	debug_sync_point("xtrabackup_suspend_at_start");
 
 	if (xtrabackup_incremental) {
 		if (!xtrabackup_incremental_force_scan) {
@@ -3306,9 +4112,8 @@
 	}
 	}
 
-	/* suspend-at-end */
-	if (xtrabackup_suspend_at_end) {
-		xtrabackup_suspend(XB_FN_SUSPENDED_AT_END);
+	if (!backup_start()) {
+		exit(EXIT_FAILURE);
 	}
 
 	/* read the latest checkpoint lsn */
@@ -3330,6 +4135,8 @@
 
 		log_group_read_checkpoint_info(max_cp_group, max_cp_field);
 
+		xtrabackup_choose_lsn_offset(checkpoint_lsn_start);
+
 		latest_cp = mach_read_from_8(log_sys->checkpoint_buf +
 					     LOG_CHECKPOINT_LSN);
 
@@ -3350,16 +4157,8 @@
 	msg("\n");
 
 	os_event_free(log_copying_stop);
-
-	/* Signal innobackupex that log copying has stopped and it may now
-	unlock tables, so we can possibly stream xtrabackup_logfile later
-	without holding the lock. */
-	if (xtrabackup_suspend_at_end) {
-		char	log_copied_sync_file[FN_REFLEN];
-		xb_make_sync_file_name(XB_FN_LOG_COPIED, log_copied_sync_file);
-		if (!xb_create_sync_file(log_copied_sync_file)) {
-			exit(EXIT_FAILURE);
-		}
+	if (ds_close(dst_log_file)) {
+		exit(EXIT_FAILURE);
 	}
 
 	if(!xtrabackup_incremental) {
@@ -3373,30 +4172,50 @@
 	metadata_last_lsn = log_copy_scanned_lsn;
 
 	if (!xtrabackup_stream_metadata(ds_meta)) {
-		msg("xtrabackup: error: "
-		    "xtrabackup_stream_metadata() failed.\n");
+		msg("xtrabackup: Error: failed to stream metadata.\n");
+		exit(EXIT_FAILURE);
 	}
 	if (xtrabackup_extra_lsndir) {
 		char	filename[FN_REFLEN];
 
 		sprintf(filename, "%s/%s", xtrabackup_extra_lsndir,
 			XTRABACKUP_METADATA_FILENAME);
-		if (!xtrabackup_write_metadata(filename))
-			msg("xtrabackup: error: "
-			    "xtrabackup_write_metadata() failed.\n");
+		if (!xtrabackup_write_metadata(filename)) {
+			msg("xtrabackup: Error: failed to write metadata "
+			    "to '%s'.\n", filename);
+			exit(EXIT_FAILURE);
+		}
 
 	}
 
+	if (!backup_finish()) {
+		exit(EXIT_FAILURE);
+	}
+
 	xtrabackup_destroy_datasinks();
 
-	if (wait_throttle)
+	if (wait_throttle) {
+		/* wait for io_watching_thread completion */
+		while (io_watching_thread_running) {
+			os_thread_sleep(1000000);
+		}
 		os_event_free(wait_throttle);
+		wait_throttle = NULL;
+	}
 
 	msg("xtrabackup: Transaction log of lsn (" LSN_PF ") to (" LSN_PF
 	    ") was copied.\n", checkpoint_lsn_start, log_copy_scanned_lsn);
 	xb_filters_free();
 
 	xb_data_files_close();
+
+	/* Make sure that the latest checkpoint made it to xtrabackup_logfile */
+	if (latest_cp > log_copy_scanned_lsn) {
+		msg("xtrabackup: error: last checkpoint LSN (" LSN_PF
+		    ") is larger than last copied LSN (" LSN_PF ").\n",
+		    latest_cp, log_copy_scanned_lsn);
+		exit(EXIT_FAILURE);
+	}
 }
 
 /* ================= stats ================= */
@@ -3815,6 +4634,8 @@
 end:
 	putc('\n', stdout);
 
+	fflush(stdout);
+
 	xb_filters_free();
 
 	/* shutdown InnoDB */
@@ -3828,22 +4649,22 @@
 xtrabackup_init_temp_log(void)
 {
 	os_file_t	src_file = XB_FILE_UNDEFINED;
-	char	src_path[FN_REFLEN];
-	char	dst_path[FN_REFLEN];
-	ibool	success;
+	char		src_path[FN_REFLEN];
+	char		dst_path[FN_REFLEN];
+	ibool		success;
 
-	ulint	field;
-	byte	log_buf[UNIV_PAGE_SIZE_MAX * 128]; /* 2 MB */
+	ulint		field;
+	byte		log_buf[UNIV_PAGE_SIZE_MAX * 128]; /* 2 MB */
 
 	ib_int64_t	file_size;
 
-	lsn_t	max_no;
-	lsn_t	max_lsn;
-	lsn_t	checkpoint_no;
+	lsn_t		max_no;
+	lsn_t		max_lsn;
+	lsn_t		checkpoint_no;
 
-	ulint	fold;
+	ulint		fold;
 
-	bool	checkpoint_found;
+	bool		checkpoint_found;
 
 	max_no = 0;
 
@@ -4079,6 +4900,10 @@
 	src_file = XB_FILE_UNDEFINED;
 
 	/* fake InnoDB */
+	innobase_log_files_in_group_save = innobase_log_files_in_group;
+	srv_log_group_home_dir_save = srv_log_group_home_dir;
+	innobase_log_file_size_save = innobase_log_file_size;
+
 	srv_log_group_home_dir = NULL;
 	innobase_log_file_size      = file_size;
 	innobase_log_files_in_group = 1;
@@ -4239,7 +5064,7 @@
 	fil_space_t*		fil_space;
 	os_file_t		file	= 0;
 	ulint			tablespace_flags;
-	xtrabackup_tables_t*	table;
+	xb_filter_entry_t*	table;
 
 	ut_a(dbname != NULL ||
 	     !fil_is_user_tablespace_id(space_id) ||
@@ -4278,13 +5103,13 @@
 	}
 
 	/* remember space name for further reference */
-	table = static_cast<xtrabackup_tables_t *>
-		(ut_malloc(sizeof(xtrabackup_tables_t) +
+	table = static_cast<xb_filter_entry_t *>
+		(ut_malloc(sizeof(xb_filter_entry_t) +
 			strlen(dest_space_name) + 1));
 
-	table->name = ((char*)table) + sizeof(xtrabackup_tables_t);
+	table->name = ((char*)table) + sizeof(xb_filter_entry_t);
 	strcpy(table->name, dest_space_name);
-	HASH_INSERT(xtrabackup_tables_t, name_hash, inc_dir_tables_hash,
+	HASH_INSERT(xb_filter_entry_t, name_hash, inc_dir_tables_hash,
 			ut_fold_string(table->name), table);
 
 	mutex_enter(&fil_system->mutex);
@@ -4610,14 +5435,14 @@
 	void*		arg __attribute__((unused)))
 {
 	char			name[FN_REFLEN];
-	xtrabackup_tables_t*	table;
+	xb_filter_entry_t*	table;
 
 	snprintf(name, FN_REFLEN, "%s/%s", db_name, file_name);
 	/* Truncate ".ibd" */
 	name[strlen(name) - 4] = '\0';
 
 	HASH_SEARCH(name_hash, inc_dir_tables_hash, ut_fold_string(name),
-		    xtrabackup_tables_t*,
+		    xb_filter_entry_t*,
 		    table, (void) 0,
 		    !strcmp(table->name, name));
 
@@ -4833,6 +5658,10 @@
 	os_file_close(src_file);
 	src_file = XB_FILE_UNDEFINED;
 
+	innobase_log_files_in_group = innobase_log_files_in_group_save;
+	srv_log_group_home_dir = srv_log_group_home_dir_save;
+	innobase_log_file_size = innobase_log_file_size_save;
+
 	return(FALSE);
 error:
 	if (src_file != XB_FILE_UNDEFINED)
@@ -5253,6 +6082,45 @@
 	return xtrabackup_arch_first_file_lsn != 0;
 }
 
+static
+void
+innodb_free_param()
+{
+	srv_free_paths_and_sizes();
+	free(internal_innobase_data_file_path);
+	internal_innobase_data_file_path = NULL;
+	free_tmpdir(&mysql_tmpdir_list);
+}
+
+
+/**************************************************************************
+Store the current binary log coordinates in a specified file.
+@return 'false' on error. */
+static bool
+store_binlog_info(
+/*==============*/
+	const char *filename)	/*!< in: output file name */
+{
+	FILE *fp;
+
+	if (trx_sys_mysql_bin_log_name[0] == '\0') {
+		return(true);
+	}
+
+	fp = fopen(filename, "w");
+
+	if (!fp) {
+		msg("xtrabackup: failed to open '%s'\n", filename);
+		return(false);
+	}
+
+	fprintf(fp, "%s\t" UINT64PF "\n",
+		trx_sys_mysql_bin_log_name, trx_sys_mysql_bin_log_pos);
+	fclose(fp);
+
+	return(true);
+}
+
 static void
 xtrabackup_prepare_func(void)
 {
@@ -5283,26 +6151,33 @@
 	sprintf(metadata_path, "%s/%s", xtrabackup_target_dir,
 		XTRABACKUP_METADATA_FILENAME);
 
-	if (!xtrabackup_read_metadata(metadata_path))
-		msg("xtrabackup: error: xtrabackup_read_metadata()\n");
+	if (!xtrabackup_read_metadata(metadata_path)) {
+		msg("xtrabackup: Error: failed to read metadata from '%s'\n",
+		    metadata_path);
+		exit(EXIT_FAILURE);
+	}
 
 	if (!innobase_log_arch_dir)
 	{
 		if (!strcmp(metadata_type, "full-backuped")) {
 			msg("xtrabackup: This target seems to be not prepared "
 			    "yet.\n");
+		} else if (!strcmp(metadata_type, "log-applied")) {
+			msg("xtrabackup: This target seems to be already "
+			    "prepared with --apply-log-only.\n");
+			goto skip_check;
 		} else if (!strcmp(metadata_type, "full-prepared")) {
 			msg("xtrabackup: This target seems to be already "
 			    "prepared.\n");
-			goto skip_check;
 		} else {
 			msg("xtrabackup: This target seems not to have correct "
 			    "metadata...\n");
+			exit(EXIT_FAILURE);
 		}
 
 		if (xtrabackup_incremental) {
 			msg("xtrabackup: error: applying incremental backup "
-			    "needs target prepared.\n");
+			    "needs target prepared with --apply-log-only.\n");
 			exit(EXIT_FAILURE);
 		}
 skip_check:
@@ -5329,11 +6204,13 @@
 	mem_init(srv_mem_pool_size);
 	ut_crc32_init();
 
+	xb_filters_init();
+
 	if(!innobase_log_arch_dir && xtrabackup_init_temp_log())
-		goto error;
+		goto error_cleanup;
 
 	if(innodb_init_param()) {
-		goto error;
+		goto error_cleanup;
 	}
 
 	/* Expand compacted datafiles */
@@ -5342,7 +6219,7 @@
 		srv_compact_backup = TRUE;
 
 		if (!xb_expand_datafiles()) {
-			goto error;
+			goto error_cleanup;
 		}
 
 		/* Reset the 'compact' flag in xtrabackup_checkpoints so we
@@ -5351,7 +6228,7 @@
 		if (!xtrabackup_write_metadata(metadata_path)) {
 			msg("xtrabackup: error: xtrabackup_write_metadata() "
 			    "failed\n");
-			goto error;
+			goto error_cleanup;
 		}
 	}
 
@@ -5362,7 +6239,7 @@
 		if (err != DB_SUCCESS) {
 			msg("xtrabackup: error: xb_data_files_init() failed "
 			    "with error code %lu\n", err);
-			goto error;
+			goto error_cleanup;
 		}
 	}
 	if (xtrabackup_incremental) {
@@ -5370,8 +6247,8 @@
 
 		if(!xtrabackup_apply_deltas()) {
 			xb_data_files_close();
-			xb_tables_hash_free(inc_dir_tables_hash);
-			goto error;
+			xb_filter_hash_free(inc_dir_tables_hash);
+			goto error_cleanup;
 		}
 	}
 	if (xtrabackup_incremental || innobase_log_arch_dir) {
@@ -5383,19 +6260,24 @@
 
 		xb_process_datadir("./", ".ibd", rm_if_not_found, NULL);
 
-		xb_tables_hash_free(inc_dir_tables_hash);
+		xb_filter_hash_free(inc_dir_tables_hash);
 	}
 	sync_close();
 	sync_initialized = FALSE;
+	if (fil_system) {
+		fil_close();
+	}
 	os_sync_free();
 	mem_close();
 	os_sync_mutex = NULL;
 	ut_free_all_mem();
 
+	innodb_free_param();
+
 	/* Reset the configuration as it might have been changed by
 	xb_data_files_init(). */
 	if(innodb_init_param()) {
-		goto error;
+		goto error_cleanup;
 	}
 
 	srv_apply_log_only = (ibool) xtrabackup_apply_log_only;
@@ -5427,7 +6309,7 @@
 				    ", there is nothing to do\n",
 				    xtrabackup_archived_to_lsn,
 				    min_flushed_lsn);
-				goto error;
+				goto error_cleanup;
 			}
 		}
 		srv_archive_recovery_limit_lsn= xtrabackup_archived_to_lsn;
@@ -5435,10 +6317,10 @@
 		  Unfinished transactions are not rolled back during log applying
 		  as they can be finished at the firther files applyings.
 		*/
-		srv_apply_log_only = TRUE;
+		srv_apply_log_only = xtrabackup_apply_log_only = TRUE;
 
 		if (!xtrabackup_arch_search_files(min_flushed_lsn)) {
-			goto error;
+			goto error_cleanup;
 		}
 
 		/*
@@ -5450,7 +6332,7 @@
 		    LOG_FILE_HDR_SIZE < metadata_last_lsn) {
 			msg("xtrabackup: error: there are no enough archived logs "
 			    "to apply\n");
-			goto error;
+			goto error_cleanup;
 		}
 	}
 
@@ -5459,7 +6341,7 @@
 	    "(set by --use-memory parameter)\n", xtrabackup_use_memory);
 
 	if(innodb_init())
-		goto error;
+		goto error_cleanup;
 
 	it = datafiles_iter_new(fil_system);
 	if (it == NULL) {
@@ -5649,29 +6531,19 @@
 		ut_free(buf);
 	}
 
-	/* print binlog position (again?) */
-	msg("\n[notice (again)]\n"
-	    "  If you use binary log and don't use any hack of group commit,\n"
-	    "  the binary log position seems to be:\n");
+	/* print the binary log position  */
 	trx_sys_print_mysql_binlog_offset();
 	msg("\n");
 
-	/* output to xtrabackup_binlog_pos_innodb */
-	if (*trx_sys_mysql_bin_log_name != '\0') {
-		FILE *fp;
-
-		fp = fopen("xtrabackup_binlog_pos_innodb", "w");
-		if (fp) {
-			/* Use UINT64PF instead of LSN_PF here, as we have to
-			maintain the file format. */
-			fprintf(fp, "%s\t" UINT64PF "\n",
-				trx_sys_mysql_bin_log_name,
-				trx_sys_mysql_bin_log_pos);
-			fclose(fp);
-		} else {
-			msg("xtrabackup: failed to open "
-			    "'xtrabackup_binlog_pos_innodb'\n");
-		}
+	/* output to xtrabackup_binlog_pos_innodb and (if
+	backup_safe_binlog_info was available on the server) to
+	xtrabackup_binlog_info. In the latter case xtrabackup_binlog_pos_innodb
+	becomes redundant and is created only for compatibility. */
+	if (!store_binlog_info("xtrabackup_binlog_pos_innodb") ||
+	    (recover_binlog_info &&
+	     !store_binlog_info(XTRABACKUP_BINLOG_INFO))) {
+
+		exit(EXIT_FAILURE);
 	}
 
 	if (innobase_log_arch_dir)
@@ -5679,27 +6551,31 @@
 
 	/* Check whether the log is applied enough or not. */
 	if ((xtrabackup_incremental
-	     && srv_start_lsn < incremental_last_lsn)
+	     && srv_start_lsn < incremental_to_lsn)
 	    ||(!xtrabackup_incremental
-	       && srv_start_lsn < metadata_last_lsn)) {
-		msg(
-"xtrabackup: ########################################################\n"
-"xtrabackup: # !!WARNING!!                                          #\n"
-"xtrabackup: # The transaction log file is corrupted.               #\n"
-"xtrabackup: # The log was not applied to the intended LSN!         #\n"
-"xtrabackup: ########################################################\n"
-		    );
+	       && srv_start_lsn < metadata_to_lsn)) {
+		msg("xtrabackup: error: "
+		    "The transaction log file is corrupted.\n"
+		    "xtrabackup: error: "
+		    "The log was not applied to the intended LSN!\n");
+		msg("xtrabackup: Log applied to lsn " LSN_PF "\n",
+		    srv_start_lsn);
 		if (xtrabackup_incremental) {
 			msg("xtrabackup: The intended lsn is " LSN_PF "\n",
-			    incremental_last_lsn);
+			    incremental_to_lsn);
 		} else {
 			msg("xtrabackup: The intended lsn is " LSN_PF "\n",
-			    metadata_last_lsn);
+			    metadata_to_lsn);
 		}
+		exit(EXIT_FAILURE);
 	}
 
+	xb_write_galera_info(xtrabackup_incremental);
+
 	if(innodb_end())
-		goto error;
+		goto error_cleanup;
+
+        innodb_free_param();
 
 	sync_initialized = FALSE;
 	os_sync_mutex = NULL;
@@ -5717,7 +6593,8 @@
 	{
 		char	filename[FN_REFLEN];
 
-		strcpy(metadata_type, "full-prepared");
+		strcpy(metadata_type, srv_apply_log_only ?
+					"log-applied" : "full-prepared");
 
 		if(xtrabackup_incremental
 		   && metadata_to_lsn < incremental_to_lsn)
@@ -5727,41 +6604,100 @@
 		}
 
 		sprintf(filename, "%s/%s", xtrabackup_target_dir, XTRABACKUP_METADATA_FILENAME);
-		if (!xtrabackup_write_metadata(filename))
-			msg("xtrabackup: error: xtrabackup_write_metadata"
-			    "(xtrabackup_target_dir)\n");
+		if (!xtrabackup_write_metadata(filename)) {
+
+			msg("xtrabackup: Error: failed to write metadata "
+			    "to '%s'\n", filename);
+			exit(EXIT_FAILURE);
+		}
 
 		if(xtrabackup_extra_lsndir) {
 			sprintf(filename, "%s/%s", xtrabackup_extra_lsndir, XTRABACKUP_METADATA_FILENAME);
-			if (!xtrabackup_write_metadata(filename))
-				msg("xtrabackup: error: "
-				    "xtrabackup_write_metadata"
-				    "(xtrabackup_extra_lsndir)\n");
+			if (!xtrabackup_write_metadata(filename)) {
+				msg("xtrabackup: Error: failed to write "
+				    "metadata to '%s'\n", filename);
+				exit(EXIT_FAILURE);
+			}
 		}
 	}
 
-	if(!xtrabackup_create_ib_logfile)
-		return;
+	if (!apply_log_finish()) {
+		exit(EXIT_FAILURE);
+	}
+
+	sync_close();
+	sync_initialized = FALSE;
+	if (fil_system) {
+		fil_close();
+	}
+	os_sync_free();
+	// mem_close();
+	os_sync_mutex = NULL;
+	ut_free_all_mem();
+
+	/* start InnoDB once again to create log files */
 
-	/* TODO: make more smart */
+	if (!xtrabackup_apply_log_only) {
 
-	msg("\n[notice]\n"
-	    "We cannot call InnoDB second time during the process lifetime.\n");
-	msg("Please re-execte to create ib_logfile*. Sorry.\n");
+		if(innodb_init_param()) {
+			goto error;
+		}
+
+		srv_apply_log_only = FALSE;
+		srv_rebuild_indexes = FALSE;
+
+		/* increase IO threads */
+		if(srv_n_file_io_threads < 10) {
+			srv_n_read_io_threads = 4;
+			srv_n_write_io_threads = 4;
+		}
+
+		srv_shutdown_state = SRV_SHUTDOWN_NONE;
+
+		if(innodb_init())
+			goto error;
+
+		if(innodb_end())
+			goto error;
+
+                innodb_free_param();
+
+	}
+
+	xb_filters_free();
 
 	return;
 
-error:
+error_cleanup:
 	xtrabackup_close_temp_log(FALSE);
+	xb_filters_free();
 
+error:
 	exit(EXIT_FAILURE);
 }
 
-/* ================= main =================== */
-
-int main(int argc, char **argv)
+/**************************************************************************
+Signals-related setup. */
+static
+void
+setup_signals()
+/*===========*/
 {
-	int ho_error;
+	struct sigaction sa;
+
+	/* Print a stacktrace on some signals */
+	sa.sa_flags = SA_RESETHAND | SA_NODEFER;
+	sigemptyset(&sa.sa_mask);
+	sigprocmask(SIG_SETMASK,&sa.sa_mask,NULL);
+#ifdef HAVE_STACKTRACE
+	my_init_stacktrace();
+#endif
+	sa.sa_handler = handle_fatal_signal;
+	sigaction(SIGSEGV, &sa, NULL);
+	sigaction(SIGABRT, &sa, NULL);
+	sigaction(SIGBUS, &sa, NULL);
+	sigaction(SIGILL, &sa, NULL);
+	sigaction(SIGFPE, &sa, NULL);
 
 #ifdef __linux__
 	/* Ensure xtrabackup process is killed when the parent one
@@ -5772,75 +6708,285 @@
 		exit(EXIT_FAILURE);
 	}
 #endif
-	MY_INIT(argv[0]);
-	xb_regex_init();
+}
 
-	system_charset_info= &my_charset_utf8_general_ci;
-	key_map_full.set_all();
+/**************************************************************************
+Append group name to xb_load_default_groups list. */
+static
+void
+append_defaults_group(const char *group, const char *default_groups[],
+		      size_t default_groups_size)
+{
+	uint i;
+	bool appended = false;
+	for (i = 0; i < default_groups_size - 1; i++) {
+		if (default_groups[i] == NULL) {
+			default_groups[i] = group;
+			appended = true;
+			break;
+		}
+	}
+	ut_a(appended);
+}
 
-	/* scan options for group to load defaults from */
-	{
-		int	i;
-		char*	optend;
-		for (i=1; i < argc; i++) {
-			optend = strcend(argv[i], '=');
-			if (strncmp(argv[i], "--defaults-group", optend - argv[i]) == 0) {
-				xb_load_default_groups[2] = defaults_group = optend + 1;
-			}
+bool
+xb_init()
+{
+	const char *mixed_options[4] = {NULL, NULL, NULL, NULL};
+	int n_mixed_options;
+
+	/* sanity checks */
+
+	if (opt_slave_info
+		&& opt_no_lock
+		&& !opt_safe_slave_backup) {
+		msg("Error: --slave-info is used with --no-lock but "
+			"without --safe-slave-backup. The binlog position "
+			"cannot be consistent with the backup data.\n");
+		return(false);
+	}
+
+	if (opt_rsync && xtrabackup_stream_fmt) {
+		msg("Error: --rsync doesn't work with --stream\n");
+		return(false);
+	}
+
+	n_mixed_options = 0;
+
+	if (opt_decompress) {
+		mixed_options[n_mixed_options++] = "--decompress";
+	} else if (opt_decrypt) {
+		mixed_options[n_mixed_options++] = "--decrypt";
+	}
+
+	if (xtrabackup_copy_back) {
+		mixed_options[n_mixed_options++] = "--copy-back";
+	}
+
+	if (xtrabackup_move_back) {
+		mixed_options[n_mixed_options++] = "--move-back";
+	}
+
+	if (xtrabackup_prepare) {
+		mixed_options[n_mixed_options++] = "--apply-log";
+	}
+
+	if (n_mixed_options > 1) {
+		msg("Error: %s and %s are mutually exclusive\n",
+			mixed_options[0], mixed_options[1]);
+		return(false);
+	}
+
+	if (xtrabackup_backup) {
+
+		if (!opt_noversioncheck) {
+			version_check();
+		}
+
+		if ((mysql_connection = xb_mysql_connect()) == NULL) {
+			return(false);
 		}
+
+		if (!get_mysql_vars(mysql_connection)) {
+			return(false);
+		}
+
+		history_start_time = time(NULL);
+
 	}
-	load_defaults("my", xb_load_default_groups, &argc, &argv);
 
-	/* ignore unsupported options */
-	{
-	int i,j,argc_new,find;
-	char *optend, *prev_found = NULL;
-	argc_new = argc;
-
-	j=1;
-	for (i=1 ; i < argc ; i++) {
-		uint count;
-		struct my_option *opt= (struct my_option *) xb_long_options;
-		optend= strcend((argv)[i], '=');
-		if (!strncmp(argv[i], "--defaults-file", optend - argv[i]))
-		{
+	return(true);
+}
+
+void
+handle_options(int argc, char **argv, char ***argv_client, char ***argv_server)
+{
+	int i;
+	int ho_error;
+
+	char*	target_dir = NULL;
+	bool	prepare = false;
+
+	char	conf_file[FN_REFLEN];
+	int	argc_client = argc;
+	int	argc_server = argc;
+
+	*argv_client = argv;
+	*argv_server = argv;
+
+	/* scan options for group and config file to load defaults from */
+	for (i = 1; i < argc; i++) {
+
+		char *optend = strcend(argv[i], '=');
+
+		if (strncmp(argv[i], "--defaults-group",
+			    optend - argv[i]) == 0) {
+			defaults_group = optend + 1;
+			append_defaults_group(defaults_group,
+				xb_server_default_groups,
+				array_elements(xb_server_default_groups));
+		}
+
+		if (strncmp(argv[i], "--login-path",
+			    optend - argv[i]) == 0) {
+			append_defaults_group(optend + 1,
+				xb_client_default_groups,
+				array_elements(xb_client_default_groups));
+		}
+
+		if (!strncmp(argv[i], "--prepare",
+			     optend - argv[i])) {
+			prepare = true;
+		}
+
+		if (!strncmp(argv[i], "--apply-log",
+			     optend - argv[i])) {
+			prepare = true;
+		}
+
+		if (!strncmp(argv[i], "--target-dir",
+			     optend - argv[i]) && *optend) {
+			target_dir = optend + 1;
+		}
+
+		if (!*optend && argv[i][0] != '-') {
+			target_dir = argv[i];
+		}
+	}
+
+	snprintf(conf_file, sizeof(conf_file), "my");
+
+	if (prepare && target_dir) {
+		snprintf(conf_file, sizeof(conf_file),
+			 "%s/backup-my.cnf", target_dir);
+	}
+	if (load_defaults(conf_file, xb_server_default_groups,
+			  &argc_server, argv_server)) {
+		exit(EXIT_FAILURE);
+	}
+
+	print_param_str <<
+		"# This MySQL options file was generated by XtraBackup.\n"
+		"[" << defaults_group << "]\n";
+
+	/* We want xtrabackup to ignore unknown options, because it only
+	recognizes a small subset of server variables */
+	my_getopt_skip_unknown = TRUE;
+
+	/* Reset u_max_value for all options, as we don't want the
+	--maximum-... modifier to set the actual option values */
+	for (my_option *optp= xb_server_options; optp->name; optp++) {
+		optp->u_max_value = (G_PTR *) &global_max_value;
+	}
+
+	/* Throw a descriptive error if --defaults-file or --defaults-extra-file
+	is not the first command line argument */
+	for (int i = 2 ; i < argc ; i++) {
+		char *optend = strcend((argv)[i], '=');
+
+		if (optend - argv[i] == 15 &&
+                    !strncmp(argv[i], "--defaults-file", optend - argv[i])) {
+
 			msg("xtrabackup: Error: --defaults-file "
 			    "must be specified first on the command "
 			    "line\n");
 			exit(EXIT_FAILURE);
 		}
-		for (count= 0; opt->name; opt++) {
-			if (!getopt_compare_strings(opt->name, (argv)[i] + 2,
-				(uint)(optend - (argv)[i] - 2))) /* match found */
-			{
-				if (!opt->name[(uint)(optend - (argv)[i] - 2)]) {
-					find = 1;
-					goto next_opt;
-				}
-				if (!count) {
-					count= 1;
-					prev_found= (char *) opt->name;
-				}
-				else if (strcmp(prev_found, opt->name)) {
-					count++;
+                if (optend - argv[i] == 21 &&
+		    !strncmp(argv[i], "--defaults-extra-file",
+			     optend - argv[i])) {
+
+			msg("xtrabackup: Error: --defaults-extra-file "
+			    "must be specified first on the command "
+			    "line\n");
+			exit(EXIT_FAILURE);
+		}
+	}
+
+	if (argc_server > 0
+	    && (ho_error=handle_options(&argc_server, argv_server,
+					xb_server_options, xb_get_one_option)))
+		exit(ho_error);
+
+	if (load_defaults(conf_file, xb_client_default_groups,
+			  &argc_client, argv_client)) {
+		exit(EXIT_FAILURE);
+	}
+
+	if (strcmp(base_name(my_progname), INNOBACKUPEX_BIN_NAME) == 0 &&
+	    argc_client > 0) {
+		/* emulate innobackupex script */
+		innobackupex_mode = true;
+		if (!ibx_handle_options(&argc_client, argv_client)) {
+			exit(EXIT_FAILURE);
+		}
+	}
+
+	if (argc_client > 0
+	    && (ho_error=handle_options(&argc_client, argv_client,
+					xb_client_options, xb_get_one_option)))
+		exit(ho_error);
+
+	/* Reject command line arguments that don't look like options, i.e. are
+	not of the form '-X' (single-character options) or '--option' (long
+	options) */
+	for (int i = 0 ; i < argc_client ; i++) {
+		const char * const opt = (*argv_client)[i];
+
+		if (strncmp(opt, "--", 2) &&
+		    !(strlen(opt) == 2 && opt[0] == '-')) {
+			bool server_option = true;
+
+			for (int j = 0; j < argc_server; j++) {
+				if (opt == (*argv_server)[j]) {
+					server_option = false;
+					break;
 				}
 			}
-		}
-		find = count;
-next_opt:
-		if(!find){
-			argc_new--;
-		} else {
-			(argv)[j]=(argv)[i];
-			j++;
+
+			if (!server_option) {
+				msg("xtrabackup: Error:"
+				    " unknown argument: '%s'\n", opt);
+				exit(EXIT_FAILURE);
+			}
 		}
 	}
-	argc = argc_new;
-	argv[argc] = NULL;
+}
+
+/* ================= main =================== */
+
+int main(int argc, char **argv)
+{
+	char **client_defaults, **server_defaults;
+	char cwd[FN_REFLEN];
+	my_bool is_symdir;
+
+	setup_signals();
+
+	MY_INIT(argv[0]);
+
+	pthread_key_create(&THR_THD, NULL);
+	my_pthread_setspecific_ptr(THR_THD, NULL);
+
+	xb_regex_init();
+
+	capture_tool_command(argc, argv);
+
+	if (mysql_server_init(-1, NULL, NULL))
+	{
+		exit(EXIT_FAILURE);
 	}
 
-	if ((ho_error=handle_options(&argc, &argv, xb_long_options, get_one_option)))
-		exit(ho_error);
+	system_charset_info= &my_charset_utf8_general_ci;
+	key_map_full.set_all();
+
+	handle_options(argc, argv, &client_defaults, &server_defaults);
+
+	if (innobackupex_mode) {
+		if (!ibx_init()) {
+			exit(EXIT_FAILURE);
+		}
+	}
 
 	if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
 		if (!xtrabackup_print_param)
@@ -5849,10 +6995,57 @@
 		exit(EXIT_FAILURE);
 	}
 
-	/* Ensure target dir is not relative to datadir */
-	my_load_path(xtrabackup_real_target_dir, xtrabackup_target_dir, NULL);
+	/* Expand target-dir, incremental-basedir, etc. */
+
+	my_getwd(cwd, sizeof(cwd), MYF(0));
+
+	my_load_path(xtrabackup_real_target_dir,
+		     xtrabackup_target_dir, cwd);
+	unpack_dirname(xtrabackup_real_target_dir,
+		       xtrabackup_real_target_dir, &is_symdir);
 	xtrabackup_target_dir= xtrabackup_real_target_dir;
 
+	if (xtrabackup_incremental_basedir) {
+		my_load_path(xtrabackup_real_incremental_basedir,
+			     xtrabackup_incremental_basedir, cwd);
+		unpack_dirname(xtrabackup_real_incremental_basedir,
+			       xtrabackup_real_incremental_basedir, &is_symdir);
+		xtrabackup_incremental_basedir =
+			xtrabackup_real_incremental_basedir;
+	}
+
+	if (xtrabackup_incremental_dir) {
+		my_load_path(xtrabackup_real_incremental_dir,
+			     xtrabackup_incremental_dir, cwd);
+		unpack_dirname(xtrabackup_real_incremental_dir,
+			       xtrabackup_real_incremental_dir, &is_symdir);
+		xtrabackup_incremental_dir = xtrabackup_real_incremental_dir;
+	}
+
+	if (xtrabackup_extra_lsndir) {
+		my_load_path(xtrabackup_real_extra_lsndir,
+			     xtrabackup_extra_lsndir, cwd);
+		unpack_dirname(xtrabackup_real_extra_lsndir,
+			       xtrabackup_real_extra_lsndir, &is_symdir);
+		xtrabackup_extra_lsndir = xtrabackup_real_extra_lsndir;
+	}
+
+	/* get default temporary directory */
+	if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0]) {
+		opt_mysql_tmpdir = getenv("TMPDIR");
+#if defined(__WIN__)
+		if (!opt_mysql_tmpdir) {
+			opt_mysql_tmpdir = getenv("TEMP");
+		}
+		if (!opt_mysql_tmpdir) {
+			opt_mysql_tmpdir = getenv("TMP");
+		}
+#endif
+		if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0]) {
+			opt_mysql_tmpdir = const_cast<char*>(DEFAULT_TMPDIR);
+		}
+	}
+
 	/* temporary setting of enough size */
 	srv_page_size_shift = UNIV_PAGE_SIZE_SHIFT_MAX;
 	srv_page_size = UNIV_PAGE_SIZE_MAX;
@@ -5900,57 +7093,23 @@
 		incremental_last_lsn = metadata_last_lsn;
 		xtrabackup_incremental = xtrabackup_incremental_dir; //dummy
 
+	} else if (opt_incremental_history_name) {
+		xtrabackup_incremental = opt_incremental_history_name;
+	} else if (opt_incremental_history_uuid) {
+		xtrabackup_incremental = opt_incremental_history_uuid;
 	} else {
 		xtrabackup_incremental = NULL;
 	}
 
+	if (!xb_init()) {
+		exit(EXIT_FAILURE);
+	}
+
 	/* --print-param */
 	if (xtrabackup_print_param) {
-		/* === some variables from mysqld === */
-		memset((G_PTR) &mysql_tmpdir_list, 0,
-		       sizeof(mysql_tmpdir_list));
 
-		if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))
-			exit(EXIT_FAILURE);
+		printf("%s", print_param_str.str().c_str());
 
-		printf("# This MySQL options file was generated by XtraBackup.\n");
-		printf("[%s]\n", defaults_group);
-		printf("datadir = \"%s\"\n", mysql_data_home);
-		printf("tmpdir = \"%s\"\n", mysql_tmpdir_list.list[0]);
-		printf("innodb_data_home_dir = \"%s\"\n",
-			innobase_data_home_dir ? innobase_data_home_dir : mysql_data_home);
-		printf("innodb_data_file_path = \"%s\"\n",
-			innobase_data_file_path ? innobase_data_file_path : "ibdata1:10M:autoextend");
-		printf("innodb_log_group_home_dir = \"%s\"\n",
-		       srv_log_group_home_dir ?
-		       srv_log_group_home_dir : mysql_data_home);
-		printf("innodb_log_files_in_group = %ld\n", innobase_log_files_in_group);
-		printf("innodb_log_file_size = %lld\n", innobase_log_file_size);
-		printf("innodb_flush_method = \"%s\"\n",
-		       (innobase_unix_file_flush_method != NULL) ?
-		       innobase_unix_file_flush_method : "");
-		printf("innodb_page_size = %lld\n", innobase_page_size);
-		printf("innodb_fast_checksum = %d\n", innobase_fast_checksum);
-		printf("innodb_log_block_size = %lu\n", innobase_log_block_size);
-		if (innobase_doublewrite_file != NULL) {
-			printf("innodb_doublewrite_file = %s\n", innobase_doublewrite_file);
-		}
-		if (srv_undo_dir) {
-
-			printf("innodb_undo_directory = \"%s\"\n",
-			       srv_undo_dir);
-		}
-		printf("innodb_undo_tablespaces = %lu\n", srv_undo_tablespaces);
-		printf("innodb_checksum_algorithm = %s\n",
-		       innodb_checksum_algorithm_names[srv_checksum_algorithm]
-		       );
-		printf("innodb_log_checksum_algorithm = %s\n",
-		       innodb_checksum_algorithm_names[srv_log_checksum_algorithm]
-		       );
-		printf("innodb_buffer_pool_filename = \"%s\"\n",
-			innobase_buffer_pool_filename ?
-				innobase_buffer_pool_filename :
-				"ib_buffer_pool");
 		exit(EXIT_SUCCESS);
 	}
 
@@ -6001,6 +7160,9 @@
 		if (xtrabackup_backup) num++;
 		if (xtrabackup_stats) num++;
 		if (xtrabackup_prepare) num++;
+		if (xtrabackup_copy_back) num++;
+		if (xtrabackup_move_back) num++;
+		if (xtrabackup_decrypt_decompress) num++;
 		if (num != 1) { /* !XOR (for now) */
 			usage();
 			exit(EXIT_FAILURE);
@@ -6025,7 +7187,34 @@
 	if (xtrabackup_prepare)
 		xtrabackup_prepare_func();
 
+	if (xtrabackup_copy_back || xtrabackup_move_back) {
+		if (!check_if_param_set("datadir")) {
+			msg("Error: datadir must be specified.\n");
+			exit(EXIT_FAILURE);
+		}
+		if (!copy_back())
+			exit(EXIT_FAILURE);
+	}
+
+	if (xtrabackup_decrypt_decompress && !decrypt_decompress()) {
+		exit(EXIT_FAILURE);
+	}
+
+	backup_cleanup();
+
+	if (innobackupex_mode) {
+		ibx_cleanup();
+	}
+
 	xb_regex_end();
 
+	free_defaults(client_defaults);
+	free_defaults(server_defaults);
+
+	if (THR_THD)
+		(void) pthread_key_delete(THR_THD);
+
+	msg_ts("completed OK!\n");
+
 	exit(EXIT_SUCCESS);
 }
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xtrabackup.h percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xtrabackup.h
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xtrabackup.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xtrabackup.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 /******************************************************
-Copyright (c) 2011-2013 Percona LLC and/or its affiliates.
+Copyright (c) 2011-2015 Percona LLC and/or its affiliates.
 
-Declarations for xtrabackup.c
+Declarations for xtrabackup.cc
 
 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
@@ -14,14 +14,16 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
 #ifndef XB_XTRABACKUP_H
 #define XB_XTRABACKUP_H
 
+#include <my_getopt.h>
 #include "datasink.h"
+#include "xbstream.h"
 #include "changed_page_bitmap.h"
 
 #ifdef __WIN__
@@ -49,6 +51,10 @@
 extern lsn_t incremental_lsn;
 
 extern char		*xtrabackup_target_dir;
+extern char		*xtrabackup_incremental_dir;
+extern char		*xtrabackup_incremental_basedir;
+extern char		*innobase_data_home_dir;
+extern char		*innobase_buffer_pool_filename;
 extern ds_ctxt_t	*ds_meta;
 extern ds_ctxt_t	*ds_data;
 
@@ -59,6 +65,119 @@
 
 extern ulint	xtrabackup_rebuild_threads;
 
+extern char		*xtrabackup_incremental;
+extern my_bool		xtrabackup_incremental_force_scan;
+
+extern lsn_t		metadata_from_lsn;
+extern lsn_t		metadata_to_lsn;
+extern lsn_t		metadata_last_lsn;
+
+extern xb_stream_fmt_t	xtrabackup_stream_fmt;
+extern ibool		xtrabackup_stream;
+
+extern char		*xtrabackup_tables;
+extern char		*xtrabackup_tables_file;
+extern char		*xtrabackup_databases;
+extern char		*xtrabackup_databases_file;
+
+extern my_bool		xtrabackup_compact;
+extern ibool		xtrabackup_compress;
+extern ibool		xtrabackup_encrypt;
+
+extern my_bool		xtrabackup_backup;
+extern my_bool		xtrabackup_prepare;
+extern my_bool		xtrabackup_apply_log_only;
+extern my_bool		xtrabackup_copy_back;
+extern my_bool		xtrabackup_move_back;
+extern my_bool		xtrabackup_decrypt_decompress;
+
+extern char		*innobase_data_file_path;
+extern char		*innobase_doublewrite_file;
+extern char		*xtrabackup_encrypt_key;
+extern char		*xtrabackup_encrypt_key_file;
+extern longlong		innobase_log_file_size;
+extern long		innobase_log_files_in_group;
+extern longlong		innobase_page_size;
+
+extern const char	*xtrabackup_encrypt_algo_names[];
+extern TYPELIB		xtrabackup_encrypt_algo_typelib;
+
+extern int		xtrabackup_parallel;
+
+extern my_bool		xb_close_files;
+extern const char	*xtrabackup_compress_alg;
+extern uint		xtrabackup_compress_threads;
+extern ulonglong	xtrabackup_compress_chunk_size;
+extern ulong		xtrabackup_encrypt_algo;
+extern uint		xtrabackup_encrypt_threads;
+extern ulonglong	xtrabackup_encrypt_chunk_size;
+extern my_bool		xtrabackup_export;
+extern char		*xtrabackup_incremental_basedir;
+extern char		*xtrabackup_extra_lsndir;
+extern char		*xtrabackup_incremental_dir;
+extern ulint		xtrabackup_log_copy_interval;
+extern my_bool		xtrabackup_rebuild_indexes;
+extern char		*xtrabackup_stream_str;
+extern long		xtrabackup_throttle;
+extern longlong		xtrabackup_use_memory;
+
+extern my_bool		opt_galera_info;
+extern my_bool		opt_slave_info;
+extern my_bool		opt_no_lock;
+extern my_bool		opt_safe_slave_backup;
+extern my_bool		opt_rsync;
+extern my_bool		opt_force_non_empty_dirs;
+extern my_bool		opt_noversioncheck;
+extern my_bool		opt_no_backup_locks;
+extern my_bool		opt_decompress;
+extern my_bool		opt_remove_original;
+
+extern char		*opt_incremental_history_name;
+extern char		*opt_incremental_history_uuid;
+
+extern char		*opt_user;
+extern char		*opt_password;
+extern char		*opt_host;
+extern char		*opt_defaults_group;
+extern char		*opt_socket;
+extern uint		opt_port;
+extern char		*opt_login_path;
+extern char		*opt_log_bin;
+
+extern const char 	*query_type_names[];
+
+enum query_type_t {QUERY_TYPE_ALL, QUERY_TYPE_UPDATE,
+			QUERY_TYPE_SELECT};
+
+extern TYPELIB		query_type_typelib;
+
+extern ulong		opt_lock_wait_query_type;
+extern ulong		opt_kill_long_query_type;
+
+extern ulong		opt_decrypt_algo;
+
+extern uint		opt_kill_long_queries_timeout;
+extern uint		opt_lock_wait_timeout;
+extern uint		opt_lock_wait_threshold;
+extern uint		opt_debug_sleep_before_unlock;
+extern uint		opt_safe_slave_backup_timeout;
+
+extern const char	*opt_history;
+extern my_bool		opt_decrypt;
+
+#if defined(HAVE_OPENSSL)
+extern my_bool opt_use_ssl;
+extern my_bool opt_ssl_verify_server_cert;
+#if !defined(HAVE_YASSL)
+extern char *opt_server_public_key;
+#endif
+#endif
+
+enum binlog_info_enum { BINLOG_INFO_OFF, BINLOG_INFO_LOCKLESS, BINLOG_INFO_ON,
+			BINLOG_INFO_AUTO};
+
+extern ulong opt_binlog_info;
+
 void xtrabackup_io_throttling(void);
 my_bool xb_write_delta_metadata(const char *filename,
 				const xb_delta_info_t *info);
@@ -81,4 +200,33 @@
 page size, or 0 if the space is not compressed. */
 ulint xb_get_zip_size(os_file_t file);
 
+/************************************************************************
+Checks if a table specified as a name in the form "database/name" (InnoDB 5.6)
+or "./database/name.ibd" (InnoDB 5.5-) should be skipped from backup based on
+the --tables or --tables-file options.
+
+@return TRUE if the table should be skipped. */
+my_bool
+check_if_skip_table(
+/******************/
+	const char*	name);	/*!< in: path to the table */
+
+/************************************************************************
+Check if parameter is set in defaults file or via command line argument
+@return true if parameter is set. */
+bool
+check_if_param_set(const char *param);
+
+
+void
+xtrabackup_backup_func(void);
+
+my_bool
+xb_get_one_option(int optid,
+		  const struct my_option *opt __attribute__((unused)),
+		  char *argument);
+
+const char*
+xb_get_copy_action(const char *dflt = "Copying");
+
 #endif /* XB_XTRABACKUP_H */
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xtrabackup_version.h.in percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xtrabackup_version.h.in
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/src/xtrabackup_version.h.in	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/src/xtrabackup_version.h.in	2017-02-27 07:47:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 *******************************************************/
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/bootstrap.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/bootstrap.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/bootstrap.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/bootstrap.sh	2017-02-27 07:47:02.000000000 +0000
@@ -47,55 +47,27 @@
 
     innodb55)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
-        tarball="mysql-5.5.36-linux2.6-$arch.tar.gz"
+        tarball="mysql-5.5.42-linux2.6-$arch.tar.gz"
         ;;
 
     innodb56)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
-        tarball="mysql-5.6.16-linux-glibc2.5-$arch.tar.gz"
+        tarball="mysql-5.6.23-linux-glibc2.5-$arch.tar.gz"
         ;;
 
     xtradb51)
-        if which lsb_release >/dev/null 2>&1 && \
-           ! lsb_release -i | grep -qi centos 
-        then
-            # PS 5.1.69-rel14.7 tarballs are affected by LP bug #1172916
-            # and thus unusable on anything but CentOS
-            url="http://www.percona.com/redir/downloads/Percona-Server-5.1/Percona-Server-5.1.67-14.4/binary/linux/$arch"
-            tarball="Percona-Server-5.1.67-rel14.4-511.Linux.$arch.tar.gz"
-
-        else
-            url="http://s3.amazonaws.com/percona.com/downloads/community"
-            tarball="Percona-Server-5.1.73-rel14.11-603.Linux.$arch.tar.gz"
-        fi
+        url="http://s3.amazonaws.com/percona.com/downloads/community/yassl"
+        tarball="Percona-Server-5.1.73-rel14.12-625.Linux.$arch.tar.gz"
         ;;
 
     xtradb55)
-        if which lsb_release >/dev/null 2>&1 && \
-           ! lsb_release -i | grep -qi centos
-        then
-            # PS 5.5.31-rel30.3 tarballs are affected by LP bug #1172916
-            # and thus unusable on anything but CentOS
-            url="http://www.percona.com/redir/downloads/Percona-Server-5.5/Percona-Server-5.5.30-30.1/binary/linux/$arch"
-            tarball="Percona-Server-5.5.30-rel30.1-465.Linux.$arch.tar.gz"
-        else
-            url="http://s3.amazonaws.com/percona.com/downloads/community"
-            tarball="Percona-Server-5.5.36-rel34.1-642.Linux.$arch.tar.gz"
-        fi
+        url="http://s3.amazonaws.com/percona.com/downloads/community/yassl"
+        tarball="Percona-Server-5.5.41-rel37.0-727.Linux.$arch.tar.gz"
         ;;
 
     xtradb56)
-        if which lsb_release >/dev/null 2>&1 && \
-           ! lsb_release -i | grep -qi centos
-        then
-            # PS 5.6.11-rc60.3 tarballs are affected by LP bug #1172916
-            # and thus unusable on anything but CentOS
-            url="http://www.percona.com/downloads/TESTING/Percona-Server-56/Percona-Server-5.6.10-alpha60.2/binary/linux/$arch"
-            tarball="Percona-Server-5.6.10-alpha60.2-324.Linux.$arch.tar.gz"
-        else
-            url="http://s3.amazonaws.com/percona.com/downloads/community"
-            tarball="Percona-Server-5.6.16-rel64.1-563.Linux.$arch.tar.gz"
-        fi
+        url="http://s3.amazonaws.com/percona.com/downloads/community/yassl"
+        tarball="Percona-Server-5.6.22-rel72.0-.Linux.$arch.tar.gz"
         ;;
 
     mariadb51)
@@ -115,12 +87,12 @@
 
     mariadb55)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
-        tarball="mariadb-5.5.32-linux-$arch.tar.gz"
+        tarball="mariadb-5.5.40-linux-$arch.tar.gz"
         ;;
 
     mariadb100)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
-        tarball="mariadb-10.0.3-linux-$arch.tar.gz"
+        tarball="mariadb-10.0.14-linux-$arch.tar.gz"
         ;;
 
     *)
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/CMakeLists.txt percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -11,7 +11,7 @@
 
 # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 IF(INSTALL_MYSQLTESTDIR)
   INSTALL(
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/common.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/common.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/common.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/common.sh	2017-02-27 07:47:02.000000000 +0000
@@ -2,12 +2,17 @@
 
 function innobackupex()
 {
-    run_cmd $IB_BIN $IB_ARGS $*
+    run_cmd $IB_BIN $IB_ARGS "$@"
 }
 
 function xtrabackup()
 {
-    run_cmd $XB_BIN $XB_ARGS $*
+    run_cmd $XB_BIN $XB_ARGS "$@"
+}
+
+function mysql()
+{
+    run_cmd $MYSQL $MYSQL_ARGS "$@"
 }
 
 function vlog
@@ -239,9 +244,10 @@
 	MYSQLD_ARGS="$MYSQLD_ARGS --user=root"
     fi
 
-    IB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf --ibbackup=$XB_BIN \
---no-version-check"
-    XB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf"
+    IB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf \
+--no-version-check ${IB_EXTRA_OPTS:-}"
+    XB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf \
+--no-version-check ${XB_EXTRA_OPTS:-}"
 
     # Some aliases for compatibility, as tests use the following names
     topdir="$MYSQLD_VARDIR"
@@ -304,6 +310,9 @@
 [client]
 socket=${MYSQLD_SOCKET}
 user=root
+
+[xtrabackup]
+${XB_EXTRA_MY_CNF_OPTS:-}
 EOF
 
         # Create datadir and call mysql_install_db if it doesn't exist
@@ -371,10 +380,6 @@
         vlog "Server PID file '${MYSQLD_PIDFILE}' doesn't exist!"
     fi
 
-    # Reset XB_ARGS so we can call xtrabackup in tests even without starting the
-    # server
-    XB_ARGS="--no-defaults"
-
     # unlock the port number
     free_reserved_port $MYSQLD_PORT
 
@@ -478,6 +483,48 @@
 }
 
 ########################################################################
+# Get the binary log file from SHOW MASTER STATUS
+########################################################################
+function get_binlog_file()
+{
+    local count
+    local res
+
+    count=0
+    while read line; do
+        if [ $count -eq 1 ] # File:
+        then
+            res=`echo "$line" | sed s/File://`
+            break;
+        fi
+        count=$((count+1))
+    done <<< "`run_cmd $MYSQL $MYSQL_ARGS -Nse 'SHOW MASTER STATUS\G' mysql`"
+
+    echo $res
+}
+
+########################################################################
+# Get the binary log offset from SHOW MASTER STATUS
+########################################################################
+function get_binlog_pos()
+{
+    local count
+    local res
+
+    count=0
+    while read line; do
+        if [ $count -eq 2 ] # Position:
+        then
+            res=`echo "$line" | sed s/Position://`
+            break;
+        fi
+        count=$((count+1))
+    done <<< "`run_cmd $MYSQL $MYSQL_ARGS -Nse 'SHOW MASTER STATUS\G' mysql`"
+
+    echo $res
+}
+
+########################################################################
 # Wait until slave catches up with master.
 # The timeout is hardcoded to 300 seconds
 #
@@ -488,7 +535,6 @@
 {
     local slave_id=$1
     local master_id=$2
-    local count
     local master_file
     local master_pos
 
@@ -496,19 +542,8 @@
 
     # Get master log pos
     switch_server $master_id
-    count=0
-    while read line; do
-      	if [ $count -eq 1 ] # File:
-      	then
-      	    master_file=`echo "$line" | sed s/File://`
-      	elif [ $count -eq 2 ] # Position:
-      	then
-      	    master_pos=`echo "$line" | sed s/Position://`
-      	fi
-      	count=$((count+1))
-    done <<< "`run_cmd $MYSQL $MYSQL_ARGS -Nse 'SHOW MASTER STATUS\G' mysql`"
-
-    echo "master_file=$master_file, master_pos=$master_pos"
+    master_file=`get_binlog_file`
+    master_pos=`get_binlog_pos`
 
     # Wait for the slave SQL thread to catch up
     switch_server $slave_id
@@ -621,7 +656,7 @@
 {
     local file=$1
     echo "Removing $file"
-    rm -f $file
+    kill -SIGCONT `cat $file`
 }
 
 ########################################################################
@@ -768,5 +803,80 @@
     vlog "Done."
 }
 
+########################################################################
+# Return 0 if the server has the specified variable and its value is YES
+########################################################################
+function has_feature_enabled()
+{
+    local var=$1
+
+    if $MYSQL $MYSQL_ARGS -s -e "SHOW VARIABLES LIKE '$var'\G" \
+              2> /dev/null | egrep -q 'Value: YES$'
+    then
+        return 0
+    fi
+
+    # Was the server available?
+    if [[ ${PIPESTATUS[0]} != 0 ]]
+    then
+        die "Server is unavailable"
+    fi
+
+    return 1
+}
+
+########################################################################
+# Return 0 if the server has the specified status variable
+########################################################################
+function has_status_variable()
+{
+    local var=$1
+
+    if $MYSQL $MYSQL_ARGS -s -e "SHOW STATUS LIKE '$var'\G" \
+              2> /dev/null | egrep -q "^Variable_name: $var"
+    then
+        return 0
+    fi
+
+    # Was the server available?
+    if [[ ${PIPESTATUS[0]} != 0 ]]
+    then
+        die "Server is unavailable"
+    fi
+
+    return 1
+}
+
+########################################################################
+# Return 0 if the server has backup locks support
+########################################################################
+function has_backup_locks()
+{
+    has_feature_enabled "have_backup_locks"
+}
+
+########################################################################
+# Return 0 if the server has backup-safe binlog info
+########################################################################
+function has_backup_safe_binlog_info()
+{
+    has_feature_enabled "have_backup_safe_binlog_info"
+}
+
+########################################################################
+# Return 0 if the server has been compiled with OpenSSL
+########################################################################
+function has_openssl()
+{
+    has_status_variable "Rsa_public_key"
+}
+
+# Return 0 if the platform is 64-bit
+########################################################################
+function is_64bit()
+{
+    uname -m 2>&1 | grep 'x86_64'
+}
+
 # To avoid unbound variable error when no server have been started
 SRV_MYSQLD_IDS=
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/ib_incremental_common.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/ib_incremental_common.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/ib_incremental_common.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/ib_incremental_common.sh	2017-02-27 07:47:02.000000000 +0000
@@ -5,12 +5,16 @@
 #                       changed page bitmap output.
 #    ib_inc_extra_args: extra args to be passed to innobackup incremental 
 #                       backup invocations.
+#    ib_inc_use_lsn:    if 1, use --incremental-lsn instead of
+#                       --incremental-basedir
 
 . inc/common.sh
 
 MYSQLD_EXTRA_MY_CNF_OPTS="${MYSQLD_EXTRA_MY_CNF_OPTS:-""}
 innodb_file_per_table"
 
+ib_inc_use_lsn=${ib_inc_use_lsn:-""}
+
 start_server
 load_dbase_schema incremental_sample
 
@@ -49,8 +53,19 @@
 
 # Incremental backup
 inc_backup_dir=$topdir/backup_incremental
-innobackupex --no-timestamp --incremental --incremental-basedir=$full_backup_dir \
-    $inc_backup_dir $ib_inc_extra_args
+if [ $ib_inc_use_lsn = "1" ]
+then
+    inc_lsn=`grep to_lsn $full_backup_dir/xtrabackup_checkpoints | \
+             sed 's/to_lsn = //'`
+
+    [ -z "$inc_lsn" ] && die "Couldn't read to_lsn from xtrabackup_checkpoints"
+
+    ib_inc_extra_args="${ib_inc_extra_args:-""} --incremental-lsn=$inc_lsn"
+else
+    ib_inc_extra_args="${ib_inc_extra_args:-""} --incremental-basedir=$full_backup_dir"
+fi
+
+innobackupex --no-timestamp --incremental $ib_inc_extra_args $inc_backup_dir
 
 vlog "Preparing backup"
 # Prepare backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/ib_local.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/ib_local.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/ib_local.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/ib_local.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,61 @@
+############################################################################
+# Common code for xb_*.sh local backup tests.
+# Expects the following variables to be set appropriately before
+# including:
+#
+# Optionally the following variables may be set:
+#   innobackupex_option:  additional options to be passed to innobackupex.
+#   data_decrypt_cmd: command used to decrypt data
+#   data_decompress_cmd: command used to decompress data
+############################################################################
+
+. inc/common.sh
+
+start_server --innodb_file_per_table
+
+load_dbase_schema sakila
+load_dbase_data sakila
+
+innobackupex_options=${innobackupex_options:-""}
+innobackupex_options="${innobackupex_options} --no-timestamp"
+
+# Take backup
+backup_dir=${topdir}/backup
+innobackupex $innobackupex_options $backup_dir
+vlog "Backup created in directory $backup_dir"
+
+stop_server
+# Remove datadir
+rm -r $mysql_datadir
+
+# Restore sakila
+vlog "Applying log"
+cd $backup_dir
+if [ -n "${data_decrypt_cmd:=""}" ] || [ -n "${data_decompress_cmd:=""}" ]; then 
+  vlog "###################################"
+  vlog "# DECRYPTING AND/OR DECOMPRESSING #"
+  vlog "###################################"
+  test -n "${data_decrypt_cmd_wrong_passphrase:=""}" && run_cmd_expect_failure bash -c "$data_decrypt_cmd_wrong_passphrase"
+  test -n "${data_decrypt_cmd:=""}" && run_cmd bash -c "$data_decrypt_cmd"
+  test -n "${data_decompress_cmd:-""}" && run_cmd bash -c "$data_decompress_cmd";
+fi
+cd - >/dev/null 2>&1
+vlog "###########"
+vlog "# PREPARE #"
+vlog "###########"
+innobackupex --apply-log $backup_dir
+mkdir -p $mysql_datadir
+vlog "###########"
+vlog "# RESTORE #"
+vlog "###########"
+innobackupex --copy-back $backup_dir
+
+start_server
+# Check sakila
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT count(*) from actor" sakila
+
+########################################################################
+# Bug #1217426: Empty directory is not backed when stream is used
+########################################################################
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "CREATE TABLE t(a INT)" test
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT * FROM t" test
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/ib_part.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/ib_part.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/ib_part.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/ib_part.sh	2017-02-27 07:47:02.000000000 +0000
@@ -62,11 +62,11 @@
 	local tables_file=$2
 	for table in $mysql_datadir/mysql/*.frm
 	do
-	        echo mysql.`basename $table` >> $tables_file
+	        echo mysql.`basename ${table%.*}` >> $tables_file
 	done
 	for table in $mysql_datadir/performance_schema/*.frm
 	do
-	    echo performance_schema.`basename $table` >> $tables_file
+	    echo performance_schema.`basename ${table%.*}` >> $tables_file
 	done
 }
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/xb_local.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/xb_local.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/xb_local.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/xb_local.sh	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,7 @@
 # including:
 #
 # Optionally the following variables may be set:
-#   innobackupex_option:  additional options to be passed to innobackupex.
+#   xtrabackup_option:  additional options to be passed to xtrabackup.
 #   data_decrypt_cmd: command used to decrypt data
 #   data_decompress_cmd: command used to decompress data
 ############################################################################
@@ -16,12 +16,11 @@
 load_dbase_schema sakila
 load_dbase_data sakila
 
-innobackupex_options=${innobackupex_options:-""}
-innobackupex_options="${innobackupex_options} --no-timestamp"
+xtrabackup_options=${xtrabackup_options:-""}
 
 # Take backup
 backup_dir=${topdir}/backup
-innobackupex $innobackupex_options $backup_dir
+xtrabackup $xtrabackup_options --backup --target-dir=$backup_dir
 vlog "Backup created in directory $backup_dir"
 
 stop_server
@@ -35,6 +34,7 @@
   vlog "###################################"
   vlog "# DECRYPTING AND/OR DECOMPRESSING #"
   vlog "###################################"
+  test -n "${data_decrypt_cmd_wrong_passphrase:=""}" && run_cmd_expect_failure bash -c "$data_decrypt_cmd_wrong_passphrase"
   test -n "${data_decrypt_cmd:=""}" && run_cmd bash -c "$data_decrypt_cmd"
   test -n "${data_decompress_cmd:-""}" && run_cmd bash -c "$data_decompress_cmd";
 fi
@@ -42,12 +42,12 @@
 vlog "###########"
 vlog "# PREPARE #"
 vlog "###########"
-innobackupex --apply-log $backup_dir
+xtrabackup --prepare --target-dir=$backup_dir
 mkdir -p $mysql_datadir
 vlog "###########"
 vlog "# RESTORE #"
 vlog "###########"
-innobackupex --copy-back $backup_dir
+xtrabackup --copy-back --target-dir=$backup_dir
 
 start_server
 # Check sakila
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/xb_stream_common.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/xb_stream_common.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/inc/xb_stream_common.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/inc/xb_stream_common.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,65 @@
+############################################################################
+# Common code for xb_stream_*.sh tests.
+# Expects the following variables to be set appropriately before 
+# including:
+#   stream_format: passed to the --stream xtrabackup option
+#   stream_extract_cmd: shell command to be used to extract the stream
+#
+# Optionally the following variables may be set:
+#   xtrabackup_option:  additional options to be passed to xtrabackup.
+#   stream_uncompress_cmd: command used to uncompress data streamed data
+############################################################################
+
+. inc/common.sh
+
+start_server --innodb_file_per_table
+
+load_dbase_schema sakila
+load_dbase_data sakila
+
+xtrabackup_options=${xtrabackup_options:-""}
+
+# Take backup
+mkdir -p $topdir/backup
+xtrabackup --backup --stream=$stream_format $xtrabackup_options --target-dir=$topdir/backup > $topdir/backup/out
+
+stop_server
+
+# Remove datadir
+rm -r $mysql_datadir
+
+# Restore sakila
+vlog "#####################"
+vlog "# EXTRACTING STREAM #"
+vlog "#####################"
+backup_dir=$topdir/backup
+cd $backup_dir
+run_cmd bash -c "$stream_extract_cmd out"
+if [ -n "${stream_uncompress_cmd:=""}" ]; then 
+  vlog "################################"
+  vlog "# DECRYPTING AND DECOMPRESSING #"
+  vlog "################################"
+  run_cmd bash -c "$stream_uncompress_cmd";
+fi
+cd - >/dev/null 2>&1 
+vlog "###########"
+vlog "# PREPARE #"
+vlog "###########"
+xtrabackup --prepare --target-dir=$backup_dir
+mkdir -p $mysql_datadir
+vlog "###########"
+vlog "# RESTORE #"
+vlog "###########"
+xtrabackup --copy-back --target-dir=$backup_dir
+
+start_server
+# Check sakila
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT count(*) from actor" sakila
+
+########################################################################
+# Bug #1217426: Empty directory is not backed when stream is used
+########################################################################
+
+# Check if the 'test' database is accessible by the server
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "CREATE TABLE t(a INT)" test
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT * FROM t" test
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/python/subunit/tests/TestUtil.py percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/python/subunit/tests/TestUtil.py
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/python/subunit/tests/TestUtil.py	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/python/subunit/tests/TestUtil.py	2017-02-27 07:47:02.000000000 +0000
@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
 import sys
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/run.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/run.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/run.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/run.sh	2017-02-27 07:47:02.000000000 +0000
@@ -48,6 +48,8 @@
             Default is 't'.
 -j N        Run tests in N parallel processes.
 -T seconds  Test timeout (default is $TEST_TIMEOUT seconds).
+-x options  Extra options to pass to xtrabackup
+-i options  Extra options to pass to innobackupex
 EOF
 }
 
@@ -260,6 +262,9 @@
     if gnutar --version > /dev/null 2>&1
     then
 	TAR=gnutar
+    elif gtar --version > /dev/null 2>&1
+    then
+	TAR=gtar
     else
 	TAR=tar
     fi
@@ -267,14 +272,7 @@
     find_program MYSQL_INSTALL_DB mysql_install_db $MYSQL_BASEDIR/bin \
 	$MYSQL_BASEDIR/scripts
     find_program MYSQLD mysqld $MYSQL_BASEDIR/bin/ $MYSQL_BASEDIR/libexec
-    # Use the global mysql client binary, if available. This is a workaround for
-    # PS packageing bug LP 1153950
-    if which mysql >/dev/null 2>&1
-    then
-        MYSQL=`which mysql`
-    else
-        find_program MYSQL mysql $MYSQL_BASEDIR/bin
-    fi
+    find_program MYSQL mysql $MYSQL_BASEDIR/bin
     find_program MYSQLADMIN mysqladmin $MYSQL_BASEDIR/bin
     find_program MYSQLDUMP mysqldump $MYSQL_BASEDIR/bin
 
@@ -326,7 +324,7 @@
     MYSQLD_EXTRA_ARGS=
 
     XB_BIN=""
-    IB_ARGS="--user=root --ibbackup=$XB_BIN"
+    IB_ARGS="--user=root --ibbackup=$XB_BIN ${IB_EXTRA_OPTS:-}"
     XB_ARGS="--no-defaults"
     XB_BIN="xtrabackup"
 
@@ -375,9 +373,6 @@
        fi
     fi
 
-    # Version-specific defaults
-    DEFAULT_IBDATA_SIZE="10M"
-
     # Determine MySQL flavor
     if [[ "$MYSQL_VERSION" =~ "MariaDB" ]]
     then
@@ -412,8 +407,7 @@
             ;;
         5.5 )
             ;;
-        5.6 | 10.0 )
-            DEFAULT_IBDATA_SIZE="12M"
+        5.6 | 10.0 | 10.1)
             ;;
         *)
             vlog "Unknown MySQL/InnoDB version: $MYSQL_VERSION/$INNODB_VERSION"
@@ -442,7 +436,7 @@
     export MYSQL_VERSION MYSQL_VERSION_COMMENT MYSQL_FLAVOR \
 	INNODB_VERSION XTRADB_VERSION INNODB_FLAVOR \
 	XB_BIN IB_BIN IB_ARGS XB_ARGS MYSQLD_EXTRA_ARGS \
-        DEFAULT_IBDATA_SIZE WSREP_READY LIBGALERA_PATH
+        WSREP_READY LIBGALERA_PATH
 }
 
 ###########################################################################
@@ -758,7 +752,7 @@
 NWORKERS=
 DEBUG_WORKER=""
 
-while getopts "fgh?:t:s:d:c:j:T:" options; do
+while getopts "fgh?:t:s:d:c:j:T:x:i:" options; do
         case $options in
             f ) force="yes";;
             t )
@@ -796,6 +790,14 @@
                 TEST_TIMEOUT="$OPTARG"
                 ;;
 
+            x )
+                XB_EXTRA_MY_CNF_OPTS="$OPTARG"
+                ;;
+
+            i )
+                IB_EXTRA_OPTS="$OPTARG"
+                ;;
+
             ? ) echo "Use \`$0 -h' for the list of available options."
                     exit -1;;
         esac
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/backup_locks.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/backup_locks.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/backup_locks.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/backup_locks.sh	2017-02-27 07:47:02.000000000 +0000
@@ -10,46 +10,73 @@
 
 start_server
 
-load_sakila
+has_backup_locks || skip_test "Requires backup locks support"
+
+has_backup_safe_binlog_info && lock_binlog_used=0 || lock_binlog_used=1
 
-if ! $MYSQL $MYSQL_ARGS -Ns -e "SHOW VARIABLES LIKE 'have_backup_locks'\G" \
-     2> /dev/null | egrep -q "^YES$"
-then
-    skip_test "Requires backup locks support"
-fi
+load_sakila
 
-innobackupex --no-timestamp $topdir/full_backup
+xtrabackup --backup --target-dir=$topdir/full_backup
 
 $MYSQL $MYSQL_ARGS -Ns -e \
        "SHOW GLOBAL STATUS LIKE 'Com_%lock%'; \
        SHOW GLOBAL STATUS LIKE 'Com_flush%'" \
        > $topdir/status1
 
+binlog_stmts=$lock_binlog_used
+
 diff $topdir/status1 - <<EOF
 Com_lock_tables	0
 Com_lock_tables_for_backup	1
-Com_lock_binlog_for_backup	1
+Com_lock_binlog_for_backup	$binlog_stmts
 Com_show_slave_status_nolock	0
-Com_unlock_binlog	1
+Com_unlock_binlog	$binlog_stmts
 Com_unlock_tables	1
 Com_flush	1
 EOF
 
-innobackupex --no-timestamp --incremental \
-             --incremental-basedir=$topdir/full_backup \
-             $topdir/inc_backup
+xtrabackup --backup \
+           --incremental-basedir=$topdir/full_backup \
+           --target-dir=$topdir/inc_backup
 
 $MYSQL $MYSQL_ARGS -Ns -e \
        "SHOW GLOBAL STATUS LIKE 'Com_%lock%'; \
        SHOW GLOBAL STATUS LIKE 'Com_flush%'" \
        > $topdir/status2
 
+((binlog_stmts+=lock_binlog_used)) || true
+
 diff $topdir/status2 - <<EOF
 Com_lock_tables	0
 Com_lock_tables_for_backup	2
-Com_lock_binlog_for_backup	2
+Com_lock_binlog_for_backup	$binlog_stmts
 Com_show_slave_status_nolock	0
-Com_unlock_binlog	2
+Com_unlock_binlog	$binlog_stmts
 Com_unlock_tables	2
-Com_flush	2
+Com_flush	3
+EOF
+
+########################################################################
+# Bug #1418820: Make backup locks usage optional
+########################################################################
+
+# Test that --no-backup-lock forces FTWRL
+
+rm -rf $topdir/full_backup
+
+xtrabackup --backup --no-backup-locks --target-dir=$topdir/full_backup
+
+$MYSQL $MYSQL_ARGS -Ns -e \
+       "SHOW GLOBAL STATUS LIKE 'Com_%lock%'; \
+       SHOW GLOBAL STATUS LIKE 'Com_flush%'" \
+       > $topdir/status3
+
+diff $topdir/status3 - <<EOF
+Com_lock_tables	0
+Com_lock_tables_for_backup	2
+Com_lock_binlog_for_backup	$binlog_stmts
+Com_show_slave_status_nolock	0
+Com_unlock_binlog	$binlog_stmts
+Com_unlock_tables	3
+Com_flush	6
 EOF
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/binlog_info.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/binlog_info.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/binlog_info.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/binlog_info.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,131 @@
+########################################################################
+# --binlog-info tests
+########################################################################
+
+xtrabackup --help 2>&1 | grep 'binlog-info *auto'
+
+start_server
+
+has_backup_locks && bl_avail=1 || bl_avail=0
+has_backup_safe_binlog_info && bsbi_avail=1 || bsbi_avail=0
+
+load_sakila
+
+binlog_file_innodb=`get_binlog_file`
+binlog_pos_innodb=`get_binlog_pos`
+
+# Generate some non-InnoDB entries in the binary log
+run_cmd $MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t (a INT) ENGINE=MyISAM;
+INSERT INTO t VALUES (1), (2), (3);
+EOF
+
+binlog_file=`get_binlog_file`
+binlog_pos=`get_binlog_pos`
+
+xb_binlog_info=$topdir/backup/xtrabackup_binlog_info
+xb_binlog_info_innodb=$topdir/backup/xtrabackup_binlog_pos_innodb
+
+function normalize_path()
+{
+    sed -i -e 's|^\./||' $1
+}
+
+function verify_binlog_info_on()
+{
+    grep "recover_binlog_info = 0" $topdir/backup/xtrabackup_checkpoints
+
+    normalize_path $xb_binlog_info
+
+    diff $xb_binlog_info - <<EOF
+$binlog_file	$binlog_pos
+EOF
+    xtrabackup --prepare --target-dir=$topdir/backup
+
+    normalize_path $xb_binlog_info_innodb
+
+    if [ $bsbi_avail = 1 ]
+    then
+        # Real coordinates in xtrabackup_binlog_pos_innodb
+        diff $xb_binlog_info_innodb - <<EOF
+$binlog_file	$binlog_pos
+EOF
+    else
+        # Stale coordinates in xtrabackup_binlog_pos_innodb
+        diff $xb_binlog_info_innodb - <<EOF
+$binlog_file_innodb	$binlog_pos_innodb
+EOF
+    fi
+}
+
+function verify_binlog_info_lockless()
+{
+    test -f $xb_binlog_info &&
+        die "$xb_binlog_info was created on the backup stage with --binlog-info=auto and BSBI available"
+    grep "recover_binlog_info = 1" $topdir/backup/xtrabackup_checkpoints
+
+    xtrabackup --prepare --target-dir=$topdir/backup
+
+    normalize_path $xb_binlog_info
+    normalize_path $xb_binlog_info_innodb
+
+    diff $xb_binlog_info - <<EOF
+$binlog_file	$binlog_pos
+EOF
+    # Real coordinates in xtrabackup_binlog_pos_innodb
+    diff $xb_binlog_info_innodb - <<EOF
+$binlog_file	$binlog_pos
+EOF
+}
+
+function verify_binlog_info_off()
+{
+    grep "recover_binlog_info = 0" $topdir/backup/xtrabackup_checkpoints
+
+    test -f $xb_binlog_info &&
+        die "$xb_binlog_info was created on the backup stage with --binlog-info=off"
+
+    xtrabackup --prepare --target-dir=$topdir/backup
+
+    test -f $xb_binlog_info &&
+        die "$xb_binlog_info was created on the prepare stage with --binlog-info=off"
+
+    true
+}
+
+# --binlog-info=auto
+xtrabackup --backup --binlog-info=auto --target-dir=$topdir/backup
+
+if [ $bsbi_avail = 1 ]
+then
+    verify_binlog_info_lockless
+else
+    verify_binlog_info_on
+fi
+
+rm -rf $topdir/backup
+
+# --binlog-info=off
+xtrabackup --backup --binlog-info=off --target-dir=$topdir/backup
+
+verify_binlog_info_off
+
+rm -rf $topdir/backup
+
+# --binlog-info=on
+xtrabackup --backup --binlog-info=on --target-dir=$topdir/backup
+
+verify_binlog_info_on
+
+rm -rf $topdir/backup
+
+# --binlog-info=lockless
+
+if [ $bsbi_avail = 0 ]
+then
+   run_cmd_expect_failure $XB_BIN $XB_ARGS --backup --binlog-info=lockless \
+                          --target-dir=$topdir/backup
+else
+    xtrabackup --backup --binlog-info=lockless --target-dir=$topdir/backup
+    verify_binlog_info_lockless
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/broken_pipe.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/broken_pipe.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/broken_pipe.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/broken_pipe.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+########################################################################
+# Test correct handling of "broken pipe" error for streaming backups
+# Is the test case for
+#     bug #1452387: xtrabackup never verifies return code of ds_close
+########################################################################
+
+. inc/common.sh
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_data_file_path=ibdata1:100M:autoextend
+innodb_file_per_table
+"
+
+start_server
+
+$MYSQL $MYSQL_ARGS -e "CREATE TABLE test.t1(a INT)"
+$MYSQL $MYSQL_ARGS -e "CREATE TABLE test.t3(a INT)"
+$MYSQL $MYSQL_ARGS -e "CREATE TABLE test.t4(a INT)"
+$MYSQL $MYSQL_ARGS -e "CREATE TABLE test.t5(a INT)"
+
+xtrabackup --backup --stream=xbstream \
+	--target-dir=$topdir/backup | dd bs=1024 count=103000 of=/dev/null
+
+if [ ${PIPESTATUS[0]} -eq 0 ] ; then
+	die "xtrabackup completed OK when it was expected to fail"
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1007446.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1007446.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1007446.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1007446.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-############################################################################
-# Bug #1007446: innobackupex should remove stale xtrabackup_suspended file
-############################################################################
-
-. inc/common.sh
-
-start_server
-
-echo "" > $MYSQLD_TMPDIR/xtrabackup_suspended_1
-
-mkdir -p $topdir/backup
-innobackupex --stream=tar $topdir/backup > /dev/null
-
-grep -q "A left over instance of suspend file" $OUTFILE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1042887.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1042887.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1042887.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1042887.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,23 @@
+###############################################################################
+# Bug #1042887: innobackupex should understand --datadir option
+###############################################################################
+
+start_server
+
+# remove datadir from my.cnf
+cp ${MYSQLD_VARDIR}/my.cnf ${MYSQLD_VARDIR}/my.cnf.orig
+sed -ie '/datadir/d' ${MYSQLD_VARDIR}/my.cnf
+
+innobackupex --datadir=$mysql_datadir --no-timestamp $topdir/backup
+innobackupex --apply-log $topdir/backup
+
+stop_server
+
+rm -rf $mysql_datadir
+
+innobackupex --datadir=$mysql_datadir --copy-back $topdir/backup
+
+# restore original my.cnf to allow mysqld to start
+mv ${MYSQLD_VARDIR}/my.cnf.orig ${MYSQLD_VARDIR}/my.cnf
+
+start_server
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1062684.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1062684.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1062684.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1062684.sh	2017-02-27 07:47:02.000000000 +0000
@@ -7,7 +7,7 @@
 . inc/common.sh
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
-innodb-data-file-path=ibdata1:${DEFAULT_IBDATA_SIZE};ibdata2:5M:autoextend
+innodb-data-file-path=ibdata1:10M;ibdata2:5M:autoextend
 "
 
 start_server
@@ -22,8 +22,8 @@
 mkdir -p $topdir/backup
 
 vlog "Starting backup"
-innobackupex  $topdir/backup
-full_backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{print $2}'`
+full_backup_dir=$topdir/backup/full
+innobackupex --no-timestamp $full_backup_dir
 vlog "Full backup done to directory $full_backup_dir"
 
 # Changing data
@@ -47,9 +47,9 @@
 vlog "###############"
 
 # Incremental backup
+inc_backup_dir=$topdir/backup/inc
 innobackupex --incremental --incremental-basedir=$full_backup_dir \
-    $topdir/backup
-inc_backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | tail -n 1 | awk -F\' '{print $2}'`
+    --no-timestamp $inc_backup_dir
 vlog "Incremental backup done to directory $inc_backup_dir"
 
 vlog "Preparing backup"
@@ -84,7 +84,7 @@
 innobackupex --copy-back $full_backup_dir
 vlog "Data restored"
 
-start_server --innodb-data-file-path="ibdata1:${DEFAULT_IBDATA_SIZE};ibdata2:5M:autoextend"
+start_server
 
 vlog "Checking checksums"
 checksum_test_b=`checksum_table incremental_sample test`
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1130627.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1130627.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1130627.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1130627.sh	2017-02-27 07:47:02.000000000 +0000
@@ -46,18 +46,17 @@
 rm -rf $topdir/backup
 
 # Test that specifying partitions with --databases works
-# TODO: uncomment when bug #569387 is fixed
 
-# innobackupex --no-timestamp \
-#     --databases='test.t_myisam#P#p5 test.t_innodb#P#p5' $topdir/backup
-# innobackupex --apply-log $topdir/backup
+innobackupex --no-timestamp \
+    --databases='test.t_myisam#P#p5 test.t_innodb#P#p5' $topdir/backup
+innobackupex --apply-log $topdir/backup
 
-# test "$file_cnt" -eq 3
-# test -f $topdir/backup/test/t_innodb#P#p5.ibd
-# test -f $topdir/backup/test/t_myisam#P#p5.MYD
-# test -f $topdir/backup/test/t_myisam#P#p5.MYI
+test "$file_cnt" -eq 3
+test -f $topdir/backup/test/t_innodb#P#p5.ibd
+test -f $topdir/backup/test/t_myisam#P#p5.MYD
+test -f $topdir/backup/test/t_myisam#P#p5.MYI
 
-# rm -rf $topdir/backup
+rm -rf $topdir/backup
 
 # Test that specifying partitions with --tables-file works
 cat >$topdir/tables_file <<EOF
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1164945.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1164945.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1164945.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1164945.sh	2017-02-27 07:47:02.000000000 +0000
@@ -21,19 +21,19 @@
 
     touch $MYSQLD_DATADIR/non_existing_file
 
-    # check that --*-back fails without --force-non-empty-directories
+    vlog "check that $1 fails without --force-non-empty-directories"
     run_cmd_expect_failure $IB_BIN $IB_ARGS $1 $topdir/backup
 
     rm -rf $topdir/backup
     cp -a $topdir/backup_copy $topdir/backup
 
-    # check that --*-back works with --force-non-empty-directories
+    vlog "check that $1 works with --force-non-empty-directories"
     innobackupex $1 --force-non-empty-directories $topdir/backup
 
     rm -rf $topdir/backup
     cp -a $topdir/backup_copy $topdir/backup
 
-    # check that --*-back --force-non-empty-directories does not overwrite files
+    vlog "check that $1 --force-non-empty-directories does not overwrite files"
     touch $MYSQLD_DATADIR/ibdata1
     run_cmd_expect_failure $IB_BIN $IB_ARGS $1 --force-non-empty-directories \
                            $topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1175860.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1175860.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1175860.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1175860.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-############################################################################
-# Bug #1175860: Orphaned xtrabackup_pid file Breaks Cluster SST
-############################################################################
-
-. inc/common.sh
-
-start_server
-
-echo "22993" > $MYSQLD_TMPDIR/xtrabackup_pid
-
-mkdir -p $topdir/backup
-innobackupex --stream=tar $topdir/backup > /dev/null
-
-grep -q "A left over instance of xtrabackup pid file" $OUTFILE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1190335.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1190335.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1190335.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1190335.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,15 @@
+###############################################################################
+# Bug #1190335: Stream decryption fails with options in my.cnf
+###############################################################################
+
+XB_EXTRA_MY_CNF_OPTS="
+loose-encrypt=AES256
+loose-encrypt-key=6F3AD9F428143F133FD7D50D77D91EA4
+"
+
+start_server
+
+innobackupex --stream=xbstream $topdir/tmp | xbstream -xv -C $topdir/tmp
+diff -u <(LANG=C ls $topdir/tmp/test) - <<EOF
+db.opt.xbcrypt
+EOF
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1213778.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1213778.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1213778.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1213778.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,17 @@
+##########################################################################
+# Bug #1213778: --incremental-lsn without --incremental does not return an
+#               error.
+##########################################################################
+
+innobackupex --incremental-lsn=0 $topdir 2>&1 |
+    grep 'require the --incremental option'
+
+innobackupex --incremental-basedir=$topdir $topdir 2>&1 |
+    grep 'require the --incremental option'
+
+innobackupex --incremental-history-name=foo $topdir 2>&1 |
+    grep 'require the --incremental option'
+
+innobackupex --incremental-history-uuid=f81d4fae-7dec-11d0-a765-00a0c91e6bf6 \
+             $topdir 2>&1 |
+    grep 'require the --incremental option'
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1222062.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1222062.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1222062.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1222062.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,11 @@
+########################################################################
+# Bug #1222062: add option --close-files
+########################################################################
+
+start_server
+
+mkdir $topdir/backup
+
+innobackupex --close-files $topdir/backup
+
+grep "xtrabackup: warning: close-files specified" $OUTFILE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1242309.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1242309.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1242309.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1242309.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+#############################################################################
+# Bug 1242309: xtrabackup_logfile not compressed in XtraBackup 2.1+
+#############################################################################
+
+start_server
+
+innobackupex --no-timestamp --compress $topdir/backup
+
+if [ ! -f $topdir/backup/xtrabackup_logfile.qp ] ; then
+	die "xtrabackup_logfile is not compressed!"
+fi
+
+rm -rf $topdir/backup/*
+
+innobackupex --no-timestamp --compress --stream=xbstream $topdir/backup | xbstream -xv -C $topdir/backup
+
+if [ ! -f $topdir/backup/xtrabackup_logfile.qp ] ; then
+	die "xtrabackup_logfile is not compressed!"
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1248065.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1248065.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1248065.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1248065.sh	2017-02-27 07:47:02.000000000 +0000
@@ -26,8 +26,9 @@
     stop_server
     rm -rf $MYSQLD_DATADIR/*
 
-    innobackupex --apply-log --defaults-file=$topdir/backup/backup-my.cnf \
-                 $topdir/backup
+    run_cmd ${IB_BIN} \
+        ${IB_ARGS/\/--defaults-file=*my.cnf/$topdir\/backup\/backup-my.cnf} \
+        --apply-log $topdir/backup
 
     innobackupex --copy-back $topdir/backup
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1250375.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1250375.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1250375.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1250375.sh	2017-02-27 07:47:02.000000000 +0000
@@ -28,17 +28,7 @@
 backup_dir=$topdir/backup
 vlog "Backup created in directory $backup_dir"
 
-count=0
-master_file=
-
-while read line; do
-    if [ $count -eq 1 ] # File:
-    then
-        master_file=`echo "$line" | sed s/File://`
-        break
-    fi
-    count=$((count+1))
-done <<< "`run_cmd $MYSQL $MYSQL_ARGS -Nse 'SHOW MASTER STATUS\G' mysql`"
+master_file=`get_binlog_file`
 
 cd $backup_dir
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1254227.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1254227.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1254227.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1254227.sh	2017-02-27 07:47:02.000000000 +0000
@@ -2,6 +2,8 @@
 # Bug #1254227: xtrabackup_56 does not roll back prepared XA transactions
 #########################################################################
 
+is_galera && skip_test "Requires a server without Galera support"
+
 start_server
 
 mkfifo $topdir/fifo
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1277403.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1277403.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1277403.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1277403.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+################################################################################
+# Bug 1277403: Use FLUSH TABLES before FTWRL                                   #
+################################################################################
+
+# we don't want to run this test on InnoDB 5.1 since it doesn't support
+# "FLUSH ENGINE LOGS" and Com_flush will show 2 for it
+require_server_version_higher_than 5.5.0
+
+start_server
+
+has_backup_locks && skip_test "Requires server without backup locks support"
+
+$MYSQL $MYSQL_ARGS -Ns -e \
+       "SHOW GLOBAL STATUS LIKE 'Com_unlock%'; \
+       SHOW GLOBAL STATUS LIKE 'Com_flush%'" \
+       > $topdir/status1
+
+diff -u $topdir/status1 - <<EOF
+Com_unlock_tables	0
+Com_flush	0
+EOF
+
+innobackupex --no-timestamp $topdir/full_backup
+
+$MYSQL $MYSQL_ARGS -Ns -e \
+       "SHOW GLOBAL STATUS LIKE 'Com_unlock%'; \
+       SHOW GLOBAL STATUS LIKE 'Com_flush%'" \
+       > $topdir/status2
+
+diff -u $topdir/status2 - <<EOF
+Com_unlock_tables	1
+Com_flush	3
+EOF
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1334062.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1334062.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1334062.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1334062.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,24 @@
+#############################################################################
+# Bug #1334062: Xtrabackup 2.2.3 fails to perform a full backup on PS 5.5 if
+#               innodb_log_file_size on the [mysqld] section of my.cnf is not
+#               set
+#############################################################################
+
+start_server
+
+sed -i -e 's/innodb_log_file_size=.*//' $MYSQLD_VARDIR/my.cnf
+
+grep innodb_log_file_size $MYSQLD_VARDIR/my.cnf &&
+  die "innodb_log_file_size is present in my.cnf"
+
+innobackupex --no-timestamp $topdir/backup
+
+innobackupex --apply-log $topdir/backup
+
+stop_server
+
+rm -rf $MYSQLD_DATADIR/*
+
+innobackupex --copy-back $topdir/backup
+
+start_server
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1340717.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1340717.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1340717.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1340717.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,35 @@
+########################################################################
+# Test resurrect table locks
+########################################################################
+
+. inc/common.sh
+
+require_server_version_higher_than 5.6.0
+
+################################################################################
+# Start an uncommitted transaction pause "indefinitely" to keep the connection
+# open
+################################################################################
+function start_uncomitted_transaction()
+{
+    run_cmd $MYSQL $MYSQL_ARGS sakila <<EOF
+START TRANSACTION;
+DELETE FROM payment;
+SELECT SLEEP(10000);
+EOF
+}
+
+start_server
+load_sakila
+
+start_uncomitted_transaction &
+job_master=$!
+
+sleep 5;
+
+innobackupex --no-timestamp --include="sakila.actor" $topdir/backup
+
+kill -SIGKILL $job_master
+stop_server
+
+innobackupex --apply-log $topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1343722.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1343722.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1343722.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1343722.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+########################################################################
+# Bug #1343722: Too easy to backup wrong datadir with multiple instances
+########################################################################
+
+start_server_with_id 1
+
+socket=$MYSQLD_SOCKET
+
+start_server_with_id 2
+
+# Try to backup server 2, but use server 1's connection socket
+$IB_BIN $IB_ARGS --socket=$socket --no-timestamp $topdir/backup 2>&1 |
+    grep 'has different values'
+
+if [[ ${PIPESTATUS[0]} != 0 ]]
+then
+    die "innobackupex failed"
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1347698.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1347698.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1347698.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1347698.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+########################################################################
+# Bug #1347698: log parameter on mysqld section shouldn't be read by
+#                xtrabackup
+########################################################################
+
+. inc/common.sh
+
+require_server_version_lower_than 5.6.0
+
+# add --log parameter to [mysqld] section of my.cnf
+MYSQLD_EXTRA_MY_CNF_OPTS="
+log=$MYSQLD_VARDIR/general.log
+"
+
+start_server
+
+vlog "Creating the backup directory: $topdir/backup"
+mkdir -p $topdir/backup
+xtrabackup --backup --target-dir=$topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1363234.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1363234.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1363234.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1363234.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,29 @@
+########################################################################
+# Bug 1363234: Incremental backup fail with innodb_undo_tablespaces > 1
+########################################################################
+
+. inc/common.sh
+
+require_server_version_higher_than 5.6.0
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_undo_tablespaces=4
+"
+
+start_server
+load_sakila
+
+# backup
+innobackupex --no-timestamp $topdir/backup
+innobackupex --incremental --no-timestamp \
+    --incremental-basedir=$topdir/backup $topdir/inc1
+innobackupex --incremental --no-timestamp \
+    --incremental-basedir=$topdir/inc1 $topdir/inc2
+
+# prepare (last one would fail)
+innobackupex --apply-log --redo-only $topdir/backup
+innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc1 \
+    $topdir/backup
+innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc2 \
+    $topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1367377.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1367377.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1367377.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1367377.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+################################################################################
+# Bug #1367377: xtrabackup should reject unknown arguments which are not options
+################################################################################
+
+start_server
+
+run_cmd_expect_failure $XB_BIN $XB_ARGS --backup foo
+
+test -d xtrabackup_backupfiles && die "Default backup directory found" || true
+
+run_cmd_expect_failure $XB_BIN $XB_ARGS foo --backup
+
+test -d xtrabackup_backupfiles && die "Default backup directory found" || true
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1372679.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1372679.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1372679.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1372679.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,56 @@
+########################################################################
+# Bug #1372679: innobackupex --slave-info doesn't handle
+#               slave_parallel_workers>0
+########################################################################
+
+require_server_version_higher_than 5.6.0
+
+# Test that --slave-info with MTS enabled + GTID disabled fails
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+slave_parallel_workers=2
+"
+master_id=1
+slave_id=2
+
+start_server_with_id $master_id
+
+start_server_with_id $slave_id
+
+setup_slave $slave_id $master_id
+
+switch_server $slave_id
+
+innobackupex --no-timestamp --slave-info $topdir/backup 2>&1 |
+    grep 'The --slave-info option requires GTID enabled for a multi-threaded slave' ||
+    die "could not find the error message"
+
+if [[ ${PIPESTATUS[0]} == 0 ]]
+then
+    die "innobackupex did not fail as expected"
+fi
+
+stop_server_with_id $master_id
+stop_server_with_id $slave_id
+
+remove_var_dirs
+
+# Test that --slave-info with MTS enabled + GTID enabled works
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+gtid_mode=on
+log_slave_updates=on
+enforce_gtid_consistency=on
+slave_parallel_workers=2
+"
+
+start_server_with_id $master_id
+start_server_with_id $slave_id
+
+setup_slave $slave_id $master_id
+
+switch_server $slave_id
+
+sync_slave_with_master $slave_id $master_id
+
+innobackupex --no-timestamp --slave-info $topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1376874.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1376874.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1376874.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1376874.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,21 @@
+########################################################################
+# Bug 1376874: --apply-log and --decompress aren't mutually exclusive
+#              Test checks different combinatinos of options
+########################################################################
+
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --decompress --apply-log backup
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --decompress --copy-back backup
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --decompress --move-back backup
+
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --decrypt=AES256 --apply-log backup
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --decrypt=AES256 --copy-back backup
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --decrypt=AES256 --move-back backup
+
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --apply-log --copy-back backup
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --apply-log --move-back backup
+
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --copy-back --move-back backup
+
+COUNT=$(grep -E -c -- "--[^ ]+ and --[^ ]+ are mutually exclusive" $OUTFILE)
+echo $COUNT
+[ "$COUNT" == "9" ]
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1382347.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1382347.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1382347.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1382347.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,39 @@
+###########################################################################
+# Bug1382347: innobackupex should create server directories when copy back
+#             is performed
+###########################################################################
+
+. inc/common.sh
+
+require_server_version_higher_than 5.6.0
+
+mkdir -p ${TEST_VAR_ROOT}/dir/{undo,data,logs}
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_undo_directory=${TEST_VAR_ROOT}/dir/undo
+innodb_undo_tablespaces=4
+innodb_data_home_dir=${TEST_VAR_ROOT}/dir/data
+innodb_log_group_home_dir=${TEST_VAR_ROOT}/dir/logs
+"
+
+start_server
+load_sakila
+
+checksum1=`checksum_table sakila payment`
+test -n "$checksum1" || die "Failed to checksum table sakila.payment"
+
+innobackupex --no-timestamp $topdir/backup
+
+stop_server
+
+rm -rf $MYSQLD_DATADIR
+rm -rf ${TEST_VAR_ROOT}/dir
+
+innobackupex --apply-log $topdir/backup
+innobackupex --copy-back $topdir/backup
+
+start_server
+
+checksum2=`checksum_table sakila payment`
+test -n "$checksum2" || die "Failed to checksum table sakila.payment"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1388122.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1388122.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1388122.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1388122.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,22 @@
+########################################################################
+# Bug 1388122: Innobackupex does not work with .mylogin.cnf
+########################################################################
+
+require_server_version_higher_than 5.6.0
+
+start_server
+
+export HOME=$topdir/home
+
+rm -rf $HOME/.mylogin.cnf
+mkdir -p $HOME
+
+mysql -e "CREATE USER 'backup'@'localhost' IDENTIFIED BY 'secret'"
+mysql -e "GRANT ALL PRIVILEGES ON * . * TO 'backup'@'localhost'"
+
+run_cmd mysql_config_editor \
+	set --login-path=backup --user=backup --host=localhost
+
+innobackupex --no-timestamp --login-path=backup --password=secret $topdir/backup
+
+rm -rf $HOME/.mylogin.cnf
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1391041.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1391041.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1391041.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1391041.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,73 @@
+########################################################################
+# Bug 1391041: innobackupex should skip GTID output is GTID_MODE is OFF
+########################################################################
+
+. inc/common.sh
+
+require_server_version_higher_than 5.6.0
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+gtid_mode=on
+log_slave_updates=on
+enforce_gtid_consistency=on
+"
+start_server
+
+$MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, c INT);
+INSERT INTO t(c) VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+SET AUTOCOMMIT=0;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+COMMIT;
+EOF
+
+innobackupex --no-timestamp $topdir/backup
+
+binlog_info=$topdir/backup/xtrabackup_binlog_info
+
+if ! egrep -q "filename.*position" $OUTFILE ; then
+	die "filename/position NOT FOUND with GTID_MODE=ON"
+fi
+
+if ! egrep -q "GTID of the last change" $OUTFILE ; then
+	die "GTID of the last change not found with GTID_MODE=ON"
+fi
+
+if ! egrep -q "^mysql-bin.[0-9]+[[:space:]]+[0-9]+" $binlog_info ; then
+	die "filename/position NOT FOUND with GTID_MODE=ON"
+fi
+
+if ! egrep -q "[a-f0-9:-]+$" $binlog_info ; then
+	die "GTID not found in xtrabackup_binlog_info with GTID_MODE=ON"
+fi
+
+echo -n >$OUTFILE
+rm -rf $topdir/backup
+MYSQLD_EXTRA_MY_CNF_OPTS=
+
+stop_server
+start_server
+
+innobackupex --no-timestamp $topdir/backup
+
+if egrep -q "GTID of the last change" $OUTFILE ; then
+	die "Found GTID of the last change with GTID_MODE=OFF"
+fi
+
+if ! grep -q "filename.*position" $OUTFILE ; then
+	die "filename/position not found with GTID_MODE=OFF"
+fi
+
+if ! egrep -q "^mysql-bin.[0-9]+[[:space:]]+[0-9]+$" $binlog_info ; then
+	die "Found filename/position in xtrabackup_binlog_info with GTID_MODE=OFF"
+fi
+
+if egrep -q "^[a-f0-9:-]+$" $binlog_info ; then
+	die "Found GTID of the last change in xtrabackup_binlog_info with GTID_MODE=OFF"
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1399471.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1399471.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1399471.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1399471.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,37 @@
+############################################################################
+# Bug 1399471: XtraBackup 2.2.x crash on prepare when backing up
+#              MySQL/Percona Server 5.5.x (temp tables involved)
+############################################################################
+
+. inc/common.sh
+
+start_server --innodb_file_per_table
+
+function create_tmp_table()
+{
+    run_cmd $MYSQL $MYSQL_ARGS test <<EOF
+START TRANSACTION;
+CREATE TEMPORARY TABLE tmp_crash(id INT) ENGINE=InnoDB;
+SELECT SLEEP(10000);
+EOF
+}
+
+create_tmp_table &
+job_id=$!
+
+vlog "Starting backup"
+
+innobackupex --no-timestamp $topdir/backup
+
+kill -SIGKILL $job_id
+
+vlog "Preparing backup"
+innobackupex --apply-log $topdir/backup
+
+stop_server
+
+rm -rf ${mysql_datadir}/*
+
+innobackupex --copy-back $topdir/backup
+
+start_server
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1410339.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1410339.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1410339.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1410339.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,55 @@
+###############################################################################
+# Bug #1410339: Set session lock_wait_timeout value to its default value before
+#               executing FTWRL
+###############################################################################
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+loose-lock_wait_timeout=1
+"
+
+start_server
+
+function blocking_statement()
+{
+    $MYSQL $MYSQL_ARGS test -e "INSERT INTO t VALUES (SLEEP(10000))"
+}
+
+function start_innobackupex()
+{
+    innobackupex --no-timestamp $topdir/backup
+}
+
+$MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t (a INT) ENGINE=MyISAM;
+EOF
+
+blocking_statement &
+job1=$!
+
+while ! $MYSQL $MYSQL_ARGS -e "SHOW PROCESSLIST" | grep "INSERT"
+do
+    sleep 1
+done
+
+conn_id=`$MYSQL $MYSQL_ARGS -e "SHOW PROCESSLIST" | grep "INSERT" | awk '{print $1;}'`
+
+start_innobackupex &
+job2=$!
+
+# xtrabackup does FLUSH TABLES before FLUSH TABLES WITH READ LOCK
+# or LOCK TABLES FOR BACKUP
+# both are affected by lock_wait_timeout setting
+while ! $MYSQL $MYSQL_ARGS -e "SHOW PROCESSLIST" | grep "TABLES"
+do
+    sleep 1
+done
+
+# Make sure we wait longer than lock_wait_timeout
+sleep 1
+
+echo "Letting innobackupex to go!"
+$MYSQL $MYSQL_ARGS -e "KILL $conn_id"
+
+# Test that FTWRL / LOCK TABLES FOR BACKUP succeeds
+
+wait $job2
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1414221.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1414221.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1414221.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1414221.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,32 @@
+############################################################################
+# Bug 1414221: Warning "The log was not applied to the intended LSN"
+#              should optionally be an error
+############################################################################
+. inc/common.sh
+
+if [ ${ASAN_OPTIONS:-undefined} != "undefined" ]
+then
+    skip_test "Incompatible with AddressSanitizer"
+fi
+
+start_server --innodb_file_per_table
+load_sakila
+
+${MYSQL} ${MYSQL_ARGS} sakila -e "DELETE FROM payment"
+
+# Full backup
+# backup root directory
+vlog "Starting backup"
+
+full_backup_dir=$topdir/full_backup
+innobackupex --no-timestamp $full_backup_dir
+
+ls -al $full_backup_dir/xtrabackup_logfile
+
+sed -i -e 's/to_lsn = [0-9]*$/to_lsn = 999999999/' \
+	$full_backup_dir/xtrabackup_checkpoints
+
+vlog "Preparing backup"
+run_cmd_expect_failure $IB_BIN $IB_ARGS  --apply-log \
+	$full_backup_dir
+vlog "Log applied to full backup"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1415191.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1415191.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1415191.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1415191.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+#
+# Bug 1415191: apply log crashes - signal 11 (ib_warn_row_too_big)
+#
+
+start_server
+
+( echo -n "CREATE TABLE test.foo ( "
+  for i in {1..197}; do
+    echo -n "text${i} TEXT"
+    [[ ${i} -ne 197 ]] && echo -n ", "
+  done
+  echo ") ENGINE = InnoDB" ) | $MYSQL $MYSQL_ARGS test
+
+( echo -n "INSERT INTO test.foo VALUES ("
+  for i in {1..197}; do
+    echo -n "'abcdef'"
+    [[ ${i} -ne 197 ]] && echo -n ", "
+  done
+  echo ")" ) | $MYSQL $MYSQL_ARGS test
+
+$MYSQL $MYSQL_ARGS -e "DELETE FROM test.foo WHERE text1 = 'abcdef'" test
+
+innobackupex --no-timestamp $topdir/backup
+
+# prepare will crash if bug is present
+innobackupex --apply-log $topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1418438.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1418438.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1418438.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1418438.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,15 @@
+###############################################################################
+# Bug #1418438: innobackupex --compress only compress innodb tables
+###############################################################################
+
+start_server
+
+mysql -e "CREATE TABLE test (A INT PRIMARY KEY) ENGINE=MyISAM" test
+
+innobackupex --compress --no-timestamp --include=test.test $topdir/backup
+
+diff -u <(LANG=C ls $topdir/backup/test) - <<EOF
+test.MYD.qp
+test.MYI.qp
+test.frm.qp
+EOF
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1418584.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1418584.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1418584.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1418584.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,40 @@
+###############################################################################
+# Bug #1418584: Do not overwrite xtrabackup_galera_info when using autorecovery
+###############################################################################
+
+require_galera
+
+ADDR=127.0.0.1
+
+if [[ -n ${WSREP_DEBUG:-} ]];then
+    start_server --log-bin=`hostname`-bin --binlog-format=ROW \
+                 --wsrep-provider=$LIBGALERA_PATH \
+                 --wsrep_cluster_address=gcomm:// \
+                 --wsrep-debug=1 --wsrep_provider_options="debug=1" \
+                 --wsrep_node_address=$ADDR
+else
+    start_server --log-bin=`hostname`-bin --binlog-format=ROW \
+                 --wsrep-provider=$LIBGALERA_PATH \
+                 --wsrep_cluster_address=gcomm:// --wsrep_node_address=$ADDR
+fi
+
+has_backup_locks && skip_test "Requires server without backup locks support"
+
+backup_dir=$topdir/backup
+
+backup_dir=$topdir/backup
+
+innobackupex --no-timestamp --galera-info $backup_dir
+
+test -f $backup_dir/xtrabackup_galera_info ||
+  die "xtrabackup_galera_info was not created"
+
+echo "test" > $backup_dir/xtrabackup_galera_info
+
+cp $backup_dir/xtrabackup_galera_info $backup_dir/xtrabackup_galera_info_copy
+
+innobackupex --apply-log $backup_dir
+
+# Test that xtrabackup_galera_info has not been overwritten on --apply-log
+diff -u $backup_dir/xtrabackup_galera_info \
+     $backup_dir/xtrabackup_galera_info_copy
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1454815.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1454815.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1454815.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1454815.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,30 @@
+. inc/common.sh
+
+start_server --innodb_file_per_table
+
+vlog "Creating test data"
+run_cmd $MYSQL $MYSQL_ARGS test <<EOF
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3);
+CREATE DATABASE db2;
+USE db2;
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3);
+EOF
+
+vlog "Creating backup directory"
+mkdir -p $topdir/backup
+
+vlog "Starting backup"
+xtrabackup --datadir=$mysql_datadir --backup --databases=db1 --target-dir=$topdir/backup
+
+vlog "Preparing backup"
+xtrabackup --datadir=$mysql_datadir --prepare --databases=db1 --export --target-dir=$topdir/backup
+
+if grep -q "InnoDB data dictionary has tablespace" $OUTFILE; then
+  exit 1
+fi
+
+stop_server
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1461735.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1461735.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1461735.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1461735.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,107 @@
+#
+# Bug 1461735: database directories not removed when drop database happened during backup
+#
+
+if ! $XB_BIN --help 2>&1 | grep -q debug-sync; then
+    skip_test "Requires --debug-sync support"
+fi
+
+XB_EXTRA_MY_CNF_OPTS="
+debug-sync=xtrabackup_load_tablespaces_pause
+"
+
+start_server
+
+function backup_local() {
+	xtrabackup --backup --target-dir=$topdir/backup
+}
+
+function prepare_local() {
+	xtrabackup --prepare --target-dir=$topdir/backup
+}
+
+function backup_xbstream() {
+	xtrabackup --backup --stream=xbstream --target-dir=$topdir/backup > $topdir/backup.xbs
+}
+
+function prepare_xbstream() {
+	xbstream -x -C $topdir/backup < $topdir/backup.xbs
+	xtrabackup --prepare --target-dir=$topdir/backup
+}
+
+function backup_rsync() {
+	xtrabackup --backup --rsync --target-dir=$topdir/backup
+}
+
+function prepare_rsync() {
+	xtrabackup --prepare --target-dir=$topdir/backup
+}
+
+function do_test() {
+
+	cat <<EOF | $MYSQL $MYSQL_ARGS 
+CREATE DATABASE sakila;
+use sakila;
+CREATE TABLE t (a INT);
+INSERT INTO t (a) VALUES (1), (2), (3);
+EOF
+
+	(eval $backup_cmd) &
+	job_pid=$!
+
+	wait_for_xb_to_suspend $pid_file
+
+	xb_pid=`cat $pid_file`
+
+	$MYSQL $MYSQL_ARGS -Ns -e "DROP DATABASE sakila"
+
+	# Resume the xtrabackup process
+	vlog "Resuming xtrabackup"
+	kill -SIGCONT $xb_pid
+
+	# wait's return code will be the code returned by the background process
+	run_cmd wait $job_pid
+
+	eval $prepare_cmd
+
+	if [ ! -d $topdir/backup/test ] ; then
+		vlog "Database directory test is removed"
+		exit 1
+	fi
+
+	if [ -d $topdir/backup/sakila ] ; then
+		vlog "Database directory is not removed"
+		exit 1
+	fi
+
+	rm -rf $topdir/backup
+	rm -rf $pid_file
+
+}
+
+vlog "##############################"
+vlog "# Streaming backup"
+vlog "##############################"
+
+export backup_cmd=backup_xbstream
+export prepare_cmd=prepare_xbstream
+export pid_file=$topdir/backup/xtrabackup_debug_sync
+do_test
+
+vlog "##############################"
+vlog "# Local backup"
+vlog "##############################"
+
+export backup_cmd=backup_local
+export prepare_cmd=prepare_local
+export pid_file=$topdir/backup/xtrabackup_debug_sync
+do_test
+
+vlog "##############################"
+vlog "# Backup using rsync"
+vlog "##############################"
+
+export backup_cmd=backup_rsync
+export prepare_cmd=prepare_rsync
+export pid_file=$topdir/backup/xtrabackup_debug_sync
+do_test
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1470847.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1470847.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1470847.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1470847.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,61 @@
+#
+# Bug 1470847: starting LSN is bigger than ending LSN makes no error
+#
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-log-files-in-group=4
+innodb-log-file-size=2M
+"
+start_server
+
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e \
+	"CREATE TABLE t (a INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB" test
+
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e \
+	"INSERT INTO t VALUES (), (), (), (), (), (), (), ()" test
+
+function mysql_lsn()
+{
+	${MYSQL} ${MYSQL_ARGS} -e "SHOW ENGINE InnoDB STATUS\G" | \
+		grep "Log sequence number" | awk '{ print $4 }'
+}
+
+function mysql_flushed_lsn()
+{
+	${MYSQL} ${MYSQL_ARGS} -e "SHOW ENGINE InnoDB STATUS\G" | \
+		grep "Log flushed up to" | awk '{ print $5 }'
+}
+
+function mysql_n_dirty_pages()
+{
+	result=$( $MYSQL $MYSQL_ARGS -se \
+		"SHOW STATUS LIKE 'innodb_buffer_pool_pages_dirty'" | \
+		awk '{ print $2 }' )
+	echo "Dirty pages left $result"
+	return $result
+}
+
+# fill 3 of 4 redo log files
+while [ `mysql_lsn` -lt 6502000 ] ; do
+	run_cmd ${MYSQL} ${MYSQL_ARGS} -e \
+		"INSERT INTO t SELECT NULL FROM t LIMIT 1000" test
+done
+
+# wait for InnoDB to flush all dirty pages
+while ! mysql_n_dirty_pages ; do
+	sleep 1
+done
+
+# wait for InnoDB to flush redo log
+while [ `mysql_flushed_lsn` != `mysql_lsn` ] ; do
+	sleep 1
+done
+
+sleep 1
+
+# pass wrong value for innodb-log-files-in-group
+run_cmd_expect_failure ${XB_BIN} ${XB_ARGS} --backup \
+			--target-dir=$topdir/backup \
+			--innodb-log-files-in-group=3
+
+grep -q "xtrabackup: error: last checkpoint LS" $OUTFILE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1475487.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1475487.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1475487.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1475487.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,20 @@
+#
+# Bug 1475487: xtrabackup handling of space id conflicts
+#
+
+start_server --innodb_file_per_table
+
+${MYSQL} ${MYSQL_ARGS} -e "CREATE TABLE t (a INT) engine=InnoDB" test
+
+${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t VALUES (1), (2), (3)" test
+
+datadir=$mysql_datadir
+
+shutdown_server
+
+cp $datadir/test/t.ibd $datadir/test/a.ibd 
+
+start_server --innodb_file_per_table
+
+run_cmd_expect_failure ${XB_BIN} ${XB_ARGS} --backup --datadir=$mysql_datadir \
+					    --target-dir=$topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1495367.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1495367.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1495367.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1495367.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+########################################################################
+# Bug 1495367: xtrabackup 2.3 does not set wait_timeout session variable
+########################################################################
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+wait_timeout=1
+"
+
+start_server
+
+xtrabackup --backup --target-dir=$topdir/backup \
+	   --debug-sync="data_copy_thread_func" &
+
+job_pid=$!
+pid_file=$topdir/backup/xtrabackup_debug_sync
+
+wait_for_xb_to_suspend $pid_file
+
+xb_pid=`cat $pid_file`
+
+sleep 1
+
+vlog "Resuming xtrabackup"
+kill -SIGCONT $xb_pid
+
+wait $job_pid
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1508448.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1508448.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1508448.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1508448.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Bug 1508448: --defaults-file requires datadir to be set.
+#
+
+start_server
+
+# remove datadir from my.cnf
+sed -ie '/datadir/d' ${MYSQLD_VARDIR}/my.cnf
+
+# must succeed, datadir taken from server
+innobackupex --no-timestamp $topdir/backup1
+xtrabackup --backup --target-dir=$topdir/backup2
+
+# must fail, datadir pints to bogus destination
+run_cmd_expect_failure $IB_BIN $IB_ARGS --datadir=/wrong/datadir \
+			--no-timestamp $topdir/backup3
+run_cmd_expect_failure $XB_BIN $XB_ARGS --datadir=/wrong/datadir \
+			--backup --target-dir=$topdir/backup4
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1509812.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1509812.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1509812.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1509812.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Bug 1509812: backup fails with history on server enabled
+#              and binary log disabled
+#
+
+start_server --skip-log-bin
+
+xtrabackup --history --backup --target-dir=$topdir/backup
+
+cat $topdir/backup/xtrabackup_info
+
+run_cmd $MYSQL $MYSQL_ARGS -e "SELECT * FROM PERCONA_SCHEMA.xtrabackup_history\G"
+
+innobackupex --history $topdir/backup
+
+cat $topdir/backup/xtrabackup_info
+
+run_cmd $MYSQL $MYSQL_ARGS -e "SELECT * FROM PERCONA_SCHEMA.xtrabackup_history\G"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1511451.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1511451.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1511451.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1511451.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,29 @@
+#
+# Bug 1511451: innobackupex permission error; --defaults-extra-file ignored?
+#
+
+run_cmd_expect_failure ${IB_BIN} \
+	--datadir=$topdir/data \
+	--defaults-file=$MYSQLD_VARDIR/my.cnf \
+	$topdir/backup
+
+run_cmd_expect_failure ${XB_BIN} \
+	--datadir=$topdir/data \
+	--defaults-file=$MYSQLD_VARDIR/my.cnf \
+	--backup \
+	--target-dir=$topdir/backup
+
+run_cmd_expect_failure ${IB_BIN} \
+	--datadir=$topdir/data \
+	--defaults-extra-file=$MYSQLD_VARDIR/my.cnf \
+	$topdir/backup
+
+run_cmd_expect_failure ${XB_BIN} \
+	--datadir=$topdir/data \
+	--defaults-extra-file=$MYSQLD_VARDIR/my.cnf \
+	--backup \
+	--target-dir=$topdir/backup
+
+if [ `grep -c 'must be specified first' $OUTFILE` != '4' ] ; then
+	die 'Error message mush be repeated 4 times'
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1511701.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1511701.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1511701.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1511701.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+###############################################################################
+# Bug 1511701: rsync parameter return error with 2.3.2 build
+###############################################################################
+
+start_server
+
+# remove tmpdir from my.cnf
+cp ${MYSQLD_VARDIR}/my.cnf ${MYSQLD_VARDIR}/my.cnf.orig
+sed -ie '/tmpdir/d' ${MYSQLD_VARDIR}/my.cnf
+
+innobackupex --rsync --datadir=$mysql_datadir --no-timestamp $topdir/backup1
+
+xtrabackup --rsync --datadir=$mysql_datadir --backup --target-dir=$topdir/backup2
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1512616.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1512616.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1512616.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1512616.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,34 @@
+#
+# Bug 1512616: XtraBackup 2.3 ib_logfile --move-back problem
+#
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_log_group_home_dir=${TEST_VAR_ROOT}/dir/logs
+innodb_data_home_dir=${TEST_VAR_ROOT}/dir/data
+"
+
+mkdir -p ${TEST_VAR_ROOT}/dir/logs
+mkdir -p ${TEST_VAR_ROOT}/dir/data
+
+start_server
+
+xtrabackup --backup --target-dir=$topdir/backup
+
+xtrabackup --prepare --target-dir=$topdir/backup
+
+stop_server
+
+rm -rf $mysql_datadir/*
+rm -rf ${TEST_VAR_ROOT}/dir
+
+xtrabackup --move-back --target-dir=$topdir/backup
+
+if [ ! -f ${TEST_VAR_ROOT}/dir/logs/ib_logfile0 ] ; then
+	die "Log files were not moved to correct place!"
+fi
+
+if [ ! -f ${TEST_VAR_ROOT}/dir/data/ibdata1 ] ; then
+	die "Data files were not moved to correct place!"
+fi
+
+start_server
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1513520.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1513520.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1513520.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1513520.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,9 @@
+#
+# Bug 1513520: xtrabackup doesn't handle --slave-info option well with PXC
+#
+
+start_server
+
+innobackupex --slave-info --no-timestamp $topdir/backup1
+
+xtrabackup --slave-info --backup --target-dir=$topdir/backup2
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1520569.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1520569.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1520569.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1520569.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+#
+# Bug 1520569: 2.3 creates empty dir after upgrading
+#
+
+start_server
+
+# check that directory with timestamp as a name is not created
+# (--stream should imply --no-timestamp)
+innobackupex --stream=tar $topdir/backup > $topdir/xbs
+
+if [ "$(ls -A $topdir/backup)" ] ; then
+	die "Directory is created!"
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1523687.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1523687.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1523687.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1523687.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,32 @@
+#
+# Bug 1523687: xtrabackup_binlog_info is not being
+#              updated correctly when applying incrementals
+#
+
+start_server
+
+$MYSQL $MYSQL_ARGS -e "CREATE TABLE t (a INT) ENGINE=InnoDB" test
+$MYSQL $MYSQL_ARGS -e "INSERT INTO t VALUES (1), (2), (3)" test
+
+xtrabackup --backup --target-dir=$topdir/full
+
+$MYSQL $MYSQL_ARGS -e "INSERT INTO t VALUES (4), (5), (6)" test
+
+xtrabackup --backup --incremental-basedir=$topdir/full --target-dir=$topdir/inc
+
+xtrabackup --prepare --apply-log-only --target-dir=$topdir/full
+
+xtrabackup --prepare --apply-log-only --target-dir=$topdir/full \
+				      --incremental-dir=$topdir/inc
+
+xtrabackup --prepare --target-dir=$topdir/full
+
+# verify that following files overwritten in full backup directory with the
+# corresponding files from incremental directory
+for i in xtrabackup_binlog_info xtrabackup_galera_info \
+	 xtrabackup_slave_info xtrabackup_info ;
+do
+	if [ -f $topdir/inc/$i ] ; then
+		diff -u $topdir/full/$i $topdir/inc/$i
+	fi
+done
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1527081.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1527081.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1527081.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1527081.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,27 @@
+#
+# Bug 1527081: xtrabackup 2.3 does not respect innodb_log_file_size
+#              stored in backup-my.cnf
+#
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-log-files-in-group=4
+innodb-log-file-size=2M
+"
+
+start_server
+
+xtrabackup --backup --target-dir=$topdir/backup
+
+${XB_BIN} --prepare --target-dir=$topdir/backup
+
+stop_server
+
+rm -rf ${mysql_datadir}
+
+xtrabackup --move-back --target-dir=$topdir/backup
+
+start_server
+
+if grep -q "Resizing redo log" ${MYSQLD_ERRFILE} ; then
+	die "backup-my.cnf is ignored!"
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1533542.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1533542.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1533542.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1533542.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+########################################################################
+# Bug #1533542: innobackupex silently skip extra arguments
+########################################################################
+
+. inc/common.sh
+
+start_server
+
+# Full backup
+vlog "Starting backup"
+
+# Invoke innobackupex with an extra argument 'tmp-dir'
+run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp $topdir/backup tmp-dir
+
+# Should failed with error
+grep -q "Error: extra argument found tmp-dir" $OUTFILE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1566228.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1566228.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1566228.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1566228.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,19 @@
+#
+# Bug 1566228: XB crashes with insufficient param
+# 
+
+start_server
+
+xtrabackup --backup --target-dir=$topdir/backup
+
+xtrabackup --prepare --target-dir=$topdir/backup
+
+run_cmd_expect_failure ${XB_BIN} --defaults-file= --defaults-group=mysqld.2 \
+	  --no-version-check --move-back --force-non-empty-directories \
+	  --target-dir=$topdir/backup 2>&1 | \
+	  grep "Error: datadir must be specified"
+
+run_cmd_expect_failure ${IB_BIN} --defaults-file= --defaults-group=mysqld.2 \
+	  --no-version-check --move-back --force-non-empty-directories \
+	  $topdir/backup 2>&1 | \
+	  grep "Error: datadir must be specified"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1623210.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1623210.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1623210.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1623210.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,24 @@
+#
+# Bug 1623210: xtrabackup failed to write metadata but backup still succeeded
+# Bug 1557027: Error message about missing metadata is misleading
+#
+
+start_server
+
+mkdir $topdir/extra1
+mkdir $topdir/extra2
+chmod ugoa-w $topdir/extra1
+
+run_cmd_expect_failure ${XB_BIN} ${XB_ARGS} --backup --target-dir=$topdir/bak1 \
+					    --extra-lsndir=$topdir/extra1
+
+xtrabackup --backup --target-dir=$topdir/bak2 --extra-lsndir=$topdir/extra2
+
+echo -n > $topdir/bak2/xtrabackup_checkpoints
+run_cmd_expect_failure ${XB_BIN} --prepare --target-dir=$topdir/bak2
+
+rm $topdir/bak2/xtrabackup_checkpoints
+run_cmd_expect_failure ${XB_BIN} --prepare --target-dir=$topdir/bak2
+
+cp $topdir/extra2/xtrabackup_checkpoints $topdir/bak2/xtrabackup_checkpoints
+xtrabackup --prepare --target-dir=$topdir/bak2
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1630841.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1630841.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1630841.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1630841.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,114 @@
+#
+# Bug 1630841: sha256 password doesn't work
+#
+
+require_server_version_higher_than 5.6.0
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+default-authentication-plugin=sha256_password
+ssl-ca=${MYSQL_BASEDIR}/mysql-test/std_data/cacert.pem
+ssl-cert=${MYSQL_BASEDIR}/mysql-test/std_data/server-cert.pem
+ssl-key=${MYSQL_BASEDIR}/mysql-test/std_data/server-key.pem
+"
+
+start_server
+
+vlog "Detectiong SSL support"
+
+if has_openssl
+then
+	vlog "Server is built with OpenSSL"
+	SEVER_SSL=openssl
+else
+	vlog "Server is built with YaSSL"
+	SEVER_SSL=yassl
+fi
+
+if ${XB_BIN} --param 2>/dev/null | grep -q server-public-key-path
+then
+	vlog "Xtrabackup is built with OpenSSL"
+	XTRABACKUP_SSL=openssl
+else
+	vlog "Xtrabackup is built with YaSSL"
+	XTRABACKUP_SSL=yassl
+fi
+
+# using SSL encryption requires xtrabackup and mysql to use the same SSL library
+if [ "$SEVER_SSL" = "$XTRABACKUP_SSL" ]
+then
+
+vlog "Creating user 'pxb'"
+
+${MYSQL} ${MYSQL_ARGS} -e "CREATE USER pxb@'localhost' IDENTIFIED BY 'password1'"
+${MYSQL} ${MYSQL_ARGS} -e "GRANT RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO pxb@'localhost' REQUIRE SSL"
+${MYSQL} ${MYSQL_ARGS} -e "FLUSH PRIVILEGES"
+
+vlog 'connecting with MYSQL cli'
+run_cmd ${MYSQL} \
+	--no-defaults \
+	--user=pxb \
+	--password=password1 \
+	--host=127.0.0.1 \
+	--port=${MYSQLD_PORT} \
+	--ssl \
+	--ssl-ca=${MYSQL_BASEDIR}/mysql-test/std_data/cacert.pem \
+	--ssl-cert=${MYSQL_BASEDIR}/mysql-test/std_data/client-cert.pem \
+	--ssl-key=${MYSQL_BASEDIR}/mysql-test/std_data/client-key.pem \
+	-e '\s'
+
+vlog 'connecting with xtrabackup'
+run_cmd ${XB_BIN} \
+	--no-defaults \
+	--backup \
+	--user=pxb \
+	--password=password1 \
+	--host=127.0.0.1 \
+	--port=${MYSQLD_PORT} \
+	--ssl \
+	--ssl-ca=${MYSQL_BASEDIR}/mysql-test/std_data/cacert.pem \
+	--ssl-cert=${MYSQL_BASEDIR}/mysql-test/std_data/client-cert.pem \
+	--ssl-key=${MYSQL_BASEDIR}/mysql-test/std_data/client-key.pem \
+	--target-dir=$topdir/backup1
+
+fi
+
+stop_server
+
+# sha256_password + asymmetric encryption requires OpenSSL
+# both on server and xtrabackup
+
+if [ "$SEVER_SSL" = "openssl" -a "$XTRABACKUP_SSL" = "openssl" ]
+then
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+default-authentication-plugin=sha256_password
+sha256_password_private_key_path=${MYSQL_BASEDIR}/mysql-test/std_data/rsa_private_key.pem
+sha256_password_public_key_path=${MYSQL_BASEDIR}/mysql-test/std_data/rsa_public_key.pem
+"
+
+start_server
+
+${MYSQL} ${MYSQL_ARGS} -e "CREATE USER pbx@'localhost' IDENTIFIED BY 'password1'"
+${MYSQL} ${MYSQL_ARGS} -e "GRANT RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO pbx@'localhost'"
+${MYSQL} ${MYSQL_ARGS} -e "FLUSH PRIVILEGES"
+
+vlog 'connecting with MYSQL cli'
+run_cmd ${MYSQL} \
+	--no-defaults \
+	--user=pbx \
+	--password=password1 \
+	--host=127.0.0.1 \
+	--port=${MYSQLD_PORT} \
+	-e '\s'
+
+vlog 'connecting with xtrabackup'
+run_cmd ${XB_BIN} \
+	--no-defaults \
+	--backup \
+	--user=pbx \
+	--password=password1 \
+	--host=127.0.0.1 \
+	--port=${MYSQLD_PORT} \
+	--target-dir=$topdir/backup2
+
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1642826.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1642826.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1642826.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1642826.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,26 @@
+#
+# Bug 1642826: incremental backup fails with relative path / xtrabackup doesn't expand tilde
+#
+
+start_server
+
+cd $topdir
+
+mkdir backup
+
+xtrabackup --backup --target-dir=backup/full --extra-lsndir=backup/lsn
+xtrabackup --backup --incremental-basedir=backup/full --target-dir=backup/inc_1
+xtrabackup --prepare --apply-log-only --target-dir=backup/full
+xtrabackup --prepare --target-dir=backup/full --incremental-dir=backup/inc_1
+
+rm -rf backup/*
+
+cd -
+
+export HOME=$topdir
+
+xtrabackup --backup --target-dir=~/backup/full --extra-lsndir=~/backup/lsn
+xtrabackup --backup --incremental-basedir=~/backup/full --target-dir=~/backup/inc_1
+xtrabackup --prepare --apply-log-only --target-dir=~/backup/full
+xtrabackup --prepare --target-dir=~/backup/full --incremental-dir=~/backup/inc_1
+
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1652044.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1652044.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug1652044.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug1652044.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,16 @@
+#
+# Bug 1652044: Add -u and -p shortcuts for --user and --password
+#
+
+start_server
+
+mysql -e "CREATE USER 'backup'@'localhost' IDENTIFIED BY 'secret'"
+mysql -e "GRANT ALL PRIVILEGES ON * . * TO 'backup'@'localhost'"
+
+run_cmd ${XB_BIN} --no-defaults --backup -ubackup -S $MYSQLD_SOCKET \
+		  -P $MYSQLD_PORT -psecret --target-dir=$topdir/backup
+
+rm -rf $topdir/backup
+
+run_cmd ${IB_BIN} --no-defaults -ubackup -psecret -S $MYSQLD_SOCKET \
+		  -P $MYSQLD_PORT $topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug369913.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug369913.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug369913.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug369913.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,15 @@
+#############################################################################
+# Bug #369913: Feature Request: more verbose output during initial table scan
+#############################################################################
+
+start_server
+
+innobackupex --no-timestamp $topdir/backup
+
+egrep -q \
+      '[0-9]{6} [0-9]{2}:[0-9]{2}:[0-9]{2} .* Starting the backup operation' \
+      $OUTFILE \
+    || die "Could not find the operation start message"
+
+grep -q "xtrabackup: Generating a list of tablespaces" $OUTFILE \
+    || die "Could not find \"Generating a list of tablespaces\" message"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug664128.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug664128.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug664128.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug664128.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,40 @@
+########################################################################
+# Bug #664128: xtrabackup does not support "--loose-" options
+########################################################################
+
+cat >$topdir/my.cnf <<EOF
+[mysqld]
+loose-innodb_log_file_size=5M
+maximum-innodb_log_file_size=6M
+skip-innodb_fast_checksum
+EOF
+
+diff -u - <($XB_BIN --defaults-file=$topdir/my.cnf --print-param) <<EOF
+# This MySQL options file was generated by XtraBackup.
+[mysqld]
+innodb_log_file_size=5242880
+innodb_log_file_size=5242880
+innodb_fast_checksum=0
+EOF
+
+cat >$topdir/my.cnf <<EOF
+[mysqld]
+enable-innodb_fast_checksum
+EOF
+
+diff -u - <($XB_BIN --defaults-file=$topdir/my.cnf --print-param) <<EOF
+# This MySQL options file was generated by XtraBackup.
+[mysqld]
+innodb_fast_checksum=1
+EOF
+
+cat >$topdir/my.cnf <<EOF
+[mysqld]
+disable-innodb_fast_checksum
+EOF
+
+diff -u - <($XB_BIN --defaults-file=$topdir/my.cnf --print-param) <<EOF
+# This MySQL options file was generated by XtraBackup.
+[mysqld]
+innodb_fast_checksum=0
+EOF
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug664986.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug664986.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug664986.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug664986.sh	2017-02-27 07:47:02.000000000 +0000
@@ -4,6 +4,8 @@
 
 . inc/common.sh
 
+[[ $EUID -eq 0 ]] && skip_test "Can not be run by root"
+
 start_server --innodb_file_per_table
 
 run_cmd $MYSQL $MYSQL_ARGS <<EOF
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug740489.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug740489.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug740489.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug740489.sh	2017-02-27 07:47:02.000000000 +0000
@@ -12,19 +12,17 @@
 
 defaults_extra_file=$topdir/740489.cnf
 
-cat > $defaults_extra_file <<EOF
-[mysqld]
-datadir=${MYSQLD_DATADIR}
+cp $MYSQLD_VARDIR/my.cnf $defaults_extra_file
 
+cat >> $defaults_extra_file <<EOF
 [client]
-user=root
 password=password
 EOF
 
 backup_dir=$topdir/backup
 run_cmd $IB_BIN \
     --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} \
-    --ibbackup=$XB_BIN --no-timestamp $backup_dir
+    --ibbackup=$XB_BIN --no-version-check --no-timestamp $backup_dir
 vlog "Backup created in directory $backup_dir"
 
 run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password <<EOF
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug766033.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug766033.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug766033.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug766033.sh	2017-02-27 07:47:02.000000000 +0000
@@ -7,7 +7,14 @@
 start_server --innodb_file_per_table
 load_sakila
 
-stop_server
+# make sure all pages are flushed
+while true
+do
+	DIRTY=`mysql -Ns -e "SHOW GLOBAL STATUS LIKE 'Innodb_buffer_pool_pages_dirty'" | awk '{print $2;}'`
+	if [ "$DIRTY" == "0" ] ; then
+		break
+	fi
+done
 
 # Full backup
 vlog "Starting backup"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug766305.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug766305.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug766305.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug766305.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,36 @@
+########################################################################
+# Bug #766305: Use MySQL Code to get stack trace
+########################################################################
+
+start_server --innodb_file_per_table
+
+if [ ${ASAN_OPTIONS:-undefined} != "undefined" ]
+then
+    skip_test "Incompatible with AddressSanitizer"
+fi
+
+mkdir $topdir/backup
+
+xtrabackup --backup --target-dir=$topdir/backup --debug-sync="data_copy_thread_func" &
+
+job_pid=$!
+pid_file=$topdir/backup/xtrabackup_debug_sync
+
+# Wait for xtrabackup to suspend
+i=0
+while [ ! -r "$pid_file" ]
+do
+    sleep 1
+    i=$((i+1))
+    echo "Waited $i seconds for $pid_file to be created"
+done
+
+xb_pid=`cat $pid_file`
+
+kill -SIGSEGV $xb_pid
+kill -SIGCONT $xb_pid
+
+run_cmd_expect_failure wait $job_pid
+
+grep -q "handle_fatal_signal" $OUTFILE || \
+  die "Could not find a resolved stacktrace in the log"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug817132.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug817132.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug817132.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug817132.sh	2017-02-27 07:47:02.000000000 +0000
@@ -17,7 +17,7 @@
 
 mkdir -p $topdir/backup
 innobackupex  $topdir/backup
-backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
+backup_dir=`grep "Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
 vlog "Backup created in directory $backup_dir"
 
 stop_server
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug907147.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug907147.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug907147.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug907147.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+##########################################################################
+# Bug #907147: 1.6.4-313 loses master log info                           #
+##########################################################################
+
+. inc/common.sh
+
+start_server
+load_sakila
+
+innobackupex --no-timestamp $topdir/backup
+
+run_cmd_expect_failure grep "xtrabackup ping" \
+    $topdir/backup/xtrabackup_binlog_info
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug977101.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug977101.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug977101.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug977101.sh	2017-02-27 07:47:02.000000000 +0000
@@ -17,14 +17,16 @@
 
 # Check that binlog info is correct with --safe-slave-backup
 innobackupex --no-timestamp --safe-slave-backup $topdir/backup
-run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
+cat $topdir/backup/xtrabackup_binlog_info
+run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+$' \
     $topdir/backup/xtrabackup_binlog_info
 
 # Check that both binlog info and slave info are correct with 
 # --safe-slave-backup
 rm -rf $topdir/backup
 innobackupex --no-timestamp --slave-info --safe-slave-backup $topdir/backup
-run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
+cat $topdir/backup/xtrabackup_binlog_info
+run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+$' \
     $topdir/backup/xtrabackup_binlog_info
 run_cmd egrep -q '^CHANGE MASTER TO MASTER_LOG_FILE='\''mysql-bin.[0-9]+'\'', MASTER_LOG_POS=[0-9]+$' \
     $topdir/backup/xtrabackup_slave_info
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug983685.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug983685.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug983685.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug983685.sh	2017-02-27 07:47:02.000000000 +0000
@@ -10,7 +10,7 @@
 
 mkdir -p $topdir/backup
 innobackupex  $topdir/backup
-backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
+backup_dir=`grep "Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
 vlog "Backup created in directory $backup_dir"
 
 # test presence of options
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/bug983720_galerainfo.sh	2017-02-27 07:47:02.000000000 +0000
@@ -23,6 +23,8 @@
              --wsrep_provider_options="base_port=${galera_port}${pdebug}" \
              --wsrep_node_address=$ADDR
 
+has_backup_locks && skip_test "Requires server without backup locks support"
+
 # take a backup with stream mode
 mkdir -p $topdir/backup
 innobackupex --galera-info --stream=xbstream $topdir/backup > $topdir/backup/stream.xbs
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/history_on_server.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/history_on_server.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/history_on_server.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/history_on_server.sh	2017-02-27 07:47:02.000000000 +0000
@@ -159,7 +159,7 @@
 
 innobackupex --history --incremental --incremental-history-uuid=$third_uuid \
 --stream=xbstream --compress --encrypt=AES256 \
-$backup_dir --encrypt-key=percona_xtrabackup_is_awesome___ > /dev/null
+--encrypt-key=percona_xtrabackup_is_awesome___ $backup_dir > /dev/null
 
 get_one_value "innodb_from_lsn"
 fourth_from_lsn=$val
@@ -175,14 +175,14 @@
 # validate command tool and encrypt key scrubbibng but need to pop off first
 # three arguments in the result added by test framework function innobackupex
 get_one_value "tool_command"
-val=`set -- $val; shift 3; echo "$@"`
+val=`set -- $val; shift 2; echo "$@"`
 expected_val="--history --incremental "\
 "--incremental-history-uuid=$third_uuid --stream=xbstream --compress "\
-"--encrypt=AES256 $backup_dir --encrypt-key=..."
+"--encrypt=AES256 --encrypt-key=... $backup_dir"
 
 if [ -z "$val" ] || [ "$val" != "$expected_val" ]
 then
-  vlog "Error: $column in history record invalid, got \"$val\" expected \"$expected_val\""
+  vlog "Error: tool_command in history record invalid, got \"$val\" expected \"$expected_val\""
   exit 1
 fi
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_basic.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_basic.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_basic.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_basic.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,5 @@
+############################################################################
+# Test basic local backup
+############################################################################
+
+. inc/ib_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_binlog_info.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_binlog_info.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_binlog_info.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_binlog_info.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-##########################################################################
-# Bug #907147: 1.6.4-313 loses master log info                           #
-##########################################################################
-
-. inc/common.sh
-
-start_server
-load_sakila
-
-innobackupex --no-timestamp $topdir/backup
-
-run_cmd_expect_failure grep "xtrabackup ping" \
-    $topdir/backup/xtrabackup_binlog_info
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_buffer_pool.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_buffer_pool.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_buffer_pool.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_buffer_pool.sh	2017-02-27 07:47:02.000000000 +0000
@@ -21,8 +21,9 @@
 # produce buffer pool dump
 ${MYSQL} ${MYSQL_ARGS} -e "SET GLOBAL innodb_buffer_pool_dump_now=ON;"
 
-# take a backup
+# take a backup and apply log
 innobackupex --no-timestamp $topdir/backup
+innobackupex --apply-log $topdir/backup
 
 if [ -f $topdir/backup/pool/dump ] ; then
     vlog "Buffer pool dump has been backed up"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_compress_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_compress_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_compress_encrypt.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_compress_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,15 @@
+############################################################################
+# Test basic local backup with compression and encryption
+############################################################################
+
+require_qpress
+
+encrypt_algo="AES256"
+encrypt_key="percona_xtrabackup_is_awesome___"
+
+innobackupex_options="--compress --compress-threads=4 --compress-chunk-size=8K --encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
+
+data_decrypt_cmd="innobackupex --decrypt=${encrypt_algo} --encrypt-key=${encrypt_key} ./"
+data_decompress_cmd="innobackupex --decompress ./"
+
+. inc/ib_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_compress.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_compress.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_compress.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_compress.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,10 @@
+############################################################################
+# Test basic local backup with compression
+############################################################################
+
+require_qpress
+
+innobackupex_options="--compress --compress-threads=4 --compress-chunk-size=8K"
+data_decompress_cmd="innobackupex --decompress ./"
+
+. inc/ib_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_csm_csv.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_csm_csv.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_csm_csv.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_csm_csv.sh	2017-02-27 07:47:02.000000000 +0000
@@ -20,7 +20,7 @@
 
 vlog "Starting backup"
 innobackupex $topdir/backup
-full_backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{print $2}'`
+full_backup_dir=`grep "Backup created in directory" $OUTFILE | awk -F\' '{print $2}'`
 vlog "Full backup done to directory $full_backup_dir"
 
 # Saving the checksum of original table
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_databases_file.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_databases_file.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_databases_file.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_databases_file.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,56 @@
+########################################################################
+# Bug #569387: innobackupex ignores --databases
+#              Testcase covers using --databases option with InnoDB
+#              database (list is specified in file which option
+#              points to)
+########################################################################
+
+. inc/common.sh
+
+start_server --innodb-file-per-table
+
+cat <<EOF | run_cmd $MYSQL $MYSQL_ARGS
+
+	CREATE DATABASE test1;
+
+	CREATE TABLE test1.a (a INT PRIMARY KEY) engine=InnoDB;
+	CREATE TABLE test1.b (b INT PRIMARY KEY) engine=InnoDB;
+	CREATE TABLE test1.c (c INT PRIMARY KEY) engine=InnoDB;
+
+	CREATE TABLE test.a (a INT PRIMARY KEY) engine=InnoDB;
+	CREATE TABLE test.b (b INT PRIMARY KEY) engine=InnoDB;
+	CREATE TABLE test.c (c INT PRIMARY KEY) engine=InnoDB;
+
+EOF
+
+# Take a backup
+# Backup the whole test and b,c from test1
+cat >$topdir/databases_file <<EOF
+mysql
+performance_schema
+test
+test1.b
+test1.c
+EOF
+innobackupex --no-timestamp --databases=$topdir/databases_file $topdir/backup
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+stop_server
+
+# Restore partial backup
+# Remove database
+rm -rf $mysql_datadir/*
+vlog "Original database removed"
+
+# Restore database from backup
+innobackupex --copy-back $topdir/backup
+vlog "database restored from backup"
+
+start_server
+
+OUT=`run_cmd $MYSQL $MYSQL_ARGS -e "USE test; SHOW TABLES; USE test1; SHOW TABLES;" | tr -d '\n'`
+
+if [ $OUT != "Tables_in_testabcTables_in_test1bc" ] ; then
+	die "Backed up tables set doesn't match filter"
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_databases.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_databases.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_databases.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_databases.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,46 @@
+########################################################################
+# Bug #569387: innobackupex ignores --databases
+#              Testcase covers using --databases option with InnoDB
+#              database (list is specified in option itself)
+########################################################################
+
+. inc/common.sh
+
+start_server --innodb-file-per-table
+
+cat <<EOF | run_cmd $MYSQL $MYSQL_ARGS
+
+	CREATE DATABASE test1;
+
+	CREATE TABLE test1.a (a INT PRIMARY KEY);
+	CREATE TABLE test1.b (b INT PRIMARY KEY);
+	CREATE TABLE test1.c (c INT PRIMARY KEY);
+
+	CREATE TABLE test.a (a INT PRIMARY KEY);
+	CREATE TABLE test.b (b INT PRIMARY KEY);
+	CREATE TABLE test.c (c INT PRIMARY KEY);
+
+EOF
+
+innobackupex --no-timestamp --databases=test\ test1.b\ test1.c\ mysql\ performance_schema $topdir/backup
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+stop_server
+
+# Restore partial backup
+# Remove database
+rm -rf $mysql_datadir/*
+vlog "Original database removed"
+
+# Restore database from backup
+innobackupex --copy-back $topdir/backup
+vlog "database restored from backup"
+
+start_server
+
+OUT=`run_cmd $MYSQL $MYSQL_ARGS -e "USE test; SHOW TABLES; USE test1; SHOW TABLES;" | tr -d '\n'`
+
+if [ $OUT != "Tables_in_testabcTables_in_test1bc" ] ; then
+	die "Backed up tables set doesn't match filter"
+fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_encrypt.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,13 @@
+############################################################################
+# Test basic local backup with encryption
+############################################################################
+
+encrypt_algo="AES256"
+encrypt_key="percona_xtrabackup_is_awesome___"
+wrong_encrypt_key="Percona_XtraBackup_Is_Awesome___"
+
+innobackupex_options="--encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
+data_decrypt_cmd="innobackupex --decrypt=${encrypt_algo} --encrypt-key=${encrypt_key} ./"
+data_decrypt_cmd_wrong_passphrase="innobackupex --decrypt=${encrypt_algo} --encrypt-key=${wrong_encrypt_key} ./"
+
+. inc/ib_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_incremental_bitmap_lsn.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_incremental_bitmap_lsn.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_incremental_bitmap_lsn.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_incremental_bitmap_lsn.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,14 @@
+# Test for fast incremental backups with the --incremental-lsn option
+
+require_xtradb
+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb-track-changed-pages=TRUE
+"
+ib_inc_extra_args=
+ib_inc_use_lsn=1
+
+. inc/ib_incremental_common.sh
+
+check_bitmap_inc_backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_incremental_bitmap.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,7 @@
 # Test for incremental backups that use changed page bitmaps
 
 require_xtradb
+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb-track-changed-pages=TRUE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_incremental_force_full_scan.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,7 @@
 # Test for incremental backups that use forced full scan even when bitmaps are present
 
 require_xtradb
+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb-track-changed-pages=TRUE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_incremental_full_scan_lsn.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_incremental_full_scan_lsn.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_incremental_full_scan_lsn.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_incremental_full_scan_lsn.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,8 @@
+# Test incremental full scan backups with the --incremental-lsn option
+
+ib_inc_extra_args=
+ib_inc_use_lsn=1
+
+. inc/ib_incremental_common.sh
+
+check_full_scan_inc_backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_parallel_compress_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_parallel_compress_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_parallel_compress_encrypt.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_parallel_compress_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,14 @@
+############################################################################
+# Test basic local parallel backup with compression and encryption
+############################################################################
+
+require_qpress
+
+encrypt_algo="AES256"
+encrypt_key="percona_xtrabackup_is_awesome___"
+
+innobackupex_options="--parallel=8 --compress --compress-threads=4 --compress-chunk-size=8K --encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
+
+data_decrypt_cmd="innobackupex --decrypt=${encrypt_algo} --encrypt-key=${encrypt_key} --decompress --parallel=8 ./"
+
+. inc/ib_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_parallel_compress.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_parallel_compress.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_parallel_compress.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_parallel_compress.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,10 @@
+############################################################################
+# Test basic local parallel backup with compression
+############################################################################
+
+require_qpress
+
+innobackupex_options="--parallel=8 --compress --compress-threads=4 --compress-chunk-size=8K"
+data_decompress_cmd="innobackupex --decompress --parallel=8 ./"
+
+. inc/ib_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_parallel_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_parallel_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_parallel_encrypt.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_parallel_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,11 @@
+############################################################################
+# Test basic local parallel backup with encryption
+############################################################################
+
+encrypt_algo="AES256"
+encrypt_key="percona_xtrabackup_is_awesome___"
+
+innobackupex_options="--parallel=4 --encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
+data_decrypt_cmd="innobackupex --decrypt=${encrypt_algo} --encrypt-key=${encrypt_key} --parallel=4 ./"
+
+. inc/ib_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_part_tf_innodb.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_part_tf_innodb.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_part_tf_innodb.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_part_tf_innodb.sh	2017-02-27 07:47:02.000000000 +0000
@@ -30,7 +30,8 @@
 vlog "Backup taken"
 
 COUNT=`xtrabackup --stats --tables-file=$topdir/tables --datadir=$topdir/backup \
-       | grep table: | grep -v SYS_ | awk '{print $2}' | sort -u | wc -l`
+       | grep table: | grep -v mysql/ | grep -v SYS_ \
+       | awk '{print $2}' | sort -u | wc -l`
 echo "COUNT = $COUNT"
 if [ $COUNT != 5 ] ; then
 	vlog "xtrabackup --stats does not work"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_slave_info.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_slave_info.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_slave_info.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_slave_info.sh	2017-02-27 07:47:02.000000000 +0000
@@ -22,7 +22,7 @@
   $topdir/backup
 
 innobackupex --no-timestamp --slave-info $topdir/backup
-egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
+egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+$' \
     $topdir/backup/xtrabackup_binlog_info
 egrep -q '^CHANGE MASTER TO MASTER_LOG_FILE='\''mysql-bin.[0-9]+'\'', MASTER_LOG_POS=[0-9]+$' \
     $topdir/backup/xtrabackup_slave_info
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_specialchar.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_specialchar.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_specialchar.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_specialchar.sh	2017-02-27 07:47:02.000000000 +0000
@@ -15,7 +15,7 @@
 
 vlog "Starting innobackupex wrapper"
 innobackupex --password='$PASSWD' $topdir/backup
-backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
+backup_dir=`grep "Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
 
 run_cmd ${MYSQLADMIN} ${MYSQL_ARGS} -p'$PASSWD' password ''
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_stream_compress_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_stream_compress_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_stream_compress_encrypt.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_stream_compress_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -7,8 +7,8 @@
 encrypt_algo="AES256"
 encrypt_key="percona_xtrabackup_is_awesome___"
 stream_format=xbstream
-stream_extract_cmd="(xbcrypt -d -a $encrypt_algo -k $encrypt_key | xbstream -xv) <"
-stream_uncompress_cmd="innobackupex --decompress ./"
+stream_extract_cmd="xbstream -xv <"
+stream_uncompress_cmd="innobackupex --decompress --decrypt=$encrypt_algo --encrypt-key $encrypt_key ./"
 innobackupex_options="--compress --compress-threads=4 --compress-chunk-size=8K --encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
 
 . inc/ib_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_stream_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_stream_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_stream_encrypt.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_stream_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -5,7 +5,7 @@
 encrypt_algo="AES256"
 encrypt_key="percona_xtrabackup_is_awesome___"
 stream_format=xbstream
-stream_extract_cmd="(xbcrypt -d -a $encrypt_algo -k $encrypt_key | xbstream -xv) <"
+stream_extract_cmd="(xbstream -xv ; innobackupex --decrypt=$encrypt_algo --encrypt-key=$encrypt_key ./) <"
 innobackupex_options="--encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
 
 . inc/ib_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_stream_parallel_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_stream_parallel_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/ib_stream_parallel_encrypt.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/ib_stream_parallel_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -6,7 +6,7 @@
 encrypt_algo="AES256"
 encrypt_key="percona_xtrabackup_is_awesome___"
 stream_format=xbstream
-stream_extract_cmd="(xbcrypt -d -a $encrypt_algo -k $encrypt_key | xbstream -xv) <"
+stream_extract_cmd="(xbstream -xv ; innobackupex --decrypt=$encrypt_algo --encrypt-key=$encrypt_key ./) <"
 innobackupex_options="--parallel=16 --encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
 
 . inc/ib_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,33 @@
+##############################################################################
+# Test innodb_data_file_dir support
+##############################################################################
+
+. inc/common.sh
+
+mkdir -p ${TEST_VAR_ROOT}/dir/data
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_data_home_dir=${TEST_VAR_ROOT}/dir/data
+"
+
+start_server
+load_sakila
+
+checksum1=`checksum_table sakila payment`
+test -n "$checksum1" || die "Failed to checksum table sakila.payment"
+
+innobackupex --no-timestamp $topdir/backup
+
+stop_server
+
+rm -rf $MYSQLD_DATADIR/*
+rm -rf ${TEST_VAR_ROOT}/dir/data/*
+
+innobackupex --apply-log $topdir/backup
+innobackupex --copy-back $topdir/backup
+
+start_server
+
+checksum2=`checksum_table sakila payment`
+test -n "$checksum2" || die "Failed to checksum table sakila.payment"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/innodb_log_checksum_algorithm.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/innodb_log_checksum_algorithm.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/innodb_log_checksum_algorithm.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/innodb_log_checksum_algorithm.sh	2017-02-27 07:47:02.000000000 +0000
@@ -31,8 +31,9 @@
 
     rm -rf $MYSQLD_DATADIR/*
 
-    innobackupex --apply-log --defaults-file=$topdir/backup/backup-my.cnf \
-                 $topdir/backup
+    run_cmd ${IB_BIN} \
+        ${IB_ARGS/\/--defaults-file=*my.cnf/$topdir\/backup\/backup-my.cnf} \
+        --apply-log $topdir/backup
 
     innobackupex --copy-back $topdir/backup
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/innodb_page_size.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/innodb_page_size.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/innodb_page_size.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/innodb_page_size.sh	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,7 @@
 
 . inc/common.sh
 
-if ! is_server_version_higher_than 5.6.0 && ! is_xtradb
+if is_galera || ( ! is_server_version_higher_than 5.6.0 && ! is_xtradb )
 then
     skip_test "Requires either XtraDB or a 5.6 server"
 fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/kill_long_selects.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/kill_long_selects.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/kill_long_selects.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/kill_long_selects.sh	2017-02-27 07:47:02.000000000 +0000
@@ -4,6 +4,11 @@
 
 . inc/common.sh
 
+if [ ${ASAN_OPTIONS:-undefined} != "undefined" ]
+then
+    skip_test "Incompatible with AddressSanitizer"
+fi
+
 function bg_run()
 {
     local varname=$1
@@ -24,7 +29,7 @@
 function mysql_select()
 {
     vlog "Run select query with duration $1 seconds"
-    ${MYSQL} ${MYSQL_ARGS} -c test  2> /dev/null <<EOF
+    ${MYSQL} ${MYSQL_ARGS} -c test  <<EOF
         /* Run background /*SELECT*\  */
         (
          SELECT SLEEP($1) FROM t1 FOR UPDATE
@@ -38,7 +43,7 @@
 function mysql_update()
 {
     vlog "Run update query with duration $1 seconds"
-    ${MYSQL} ${MYSQL_ARGS} -c test 2> /dev/null <<EOF
+    ${MYSQL} ${MYSQL_ARGS} -c test <<EOF
         /* This is not SELECT but rather an /*UPDATE*\
         query  */
         UPDATE t1 SET a = SLEEP($1);
@@ -73,19 +78,25 @@
   # between SELECT and killall
   run_cmd $MYSQL $MYSQL_ARGS --force --batch  test <<EOF
   select concat('KILL ',id,';') from information_schema.processlist
-  where user='root' and time > 2 into outfile '$MYSQLD_TMPDIR/killall.sql';
+  where user='root' and time > 1 into outfile '$MYSQLD_TMPDIR/killall.sql';
   source $MYSQLD_TMPDIR/killall.sql;
 EOF
   rm -f $MYSQLD_TMPDIR/killall.sql
 }
 
+function wait_for_connection_count()
+{
+  n=$(($1 + 1))
+  for i in {1..200} ; do
+    count=`${MYSQL} ${MYSQL_ARGS} -N -e "SHOW PROCESSLIST" test | wc -l`
+    [ $count != $n ] || break
+    sleep 0.3
+  done
+}
+
 start_server --innodb_file_per_table
 
-if $MYSQL $MYSQL_ARGS -Ns -e "SHOW VARIABLES LIKE 'have_backup_locks'\G" \
-     2> /dev/null | egrep -q "^YES$"
-then
-    skip_test "Requires a server without backup locks support"
-fi
+has_backup_locks && skip_test "Requires a server without backup locks support"
 
 run_cmd $MYSQL $MYSQL_ARGS test <<EOF
 CREATE TABLE t1(a INT) ENGINE=InnoDB;
@@ -97,11 +108,9 @@
 # ==============================================================
 vlog "===================== case 1 ====================="
 bg_run bg_select_pid "mysql_select 3"
-bg_run bg_update_pid "sleep 1" "mysql_update 3"
+bg_run bg_update_pid "mysql_update 3"
 
-sleep 8
-
-innobackupex $topdir/full --kill-long-queries-timeout=10 \
+innobackupex $topdir/full --kill-long-queries-timeout=50 \
                           --kill-long-query-type=all
 
 bg_wait_ok $bg_select_pid
@@ -117,7 +126,8 @@
 #    it. then it may be still alive by the time of kill_all_queries
 vlog "===================== case 2 ====================="
 bg_run bg_select_pid "mysql_select 200"
-bg_run bg_update_pid "sleep 1" "mysql_update 5"
+bg_run bg_update_pid "mysql_update 5"
+wait_for_connection_count 2
 
 innobackupex $topdir/full --kill-long-queries-timeout=3 \
                           --kill-long-query-type=select
@@ -131,6 +141,7 @@
 vlog "===================== case 3 ====================="
 bg_run bg_select_pid "mysql_select 200"
 bg_run bg_update_pid "mysql_update 200"
+wait_for_connection_count 2
 
 innobackupex $topdir/full --kill-long-queries-timeout=3 \
                           --kill-long-query-type=all
@@ -144,13 +155,12 @@
 vlog "===================== case 4 ====================="
 bg_run bg_select_pid "mysql_select 200"
 bg_run bg_update_pid "mysql_update 200"
-
-sleep 1
+wait_for_connection_count 2
 
 run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \
-                          --lock-wait-timeout=3 \
-                          --lock-wait-query-type=all \
-                          --lock-wait-threshold=1 \
+                          --ftwrl-wait-timeout=3 \
+                          --ftwrl-wait-query-type=all \
+                          --ftwrl-wait-threshold=1 \
                           --kill-long-queries-timeout=1 \
                           --kill-long-query-type=all
 
@@ -163,13 +173,15 @@
 vlog "===================== case 5 ====================="
 bg_run bg_select_pid "mysql_select 200"
 bg_run bg_update_pid "mysql_update 200"
+wait_for_connection_count 2
 
-sleep 2
+# sleep at least --ftwrl-wait-threshold seconds
+sleep 1
 
 run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \
-                          --lock-wait-timeout=3 \
-                          --lock-wait-query-type=update \
-                          --lock-wait-threshold=2 \
+                          --ftwrl-wait-timeout=3 \
+                          --ftwrl-wait-query-type=update \
+                          --ftwrl-wait-threshold=1 \
                           --kill-long-queries-timeout=1 \
                           --kill-long-query-type=all
 
@@ -181,14 +193,17 @@
 # ==============================================================
 vlog "===================== case 6 ====================="
 bg_run bg_update_pid "mysql_update 5"
-bg_run bg_select_pid "sleep 1" "mysql_select 200"
+wait_for_connection_count 1
+bg_run bg_select_pid "mysql_select 200"
+wait_for_connection_count 2
 
-sleep 2
+# sleep at least --ftwrl-wait-threshold seconds
+sleep 1
 
 innobackupex $topdir/full \
-                          --lock-wait-timeout=6 \
-                          --lock-wait-query-type=update \
-                          --lock-wait-threshold=2 \
+                          --ftwrl-wait-timeout=6 \
+                          --ftwrl-wait-query-type=update \
+                          --ftwrl-wait-threshold=1 \
                           --kill-long-queries-timeout=1 \
                           --kill-long-query-type=all
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/pxb170-ib.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/pxb170-ib.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/pxb170-ib.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/pxb170-ib.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,45 @@
+############################################################################
+# PXB-170: xtrabackup should not allow to apply incremental backup on
+#          top of the backup prepared without --apply-log-only
+############################################################################
+
+. inc/common.sh
+
+start_server --innodb_file_per_table
+
+# full backup
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "CREATE TABLE t (a INT) ENGINE=InnoDB" test
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t values (1), (2), (3)" test
+innobackupex --no-timestamp $topdir/backup
+
+# incremental backup
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t values (11), (12), (13)" test
+innobackupex --no-timestamp --incremental \
+		--incremental-basedir=$topdir/backup \
+		$topdir/inc1
+
+# incremental backup
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t values (21), (22), (23)" test
+innobackupex --no-timestamp --incremental \
+		--incremental-basedir=$topdir/inc1 \
+		$topdir/inc2
+
+# incremental backup
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t values (31), (32), (33)" test
+innobackupex --no-timestamp --incremental \
+		--incremental-basedir=$topdir/inc2 \
+		$topdir/inc3
+
+# prepare
+innobackupex --apply-log --redo-only $topdir/backup
+grep log-applied $topdir/backup/xtrabackup_checkpoints
+
+innobackupex --apply-log --redo-only \
+			--incremental-dir=$topdir/inc1 $topdir/backup
+grep log-applied $topdir/backup/xtrabackup_checkpoints
+
+innobackupex --apply-log --incremental-dir=$topdir/inc2 $topdir/backup
+grep full-prepared $topdir/backup/xtrabackup_checkpoints
+
+run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} --apply-log \
+			--incremental-dir=$topdir/inc3 $topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/pxb170.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/pxb170.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/pxb170.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/pxb170.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,39 @@
+############################################################################
+# PXB-170: xtrabackup should not allow to apply incremental backup on
+#          top of the backup prepared without --apply-log-only
+############################################################################
+
+. inc/common.sh
+
+start_server --innodb_file_per_table
+
+# full backup
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "CREATE TABLE t (a INT) ENGINE=InnoDB" test
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t values (1), (2), (3)" test
+innobackupex --no-timestamp $topdir/backup
+
+# incremental backup
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t values (11), (12), (13)" test
+innobackupex --no-timestamp --incremental \
+		--incremental-basedir=$topdir/backup \
+		$topdir/inc1
+
+# incremental backup
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t values (21), (22), (23)" test
+innobackupex --no-timestamp --incremental \
+		--incremental-basedir=$topdir/inc1 \
+		$topdir/inc2
+
+# prepare
+xtrabackup --prepare --apply-log-only --target-dir=$topdir/backup
+grep log-applied $topdir/backup/xtrabackup_checkpoints
+
+xtrabackup --prepare --apply-log-only --incremental-dir=$topdir/inc1 \
+		--target-dir=$topdir/backup
+grep log-applied $topdir/backup/xtrabackup_checkpoints
+
+xtrabackup --prepare --incremental-dir=$topdir/inc2 --target-dir=$topdir/backup
+grep full-prepared $topdir/backup/xtrabackup_checkpoints
+
+run_cmd_expect_failure ${XB_BIN} ${XB_ARGS} --prepare \
+		--incremental-dir=$topdir/inc2 --target-dir=$topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/remote_tablespaces.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/remote_tablespaces.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/remote_tablespaces.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/remote_tablespaces.sh	2017-02-27 07:47:02.000000000 +0000
@@ -8,7 +8,7 @@
 
 start_server --innodb_file_per_table
 
-remote_dir=$TEST_VAR_ROOT/var1/remote_dir
+remote_dir=$TEST_VAR_ROOT/var1/remote_dir/subdir
 
 $MYSQL $MYSQL_ARGS test <<EOF
 CREATE TABLE t(id INT AUTO_INCREMENT PRIMARY KEY, c INT)
@@ -16,6 +16,14 @@
 INSERT INTO t(c) VALUES (1), (2), (3), (4), (5), (6), (7), (8);
 EOF
 
+for ((i=0; i<12; i++))
+do
+    $MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t$i(id INT AUTO_INCREMENT PRIMARY KEY, c INT)
+  DATA DIRECTORY = '$remote_dir' ENGINE=InnoDB;
+EOF
+done
+
 # Generate some log data, as we also want to test recovery of remote tablespaces
 for ((i=0; i<12; i++))
 do
@@ -31,19 +39,42 @@
 stop_server
 
 rm -rf $mysql_datadir/*
+rm -rf $remote_dir
 
 innobackupex --apply-log $topdir/backup
-innobackupex --copy-back $topdir/backup
 
-start_server
+for cmd in "--copy-back" "--move-back" ; do
+
+    innobackupex $cmd $topdir/backup
 
-checksum_b=`checksum_table test t`
+    if [ ! -f $remote_dir/test/t.ibd ] ; then
+        vlog "Tablepace $remote_dir/t.ibd is missing!"
+        exit -1
+    fi
 
-vlog "Old checksum: $checksum_a"
-vlog "New checksum: $checksum_b"
+    for ((i=0; i<12; i++)) ; do
+        if [ ! -f $remote_dir/test/t$i.ibd ] ; then
+            vlog "Tablepace $remote_dir/t$i.ibd is missing!"
+            exit -1
+        fi
+    done
 
-if [ "$checksum_a" != "$checksum_b"  ]
-then
-    vlog "Checksums do not match"
-    exit -1
-fi
+    start_server
+
+    checksum_b=`checksum_table test t`
+
+    vlog "Old checksum: $checksum_a"
+    vlog "New checksum: $checksum_b"
+
+    if [ "$checksum_a" != "$checksum_b"  ]
+    then
+        vlog "Checksums do not match"
+        exit -1
+    fi
+
+    stop_server
+
+    rm -rf $mysql_datadir/*
+    rm -rf $remote_dir
+
+done
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/skip-secure-auth.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/skip-secure-auth.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/skip-secure-auth.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/skip-secure-auth.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,28 @@
+#
+# Option --[skip]-secure-auth
+#
+
+require_server_version_lower_than 5.6.0
+
+start_server
+
+run_cmd $MYSQL $MYSQL_ARGS <<EOF
+
+SET SESSION old_passwords= 1;
+
+CREATE USER 'pxb'@'localhost';
+SET PASSWORD FOR 'pxb'@'localhost' = PASSWORD('123456');
+GRANT ALL PRIVILEGES ON *.* TO 'pxb'@'localhost' WITH GRANT OPTION;
+
+EOF
+
+run_cmd_expect_failure $XB_BIN $XB_ARGS --backup --target-dir=$topdir/backup \
+					--user=pxb --password=123456
+
+xtrabackup --backup --target-dir=$topdir/backup --user=pxb --password=123456 \
+	   --skip-secure-auth
+
+run_cmd_expect_failure $IB_BIN $IB_ARGS --user=pxb \
+					--password=123456 $topdir/backup
+
+innobackupex --user=pxb --password=123456 --skip-secure-auth $topdir/backup
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/throttle.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/throttle.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/throttle.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/throttle.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,8 @@
+#
+# Simple test case for throttle
+#
+
+start_server
+
+xtrabackup --backup --throttle=20 --target-dir=$topdir/backup
+
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh	2017-02-27 07:47:02.000000000 +0000
@@ -261,7 +261,7 @@
 	#########################################
 	# Apply logs only to the remembered lsn #
 	#########################################
-	# --apply-logs-only is set implicitly because unfinished transactions
+	# --apply-log-only is set implicitly because unfinished transactions
 	# can be finished on further logs applying but using this option with
 	# --innodb-log-arch-dir is tested here to prove this bug
 	# https://bugs.launchpad.net/percona-xtrabackup/+bug/1199555 is not
@@ -271,7 +271,7 @@
 		   --target-dir=$BACKUP_DIR \
 		   --innodb-log-arch-dir=$ARCHIVED_LOGS_DIR \
 		   --to-archived-lsn=$LSN \
-		   --apply-logs-only \
+		   --apply-log-only \
 		   $XTRABACKUP_OPTIONS
 	#Copy prepared data to server data dir
 	cp -R $BACKUP_DIR/* $mysql_datadir
@@ -294,7 +294,7 @@
 	xtrabackup --prepare \
 		   --target-dir=$BACKUP_DIR \
 		   --innodb-log-arch-dir=$ARCHIVED_LOGS_DIR \
-		   --apply-logs-only \
+		   --apply-log-only \
 		   $XTRABACKUP_OPTIONS
 	#Copy prepared data to server data dir
 	cp -R $BACKUP_DIR/* $mysql_datadir
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xbcloud.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xbcloud.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xbcloud.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xbcloud.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,105 @@
+################################################################################
+# Test xbcloud
+#
+# Set following environment variables to enable this test:
+#     XBCLOUD_CREDENTIALS
+#
+# Example:
+#     export XBCLOUD_CREDENTIALS="--storage=swift \
+#         --swift-url=http://192.168.8.80:8080/ \
+#         --swift-user=test:tester 
+#         --swift-key=testing"
+#
+################################################################################
+
+. inc/common.sh
+
+# run this test only when backing up PS 5.6
+require_xtradb
+require_server_version_lower_than 5.7.0
+require_server_version_higher_than 5.6.0
+is_galera && skip_test "skipping"
+
+[ "${XBCLOUD_CREDENTIALS:-unset}" == "unset" ] && \
+	skip_test "Requires XBCLOUD_CREDENTIALS"
+
+start_server --innodb_file_per_table
+
+# write credentials into ~/.my.cnf
+echo '[xbcloud]' > $topdir/xbcloud.cnf
+echo ${XBCLOUD_CREDENTIALS} | sed 's/ *--/\'$'\n/g' >> $topdir/xbcloud.cnf
+
+load_dbase_schema sakila
+load_dbase_data sakila
+
+now=$(date +%s)
+pwdpart=$(pwd | sed 's/\//-/g')
+
+full_backup_name=${now}-${pwdpart}-full_backup
+inc_backup_name=${now}-${pwdpart}-inc_backup
+
+full_backup_dir=$topdir/${full_backup_name}
+inc_backup_dir=$topdir/${inc_backup_name}
+
+vlog "take full backup"
+
+xtrabackup --backup --stream=xbstream --extra-lsndir=$full_backup_dir \
+	--target-dir=$full_backup_dir | xbcloud put \
+	--defaults-file=$topdir/xbcloud.cnf \
+	--swift-container=test_backup \
+	--parallel=4 \
+	${full_backup_name}
+
+vlog "take incremental backup"
+
+xtrabackup --backup --incremental-basedir=$full_backup_dir \
+	--stream=xbstream --target-dir=inc_backup_dir | xbcloud put \
+	--defaults-file=$topdir/xbcloud.cnf \
+	--swift-container=test_backup \
+	${inc_backup_name}
+
+vlog "download and prepare"
+
+mkdir $topdir/downloaded_full
+mkdir $topdir/downloaded_inc
+
+run_cmd xbcloud get --defaults-file=$topdir/xbcloud.cnf \
+	--swift-container=test_backup \
+	${full_backup_name} | xbstream -xv -C $topdir/downloaded_full
+
+xtrabackup --prepare --apply-log-only --target-dir=$topdir/downloaded_full
+
+run_cmd xbcloud get --defaults-file=$topdir/xbcloud.cnf \
+	--swift-container=test_backup \
+	${inc_backup_name} | xbstream -xv -C $topdir/downloaded_inc
+
+xtrabackup --prepare --apply-log-only \
+	--target-dir=$topdir/downloaded_full \
+	--incremental-dir=$topdir/downloaded_inc
+
+xtrabackup --prepare --target-dir=$topdir/downloaded_full
+
+# test partial download
+
+mkdir $topdir/partial
+
+run_cmd xbcloud get --defaults-file=$topdir/xbcloud.cnf \
+	--swift-container=test_backup \
+	${full_backup_name} ibdata1 sakila/payment.ibd \
+	> $topdir/partial/partial.xbs
+
+xbstream -xv -C $topdir/partial < $topdir/partial/partial.xbs \
+				2>$topdir/partial/partial.list
+
+diff -u $topdir/partial/partial.list - <<EOF
+ibdata1
+sakila/payment.ibd
+EOF
+
+# cleanup
+run_cmd xbcloud delete --defaults-file=$topdir/xbcloud.cnf \
+	--swift-container=test_backup \
+	${full_backup_name}
+run_cmd xbcloud delete --defaults-file=$topdir/xbcloud.cnf \
+	--swift-container=test_backup \
+	${inc_backup_name}
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_compress_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_compress_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_compress_encrypt.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_compress_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -7,9 +7,9 @@
 encrypt_algo="AES256"
 encrypt_key="percona_xtrabackup_is_awesome___"
 
-innobackupex_options="--compress --compress-threads=4 --compress-chunk-size=8K --encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
+xtrabackup_options="--compress --compress-threads=4 --compress-chunk-size=8K --encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
 
-data_decrypt_cmd="innobackupex --decrypt=${encrypt_algo} --encrypt-key=${encrypt_key} ./"
-data_decompress_cmd="innobackupex --decompress ./"
+data_decrypt_cmd="xtrabackup --decrypt=${encrypt_algo} --encrypt-key=${encrypt_key} --target-dir=./"
+data_decompress_cmd="xtrabackup --decompress --target-dir=./"
 
 . inc/xb_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_compress.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_compress.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_compress.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_compress.sh	2017-02-27 07:47:02.000000000 +0000
@@ -4,7 +4,7 @@
 
 require_qpress
 
-innobackupex_options="--compress --compress-threads=4 --compress-chunk-size=8K"
-data_decompress_cmd="innobackupex --decompress ./"
+xtrabackup_options="--compress --compress-threads=4 --compress-chunk-size=8K"
+data_decompress_cmd="xtrabackup --decompress --target-dir=./"
 
 . inc/xb_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_databases_options.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_databases_options.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_databases_options.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_databases_options.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,218 @@
+########################################################################
+# Bug #569387: xtrabackup ignores --databases, i.e. when --databases
+#
+# Test following xtrabackup options
+# --databases
+# --databases-file
+# --tables
+# --tables-file
+########################################################################
+
+. inc/common.sh
+
+start_server --innodb-file-per-table
+
+function setup_test {
+
+	cat <<EOF | run_cmd $MYSQL $MYSQL_ARGS
+
+		create database database1;
+		create database database2;
+		create database test1;
+		create database test2;
+		create database thisisadatabase;
+		create database testdatabase;
+
+		create table database1.thisisatable (a int primary key) engine=InnoDB;
+		create table database1.t (a int primary key) engine=InnoDB;
+		create table database1.t1 (a int primary key) engine=InnoDB;
+		create table database1.t2 (a int primary key) engine=InnoDB;
+		create table database1.ancor (a int primary key) engine=InnoDB;
+		create table database1.glow (a int primary key) engine=InnoDB;
+
+		create table database2.thisisatable (a int primary key) engine=InnoDB;
+		create table database2.t (a int primary key) engine=InnoDB;
+		create table database2.t1 (a int primary key) engine=InnoDB;
+		create table database2.t2 (a int primary key) engine=InnoDB;
+		create table database2.ancor (a int primary key) engine=InnoDB;
+		create table database2.glow (a int primary key) engine=InnoDB;
+
+		create table test1.thisisatable (a int primary key) engine=InnoDB;
+		create table test1.t (a int primary key) engine=InnoDB;
+		create table test1.t1 (a int primary key) engine=InnoDB;
+		create table test1.t2 (a int primary key) engine=InnoDB;
+		create table test1.ancor (a int primary key) engine=InnoDB;
+		create table test1.glow (a int primary key) engine=InnoDB;
+
+		create table test2.thisisatable (a int primary key) engine=InnoDB;
+		create table test2.t (a int primary key) engine=InnoDB;
+		create table test2.t1 (a int primary key) engine=InnoDB;
+		create table test2.t2 (a int primary key) engine=InnoDB;
+		create table test2.ancor (a int primary key) engine=InnoDB;
+		create table test2.glow (a int primary key) engine=InnoDB;
+
+		create table thisisadatabase.thisisatable (a int primary key) engine=InnoDB;
+		create table thisisadatabase.t (a int primary key) engine=InnoDB;
+		create table thisisadatabase.t1 (a int primary key) engine=InnoDB;
+		create table thisisadatabase.t2 (a int primary key) engine=InnoDB;
+		create table thisisadatabase.ancor (a int primary key) engine=InnoDB;
+		create table thisisadatabase.glow (a int primary key) engine=InnoDB;
+
+		create table testdatabase.thisisatable (a int primary key) engine=InnoDB;
+		create table testdatabase.t (a int primary key) engine=InnoDB;
+		create table testdatabase.t1 (a int primary key) engine=InnoDB;
+		create table testdatabase.t2 (a int primary key) engine=InnoDB;
+		create table testdatabase.ancor (a int primary key) engine=InnoDB;
+		create table testdatabase.glow (a int primary key) engine=InnoDB;
+
+EOF
+
+}
+
+function ls_dir {
+	( cd $1 ; find . -name '*.ibd' -type f | sort -d )
+}
+
+setup_test
+
+backup_dir=$topdir/backup_dir
+mkdir -p $backup_dir
+
+# invalid characters
+xtrabackup --backup --databases=a/b/c --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is not valid'
+
+# too long name
+xtrabackup --backup --databases=verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is too long'
+
+# too long name
+xtrabackup --backup --databases=test1.verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is too long'
+
+# not fully qualified name
+xtrabackup --backup --tables-file=<(echo verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow) --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is not fully qualified'
+
+# again too long name
+xtrabackup --backup --tables-file=<(echo test1.verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow) --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is too long'
+
+# should go fine, we cannot validate regex against length
+xtrabackup --backup --tables=verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir
+rm -rf $backup_dir/*
+
+# should go fine, we cannot validate regex against length
+xtrabackup --backup --tables=test1.verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir
+rm -rf $backup_dir/*
+
+vlog "Testing with --databases=..."
+$XB_BIN $XB_ARGS --backup --databases='database database2 test1.t test1.ancor thisisadatabase testdatabase.t testdatabase.t7' --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+./database2/ancor.ibd
+./database2/glow.ibd
+./database2/t1.ibd
+./database2/t2.ibd
+./database2/thisisatable.ibd
+./database2/t.ibd
+./test1/ancor.ibd
+./test1/t.ibd
+./testdatabase/t.ibd
+./thisisadatabase/ancor.ibd
+./thisisadatabase/glow.ibd
+./thisisadatabase/t1.ibd
+./thisisadatabase/t2.ibd
+./thisisadatabase/thisisatable.ibd
+./thisisadatabase/t.ibd
+EOF
+rm -rf $backup_dir/*
+
+vlog "Testing with --databases-file=..."
+cat >$topdir/list <<EOF
+database
+database2
+test1.t
+test1.ancor
+thisisadatabase
+testdatabase.t
+testdatabase.t7
+EOF
+xtrabackup --backup --databases-file=$topdir/list --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+./database2/ancor.ibd
+./database2/glow.ibd
+./database2/t1.ibd
+./database2/t2.ibd
+./database2/thisisatable.ibd
+./database2/t.ibd
+./test1/ancor.ibd
+./test1/t.ibd
+./testdatabase/t.ibd
+./thisisadatabase/ancor.ibd
+./thisisadatabase/glow.ibd
+./thisisadatabase/t1.ibd
+./thisisadatabase/t2.ibd
+./thisisadatabase/thisisatable.ibd
+./thisisadatabase/t.ibd
+EOF
+rm -rf $backup_dir/*
+
+vlog "Testing failure with --tables-file=..."
+cat >$topdir/list <<EOF
+database
+database2
+test1.t
+test1.ancor
+thisisadatabase
+testdatabase.t
+testdatabase.t7
+EOF
+run_cmd_expect_failure $XB_BIN $XB_ARGS --backup --tables-file=$topdir/list --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+EOF
+rm -rf $backup_dir/*
+
+vlog "Testing with --tables-file=..."
+cat >$topdir/list <<EOF
+test1.t
+test1.ancor
+testdatabase.t
+testdatabase.t7
+EOF
+xtrabackup --backup --tables-file=$topdir/list --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+./test1/ancor.ibd
+./test1/t.ibd
+./testdatabase/t.ibd
+EOF
+rm -rf $backup_dir/*
+
+vlog "Testing with --tables=..."
+xtrabackup --backup --tables='dat.base,test1.t,test1.a' --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+./database1/ancor.ibd
+./database1/glow.ibd
+./database1/t1.ibd
+./database1/t2.ibd
+./database1/thisisatable.ibd
+./database1/t.ibd
+./database2/ancor.ibd
+./database2/glow.ibd
+./database2/t1.ibd
+./database2/t2.ibd
+./database2/thisisatable.ibd
+./database2/t.ibd
+./test1/ancor.ibd
+./test1/t1.ibd
+./test1/t2.ibd
+./test1/thisisatable.ibd
+./test1/t.ibd
+./testdatabase/ancor.ibd
+./testdatabase/glow.ibd
+./testdatabase/t1.ibd
+./testdatabase/t2.ibd
+./testdatabase/thisisatable.ibd
+./testdatabase/t.ibd
+./thisisadatabase/ancor.ibd
+./thisisadatabase/glow.ibd
+./thisisadatabase/t1.ibd
+./thisisadatabase/t2.ibd
+./thisisadatabase/thisisatable.ibd
+./thisisadatabase/t.ibd
+EOF
+rm -rf $backup_dir/*
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_encrypt.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -4,8 +4,10 @@
 
 encrypt_algo="AES256"
 encrypt_key="percona_xtrabackup_is_awesome___"
+wrong_encrypt_key="Percona_XtraBackup_Is_Awesome___"
 
-innobackupex_options="--encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
-data_decrypt_cmd="innobackupex --decrypt=${encrypt_algo} --encrypt-key=${encrypt_key} ./"
+xtrabackup_options="--encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
+data_decrypt_cmd="xtrabackup --decrypt=${encrypt_algo} --encrypt-key=${encrypt_key} --target-dir=./"
+data_decrypt_cmd_wrong_passphrase="xtrabackup --decrypt=${encrypt_algo} --encrypt-key=${wrong_encrypt_key} --target-dir=./"
 
 . inc/xb_local.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_galera_info.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_galera_info.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_galera_info.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_galera_info.sh	2017-02-27 07:47:02.000000000 +0000
@@ -16,11 +16,33 @@
                  --wsrep_cluster_address=gcomm:// --wsrep_node_address=$ADDR
 fi
 
-
-innobackupex --no-timestamp --galera-info $topdir/backup 
 backup_dir=$topdir/backup
+backup_dir1=$topdir/backup1
+
+xtrabackup --backup --galera-info --target-dir=$backup_dir
+
+xtrabackup --backup --galera-info --target-dir=$backup_dir1  --incremental-basedir=$backup_dir
+
 vlog "Backup created in directory $backup_dir"
-if [[ "`${MYSQL} ${MYSQL_ARGS} -Ns -e 'SHOW STATUS LIKE "wsrep_local_state_uuid"'|awk {'print $2'}`" == "`sed  -re 's/:.+$//' $topdir/backup/xtrabackup_galera_info`" && "`${MYSQL} ${MYSQL_ARGS} -Ns -e 'SHOW STATUS LIKE "wsrep_last_committed"'|awk {'print $2'}`" == "`sed  -re 's/^.+://' $topdir/backup/xtrabackup_galera_info`" ]]
+
+# Test if backup locks are supported by the server and thus, whether
+# xtrabackup_galera_info should be created on the backup or prepare stage
+if has_backup_locks
+then
+    vlog "Preparing the backup to create xtrabackup_galera_info"
+    xtrabackup --prepare --apply-log-only --target-dir=$backup_dir
+
+    # bug 1643803: incremental backups do not include xtrabackup_binlog_info and xtrabackup_galera_info
+    test -f $backup_dir/xtrabackup_galera_info ||
+      die "xtrabackup_galera_info was not created"
+
+    xtrabackup --prepare --target-dir=$backup_dir --incremental-dir=$backup_dir1
+fi
+
+test -f $backup_dir/xtrabackup_galera_info ||
+  die "xtrabackup_galera_info was not created"
+
+if [[ "`${MYSQL} ${MYSQL_ARGS} -Ns -e 'SHOW STATUS LIKE "wsrep_local_state_uuid"'|awk {'print $2'}`" == "`sed  -re 's/:.+$//' $backup_dir/xtrabackup_galera_info`" && "`${MYSQL} ${MYSQL_ARGS} -Ns -e 'SHOW STATUS LIKE "wsrep_last_committed"'|awk {'print $2'}`" == "`sed  -re 's/^.+://' $backup_dir/xtrabackup_galera_info`" ]]
 then
 	vlog "File is written correctly"
 else
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_galera_sst.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_galera_sst.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_galera_sst.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_galera_sst.sh	2017-02-27 07:47:02.000000000 +0000
@@ -33,7 +33,7 @@
                      --wsrep_sst_receive_address=$recv_addr1 \
                      --wsrep_node_incoming_address=$ADDR \
                      --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr1${pdebug}" \
-                     --wsrep_sst_method=xtrabackup \
+                     --wsrep_sst_method=xtrabackup-v2 \
                      --wsrep_sst_auth=$SUSER:$SSTPASS  \
                      --wsrep_node_address=$ADDR $debug 
 
@@ -51,7 +51,7 @@
                      --wsrep_sst_receive_address=$recv_addr2 \
                      --wsrep_node_incoming_address=$ADDR \
                      --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr2${pdebug}" \
-                     --wsrep_sst_method=xtrabackup \
+                     --wsrep_sst_method=xtrabackup-v2 \
                      --wsrep_sst_auth=$SUSER:$SSTPASS  \
                      --wsrep_node_address=$ADDR $debug
 switch_server $node2
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_bitmap_misc.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,7 @@
 # Test diagnostics for missing bitmap data and --incremental-force-scan option
 
 require_xtradb
+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
 
 . inc/common.sh
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_16kb.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,7 @@
 # Test incremental backups that use bitmaps with 16KB compressed pages
 
 require_xtradb
+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb-track-changed-pages=TRUE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_1kb.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,7 @@
 # Test incremental backups that use bitmaps with 1KB compressed pages
 
 require_xtradb
+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb-track-changed-pages=TRUE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_2kb.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,7 @@
 # Test incremental backups that use bitmaps with 2KB compressed pages
 
 require_xtradb
+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb-track-changed-pages=TRUE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_4kb.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,7 @@
 # Test incremental backups that use bitmaps with 4KB compressed pages
 
 require_xtradb
+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb-track-changed-pages=TRUE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed_bitmap_8kb.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,7 @@
 # Test incremental backups that use bitmaps with 8KB compressed pages
 
 require_xtradb
+is_64bit || skip_test "Disabled on 32-bit hosts due to LP bug #1359182"
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
 innodb-track-changed-pages=TRUE
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed.inc percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed.inc
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_incremental_compressed.inc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_incremental_compressed.inc	2017-02-27 07:47:02.000000000 +0000
@@ -6,8 +6,8 @@
 #                       Use this to set special options that influence 
 #                       incremental backups, e.g. turns on log archiving or 
 #                       changed page bitmap output.
-#    first_inc_suspend_command: if non-empty string, passes --suspend-at-start 
-#                               to incremental XB invocation and executes the 
+#    first_inc_suspend_command: if non-empty string, suspends incremental XB
+#                               invocation at start and executes the 
 #                               given command while it's suspended
 
 . inc/common.sh
@@ -106,7 +106,7 @@
 
   if [ -n "$first_inc_suspend_command" ]
   then
-      suspend_arg="--suspend_at_start";
+      suspend_arg="--debug-sync=xtrabackup_suspend_at_start";
   else
       suspend_arg="";
   fi
@@ -120,10 +120,10 @@
 
   if [ -n "$first_inc_suspend_command" ]
   then
-      wait_for_xb_to_suspend $topdir/data/delta/xtrabackup_suspended_1
+      wait_for_xb_to_suspend $topdir/data/delta/xtrabackup_debug_sync
       ${MYSQL} ${MYSQL_ARGS} -e "$first_inc_suspend_command"
 
-      resume_suspended_xb $topdir/data/delta/xtrabackup_suspended_1
+      resume_suspended_xb $topdir/data/delta/xtrabackup_debug_sync
   fi
 
   wait $xb_pid
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_log_overwrap.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_log_overwrap.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_log_overwrap.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_log_overwrap.sh	2017-02-27 07:47:02.000000000 +0000
@@ -33,7 +33,5 @@
 vlog "Resuming xtrabackup"
 kill -SIGCONT $xb_pid
 
-resume_suspended_xb $topdir/backup/xtrabackup_suspended_2
-
 # wait's return code will be the code returned by the background process
 run_cmd wait $job_pid
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_parallel.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_parallel.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_parallel.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_parallel.sh	2017-02-27 07:47:02.000000000 +0000
@@ -9,7 +9,7 @@
 vlog "Creating the backup directory: $topdir/backup"
 mkdir -p $topdir/backup
 innobackupex $topdir/backup --parallel=8
-backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
+backup_dir=`grep "Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
 
 #echo "Backup dir in $backup_dir"
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_print_param.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_print_param.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_print_param.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_print_param.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,46 @@
+########################################################################
+# Tests for xtrabackup --print-param
+########################################################################
+
+my_cnf="[mysqld]
+datadir=/some/data/dir
+tmpdir=/some/tmp/dir1:/some/tmp/dir2
+innodb_data_home_dir=/some/innodb/dir
+innodb_data_file_path=ibdata1:10M;ibdata2:5M:autoextend
+innodb_log_group_home_dir=/some/log/dir
+innodb_log_files_in_group=3
+innodb_log_file_size=5M
+innodb_flush_method=O_DIRECT
+innodb_page_size=4K
+innodb_fast_checksum=1
+innodb_log_block_size=4K
+innodb_doublewrite_file=/some/doublewrite/file
+innodb_undo_directory=/some/undo/directory
+innodb_undo_tablespaces=8
+innodb_checksum_algorithm=strict_crc32
+innodb_log_checksum_algorithm=none
+innodb_buffer_pool_filename=/some/buffer/pool/file"
+
+echo "$my_cnf" >$topdir/my.cnf
+
+diff -u <($XB_BIN --defaults-file=$topdir/my.cnf --print-param) - <<EOF
+# This MySQL options file was generated by XtraBackup.
+[mysqld]
+datadir=/some/data/dir
+tmpdir=/some/tmp/dir1:/some/tmp/dir2
+innodb_data_home_dir=/some/innodb/dir
+innodb_data_file_path=ibdata1:10M;ibdata2:5M:autoextend
+innodb_log_group_home_dir=/some/log/dir
+innodb_log_files_in_group=3
+innodb_log_file_size=5242880
+innodb_flush_method=O_DIRECT
+innodb_page_size=4096
+innodb_fast_checksum=1
+innodb_log_block_size=4096
+innodb_doublewrite_file=/some/doublewrite/file
+innodb_undo_directory=/some/undo/directory
+innodb_undo_tablespaces=8
+innodb_checksum_algorithm=strict_crc32
+innodb_log_checksum_algorithm=none
+innodb_buffer_pool_filename=/some/buffer/pool/file
+EOF
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_remove_original.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_remove_original.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_remove_original.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_remove_original.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,42 @@
+#
+# Test for --remove-original option
+#
+
+start_server --innodb_file_per_table
+
+$MYSQL $MYSQL_ARGS -e "CREATE TABLE t1 (a INT) engine=InnoDB" test
+$MYSQL $MYSQL_ARGS -e "INSERT INTO t1 VALUES (1), (2), (3), (4)" test
+
+xtrabackup --backup --encrypt=AES256 \
+	   --encrypt-key=percona_xtrabackup_is_awesome___ \
+	   --encrypt-threads=4 --encrypt-chunk-size=8K \
+	   --compress --target-dir=$topdir/backup
+
+cp -r $topdir/backup $topdir/backup1
+
+run_cmd $XB_BIN --decrypt=AES256 --encrypt-key=percona_xtrabackup_is_awesome___ \
+		--parallel=4 --encrypt-chunk-size=8K \
+		--target-dir=$topdir/backup1
+
+test -f $topdir/backup1/test/t1.ibd.qp.xbcrypt || die "Files removed"
+
+rm -rf $topdir/backup1
+cp -r $topdir/backup $topdir/backup1
+
+run_cmd $XB_BIN --decrypt=AES256 --encrypt-key=percona_xtrabackup_is_awesome___ \
+		--parallel=4 --encrypt-chunk-size=8K \
+		--remove-original \
+		--target-dir=$topdir/backup1
+
+test -f $topdir/backup1/test/t1.ibd.qp.xbcrypt && die "Files not removed"
+
+rm -rf $topdir/backup1
+cp -r $topdir/backup $topdir/backup1
+
+run_cmd_expect_failure $XB_BIN --decrypt=AES256 \
+			       --encrypt-key=percona_xtrabackup_Is_awesome___ \
+			       --parallel=4 --encrypt-chunk-size=8K \
+			       --remove-original \
+			       --target-dir=$topdir/backup1
+
+test -f $topdir/backup1/test/t1.ibd.qp.xbcrypt || die "Files removed"
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stats.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stats.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stats.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stats.sh	2017-02-27 07:47:02.000000000 +0000
@@ -9,7 +9,7 @@
 mkdir -p $topdir/backup
 xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/backup
 vlog "Backup taken, trying stats"
-xtrabackup --datadir=$mysql_datadir --prepare --target-dir=$topdir/backup
+xtrabackup --datadir=$mysql_datadir --prepare --apply-log-only --target-dir=$topdir/backup
 
 # First check that xtrabackup fails with the correct error message
 # when trying to get stats before creating the log files
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_compress_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_compress_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_compress_encrypt.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_compress_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,14 @@
+############################################################################
+# Test streaming + compression + encryption
+############################################################################
+
+require_qpress
+
+encrypt_algo="AES256"
+encrypt_key="percona_xtrabackup_is_awesome___"
+stream_format=xbstream
+stream_extract_cmd="xbstream -xv <"
+stream_uncompress_cmd="xtrabackup --decompress --decrypt=$encrypt_algo --encrypt-key=$encrypt_key --target-dir=./"
+xtrabackup_options="--compress --compress-threads=4 --compress-chunk-size=8K --encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
+
+. inc/xb_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_compress.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_compress.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_compress.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_compress.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,12 @@
+############################################################################
+# Test streaming + compression
+############################################################################
+
+require_qpress
+
+stream_format=xbstream
+stream_extract_cmd="xbstream -xv <"
+stream_uncompress_cmd="xtrabackup --decompress --target-dir=./"
+xtrabackup_options="--compress --compress-threads=4 --compress-chunk-size=8K"
+
+. inc/xb_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_encrypt.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,11 @@
+############################################################################
+# Test streaming + encryption
+############################################################################
+
+encrypt_algo="AES256"
+encrypt_key="percona_xtrabackup_is_awesome___"
+stream_format=xbstream
+stream_extract_cmd="(xbstream -xv ; xtrabackup --decrypt=$encrypt_algo --encrypt-key=$encrypt_key --target-dir=./) <"
+xtrabackup_options="--encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
+
+. inc/xb_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_parallel_encrypt.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_parallel_encrypt.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_parallel_encrypt.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_parallel_encrypt.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,12 @@
+############################################################################
+# Test streaming + parallel + encryption
+############################################################################
+
+
+encrypt_algo="AES256"
+encrypt_key="percona_xtrabackup_is_awesome___"
+stream_format=xbstream
+stream_extract_cmd="(xbstream -xv ; xtrabackup --decrypt=$encrypt_algo --encrypt-key=$encrypt_key --target-dir=./) <"
+xtrabackup_options="--parallel=16 --encrypt=$encrypt_algo --encrypt-key=$encrypt_key --encrypt-threads=4 --encrypt-chunk-size=8K"
+
+. inc/xb_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_parallel.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_parallel.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_parallel.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_parallel.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,9 @@
+############################################################################
+# Test parallel streaming feature of the 'xbstream' format
+############################################################################
+
+stream_format=xbstream
+stream_extract_cmd="xbstream -xv <"
+xtrabackup_options="--parallel=16"
+
+. inc/xb_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_tar.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_tar.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_tar.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_tar.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,9 @@
+############################################################################
+# Test streaming in the TAR format
+############################################################################
+
+stream_extract_cmd="$TAR -ixvf"
+
+stream_format=tar
+
+. inc/xb_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_xbstream.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_xbstream.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/test/t/xb_stream_xbstream.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/test/t/xb_stream_xbstream.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,8 @@
+############################################################################
+# Test streaming in the XBSTREAM format
+############################################################################
+
+stream_format=xbstream
+stream_extract_cmd="xbstream -xv <"
+
+. inc/xb_stream_common.sh
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/build-binary.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/build-binary.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/build-binary.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/build-binary.sh	2017-02-27 07:47:02.000000000 +0000
@@ -82,10 +82,6 @@
 
 XTRABACKUP_VERSION="${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}"
 
-# Build information
-if [ -z "${REVISION:-}" ]; then
-  REVISION="$(cd "$SOURCEDIR"; bzr revno 2>/dev/null || cat REVNO)"
-fi
 # Compilation flags
 export CC=${CC:-gcc}
 export CXX=${CXX:-g++}
@@ -109,8 +105,8 @@
 
         # Install the files
         mkdir -p "$INSTALLDIR"
-        cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" \
-          -DINSTALL_MYSQLTESTDIR=percona-xtrabackup-${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}-test . 
+        cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+          -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=percona-xtrabackup-${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}-test -DINSTALL_MANDIR=${INSTALLDIR}/man .
         make $MAKE_JFLAG
         make install
 
@@ -119,7 +115,7 @@
 
     if test "x$exit_value" = "x0"
     then
-      $TAR czf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION-$(uname -s)-$(uname -m).tar.gz" \
+      $TAR czf "percona-xtrabackup-$XTRABACKUP_VERSION-$(uname -s)-$(uname -m).tar.gz" \
             --owner=0 --group=0 -C "$INSTALLDIR/../" \
             "percona-xtrabackup-$XTRABACKUP_VERSION-$(uname -s)-$(uname -m)"
     fi
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/build-dpkg.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/build-dpkg.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/build-dpkg.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/build-dpkg.sh	2017-02-27 07:47:02.000000000 +0000
@@ -48,7 +48,7 @@
 XTRABACKUP_VERSION="${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}"
 
 DEBIAN_VERSION="$(lsb_release -sc)"
-REVISION="$(cd "$SOURCEDIR"; bzr revno 2>/dev/null || cat REVNO)"
+REVISION="$(cd "$SOURCEDIR"; git rev-parse --short HEAD 2>/dev/null || cat REVNO)"
 FULL_VERSION="$XTRABACKUP_VERSION-$REVISION.$DEBIAN_VERSION"
 
 # Working directory
@@ -94,12 +94,12 @@
         make DUMMY="$DUMMY" dist
     # Create the original tarball
         mv "${TMPDIR}/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz" \
-        "$WORKDIR/percona-xtrabackup-${XB_VERSION_MAJOR}${XB_VERSION_MINOR}_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"
+        "$WORKDIR/percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"
         rm -fr ${TMPDIR}
     #
         cd "$WORKDIR"
         rm -fr percona-xtrabackup-$XTRABACKUP_VERSION
-        tar xzf percona-xtrabackup-${XB_VERSION_MAJOR}${XB_VERSION_MINOR}_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz
+        tar xzf percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz
         cd percona-xtrabackup-$XTRABACKUP_VERSION
         cp -a storage/innobase/xtrabackup/utils/debian .
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/build-rpm.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/build-rpm.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/build-rpm.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/build-rpm.sh	2017-02-27 07:47:02.000000000 +0000
@@ -104,7 +104,7 @@
 cut -d ' ' -f 2)"
 
 if [ -z "${REVISION:-}" ]; then
-  REVISION="$(cd "$SOURCEDIR"; (bzr revno 2>/dev/null || cat REVNO))"
+  REVISION="$(cd "$SOURCEDIR"; (git rev-parse --short HEAD 2>/dev/null || cat REVNO))"
 fi
 
 # Fix problems in rpmbuild for rhel4: _libdir and _arch are not correctly set.
@@ -142,7 +142,7 @@
   RPM_EXTRAVER=1
 else 
   EXTRAVER=${XB_VERSION_EXTRA}
-  RPM_EXTRAVER=.${XB_VERSION_EXTRA#-}
+  RPM_EXTRAVER=${XB_VERSION_EXTRA#-}.1
 fi
 #
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/changelog percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/changelog
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/changelog	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/changelog	2017-02-27 07:47:02.000000000 +0000
@@ -1,95 +1,31 @@
-percona-xtrabackup (2.2.3-1) unstable; urgency=low
+percona-xtrabackup (2.3.4) unstable; urgency=low
 
-  * New upstream release 2.2.3 (Closes: #751377).
+  * Update to new release Percona XtraBackup 2.3.4
 
- -- George Ormond Lorch III <george.lorch@percona.com>  Mon, 21 Jul 2014 16:04:36 -0700
+ -- Tomislav Plavcic <tomislav.plavcic@percona.com>  Mon, 14 Mar 2016 14:33:15 +0100
 
-percona-xtrabackup (2.1.8-1) unstable; urgency=medium
+percona-xtrabackup (2.3.3) unstable; urgency=low
 
-  * New upstream release (Closes: #741788, #737452).
+  * Update to new release Percona XtraBackup 2.3.3
 
- -- James Page <james.page@ubuntu.com>  Mon, 17 Mar 2014 16:46:08 +0000
+ -- Tomislav Plavcic <tomislav.plavcic@percona.com>  Mon, 14 Dec 2015 20:46:36 +0100
 
-percona-xtrabackup (2.1.6-3) unstable; urgency=low
+percona-xtrabackup (2.3.2) unstable; urgency=low
 
-  [ Stewart Smith ]
-  * Add lsb-base as build dependency to fix URL generation in --help
-  * Add Enhances: mysql-server
+  * Update to new release Percona XtraBackup 2.3.2
+  * Renamed the package to percona-xtrabackup since 2.3 became GA
 
-  [ Clint Byrum ]
-  * Bumped standards version to 3.9.5 - No changes necessary.
+ -- Tomislav Plavcic <tomislav.plavcic@percona.com>  Fri, 16 Oct 2015 17:25:26 +0200
 
- -- Stewart Smith <stewart.smith@percona.com>  Wed, 11 Dec 2013 12:00:29 +1100
+percona-xtrabackup-23 (2.3.1beta1) unstable; urgency=low
 
-percona-xtrabackup (2.1.6-2) unstable; urgency=low
+  * Update to new release Percona XtraBackup 2.3.1beta1
 
-  * Update to new upstream release Percona XtraBackup 2.1.6
-  * Integrate packaging updates from upstream and Debian.
+ -- Tomislav Plavcic <tomislav.plavcic@percona.com>  Fri, 15 May 2015 08:20:44 +0100
 
- -- Stewart Smith <stewart@flamingspork.com>  Wed, 27 Nov 2013 15:15:17 +1100
+percona-xtrabackup-23 (2.3.0alpha1) unstable; urgency=low
 
-percona-xtrabackup (2.1.5-1) unstable; urgency=low
+  * Update to new release Percona XtraBackup 2.3.0alpha1
 
-  * Update to new upstream release Percona XtraBackup 2.1.5
+ -- Tomislav Plavcic <tomislav.plavcic@percona.com>  Thu, 30 Oct 2014 15:33:54 +0100
 
- -- Stewart Smith <stewart@flamingspork.com>  Tue, 29 Oct 2013 14:56:54 +1100
-
-percona-xtrabackup (2.1.3-618-1) unstable; urgency=low
-
-  [ Stewart Smith ]
-  * Initial packaging for Debian (Closes: #620824)
-
-  [ Clint Byrum ]
-  * Remove inaccurate Vcs-* fields.
-  * Remove MAKE_J setting as it is handled by dpkg build tools.
-  * Remove unnecesssary debian/percona-xtrabackup.dirs
-  * Updating standards to 3.9.4, no changes necessary.
-  * Add embedded-library libmysqlclient to
-    percona-xtrabackup.lintian-overrides.
-
- -- Stewart Smith <stewart.smith@percona.com>  Fri, 19 Jul 2013 16:18:36 +1000
-
-percona-xtrabackup (2.1.0) unstable; urgency=low
-
-  * Update compat level to 7
-  * Update Standards-Version to 3.9.1.
-  * Use dh targets and overrides.
-  * Remove the obsolete debian/info file
-  * Move the /usr/share/percona-xtrabackup-test directory to
-    the percona-xtrabackup-test package.
-  * Update the copyright file to a machine-readable format.
-
- -- Ignacio Nin <ignacio.nin@percona.com>  Mon, 22 Apr 2013 16:14:20 -0300
-
-percona-xtrabackup (2.0.0) lucid; urgency=low
-
-  * General polishing of debian/ directory
-  * Add correct copyright info
-  * Move rules for installing files (binaries and test) from rules to
-    .install and .links files
-  * Create per-package .dirs and .docs files
-  * Add a lintian-overrides files
-
- -- Ignacio Nin <ignacio.nin@percona.com>  Wed, 18 Apr 2012 02:34:40 +0000
-
-percona-xtrabackup (1.9.1) unstable; urgency=low
-
-  * Change package name to percona-xtrabackup
-
- -- Ignacio Nin <ignacio.nin@percona.com>  Wed, 14 Mar 2012 16:52:34 -0300
-
-xtrabackup (1.2) unstable; urgency=low
-
-  * XtraBackup is based on XtraDB 10
-
- -- Aleksandr Kuzminsky <aleksandr.kuzminsky@percona.com>  Wed, 07 Mar 2010 23:45:00 +0200
-xtrabackup (1.1) unstable; urgency=low
-
-  * XtraBackup is ported to InnoDB plugin
-
- -- Aleksandr Kuzminsky <aleksandr.kuzminsky@percona.com>  Mon, 15 Mar 2010 07:00:00 +0200
-xtrabackup (1.0) unstable; urgency=low
-
-  * Initial release
-
- -- Alex <aleksandr.kuzminsky@percona.com>  Sun, 28 Jun 2009 14:20:17 -0700
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/control percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/control
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/control	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/control	2017-02-27 07:47:02.000000000 +0000
@@ -1,10 +1,8 @@
 Source: percona-xtrabackup
 Section: database
 Priority: extra
-Maintainer: Percona XtraBackup Development Team <mysql-dev@percona.com> 
-Uploaders: Alexey Bychko <alexey.bychko@percona.com>,
-           Alexey Kopytov <alexey.kopytov@percona.com>,
-           George Ormond Lorch III <george.lorch@percona.com>
+Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
+Uploaders: Tomislav Plavcic <tomislav.plavcic@percona.com>, Clint Byrum <clint@fewbar.com>
 Build-Depends: automake,
                bison,
                ca-certificates,
@@ -16,22 +14,27 @@
                libtool,
                libz-dev,
                libgcrypt-dev,
-               lsb-release
+               libev-dev,
+               libcurl-dev,
+               lsb-release,
+               python-sphinx (>= 1.0.1),
+               python-docutils (>= 0.6)
 Standards-Version: 3.9.5
 Homepage: http://www.percona.com/software/percona-xtrabackup
 
 Package: percona-xtrabackup
 Architecture: any
-Depends: libdbd-mysql-perl, ${misc:Depends}, ${shlibs:Depends}
+Depends: libdbd-mysql-perl, rsync, ${misc:Depends}, ${shlibs:Depends}
 Provides: xtrabackup
+Conflicts: percona-xtrabackup-21, percona-xtrabackup-22
 Breaks: xtrabackup (<< 2.0.0~)
 Replaces: xtrabackup (<< 2.0.0~)
 Enhances: mysql-server
 Description: Open source backup tool for InnoDB and XtraDB
  Percona XtraBackup is an open-source hot backup utility for MySQL that
  doesn't lock your database during the backup. It can back up data from
- InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server 5.1 and
- 5.5 servers, and has many advanced features.
+ InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server/MariaDB
+ servers, and has many advanced features.
 
 Package: percona-xtrabackup-dbg
 Section: debug
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/copyright percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/copyright
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/copyright	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/copyright	2017-02-27 07:47:02.000000000 +0000
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Percona XtraBackup
-Upstream-Contact: https://bugs.launchpad.net/percona-xtrabackup
+Upstream-Contact: Stewart Smith <stewart.smith@percona.com>
 Source: http://www.percona.com/downloads/XtraBackup/
 Disclaimer: Modified from Autogenerated by CDBS. The notices for the embedded
  MySQL source trees comes mostly from the debian/copyright file for the debian
@@ -802,8 +802,8 @@
  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., 59 Temple
- Place, Suite 330, Boston, MA 02111-1307 USA
+ this program; if not, write to the Free Software Foundation, Inc., 51 Franklin 
+ Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Files: */storage/innobase/include/srv0srv.h
  */storage/innobase/srv/srv0start.c
@@ -932,7 +932,7 @@
  .
  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
  .
  Copyright (c) 1997, 1999 Kungliga Tekniska Högskolan
  (Royal Institute of Technology, Stockholm, Sweden). 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install	2017-02-27 07:47:02.000000000 +0000
@@ -1 +1,2 @@
 /usr/bin
+/usr/share/man/man1
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.lintian-overrides percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.lintian-overrides
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.lintian-overrides	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.lintian-overrides	2017-02-27 07:47:02.000000000 +0000
@@ -10,7 +10,6 @@
 embedded-library usr/bin/xtrabackup_56: zlib
 
 # The embedded forked mysql 5.6 source builds and links this statically
-embedded-library usr/bin/xtrabackup: libmysqlclient
 embedded-library usr/bin/xtrabackup_56: libmysqlclient
 
 # Older versions of lintian
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/rules percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/rules
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/debian/rules	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/debian/rules	2017-02-27 07:47:02.000000000 +0000
@@ -3,6 +3,8 @@
 
 #export DH_VERBOSE=1
 
+NCPU=$(shell grep -c processor /proc/cpuinfo)
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -16,8 +18,8 @@
 override_dh_auto_configure:
 
 ifeq "$(DEB_DUMMY)" ""
-	cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test .
+	cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+	  -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test -DINSTALL_MANDIR=/usr/share/man .
 else
 	# Dummy binaries that avoid compilation
 	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup
@@ -25,13 +27,16 @@
 	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup_56
 	echo 'main() { return 300; }' | gcc -x c - -o xbstream
 	echo 'main() { return 300; }' | gcc -x c - -o xbcrypt
+	echo 'main() { return 300; }' | gcc -x c - -o xbcloud
 endif
 
 	#docbook-to-man debian/xtrabackup.sgml > xtrabackup.1
+override_dh_auto_build:
+	make -j$(NCPU)
 
 override_dh_strip:
 	dh_strip --dbg-package=percona-xtrabackup-dbg
 
 %:
-	dh $@ --parallel
+	dh $@
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec	2017-02-27 07:47:02.000000000 +0000
@@ -4,11 +4,12 @@
 %define xb_version_extra  @@XB_VERSION_EXTRA@@
 %define xb_rpm_version_extra @@XB_RPM_VERSION_EXTRA@@
 %define xb_revision       @@XB_REVISION@@
+%global mysqldatadir /var/lib/mysql
 
 #####################################
 Name:           percona-xtrabackup
 Version:        %{xb_version_major}.%{xb_version_minor}.%{xb_version_patch}
-Release:        %{xb_revision}%{xb_rpm_version_extra}%{?dist}
+Release:        %{xb_rpm_version_extra}%{?dist}
 Summary:        XtraBackup online backup for MySQL / InnoDB
 
 Group:          Applications/Databases
@@ -16,9 +17,19 @@
 URL:            http://www.percona.com/software/percona-xtrabackup
 Source:         percona-xtrabackup-%{version}%{xb_version_extra}.tar.gz
 
-BuildRequires:  cmake, libaio-devel, libgcrypt-devel, ncurses-devel, readline-devel
-Requires:       perl(DBD::mysql)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  cmake, libaio-devel, libgcrypt-devel, ncurses-devel, readline-devel, zlib-devel, libev-devel openssl-devel
+%if 0%{?rhel} > 5
+BuildRequires:  libcurl-devel
+%else
+BuildRequires:  curl-devel
+%endif
+%if 0%{?rhel} > 6 
+BuildRequires:  python-sphinx >= 1.0.1, python-docutils >= 0.6 
+%endif
+Conflicts:      percona-xtrabackup-21, percona-xtrabackup-22
+Requires:       perl(DBD::mysql), rsync
+Requires:	perl(Digest::MD5)
+BuildRoot:      %{_tmppath}/%{name}-%{version}%{xb_version_extra}-root
 
 %description
 Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines
@@ -31,7 +42,7 @@
 AutoReqProv:    no
 
 %description -n percona-xtrabackup-test
-This package contains the test suite for Percona XtraBackup %{version}
+This package contains the test suite for Percona XtraBackup %{version}%{xb_version_extra}
 
 %prep
 %setup -q -n percona-xtrabackup-%{version}%{xb_version_extra}
@@ -45,16 +56,17 @@
 echo 'main() { return 300; }' | gcc -x c - -o storage/innobase/xtrabackup/src/xtrabackup
 echo 'main() { return 300; }' | gcc -x c - -o storage/innobase/xtrabackup/src/xbstream
 echo 'main() { return 300; }' | gcc -x c - -o storage/innobase/xtrabackup/src/xbcrypt
+echo 'main() { return 300; }' | gcc -x c - -o storage/innobase/xtrabackup/src/xbcloud
 #
 %else
 #
 export CC=${CC-"gcc"}
 export CXX=${CXX-"g++"}
-export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
-export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
+export CFLAGS=${CFLAGS:-}
+export CXXFLAGS=${CXXFLAGS:-}
 #
-cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-  -DINSTALL_MYSQLTESTDIR=%{_datadir}/percona-xtrabackup-test .
+cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+  -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=%{_datadir}/percona-xtrabackup-test -DINSTALL_MANDIR=%{_mandir} .
 #
 make %{?_smp_mflags}
 #
@@ -73,13 +85,44 @@
 %{_bindir}/xtrabackup
 %{_bindir}/xbstream
 %{_bindir}/xbcrypt
+%{_bindir}/xbcloud
+%{_bindir}/xbcloud_osenv
 %doc COPYING
+%doc %{_mandir}/man1/*.1.gz
 
 %files -n percona-xtrabackup-test
 %defattr(-,root,root,-)
 %{_datadir}/percona-xtrabackup-test
 
 %changelog
+* Mon Feb 13 2017 Evgeniy Patlan <evgeniy.patlan@percona.com>
+- Update to new release Percona XtraBackup 2.3.7
+
+* Mon Mar 14 2016 Tomislav Plavcic <tomislav.plavcic@percona.com>
+- Update to new release Percona XtraBackup 2.3.4
+
+* Mon Dec 14 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
+- Update to new release Percona XtraBackup 2.3.3
+
+* Fri Oct 16 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
+- Update to new release Percona XtraBackup 2.3.2
+- Renamed the package to percona-xtrabackup since 2.3 became GA
+
+* Fri May 15 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
+- Update to new release Percona XtraBackup 2.3.1beta1
+
+* Thu Oct 30 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
+- Update to new release Percona XtraBackup 2.3.0alpha1
+
+* Wed Sep 29 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
+- Update to new release Percona XtraBackup 2.2.6
+
+* Fri Sep 26 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
+- Update to new release Percona XtraBackup 2.2.5
+
+* Thu Sep 11 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
+- Changed options to build with system zlib
+
 * Mon Jun 10 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
 - renamed package from percona-xtrabackup-22 to percona-xtrabackup
 
diff -Nru percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/xbcloud_osenv.sh percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/xbcloud_osenv.sh
--- percona-xtrabackup-2.2.3/storage/innobase/xtrabackup/xbcloud_osenv.sh	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/innobase/xtrabackup/xbcloud_osenv.sh	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Copyright (C) 2015 Percona LLC and/or its affiliates.
+# This software comes with ABSOLUTELY NO WARRANTY. This is free software,
+# and you are welcome to modify and redistribute it under the GPL license.
+
+# A script to apply the standard OpenStack OS_xxx environment variables to
+# the xbcloud command line.
+#
+# Copyright Percona LLC and/or its affiliates, 2015.  All Rights Reserved.
+#
+
+usage() {
+  cat <<_EOU_
+Copyright (C) 2015 Percona LLC and/or its affiliates.
+This software comes with ABSOLUTELY NO WARRANTY. This is free software,
+and you are welcome to modify and redistribute it under the GPL license.
+
+Usage: xbcloud_osenv put|get {options}
+
+This command is a wrapper for the xbcloud command.  It will read the
+standard OpenStack OS_xxx environment variables and apply them to 
+the xbcloud command line.  See 'xbcloud --help' for more information.
+
+_EOU_
+}
+
+# if no parameters or help parameter, display usage and exit
+#
+if [ "$#" -eq 0 ] || [ "$1" = "-?" ] || [ "$1" = "--help" ]; then
+  usage
+  exit 0
+fi
+
+# xbcloud options extracted from OS_xxx variables
+#
+XBCLOUD_OS_ENV=
+
+# Add OS_xxx env vars to xbcloud options
+#
+# params: OpenStack OS_xxx environment variable, xbcloud parameter
+#
+add_os_env_opt() {
+  if [ ! "$1" == "" ]; then
+    XBCLOUD_OS_ENV="${XBCLOUD_OS_ENV} --$2=$1"
+  fi
+}
+
+# Direct conversion of OS_xxx variables to xbcloud options
+#
+add_os_env_opt "${OS_USERNAME:-}" 'swift-user'
+add_os_env_opt "${OS_PASSWORD:-}" 'swift-password'
+add_os_env_opt "${OS_TENANT_NAME:-}" 'swift-tenant'
+add_os_env_opt "${OS_TENANT_ID:-}" 'swift-tenant-id'
+add_os_env_opt "${OS_REGION_NAME:-}" 'swift-region'
+add_os_env_opt "${OS_CACERT:-}" 'cacert'
+
+# split OS_AUTH_URL if found
+#
+if [ ! "${OS_AUTH_URL:-}" == "" ]; then
+  OAU_BASE=$(echo "${OS_AUTH_URL}" | sed -rn 's/\/v([0-9\.]+)\/*/\//p')
+  OAU_VER=$(echo "${OS_AUTH_URL}" | sed -rn 's/^.*\/v([0-9\.]+)\/*$/\1/p')
+  add_os_env_opt "${OAU_BASE:-}" 'swift-auth-url'
+  add_os_env_opt "${OAU_VER:-}" 'swift-auth-version'
+fi
+
+# find the xbcloud binary
+#
+XBCLOUD_BIN="$(dirname "$0")/xbcloud"
+#
+# if it's not where this script is located
+# then search path
+#
+if [ ! -e "${XBCLOUD_BIN}" ]; then
+  XBCLOUD_BIN=
+  hash xbcloud 2>/dev/null || {
+    XBCLOUD_BIN='xbcloud'
+  }
+fi
+if [ "${XBCLOUD_BIN}" == "" ]; then
+  >&2 echo "ERROR: Could not find xbcloud binary."
+  exit 1
+fi
+
+# make sure the storage mode is swift, if
+# it's unspecified and we have OS_xxx values
+# then set the storage mode to swift
+if [ ! "${XBCLOUD_OS_ENV}" == "" ]; then
+  for WARG in "$@"
+  do
+    case "${WARG}" in
+      --storage*)
+        STORAGE_MODE=$(echo "$1" | sed -e 's^[^=]*=//g')
+        break
+    esac
+  done
+  # if storage mode not specified then specify Swift
+  if [ "${STORAGE_MODE}" == "" ]; then
+    XBCLOUD_OS_ENV="--storage=Swift ${XBCLOUD_OS_ENV}"
+  # if not swift then don't set the OS_xxx variables
+  elif [ ! "${STORAGE_MODE:-}" == "Swift" ]; then
+    XBCLOUD_OS_ENV=
+  fi
+fi
+
+# do it
+# shellcheck disable=SC2086,SC2048
+${XBCLOUD_BIN} $* ${XBCLOUD_OS_ENV}
+
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/ft_update.c percona-xtrabackup-2.3.7/storage/myisam/ft_update.c
--- percona-xtrabackup-2.2.3/storage/myisam/ft_update.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/ft_update.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -96,7 +96,7 @@
 uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const uchar *record,
                   MYSQL_FTPARSER_PARAM *param, MEM_ROOT *mem_root)
 {
-  FT_SEG_ITERATOR ftsi;
+  FT_SEG_ITERATOR ftsi= { 0, 0, NULL, NULL, NULL };
   struct st_mysql_ftparser *parser;
   DBUG_ENTER("_mi_ft_parse");
 
@@ -169,7 +169,8 @@
 
 int _mi_ft_cmp(MI_INFO *info, uint keynr, const uchar *rec1, const uchar *rec2)
 {
-  FT_SEG_ITERATOR ftsi1, ftsi2;
+  FT_SEG_ITERATOR ftsi1= { 0, 0, NULL, NULL, NULL };
+  FT_SEG_ITERATOR ftsi2= { 0, 0, NULL, NULL, NULL };
   const CHARSET_INFO *cs= info->s->keyinfo[keynr].seg->charset;
   DBUG_ENTER("_mi_ft_cmp");
   _mi_ft_segiterator_init(info, keynr, rec1, &ftsi1);
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/ha_myisam.cc percona-xtrabackup-2.3.7/storage/myisam/ha_myisam.cc
--- percona-xtrabackup-2.2.3/storage/myisam/ha_myisam.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/ha_myisam.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1037,7 +1037,6 @@
 
   param.db_name=    table->s->db.str;
   param.table_name= table->alias;
-  param.tmpfile_createflag = O_RDWR | O_TRUNC;
   param.using_global_keycache = 1;
   param.thd= thd;
   param.tmpdir= &mysql_tmpdir_list;
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/mi_delete.c percona-xtrabackup-2.3.7/storage/myisam/mi_delete.c
--- percona-xtrabackup-2.2.3/storage/myisam/mi_delete.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/mi_delete.c	2017-02-27 07:47:02.000000000 +0000
@@ -87,8 +87,6 @@
                 _mi_make_key(info,i,old_key,record,info->lastpos)))
           goto err;
       }
-      /* The above changed info->lastkey2. Inform mi_rnext_same(). */
-      info->update&= ~HA_STATE_RNEXT_SAME;
     }
   }
 
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/mi_key.c percona-xtrabackup-2.3.7/storage/myisam/mi_key.c
--- percona-xtrabackup-2.2.3/storage/myisam/mi_key.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/mi_key.c	2017-02-27 07:47:02.000000000 +0000
@@ -155,7 +155,7 @@
       {
 	float nr;
 	float4get(nr,pos);
-	if (isnan(nr))
+	if (my_isnan(nr))
 	{
 	  /* Replace NAN with zero */
 	  memset(key, 0, length);
@@ -167,7 +167,7 @@
       {
 	double nr;
 	float8get(nr,pos);
-	if (isnan(nr))
+	if (my_isnan(nr))
 	{
 	  memset(key, 0, length);
 	  key+=length;
@@ -427,8 +427,6 @@
                &blob_ptr, sizeof(char*));
         memcpy(blob_ptr,key,length);
         blob_ptr+=length;
-        /* The above changed info->lastkey2. Inform mi_rnext_same(). */
-        info->update&= ~HA_STATE_RNEXT_SAME;
         _mi_store_blob_length(record+keyseg->start,
                               (uint) keyseg->bit_start,length);
       }
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/mi_open.c percona-xtrabackup-2.3.7/storage/myisam/mi_open.c
--- percona-xtrabackup-2.2.3/storage/myisam/mi_open.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/mi_open.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -579,6 +579,7 @@
 		       &info.buff,(share->base.max_key_block_length*2+
 				   share->base.max_key_length),
 		       &info.lastkey,share->base.max_key_length*3+1,
+                       &info.rnext_same_key, share->base.max_key_length,
 		       &info.first_mbr_key, share->base.max_key_length,
 		       &info.filename,strlen(name)+1,
 		       &info.rtree_recursion_state,have_rtree ? 1024 : 0,
@@ -593,6 +594,11 @@
   memcpy(info.blobs,share->blobs,sizeof(MI_BLOB)*share->base.blobs);
   info.lastkey2=info.lastkey+share->base.max_key_length;
 
+  /*
+    If only mi_rkey is called earlier, rnext_same_key should be set in
+    mi_rnext_same.
+  */
+  info.set_rnext_same_key= FALSE;
   info.s=share;
   info.lastpos= HA_OFFSET_ERROR;
   info.update= (short) (HA_STATE_NEXT_FOUND+HA_STATE_PREV_FOUND);
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/mi_rkey.c percona-xtrabackup-2.3.7/storage/myisam/mi_rkey.c
--- percona-xtrabackup-2.2.3/storage/myisam/mi_rkey.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/mi_rkey.c	2017-02-27 07:47:02.000000000 +0000
@@ -178,6 +178,9 @@
   else
     info->last_rkey_length= pack_key_length;
 
+  /* Next call to mi_rnext_same should set rnext_same_key. */
+    info->set_rnext_same_key= TRUE;
+
   /* Check if we don't want to have record back, only error message */
   if (!buf)
     DBUG_RETURN(info->lastpos == HA_OFFSET_ERROR ? my_errno : 0);
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/mi_rnext_same.c percona-xtrabackup-2.3.7/storage/myisam/mi_rnext_same.c
--- percona-xtrabackup-2.2.3/storage/myisam/mi_rnext_same.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/mi_rnext_same.c	2017-02-27 07:47:02.000000000 +0000
@@ -56,10 +56,12 @@
 #endif
     case HA_KEY_ALG_BTREE:
     default:
-      if (!(info->update & HA_STATE_RNEXT_SAME))
+
+      if (info->set_rnext_same_key)
       {
-        /* First rnext_same; Store old key */
-        memcpy(info->lastkey2,info->lastkey,info->last_rkey_length);
+        /* First rnext_same and lastkey is filled in mi_rkey */
+        memcpy(info->rnext_same_key, info->lastkey, info->last_rkey_length);
+        info->set_rnext_same_key= FALSE;
       }
       for (;;)
       {
@@ -67,7 +69,7 @@
 			       info->lastkey_length,SEARCH_BIGGER,
 			       info->s->state.key_root[inx])))
           break;
-        if (ha_key_cmp(keyinfo->seg, info->lastkey, info->lastkey2,
+        if (ha_key_cmp(keyinfo->seg, info->lastkey, info->rnext_same_key,
                        info->last_rkey_length, SEARCH_FIND, not_used))
         {
           error=1;
@@ -85,7 +87,7 @@
     mysql_rwlock_unlock(&info->s->key_root_lock[inx]);
 	/* Don't clear if database-changed */
   info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
-  info->update|= HA_STATE_NEXT_FOUND | HA_STATE_RNEXT_SAME;
+  info->update|= HA_STATE_NEXT_FOUND;
 
   if (error)
   {
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/mi_unique.c percona-xtrabackup-2.3.7/storage/myisam/mi_unique.c
--- percona-xtrabackup-2.2.3/storage/myisam/mi_unique.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/mi_unique.c	2017-02-27 07:47:02.000000000 +0000
@@ -29,9 +29,6 @@
   mi_unique_store(record+key->seg->start, unique_hash);
   _mi_make_key(info,def->key,key_buff,record,0);
 
-  /* The above changed info->lastkey2. Inform mi_rnext_same(). */
-  info->update&= ~HA_STATE_RNEXT_SAME;
-
   if (_mi_search(info,info->s->keyinfo+def->key,key_buff,MI_UNIQUE_HASH_LENGTH,
 		 SEARCH_FIND,info->s->state.key_root[def->key]))
   {
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/mi_update.c percona-xtrabackup-2.3.7/storage/myisam/mi_update.c
--- percona-xtrabackup-2.2.3/storage/myisam/mi_update.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/mi_update.c	2017-02-27 07:47:02.000000000 +0000
@@ -109,9 +109,6 @@
 	uint new_length=_mi_make_key(info,i,new_key,newrec,pos);
 	uint old_length=_mi_make_key(info,i,old_key,oldrec,pos);
 
-        /* The above changed info->lastkey2. Inform mi_rnext_same(). */
-        info->update&= ~HA_STATE_RNEXT_SAME;
-
 	if (new_length != old_length ||
 	    memcmp((uchar*) old_key,(uchar*) new_key,new_length))
 	{
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/mi_write.c percona-xtrabackup-2.3.7/storage/myisam/mi_write.c
--- percona-xtrabackup-2.2.3/storage/myisam/mi_write.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/mi_write.c	2017-02-27 07:47:02.000000000 +0000
@@ -131,9 +131,6 @@
         }
       }
 
-      /* The above changed info->lastkey2. Inform mi_rnext_same(). */
-      info->update&= ~HA_STATE_RNEXT_SAME;
-
       if (local_lock_tree)
         mysql_rwlock_unlock(&share->key_root_lock[i]);
     }
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/myisamdef.h percona-xtrabackup-2.3.7/storage/myisam/myisamdef.h
--- percona-xtrabackup-2.2.3/storage/myisam/myisamdef.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/myisamdef.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -245,6 +245,9 @@
   char *filename;			/* parameter to open filename       */
   uchar *buff,				/* Temp area for key                */
 	*lastkey,*lastkey2;		/* Last used search key             */
+
+  /* Key used in mi_rnext_same and filled by mi_rkey. */
+  uchar *rnext_same_key;
   uchar *first_mbr_key;			/* Searhed spatial key              */
   uchar	*rec_buff;			/* Tempbuff for recordpack          */
   uchar *int_keypos,			/* Save position for next/previous  */
@@ -295,6 +298,9 @@
   my_bool buff_used;		/* If info->buff has to be reread for rnext */
   my_bool once_flags;           /* For MYISAMMRG */
 
+  /* Used in mi_rnext_same to fill rnext_same_key for the first time. */
+    my_bool set_rnext_same_key;
+
   index_cond_func_t index_cond_func;   /* Index condition function */
   void *index_cond_func_arg;           /* parameter for the func */
 #ifdef __WIN__
diff -Nru percona-xtrabackup-2.2.3/storage/myisam/sp_key.c percona-xtrabackup-2.3.7/storage/myisam/sp_key.c
--- percona-xtrabackup-2.2.3/storage/myisam/sp_key.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/myisam/sp_key.c	2017-02-27 07:47:02.000000000 +0000
@@ -67,7 +67,7 @@
     
     val= mbr[start / sizeof (double)];
 #ifdef HAVE_ISNAN
-    if (isnan(val))
+    if (my_isnan(val))
     {
       memset(key, 0, length);
       key+= length;
diff -Nru percona-xtrabackup-2.2.3/storage/ndb/CMakeLists.txt percona-xtrabackup-2.3.7/storage/ndb/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/ndb/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/ndb/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -104,9 +104,11 @@
   SET(is_default_plugin "DEFAULT")
 ENDIF()
 
-MYSQL_ADD_PLUGIN(ndbcluster ${NDBCLUSTER_SOURCES} STORAGE_ENGINE
-  ${is_default_plugin} STATIC_ONLY RECOMPILE_FOR_EMBEDDED
-  LINK_LIBRARIES ndbclient)
+IF(NOT WITHOUT_SERVER)
+  MYSQL_ADD_PLUGIN(ndbcluster ${NDBCLUSTER_SOURCES} STORAGE_ENGINE
+    ${is_default_plugin} STATIC_ONLY RECOMPILE_FOR_EMBEDDED
+    LINK_LIBRARIES ndbclient)
+ENDIF()
 
 #
 # Add NDB binaries if ndbcluster is built
diff -Nru percona-xtrabackup-2.2.3/storage/ndb/src/CMakeLists.txt percona-xtrabackup-2.3.7/storage/ndb/src/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/ndb/src/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/ndb/src/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -18,7 +18,10 @@
 ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(mgmapi)
 ADD_SUBDIRECTORY(ndbapi)
-ADD_SUBDIRECTORY(kernel)
+
+IF(NOT WITHOUT_SERVER)
+  ADD_SUBDIRECTORY(kernel)
+ENDIF()
 ADD_SUBDIRECTORY(mgmclient)
 ADD_SUBDIRECTORY(mgmsrv)
 
diff -Nru percona-xtrabackup-2.2.3/storage/ndb/src/mgmclient/CMakeLists.txt percona-xtrabackup-2.3.7/storage/ndb/src/mgmclient/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/ndb/src/mgmclient/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/ndb/src/mgmclient/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -18,6 +18,10 @@
 ADD_LIBRARY(ndbmgmclient STATIC
             CommandInterpreter.cpp)
 
+IF(WITHOUT_SERVER)
+  RETURN()
+ENDIF()
+
 MYSQL_ADD_EXECUTABLE(ndb_mgm
   main.cpp
   COMPONENT ClusterManagementClient)
diff -Nru percona-xtrabackup-2.2.3/storage/ndb/src/mgmsrv/CMakeLists.txt percona-xtrabackup-2.3.7/storage/ndb/src/mgmsrv/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/ndb/src/mgmsrv/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/ndb/src/mgmsrv/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -26,6 +26,10 @@
 )
 TARGET_LINK_LIBRARIES(ndbconf ndbmgmapi)
 
+IF(WITHOUT_SERVER)
+  RETURN()
+ENDIF()
+
 # Define MYSQLCLUSTERDIR, the default location
 # of ndb_mgmd config files
 IF(NOT DEFINED DEFAULT_MYSQL_HOME)
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/CMakeLists.txt percona-xtrabackup-2.3.7/storage/perfschema/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/perfschema/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, 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
@@ -21,29 +21,11 @@
 
 ADD_DEFINITIONS(-DMYSQL_SERVER)
 
-# Gen_pfs_lex_token
-ADD_EXECUTABLE(gen_pfs_lex_token gen_pfs_lex_token.cc)
-# gen_pfs_lex_token itself depends on ${CMAKE_CURRENT_BINARY_DIR}/sql/sql_yacc.h
-ADD_DEPENDENCIES(gen_pfs_lex_token GenServerSource)
-
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pfs_lex_token.h
-  COMMAND gen_pfs_lex_token > pfs_lex_token.h
-  DEPENDS gen_pfs_lex_token
-)
-
-SET(PFS_GEN_SOURCES
-  ${CMAKE_CURRENT_BINARY_DIR}/pfs_lex_token.h
-)
-
-SET_SOURCE_FILES_PROPERTIES(${PFS_GEN_SOURCES} PROPERTIES GENERATED 1)
-
 #
 # Maintainer: keep this list sorted, to avoid merge collisions.
 # Tip: ls -1 *.h, ls -1 *.cc
 #
 SET(PERFSCHEMA_SOURCES
-${PFS_GEN_SOURCES}
 ha_perfschema.h
 cursor_by_account.h
 cursor_by_host.h
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/gen_pfs_lex_token.cc percona-xtrabackup-2.3.7/storage/perfschema/gen_pfs_lex_token.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/gen_pfs_lex_token.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/gen_pfs_lex_token.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2014, 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
@@ -36,10 +36,13 @@
   See also YYMAXUTOK.
 */
 #define MY_MAX_TOKEN 1000
+/** Generated token. */
 struct gen_lex_token_string
 {
   const char *m_token_string;
   int m_token_length;
+  bool m_append_space;
+  bool m_start_expr;
 };
 
 gen_lex_token_string compiled_token_array[MY_MAX_TOKEN];
@@ -76,6 +79,13 @@
 
   compiled_token_array[tok].m_token_string= str;
   compiled_token_array[tok].m_token_length= strlen(str);
+  compiled_token_array[tok].m_append_space= true;
+  compiled_token_array[tok].m_start_expr= false;
+}
+
+void set_start_expr_token(int tok)
+{
+  compiled_token_array[tok].m_start_expr= true;
 }
 
 void compute_tokens()
@@ -91,6 +101,8 @@
   {
     compiled_token_array[tok].m_token_string= "(unknown)";
     compiled_token_array[tok].m_token_length= 9;
+    compiled_token_array[tok].m_append_space= true;
+    compiled_token_array[tok].m_start_expr= false;
   }
 
   /*
@@ -102,6 +114,7 @@
     str[0]= (char) tok;
     compiled_token_array[tok].m_token_string= str;
     compiled_token_array[tok].m_token_length= 1;
+    compiled_token_array[tok].m_append_space= true;
   }
 
   max_token_seen= 255;
@@ -202,6 +215,71 @@
   max_token_seen++;
   tok_pfs_unused= max_token_seen;
   set_token(tok_pfs_unused, "UNUSED");
+
+  /*
+    Fix whitespace for some special tokens.
+  */
+
+  /*
+    The lexer parses "@@variable" as '@', '@', 'variable',
+    returning a token for '@' alone.
+
+    This is incorrect, '@' is not really a token,
+    because the syntax "@ @ variable" (with spaces) is not accepted:
+    The lexer keeps some internal state after the '@' fake token.
+
+    To work around this, digest text are printed as "@@variable".
+  */
+  compiled_token_array[(int) '@'].m_append_space= false;
+
+  /*
+    Define additional properties for tokens.
+
+    List all the token that are followed by an expression.
+    This is needed to differentiate unary from binary
+    '+' and '-' operators, because we want to:
+    - reduce <unary +> <NUM> to <?>,
+    - preserve <...> <binary +> <NUM> as is.
+  */
+  set_start_expr_token('(');
+  set_start_expr_token(',');
+  set_start_expr_token(EVERY_SYM);
+  set_start_expr_token(AT_SYM);
+  set_start_expr_token(STARTS_SYM);
+  set_start_expr_token(ENDS_SYM);
+  set_start_expr_token(DEFAULT);
+  set_start_expr_token(RETURN_SYM);
+  set_start_expr_token(IF);
+  set_start_expr_token(ELSEIF_SYM);
+  set_start_expr_token(CASE_SYM);
+  set_start_expr_token(WHEN_SYM);
+  set_start_expr_token(WHILE_SYM);
+  set_start_expr_token(UNTIL_SYM);
+  set_start_expr_token(SELECT_SYM);
+
+  set_start_expr_token(OR_SYM);
+  set_start_expr_token(OR2_SYM);
+  set_start_expr_token(XOR);
+  set_start_expr_token(AND_SYM);
+  set_start_expr_token(AND_AND_SYM);
+  set_start_expr_token(NOT_SYM);
+  set_start_expr_token(BETWEEN_SYM);
+  set_start_expr_token(LIKE);
+  set_start_expr_token(REGEXP);
+
+  set_start_expr_token('|');
+  set_start_expr_token('&');
+  set_start_expr_token(SHIFT_LEFT);
+  set_start_expr_token(SHIFT_RIGHT);
+  set_start_expr_token('+');
+  set_start_expr_token('-');
+  set_start_expr_token(INTERVAL_SYM);
+  set_start_expr_token('*');
+  set_start_expr_token('/');
+  set_start_expr_token('%');
+  set_start_expr_token(DIV_SYM);
+  set_start_expr_token(MOD_SYM);
+  set_start_expr_token('^');
 }
 
 void print_tokens()
@@ -214,20 +292,26 @@
 
   for (tok= 0; tok<256; tok++)
   {
-    printf("/* %03d */  { \"\\x%02x\", 1},\n", tok, tok);
+    printf("/* %03d */  { \"\\x%02x\", 1, %s, %s},\n",
+           tok,
+           tok,
+           compiled_token_array[tok].m_append_space ? "true" : "false",
+           compiled_token_array[tok].m_start_expr ? "true" : "false");
   }
 
   printf("/* PART 2: named tokens. */\n");
 
   for (tok= 256; tok<= max_token_seen; tok++)
   {
-    printf("/* %03d */  { \"%s\", %d},\n",
+    printf("/* %03d */  { \"%s\", %d, %s, %s},\n",
            tok,
            compiled_token_array[tok].m_token_string,
-           compiled_token_array[tok].m_token_length);
+           compiled_token_array[tok].m_token_length,
+           compiled_token_array[tok].m_append_space ? "true" : "false",
+           compiled_token_array[tok].m_start_expr ? "true" : "false");
   }
 
-  printf("/* DUMMY */ { \"\", 0}\n");
+  printf("/* DUMMY */ { \"\", 0, false, false}\n");
   printf("};\n");
 
   printf("/* PFS specific tokens. */\n");
@@ -254,6 +338,8 @@
   printf("{\n");
   printf("  const char *m_token_string;\n");
   printf("  int m_token_length;\n");
+  printf("  bool m_append_space;\n");
+  printf("  bool m_start_expr;\n");
   printf("};\n");
   printf("typedef struct lex_token_string lex_token_string;\n");
 
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_account.cc percona-xtrabackup-2.3.7/storage/perfschema/pfs_account.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_account.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_account.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -527,9 +527,7 @@
                     account->m_key.m_key_length));
   if (entry && (entry != MY_ERRPTR))
   {
-    PFS_account *pfs;
-    pfs= *entry;
-    DBUG_ASSERT(pfs == account);
+    DBUG_ASSERT(*entry == account);
     if (account->get_refcount() == 0)
     {
       lf_hash_delete(&account_hash, pins,
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs.cc percona-xtrabackup-2.3.7/storage/perfschema/pfs.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -4455,7 +4455,7 @@
       pfs->m_sort_scan= 0;
       pfs->m_no_index_used= 0;
       pfs->m_no_good_index_used= 0;
-      digest_reset(& pfs->m_digest_storage);
+      pfs->m_digest_storage.reset();
 
       /* New stages will have this statement as parent */
       PFS_events_stages *child_stage= & pfs_thread->m_stage_current;
@@ -4484,11 +4484,7 @@
 
   if (flag_statements_digest)
   {
-    const CHARSET_INFO *cs= static_cast <const CHARSET_INFO*> (charset);
     flags|= STATE_FLAG_DIGEST;
-    state->m_digest_state.m_last_id_index= 0;
-    digest_reset(& state->m_digest_state.m_digest_storage);
-    state->m_digest_state.m_digest_storage.m_charset_number= cs->number;
   }
 
   state->m_discarded= false;
@@ -4512,6 +4508,8 @@
   state->m_no_index_used= 0;
   state->m_no_good_index_used= 0;
 
+  state->m_digest= NULL;
+
   state->m_schema_name_length= 0;
 
   return reinterpret_cast<PSI_statement_locker*> (state);
@@ -4781,11 +4779,11 @@
   PFS_statement_stat *event_name_array;
   uint index= klass->m_event_name_index;
   PFS_statement_stat *stat;
-  
+
   /*
    Capture statement stats by digest.
   */
-  PSI_digest_storage *digest_storage= NULL;
+  const sql_digest_storage *digest_storage= NULL;
   PFS_statement_stat *digest_stat= NULL;
 
   if (flags & STATE_FLAG_THREAD)
@@ -4798,11 +4796,15 @@
 
     if (flags & STATE_FLAG_DIGEST)
     {
-      digest_storage= &state->m_digest_state.m_digest_storage;
-      /* Populate PFS_statements_digest_stat with computed digest information.*/
-      digest_stat= find_or_create_digest(thread, digest_storage,
-                                         state->m_schema_name,
-                                         state->m_schema_name_length);
+      digest_storage= state->m_digest;
+
+      if (digest_storage != NULL)
+      {
+        /* Populate PFS_statements_digest_stat with computed digest information.*/
+        digest_stat= find_or_create_digest(thread, digest_storage,
+                                           state->m_schema_name,
+                                           state->m_schema_name_length);
+      }
     }
 
     if (flags & STATE_FLAG_EVENT)
@@ -4839,7 +4841,7 @@
       pfs->m_timer_end= timer_end;
       pfs->m_end_event_id= thread->m_event_id;
 
-      if (flags & STATE_FLAG_DIGEST)
+      if (digest_storage != NULL)
       {
         /*
           The following columns in events_statement_current:
@@ -4847,7 +4849,7 @@
           - DIGEST_TEXT
           are computed from the digest storage.
         */
-        digest_copy(& pfs->m_digest_storage, digest_storage);
+        pfs->m_digest_storage.copy(digest_storage);
       }
 
       if (flag_events_statements_history)
@@ -4870,11 +4872,15 @@
       if (thread != NULL)
       {
         /* Set digest stat. */
-        digest_storage= &state->m_digest_state.m_digest_storage;
-        /* Populate statements_digest_stat with computed digest information. */
-        digest_stat= find_or_create_digest(thread, digest_storage,
-                                           state->m_schema_name,
-                                           state->m_schema_name_length);
+        digest_storage= state->m_digest;
+
+        if (digest_storage != NULL)
+        {
+          /* Populate statements_digest_stat with computed digest information. */
+          digest_stat= find_or_create_digest(thread, digest_storage,
+                                             state->m_schema_name,
+                                             state->m_schema_name_length);
+        }
       }
     }
 
@@ -4921,7 +4927,7 @@
     {
       digest_stat->aggregate_counted();
     }
-  
+
     digest_stat->m_lock_time+= state->m_lock_time;
     digest_stat->m_rows_sent+= state->m_rows_sent;
     digest_stat->m_rows_examined+= state->m_rows_examined;
@@ -5106,6 +5112,39 @@
   pfs_socket->m_thread_owner= my_pthread_getspecific_ptr(PFS_thread*, THR_PFS);
 }
 
+struct PSI_digest_locker*
+pfs_digest_start_v1(PSI_statement_locker *locker)
+{
+  PSI_statement_locker_state *statement_state;
+  statement_state= reinterpret_cast<PSI_statement_locker_state*> (locker);
+  DBUG_ASSERT(statement_state != NULL);
+
+  if (statement_state->m_discarded)
+    return NULL;
+
+  if (statement_state->m_flags & STATE_FLAG_DIGEST)
+  {
+    return reinterpret_cast<PSI_digest_locker*> (locker);
+  }
+
+  return NULL;
+}
+
+void pfs_digest_end_v1(PSI_digest_locker *locker, const sql_digest_storage *digest)
+{
+  PSI_statement_locker_state *statement_state;
+  statement_state= reinterpret_cast<PSI_statement_locker_state*> (locker);
+  DBUG_ASSERT(statement_state != NULL);
+  DBUG_ASSERT(digest != NULL);
+
+  if (statement_state->m_discarded)
+    return;
+
+  if (statement_state->m_flags & STATE_FLAG_DIGEST)
+  {
+    statement_state->m_digest= digest;
+  }
+}
 
 /**
   Implementation of the thread attribute connection interface
@@ -5243,7 +5282,7 @@
   set_socket_info_v1,
   set_socket_thread_owner_v1,
   pfs_digest_start_v1,
-  pfs_digest_add_token_v1,
+  pfs_digest_end_v1,
   set_thread_connect_attrs_v1,
 };
 
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_column_types.h percona-xtrabackup-2.3.7/storage/perfschema/pfs_column_types.h
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_column_types.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_column_types.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_digest.cc percona-xtrabackup-2.3.7/storage/perfschema/pfs_digest.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_digest.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_digest.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -28,54 +28,32 @@
 #include "pfs_digest.h"
 #include "pfs_global.h"
 #include "table_helper.h"
-#include "my_md5.h"
 #include "sql_lex.h"
 #include "sql_get_diagnostics.h"
 #include "sql_string.h"
 #include <string.h>
 
-/* Generated code */
-#include "../sql/sql_yacc.h"
-#include "../storage/perfschema/pfs_lex_token.h"
-
-/* Name pollution from sql/sql_lex.h */
-#ifdef LEX_YYSTYPE
-#undef LEX_YYSTYPE
-#endif
-
-#define LEX_YYSTYPE YYSTYPE
-
-/**
-  Token array :
-  Token array is an array of bytes to store tokens recieved during parsing.
-  Following is the way token array is formed.
-
-      ...<non-id-token><non-id-token><id-token><id_len><id_text>...
-
-  For Ex:
-  SELECT * FROM T1;
-  <SELECT_TOKEN><*><FROM_TOKEN><ID_TOKEN><2><T1>
-*/
-
 ulong digest_max= 0;
 ulong digest_lost= 0;
 
 /** EVENTS_STATEMENTS_HISTORY_LONG circular buffer. */
 PFS_statements_digest_stat *statements_digest_stat_array= NULL;
+static unsigned char *statements_digest_token_array= NULL;
 /** Consumer flag for table EVENTS_STATEMENTS_SUMMARY_BY_DIGEST. */
 bool flag_statements_digest= true;
 /**
   Current index in Stat array where new record is to be inserted.
   index 0 is reserved for "all else" case when entire array is full.
 */
-volatile uint32 digest_index= 1;
+volatile uint32 digest_index;
+bool digest_full= false;
 
 LF_HASH digest_hash;
 static bool digest_hash_inited= false;
 
 /**
   Initialize table EVENTS_STATEMENTS_SUMMARY_BY_DIGEST.
-  @param digest_sizing
+  @param param performance schema sizing
 */
 int init_digest(const PFS_global_param *param)
 {
@@ -87,19 +65,41 @@
   */
   digest_max= param->m_digest_sizing;
   digest_lost= 0;
+  digest_index= 1;
+  digest_full= false;
 
   if (digest_max == 0)
     return 0;
 
   statements_digest_stat_array=
-    PFS_MALLOC_ARRAY(digest_max, PFS_statements_digest_stat,
+    PFS_MALLOC_ARRAY(digest_max,
+                     PFS_statements_digest_stat,
                      MYF(MY_ZEROFILL));
+
   if (unlikely(statements_digest_stat_array == NULL))
+  {
+    cleanup_digest();
     return 1;
+  }
+
+  if (pfs_max_digest_length > 0)
+  {
+    statements_digest_token_array=
+      PFS_MALLOC_ARRAY(digest_max * pfs_max_digest_length,
+                       unsigned char,
+                       MYF(MY_ZEROFILL));
+
+    if (unlikely(statements_digest_token_array == NULL))
+    {
+      cleanup_digest();
+      return 1;
+    }
+  }
 
   for (index= 0; index < digest_max; index++)
   {
-    statements_digest_stat_array[index].reset_data();
+    statements_digest_stat_array[index].reset_data(statements_digest_token_array
+                                                   + index * pfs_max_digest_length, pfs_max_digest_length);
   }
 
   return 0;
@@ -110,7 +110,9 @@
 {
   /*  Free memory allocated to statements_digest_stat_array. */
   pfs_free(statements_digest_stat_array);
+  pfs_free(statements_digest_token_array);
   statements_digest_stat_array= NULL;
+  statements_digest_token_array= NULL;
 }
 
 C_MODE_START
@@ -170,10 +172,12 @@
 
 PFS_statement_stat*
 find_or_create_digest(PFS_thread *thread,
-                      PSI_digest_storage *digest_storage,
+                      const sql_digest_storage *digest_storage,
                       const char *schema_name,
                       uint schema_name_length)
 {
+  DBUG_ASSERT(digest_storage != NULL);
+
   if (statements_digest_stat_array == NULL)
     return NULL;
 
@@ -192,9 +196,8 @@
   PFS_digest_key hash_key;
   memset(& hash_key, 0, sizeof(hash_key));
   /* Compute MD5 Hash of the tokens received. */
-  compute_md5_hash((char *) hash_key.m_md5,
-                   (char *) digest_storage->m_token_array,
-                   digest_storage->m_byte_count);
+  compute_digest_md5(digest_storage, hash_key.m_md5);
+  memcpy((void*)& digest_storage->m_md5, &hash_key.m_md5, MD5_HASH_SIZE);
   /* Add the current schema to the key */
   hash_key.m_schema_name_length= schema_name_length;
   if (schema_name_length > 0)
@@ -227,8 +230,7 @@
 
   lf_hash_search_unpin(pins);
 
-  /* Dirty read of digest_index */
-  if (digest_index == 0)
+  if (digest_full)
   {
     /*  digest_stat array is full. Add stat at index 0 and return. */
     pfs= &statements_digest_stat_array[0];
@@ -244,7 +246,7 @@
   if (safe_index >= digest_max)
   {
     /* The digest array is now full. */
-    digest_index= 0;
+    digest_full= true;
     pfs= &statements_digest_stat_array[0];
 
     if (pfs->m_first_seen == 0)
@@ -263,7 +265,7 @@
     Copy digest storage to statement_digest_stat_array so that it could be
     used later to generate digest text.
   */
-  digest_copy(& pfs->m_digest_storage, digest_storage);
+  pfs->m_digest_storage.copy(digest_storage);
 
   pfs->m_first_seen= now;
   pfs->m_last_seen= now;
@@ -313,9 +315,9 @@
   return;
 }
 
-void PFS_statements_digest_stat::reset_data()
+void PFS_statements_digest_stat::reset_data(unsigned char *token_array, uint length)
 {
-  digest_reset(& m_digest_storage);
+  m_digest_storage.reset(token_array, length);
   m_stat.reset();
   m_first_seen= 0;
   m_last_seen= 0;
@@ -345,7 +347,7 @@
   for (index= 0; index < digest_max; index++)
   {
     statements_digest_stat_array[index].reset_index(thread);
-    statements_digest_stat_array[index].reset_data();
+    statements_digest_stat_array[index].reset_data(statements_digest_token_array + index * pfs_max_digest_length, pfs_max_digest_length);
   }
 
   /*
@@ -353,397 +355,6 @@
     to be inserted in statements_digest_stat_array.
   */
   digest_index= 1;
+  digest_full= false;
 }
 
-/*
-  Iterate token array and updates digest_text.
-*/
-void get_digest_text(char* digest_text, PSI_digest_storage* digest_storage)
-{
-  DBUG_ASSERT(digest_storage != NULL);
-  bool truncated= false;
-  int byte_count= digest_storage->m_byte_count;
-  char *digest_output= digest_text;
-  int bytes_needed= 0;
-  uint tok= 0;
-  int current_byte= 0;
-  lex_token_string *tok_data;
-  /* -4 is to make sure extra space for '...' and a '\0' at the end. */
-  int bytes_available= COL_DIGEST_TEXT_SIZE - 4;
-
-  if (byte_count <= 0 || byte_count > PSI_MAX_DIGEST_STORAGE_SIZE)
-  {
-    *digest_text= '\0';
-    return;
-  }
-
-  /* Convert text to utf8 */
-  const CHARSET_INFO *from_cs= get_charset(digest_storage->m_charset_number, MYF(0));
-  const CHARSET_INFO *to_cs= &my_charset_utf8_bin;
-
-  if (from_cs == NULL)
-  {
-    /*
-      Can happen, as we do dirty reads on digest_storage,
-      which can be written to in another thread.
-    */
-    *digest_text= '\0';
-    return;
-  }
-
-  /*
-     Max converted size is number of characters * max multibyte length of the
-     target charset, which is 4 for UTF8.
-   */
-  const uint max_converted_size= PSI_MAX_DIGEST_STORAGE_SIZE * 4;
-  char id_buffer[max_converted_size];
-  char *id_string;
-  int  id_length;
-  bool convert_text= !my_charset_same(from_cs, to_cs);
-
-  DBUG_ASSERT(byte_count <= PSI_MAX_DIGEST_STORAGE_SIZE);
-
-  while ((current_byte < byte_count) &&
-         (bytes_available > 0) &&
-         !truncated)
-  {
-    current_byte= read_token(digest_storage, current_byte, &tok);
-
-    if (tok <= 0 || tok >= array_elements(lex_token_array))
-    {
-      *digest_text='\0';
-      return;
-    }
-
-    tok_data= &lex_token_array[tok];
-
-    switch (tok)
-    {
-    /* All identifiers are printed with their name. */
-    case IDENT:
-    case IDENT_QUOTED:
-      {
-        char *id_ptr;
-        int id_len;
-        uint err_cs= 0;
-
-        /* Get the next identifier from the storage buffer. */
-        current_byte= read_identifier(digest_storage, current_byte,
-                                      &id_ptr, &id_len);
-        if (convert_text)
-        {
-          /* Verify that the converted text will fit. */
-          if (to_cs->mbmaxlen*id_len > max_converted_size)
-          {
-            truncated= true;
-            break;
-          }
-          /* Convert identifier string into the storage character set. */
-          id_length= my_convert(id_buffer, max_converted_size, to_cs,
-                                id_ptr, id_len, from_cs, &err_cs);
-          id_string= id_buffer;
-        }
-        else
-        {
-          id_string= id_ptr;
-          id_length= id_len;
-        }
-
-        if (id_length == 0 || err_cs != 0)
-        {
-          truncated= true;
-          break;
-        }
-        /* Copy the converted identifier into the digest string. */
-        bytes_needed= id_length + (tok == IDENT ? 1 : 3);
-        if (bytes_needed <= bytes_available)
-        {
-          if (tok == IDENT_QUOTED)
-            *digest_output++= '`';
-          if (id_length > 0)
-          {
-            memcpy(digest_output, id_string, id_length);
-            digest_output+= id_length;
-          }
-          if (tok == IDENT_QUOTED)
-            *digest_output++= '`';
-          *digest_output++= ' ';
-          bytes_available-= bytes_needed;
-        }
-        else
-        {
-          truncated= true;
-        }
-      }
-      break;
-
-    /* Everything else is printed as is. */
-    default:
-      /*
-        Make sure not to overflow digest_text buffer.
-        +1 is to make sure extra space for ' '.
-      */
-      int tok_length= tok_data->m_token_length;
-      bytes_needed= tok_length + 1;
-
-      if (bytes_needed <= bytes_available)
-      {
-        strncpy(digest_output, tok_data->m_token_string, tok_length);
-        digest_output+= tok_length;
-        *digest_output++= ' ';
-        bytes_available-= bytes_needed;
-      }
-      else
-      {
-        truncated= true;
-      }
-      break;
-    }
-  }
-
-  /* Truncate digest text in case of long queries. */
-  if (digest_storage->m_full || truncated)
-  {
-    strcpy(digest_output, "...");
-    digest_output+= 3;
-  }
-
-  *digest_output= '\0';
-}
-
-static inline uint peek_token(const PSI_digest_storage *digest, int index)
-{
-  uint token;
-  DBUG_ASSERT(index >= 0);
-  DBUG_ASSERT(index + PFS_SIZE_OF_A_TOKEN <= digest->m_byte_count);
-  DBUG_ASSERT(digest->m_byte_count <=  PSI_MAX_DIGEST_STORAGE_SIZE);
-
-  token= ((digest->m_token_array[index + 1])<<8) | digest->m_token_array[index];
-  return token;
-}
-
-/**
-  Function to read last two tokens from token array. If an identifier
-  is found, do not look for token before that.
-*/
-static inline void peek_last_two_tokens(const PSI_digest_storage* digest_storage,
-                                        int last_id_index, uint *t1, uint *t2)
-{
-  int byte_count= digest_storage->m_byte_count;
-  int peek_index= byte_count - PFS_SIZE_OF_A_TOKEN;
-
-  if (last_id_index <= peek_index)
-  {
-    /* Take last token. */
-    *t1= peek_token(digest_storage, peek_index);
-
-    peek_index-= PFS_SIZE_OF_A_TOKEN;
-    if (last_id_index <= peek_index)
-    {
-      /* Take 2nd token from last. */
-      *t2= peek_token(digest_storage, peek_index);
-    }
-    else
-    {
-      *t2= TOK_PFS_UNUSED;
-    }
-  }
-  else
-  {
-    *t1= TOK_PFS_UNUSED;
-    *t2= TOK_PFS_UNUSED;
-  }
-}
-
-struct PSI_digest_locker* pfs_digest_start_v1(PSI_statement_locker *locker)
-{
-  PSI_statement_locker_state *statement_state;
-  statement_state= reinterpret_cast<PSI_statement_locker_state*> (locker);
-  DBUG_ASSERT(statement_state != NULL);
-
-  if (statement_state->m_discarded)
-    return NULL;
-
-  if (statement_state->m_flags & STATE_FLAG_DIGEST)
-  {
-    PSI_digest_locker_state *digest_state;
-    digest_state= &statement_state->m_digest_state;
-    return reinterpret_cast<PSI_digest_locker*> (digest_state);
-  }
-
-  return NULL;
-}
-
-PSI_digest_locker* pfs_digest_add_token_v1(PSI_digest_locker *locker,
-                                           uint token,
-                                           OPAQUE_LEX_YYSTYPE *yylval)
-{
-  PSI_digest_locker_state *state= NULL;
-  PSI_digest_storage      *digest_storage= NULL;
-
-  state= reinterpret_cast<PSI_digest_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
-
-  digest_storage= &state->m_digest_storage;
-
-  /*
-    Stop collecting further tokens if digest storage is full or
-    if END token is received.
-  */
-  if (digest_storage->m_full || token == END_OF_INPUT)
-    return NULL;
-
-  /*
-    Take last_token 2 tokens collected till now. These tokens will be used
-    in reduce for normalisation. Make sure not to consider ID tokens in reduce.
-  */
-  uint last_token;
-  uint last_token2;
-
-  switch (token)
-  {
-    case BIN_NUM:
-    case DECIMAL_NUM:
-    case FLOAT_NUM:
-    case HEX_NUM:
-    case LEX_HOSTNAME:
-    case LONG_NUM:
-    case NUM:
-    case TEXT_STRING:
-    case NCHAR_STRING:
-    case ULONGLONG_NUM:
-    {
-      /*
-        REDUCE:
-        TOK_PFS_GENERIC_VALUE := BIN_NUM | DECIMAL_NUM | ... | ULONGLONG_NUM
-      */
-      token= TOK_PFS_GENERIC_VALUE;
-    }
-    /* fall through */
-    case NULL_SYM:
-    {
-      peek_last_two_tokens(digest_storage, state->m_last_id_index,
-                           &last_token, &last_token2);
-
-      if ((last_token2 == TOK_PFS_GENERIC_VALUE ||
-           last_token2 == TOK_PFS_GENERIC_VALUE_LIST ||
-           last_token2 == NULL_SYM) &&
-          (last_token == ','))
-      {
-        /*
-          REDUCE:
-          TOK_PFS_GENERIC_VALUE_LIST :=
-            (TOK_PFS_GENERIC_VALUE|NULL_SYM) ',' (TOK_PFS_GENERIC_VALUE|NULL_SYM)
-
-          REDUCE:
-          TOK_PFS_GENERIC_VALUE_LIST :=
-            TOK_PFS_GENERIC_VALUE_LIST ',' (TOK_PFS_GENERIC_VALUE|NULL_SYM)
-        */
-        digest_storage->m_byte_count-= 2*PFS_SIZE_OF_A_TOKEN;
-        token= TOK_PFS_GENERIC_VALUE_LIST;
-      }
-      /*
-        Add this token or the resulting reduce to digest storage.
-      */
-      store_token(digest_storage, token);
-      break;
-    }
-    case ')':
-    {
-      peek_last_two_tokens(digest_storage, state->m_last_id_index,
-                           &last_token, &last_token2);
-
-      if (last_token == TOK_PFS_GENERIC_VALUE &&
-          last_token2 == '(')
-      {
-        /*
-          REDUCE:
-          TOK_PFS_ROW_SINGLE_VALUE :=
-            '(' TOK_PFS_GENERIC_VALUE ')'
-        */
-        digest_storage->m_byte_count-= 2*PFS_SIZE_OF_A_TOKEN;
-        token= TOK_PFS_ROW_SINGLE_VALUE;
-
-        /* Read last two tokens again */
-        peek_last_two_tokens(digest_storage, state->m_last_id_index,
-                             &last_token, &last_token2);
-
-        if ((last_token2 == TOK_PFS_ROW_SINGLE_VALUE ||
-             last_token2 == TOK_PFS_ROW_SINGLE_VALUE_LIST) &&
-            (last_token == ','))
-        {
-          /*
-            REDUCE:
-            TOK_PFS_ROW_SINGLE_VALUE_LIST :=
-              TOK_PFS_ROW_SINGLE_VALUE ',' TOK_PFS_ROW_SINGLE_VALUE
-
-            REDUCE:
-            TOK_PFS_ROW_SINGLE_VALUE_LIST :=
-              TOK_PFS_ROW_SINGLE_VALUE_LIST ',' TOK_PFS_ROW_SINGLE_VALUE
-          */
-          digest_storage->m_byte_count-= 2*PFS_SIZE_OF_A_TOKEN;
-          token= TOK_PFS_ROW_SINGLE_VALUE_LIST;
-        }
-      }
-      else if (last_token == TOK_PFS_GENERIC_VALUE_LIST &&
-               last_token2 == '(')
-      {
-        /*
-          REDUCE:
-          TOK_PFS_ROW_MULTIPLE_VALUE :=
-            '(' TOK_PFS_GENERIC_VALUE_LIST ')'
-        */
-        digest_storage->m_byte_count-= 2*PFS_SIZE_OF_A_TOKEN;
-        token= TOK_PFS_ROW_MULTIPLE_VALUE;
-
-        /* Read last two tokens again */
-        peek_last_two_tokens(digest_storage, state->m_last_id_index,
-                             &last_token, &last_token2);
-
-        if ((last_token2 == TOK_PFS_ROW_MULTIPLE_VALUE ||
-             last_token2 == TOK_PFS_ROW_MULTIPLE_VALUE_LIST) &&
-            (last_token == ','))
-        {
-          /*
-            REDUCE:
-            TOK_PFS_ROW_MULTIPLE_VALUE_LIST :=
-              TOK_PFS_ROW_MULTIPLE_VALUE ',' TOK_PFS_ROW_MULTIPLE_VALUE
-
-            REDUCE:
-            TOK_PFS_ROW_MULTIPLE_VALUE_LIST :=
-              TOK_PFS_ROW_MULTIPLE_VALUE_LIST ',' TOK_PFS_ROW_MULTIPLE_VALUE
-          */
-          digest_storage->m_byte_count-= 2*PFS_SIZE_OF_A_TOKEN;
-          token= TOK_PFS_ROW_MULTIPLE_VALUE_LIST;
-        }
-      }
-      /*
-        Add this token or the resulting reduce to digest storage.
-      */
-      store_token(digest_storage, token);
-      break;
-    }
-    case IDENT:
-    case IDENT_QUOTED:
-    {
-      LEX_YYSTYPE *lex_token= (LEX_YYSTYPE*) yylval;
-      char *yytext= lex_token->lex_str.str;
-      int yylen= lex_token->lex_str.length;
-
-      /* Add this token and identifier string to digest storage. */
-      store_token_identifier(digest_storage, token, yylen, yytext);
-
-      /* Update the index of last identifier found. */
-      state->m_last_id_index= digest_storage->m_byte_count;
-      break;
-    }
-    default:
-    {
-      /* Add this token to digest storage. */
-      store_token(digest_storage, token);
-      break;
-    }
-  }
-
-  return locker;
-}
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_digest.h percona-xtrabackup-2.3.7/storage/perfschema/pfs_digest.h
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_digest.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_digest.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2015, 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
@@ -24,23 +24,19 @@
 #include "pfs_column_types.h"
 #include "lf.h"
 #include "pfs_stat.h"
-
-#define PFS_SIZE_OF_A_TOKEN 2
+#include "sql_digest.h"
 
 extern bool flag_statements_digest;
 extern ulong digest_max;
 extern ulong digest_lost;
 struct PFS_thread;
 
-/* Fixed, per MD5 hash. */
-#define PFS_MD5_SIZE 16
-
 /**
   Structure to store a MD5 hash value (digest) for a statement.
 */
 struct PFS_digest_key
 {
-  unsigned char m_md5[PFS_MD5_SIZE];
+  unsigned char m_md5[MD5_HASH_SIZE];
   char m_schema_name[NAME_LEN];
   uint m_schema_name_length;
 };
@@ -52,7 +48,7 @@
   PFS_digest_key m_digest_key;
 
   /** Digest Storage. */
-  PSI_digest_storage m_digest_storage;
+  sql_digest_storage m_digest_storage;
 
   /** Statement stat. */
   PFS_statement_stat m_stat;
@@ -62,7 +58,7 @@
   ulonglong m_last_seen;
 
   /** Reset data for this record. */
-  void reset_data();
+  void reset_data(unsigned char* token_array, uint length);
   /** Reset data and remove index for this record. */
   void reset_index(PFS_thread *thread);
 };
@@ -73,147 +69,15 @@
 int init_digest_hash(void);
 void cleanup_digest_hash(void);
 PFS_statement_stat* find_or_create_digest(PFS_thread *thread,
-                                          PSI_digest_storage *digest_storage,
+                                          const sql_digest_storage *digest_storage,
                                           const char *schema_name,
                                           uint schema_name_length);
 
-void get_digest_text(char *digest_text, PSI_digest_storage *digest_storage);
-
 void reset_esms_by_digest();
 
 /* Exposing the data directly, for iterators. */
 extern PFS_statements_digest_stat *statements_digest_stat_array;
 
-/* Instrumentation callbacks for pfs.cc */
-
-struct PSI_digest_locker *pfs_digest_start_v1(PSI_statement_locker *locker);
-PSI_digest_locker *pfs_digest_add_token_v1(PSI_digest_locker *locker,
-                                           uint token,
-                                           OPAQUE_LEX_YYSTYPE *yylval);
-
-static inline void digest_reset(PSI_digest_storage *digest)
-{
-  digest->m_full= false;
-  digest->m_byte_count= 0;
-  digest->m_charset_number= 0;
-}
-
-static inline void digest_copy(PSI_digest_storage *to, const PSI_digest_storage *from)
-{
-  if (from->m_byte_count > 0)
-  {
-    to->m_full= from->m_full;
-    to->m_byte_count= from->m_byte_count;
-    to->m_charset_number= from->m_charset_number;
-    DBUG_ASSERT(to->m_byte_count <= PSI_MAX_DIGEST_STORAGE_SIZE);
-    memcpy(to->m_token_array, from->m_token_array, to->m_byte_count);
-  }
-  else
-  {
-    DBUG_ASSERT(from->m_byte_count == 0);
-    to->m_full= false;
-    to->m_byte_count= 0;
-    to->m_charset_number= 0;
-  }
-}
-
-/** 
-  Read a single token from token array.
-*/
-inline int read_token(PSI_digest_storage *digest_storage,
-                      int index, uint *tok)
-{
-  int safe_byte_count= digest_storage->m_byte_count;
-
-  if (index + PFS_SIZE_OF_A_TOKEN <= safe_byte_count &&
-      safe_byte_count <= PSI_MAX_DIGEST_STORAGE_SIZE)
-  {
-    unsigned char *src= & digest_storage->m_token_array[index];
-    *tok= src[0] | (src[1] << 8);
-    return index + PFS_SIZE_OF_A_TOKEN;
-  }
-
-  /* The input byte stream is exhausted. */
-  *tok= 0;
-  return PSI_MAX_DIGEST_STORAGE_SIZE + 1;
-}
-
-/**
-  Store a single token in token array.
-*/
-inline void store_token(PSI_digest_storage* digest_storage, uint token)
-{
-  DBUG_ASSERT(digest_storage->m_byte_count >= 0);
-  DBUG_ASSERT(digest_storage->m_byte_count <= PSI_MAX_DIGEST_STORAGE_SIZE);
-
-  if (digest_storage->m_byte_count + PFS_SIZE_OF_A_TOKEN <= PSI_MAX_DIGEST_STORAGE_SIZE)
-  {
-    unsigned char* dest= & digest_storage->m_token_array[digest_storage->m_byte_count];
-    dest[0]= token & 0xff;
-    dest[1]= (token >> 8) & 0xff;
-    digest_storage->m_byte_count+= PFS_SIZE_OF_A_TOKEN; 
-  }
-  else
-  {
-    digest_storage->m_full= true;
-  }
-}
-
-/**
-  Read an identifier from token array.
-*/
-inline int read_identifier(PSI_digest_storage* digest_storage,
-                           int index, char ** id_string, int *id_length)
-{
-  int new_index;
-  DBUG_ASSERT(index <= digest_storage->m_byte_count);
-  DBUG_ASSERT(digest_storage->m_byte_count <= PSI_MAX_DIGEST_STORAGE_SIZE);
-
-  /*
-    token + length + string are written in an atomic way,
-    so we do always expect a length + string here
-  */
-  unsigned char *src= & digest_storage->m_token_array[index];
-  uint length= src[0] | (src[1] << 8);
-  *id_string= (char *) (src + 2);
-  *id_length= length;
-
-  new_index= index + PFS_SIZE_OF_A_TOKEN + length;
-  DBUG_ASSERT(new_index <= digest_storage->m_byte_count);
-  return new_index;
-}
-
-/**
-  Store an identifier in token array.
-*/
-inline void store_token_identifier(PSI_digest_storage* digest_storage,
-                                   uint token,
-                                   uint id_length, const char *id_name)
-{
-  DBUG_ASSERT(digest_storage->m_byte_count >= 0);
-  DBUG_ASSERT(digest_storage->m_byte_count <= PSI_MAX_DIGEST_STORAGE_SIZE);
-
-  uint bytes_needed= 2 * PFS_SIZE_OF_A_TOKEN + id_length;
-  if (digest_storage->m_byte_count + bytes_needed <= PSI_MAX_DIGEST_STORAGE_SIZE)
-  {
-    unsigned char* dest= & digest_storage->m_token_array[digest_storage->m_byte_count];
-    /* Write the token */
-    dest[0]= token & 0xff;
-    dest[1]= (token >> 8) & 0xff;
-    /* Write the string length */
-    dest[2]= id_length & 0xff;
-    dest[3]= (id_length >> 8) & 0xff;
-    /* Write the string data */
-    if (id_length > 0)
-      memcpy((char *)(dest + 4), id_name, id_length);
-    digest_storage->m_byte_count+= bytes_needed; 
-  }
-  else
-  {
-    digest_storage->m_full= true;
-  }
-}
-
 extern LF_HASH digest_hash;
 
 #endif
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_engine_table.cc percona-xtrabackup-2.3.7/storage/perfschema/pfs_engine_table.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_engine_table.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_engine_table.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -1415,12 +1415,64 @@
       name= "host_cache.size";
       size= sizeof(Host_entry);
       break;
+    case 154:
+      name= "(history_long_statements_digest_token_array).row_count";
+      size= events_statements_history_long_size;
+      break;
+    case 155:
+      name= "(history_long_statements_digest_token_array).row_size";
+      size= pfs_max_digest_length;
+      break;
+    case 156:
+      name= "(history_long_statements_digest_token_array).memory";
+      size= events_statements_history_long_size * pfs_max_digest_length;
+      total_memory+= size;
+      break;
+    case 157:
+      name= "(history_statements_digest_token_array).row_count";
+      size= thread_max * events_statements_history_per_thread;
+      break;
+    case 158:
+      name= "(history_statements_digest_token_array).row_size";
+      size= pfs_max_digest_length;
+      break;
+    case 159:
+      name= "(history_statements_digest_token_array).memory";
+      size= thread_max * events_statements_history_per_thread * pfs_max_digest_length;
+      total_memory+= size;
+      break;
+    case 160:
+      name= "(current_statements_digest_token_array).row_count";
+      size= thread_max * statement_stack_max;
+      break;
+    case 161:
+      name= "(current_statements_digest_token_array).row_size";
+      size= pfs_max_digest_length;
+      break;
+    case 162:
+      name= "(current_statements_digest_token_array).memory";
+      size= thread_max * statement_stack_max * pfs_max_digest_length;
+      total_memory+= size;
+      break;
+    case 163:
+      name= "(statements_digest_token_array).row_count";
+      size= digest_max;
+      break;
+    case 164:
+      name= "(statements_digest_token_array).row_size";
+      size= pfs_max_digest_length;
+      break;
+    case 165:
+      name= "(statements_digest_token_array).memory";
+      size= digest_max * pfs_max_digest_length;
+      total_memory+= size;
+      break;
 
     /*
       This case must be last,
       for aggregation in total_memory.
     */
-    case 154:
+    case 166:
       name= "performance_schema.memory";
       size= total_memory;
       /* This will fail if something is not advertised here */
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_events_statements.cc percona-xtrabackup-2.3.7/storage/perfschema/pfs_events_statements.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_events_statements.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_events_statements.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -44,6 +44,7 @@
 volatile uint32 events_statements_history_long_index= 0;
 /** EVENTS_STATEMENTS_HISTORY_LONG circular buffer. */
 PFS_events_statements *events_statements_history_long_array= NULL;
+static unsigned char *h_long_stmts_digest_token_array= NULL;
 
 /**
   Initialize table EVENTS_STATEMENTS_HISTORY_LONG.
@@ -51,6 +52,7 @@
 */
 int init_events_statements_history_long(uint events_statements_history_long_sizing)
 {
+  uint index;
   events_statements_history_long_size= events_statements_history_long_sizing;
   events_statements_history_long_full= false;
   PFS_atomic::store_u32(&events_statements_history_long_index, 0);
@@ -62,20 +64,50 @@
     PFS_MALLOC_ARRAY(events_statements_history_long_size, PFS_events_statements,
                      MYF(MY_ZEROFILL));
 
-  return (events_statements_history_long_array ? 0 : 1);
+  if (events_statements_history_long_array == NULL)
+  {
+    cleanup_events_statements_history_long();
+    return 1;
+  }
+
+  if (pfs_max_digest_length > 0)
+  {
+    h_long_stmts_digest_token_array=
+      PFS_MALLOC_ARRAY(events_statements_history_long_size * pfs_max_digest_length,
+                       unsigned char, MYF(MY_ZEROFILL));
+    if (h_long_stmts_digest_token_array == NULL)
+    {
+      cleanup_events_statements_history_long();
+      return 1;
+    }
+  }
+
+  for (index= 0; index < events_statements_history_long_size; index++)
+  {
+    events_statements_history_long_array[index].m_digest_storage.reset(h_long_stmts_digest_token_array
+                                                                       + index * pfs_max_digest_length, pfs_max_digest_length);
+  }
+
+  return 0;
 }
 
 /** Cleanup table EVENTS_STATEMENTS_HISTORY_LONG. */
 void cleanup_events_statements_history_long(void)
 {
   pfs_free(events_statements_history_long_array);
+  pfs_free(h_long_stmts_digest_token_array);
   events_statements_history_long_array= NULL;
+  h_long_stmts_digest_token_array= NULL;
 }
 
 static inline void copy_events_statements(PFS_events_statements *dest,
                                       const PFS_events_statements *source)
 {
-  memcpy(dest, source, sizeof(PFS_events_statements));
+  /* Copy all attributes except DIGEST */
+  memcpy(dest, source, my_offsetof(PFS_events_statements, m_digest_storage));
+
+  /* Copy DIGEST */
+  dest->m_digest_storage.copy(& source->m_digest_storage);
 }
 
 /**
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_events_statements.h percona-xtrabackup-2.3.7/storage/perfschema/pfs_events_statements.h
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_events_statements.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_events_statements.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -88,8 +88,12 @@
   ulonglong m_no_index_used;
   /** Optimizer metric, number of 'no good index used'. */
   ulonglong m_no_good_index_used;
-  /** Statement digest. */
-  PSI_digest_storage m_digest_storage;
+  /**
+    Statement digest.
+    This underlying token array storage pointer is immutable,
+    and always point to pre allocated memory.
+  */
+  sql_digest_storage m_digest_storage;
 };
 
 void insert_events_statements_history(PFS_thread *thread, PFS_events_statements *statement);
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_host.cc percona-xtrabackup-2.3.7/storage/perfschema/pfs_host.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_host.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_host.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -353,9 +353,7 @@
                     host->m_key.m_hash_key, host->m_key.m_key_length));
   if (entry && (entry != MY_ERRPTR))
   {
-    PFS_host *pfs;
-    pfs= *entry;
-    DBUG_ASSERT(pfs == host);
+    DBUG_ASSERT(*entry == host);
     if (host->get_refcount() == 0)
     {
       lf_hash_delete(&host_hash, pins,
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_instr.cc percona-xtrabackup-2.3.7/storage/perfschema/pfs_instr.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_instr.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_instr.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -94,6 +94,7 @@
 /** Number of EVENTS_STATEMENTS_HISTORY records per thread. */
 ulong events_statements_history_per_thread;
 uint statement_stack_max;
+uint pfs_max_digest_length= 0;
 /** Number of locker lost. @sa LOCKER_STACK_SIZE. */
 ulong locker_lost= 0;
 /** Number of statement lost. @sa STATEMENT_STACK_SIZE. */
@@ -176,6 +177,8 @@
 static PFS_events_stages *thread_stages_history_array= NULL;
 static PFS_events_statements *thread_statements_history_array= NULL;
 static PFS_events_statements *thread_statements_stack_array= NULL;
+static unsigned char *current_stmts_digest_token_array= NULL;
+static unsigned char *history_stmts_digest_token_array= NULL;
 static char *thread_session_connect_attrs_array= NULL;
 
 /** Hash table for instrumented files. */
@@ -190,6 +193,9 @@
 */
 int init_instruments(const PFS_global_param *param)
 {
+  PFS_events_statements *pfs_stmt;
+  unsigned char *pfs_tokens;
+
   uint thread_waits_history_sizing;
   uint thread_stages_history_sizing;
   uint thread_statements_history_sizing;
@@ -215,6 +221,9 @@
   file_handle_max= param->m_file_handle_sizing;
   file_handle_full= false;
   file_handle_lost= 0;
+
+  pfs_max_digest_length= param->m_max_digest_length;
+
   table_max= param->m_table_sizing;
   table_full= false;
   table_lost= 0;
@@ -254,6 +263,9 @@
     * session_connect_attrs_size_per_thread;
   session_connect_attrs_lost= 0;
 
+  size_t current_digest_tokens_sizing= param->m_thread_sizing * pfs_max_digest_length * statement_stack_max;
+  size_t history_digest_tokens_sizing= param->m_thread_sizing * pfs_max_digest_length * events_statements_history_per_thread;
+
   mutex_array= NULL;
   rwlock_array= NULL;
   cond_array= NULL;
@@ -266,6 +278,8 @@
   thread_stages_history_array= NULL;
   thread_statements_history_array= NULL;
   thread_statements_stack_array= NULL;
+  current_stmts_digest_token_array= NULL;
+  history_stmts_digest_token_array= NULL;
   thread_instr_class_waits_array= NULL;
   thread_instr_class_stages_array= NULL;
   thread_instr_class_statements_array= NULL;
@@ -407,6 +421,22 @@
       return 1;
   }
 
+  if (current_digest_tokens_sizing > 0)
+  {
+    current_stmts_digest_token_array=
+      (unsigned char *)pfs_malloc(current_digest_tokens_sizing, MYF(MY_ZEROFILL));
+    if (unlikely(current_stmts_digest_token_array == NULL))
+      return 1;
+  }
+
+  if (history_digest_tokens_sizing > 0)
+  {
+    history_stmts_digest_token_array=
+      (unsigned char *)pfs_malloc(history_digest_tokens_sizing, MYF(MY_ZEROFILL));
+    if (unlikely(history_stmts_digest_token_array == NULL))
+      return 1;
+  }
+
   for (index= 0; index < thread_max; index++)
   {
     thread_array[index].m_waits_history=
@@ -427,6 +457,22 @@
       &thread_session_connect_attrs_array[index * session_connect_attrs_size_per_thread];
   }
 
+  for (index= 0; index < thread_statements_stack_sizing; index++)
+  {
+    pfs_stmt= & thread_statements_stack_array[index];
+
+    pfs_tokens= & current_stmts_digest_token_array[index * pfs_max_digest_length];
+    pfs_stmt->m_digest_storage.reset(pfs_tokens, pfs_max_digest_length);
+  }
+
+  for (index= 0; index < thread_statements_history_sizing; index++)
+  {
+    pfs_stmt= & thread_statements_history_array[index];
+
+    pfs_tokens= & history_stmts_digest_token_array[index * pfs_max_digest_length];
+    pfs_stmt->m_digest_storage.reset(pfs_tokens, pfs_max_digest_length);
+  }
+
   if (stage_class_max > 0)
   {
     global_instr_class_stages_array=
@@ -497,6 +543,10 @@
   global_instr_class_statements_array= NULL;
   pfs_free(thread_session_connect_attrs_array);
   thread_session_connect_attrs_array=NULL;
+  pfs_free(current_stmts_digest_token_array);
+  current_stmts_digest_token_array= NULL;
+  pfs_free(history_stmts_digest_token_array);
+  history_stmts_digest_token_array= NULL;
 }
 
 C_MODE_START
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_instr.h percona-xtrabackup-2.3.7/storage/perfschema/pfs_instr.h
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_instr.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_instr.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -298,6 +298,8 @@
 
 /** Max size of the statements stack. */
 extern uint statement_stack_max;
+/** Max size of the digests token array. */
+extern uint pfs_max_digest_length;
 
 /**
   @def PFS_MAX_ALLOC_RETRY
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_server.cc percona-xtrabackup-2.3.7/storage/perfschema/pfs_server.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_server.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_server.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_server.h percona-xtrabackup-2.3.7/storage/perfschema/pfs_server.h
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_server.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_server.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -197,6 +197,8 @@
   /** Maximum number of session attribute strings per thread */
   long m_session_connect_attrs_sizing;
 
+  uint m_max_digest_length;
+
   /** Sizing hints, for auto tuning. */
   PFS_sizing_hints m_hints;
 };
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/pfs_user.cc percona-xtrabackup-2.3.7/storage/perfschema/pfs_user.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/pfs_user.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/pfs_user.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -346,9 +346,7 @@
                     user->m_key.m_hash_key, user->m_key.m_key_length));
   if (entry && (entry != MY_ERRPTR))
   {
-    PFS_user *pfs;
-    pfs= *entry;
-    DBUG_ASSERT(pfs == user);
+    DBUG_ASSERT(*entry == user);
     if (user->get_refcount() == 0)
     {
       lf_hash_delete(&user_hash, pins,
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/table_events_statements.cc percona-xtrabackup-2.3.7/storage/perfschema/table_events_statements.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/table_events_statements.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/table_events_statements.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -249,7 +249,7 @@
   &table_events_statements_current::delete_all_rows,
   NULL, /* get_row_count */
   1000, /* records */
-  sizeof(PFS_simple_index), /* ref length */
+  sizeof(pos_events_statements_current), /* ref length */
   &m_table_lock,
   &m_field_def,
   false /* checked */
@@ -302,7 +302,7 @@
   @param statement                      the statement the cursor is reading
 */
 void table_events_statements_common::make_row_part_1(PFS_events_statements *statement,
-                                                     PSI_digest_storage *digest)
+                                                     sql_digest_storage *digest)
 {
   const char *base;
   const char *safe_source_file;
@@ -367,46 +367,40 @@
   m_row.m_sort_scan= statement->m_sort_scan;
   m_row.m_no_index_used= statement->m_no_index_used;
   m_row.m_no_good_index_used= statement->m_no_good_index_used;
-  /* 
+  /*
     Making a copy of digest storage.
   */
-  digest_copy(digest, & statement->m_digest_storage);
+  digest->copy(& statement->m_digest_storage);
 
   m_row_exists= true;
   return;
 }
 
 
-void table_events_statements_common::make_row_part_2(PSI_digest_storage *digest)
+void table_events_statements_common::make_row_part_2(const sql_digest_storage *digest)
 {
   /*
     Filling up statement digest information.
   */
-  int safe_byte_count= digest->m_byte_count;
+  uint safe_byte_count= digest->m_byte_count;
   if (safe_byte_count > 0 &&
-      safe_byte_count <= PSI_MAX_DIGEST_STORAGE_SIZE)
+      safe_byte_count <= pfs_max_digest_length)
   {
-    PFS_digest_key md5;
-    compute_md5_hash((char *) md5.m_md5,
-                     (char *) digest->m_token_array,
-                     safe_byte_count);
-
     /* Generate the DIGEST string from the MD5 digest  */
-    MD5_HASH_TO_STRING(md5.m_md5,
+    MD5_HASH_TO_STRING(digest->m_md5,
                        m_row.m_digest.m_digest);
     m_row.m_digest.m_digest_length= MD5_HASH_TO_STRING_LENGTH;
 
     /* Generate the DIGEST_TEXT string from the token array */
-    get_digest_text(m_row.m_digest.m_digest_text, digest);
-    m_row.m_digest.m_digest_text_length= strlen(m_row.m_digest.m_digest_text);
+    compute_digest_text(digest, &m_row.m_digest.m_digest_text);
 
-    if (m_row.m_digest.m_digest_text_length == 0)
+    if (m_row.m_digest.m_digest_text.length() == 0)
       m_row.m_digest.m_digest_length= 0;
   }
   else
   {
     m_row.m_digest.m_digest_length= 0;
-    m_row.m_digest.m_digest_text_length= 0;
+    m_row.m_digest.m_digest_text.length(0);
   }
 
   return;
@@ -491,9 +485,9 @@
           f->set_null();
         break;
       case 11: /* DIGEST_TEXT */
-        if (m_row.m_digest.m_digest_text_length > 0)
-           set_field_longtext_utf8(f, m_row.m_digest.m_digest_text,
-                                   m_row.m_digest.m_digest_text_length);
+        if (m_row.m_digest.m_digest_text.length() > 0)
+           set_field_longtext_utf8(f, m_row.m_digest.m_digest_text.ptr(),
+                                   m_row.m_digest.m_digest_text.length());
         else
           f->set_null();
         break;
@@ -710,11 +704,11 @@
 void table_events_statements_current::make_row(PFS_thread *pfs_thread,
                                                PFS_events_statements *statement)
 {
-  PSI_digest_storage digest;
+  sql_digest_storage digest;
   pfs_lock lock;
   pfs_lock stmt_lock;
 
-  digest_reset(&digest);
+  digest.reset(m_token_array, MAX_DIGEST_STORAGE_SIZE);
   /* Protect this reader against thread termination. */
   pfs_thread->m_lock.begin_optimistic_lock(&lock);
   /* Protect this reader against writing on statement information. */
@@ -838,10 +832,10 @@
 void table_events_statements_history::make_row(PFS_thread *pfs_thread,
                                                PFS_events_statements *statement)
 {
-  PSI_digest_storage digest;
+  sql_digest_storage digest;
   pfs_lock lock;
 
-  digest_reset(&digest);
+  digest.reset(m_token_array, MAX_DIGEST_STORAGE_SIZE);
   /* Protect this reader against thread termination. */
   pfs_thread->m_lock.begin_optimistic_lock(&lock);
 
@@ -942,9 +936,9 @@
 
 void table_events_statements_history_long::make_row(PFS_events_statements *statement)
 {
-  PSI_digest_storage digest;
+  sql_digest_storage digest;
 
-  digest_reset(&digest);
+  digest.reset(m_token_array, MAX_DIGEST_STORAGE_SIZE);
   table_events_statements_common::make_row_part_1(statement, &digest);
 
   table_events_statements_common::make_row_part_2(&digest);
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/table_events_statements.h percona-xtrabackup-2.3.7/storage/perfschema/table_events_statements.h
--- percona-xtrabackup-2.2.3/storage/perfschema/table_events_statements.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/table_events_statements.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -175,14 +175,15 @@
   {}
 
   void make_row_part_1(PFS_events_statements *statement,
-                       PSI_digest_storage *digest);
+                       sql_digest_storage *digest);
 
-  void make_row_part_2(PSI_digest_storage *digest);
+  void make_row_part_2(const sql_digest_storage *digest);
 
   /** Current row. */
   row_events_statements m_row;
   /** True if the current row exists. */
   bool m_row_exists;
+  unsigned char m_token_array[MAX_DIGEST_STORAGE_SIZE];
 };
 
 /** Table PERFORMANCE_SCHEMA.EVENTS_STATEMENTS_CURRENT. */
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/table_helper.cc percona-xtrabackup-2.3.7/storage/perfschema/table_helper.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/table_helper.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/table_helper.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -25,6 +25,7 @@
 #include "pfs_host.h"
 #include "pfs_user.h"
 #include "pfs_account.h"
+#include "pfs_instr.h"
 
 int PFS_host_row::make_row(PFS_host *pfs)
 {
@@ -109,8 +110,8 @@
   if (m_schema_name_length > 0)
     memcpy(m_schema_name, pfs->m_digest_key.m_schema_name, m_schema_name_length);
 
-  int safe_byte_count= pfs->m_digest_storage.m_byte_count;
-  if (safe_byte_count > PSI_MAX_DIGEST_STORAGE_SIZE)
+  uint safe_byte_count= pfs->m_digest_storage.m_byte_count;
+  if (safe_byte_count > pfs_max_digest_length)
     safe_byte_count= 0;
 
   /*
@@ -124,23 +125,22 @@
       Calculate digest from MD5 HASH collected to be shown as
       DIGEST in this row.
     */
-    MD5_HASH_TO_STRING(pfs->m_digest_key.m_md5, m_digest);
+    MD5_HASH_TO_STRING(pfs->m_digest_storage.m_md5, m_digest);
     m_digest_length= MD5_HASH_TO_STRING_LENGTH;
 
     /*
       Calculate digest_text information from the token array collected
       to be shown as DIGEST_TEXT column.
     */
-    get_digest_text(m_digest_text, &pfs->m_digest_storage);
-    m_digest_text_length= strlen(m_digest_text);
+    compute_digest_text(&pfs->m_digest_storage, &m_digest_text);
 
-    if (m_digest_text_length == 0)
+    if (m_digest_text.length() == 0)
       m_digest_length= 0;
   }
   else
   {
     m_digest_length= 0;
-    m_digest_text_length= 0;
+    m_digest_text.length(0);
   }
 
   return 0;
@@ -165,9 +165,9 @@
         f->set_null();
       break;
     case 2: /* DIGEST_TEXT */
-      if (m_digest_text_length > 0)
-        PFS_engine_table::set_field_longtext_utf8(f, m_digest_text,
-                                                  m_digest_text_length);
+      if (m_digest_text.length() > 0)
+        PFS_engine_table::set_field_longtext_utf8(f, m_digest_text.ptr(),
+                                                  m_digest_text.length());
       else
         f->set_null();
       break;
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/table_helper.h percona-xtrabackup-2.3.7/storage/perfschema/table_helper.h
--- percona-xtrabackup-2.2.3/storage/perfschema/table_helper.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/table_helper.h	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -136,9 +136,7 @@
   /** Length in bytes of @c m_digest. */
   uint m_digest_length;
   /** Column DIGEST_TEXT. */
-  char m_digest_text[COL_DIGEST_TEXT_SIZE];
-  /** Length in bytes of @c m_digest_text. */
-  uint m_digest_text_length;
+  String m_digest_text;
 
   /** Build a row from a memory buffer. */
   int make_row(PFS_statements_digest_stat*);
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/CMakeLists.txt percona-xtrabackup-2.3.7/storage/perfschema/unittest/CMakeLists.txt
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, 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
@@ -23,9 +23,13 @@
 
 ADD_DEFINITIONS(-DMYSQL_SERVER ${SSL_DEFINES})
 
+ADD_CONVENIENCE_LIBRARY(pfs_server_stubs pfs_server_stubs.cc)
+
+ADD_DEPENDENCIES(pfs_server_stubs GenError)
+
 MACRO (PFS_ADD_TEST name)
   ADD_EXECUTABLE(${name}-t ${name}-t.cc)
-  TARGET_LINK_LIBRARIES(${name}-t mytap perfschema mysys)
+  TARGET_LINK_LIBRARIES(${name}-t mytap perfschema mysys pfs_server_stubs)
   ADD_TEST(${name} ${name}-t)
 ENDMACRO()
 
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_account-oom-t.cc percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_account-oom-t.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_account-oom-t.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_account-oom-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2015, 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
@@ -22,7 +22,6 @@
 #include <tap.h>
 
 #include "stub_pfs_global.h"
-#include "stub_server_misc.h"
 
 #include <string.h> /* memset */
 
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_host-oom-t.cc percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_host-oom-t.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_host-oom-t.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_host-oom-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2015, 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
@@ -22,7 +22,6 @@
 #include <tap.h>
 
 #include "stub_pfs_global.h"
-#include "stub_server_misc.h"
 
 #include <string.h> /* memset */
 
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_instr_class-oom-t.cc percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_instr_class-oom-t.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_instr_class-oom-t.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_instr_class-oom-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -20,7 +20,6 @@
 #include <tap.h>
 
 #include "stub_pfs_global.h"
-#include "stub_server_misc.h"
 
 void test_oom()
 {
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_instr_class-t.cc percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_instr_class-t.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_instr_class-t.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_instr_class-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -21,8 +21,6 @@
 #include <pfs_global.h>
 #include <tap.h>
 
-#include "stub_server_misc.h"
-
 void test_no_registration()
 {
   int rc;
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_instr-oom-t.cc percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_instr-oom-t.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_instr-oom-t.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_instr-oom-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -22,7 +22,6 @@
 #include <tap.h>
 
 #include "stub_pfs_global.h"
-#include "stub_server_misc.h"
 
 #include <string.h> /* memset */
 
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_instr-t.cc percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_instr-t.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_instr-t.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_instr-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -23,8 +23,6 @@
 
 #include <memory.h>
 
-#include "stub_server_misc.h"
-
 void test_no_instruments()
 {
   int rc;
@@ -62,6 +60,7 @@
   param.m_events_statements_history_long_sizing= 0;
   param.m_digest_sizing= 0;
   param.m_session_connect_attrs_sizing= 0;
+  param.m_max_digest_length= 0;
 
   init_event_name_sizing(& param);
   rc= init_instruments(& param);
@@ -121,6 +120,7 @@
   param.m_events_statements_history_long_sizing= 0;
   param.m_digest_sizing= 0;
   param.m_session_connect_attrs_sizing= 0;
+  param.m_max_digest_length= 0;
 
   init_event_name_sizing(& param);
   rc= init_instruments(& param);
@@ -261,6 +261,7 @@
   param.m_events_statements_history_long_sizing= 0;
   param.m_digest_sizing= 0;
   param.m_session_connect_attrs_sizing= 0;
+  param.m_max_digest_length= 0;
 
   init_event_name_sizing(& param);
   rc= init_instruments(& param);
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_server_stubs.cc percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_server_stubs.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_server_stubs.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_server_stubs.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,35 @@
+/* Copyright (c) 2010, 2015, 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+
+/*
+  Minimal code to be able to link a unit test.
+*/
+
+#include "my_global.h"
+#include "m_ctype.h"
+#include "sql_class.h"
+#include "sql_show.h"
+
+struct sql_digest_storage;
+
+volatile bool ready_to_exit= false;
+
+uint lower_case_table_names= 0;
+CHARSET_INFO *files_charset_info= NULL;
+
+void compute_digest_md5(const sql_digest_storage *, unsigned char *)
+{
+}
+
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs-t.cc percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs-t.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs-t.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, 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
@@ -26,7 +26,6 @@
 
 #include "stub_print_error.h"
 #include "stub_pfs_defaults.h"
-#include "stub_server_misc.h"
 
 /* test helpers, to simulate the setup */
 
@@ -112,6 +111,7 @@
   param.m_events_statements_history_long_sizing= 0;
   param.m_digest_sizing= 0;
   param.m_session_connect_attrs_sizing= 0;
+  param.m_max_digest_length= 0;
 
   boot= initialize_performance_schema(& param);
   ok(boot != NULL, "boot");
@@ -170,6 +170,7 @@
   param.m_events_statements_history_long_sizing= 0;
   param.m_digest_sizing= 0;
   param.m_session_connect_attrs_sizing= 0;
+  param.m_max_digest_length= 0;
 
   /* test_bootstrap() covered this, assuming it just works */
   boot= initialize_performance_schema(& param);
@@ -1514,6 +1515,7 @@
   param.m_events_statements_history_long_sizing= 0;
   param.m_digest_sizing= 0;
   param.m_session_connect_attrs_sizing= 0;
+  param.m_max_digest_length= 0;
 
   param.m_mutex_sizing= 0;
   param.m_rwlock_sizing= 0;
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_user-oom-t.cc percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_user-oom-t.cc
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/pfs_user-oom-t.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/pfs_user-oom-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2015, 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
@@ -22,7 +22,6 @@
 #include <tap.h>
 
 #include "stub_pfs_global.h"
-#include "stub_server_misc.h"
 
 #include <string.h> /* memset */
 
diff -Nru percona-xtrabackup-2.2.3/storage/perfschema/unittest/stub_server_misc.h percona-xtrabackup-2.3.7/storage/perfschema/unittest/stub_server_misc.h
--- percona-xtrabackup-2.2.3/storage/perfschema/unittest/stub_server_misc.h	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/storage/perfschema/unittest/stub_server_misc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/* Copyright (c) 2010, 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
-  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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
-
-/*
-  Minimal code to be able to link a unit test.
-*/
-
-volatile bool ready_to_exit= false;
-
-uint lower_case_table_names= 0;
-CHARSET_INFO *files_charset_info= NULL;
-
-extern "C" void compute_md5_hash(char *, const char *, int)
-{
-}
-
diff -Nru percona-xtrabackup-2.2.3/strings/CMakeLists.txt percona-xtrabackup-2.3.7/strings/CMakeLists.txt
--- percona-xtrabackup-2.2.3/strings/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/strings/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -35,7 +35,6 @@
 ADD_EXECUTABLE(conf_to_src EXCLUDE_FROM_ALL conf_to_src.c)
 TARGET_LINK_LIBRARIES(conf_to_src strings)
 
-INSTALL_DEBUG_SYMBOLS(strings)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru percona-xtrabackup-2.2.3/strings/ctype-bin.c percona-xtrabackup-2.3.7/strings/ctype-bin.c
--- percona-xtrabackup-2.2.3/strings/ctype-bin.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/strings/ctype-bin.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. & tommy@valley.ne.jp.
+/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
+   Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff -Nru percona-xtrabackup-2.2.3/strings/ctype-eucjpms.c percona-xtrabackup-2.3.7/strings/ctype-eucjpms.c
--- percona-xtrabackup-2.2.3/strings/ctype-eucjpms.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/strings/ctype-eucjpms.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. & tommy@valley.ne.jp.
+/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff -Nru percona-xtrabackup-2.2.3/strings/ctype-mb.c percona-xtrabackup-2.3.7/strings/ctype-mb.c
--- percona-xtrabackup-2.2.3/strings/ctype-mb.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/strings/ctype-mb.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2014, 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
@@ -1137,7 +1137,7 @@
     }
     if (*wildstr == w_many)
     {						/* Found w_many */
-      uchar cmp;
+      int cmp;
       const char* mb = wildstr;
       int mb_len=0;
       
diff -Nru percona-xtrabackup-2.2.3/strings/ctype-tis620.c percona-xtrabackup-2.3.7/strings/ctype-tis620.c
--- percona-xtrabackup-2.2.3/strings/ctype-tis620.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/strings/ctype-tis620.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -637,12 +637,25 @@
                    uchar *dst, size_t dstlen, uint nweights,
                    const uchar *src, size_t srclen, uint flags)
 {
-  size_t len, dstlen0= dstlen;
-  len= (uint) (strmake((char*) dst, (char*) src, MY_MIN(dstlen, srclen)) -
-	               (char*) dst);
+  size_t dstlen0= dstlen;
+  size_t min_len= MY_MIN(dstlen, srclen);
+  size_t len= 0;
+
+  /*
+    We don't use strmake here, since it requires one more character for
+    the terminating '\0', while this function itself and the following calling
+    functions do not require it
+  */
+  while (len < min_len)
+  {
+    if (! (dst[len] = src[len]))
+      break;
+    len++;
+  }
+
   len= thai2sortable(dst, len);
   set_if_smaller(dstlen, nweights);
-  set_if_smaller(len, dstlen); 
+  set_if_smaller(len, dstlen);
   len= my_strxfrm_pad_desc_and_reverse(cs, dst, dst + len, dst + dstlen,
                                        dstlen - len, flags, 0);
   if ((flags & MY_STRXFRM_PAD_TO_MAXLEN) && len < dstlen0)
diff -Nru percona-xtrabackup-2.2.3/strings/ctype-ucs2.c percona-xtrabackup-2.3.7/strings/ctype-ucs2.c
--- percona-xtrabackup-2.2.3/strings/ctype-ucs2.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/strings/ctype-ucs2.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -2545,14 +2545,17 @@
                    char *s, size_t slen, int fill)
 {
   char buf[10];
-  uint buflen;
   char *e= s + slen;
   
   DBUG_ASSERT((slen % 4) == 0);
-
-  buflen= cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf,
-                          (uchar*) buf + sizeof(buf));
-  DBUG_ASSERT(buflen == 4);
+  {
+#ifndef DBUG_OFF
+    uint buflen=
+#endif
+      cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf,
+                      (uchar*) buf + sizeof(buf));
+    DBUG_ASSERT(buflen == 4);
+  }
   while (s < e)
   {
     memcpy(s, buf, 4);
diff -Nru percona-xtrabackup-2.2.3/strings/ctype-ujis.c percona-xtrabackup-2.3.7/strings/ctype-ujis.c
--- percona-xtrabackup-2.2.3/strings/ctype-ujis.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/strings/ctype-ujis.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. & tommy@valley.ne.jp.
+/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
+   Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff -Nru percona-xtrabackup-2.2.3/strings/ctype-utf8.c percona-xtrabackup-2.3.7/strings/ctype-utf8.c
--- percona-xtrabackup-2.2.3/strings/ctype-utf8.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/strings/ctype-utf8.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -5572,15 +5572,6 @@
 }
 
 
-static inline void
-my_tosort_utf8mb3(MY_UNICASE_INFO *uni_plane, my_wc_t *wc)
-{
-  MY_UNICASE_CHARACTER *page;
-  if ((page= uni_plane->page[(*wc >> 8) & 0xFF]))
-    *wc= page[*wc & 0xFF].sort;
-}
-
-
 static size_t
 my_caseup_utf8(const CHARSET_INFO *cs, char *src, size_t srclen,
                char *dst, size_t dstlen)
diff -Nru percona-xtrabackup-2.2.3/strings/decimal.c percona-xtrabackup-2.3.7/strings/decimal.c
--- percona-xtrabackup-2.2.3/strings/decimal.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/strings/decimal.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2015, 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
@@ -211,6 +211,74 @@
           (to)=a;                                                       \
         } while(0)
 
+
+/*
+  This is a direct loop unrolling of code that used to look like this:
+  for (; *buf_beg < powers10[i--]; start++) ;
+
+  @param   i    start index
+  @param   val  value to compare against list of powers of 10
+
+  @retval  Number of leading zeroes that can be removed from fraction.
+
+  @note Why unroll? To get rid of lots of compiler warnings [-Warray-bounds]
+        Nice bonus: unrolled code is significantly faster.
+ */
+static inline int count_leading_zeroes(int i, dec1 val)
+{
+  int ret= 0;
+  switch (i)
+  {
+  /* @note Intentional fallthrough in all case labels */
+  case 9: if (val >= 1000000000) break; ++ret;
+  case 8: if (val >= 100000000) break; ++ret;
+  case 7: if (val >= 10000000) break; ++ret;
+  case 6: if (val >= 1000000) break; ++ret;
+  case 5: if (val >= 100000) break; ++ret;
+  case 4: if (val >= 10000) break; ++ret;
+  case 3: if (val >= 1000) break; ++ret;
+  case 2: if (val >= 100) break; ++ret;
+  case 1: if (val >= 10) break; ++ret;
+  case 0: if (val >= 1) break; ++ret;
+  default: { DBUG_ASSERT(FALSE); }
+  }
+  return ret;
+}
+
+/*
+  This is a direct loop unrolling of code that used to look like this:
+  for (; *buf_end % powers10[i++] == 0; stop--) ;
+
+  @param   i    start index
+  @param   val  value to compare against list of powers of 10
+
+  @retval  Number of trailing zeroes that can be removed from fraction.
+
+  @note Why unroll? To get rid of lots of compiler warnings [-Warray-bounds]
+        Nice bonus: unrolled code is significantly faster.
+ */
+static inline int count_trailing_zeroes(int i, dec1 val)
+{
+  int ret= 0;
+  switch(i)
+  {
+  /* @note Intentional fallthrough in all case labels */
+  case 0: if ((val % 1) != 0) break; ++ret;
+  case 1: if ((val % 10) != 0) break; ++ret;
+  case 2: if ((val % 100) != 0) break; ++ret;
+  case 3: if ((val % 1000) != 0) break; ++ret;
+  case 4: if ((val % 10000) != 0) break; ++ret;
+  case 5: if ((val % 100000) != 0) break; ++ret;
+  case 6: if ((val % 1000000) != 0) break; ++ret;
+  case 7: if ((val % 10000000) != 0) break; ++ret;
+  case 8: if ((val % 100000000) != 0) break; ++ret;
+  case 9: if ((val % 1000000000) != 0) break; ++ret;
+  default: { DBUG_ASSERT(FALSE); }
+  }
+  return ret;
+}
+
+
 /*
   Get maximum value for given precision and scale
 
@@ -261,7 +329,7 @@
   }
   if (intg > 0)
   {
-    for (i= (intg - 1) % DIG_PER_DEC1; *buf0 < powers10[i--]; intg--) ;
+    intg-= count_leading_zeroes((intg - 1) % DIG_PER_DEC1, *buf0);
     DBUG_ASSERT(intg > 0);
   }
   else
@@ -296,9 +364,8 @@
   }
   if (frac > 0)
   {
-    for (i= DIG_PER_DEC1 - ((frac - 1) % DIG_PER_DEC1);
-         *buf0 % powers10[i++] == 0;
-         frac--) ;
+    frac-=
+      count_trailing_zeroes(DIG_PER_DEC1 - ((frac - 1) % DIG_PER_DEC1), *buf0);
   }
   return frac;
 }
@@ -484,7 +551,8 @@
     start= (int) ((buf_beg - from->buf) * DIG_PER_DEC1);
   }
   if (buf_beg < end)
-    for (; *buf_beg < powers10[i--]; start++) ;
+    start+= count_leading_zeroes(i, *buf_beg);
+
   *start_result= start; /* index of first decimal digit (from 0) */
 
   /* find non-zero digit at the end */
@@ -502,7 +570,7 @@
     stop= (int) ((buf_end - from->buf + 1) * DIG_PER_DEC1);
     i= 1;
   }
-  for (; *buf_end % powers10[i++] == 0; stop--) ;
+  stop-= count_trailing_zeroes(i, *buf_end);
   *end_result= stop; /* index of position after last decimal digit (from 0) */
 }
 
@@ -2233,7 +2301,7 @@
   }
   if (prec2 <= 0) /* short-circuit everything: from2 == 0 */
     return E_DEC_DIV_ZERO;
-  for (i= (prec2 - 1) % DIG_PER_DEC1; *buf2 < powers10[i--]; prec2--) ;
+  prec2-= count_leading_zeroes((prec2 - 1) % DIG_PER_DEC1, *buf2);
   DBUG_ASSERT(prec2 > 0);
 
   i=((prec1-1) % DIG_PER_DEC1)+1;
@@ -2248,7 +2316,7 @@
     decimal_make_zero(to);
     return E_DEC_OK;
   }
-  for (i=(prec1-1) % DIG_PER_DEC1; *buf1 < powers10[i--]; prec1--) ;
+  prec1-= count_leading_zeroes((prec1-1) % DIG_PER_DEC1, *buf1);
   DBUG_ASSERT(prec1 > 0);
 
   /* let's fix scale_incr, taking into account frac1,frac2 increase */
@@ -2421,7 +2489,7 @@
         error=E_DEC_TRUNCATED;
         goto done;
       }
-      stop1=start1+frac0;
+      stop1= start1 + frac0 + intg0;
       frac0+=intg0;
       to->intg=0;
       while (intg0++ < 0)
diff -Nru percona-xtrabackup-2.2.3/support-files/build-tags percona-xtrabackup-2.3.7/support-files/build-tags
--- percona-xtrabackup-2.2.3/support-files/build-tags	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/build-tags	2017-02-27 07:47:02.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 
 rm -f TAGS
-filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$'
+filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$\|\.ic$'
 
 list="find . -type f"
-bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned"
+git rev-parse >/dev/null 2>/dev/null && list="git ls-files"
 
 $list |grep $filter |while read f; 
 do
diff -Nru percona-xtrabackup-2.2.3/support-files/dtrace/locktime.d percona-xtrabackup-2.3.7/support-files/dtrace/locktime.d
--- percona-xtrabackup-2.2.3/support-files/dtrace/locktime.d	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/dtrace/locktime.d	2017-02-27 07:47:02.000000000 +0000
@@ -1,25 +1,27 @@
 #!/usr/sbin/dtrace -s                                                                                                            
-#
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# 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
-#
-# Shows the time that an individual lock is applied to a database and table
-# Shows the time to achieve the lock, and the time the table was locked
+/*
+   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 
-o#pragma D option quiet                                                                                                           
+   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
+*/
+
+/*
+   Shows the time that an individual lock is applied to a database and table
+   Shows the time to achieve the lock, and the time the table was locked
+*/
+
+#pragma D option quiet                                                                                                           
 
 mysql*:::handler-rdlock-start
 {
diff -Nru percona-xtrabackup-2.2.3/support-files/dtrace/query-execandqc.d percona-xtrabackup-2.3.7/support-files/dtrace/query-execandqc.d
--- percona-xtrabackup-2.2.3/support-files/dtrace/query-execandqc.d	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/dtrace/query-execandqc.d	2017-02-27 07:47:02.000000000 +0000
@@ -1,22 +1,24 @@
 #!/usr/sbin/dtrace -s
-#
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# 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
-#
-# Show query execution times, indicating whether the query-cache was used
+/*
+   Copyright (c) 2009, 2014, 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
+*/
+
+/*
+   Show query execution times, indicating whether the query-cache was used
+*/
 
 #pragma D option quiet
 
diff -Nru percona-xtrabackup-2.2.3/support-files/dtrace/query-filesort-time.d percona-xtrabackup-2.3.7/support-files/dtrace/query-filesort-time.d
--- percona-xtrabackup-2.2.3/support-files/dtrace/query-filesort-time.d	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/dtrace/query-filesort-time.d	2017-02-27 07:47:02.000000000 +0000
@@ -1,23 +1,25 @@
 #!/usr/sbin/dtrace -s
-#
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# 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
-#
-# Show the time taken for a query, including the time taken to 
-# sort the results using filesort 
+/*
+   Copyright (c) 2009, 2014, 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
+*/
+
+/*
+  Show the time taken for a query, including the time taken to
+  sort the results using filesort.
+*/
 
 #pragma D option quiet
 
diff -Nru percona-xtrabackup-2.2.3/support-files/dtrace/query-network-time.d percona-xtrabackup-2.3.7/support-files/dtrace/query-network-time.d
--- percona-xtrabackup-2.2.3/support-files/dtrace/query-network-time.d	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/dtrace/query-network-time.d	2017-02-27 07:47:02.000000000 +0000
@@ -1,23 +1,25 @@
 #!/usr/sbin/dtrace -s
-#
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# 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
-#
-# Show the time taken to execute a query, include the bytes and time taken
-# to transfer the information over the network to/from the client
+/*
+   Copyright (c) 2009, 2014, 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
+*/
+
+/*
+   Show the time taken to execute a query, include the bytes and time taken
+   to transfer the information over the network to/from the client
+*/
 
 #pragma D option quiet
 #pragma D option dynvarsize=4m
diff -Nru percona-xtrabackup-2.2.3/support-files/dtrace/query-parse-time.d percona-xtrabackup-2.3.7/support-files/dtrace/query-parse-time.d
--- percona-xtrabackup-2.2.3/support-files/dtrace/query-parse-time.d	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/dtrace/query-parse-time.d	2017-02-27 07:47:02.000000000 +0000
@@ -1,22 +1,24 @@
 #!/usr/sbin/dtrace -s
-#
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# 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
-#
-# Shows time take to actually parse the query statement
+/*
+   Copyright (c) 2009, 2014, 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
+*/
+
+/*
+  Shows time take to actually parse the query statement
+*/
 
 #pragma D option quiet
 
diff -Nru percona-xtrabackup-2.2.3/support-files/dtrace/query-rowops.d percona-xtrabackup-2.3.7/support-files/dtrace/query-rowops.d
--- percona-xtrabackup-2.2.3/support-files/dtrace/query-rowops.d	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/dtrace/query-rowops.d	2017-02-27 07:47:02.000000000 +0000
@@ -1,23 +1,25 @@
 #!/usr/sbin/dtrace -s
-#
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# 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
-#
-# Calculates the time (and operations) for accessing data from individual
-# rows for each query
+/*
+   Copyright (c) 2009, 2014, 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
+*/
+
+/*
+   Calculates the time (and operations) for accessing data from individual
+   rows for each query
+*/
 
 #pragma D option quiet
 
diff -Nru percona-xtrabackup-2.2.3/support-files/dtrace/query-time.d percona-xtrabackup-2.3.7/support-files/dtrace/query-time.d
--- percona-xtrabackup-2.2.3/support-files/dtrace/query-time.d	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/dtrace/query-time.d	2017-02-27 07:47:02.000000000 +0000
@@ -1,22 +1,24 @@
 #!/usr/sbin/dtrace -s
-#
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# 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
-#
-# Shows basic query execution time, who execute the query, and on what database
+/*
+   Copyright (c) 2009, 2014, 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
+*/
+
+/*
+   Shows basic query execution time, who execute the query, and on what database
+*/
 
 #pragma D option quiet
 
diff -Nru percona-xtrabackup-2.2.3/support-files/dtrace/statement-time.d percona-xtrabackup-2.3.7/support-files/dtrace/statement-time.d
--- percona-xtrabackup-2.2.3/support-files/dtrace/statement-time.d	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/dtrace/statement-time.d	2017-02-27 07:47:02.000000000 +0000
@@ -1,23 +1,25 @@
 #!/usr/sbin/dtrace -s
-#
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# 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
-#
-# Creates a report on each query executed at the individual statement
-# level, showing rows matched, updated, and total query time
+/*
+   Copyright (c) 2009, 2014, 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
+*/
+
+/*
+  Creates a report on each query executed at the individual statement
+  level, showing rows matched, updated, and total query time
+*/
 
 #pragma D option quiet
 
diff -Nru percona-xtrabackup-2.2.3/support-files/dtrace/statement-type-aggregate.d percona-xtrabackup-2.3.7/support-files/dtrace/statement-type-aggregate.d
--- percona-xtrabackup-2.2.3/support-files/dtrace/statement-type-aggregate.d	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/dtrace/statement-type-aggregate.d	2017-02-27 07:47:02.000000000 +0000
@@ -1,25 +1,27 @@
 #!/usr/sbin/dtrace -s
-# 
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# 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
-#
-# Creates an aggregate report of the time spent perform queries of the four main
-# types (select, insert, update, delete)
-#
-# Report generated every 30s
+/*
+   Copyright (c) 2009, 2014, 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
+*/
+
+/*
+   Creates an aggregate report of the time spent perform queries of the four main
+   types (select, insert, update, delete)
+
+   Report generated every 30s
+*/
 
 #pragma D option quiet
 
diff -Nru percona-xtrabackup-2.2.3/support-files/mysql.spec.sh percona-xtrabackup-2.3.7/support-files/mysql.spec.sh
--- percona-xtrabackup-2.2.3/support-files/mysql.spec.sh	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/support-files/mysql.spec.sh	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2014, 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
@@ -142,9 +142,9 @@
   %else
     %if %(test -f /etc/oracle-release && echo 1 || echo 0)
       %define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
-      %if "%elver" == "6"
-        %define distro_description      Oracle Linux 6
-        %define distro_releasetag       el6
+      %if "%elver" == "6" || "%elver" == "7"
+        %define distro_description      Oracle Linux %elver
+        %define distro_releasetag       el%elver
         %define distro_buildreq         gcc-c++ ncurses-devel perl time zlib-devel cmake libaio-devel
         %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
       %else
@@ -442,7 +442,6 @@
 ##############################################################################
 %prep
 %setup -T -a 0 -c -n %{src_dir}
-
 ##############################################################################
 %build
 
@@ -500,12 +499,14 @@
   # Attempt to remove any optimisation flags from the debug build
   CFLAGS=`echo " ${CFLAGS} " | \
             sed -e 's/ -O[0-9]* / /' \
+                -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \
                 -e 's/ -unroll2 / /' \
                 -e 's/ -ip / /' \
                 -e 's/^ //' \
                 -e 's/ $//'`
   CXXFLAGS=`echo " ${CXXFLAGS} " | \
               sed -e 's/ -O[0-9]* / /' \
+                  -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \
                   -e 's/ -unroll2 / /' \
                   -e 's/ -ip / /' \
                   -e 's/^ //' \
@@ -562,6 +563,8 @@
 install -d $RBR%{_mandir}
 install -d $RBR%{_sbindir}
 
+mkdir -p $RBR%{_sysconfdir}/my.cnf.d
+
 # Install all binaries
 (
   cd $MBD/release
@@ -1045,7 +1048,6 @@
 
 %files -n MySQL-server%{product_suffix} -f release/support-files/plugins.files
 %defattr(-,root,root,0755)
-
 %if %{defined license_files_server}
 %doc %{license_files_server}
 %endif
@@ -1088,6 +1090,7 @@
 %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
 
 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
+%dir %{_sysconfdir}/my.cnf.d
 
 %attr(755, root, root) %{_bindir}/innochecksum
 %attr(755, root, root) %{_bindir}/my_print_defaults
@@ -1126,13 +1129,15 @@
 
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
-
 %attr(755, root, root) %{_datadir}/mysql/
+%dir %attr(755, mysql, mysql) /var/lib/mysql
 
 # ----------------------------------------------------------------------------
 %files -n MySQL-client%{product_suffix}
-
 %defattr(-, root, root, 0755)
+%if %{defined license_files_server}
+%doc %{license_files_server}
+%endif
 %attr(755, root, root) %{_bindir}/msql2mysql
 %attr(755, root, root) %{_bindir}/mysql
 %attr(755, root, root) %{_bindir}/mysql_find_rows
@@ -1166,6 +1171,9 @@
 # ----------------------------------------------------------------------------
 %files -n MySQL-devel%{product_suffix} -f optional-files-devel
 %defattr(-, root, root, 0755)
+%if %{defined license_files_server}
+%doc %{license_files_server}
+%endif
 %doc %attr(644, root, man) %{_mandir}/man1/comp_err.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
 %attr(755, root, root) %{_bindir}/mysql_config
@@ -1180,6 +1188,9 @@
 # ----------------------------------------------------------------------------
 %files -n MySQL-shared%{product_suffix}
 %defattr(-, root, root, 0755)
+%if %{defined license_files_server}
+%doc %{license_files_server}
+%endif
 # Shared libraries (omit for architectures that don't support them)
 %{_libdir}/libmysql*.so*
 
@@ -1192,6 +1203,9 @@
 # ----------------------------------------------------------------------------
 %files -n MySQL-test%{product_suffix}
 %defattr(-, root, root, 0755)
+%if %{defined license_files_server}
+%doc %{license_files_server}
+%endif
 %attr(-, root, root) %{_datadir}/mysql-test
 %attr(755, root, root) %{_bindir}/mysql_client_test
 %attr(755, root, root) %{_bindir}/mysql_client_test_embedded
@@ -1205,6 +1219,9 @@
 # ----------------------------------------------------------------------------
 %files -n MySQL-embedded%{product_suffix}
 %defattr(-, root, root, 0755)
+%if %{defined license_files_server}
+%doc %{license_files_server}
+%endif
 %attr(755, root, root) %{_bindir}/mysql_embedded
 %attr(644, root, root) %{_libdir}/mysql/libmysqld.a
 %attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
@@ -1215,6 +1232,12 @@
 # merging BK trees)
 ##############################################################################
 %changelog
+* Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
+- Add license info in each subpackage
+
+* Wed May 28 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
+- Updated usergroup to mysql on datadir
+
 * Wed Oct 30 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
 - Removed non gpl file docs/mysql.info from community packages
 
@@ -1267,7 +1290,7 @@
 
 - Fix duplicate mentioning of "mysql_plugin" and its manual page,
   it is better to keep alphabetic order in the files list (merging!).
-  
+
 * Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
@@ -1306,7 +1329,7 @@
 * Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Null-upmerge the fix of bug#37165: This spec file is not affected.
-- Replace "/var/lib/mysql" by the spec file variable "%{mysqldatadir}".
+- Replace "/var/lib/mysql" by the spec file variable "%%{mysqldatadir}".
 
 * Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com>
 
@@ -1327,13 +1350,13 @@
   not in an RPM upgrade.
   This affects both the "mkdir" and the call of "mysql_install_db".
 
-* Thu Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+* Wed Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Fix bug#56581: If an installation deviates from the default file locations
   ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade)
   should still work, and use these locations.
   The problem was that the fix for bug#27072 did not check for local settings.
-  
+
 * Mon Jan 31 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
@@ -1448,7 +1471,7 @@
 - Fix some problems with the directives around "tcmalloc" (experimental),
   remove erroneous traces of the InnoDB plugin (that is 5.1 only).
 
-* Fri Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
+* Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
 
 - Removed mysql_fix_privilege_tables
 
@@ -1566,7 +1589,7 @@
 
 * Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
 
-- Call "make install" using "benchdir_root=%{_datadir}",
+- Call "make install" using "benchdir_root=%%{_datadir}",
   because that is affecting the regression test suite as well.
 
 * Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
@@ -1645,7 +1668,7 @@
 
 - Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
 
-* Wed Mar 07 2006 Kent Boortz <kent@mysql.com>
+* Tue Mar 07 2006 Kent Boortz <kent@mysql.com>
 
 - Changed product name from "Community Edition" to "Community Server"
 
@@ -1683,7 +1706,7 @@
 - Added zlib to the list of (static) libraries installed
 - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
 - Compile MySQL with bundled zlib
-- Fixed %packager name to "MySQL Production Engineering Team"
+- Fixed %%packager name to "MySQL Production Engineering Team"
 
 * Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
 
@@ -1833,7 +1856,7 @@
 - ISAM and merge storage engines were purged. As well as appropriate
   tools and manpages (isamchk and isamlog)
 
-* Thu Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
+* Fri Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
 
 - enabled the "Archive" storage engine for the max binary
 - enabled the "CSV" storage engine for the max binary
@@ -1893,7 +1916,7 @@
 
 - marked /etc/logrotate.d/mysql as a config file (BUG 2156)
 
-* Fri Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
+* Sat Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
 
 - fixed file permissions (BUG 1672)
 
@@ -2035,7 +2058,7 @@
 - Added separate libmysql_r directory; now both a threaded
   and non-threaded library is shipped.
 
-* Wed Sep 28 1999 David Axmark <davida@mysql.com>
+* Tue Sep 28 1999 David Axmark <davida@mysql.com>
 
 - Added the support-files/my-example.cnf to the docs directory.
 
diff -Nru percona-xtrabackup-2.2.3/tests/mysql_client_test.c percona-xtrabackup-2.3.7/tests/mysql_client_test.c
--- percona-xtrabackup-2.2.3/tests/mysql_client_test.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/tests/mysql_client_test.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2014, 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
@@ -19301,6 +19301,102 @@
   myquery(rc);
 }
 
+#ifndef EMBEDDED_LIBRARY
+/*
+  Bug #17309863 AUTO RECONNECT DOES NOT WORK WITH 5.6 LIBMYSQLCLIENT
+*/
+static void test_bug17309863()
+{
+  MYSQL *lmysql;
+  unsigned long thread_id;
+  char query[MAX_TEST_QUERY_LENGTH];
+  int rc;
+
+  myheader("test_bug17309863");
+
+  if (!opt_silent)
+    fprintf(stdout, "\n Establishing a test connection ...");
+  if (!(lmysql= mysql_client_init(NULL)))
+  {
+    myerror("mysql_client_init() failed");
+    exit(1);
+  }
+  lmysql->reconnect= 1;
+  if (!(mysql_real_connect(lmysql, opt_host, opt_user,
+                           opt_password, current_db, opt_port,
+                           opt_unix_socket, 0)))
+  {
+    myerror("connection failed");
+    exit(1);
+  }
+  if (!opt_silent)
+    fprintf(stdout, "OK");
+
+  thread_id= mysql_thread_id(lmysql);
+  sprintf(query, "KILL %lu", thread_id);
+
+  /*
+    Running the "KILL <thread_id>" query in a separate connection.
+  */
+  if (thread_query(query))
+    exit(1);
+
+  /*
+    The above KILL statement should have closed our connection. But reconnect
+    flag allows to detect this before sending query and re-establish it without
+    returning an error.
+  */
+  rc= mysql_query(lmysql, "SELECT 'bug17309863'");
+  myquery(rc);
+
+  mysql_close(lmysql);
+}
+#endif
+
+
+/**
+   BUG#17512527: LIST HANDLING INCORRECT IN MYSQL_PRUNE_STMT_LIST()
+*/
+static void test_bug17512527()
+{
+  MYSQL *conn1, *conn2;
+  MYSQL_STMT *stmt1, *stmt2;
+  const char *stmt1_txt= "SELECT NOW();";
+  const char *stmt2_txt= "SELECT 1;";
+  unsigned long thread_id;
+  char query[MAX_TEST_QUERY_LENGTH];
+  int rc;
+
+  conn1= client_connect(0, MYSQL_PROTOCOL_DEFAULT, 1);
+  conn2= client_connect(0, MYSQL_PROTOCOL_DEFAULT, 0);
+
+  stmt1 = mysql_stmt_init(conn1);
+  check_stmt(stmt1);
+  rc= mysql_stmt_prepare(stmt1, stmt1_txt, strlen(stmt1_txt));
+  check_execute(stmt1, rc);
+
+  thread_id= mysql_thread_id(conn1);
+  sprintf(query, "KILL %lu", thread_id);
+  if (thread_query(query))
+    exit(1);
+
+  /*
+    After the connection is killed, the connection is
+    re-established due to the reconnect flag.
+  */
+  stmt2 = mysql_stmt_init(conn1);
+  check_stmt(stmt2);
+
+  rc= mysql_stmt_prepare(stmt2, stmt2_txt, strlen(stmt2_txt));
+  check_execute(stmt1, rc);
+
+  mysql_stmt_close(stmt2);
+  mysql_stmt_close(stmt1);
+
+  mysql_close(conn1);
+  mysql_close(conn2);
+}
+
 
 static struct my_tests_st my_tests[]= {
   { "disable_query_logs", disable_query_logs },
@@ -19573,6 +19669,10 @@
   { "test_wl5968", test_wl5968 },
   { "test_wl5924", test_wl5924 },
   { "test_wl6587", test_wl6587 },
+#ifndef EMBEDDED_LIBRARY
+  { "test_bug17309863", test_bug17309863},
+#endif
+  { "test_bug17512527", test_bug17512527},
   { 0, 0 }
 };
 
diff -Nru percona-xtrabackup-2.2.3/unittest/gunit/CMakeLists.txt percona-xtrabackup-2.3.7/unittest/gunit/CMakeLists.txt
--- percona-xtrabackup-2.2.3/unittest/gunit/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/unittest/gunit/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -189,15 +189,22 @@
   ${CMAKE_SOURCE_DIR}/storage/example
 )
 
-INCLUDE(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-Wno-null-dereference" HAVE_NO_NULL)
+# Turn off some warning flags when compiling GUnit
+MY_CHECK_CXX_COMPILER_FLAG("-Wno-null-dereference" HAVE_NO_NULL)
 IF(HAVE_NO_NULL)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-null-dereference")
 ENDIF()
-CHECK_CXX_COMPILER_FLAG("-Wno-unused-local-typedefs" HAVE_NO_UNUSED_TYPEDEFS)
+MY_CHECK_CXX_COMPILER_FLAG("-Wno-unused-local-typedefs" HAVE_NO_UNUSED_TYPEDEFS)
 IF(HAVE_NO_UNUSED_TYPEDEFS)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs")
 ENDIF()
+MY_CHECK_CXX_COMPILER_FLAG("-Wno-compare-distinct-pointer-types"
+                           HAVE_NO_COMPARE_DISTINCT_POINTER_TYPES)
+IF(HAVE_NO_COMPARE_DISTINCT_POINTER_TYPES)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-compare-distinct-pointer-types")
+ENDIF()
+
+MY_CHECK_CXX_COMPILER_FLAG("-fno-builtin-memcmp" HAVE_NO_BUILTIN_MEMCMP)
 
 # main-wrapper libraries (with tap-compatible option).
 ADD_LIBRARY(gunit_small STATIC
@@ -239,8 +246,10 @@
   mysys_lf
   mysys_my_atomic
   mysys_my_malloc
+  mysys_my_pwrite
   mysys_my_rdtsc
   mysys_my_vsnprintf
+  mysys_my_write
   sql_list
   sql_plist
   sql_string
@@ -253,6 +262,7 @@
 SET(SERVER_TESTS
   copy_info
   create_field
+  debug_sync
   delayable_insert_operation
   explain_filename
   field
diff -Nru percona-xtrabackup-2.2.3/unittest/gunit/debug_sync-t.cc percona-xtrabackup-2.3.7/unittest/gunit/debug_sync-t.cc
--- percona-xtrabackup-2.2.3/unittest/gunit/debug_sync-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/unittest/gunit/debug_sync-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,205 @@
+/* Copyright (c) 2013, 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 */
+
+/**
+  This is a unit test written to demonstrate a race issue in debug_sync
+  functionality which resulted in wait thread getting timed out. This
+  happens because we use a single global variable to identify the thread
+  that has signalled. Before the wait could process the signal from the
+  signal thread, another signal thread can overwrite this global signal
+  value thus making the wait thread to lose this signal and  timeout
+  waiting for a signal that it has already lost.
+*/
+
+// First include (the generated) my_config.h, to get correct platform defines.
+#include "my_config.h"
+#include <gtest/gtest.h>
+
+#ifdef _WIN32
+#include <Windows.h>
+#else
+#include <pthread.h>
+#endif
+#include "my_pthread.h"
+#include "test_utils.h"
+#include "thread_utils.h"
+#include "debug_sync.h"
+#include "my_dbug.h"
+#include <string>
+
+#if defined(ENABLED_DEBUG_SYNC)
+extern uchar* debug_sync_value_ptr(THD* thd);
+
+namespace debug_sync_unittest {
+
+using thread::Notification;
+using thread::Thread;
+using my_testing::Server_initializer;
+using my_testing::Mock_error_handler;
+
+
+class DebugSyncTest : public ::testing::Test
+{
+protected:
+  DebugSyncTest() {}
+
+  void SetUp()
+  {
+    // set debug sync timeout of 60 seconds.
+    opt_debug_sync_timeout= 60;
+    debug_sync_init();
+  }
+
+  void TearDown()
+  {
+     debug_sync_end();
+     opt_debug_sync_timeout= 0;
+  }
+};
+
+
+/*
+  Set up a debug sync action thread. Depending on type of action, the  thread
+  serves different purpose. In the case where it involves wait_for action, it
+  serves the purpose of a waiting thread that wait at a 'sync_point' in it's
+  thread of control for named signal event. The debug sync action could
+  be a signal event, in which case it assumes the role of signalling thread
+  that signals an event identified by signal name to wake a waiting thread.
+*/
+class DebugSyncThread : public Thread
+{
+public:
+  DebugSyncThread(Notification *go,
+                    bool wait_thread,
+                    std::string action)
+    : m_go(go),
+      m_wait_thread(wait_thread),
+      m_action(action)
+  {}
+
+  virtual void run()
+  {
+    m_initializer.SetUp();
+    m_thd= m_initializer.thd();
+    m_go->wait_for_notification();
+
+    if (m_wait_thread)
+    {
+      std::string sync_point("sync_point ");
+      std::string action_str= sync_point + m_action;
+      Mock_error_handler error_handler(m_thd, 0);
+
+      debug_sync_set_action(m_thd, action_str.c_str(), action_str.length());
+      wait_point();
+
+      // The above should not generate any warnings.
+      EXPECT_EQ(0, error_handler.handle_called());
+    }
+    else
+    {
+      debug_sync_set_action(m_thd, m_action.c_str(), m_action.length());
+    }
+
+    m_initializer.TearDown();
+  }
+
+private:
+  Notification *m_go;
+  Server_initializer m_initializer;
+  THD *m_thd; // THD context required to hold debug_sync context.
+  bool m_wait_thread; // indicate if it is a wait thread.
+  std::string m_action; // indicate type of action WAIT_FOR or SIGNAL.
+
+  void wait_point()
+  {
+    DEBUG_SYNC(m_thd,"sync_point");
+  }
+};
+
+
+/*
+  Start a wait thread waiting for signal X1  and two signal threads
+  one signalling event X1 and other signalling an event X2. Notify
+  all of them to start at once.
+*/
+TEST_F(DebugSyncTest, DebugSyncSignalWaitTests)
+{
+  Notification go[3];
+
+  /* wait thread */
+  DebugSyncThread wait_thread(&go[0], true, std::string("WAIT_FOR X1"));
+  /* signal thread */
+  DebugSyncThread signal_thread1(&go[1], false,
+                                   std::string("now signal X1"));
+  DebugSyncThread signal_thread2(&go[2], false,
+                                   std::string("now signal X2"));
+
+  wait_thread.start();
+  signal_thread1.start();
+  signal_thread2.start();
+
+  // Notify all threads
+  go[0].notify();
+  go[1].notify();
+  go[2].notify();
+
+  // Wait for all threads to finish.
+  wait_thread.join();
+  signal_thread1.join();
+  signal_thread2.join();
+}
+
+// Test debug_sync_value_ptr
+TEST_F(DebugSyncTest, DebugSyncValuesTest)
+{
+  std::string action;
+  Server_initializer server_initializer;
+  THD *thd;
+
+  server_initializer.SetUp();
+  thd= server_initializer.thd();
+
+  // Ensure that we have a empty signal list at startup.
+  EXPECT_STREQ("ON - signals: ''",
+               reinterpret_cast<char*>(debug_sync_value_ptr(thd)));
+
+  // Set up signalling actions and ensure the signals list reflect it.
+  action= "now signal x1";
+  debug_sync_set_action(thd, action.c_str(), action.length());
+  EXPECT_STREQ("ON - signals: 'x1'",
+               reinterpret_cast<char*>(debug_sync_value_ptr(thd)));
+
+  action= "now signal x2";
+  debug_sync_set_action(thd, action.c_str(), action.length());
+  EXPECT_STREQ("ON - signals: 'x1,x2'",
+               reinterpret_cast<char*>(debug_sync_value_ptr(thd)));
+
+  action= "now signal x3";
+  debug_sync_set_action(thd, action.c_str(), action.length());
+  EXPECT_STREQ("ON - signals: 'x1,x2,x3'",
+               reinterpret_cast<char*>(debug_sync_value_ptr(thd)));
+
+  // Ensure the signal list is empty after reset.
+  action= "reset";
+  debug_sync_set_action(thd, action.c_str(), action.length());
+  EXPECT_STREQ("ON - signals: ''",
+               reinterpret_cast<char*>(debug_sync_value_ptr(thd)));
+
+  server_initializer.TearDown();
+}
+
+
+}
+#endif
diff -Nru percona-xtrabackup-2.2.3/unittest/gunit/item_param-t.cc percona-xtrabackup-2.3.7/unittest/gunit/item_param-t.cc
--- percona-xtrabackup-2.2.3/unittest/gunit/item_param-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/unittest/gunit/item_param-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,51 @@
+/* Copyright (c) 2014, 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 */
+
+#include "my_config.h"
+#include <gtest/gtest.h>
+#include <item.h>
+
+#include "test_utils.h"
+
+namespace item_param_unittest {
+using my_testing::Server_initializer;
+
+class ItemParamTest : public ::testing::Test
+{
+protected:
+  virtual void SetUp()
+  {
+    m_initializer.SetUp();
+    // An Item expects to be owned by current_thd->free_list, so allocate with
+    // new, and do not delete it.
+    m_item_param= new Item_param(POS(), 1);
+  }
+
+  virtual void TearDown()
+  {
+    m_initializer.TearDown();
+  }
+
+  Server_initializer m_initializer;
+  Item_param *m_item_param;
+};
+
+TEST_F(ItemParamTest, convert_str_value)
+{
+  m_item_param->state= Item_param::LONG_DATA_VALUE;
+  m_item_param->value.cs_info.final_character_set_of_str_value= NULL;
+  EXPECT_TRUE(m_item_param->convert_str_value(m_initializer.thd()));
+}
+}
diff -Nru percona-xtrabackup-2.2.3/unittest/gunit/mysys_my_pwrite-t.cc percona-xtrabackup-2.3.7/unittest/gunit/mysys_my_pwrite-t.cc
--- percona-xtrabackup-2.2.3/unittest/gunit/mysys_my_pwrite-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/unittest/gunit/mysys_my_pwrite-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,267 @@
+/* Copyright (c) 2014, 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  02111-1307  USA */
+
+// First include (the generated) my_config.h, to get correct platform defines.
+#include "my_config.h"
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+// Ignore test on windows, as we are mocking away a unix function, see below.
+#ifndef __WIN__
+namespace mysys_my_pwrite_unittest {
+
+using ::testing::_;
+using ::testing::InSequence;
+using ::testing::Return;
+using ::testing::ReturnPointee;
+using ::testing::SetErrnoAndReturn;
+
+class MockWrite
+{
+public:
+  virtual ~MockWrite() {}
+  MOCK_METHOD4(mockwrite, ssize_t(int, const void *, size_t, off_t));
+  MOCK_METHOD3(mockseek, off_t(int, off_t, int));
+};
+
+MockWrite *mockfs= NULL;
+
+// We need to mock away pwrite(2), do it with a macro:
+#define pwrite(fd, buf, count, offset) mockfs->mockwrite(fd, buf, count, offset)
+#define lseek(fd, offset, whence) mockfs->mockseek(fd, offset, whence)
+
+/*
+  Include the source file, which will give us
+  mysys_my_pwrite_unittest::my_pwrite() for testing.
+*/
+#include "../../mysys/my_pread.c"
+
+#undef pwrite
+#undef lseek
+
+class MysysMyPWriteTest : public ::testing::Test
+{
+  virtual void SetUp()
+  {
+    mockfs= new MockWrite;
+    m_offset= 0;
+    EXPECT_CALL(*mockfs, mockseek(_, m_offset, _))
+      .WillRepeatedly(ReturnPointee(&m_offset));
+  }
+  virtual void TearDown()
+  {
+    delete mockfs;
+    mockfs= NULL;
+  }
+public:
+  my_off_t m_offset;
+};
+
+
+// Test of normal case: write OK
+TEST_F(MysysMyPWriteTest, MyPWriteOK)
+{
+  uchar buf[4096];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(Return(4096));
+
+  const size_t result= my_pwrite(42, buf, 4096, m_offset, 0);
+  EXPECT_EQ(4096U, result);
+}
+
+
+// Test of normal case: write OK with MY_NABP
+TEST_F(MysysMyPWriteTest, MyPWriteOKNABP)
+{
+  uchar buf[4096];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(Return(4096));
+
+  const size_t result= my_pwrite(42, buf, 4096, m_offset, MYF(MY_NABP));
+  EXPECT_EQ(0U, result);
+}
+
+
+// Test of disk full: write not OK
+TEST_F(MysysMyPWriteTest, MyPWriteFail)
+{
+  uchar buf[4096];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(ENOSPC, -1));
+
+  const size_t result= my_pwrite(42, buf, 4096, m_offset, 0);
+  EXPECT_EQ(MY_FILE_ERROR, result);
+}
+
+
+// Test of disk full: write not OK, with MY_NABP
+TEST_F(MysysMyPWriteTest, MyPWriteFailNABP)
+{
+  uchar buf[4096];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(ENOSPC, -1));
+
+  const size_t result= my_pwrite(42, buf, 4096, m_offset, MYF(MY_NABP));
+  EXPECT_EQ(MY_FILE_ERROR, result);
+}
+
+
+// Test of disk full after partial write.
+TEST_F(MysysMyPWriteTest, MyPWrite8192)
+{
+  uchar buf[8192];
+  InSequence s;
+  // Expect call to write 8192 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 8192, _))
+    .Times(1)
+    .WillOnce(Return(4096));
+  // Expect second call to write remaining 4096 bytes, return disk full.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(ENOSPC, -1));
+
+  const size_t result= my_pwrite(42, buf, 8192, m_offset, 0);
+  EXPECT_EQ(4096U, result);
+}
+
+
+// Test of disk full after partial write.
+TEST_F(MysysMyPWriteTest, MyPWrite8192NABP)
+{
+  uchar buf[8192];
+  InSequence s;
+  // Expect call to write 8192 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 8192, _))
+    .Times(1)
+    .WillOnce(Return(4096));
+  // Expect second call to write remaining 4096 bytes, return disk full.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(ENOSPC, -1));
+
+  const size_t result= my_pwrite(42, buf, 8192, m_offset, MYF(MY_NABP));
+  EXPECT_EQ(MY_FILE_ERROR, result);
+}
+
+
+// Test of partial write, followed by interrupt, followed by successful write.
+TEST_F(MysysMyPWriteTest, MyPWrite8192Interrupt)
+{
+  uchar buf[8192];
+  InSequence s;
+  // Expect call to write 8192 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 8192, _))
+    .Times(1)
+    .WillOnce(Return(4096));
+  // Expect second call to write remaining 4096 bytes, return interrupt.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(EINTR, -1));
+  // Expect third call to write remaining 4096 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(Return(4096));
+
+  const size_t result= my_pwrite(42, buf, 8192, m_offset, 0);
+  EXPECT_EQ(8192U, result);
+}
+
+
+// Test of partial write, followed by interrupt, followed by successful write.
+TEST_F(MysysMyPWriteTest, MyPWrite8192InterruptNABP)
+{
+  uchar buf[8192];
+  InSequence s;
+  // Expect call to write 8192 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 8192, _))
+    .Times(1)
+    .WillOnce(Return(4096));
+  // Expect second call to write remaining 4096 bytes, return interrupt.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(EINTR, -1));
+  // Expect third call to write remaining 4096 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096, _))
+    .Times(1)
+    .WillOnce(Return(4096));
+
+  const size_t result= my_pwrite(42, buf, 8192, m_offset, MYF(MY_NABP));
+  EXPECT_EQ(0U, result);
+}
+
+
+// Test of partial write, followed successful write.
+TEST_F(MysysMyPWriteTest, MyPWrite400)
+{
+  uchar buf[400];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 400, _))
+    .Times(1)
+    .WillOnce(Return(200));
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 200, _))
+    .Times(1)
+    .WillOnce(Return(200));
+
+  const size_t result= my_pwrite(42, buf, 400, m_offset, 0);
+  EXPECT_EQ(400U, result);
+}
+
+
+// Test of partial write, followed successful write.
+TEST_F(MysysMyPWriteTest, MyPWrite400NABP)
+{
+  uchar buf[400];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 400, _))
+    .Times(1)
+    .WillOnce(Return(200));
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 200, _))
+    .Times(1)
+    .WillOnce(Return(200));
+
+  const size_t result= my_pwrite(42, buf, 400, m_offset, MYF(MY_NABP));
+  EXPECT_EQ(0U, result);
+}
+
+
+// Test of partial write, followed by failure, followed successful write.
+TEST_F(MysysMyPWriteTest, MyPWrite300)
+{
+  uchar buf[300];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 300, _))
+    .Times(1)
+    .WillOnce(Return(100));
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 200, _))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(EAGAIN, 0));
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 200, _))
+    .Times(1)
+    .WillOnce(Return(200));
+
+  const size_t result= my_pwrite(42, buf, 300, m_offset, 0);
+  EXPECT_EQ(300U, result);
+}
+
+}
+#endif
diff -Nru percona-xtrabackup-2.2.3/unittest/gunit/mysys_my_write-t.cc percona-xtrabackup-2.3.7/unittest/gunit/mysys_my_write-t.cc
--- percona-xtrabackup-2.2.3/unittest/gunit/mysys_my_write-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ percona-xtrabackup-2.3.7/unittest/gunit/mysys_my_write-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -0,0 +1,258 @@
+/* Copyright (c) 2014, 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  02111-1307  USA */
+
+// First include (the generated) my_config.h, to get correct platform defines.
+#include "my_config.h"
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+// Ignore test on windows, as we are mocking away a unix function, see below.
+#ifndef __WIN__
+namespace mysys_my_write_unittest {
+
+using ::testing::_;
+using ::testing::InSequence;
+using ::testing::Return;
+using ::testing::SetErrnoAndReturn;
+
+class MockWrite
+{
+public:
+  virtual ~MockWrite() {}
+  MOCK_METHOD3(mockwrite, ssize_t(int, const void *, size_t));
+};
+
+MockWrite *mockfs= NULL;
+
+// We need to mock away write(2), do it with a macro:
+#define write(fd, buf, count) mockfs->mockwrite(fd, buf, count)
+
+/*
+  Include the source file, which will give us
+  mysys_my_write_unittest::my_write() for testing.
+*/
+#include "../../mysys/my_write.c"
+
+#undef write
+
+class MysysMyWriteTest : public ::testing::Test
+{
+  virtual void SetUp()
+  {
+    mockfs= new MockWrite;
+  }
+  virtual void TearDown()
+  {
+    delete mockfs;
+    mockfs= NULL;
+  }
+};
+
+
+// Test of normal case: write OK
+TEST_F(MysysMyWriteTest, MyWriteOK)
+{
+  uchar buf[4096];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(Return(4096));
+
+  const size_t result= my_write(42, buf, 4096, 0);
+  EXPECT_EQ(4096U, result);
+}
+
+
+// Test of normal case: write OK with MY_NABP
+TEST_F(MysysMyWriteTest, MyWriteOKNABP)
+{
+  uchar buf[4096];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(Return(4096));
+
+  const size_t result= my_write(42, buf, 4096, MYF(MY_NABP));
+  EXPECT_EQ(0U, result);
+}
+
+
+// Test of disk full: write not OK
+TEST_F(MysysMyWriteTest, MyWriteFail)
+{
+  uchar buf[4096];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(ENOSPC, -1));
+
+  const size_t result= my_write(42, buf, 4096, 0);
+  EXPECT_EQ(MY_FILE_ERROR, result);
+}
+
+
+// Test of disk full: write not OK, with MY_NABP
+TEST_F(MysysMyWriteTest, MyWriteFailNABP)
+{
+  uchar buf[4096];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(ENOSPC, -1));
+
+  const size_t result= my_write(42, buf, 4096, MYF(MY_NABP));
+  EXPECT_EQ(MY_FILE_ERROR, result);
+}
+
+
+// Test of disk full after partial write.
+TEST_F(MysysMyWriteTest, MyWrite8192)
+{
+  uchar buf[8192];
+  InSequence s;
+  // Expect call to write 8192 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 8192))
+    .Times(1)
+    .WillOnce(Return(4096));
+  // Expect second call to write remaining 4096 bytes, return disk full.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(ENOSPC, -1));
+
+  const size_t result= my_write(42, buf, 8192, 0);
+  EXPECT_EQ(4096U, result);
+}
+
+
+// Test of disk full after partial write.
+TEST_F(MysysMyWriteTest, MyWrite8192NABP)
+{
+  uchar buf[8192];
+  InSequence s;
+  // Expect call to write 8192 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 8192))
+    .Times(1)
+    .WillOnce(Return(4096));
+  // Expect second call to write remaining 4096 bytes, return disk full.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(ENOSPC, -1));
+
+  const size_t result= my_write(42, buf, 8192, MYF(MY_NABP));
+  EXPECT_EQ(MY_FILE_ERROR, result);
+}
+
+
+// Test of partial write, followed by interrupt, followed by successful write.
+TEST_F(MysysMyWriteTest, MyWrite8192Interrupt)
+{
+  uchar buf[8192];
+  InSequence s;
+  // Expect call to write 8192 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 8192))
+    .Times(1)
+    .WillOnce(Return(4096));
+  // Expect second call to write remaining 4096 bytes, return interrupt.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(EINTR, -1));
+  // Expect third call to write remaining 4096 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(Return(4096));
+
+  const size_t result= my_write(42, buf, 8192, 0);
+  EXPECT_EQ(8192U, result);
+}
+
+
+// Test of partial write, followed by interrupt, followed by successful write.
+TEST_F(MysysMyWriteTest, MyWrite8192InterruptNABP)
+{
+  uchar buf[8192];
+  InSequence s;
+  // Expect call to write 8192 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 8192))
+    .Times(1)
+    .WillOnce(Return(4096));
+  // Expect second call to write remaining 4096 bytes, return interrupt.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(EINTR, -1));
+  // Expect third call to write remaining 4096 bytes, return 4096.
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 4096))
+    .Times(1)
+    .WillOnce(Return(4096));
+
+  const size_t result= my_write(42, buf, 8192, MYF(MY_NABP));
+  EXPECT_EQ(0U, result);
+}
+
+
+// Test of partial write, followed successful write.
+TEST_F(MysysMyWriteTest, MyWrite400)
+{
+  uchar buf[400];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 400))
+    .Times(1)
+    .WillOnce(Return(200));
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 200))
+    .Times(1)
+    .WillOnce(Return(200));
+
+  const size_t result= my_write(42, buf, 400, 0);
+  EXPECT_EQ(400U, result);
+}
+
+
+// Test of partial write, followed successful write.
+TEST_F(MysysMyWriteTest, MyWrite400NABP)
+{
+  uchar buf[400];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 400))
+    .Times(1)
+    .WillOnce(Return(200));
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 200))
+    .Times(1)
+    .WillOnce(Return(200));
+
+  const size_t result= my_write(42, buf, 400, MYF(MY_NABP));
+  EXPECT_EQ(0U, result);
+}
+
+
+// Test of partial write, followed by failure, followed successful write.
+TEST_F(MysysMyWriteTest, MyWrite300)
+{
+  uchar buf[300];
+  InSequence s;
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 300))
+    .Times(1)
+    .WillOnce(Return(100));
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 200))
+    .Times(1)
+    .WillOnce(SetErrnoAndReturn(EAGAIN, 0));
+  EXPECT_CALL(*mockfs, mockwrite(_, _, 200))
+    .Times(1)
+    .WillOnce(Return(200));
+
+  const size_t result= my_write(42, buf, 300, 0);
+  EXPECT_EQ(300U, result);
+}
+
+}
+#endif
diff -Nru percona-xtrabackup-2.2.3/unittest/gunit/stdcxx-t.cc percona-xtrabackup-2.3.7/unittest/gunit/stdcxx-t.cc
--- percona-xtrabackup-2.2.3/unittest/gunit/stdcxx-t.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/unittest/gunit/stdcxx-t.cc	2017-02-27 07:47:02.000000000 +0000
@@ -17,7 +17,9 @@
 #include "my_config.h"
 #include <gtest/gtest.h>
 
-#if defined(__GNUC__) && __GNUC__ > 3
+#if defined(_LIBCPP_VERSION)
+#include <unordered_map>
+#elif defined(__GNUC__) && __GNUC__ > 3
 #include <tr1/unordered_map>
 #elif defined(__WIN__)
 #include <hash_map>
@@ -31,7 +33,9 @@
 template<typename K, typename T>
 struct MyHashMap
 {
-#if defined(__GNUC__) && __GNUC__ > 3
+#if defined(_LIBCPP_VERSION)
+  typedef std::unordered_map<K, T> Type;
+#elif defined(__GNUC__) && __GNUC__ > 3
   typedef std::tr1::unordered_map<K, T> Type;
 #elif defined(__WIN__)
   typedef stdext::hash_map<K, T> Type;
diff -Nru percona-xtrabackup-2.2.3/unittest/gunit/test_utils.cc percona-xtrabackup-2.3.7/unittest/gunit/test_utils.cc
--- percona-xtrabackup-2.2.3/unittest/gunit/test_utils.cc	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/unittest/gunit/test_utils.cc	2017-02-27 07:47:02.000000000 +0000
@@ -19,6 +19,7 @@
 
 #include "test_utils.h"
 #include "rpl_handler.h"                        // delegates_init()
+#include "global_threads.h"                     // LOCK_thread_count
 
 namespace my_testing {
 
@@ -82,11 +83,18 @@
   m_thd->store_globals();
   lex_start(m_thd);
   m_thd->set_current_time();
+
+  mysql_mutex_lock(&LOCK_thread_count);
+  m_thd->thread_id= m_thd->variables.pseudo_thread_id= thread_id++;
+  mysql_mutex_unlock(&LOCK_thread_count);
+
+  my_pthread_setspecific_ptr(THR_THD, m_thd);
 }
 
 void Server_initializer::TearDown()
 {
   m_thd->cleanup_after_query();
+  my_pthread_setspecific_ptr(THR_THD, NULL);
   delete m_thd;
 }
 
diff -Nru percona-xtrabackup-2.2.3/VERSION percona-xtrabackup-2.3.7/VERSION
--- percona-xtrabackup-2.2.3/VERSION	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/VERSION	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=17
+MYSQL_VERSION_PATCH=24
 MYSQL_VERSION_EXTRA=
diff -Nru percona-xtrabackup-2.2.3/vio/CMakeLists.txt percona-xtrabackup-2.3.7/vio/CMakeLists.txt
--- percona-xtrabackup-2.2.3/vio/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/vio/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -21,7 +21,6 @@
 ADD_CONVENIENCE_LIBRARY(vio ${VIO_SOURCES})
 TARGET_LINK_LIBRARIES(vio ${LIBSOCKET})
 
-INSTALL_DEBUG_SYMBOLS(vio)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(vio DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru percona-xtrabackup-2.2.3/vio/vio.c percona-xtrabackup-2.3.7/vio/vio.c
--- percona-xtrabackup-2.2.3/vio/vio.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/vio/vio.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -157,6 +157,16 @@
           to another socket-based transport type. For example,
           rebind a TCP/IP transport to SSL.
 
+  @remark If new socket handle passed to vio_reset() is not equal
+          to the socket handle stored in Vio then socket handle will
+          be closed before storing new value. If handles are equal
+          then old socket is not closed. This is important for
+          vio_reset() usage in ssl_do().
+
+  @remark If any error occurs then Vio members won't be altered thus
+          preserving socket handle stored in Vio and not taking
+          ownership over socket handle passed as parameter.
+
   @param vio    A VIO object.
   @param type   A socket-based transport type.
   @param sd     The socket.
@@ -170,25 +180,19 @@
                   my_socket sd, void *ssl __attribute__((unused)), uint flags)
 {
   int ret= FALSE;
-  Vio old_vio= *vio;
+  Vio new_vio;
   DBUG_ENTER("vio_reset");
 
   /* The only supported rebind is from a socket-based transport type. */
   DBUG_ASSERT(vio->type == VIO_TYPE_TCPIP || vio->type == VIO_TYPE_SOCKET);
 
-  /*
-    Will be reinitialized depending on the flags.
-    Nonetheless, already buffered inside the SSL layer.
-  */
-  my_free(vio->read_buffer);
-
-  vio_init(vio, type, sd, flags);
+  vio_init(&new_vio, type, sd, flags);
 
   /* Preserve perfschema info for this connection */
-  vio->mysql_socket.m_psi= old_vio.mysql_socket.m_psi;
+  new_vio.mysql_socket.m_psi= vio->mysql_socket.m_psi;
 
 #ifdef HAVE_OPENSSL
-  vio->ssl_arg= ssl;
+  new_vio.ssl_arg= ssl;
 #endif
 
   /*
@@ -196,11 +200,38 @@
     the underlying proprieties associated with the timeout,
     such as the socket blocking mode.
   */
-  if (old_vio.read_timeout >= 0)
-    ret|= vio_timeout(vio, 0, old_vio.read_timeout);
+  if (vio->read_timeout >= 0)
+    ret|= vio_timeout(&new_vio, 0, vio->read_timeout);
+
+  if (vio->write_timeout >= 0)
+    ret|= vio_timeout(&new_vio, 1, vio->write_timeout);
 
-  if (old_vio.write_timeout >= 0)
-    ret|= vio_timeout(vio, 1, old_vio.write_timeout);
+  if (ret)
+  {
+    /*
+      vio_reset() failed
+      free resources allocated by vio_init
+    */
+    my_free(new_vio.read_buffer);
+  }
+  else
+  {
+    /*
+      vio_reset() succeeded
+      free old resources and then overwrite VIO structure
+    */
+
+    /*
+      Close socket only when it is not equal to the new one.
+    */
+    if (sd != mysql_socket_getfd(vio->mysql_socket))
+      if (vio->inactive == FALSE)
+        vio->vioshutdown(vio);
+
+    my_free(vio->read_buffer);
+
+    *vio= new_vio;
+  }
 
   DBUG_RETURN(MY_TEST(ret));
 }
diff -Nru percona-xtrabackup-2.2.3/vio/viosocket.c percona-xtrabackup-2.3.7/vio/viosocket.c
--- percona-xtrabackup-2.2.3/vio/viosocket.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/vio/viosocket.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2015, 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
@@ -735,7 +735,7 @@
 int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout)
 {
   int ret;
-  short revents= 0;
+  short revents __attribute__((unused)) = 0;
   struct pollfd pfd;
   my_socket sd= mysql_socket_getfd(vio->mysql_socket);
   MYSQL_SOCKET_WAIT_VARIABLES(locker, state) /* no ';' */
diff -Nru percona-xtrabackup-2.2.3/vio/viossl.c percona-xtrabackup-2.3.7/vio/viossl.c
--- percona-xtrabackup-2.2.3/vio/viossl.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/vio/viossl.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -377,6 +377,12 @@
   int r;
   SSL *ssl;
   my_socket sd= mysql_socket_getfd(vio->mysql_socket);
+
+  /* Declared here to make compiler happy */
+#if !defined(HAVE_YASSL) && !defined(DBUG_OFF)
+  int j, n;
+#endif
+
   DBUG_ENTER("ssl_do");
   DBUG_PRINT("enter", ("ptr: 0x%lx, sd: %d  ctx: 0x%lx",
                        (long) ptr, sd, (long) ptr->ssl_context));
@@ -391,8 +397,27 @@
   SSL_clear(ssl);
   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
   SSL_set_fd(ssl, sd);
-#ifndef HAVE_YASSL
-  SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
+#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
+  SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */
+#elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */
+  sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
+#endif
+
+#if !defined(HAVE_YASSL) && !defined(DBUG_OFF)
+  {
+    STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
+    ssl_comp_methods = SSL_COMP_get_compression_methods();
+    n= sk_SSL_COMP_num(ssl_comp_methods);
+    DBUG_PRINT("info", ("Available compression methods:\n"));
+    if (n == 0)
+      DBUG_PRINT("info", ("NONE\n"));
+    else
+      for (j = 0; j < n; j++)
+      {
+        SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
+        DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
+      }
+  }
 #endif
 
   /*
diff -Nru percona-xtrabackup-2.2.3/vio/viosslfactories.c percona-xtrabackup-2.3.7/vio/viosslfactories.c
--- percona-xtrabackup-2.2.3/vio/viosslfactories.c	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/vio/viosslfactories.c	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -174,6 +174,7 @@
 {
   DH *dh;
   struct st_VioSSLFd *ssl_fd;
+  long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
   DBUG_ENTER("new_VioSSLFd");
   DBUG_PRINT("enter",
              ("key_file: '%s'  cert_file: '%s'  ca_file: '%s'  ca_path: '%s'  "
@@ -203,6 +204,8 @@
     DBUG_RETURN(0);
   }
 
+  SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
+
   /*
     Set the ciphers that can be used
     NOTE: SSL_CTX_set_cipher_list will return 0 if
diff -Nru percona-xtrabackup-2.2.3/win/create_def_file.js percona-xtrabackup-2.3.7/win/create_def_file.js
--- percona-xtrabackup-2.2.3/win/create_def_file.js	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/win/create_def_file.js	2017-02-27 07:47:02.000000000 +0000
@@ -169,6 +169,7 @@
 function IsCompilerDefinedSymbol(symbol)
 {
     return ((symbol.indexOf("__real@") != -1) ||
+    (symbol.indexOf("__xmm@") != -1) ||        // SSE instruction set constants
     (symbol.indexOf("_CTA2?") != -1) ||        // std::bad_alloc
     (symbol.indexOf("_CTA3?") != -1) ||        // std::length_error
     (symbol.indexOf("_TI2?") != -1) ||         // std::bad_alloc
diff -Nru percona-xtrabackup-2.2.3/XB_VERSION percona-xtrabackup-2.3.7/XB_VERSION
--- percona-xtrabackup-2.2.3/XB_VERSION	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/XB_VERSION	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
 XB_VERSION_MAJOR=2
-XB_VERSION_MINOR=2
-XB_VERSION_PATCH=3
+XB_VERSION_MINOR=3
+XB_VERSION_PATCH=7
 XB_VERSION_EXTRA=
diff -Nru percona-xtrabackup-2.2.3/zlib/CMakeLists.txt percona-xtrabackup-2.3.7/zlib/CMakeLists.txt
--- percona-xtrabackup-2.2.3/zlib/CMakeLists.txt	2014-07-22 17:13:52.000000000 +0000
+++ percona-xtrabackup-2.3.7/zlib/CMakeLists.txt	2017-02-27 07:47:02.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -23,7 +23,6 @@
 ADD_CONVENIENCE_LIBRARY(zlib ${ZLIB_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(zlib)
 
-INSTALL_DEBUG_SYMBOLS(zlib)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(zlib DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()