diff --git a/.bzrignore b/.bzrignore
index f757e602563..409b6148125 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1140,3 +1140,7 @@ libmysqld/gcalc_tools.cc
 sql/share/errmsg.sys
 sql/share/mysql
 install_manifest.txt
+sql/db.opt
+./_CPack_Packages
+./install_manifest_*.txt
+typescript
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41ee9b199b1..3db85a0b3e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,6 @@ ENDIF()
 SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
    "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel")
 
-
-
 IF(UNIX AND NOT APPLE)
   # Note, that generally one should not change settings depending
   # on CMAKE_BUILD_TYPE, because VS and Xcode configure once (with
@@ -124,18 +122,30 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
   SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS()
 ENDIF()
 
+# Packaging
+IF (NOT CPACK_GENERATOR)
+  IF(WIN32)
+    SET(CPACK_GENERATOR "ZIP")
+  ELSE()
+    SET(CPACK_GENERATOR "TGZ")
+  ENDIF(WIN32) 
+ENDIF(NOT CPACK_GENERATOR)
+
+INCLUDE(mysql_version)
+INCLUDE(cpack_rpm)
+INCLUDE(cpack_source_ignore_files)
+INCLUDE(install_layout)
+
 # Add macros
 INCLUDE(character_sets)
 INCLUDE(zlib)
 INCLUDE(ssl)
 INCLUDE(readline)
-INCLUDE(mysql_version)
 INCLUDE(libutils)
 INCLUDE(dtrace)
 INCLUDE(ctest)
 INCLUDE(plugin)
 INCLUDE(install_macros)
-INCLUDE(install_layout)
 INCLUDE(mysql_add_executable)
 INCLUDE(wsrep)
 
@@ -238,8 +248,8 @@ ELSE()
 ENDIF()
 SET(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}")
 SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}")
-IF(SYSCONFDIR)
-  SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
+IF(INSTALL_SYSCONFDIR)
+  SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
 ENDIF()
 
 
@@ -351,51 +361,18 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
-# Packaging
-IF(WIN32)
-  SET(CPACK_GENERATOR "ZIP")
-ELSE()
-  SET(CPACK_GENERATOR "TGZ")
-ENDIF() 
-
-
-# Create a single package with "make package"
-# (see http://public.kitware.com/Bug/view.php?id=11452)
-SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
+INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql 
+DESTINATION ${INSTALL_DOCREADMEDIR} 
+COMPONENT Readme
+OPTIONAL
+)
+INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
+IF(UNIX)
+  INSTALL(FILES Docs/INSTALL-BINARY Docs/README-wsrep DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+ENDIF()
 
 INCLUDE(CPack)
-IF(UNIX)
-  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
-ENDIF()
-#
-# RPM installs documentation directly from the source tree
-#
-IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-  INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql 
-  DESTINATION ${INSTALL_DOCREADMEDIR} 
-  COMPONENT Readme
-  OPTIONAL
-  )
-  INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
-  INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
-  IF(UNIX)
-    INSTALL(FILES Docs/INSTALL-BINARY Docs/README-wsrep DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
-  ENDIF()
-  # MYSQL_DOCS_LOCATON is used in "make dist", points to the documentation directory
-  SET(MYSQL_DOCS_LOCATION "" CACHE PATH "Location from where documentation is copied")
-  MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION)
-  INSTALL(DIRECTORY Docs/ DESTINATION ${INSTALL_DOCDIR}
-    COMPONENT Documentation
-    PATTERN "INSTALL-BINARY" EXCLUDE
-    PATTERN "README-wsrep" EXCLUDE
-    PATTERN "Makefile.*" EXCLUDE
-    PATTERN "glibc*" EXCLUDE
-    PATTERN "linuxthreads.txt" EXCLUDE
-    PATTERN "myisam.txt" EXCLUDE
-    PATTERN "mysql.info" EXCLUDE
-    PATTERN "sp-imp-spec.txt" EXCLUDE
-  )
-ENDIF()
 
 IF(NON_DISTRIBUTABLE_WARNING)
   MESSAGE(WARNING "
diff --git a/VERSION b/VERSION
index 94796f2c7ba..0f96ceb238d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=23
+MYSQL_VERSION_PATCH=24
 MYSQL_VERSION_EXTRA=
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 3f53158572f..e4507f9c8ba 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -49,7 +49,7 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
 
-MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
+MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
 
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index 27c26cf9b64..e3da44e2fc5 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -141,7 +141,8 @@ static my_bool opt_compress= FALSE, tty_password= FALSE,
 const char *auto_generate_sql_type= "mixed";
 
 static unsigned long connect_flags= CLIENT_MULTI_RESULTS |
-                                    CLIENT_MULTI_STATEMENTS;
+                                    CLIENT_MULTI_STATEMENTS |
+                                    CLIENT_REMEMBER_OPTIONS;
 
 static int verbose, delimiter_length;
 static uint commit_rate;
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index e6d42bc60a2..b93c9426deb 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -33,7 +33,7 @@
   And many others
 */
 
-#define MTEST_VERSION "3.3"
+#define MTEST_VERSION "3.4"
 
 #include "client_priv.h"
 #include <mysql_version.h>
@@ -78,6 +78,8 @@ static my_bool non_blocking_api_enabled= 0;
 #define MAX_DELIMITER_LENGTH 16
 #define DEFAULT_MAX_CONN        64
 
+#define DIE_BUFF_SIZE           8192
+
 /* Flags controlling send and reap */
 #define QUERY_SEND_FLAG  1
 #define QUERY_REAP_FLAG  2
@@ -106,6 +108,7 @@ static int opt_port= 0;
 static int opt_max_connect_retries;
 static int opt_result_format_version;
 static int opt_max_connections= DEFAULT_MAX_CONN;
+static int error_count= 0;
 static my_bool opt_compress= 0, silent= 0, verbose= 0;
 static my_bool debug_info_flag= 0, debug_check_flag= 0;
 static my_bool tty_password= 0;
@@ -122,7 +125,7 @@ static my_bool disable_connect_log= 1;
 static my_bool disable_warnings= 0, disable_column_names= 0;
 static my_bool prepare_warnings_enabled= 0;
 static my_bool disable_info= 1;
-static my_bool abort_on_error= 1;
+static my_bool abort_on_error= 1, opt_continue_on_error= 0;
 static my_bool server_initialized= 0;
 static my_bool is_windows= 0;
 static char **default_argv;
@@ -559,14 +562,15 @@ const char *from, int len);
 
 static void cleanup_and_exit(int exit_code) __attribute__((noreturn));
 
-void die(const char *fmt, ...)
-  ATTRIBUTE_FORMAT(printf, 1, 2) __attribute__((noreturn));
-void abort_not_supported_test(const char *fmt, ...)
-  ATTRIBUTE_FORMAT(printf, 1, 2) __attribute__((noreturn));
-void verbose_msg(const char *fmt, ...)
-  ATTRIBUTE_FORMAT(printf, 1, 2);
-void log_msg(const char *fmt, ...)
-  ATTRIBUTE_FORMAT(printf, 1, 2);
+void really_die(const char *msg) __attribute__((noreturn));
+void report_or_die(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
+void die(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2)
+  __attribute__((noreturn));
+static void make_error_message(char *buf, size_t len, const char *fmt, va_list args);
+void abort_not_supported_test(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2)
+  __attribute__((noreturn));
+void verbose_msg(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
+void log_msg(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
 
 VAR* var_from_env(const char *, const char *);
 VAR* var_init(VAR* v, const char *name, int name_len, const char *val,
@@ -812,6 +816,9 @@ void handle_error(struct st_command*,
 void handle_no_error(struct st_command*);
 void revert_properties();
 
+static void handle_no_active_connection(struct st_command* command, 
+  struct st_connection *cn, DYNAMIC_STRING *ds);
+
 #ifdef EMBEDDED_LIBRARY
 
 #define EMB_SEND_QUERY 1
@@ -983,7 +990,10 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query,
       else
       {
 	if (!(v= var_get(p, &p, 0, 0)))
-	  die("Bad variable in eval");
+        {
+          report_or_die( "Bad variable in eval");
+          return;
+        }
 	dynstr_append_mem(query_eval, v->str_val, v->str_val_len);
       }
       break;
@@ -1270,9 +1280,13 @@ void handle_command_error(struct st_command *command, uint error,
     int i;
 
     if (command->abort_on_error)
-      die("command \"%.*s\" failed with error: %u  my_errno: %d  errno: %d",
+    {
+      report_or_die("command \"%.*s\" failed with error: %u  my_errno: %d  "
+                    "errno: %d",
           command->first_word_len, command->query, error, my_errno,
           sys_errno);
+      return;
+    }
 
     i= match_expected_error(command, error, NULL);
 
@@ -1285,14 +1299,17 @@ void handle_command_error(struct st_command *command, uint error,
       DBUG_VOID_RETURN;
     }
     if (command->expected_errors.count > 0)
-      die("command \"%.*s\" failed with wrong error: %u  my_errno: %d  errno: %d",
-          command->first_word_len, command->query, error, my_errno, sys_errno);
+      report_or_die("command \"%.*s\" failed with wrong error: %u  "
+                    "my_errno: %d  errno: %d",
+                    command->first_word_len, command->query, error, my_errno,
+                    sys_errno);
   }
   else if (command->expected_errors.err[0].type == ERR_ERRNO &&
            command->expected_errors.err[0].code.errnum != 0)
   {
     /* Error code we wanted was != 0, i.e. not an expected success */
-    die("command \"%.*s\" succeeded - should have failed with errno %d...",
+    report_or_die("command \"%.*s\" succeeded - should have failed with "
+                  "errno %d...",
         command->first_word_len, command->query,
         command->expected_errors.err[0].code.errnum);
   }
@@ -1437,50 +1454,59 @@ static void cleanup_and_exit(int exit_code)
   exit(exit_code);
 }
 
-void print_file_stack()
+size_t print_file_stack(char *s, const char *end)
 {
+  char *start= s;
   struct st_test_file* err_file= cur_file;
   if (err_file == file_stack)
-    return;
+    return 0;
 
   for (;;)
   {
     err_file--;
-    fprintf(stderr, "included from %s at line %d:\n",
-            err_file->file_name, err_file->lineno);
+    s+= my_snprintf(s, end - s, "included from %s at line %d:\n",
+                     err_file->file_name, err_file->lineno);
     if (err_file == file_stack)
       break;
   }
+  return s - start;
+}
+
+
+static void make_error_message(char *buf, size_t len, const char *fmt, va_list args)
+{
+  char *s= buf, *end= buf + len;
+  s+= my_snprintf(s, end - s, "mysqltest: ");
+  if (cur_file && cur_file != file_stack)
+  {
+    s+= my_snprintf(s, end - s, "In included file \"%s\": \n",
+                    cur_file->file_name);
+    s+= print_file_stack(s, end);
+  }
+  
+  if (start_lineno > 0)
+    s+= my_snprintf(s, end -s, "At line %u: ", start_lineno);
+  if (!fmt)
+    fmt= "unknown error";
+
+  s+= my_vsnprintf(s, end - s, fmt, args);
+  s+= my_snprintf(s, end -s, "\n", start_lineno);
 }
 
 void die(const char *fmt, ...)
 {
-  static int dying= 0;
+  char buff[DIE_BUFF_SIZE];
   va_list args;
-  DBUG_ENTER("die");
-  DBUG_PRINT("enter", ("start_lineno: %d", start_lineno));
+  va_start(args, fmt);
+  make_error_message(buff, sizeof(buff), fmt, args);
+  really_die(buff);
+}
 
+void really_die(const char *msg)
+{
+  static int dying= 0;
   fflush(stdout);
-  /* Print the error message */
-  fprintf(stderr, "mysqltest: ");
-  if (cur_file && cur_file != file_stack)
-  {
-    fprintf(stderr, "In included file \"%s\": \n",
-            cur_file->file_name);
-    print_file_stack();
-  }
-  
-  if (start_lineno > 0)
-    fprintf(stderr, "At line %u: ", start_lineno);
-  if (fmt)
-  {
-    va_start(args, fmt);
-    vfprintf(stderr, fmt, args);
-    va_end(args);
-  }
-  else
-    fprintf(stderr, "unknown error");
-  fprintf(stderr, "\n");
+  fprintf(stderr, "%s", msg);
   fflush(stderr);
 
   /*
@@ -1504,6 +1530,28 @@ void die(const char *fmt, ...)
   cleanup_and_exit(1);
 }
 
+void report_or_die(const char *fmt, ...)
+{
+  va_list args;
+  DBUG_ENTER("report_or_die");
+
+  char buff[DIE_BUFF_SIZE];
+
+  va_start(args, fmt);
+  make_error_message(buff, sizeof(buff), fmt, args);
+  va_end(args);
+
+  if (opt_continue_on_error)
+  {
+    /* Just log the error and continue */
+    replace_dynstr_append(&ds_res, buff);
+    error_count++;
+    DBUG_VOID_RETURN;
+  }
+
+  really_die(buff);
+}
+
 
 void abort_not_supported_test(const char *fmt, ...)
 {
@@ -1516,7 +1564,10 @@ void abort_not_supported_test(const char *fmt, ...)
           file_stack->file_name);
   fprintf(stderr, "Detected in file %s at line %d\n",
           cur_file->file_name, cur_file->lineno);
-  print_file_stack();
+
+  char buff[DIE_BUFF_SIZE];
+  print_file_stack(buff, buff + sizeof(buff));
+  fprintf(stderr, "%s", buff);
 
   /* Print error message */
   va_start(args, fmt);
@@ -1648,7 +1699,10 @@ static int run_command(char* cmd,
   DBUG_PRINT("enter", ("cmd: %s", cmd));
 
   if (!(res_file= popen(cmd, "r")))
-    die("popen(\"%s\", \"r\") failed", cmd);
+  {
+    report_or_die("popen(\"%s\", \"r\") failed", cmd);
+    return -1;
+  }
 
   while (fgets(buf, sizeof(buf), res_file))
   {
@@ -1748,7 +1802,10 @@ static int diff_check(const char *diff_name)
   if (!(res_file= popen(buf, "r")))
     die("popen(\"%s\", \"r\") failed", buf);
 
-  /* if diff is not present, nothing will be in stdout to increment have_diff */
+  /*
+    if diff is not present, nothing will be in stdout to increment
+    have_diff
+  */
   if (fgets(buf, sizeof(buf), res_file))
     have_diff= 1;
 
@@ -2061,7 +2118,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
 
 void check_result()
 {
-  const char* mess= "Result content mismatch\n";
+  const char *mess= 0;
 
   DBUG_ENTER("check_result");
   DBUG_ASSERT(result_file_name);
@@ -2069,9 +2126,13 @@ void check_result()
 
   switch (compare_files(log_file.file_name(), result_file_name)) {
   case RESULT_OK:
-    break; /* ok */
+    if (!error_count)
+      break; /* ok */
+    mess= "Got errors while running test";
+    /* Fallthrough */
   case RESULT_LENGTH_MISMATCH:
-    mess= "Result length mismatch\n";
+    if (!mess)
+      mess= "Result length mismatch\n";
     /* Fallthrough */
   case RESULT_CONTENT_MISMATCH:
   {
@@ -2081,6 +2142,10 @@ void check_result()
     */
     char reject_file[FN_REFLEN];
     size_t reject_length;
+
+    if (!mess)
+      mess= "Result content mismatch\n";
+
     dirname_part(reject_file, result_file_name, &reject_length);
 
     if (access(reject_file, W_OK) == 0)
@@ -2180,8 +2245,8 @@ static int strip_surrounding(char* str, char c1, char c2)
 static void strip_parentheses(struct st_command *command)
 {
   if (strip_surrounding(command->first_argument, '(', ')'))
-      die("%.*s - argument list started with '%c' must be ended with '%c'",
-          command->first_word_len, command->query, '(', ')');
+    die("%.*s - argument list started with '%c' must be ended with '%c'",
+        command->first_word_len, command->query, '(', ')');
 }
 
 
@@ -2500,6 +2565,19 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
   DBUG_ENTER("var_query_set");
   LINT_INIT(res);
 
+  if (!mysql)
+  {
+    struct st_command command;
+    memset(&command, 0, sizeof(command));
+    command.query= (char*)query;
+    command.first_word_len= (*query_end - query);
+    command.first_argument= command.query + command.first_word_len;
+    command.end= (char*)*query_end;
+    command.abort_on_error= 1; /* avoid uninitialized variables */
+    handle_no_active_connection(&command, cur_con, &ds_res);
+    DBUG_VOID_RETURN;
+  }
+
   /* Only white space or ) allowed past ending ` */
   while (end > query && *end != '`')
   {
@@ -2518,8 +2596,8 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
 
   if (mysql_real_query(mysql, ds_query.str, ds_query.length)) 
   {
-    handle_error (curr_command, mysql_errno(mysql), mysql_error(mysql),
-                  mysql_sqlstate(mysql), &ds_res);
+    handle_error(curr_command, mysql_errno(mysql), mysql_error(mysql),
+                 mysql_sqlstate(mysql), &ds_res);
     /* If error was acceptable, return empty string */
     dynstr_free(&ds_query);
     eval_expr(var, "", 0);
@@ -2527,7 +2605,12 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
   }
   
   if (!(res= mysql_store_result(mysql)))
-    die("Query '%s' didn't return a result set", ds_query.str);
+  {
+    report_or_die("Query '%s' didn't return a result set", ds_query.str);
+    dynstr_free(&ds_query);
+    eval_expr(var, "", 0);
+    return;
+  }
   dynstr_free(&ds_query);
 
   if ((row= mysql_fetch_row(res)) && row[0])
@@ -2674,6 +2757,12 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
   DBUG_ENTER("var_set_query_get_value");
   LINT_INIT(res);
 
+  if (!mysql)
+  {
+    handle_no_active_connection(command, cur_con, &ds_res);
+    DBUG_VOID_RETURN;
+  }
+
   strip_parentheses(command);
   DBUG_PRINT("info", ("query: %s", command->query));
   check_command_args(command, command->first_argument, query_get_value_args,
@@ -2696,16 +2785,23 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
   /* Run the query */
   if (mysql_real_query(mysql, ds_query.str, ds_query.length))
   {
-    handle_error (curr_command, mysql_errno(mysql), mysql_error(mysql),
-                  mysql_sqlstate(mysql), &ds_res);
+    handle_error(curr_command, mysql_errno(mysql), mysql_error(mysql),
+                 mysql_sqlstate(mysql), &ds_res);
     /* If error was acceptable, return empty string */
     dynstr_free(&ds_query);
+    dynstr_free(&ds_col);
     eval_expr(var, "", 0);
     DBUG_VOID_RETURN;
   }
 
   if (!(res= mysql_store_result(mysql)))
-    die("Query '%s' didn't return a result set", ds_query.str);
+  {
+    report_or_die("Query '%s' didn't return a result set", ds_query.str);
+    dynstr_free(&ds_query);
+    dynstr_free(&ds_col);
+    eval_expr(var, "", 0);
+    return;
+  }
 
   {
     /* Find column number from the given column name */
@@ -2725,8 +2821,11 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
     if (col_no == -1)
     {
       mysql_free_result(res);
-      die("Could not find column '%s' in the result of '%s'",
-          ds_col.str, ds_query.str);
+      report_or_die("Could not find column '%s' in the result of '%s'",
+                    ds_col.str, ds_query.str);
+      dynstr_free(&ds_query);
+      dynstr_free(&ds_col);
+      return;
     }
     DBUG_PRINT("info", ("Found column %d with name '%s'",
                         i, fields[i].name));
@@ -2834,6 +2933,7 @@ void eval_expr(VAR *v, const char *p, const char **p_end,
       command.first_word_len= len;
       command.first_argument= command.query + len;
       command.end= (char*)*p_end;
+      command.abort_on_error= 1; /* avoid uninitialized variables */
       var_set_query_get_value(&command, v);
       DBUG_VOID_RETURN;
     }
@@ -3165,7 +3265,10 @@ void do_exec(struct st_command *command)
   while (*cmd && my_isspace(charset_info, *cmd))
     cmd++;
   if (!*cmd)
-    die("Missing argument in exec");
+  {
+    report_or_die("Missing argument in exec");
+    return;
+  }
   command->last_argument= command->end;
 
   init_dynamic_string(&ds_cmd, 0, command->query_len+256, 256);
@@ -3197,10 +3300,12 @@ void do_exec(struct st_command *command)
   DBUG_PRINT("info", ("Executing '%s' as '%s'",
                       command->first_argument, ds_cmd.str));
 
-  if (!(res_file= my_popen(&ds_cmd, "r")) && command->abort_on_error)
+  if (!(res_file= my_popen(&ds_cmd, "r")))
   {
     dynstr_free(&ds_cmd);
-    die("popen(\"%s\", \"r\") failed", command->first_argument);
+    if (command->abort_on_error)
+      report_or_die("popen(\"%s\", \"r\") failed", command->first_argument);
+    return;
   }
 
   ds_result= &ds_res;
@@ -3237,11 +3342,12 @@ void do_exec(struct st_command *command)
 
     if (command->abort_on_error)
     {
-      log_msg("exec of '%s' failed, error: %d, status: %d, errno: %d",
-              ds_cmd.str, error, status, errno);
+      report_or_die("exec of '%s' failed, error: %d, status: %d, errno: %d\n"
+                    "Output from before failure:\n%s\n",
+                    ds_cmd.str, error, status, errno,
+                    ds_res.str);
       dynstr_free(&ds_cmd);
-      die("command \"%s\" failed\n\nOutput from before failure:\n%s\n",
-          command->first_argument, ds_res.str);
+      return;
     }
 
     DBUG_PRINT("info",
@@ -3256,8 +3362,8 @@ void do_exec(struct st_command *command)
     {
       dynstr_free(&ds_cmd);
       if (command->expected_errors.count > 0)
-        die("command \"%s\" failed with wrong error: %d",
-            command->first_argument, status);
+        report_or_die("command \"%s\" failed with wrong error: %d",
+                      command->first_argument, status);
     }
   }
   else if (command->expected_errors.err[0].type == ERR_ERRNO &&
@@ -3267,8 +3373,10 @@ void do_exec(struct st_command *command)
     log_msg("exec of '%s failed, error: %d, errno: %d",
             ds_cmd.str, error, errno);
     dynstr_free(&ds_cmd);
-    die("command \"%s\" succeeded - should have failed with errno %d...",
-        command->first_argument, command->expected_errors.err[0].code.errnum);
+    report_or_die("command \"%s\" succeeded - should have failed with "
+                  "errno %d...",
+                  command->first_argument,
+                  command->expected_errors.err[0].code.errnum);
   }
 
   dynstr_free(&ds_cmd);
@@ -3302,7 +3410,8 @@ int do_modify_var(struct st_command *command,
   const char *p= command->first_argument;
   VAR* v;
   if (!*p)
-    die("Missing argument to %.*s", command->first_word_len, command->query);
+    die("Missing argument to %.*s", command->first_word_len,
+        command->query);
   if (*p != '$')
     die("The argument to %.*s must be a variable (start with $)",
         command->first_word_len, command->query);
@@ -3368,7 +3477,10 @@ void do_system(struct st_command *command)
   DBUG_ENTER("do_system");
 
   if (strlen(command->first_argument) == 0)
-    die("Missing arguments to system, nothing to do!");
+  {
+    report_or_die("Missing arguments to system, nothing to do!");
+    return;
+  }
 
   init_dynamic_string(&ds_cmd, 0, command->query_len + 64, 256);
 
@@ -3389,12 +3501,14 @@ void do_system(struct st_command *command)
   if (my_system(&ds_cmd))
   {
     if (command->abort_on_error)
-      die("system command '%s' failed", command->first_argument);
-
-    /* If ! abort_on_error, log message and continue */
-    dynstr_append(&ds_res, "system command '");
-    replace_dynstr_append(&ds_res, command->first_argument);
-    dynstr_append(&ds_res, "' failed\n");
+      report_or_die("system command '%s' failed", command->first_argument);
+    else
+    {
+      /* If ! abort_on_error, log message and continue */
+      dynstr_append(&ds_res, "system command '");
+      replace_dynstr_append(&ds_res, command->first_argument);
+      dynstr_append(&ds_res, "' failed\n");
+    }
   }
 
   command->last_argument= command->end;
@@ -3941,12 +4055,12 @@ void read_until_delimiter(DYNAMIC_STRING *ds,
         No characters except \n are allowed on
         the same line as the command
       */
-      die("Trailing characters found after command");
+      report_or_die("Trailing characters found after command");
     }
 
     if (feof(cur_file->file))
-      die("End of file encountered before '%s' delimiter was found",
-          ds_delimiter->str);
+      report_or_die("End of file encountered before '%s' delimiter was found",
+                    ds_delimiter->str);
 
     if (match_delimiter(c, ds_delimiter->str, ds_delimiter->length))
     {
@@ -4350,8 +4464,13 @@ void do_perl(struct st_command *command)
     /* Format the "perl <filename>" command */
     my_snprintf(buf, sizeof(buf), "perl %s", temp_file_path);
 
-    if (!(res_file= popen(buf, "r")) && command->abort_on_error)
-     die("popen(\"%s\", \"r\") failed", buf);
+    if (!(res_file= popen(buf, "r")))
+    {
+      if (command->abort_on_error)
+        die("popen(\"%s\", \"r\") failed", buf);
+      dynstr_free(&ds_delimiter);
+      return;
+    }
 
     while (fgets(buf, sizeof(buf), res_file))
     {
@@ -4506,14 +4625,14 @@ void do_sync_with_master2(struct st_command *command, long offset)
         information is not initialized, the arguments are
         incorrect, or an error has occured
       */
-      die("%.*s failed: '%s' returned NULL "\
+      die("%.*s failed: '%s' returned NULL "          \
           "indicating slave SQL thread failure",
           command->first_word_len, command->query, query_buf);
 
     }
 
     if (result == -1)
-      die("%.*s failed: '%s' returned -1 "\
+      die("%.*s failed: '%s' returned -1 "            \
           "indicating timeout after %d seconds",
           command->first_word_len, command->query, query_buf, timeout);
     else
@@ -4808,7 +4927,8 @@ int do_sleep(struct st_command *command, my_bool real_sleep)
   while (my_isspace(charset_info, *p))
     p++;
   if (!*p)
-    die("Missing argument to %.*s", command->first_word_len, command->query);
+    die("Missing argument to %.*s", command->first_word_len,
+        command->query);
   sleep_start= p;
   /* Check that arg starts with a digit, not handled by my_strtod */
   if (!my_isdigit(charset_info, *sleep_start))
@@ -4880,16 +5000,21 @@ int query_get_string(MYSQL* mysql, const char* query,
   MYSQL_ROW row;
 
   if (mysql_query(mysql, query))
-    die("'%s' failed: %d %s", query,
-        mysql_errno(mysql), mysql_error(mysql));
+  {
+    report_or_die("'%s' failed: %d %s", query,
+                  mysql_errno(mysql), mysql_error(mysql));
+    return 1;
+  }
   if ((res= mysql_store_result(mysql)) == NULL)
-    die("Failed to store result: %d %s",
-        mysql_errno(mysql), mysql_error(mysql));
+  {
+    report_or_die("Failed to store result: %d %s",
+                  mysql_errno(mysql), mysql_error(mysql));
+    return 1;
+  }
 
   if ((row= mysql_fetch_row(res)) == NULL)
   {
     mysql_free_result(res);
-    ds= 0;
     return 1;
   }
   init_dynamic_string(ds, (row[column] ? row[column] : "NULL"), ~0, 32);
@@ -5161,7 +5286,7 @@ void do_get_errcodes(struct st_command *command)
       while (*p && p != end)
       {
         if (!my_isdigit(charset_info, *p))
-          die("Invalid argument to error: '%s' - "\
+          die("Invalid argument to error: '%s' - "            \
               "the errno may only consist of digits[0-9]",
               command->first_argument);
         p++;
@@ -6084,7 +6209,7 @@ void do_block(enum block_cmd cmd, struct st_command* command)
     eval_expr(&v2, curr_ptr, &expr_end);
 
     if ((operand!=EQ_OP && operand!=NE_OP) && ! (v.is_int && v2.is_int))
-      die ("Only == and != are supported for string values");
+      die("Only == and != are supported for string values");
 
     /* Now we overwrite the first variable with 0 or 1 (for false or true) */
 
@@ -6442,7 +6567,7 @@ int read_line(char *buf, int size)
 	*p++= c;
     }
   }
-  die("The input buffer is too small for this query.x\n" \
+  die("The input buffer is too small for this query.x\n"      \
       "check your query or increase MAX_QUERY and recompile");
   DBUG_RETURN(0);
 }
@@ -6675,6 +6800,12 @@ static struct my_option my_long_options[] =
   {"compress", 'C', "Use the compressed server/client protocol.",
    &opt_compress, &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
    0, 0, 0},
+  {"continue-on-error", 0,
+   "Continue test even if we got an error. "
+   "This is mostly useful when testing a storage engine to see what from a test file it can execute, "
+   "or to find all syntax errors in a newly created big test file",
+   &opt_continue_on_error, &opt_continue_on_error, 0,
+   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"cursor-protocol", 0, "Use cursors for prepared statements.",
    &cursor_protocol, &cursor_protocol, 0,
    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -7006,7 +7137,8 @@ int parse_args(int argc, char **argv)
   {
     /* Check that the result file exists */
     if (result_file_name && access(result_file_name, F_OK) != 0)
-      die("The specified result file '%s' does not exist", result_file_name);
+      die("The specified result file '%s' does not exist",
+          result_file_name);
   }
 
   return 0;
@@ -7333,8 +7465,8 @@ void append_stmt_result(DYNAMIC_STRING *ds, MYSQL_STMT *stmt,
   }
 
   if (error != MYSQL_NO_DATA)
-    die("mysql_fetch didn't end with MYSQL_NO_DATA from statement: error: %d",
-        error);
+    die("mysql_fetch didn't end with MYSQL_NO_DATA from statement: "
+        "error: %d", error);
   if (mysql_stmt_fetch(stmt) != MYSQL_NO_DATA)
     die("mysql_fetch didn't end with MYSQL_NO_DATA from statement: %d %s",
 	mysql_stmt_errno(stmt), mysql_stmt_error(stmt));
@@ -7481,6 +7613,22 @@ int append_warnings(DYNAMIC_STRING *ds, MYSQL* mysql)
 }
 
 
+/*
+  Handle situation where query is sent but there is no active connection 
+  (e.g directly after disconnect).
+
+  We emulate MySQL-compatible behaviour of sending something on a closed
+  connection.
+*/
+static void handle_no_active_connection(struct st_command *command, 
+  struct st_connection *cn, DYNAMIC_STRING *ds)
+{
+  handle_error(command, 2006, "MySQL server has gone away", "000000", ds);
+  cn->pending= FALSE;
+  var_set_errno(2006);
+}
+
+
 /*
   Run query using MySQL C API
 
@@ -7507,11 +7655,7 @@ void run_query_normal(struct st_connection *cn, struct st_command *command,
 
   if (!mysql)
   {
-    /* Emulate old behaviour of sending something on a closed connection */
-    handle_error(command, 2006, "MySQL server has gone away",
-                 "000000", ds);
-    cn->pending= FALSE;
-    var_set_errno(2006);
+    handle_no_active_connection(command, cn, ds);
     DBUG_VOID_RETURN;
   }
 
@@ -7666,7 +7810,8 @@ static int match_expected_error(struct st_command *command,
         NULL is quite likely, but not in conjunction with a SQL-state expect!
       */
       if (unlikely(err_sqlstate == NULL))
-        die("expecting a SQL-state (%s) from query '%s' which cannot produce one...",
+        die("expecting a SQL-state (%s) from query '%s' which cannot "
+            "produce one...",
             command->expected_errors.err[i].code.sqlstate, command->query);
 
       if (strncmp(command->expected_errors.err[i].code.sqlstate,
@@ -7720,7 +7865,11 @@ void handle_error(struct st_command *command,
   }
 
   if (command->abort_on_error)
-    die("query '%s' failed: %d: %s", command->query, err_errno, err_error);
+  {
+    report_or_die("query '%s' failed: %d: %s", command->query, err_errno,
+                  err_error);
+    DBUG_VOID_RETURN;
+  }
 
   DBUG_PRINT("info", ("expected_errors.count: %d",
                       command->expected_errors.count));
@@ -7766,13 +7915,15 @@ void handle_error(struct st_command *command,
   if (command->expected_errors.count > 0)
   {
     if (command->expected_errors.err[0].type == ERR_ERRNO)
-      die("query '%s' failed with wrong errno %d: '%s', instead of %d...",
-          command->query, err_errno, err_error,
-          command->expected_errors.err[0].code.errnum);
+      report_or_die("query '%s' failed with wrong errno %d: '%s', instead of "
+                    "%d...",
+                    command->query, err_errno, err_error,
+                    command->expected_errors.err[0].code.errnum);
     else
-      die("query '%s' failed with wrong sqlstate %s: '%s', instead of %s...",
-          command->query, err_sqlstate, err_error,
-	  command->expected_errors.err[0].code.sqlstate);
+      report_or_die("query '%s' failed with wrong sqlstate %s: '%s', "
+                    "instead of %s...",
+                    command->query, err_sqlstate, err_error,
+                    command->expected_errors.err[0].code.sqlstate);
   }
 
   revert_properties();
@@ -7799,15 +7950,17 @@ void handle_no_error(struct st_command *command)
       command->expected_errors.err[0].code.errnum != 0)
   {
     /* Error code we wanted was != 0, i.e. not an expected success */
-    die("query '%s' succeeded - should have failed with errno %d...",
-        command->query, command->expected_errors.err[0].code.errnum);
+    report_or_die("query '%s' succeeded - should have failed with errno %d...",
+                  command->query, command->expected_errors.err[0].code.errnum);
   }
   else if (command->expected_errors.err[0].type == ERR_SQLSTATE &&
            strcmp(command->expected_errors.err[0].code.sqlstate,"00000") != 0)
   {
     /* SQLSTATE we wanted was != "00000", i.e. not an expected success */
-    die("query '%s' succeeded - should have failed with sqlstate %s...",
-        command->query, command->expected_errors.err[0].code.sqlstate);
+    report_or_die("query '%s' succeeded - should have failed with "
+                  "sqlstate %s...",
+                  command->query,
+                  command->expected_errors.err[0].code.sqlstate);
   }
   DBUG_VOID_RETURN;
 }
@@ -8105,10 +8258,10 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
   DBUG_ENTER("run_query");
 
   if (cn->pending && (flags & QUERY_SEND_FLAG))
-    die ("Cannot run query on connection between send and reap");
+    die("Cannot run query on connection between send and reap");
 
   if (!(flags & QUERY_SEND_FLAG) && !cn->pending)
-    die ("Cannot reap on a connection without pending send");
+    die("Cannot reap on a connection without pending send");
   
   init_dynamic_string(&ds_warnings, NULL, 0, 256);
   ds_warn= &ds_warnings;
@@ -8293,13 +8446,14 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
   if (sp_created)
   {
     if (util_query(mysql, "DROP PROCEDURE mysqltest_tmp_sp "))
-      die("Failed to drop sp: %d: %s", mysql_errno(mysql), mysql_error(mysql));
+      report_or_die("Failed to drop sp: %d: %s", mysql_errno(mysql),
+                     mysql_error(mysql));
   }
 
   if (view_created)
   {
     if (util_query(mysql, "DROP VIEW mysqltest_tmp_v "))
-      die("Failed to drop view: %d: %s",
+      report_or_die("Failed to drop view: %d: %s",
 	  mysql_errno(mysql), mysql_error(mysql));
   }
 
@@ -8463,9 +8617,10 @@ void get_command_type(struct st_command* command)
     else
     {
       /* -- "comment" that didn't contain a mysqltest command */
-      die("Found line beginning with --  that didn't contain "\
-          "a valid mysqltest command, check your syntax or "\
+      report_or_die("Found line beginning with --  that didn't contain " \
+          "a valid mysqltest command, check your syntax or "            \
           "use # if you intended to write a comment");
+      command->type= Q_COMMENT;
     }
   }
 
@@ -9190,7 +9345,7 @@ int main(int argc, char **argv)
         if (parsing_disabled == 0)
           parsing_disabled= 1;
         else
-          die("Parsing is already disabled");
+          report_or_die("Parsing is already disabled");
         break;
       case Q_ENABLE_PARSING:
         /*
@@ -9200,7 +9355,7 @@ int main(int argc, char **argv)
         if (parsing_disabled == 1)
           parsing_disabled= 0;
         else
-          die("Parsing is already enabled");
+          report_or_die("Parsing is already enabled");
         break;
       case Q_DIE:
         /* Abort test with error code and error message */
@@ -9404,7 +9559,8 @@ void do_get_replace_column(struct st_command *command)
     if (!(column_number= atoi(to)) || column_number > MAX_COLUMNS)
       die("Wrong column number to replace_column in '%s'", command->query);
     if (!*from)
-      die("Wrong number of arguments to replace_column in '%s'", command->query);
+      die("Wrong number of arguments to replace_column in '%s'",
+          command->query);
     to= get_string(&buff, &from, command);
     my_free(replace_column[column_number-1]);
     replace_column[column_number-1]= my_strdup(to, MYF(MY_WME | MY_FAE));
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
new file mode 100644
index 00000000000..8e70af6c5a9
--- /dev/null
+++ b/cmake/cpack_rpm.cmake
@@ -0,0 +1,129 @@
+IF(RPM)
+
+SET(CPACK_GENERATOR "RPM")
+SET(CPACK_RPM_PACKAGE_DEBUG 1)
+SET(INSTALL_LAYOUT "RPM")
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
+
+SET(CPACK_RPM_COMPONENT_INSTALL ON)
+
+SET(CPACK_COMPONENT_SERVER_GROUP "server")
+SET(CPACK_COMPONENT_MANPAGESSERVER_GROUP "server")
+SET(CPACK_COMPONENT_INIFILES_GROUP "server")
+SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "server")
+SET(CPACK_COMPONENT_SUPPORTFILES_GROUP "server")
+SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "devel")
+SET(CPACK_COMPONENT_MANPAGESDEVELOPMENT_GROUP "devel")
+SET(CPACK_COMPONENT_TEST_GROUP "test")
+SET(CPACK_COMPONENT_MANPAGESTEST_GROUP "test")
+SET(CPACK_COMPONENT_CLIENT_GROUP "client")
+SET(CPACK_COMPONENT_MANPAGESCLIENT_GROUP "client")
+SET(CPACK_COMPONENT_README_GROUP "server")
+SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "shared")
+SET(CPACK_COMPONENT_COMMON_GROUP "common")
+SET(CPACK_COMPONENT_COMPAT_GROUP "compat")
+SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
+                                SupportFiles Development ManPagesDevelopment
+                                ManPagesTest Readme ManPagesClient Test 
+                                Common Client SharedLibraries)
+
+SET(CPACK_RPM_PACKAGE_NAME "MariaDB")
+SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
+
+SET(CPACK_RPM_PACKAGE_RELEASE 1) # FIX: add distribution name here
+SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
+SET(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)
+SET(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
+SET(CPACK_RPM_PACKAGE_URL "http://mariadb.org")
+SET(CPACK_RPM_PACKAGE_SUMMARY "MariaDB: a very fast and robust SQL database server")
+SET(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_SUMMARY}
+
+It is GPL v2 licensed, which means you can use the it free of charge under the
+conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/).
+
+MariaDB documentation can be found at http://kb.askmonty.org/
+MariaDB bug reports should be submitted through https://mariadb.atlassian.net/
+
+")
+
+SET(CPACK_RPM_SPEC_MORE_DEFINE "
+%define mysql_vendor ${CPACK_PACKAGE_VENDOR}
+%define mysqlversion ${MYSQL_NO_DASH_VERSION}
+%define mysqldatadir /var/lib/mysql
+%define mysqld_user  mysql
+%define mysqld_group mysql
+")
+
+# this creative hack is described here: http://www.cmake.org/pipermail/cmake/2012-January/048416.html
+# both /etc and /etc/init.d should be ignored as of 2.8.7
+# only /etc/init.d as of 2.8.8
+# and eventually this hack should go away completely
+SET(CPACK_RPM_SPEC_MORE_DEFINE "${CPACK_RPM_SPEC_MORE_DEFINE}
+%define ignore \#
+")
+
+SET(CPACK_RPM_PACKAGE_REQUIRES "MariaDB-common")
+
+SET(CPACK_RPM_server_USER_FILELIST "%ignore /etc" "%ignore /etc/init.d")
+
+SET(CPACK_RPM_client_PACKAGE_OBSOLETES "mysql-client MySQL-client MySQL-OurDelta-client")
+SET(CPACK_RPM_client_PACKAGE_PROVIDES "MariaDB-client MySQL-client mysql-client")
+
+# this is a workaround for CPackRPM.cmake (as of 2.8.8) bug.
+# If a package group does not specify OBSOLETES/REQUIRES the values of the
+# previous (alphabetically) group will apply. 
+SET(CPACK_RPM_common_PACKAGE_OBSOLETES "MySQL-common")
+SET(CPACK_RPM_common_PACKAGE_PROVIDES "MariaDB-common")
+
+SET(CPACK_RPM_devel_PACKAGE_OBSOLETES "mysql-devel MySQL-devel MySQL-OurDelta-devel")
+SET(CPACK_RPM_devel_PACKAGE_PROVIDES "MariaDB-devel MySQL-devel mysql-devel")
+
+SET(CPACK_RPM_server_PACKAGE_OBSOLETES "MariaDB mysql mysql-server MySQL-server MySQL-OurDelta-server")
+SET(CPACK_RPM_server_PACKAGE_PROVIDES "MariaDB MariaDB-server MySQL-server config(MariaDB-server) msqlormysql mysql mysql-server")
+SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
+SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-preun.sh)
+SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postin.sh)
+
+SET(CPACK_RPM_shared_PACKAGE_OBSOLETES "mysql-shared MySQL-shared-standard MySQL-shared-pro MySQL-shared-pro-cert MySQL-shared-pro-gpl MySQL-shared-pro-gpl-cert MySQL-shared MySQL-OurDelta-shared")
+SET(CPACK_RPM_shared_PACKAGE_PROVIDES "MariaDB-shared MySQL-shared mysql-shared libmysqlclient.so.${SHARED_LIB_MAJOR_VERSION} libmysqlclient.so.${SHARED_LIB_MAJOR_VERSION}(libmysqlclient_${SHARED_LIB_MAJOR_VERSION}) libmysqlclient_r.so.${SHARED_LIB_MAJOR_VERSION} libmysqlclient_r.so.${SHARED_LIB_MAJOR_VERSION}(libmysqlclient_${SHARED_LIB_MAJOR_VERSION})")
+SET(CPACK_RPM_shared_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
+SET(CPACK_RPM_shared_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
+
+SET(CPACK_RPM_test_PACKAGE_OBSOLETES "mysql-test MySQL-test MySQL-OurDelta-test")
+SET(CPACK_RPM_test_PACKAGE_PROVIDES "MariaDB-test MySQL-test mysql-test")
+
+# workaround for lots of perl dependencies added by rpmbuild
+SET(CPACK_RPM_test_PACKAGE_PROVIDES "${CPACK_RPM_test_PACKAGE_PROVIDES} perl(lib::mtr_gcov.pl) perl(lib::mtr_gprof.pl) perl(lib::mtr_io.pl) perl(lib::mtr_misc.pl) perl(lib::mtr_process.pl) perl(lib::v1/mtr_cases.pl) perl(lib::v1/mtr_gcov.pl) perl(lib::v1/mtr_gprof.pl) perl(lib::v1/mtr_im.pl) perl(lib::v1/mtr_io.pl) perl(lib::v1/mtr_match.pl) perl(lib::v1/mtr_misc.pl) perl(lib::v1/mtr_process.pl) perl(lib::v1/mtr_report.pl) perl(lib::v1/mtr_stress.pl) perl(lib::v1/mtr_timer.pl) perl(lib::v1/mtr_unique.pl) perl(mtr_misc.pl)")
+
+# If we want to build build MariaDB-shared-compat,
+# extract compat libraries from MariaDB-shared-5.3 rpm
+FILE(GLOB compat_rpm RELATIVE ${CMAKE_SOURCE_DIR}
+    "${CMAKE_SOURCE_DIR}/../MariaDB-shared-5.3.*.rpm")
+IF (compat_rpm)
+  MESSAGE("Using ${compat_rpm} to build MariaDB-compat")
+  INSTALL(CODE "EXECUTE_PROCESS(
+                 COMMAND rpm2cpio ${CMAKE_SOURCE_DIR}/${compat_rpm}
+                 COMMAND cpio --extract --make-directories */libmysqlclient*.so.* -
+                 WORKING_DIRECTORY \$ENV{DESTDIR})
+                EXECUTE_PROCESS(
+                 COMMAND chmod -R a+rX .
+                 WORKING_DIRECTORY \$ENV{DESTDIR})"
+                 COMPONENT Compat)
+  SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} Compat)
+
+  # RHEL6/CentOS6 install Postfix by default, and it requires
+  # libmysqlclient.so.16 that pulls in mysql-libs-5.1.x
+  # And the latter conflicts with our rpms.
+  # Make sure that for these distribuions all our rpms require
+  # MariaDB-compat, that will replace mysql-libs-5.1
+  IF(RPM MATCHES "(rhel|centos)6")
+    SET(CPACK_RPM_common_PACKAGE_REQUIRES "MariaDB-compat")
+  ENDIF()
+ENDIF(compat_rpm)
+
+SET(CPACK_RPM_compat_PACKAGE_REQUIRES "/bin/sh") # to mask CPACK_RPM_PACKAGE_REQUIRES
+SET(CPACK_RPM_compat_PACKAGE_PROVIDES "mysql-libs = 5.3.5") # exact version doesn't matter as long as it greater than 5.1
+SET(CPACK_RPM_compat_PACKAGE_OBSOLETES "mysql-libs < 5.3.5")
+
+ENDIF(RPM)
+
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 76e78e8b72f..3ad6da5d433 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -41,6 +41,7 @@
 # - INSTALL_BINDIR          (directory with client executables and scripts)
 # - INSTALL_SBINDIR         (directory with mysqld)
 # - INSTALL_SCRIPTDIR       (several scripts, rarely used)
+# - INSTALL_SYSCONFDIR	    (config files. Usually /etc or nothing)
 #
 # - INSTALL_LIBDIR          (directory with client end embedded libraries)
 # - INSTALL_PLUGINDIR       (directory for plugins)
@@ -60,23 +61,23 @@
 #
 # - INSTALL_MYSQLDATADIR    (data directory)
 #
+# - INSTALL_UNIX_ADDRDIR    (path to mysql.sock)
+#
 # When changing this page,  _please_ do not forget to update public Wiki
 # http://forge.mysql.com/wiki/CMake#Fine-tuning_installation_paths
 
 IF(NOT INSTALL_LAYOUT)
-  SET(DEFAULT_INSTALL_LAYOUT "STANDALONE")
+  SET(INSTALL_LAYOUT "STANDALONE")
 ENDIF()
 
-SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
+SET(INSTALL_LAYOUT "${INSTALL_LAYOUT}"
 CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) RPM DEB SVR4")
 
 IF(UNIX)
   IF(INSTALL_LAYOUT MATCHES "RPM")
     SET(default_prefix "/usr")
   ELSEIF(INSTALL_LAYOUT MATCHES "DEB")
-    SET(default_prefix "/opt/mysql/server-${MYSQL_BASE_VERSION}")
-    # This is required to avoid "cpack -GDEB" default of prefix=/usr
-    SET(CPACK_SET_DESTDIR ON)
+    SET(default_prefix "/usr")
   ELSEIF(INSTALL_LAYOUT MATCHES "SVR4")
     SET(default_prefix "/opt/mysql/mysql")
   ELSE()
@@ -92,10 +93,6 @@ IF(UNIX)
     MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
     " Choose between ${VALID_INSTALL_LAYOUTS}" )
   ENDIF()
-
-  SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc"
-    CACHE PATH "config directory (for my.cnf)")
-  MARK_AS_ADVANCED(SYSCONFDIR)
 ENDIF()
 
 #
@@ -131,12 +128,14 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files")
 SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")
 SET(INSTALL_PLUGINTESTDIR_STANDALONE    ${plugin_tests})
 
+SET(INSTALL_UNIX_ADDRDIR_STANDALONE     "/tmp/mysql.sock")
 #
 # RPM layout
 #
 SET(INSTALL_BINDIR_RPM                  "bin")
 SET(INSTALL_SBINDIR_RPM                 "sbin")
 SET(INSTALL_SCRIPTDIR_RPM               "bin")
+SET(INSTALL_SYSCONFDIR_RPM		"/etc")
 #
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
   SET(INSTALL_LIBDIR_RPM                "lib64")
@@ -148,8 +147,8 @@ ENDIF()
 #
 SET(INSTALL_INCLUDEDIR_RPM              "include/mysql")
 #
-#SET(INSTALL_DOCDIR_RPM                 unset - installed directly by RPM)
-#SET(INSTALL_DOCREADMEDIR_RPM           unset - installed directly by RPM)
+SET(INSTALL_DOCDIR_RPM                  "share/doc/${CPACK_SOURCE_PACKAGE_FILE_NAME}")
+SET(INSTALL_DOCREADMEDIR_RPM            "share/doc/${CPACK_SOURCE_PACKAGE_FILE_NAME}")
 SET(INSTALL_INFODIR_RPM                 "share/info")
 SET(INSTALL_MANDIR_RPM                  "share/man")
 #
@@ -162,6 +161,8 @@ SET(INSTALL_SUPPORTFILESDIR_RPM         "share/mysql")
 SET(INSTALL_MYSQLDATADIR_RPM            "/var/lib/mysql")
 SET(INSTALL_PLUGINTESTDIR_RPM           ${plugin_tests})
 
+SET(INSTALL_UNIX_ADDRDIR_RPM            "${INSTALL_MYSQLDATADIR_RPM}/mysql.sock")
+
 #
 # DEB layout
 #
@@ -188,6 +189,7 @@ SET(INSTALL_SUPPORTFILESDIR_DEB         "support-files")
 SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
 SET(INSTALL_PLUGINTESTDIR_DEB           ${plugin_tests})
 
+SET(INSTALL_UNIX_ADDRDIR_DEB            "/var/run/mysqld/mysqld.sock")
 #
 # SVR4 layout
 #
@@ -214,6 +216,7 @@ SET(INSTALL_SUPPORTFILESDIR_SVR4        "support-files")
 SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
 SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
 
+SET(INSTALL_UNIX_ADDRDIR_SVR            "/tmp/mysql.sock")
 
 # Clear cached variables if install layout was changed
 IF(OLD_INSTALL_LAYOUT)
@@ -226,9 +229,14 @@ SET(OLD_INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE INTERNAL "")
 # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
 # will be defined  as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
 # layout is chosen)
-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
-  INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST)
+FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF
+    INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST UNIX_ADDR)
   SET(INSTALL_${var}DIR  ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
   CACHE STRING "${var} installation directory" ${FORCE})
   MARK_AS_ADVANCED(INSTALL_${var}DIR)
 ENDFOREACH()
+
+IF(NOT MYSQL_UNIX_ADDR)
+  SET(MYSQL_UNIX_ADDR ${INSTALL_UNIX_ADDRDIR})
+ENDIF()
+
diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake
index cf9b1882715..9c9ab8cca3b 100644
--- a/cmake/maintainer.cmake
+++ b/cmake/maintainer.cmake
@@ -19,6 +19,15 @@ INCLUDE(CheckCCompilerFlag)
 MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS)
   SET(MY_MAINTAINER_WARNINGS
       "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing")
+
+  CHECK_C_COMPILER_FLAG("-Wno-missing-field-initializers"
+    HAVE_NO_MISSING_FIELD_INITIALIZERS)
+
+  IF (HAVE_NO_MISSING_FIELD_INITIALIZERS)
+    SET(MY_MAINTAINER_WARNINGS
+      "${MY_MAINTAINER_WARNINGS} -Wno-missing-field-initializers")
+  ENDIF()
+
   CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
                         HAVE_DECLARATION_AFTER_STATEMENT)
   IF(HAVE_DECLARATION_AFTER_STATEMENT)
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
index 5f60cb68101..e6b9d3e7edf 100644
--- a/cmake/mysql_version.cmake
+++ b/cmake/mysql_version.cmake
@@ -80,15 +80,10 @@ ELSEIF(MYSQL_TCP_PORT EQUAL MYSQL_TCP_PORT_DEFAULT)
   SET(MYSQL_TCP_PORT_DEFAULT "0")
 ENDIF()
 
-
-IF(NOT MYSQL_UNIX_ADDR)
-  SET(MYSQL_UNIX_ADDR "/tmp/mysql.sock")
-ENDIF()
 IF(NOT COMPILATION_COMMENT)
   SET(COMPILATION_COMMENT "Source distribution")
 ENDIF()
 
-
 INCLUDE(package_name)
 IF(NOT CPACK_PACKAGE_FILE_NAME)
   GET_PACKAGE_FILE_NAME(CPACK_PACKAGE_FILE_NAME)
@@ -104,7 +99,6 @@ ENDIF()
 SET(CPACK_PACKAGE_CONTACT "MariaDB team <info@montyprogram.com>")
 SET(CPACK_PACKAGE_VENDOR "Monty Program AB")
 SET(CPACK_SOURCE_GENERATOR "TGZ")
-INCLUDE(cpack_source_ignore_files)
 
 # Defintions for windows version resources
 SET(PRODUCTNAME "MariaDB Server")
@@ -126,10 +120,12 @@ ENDIF()
 IF(MSVC)
     # Tiny version is used to identify the build, it can be set with cmake -DTINY_VERSION=<number>
     # to bzr revno for example (in the CI builds)
-    SET(TINY_VERSION "0" CACHE INTERNAL "")
+    IF(NOT TINY_VERSION)
+      SET(TINY_VERSION "0")
+    ENDIF()
   
     GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
-	
+
     SET(FILETYPE VFT_APP)
     CONFIGURE_FILE(${MYSQL_CMAKE_SCRIPT_DIR}/versioninfo.rc.in 
     ${CMAKE_BINARY_DIR}/versioninfo_exe.rc)
@@ -137,7 +133,7 @@ IF(MSVC)
     SET(FILETYPE VFT_DLL)
     CONFIGURE_FILE(${MYSQL_CMAKE_SCRIPT_DIR}/versioninfo.rc.in  
       ${CMAKE_BINARY_DIR}/versioninfo_dll.rc)
-	  
+
   FUNCTION(ADD_VERSION_INFO target target_type sources_var)
     IF("${target_type}" MATCHES "SHARED" OR "${target_type}" MATCHES "MODULE")
       SET(rcfile ${CMAKE_BINARY_DIR}/versioninfo_dll.rc)
diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake
index 9bc7d944da2..27afe679f25 100644
--- a/cmake/os/FreeBSD.cmake
+++ b/cmake/os/FreeBSD.cmake
@@ -23,6 +23,15 @@
 # The below was used for really old versions of FreeBSD, roughly: before 5.1.9
 # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
 
+# Find libexecinfo (library that contains backtrace_symbols etc)
+INCLUDE_DIRECTORIES(/usr/local/include)
+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
+SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
+FIND_LIBRARY(EXECINFO NAMES execinfo)
+IF(EXECINFO)
+ SET(LIBEXECINFO ${EXECINFO})
+ENDIF()
+
 # Use atomic builtins
 IF(CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386")
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686")		
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 7952c351e2f..1e7f83ec227 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -211,15 +211,7 @@ MACRO(MYSQL_ADD_PLUGIN)
       SET(ARG_COMPONENT Server)
     ENDIF()
     MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${ARG_COMPONENT})
-    INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug COMPONENT ${ARG_COMPONENT})
-    # Add installed files to list for RPMs
-    FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-            "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
-            "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-    # For internal testing in PB2, append collections files
-    IF(DEFINED ENV{PB2WORKDIR})
-      PLUGIN_APPEND_COLLECTIONS(${plugin})
-    ENDIF()
+    #INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug COMPONENT ${ARG_COMPONENT})
   ELSE()
     IF(WITHOUT_${plugin})
       # Update cache variable
diff --git a/config.h.cmake b/config.h.cmake
index d03ad91189c..5f1614993c3 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -150,6 +150,7 @@
 #cmakedefine HAVE_FCNTL 1
 #cmakedefine HAVE_FCONVERT 1
 #cmakedefine HAVE_FDATASYNC 1
+#cmakedefine HAVE_DECL_FDATASYNC 1
 #cmakedefine HAVE_FESETROUND 1
 #cmakedefine HAVE_FINITE 1
 #cmakedefine HAVE_FP_EXCEPT 1
diff --git a/configure.cmake b/configure.cmake
index bf2a08386ab..6191ceef378 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -147,7 +147,7 @@ IF(UNIX)
   FIND_PACKAGE(Threads)
 
   SET(CMAKE_REQUIRED_LIBRARIES 
-    ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
+    ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
 
   IF(CMAKE_REQUIRED_LIBRARIES)
     LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
diff --git a/dbug/tests.c b/dbug/tests.c
index 657ed638a5a..22a445fdeca 100644
--- a/dbug/tests.c
+++ b/dbug/tests.c
@@ -36,7 +36,8 @@ int func1()
   DBUG_RETURN(10);
 }
 
-int main (int argc, char *argv[])
+int main (int argc __attribute__((unused)),
+          char *argv[] __attribute__((unused)))
 {
 #ifdef DBUG_OFF
   return 1;
diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf
index 6c2d812f0cc..e3803c4aaeb 100644
--- a/debian/additions/mariadb.cnf
+++ b/debian/additions/mariadb.cnf
@@ -3,7 +3,7 @@
 
 [client]
 # Default is Latin1, if you need UTF-8 set this (also in server section)
-#default-character-set  = utf8 
+#character-set-server  = utf8 
 
 [mysqld]
 #
@@ -11,7 +11,7 @@
 # 
 # Default is Latin1, if you need UTF-8 set all this (also in client section)
 #
-#default-character-set  = utf8 
-#default-collation      = utf8_general_ci 
+#character-set-server  = utf8 
+#collation-server      = utf8_general_ci 
 #character_set_server   = utf8 
 #collation_server       = utf8_general_ci 
diff --git a/debian/libmariadbclient-dev.files b/debian/libmariadbclient-dev.files
index f75f049ec00..8f56a3065d5 100644
--- a/debian/libmariadbclient-dev.files
+++ b/debian/libmariadbclient-dev.files
@@ -1,6 +1,5 @@
 usr/bin/mysql_config
-usr/include/mysql/*.h
-usr/include/mysql/psi/*.h
+usr/include/mysql
 usr/lib/libmysqlclient.a
 usr/lib/libmysqlclient_r.a
 usr/lib/libmysqlservices.a
diff --git a/debian/libmariadbclient-dev.links b/debian/libmariadbclient-dev.links
index 0481d1a0020..0076791dcfa 100644
--- a/debian/libmariadbclient-dev.links
+++ b/debian/libmariadbclient-dev.links
@@ -1,2 +1,2 @@
-usr/lib/libmysqlclient.so.16	usr/lib/libmysqlclient.so
-usr/lib/libmysqlclient_r.so.16	usr/lib/libmysqlclient_r.so
+usr/lib/libmysqlclient.so.18	usr/lib/libmysqlclient.so
+usr/lib/libmysqlclient_r.so.18	usr/lib/libmysqlclient_r.so
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index d7e6cf61983..f8f71b00743 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -72,7 +72,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 ENDIF()
 ENDIF()
 
-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Junk)
+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(replace mysys)
 IF(UNIX)
   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c)
@@ -80,6 +80,6 @@ IF(UNIX)
   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
 
-  MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
+  MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
 ENDIF()
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 3046c3f7614..a90238dbd42 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -14,17 +14,18 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 SET(HEADERS_GEN_CONFIGURE 
-${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
-${CMAKE_CURRENT_BINARY_DIR}/my_config.h
-${CMAKE_CURRENT_BINARY_DIR}/mysqld_ername.h
-${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
-${CMAKE_CURRENT_BINARY_DIR}/sql_state.h
+  mysql_version.h
+  my_config.h
+  mysqld_ername.h
+  mysqld_error.h
+  sql_state.h
 )
 
 SET(HEADERS 
   mysql.h 
   mysql_com.h
   mysql_time.h 
+  ma_dyncol.h
   my_list.h
   my_alloc.h
   typelib.h 
@@ -33,6 +34,7 @@ SET(HEADERS
   my_sys.h 
   my_xml.h
   mysql_embed.h
+  my_decimal_limits.h
   my_pthread.h
   decimal.h
   errmsg.h
@@ -49,8 +51,19 @@ SET(HEADERS
   m_ctype.h
   my_attribute.h 
   my_compiler.h
-  ${HEADERS_GEN_CONFIGURE}
 )
 
 INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
+FOREACH(f ${HEADERS_GEN_CONFIGURE})
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ENDFOREACH(f)
 INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
+
+STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
+STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
+
+INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+  FILES_MATCHING PATTERN "*.h"
+  PATTERN CMakeFiles EXCLUDE
+  PATTERN mysql EXCLUDE
+  REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
diff --git a/include/maria.h b/include/maria.h
index 404ce98dafd..cb2f92e8a35 100644
--- a/include/maria.h
+++ b/include/maria.h
@@ -24,7 +24,6 @@ extern "C" {
 #include <my_base.h>
 #include <my_sys.h>
 #include <m_ctype.h>
-#include "../storage/maria/ma_pagecache.h"
 #include "my_compare.h"
 #include "ft_global.h"
 #include <myisamchk.h>
@@ -268,7 +267,6 @@ extern my_bool maria_flush, maria_single_user, maria_page_checksums;
 extern my_bool maria_delay_key_write;
 extern my_off_t maria_max_temp_length;
 extern ulong maria_bulk_insert_tree_size, maria_data_pointer_size;
-extern PAGECACHE maria_pagecache_var, *maria_pagecache;
 extern MY_TMPDIR *maria_tmpdir;
 /*
   This is used to check if a symlink points into the mysql data home,
@@ -353,69 +351,6 @@ typedef struct st_maria_bit_buff
   uint error;
 } MARIA_BIT_BUFF;
 
-
-typedef struct st_maria_sort_info
-{
-  /* sync things */
-  mysql_mutex_t mutex;
-  mysql_cond_t cond;
-  MARIA_HA *info, *new_info;
-  HA_CHECK *param;
-  char *buff;
-  SORT_KEY_BLOCKS *key_block, *key_block_end;
-  SORT_FT_BUF *ft_buf;
-  my_off_t filelength, dupp, buff_length;
-  pgcache_page_no_t page;
-  ha_rows max_records;
-  uint current_key, total_keys;
-  uint got_error, threads_running;
-  myf myf_rw;
-  enum data_file_type new_data_file_type, org_data_file_type;
-} MARIA_SORT_INFO;
-
-typedef struct st_maria_sort_param
-{
-  pthread_t thr;
-  IO_CACHE read_cache, tempfile, tempfile_for_exceptions;
-  DYNAMIC_ARRAY buffpek;
-  MARIA_BIT_BUFF bit_buff;               /* For parallel repair of packrec. */
-  
-  MARIA_KEYDEF *keyinfo;
-  MARIA_SORT_INFO *sort_info;
-  HA_KEYSEG *seg;
-  uchar **sort_keys;
-  uchar *rec_buff;
-  void *wordlist, *wordptr;
-  MEM_ROOT wordroot;
-  uchar *record;
-  MY_TMPDIR *tmpdir;
-
-  /* 
-    The next two are used to collect statistics, see maria_update_key_parts for
-    description.
-  */
-  ulonglong unique[HA_MAX_KEY_SEG+1];
-  ulonglong notnull[HA_MAX_KEY_SEG+1];
-
-  MARIA_RECORD_POS pos,max_pos,filepos,start_recpos, current_filepos;
-  uint key, key_length,real_key_length,sortbuff_size;
-  uint maxbuffers, keys, find_length, sort_keys_length;
-  my_bool fix_datafile, master;
-  my_bool calc_checksum;                /* calculate table checksum */
-  size_t rec_buff_size;
-
-  int (*key_cmp)(struct st_maria_sort_param *, const void *, const void *);
-  int (*key_read)(struct st_maria_sort_param *, uchar *);
-  int (*key_write)(struct st_maria_sort_param *, const uchar *);
-  void (*lock_in_memory)(HA_CHECK *);
-  int (*write_keys)(struct st_maria_sort_param *, register uchar **,
-                         uint , struct st_buffpek *, IO_CACHE *);
-  uint (*read_to_buffer)(IO_CACHE *,struct st_buffpek *, uint);
-  int (*write_key)(struct st_maria_sort_param *, IO_CACHE *,uchar *,
-                   uint, uint);
-} MARIA_SORT_PARAM;
-
-
 /* functions in maria_check */
 void maria_chk_init(HA_CHECK *param);
 void maria_chk_init_for_check(HA_CHECK *param, MARIA_HA *info);
@@ -443,7 +378,6 @@ int maria_filecopy(HA_CHECK *param, File to, File from, my_off_t start,
                    my_off_t length, const char *type);
 int maria_movepoint(MARIA_HA *info, uchar *record, my_off_t oldpos,
                     my_off_t newpos, uint prot_key);
-int maria_write_data_suffix(MARIA_SORT_INFO *sort_info, my_bool fix_datafile);
 int maria_test_if_almost_full(MARIA_HA *info);
 int maria_recreate_table(HA_CHECK *param, MARIA_HA **org_info, char *filename);
 int maria_disable_indexes(MARIA_HA *info);
@@ -456,10 +390,6 @@ my_bool maria_test_if_sort_rep(MARIA_HA *info, ha_rows rows, ulonglong key_map,
 int maria_init_bulk_insert(MARIA_HA *info, ulong cache_size, ha_rows rows);
 void maria_flush_bulk_insert(MARIA_HA *info, uint inx);
 void maria_end_bulk_insert(MARIA_HA *info);
-int maria_assign_to_pagecache(MARIA_HA *info, ulonglong key_map,
-			      PAGECACHE *key_cache);
-void maria_change_pagecache(PAGECACHE *old_key_cache,
-			    PAGECACHE *new_key_cache);
 int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves);
 void maria_versioning(MARIA_HA *info, my_bool versioning);
 void maria_ignore_trids(MARIA_HA *info);
diff --git a/include/my_base.h b/include/my_base.h
index 4edecf63d18..905e4535360 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 
-   reserved
+/* Copyright (c) 2000, 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
@@ -11,8 +10,9 @@
    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 */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
 
 /* This file includes constants used with all databases */
 
@@ -459,10 +459,11 @@ enum ha_base_keytype {
 #define HA_ERR_INDEX_COL_TOO_LONG 178    /* Index column length exceeds limit */
 #define HA_ERR_INDEX_CORRUPT      179        /* Index corrupted */
 #define HA_ERR_UNDO_REC_TOO_BIG   180    /* Undo log record too big */
-#define HA_ERR_ROW_NOT_VISIBLE    181
-#define HA_ERR_ABORTED_BY_USER    182
-#define HA_ERR_DISK_FULL          183
-#define HA_ERR_LAST               183    /* Copy of last error nr */
+#define HA_ERR_TABLE_IN_FK_CHECK  181    /* Table being used in foreign key check */
+#define HA_ERR_ROW_NOT_VISIBLE    182
+#define HA_ERR_ABORTED_BY_USER    183
+#define HA_ERR_DISK_FULL          184
+#define HA_ERR_LAST               184    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff --git a/include/my_global.h b/include/my_global.h
index 8170ce381af..a5fa57dbfe3 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1429,6 +1429,10 @@ static inline char *dlerror(void)
 /* Length of decimal number represented by INT64. */
 #define MY_INT64_NUM_DECIMAL_DIGITS 21
 
+#ifdef __cplusplus
+#include <limits> /* should be included before min/max macros */
+#endif
+
 /* Define some useful general macros (should be done after all headers). */
 #if !defined(max)
 #define max(a, b)	((a) > (b) ? (a) : (b))
diff --git a/include/probes_mysql.h b/include/probes_mysql.h
index cc47c59b62d..6d44b972cb3 100644
--- a/include/probes_mysql.h
+++ b/include/probes_mysql.h
@@ -18,28 +18,8 @@
 
 #define PROBES_MYSQL_H
 
-
 #if defined(HAVE_DTRACE) && !defined(DISABLE_DTRACE)
-
-#ifdef __linux__
-/* 
-  On Linux, generated probes header may include C++ header
-  <limits> which conflicts with min and max macros from my_global.h .
-  To fix, temporarily undefine the macros.
-*/
-#pragma push_macro("min")
-#pragma push_macro("max")
-#undef min
-#undef max
-#endif
-
 #include "probes_mysql_dtrace.h"
-
-#ifdef __linux__
-#pragma pop_macro("min")
-#pragma pop_macro("max")
-#endif
-
 #else  /* no dtrace */
 #include "probes_mysql_nodtrace.h"
 #endif
diff --git a/include/mysql/thread_pool_priv.h b/include/thread_pool_priv.h
similarity index 100%
rename from include/mysql/thread_pool_priv.h
rename to include/thread_pool_priv.h
diff --git a/include/violite.h b/include/violite.h
index c8d459d931b..a026038bb0e 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -59,6 +59,9 @@ Vio* vio_new_win32shared_memory(HANDLE handle_file_map,
 #define HANDLE void *
 #endif /* __WIN__ */
 
+/* backport from 5.6 where it is part of PSI, not vio_*() */
+int	mysql_socket_shutdown(my_socket mysql_socket, int how);
+
 void	vio_delete(Vio* vio);
 int	vio_close(Vio* vio);
 void    vio_reset(Vio* vio, enum enum_vio_type type,
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index f08159da20a..c40beb5f9a1 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -134,7 +134,7 @@ FOREACH(LIB ${LIBS})
 ENDFOREACH()
 
 MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} 
-  OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
+  OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development)
 
 # Visual Studio users need debug  static library 
 IF(MSVC)
@@ -148,7 +148,7 @@ ENDIF()
 
 IF(NOT DISABLE_SHARED)
   MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS}
-  COMPONENT Embedded) 
+    COMPONENT Server) 
   IF(UNIX)
     # Name the shared library, handle versioning (provides same api as client
     # library hence the same version)
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt
index e607f3c685a..146e51d79c7 100644
--- a/libmysqld/examples/CMakeLists.txt
+++ b/libmysqld/examples/CMakeLists.txt
@@ -26,7 +26,7 @@ ADD_DEFINITIONS(-DEMBEDDED_LIBRARY -UMYSQL_CLIENT)
 
 MYSQL_ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc
                ../../client/mysql.cc ../../client/readline.cc
-               COMPONENT Test)
+               COMPONENT Client)
 TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql_embedded ${MY_READLINE_LIBRARY})
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 1ba54350883..b454fc0d2e0 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -344,6 +344,8 @@ static int emb_stmt_execute(MYSQL_STMT *stmt)
     set_stmt_errmsg(stmt, net);
     DBUG_RETURN(1);
   }
+  else if (stmt->mysql->status == MYSQL_STATUS_GET_RESULT)
+           stmt->mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT;
   DBUG_RETURN(0);
 }
 
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 4987a5bee61..d7ef1fae0bf 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Monty Program Ab
 # 
 # This 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,26 +13,26 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-# Copy man pages
-FILE(GLOB MAN1_FILES *.1)
-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
-FILE(GLOB MAN1_NDB ndb*.1)
-FILE(GLOB MAN8_FILES *.8)
-FILE(GLOB MAN8_NDB ndb*.8)
-IF(MAN1_FILES)
-  IF(MAN1_EXCLUDE)
-    LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
-  ENDIF()
-  IF(MAN1_NDB)
-    LIST(REMOVE_ITEM MAN1_FILES ${MAN1_NDB})
-  ENDIF()
-  INSTALL(FILES ${MAN1_FILES} DESTINATION ${INSTALL_MANDIR}/man1
-  COMPONENT ManPages)
-ENDIF()
-IF(MAN8_FILES)
-  IF(MAN8_NDB)
-    LIST(REMOVE_ITEM MAN8_FILES ${MAN8_NDB})
-  ENDIF()
-  INSTALL(FILES ${MAN8_FILES} DESTINATION ${INSTALL_MANDIR}/man8
-  COMPONENT ManPages)
-ENDIF()
+SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
+		myisamlog.1 myisampack.1 mysql.server.1
+		mysql_convert_table_format.1 mysql_fix_extensions.1
+		mysql_fix_privilege_tables.1 mysql_install_db.1
+		mysql_secure_installation.1 mysql_setpermission.1
+		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1
+		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
+		mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1
+		resolveip.1)
+SET(MAN8_SERVER mysqld.8 mysqlmanager.8)
+SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
+		mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
+		mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
+SET(MAN1_DEVEL mysql_config.1)
+SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
+              mysqltest_embedded.1 mysql_client_test_embedded.1)
+
+INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
+INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
+INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
+INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
+INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
+
diff --git a/mysql-test/extra/rpl_tests/rpl_row_basic.test b/mysql-test/extra/rpl_tests/rpl_row_basic.test
index 7812ff6339f..c7570de3aba 100644
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test
@@ -2,17 +2,19 @@
 # Basic tests of row-level logging
 #
 
---disable_query_log
---disable_result_log
-# Add suppression for expected warning(s) in error log
-call mtr.add_suppression("Can't find record in 't.'");
---enable_query_log
---enable_result_log
-
 #
 # First we test tables with only an index.
 #
 
+#BUG#12662190 - COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM_BEGIN IS
+#Testing command counters -BEFORE 
+#Storing the before counts of Slave
+connection slave;
+let $slave_com_commit_before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_commit', Value, 1);
+let $slave_com_insert_before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_insert', Value, 1);
+let $slave_com_delete_before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_delete', Value, 1);
+let $slave_com_update_before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_update', Value, 1);
+
 connection master;
 eval CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)$extra_index_t1) ENGINE = $type ;
 SELECT * FROM t1;
@@ -47,6 +49,32 @@ SELECT * FROM t1 ORDER BY C1,C2;
 sync_slave_with_master;
 SELECT * FROM t1 ORDER BY C1,C2;
 
+#BUG#12662190 - COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM_BEGIN IS
+#Testing command counters -AFTER 
+#Storing the after counts of Slave
+connection slave;
+let $slave_com_commit_after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_commit', Value, 1);
+let $slave_com_insert_after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_insert', Value, 1);
+let $slave_com_delete_after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_delete', Value, 1);
+let $slave_com_update_after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_update', Value, 1);
+
+#Commit count check
+--let $assert_text= Counter for COM_COMMIT is consistent with the number of actual commits
+--let $assert_cond= $slave_com_commit_after - $slave_com_commit_before = 4
+--source include/assert.inc
+#Insert count check
+--let $assert_text= Counter for COM_INSERT is consistent with the number of actual inserts
+--let $assert_cond= $slave_com_insert_after - $slave_com_insert_before = 2
+--source include/assert.inc
+#Delete count check
+--let $assert_text= Counter for COM_DELETE is consistent with the number of actual deletes
+--let $assert_cond= $slave_com_delete_after - $slave_com_delete_before = 1
+--source include/assert.inc
+#Update count check
+--let $assert_text= Counter for COM_UPDATE is consistent with the number of actual updates
+--let $assert_cond= $slave_com_update_after - $slave_com_update_before = 1
+--source include/assert.inc
+
 # Testing update with a condition that does not match any rows, but
 # which has a match for the index.
 connection master;
diff --git a/mysql-test/include/have_32bit_ulong.inc b/mysql-test/include/have_32bit_ulong.inc
deleted file mode 100644
index 0323b8a9888..00000000000
--- a/mysql-test/include/have_32bit_ulong.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by Horst Hunger     2008-04-15
-# see also have_64bit_ulong.inc
-
---disable_query_log
---disable_warnings
-let $save = `SELECT @@pseudo_thread_id`;
-SET @@pseudo_thread_id = 4294967296;
-let $mach32 = `SELECT @@pseudo_thread_id <= 4294967295`;
-eval SET @@pseudo_thread_id = $save;
---enable_warnings
---enable_query_log
-if (!$mach32)
-{
-  skip Need a 32 bit unsigned long;
-}
-
diff --git a/mysql-test/include/have_64bit_ulong.inc b/mysql-test/include/have_64bit_ulong.inc
deleted file mode 100644
index 529ab225e4f..00000000000
--- a/mysql-test/include/have_64bit_ulong.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Created by Horst Hunger       2008-04-15
-# see also have_32bit_ulong.inc
-
---disable_query_log
-let $save = `SELECT @@pseudo_thread_id`;
-SET @@pseudo_thread_id = 4294967296;
-let $mach64 = `SELECT @@pseudo_thread_id > 4294967295`;
-eval SET @@pseudo_thread_id = $save;
---enable_query_log
-if (!$mach64)
-{
-  skip Need a 64 unsigned long ;
-}
-
diff --git a/mysql-test/include/icp_tests.inc b/mysql-test/include/icp_tests.inc
index e84b8622cdb..ffe8d7f1eb1 100644
--- a/mysql-test/include/icp_tests.inc
+++ b/mysql-test/include/icp_tests.inc
@@ -874,3 +874,21 @@ show status like "Handler_icp%";
 
 DROP TABLE t1;
 
+#
+# MDEV-308 lp:1008516 - Failing assertion: templ->mysql_col_len == len
+#
+create table t1 (a int,b char(5),primary key (a), key (b(1)));
+insert into t1 values ('a','b');
+select 1 from t1 where a and b >= 'aa';
+drop table t1;
+
+--echo #
+--echo # Bug#58015 "Assert in row_sel_field_store_in_mysql_format
+--echo #            when running innodb_mrr_icp test"
+--echo #
+
+create table t1 (a char(2) charset utf8,b double, primary key (a(1)),key (b));
+insert into t1 values ('',1);
+select 1 from t1 where b <= 1 and a <> '';
+drop table t1;
+
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index fd695d1129f..ebe7af3641d 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -78,7 +78,8 @@ BEGIN {
 
 use lib "lib";
 
-use Cwd;
+use Cwd ;
+use Cwd 'realpath';
 use Getopt::Long;
 use My::File::Path; # Patched version of File::Path
 use File::Basename;
@@ -163,11 +164,14 @@ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
 
 my $DEFAULT_SUITES= join(',', map { "$_-" } qw(
     main
+    archive
     binlog
+    csv
     federated
     funcs_1
     funcs_2
     handler
+    heap
     innodb
     maria
     optimizer_unfixed_bugs
@@ -226,7 +230,7 @@ my %opts_extern;
 sub using_extern { return (keys %opts_extern > 0);};
 
 our $opt_fast= 0;
-our $opt_force;
+our $opt_force= 0;
 our $opt_mem= $ENV{'MTR_MEM'};
 our $opt_clean_vardir= $ENV{'MTR_CLEAN_VARDIR'};
 
@@ -1037,8 +1041,14 @@ sub ignore_option {
 # Setup any paths that are $opt_vardir related
 sub set_vardir {
   my ($vardir)= @_;
-
-  $opt_vardir= $vardir;
+  if(IS_WINDOWS)
+  {
+    $opt_vardir= $vardir;
+  }
+  else
+  {
+    $opt_vardir= realpath($vardir);
+  }
 
   $path_vardir_trace= $opt_vardir;
   # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/...
@@ -1126,7 +1136,7 @@ sub command_line_setup {
 	     'defaults-extra-file=s'    => \&collect_option,
 
              # Control what test suites or cases to run
-             'force'                    => \$opt_force,
+             'force+'                   => \$opt_force,
              'with-ndbcluster-only'     => \&collect_option,
              'include-ndbcluster'       => \$opt_include_ndbcluster,
              'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster,
@@ -5846,6 +5856,11 @@ sub start_mysqltest ($) {
     mtr_add_arg($args, "%s", $_) for @args_saved;
   }
 
+  if ($opt_force > 1)
+  {
+    mtr_add_arg($args, "--continue-on-error");
+  }
+
   my $suite = $tinfo->{suite};
   if ($suite->{parent}) {
     mtr_add_arg($args, "--overlay-dir=%s/", $suite->{dir});
@@ -6275,7 +6290,11 @@ Options to control directories to use
 
 Options to control what test suites or cases to run
 
-  force                 Continue to run the suite after failure
+  force                 Continue after a failure. When specified once, a
+                        failure in a test file will abort this test file, and
+                        the execution will continue from the next test file.
+                        When specified twice, execution will continue executing
+                        the failed test file from the next command.
   with-ndbcluster-only  Run only tests that include "ndb" in the filename
   skip-ndb[cluster]     Skip all tests that need cluster. Default.
   include-ndb[cluster]  Enable all tests that need cluster
diff --git a/mysql-test/r/aborted_clients.result b/mysql-test/r/aborted_clients.result
new file mode 100644
index 00000000000..7111a0c98db
--- /dev/null
+++ b/mysql-test/r/aborted_clients.result
@@ -0,0 +1,10 @@
+FLUSH STATUS;
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
+VARIABLE_VALUE
+0
+KILL CONNECTION_ID();
+ERROR 70100: Connection was killed
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
+VARIABLE_VALUE
+1
+FLUSH STATUS;
diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result
index d21e78428c5..30b4ff11227 100644
--- a/mysql-test/r/auto_increment.result
+++ b/mysql-test/r/auto_increment.result
@@ -516,3 +516,25 @@ pk
 1
 18446744073709551614
 DROP TABLE t1;
+CREATE TABLE t1 (pk BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY (pk));
+insert into t1 values((1<<63)+1);
+insert into t1 values(null);
+select last_insert_id();
+last_insert_id()
+9223372036854775810
+select * from t1;
+pk
+9223372036854775809
+9223372036854775810
+drop table t1;
+CREATE TABLE t1 (pk BIGINT AUTO_INCREMENT, PRIMARY KEY (pk));
+insert into t1 values(-5);
+insert into t1 values(null);
+select last_insert_id();
+last_insert_id()
+1
+select * from t1;
+pk
+-5
+1
+drop table t1;
diff --git a/mysql-test/r/blackhole.result b/mysql-test/r/blackhole.result
new file mode 100644
index 00000000000..317070ca08e
--- /dev/null
+++ b/mysql-test/r/blackhole.result
@@ -0,0 +1,11 @@
+#
+# Bug #11880012: INDEX_SUBQUERY, BLACKHOLE,
+#                HANG IN PREPARING WITH 100% CPU USAGE
+#
+CREATE TABLE t1(a INT NOT NULL);
+INSERT INTO t1 VALUES (1), (2), (3);
+CREATE TABLE t2 (a INT UNSIGNED, b INT, UNIQUE KEY (a, b)) ENGINE=BLACKHOLE;
+SELECT 1 FROM t1 WHERE a = ANY (SELECT a FROM t2);
+1
+DROP TABLE t1, t2;
+End of 5.5 tests 
diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
index a1eba2701f3..23417b16698 100644
--- a/mysql-test/r/cast.result
+++ b/mysql-test/r/cast.result
@@ -728,6 +728,15 @@ length(CONVERT(repeat('a',2048), CHAR(2049)))
 Warnings:
 Warning	1301	Result of cast_as_char() was larger than max_allowed_packet (2048) - truncated
 SET @@GLOBAL.max_allowed_packet=default;
+#
+# Bug#13519724 63793: CRASH IN DTCOLLATION::SET(DTCOLLATION &SET)
+#
+CREATE TABLE t1 (a VARCHAR(50));
+SELECT a FROM t1 
+WHERE CAST(a as BINARY)=x'62736D697468' 
+AND CAST(a AS BINARY)=x'65736D697468';
+a
+DROP TABLE t1;
 End of 5.1 tests
 select cast("2101-00-01 02:03:04" as datetime);
 cast("2101-00-01 02:03:04" as datetime)
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result
index a43a4d383ac..09eaf9855b0 100644
--- a/mysql-test/r/connect.result
+++ b/mysql-test/r/connect.result
@@ -257,3 +257,27 @@ connect(localhost,mysqltest_nouser,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR 28000: Access denied for user 'mysqltest_nouser'@'localhost' (using password: NO)
 DROP USER mysqltest_up1@'%';
 DROP USER mysqltest_up2@'%';
+#
+# BUG#1010351: New "via" keyword in 5.2+ can't be used as identifier anymore  
+#
+create table t1 (via int);
+alter table t1 add key(via);
+drop table t1;
+create table t1 (col1 int);
+alter table t1 add via int not null;
+drop table t1;
+drop procedure if exists p1;
+create procedure p1(x int)
+foo: loop
+if x = 0 then
+leave foo;
+end if;
+select 'test';
+set x = x-1;
+end loop foo|
+call p1(2);
+test
+test
+test
+test
+drop procedure p1;
diff --git a/mysql-test/r/derived_view.result b/mysql-test/r/derived_view.result
index 32081c13376..86b95e94a81 100644
--- a/mysql-test/r/derived_view.result
+++ b/mysql-test/r/derived_view.result
@@ -2044,6 +2044,77 @@ a
 drop table t1,t2;
 set optimizer_switch=@save968720_optimizer_switch;
 #
+# LP BUG#978847 Server crashes in Item_ref::real_item on
+# INSERT .. SELECT with FROM subquery and derived_merge=ON
+SET @save978847_optimizer_switch=@@optimizer_switch;
+SET optimizer_switch = 'derived_merge=on';
+CREATE TABLE t1 ( a INT, b INT );
+INSERT INTO t1 VALUES (2,1),(3,2);
+select * from t1;
+a	b
+2	1
+3	2
+INSERT INTO t1 SELECT * FROM
+( SELECT * FROM t1 ) AS alias;
+select * from t1;
+a	b
+2	1
+3	2
+2	1
+3	2
+prepare stmt1 from  'INSERT INTO t1 SELECT SQL_BIG_RESULT * FROM
+  ( SELECT * FROM t1 ) AS alias';
+execute stmt1;
+select * from t1;
+a	b
+2	1
+3	2
+2	1
+3	2
+2	1
+3	2
+2	1
+3	2
+execute stmt1;
+select * from t1;
+a	b
+2	1
+3	2
+2	1
+3	2
+2	1
+3	2
+2	1
+3	2
+2	1
+3	2
+2	1
+3	2
+2	1
+3	2
+2	1
+3	2
+drop table t1;
+set optimizer_switch=@save978847_optimizer_switch;
+#
+# LP bug998516 Server hangs on INSERT .. SELECT with derived_merge,
+# FROM subquery, UNION 
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (b INT);
+INSERT INTO t2 VALUES (3),(4);
+INSERT INTO t1 SELECT * FROM ( SELECT * FROM t1 ) AS alias UNION SELECT * FROM t2;
+select * from t1;
+a
+1
+2
+1
+2
+3
+4
+drop table t1,t2;
+#
 # end of 5.3 tests
 #
 set optimizer_switch=@exit_optimizer_switch;
diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result
index 24ace7eb849..8560e6176c4 100644
--- a/mysql-test/r/errors.result
+++ b/mysql-test/r/errors.result
@@ -146,3 +146,17 @@ ERROR 22003: BIGINT value is out of range in '(-(73) * -(2465717823867977728))'
 #
 # End Bug#57882
 #
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2(a INT PRIMARY KEY, b INT);
+SELECT '' AS b FROM t1 GROUP BY VALUES(b);
+ERROR 42S22: Unknown column '' in 'VALUES() function'
+REPLACE t2(b) SELECT '' AS b FROM t1 GROUP BY VALUES(b);
+ERROR 42S22: Unknown column '' in 'VALUES() function'
+UPDATE t2 SET a=(SELECT '' AS b FROM t1 GROUP BY VALUES(b));
+ERROR 42S22: Unknown column '' in 'VALUES() function'
+INSERT INTO t2 VALUES (1,0) ON DUPLICATE KEY UPDATE
+b=(SELECT '' AS b FROM t1 GROUP BY VALUES(b));
+ERROR 42S22: Unknown column '' in 'VALUES() function'
+INSERT INTO t2(a,b) VALUES (1,0) ON DUPLICATE KEY UPDATE
+b=(SELECT VALUES(a)+2 FROM t1);
+DROP TABLE t1, t2;
diff --git a/mysql-test/r/flush-innodb.result b/mysql-test/r/flush-innodb.result
new file mode 100644
index 00000000000..cea4f81e2a2
--- /dev/null
+++ b/mysql-test/r/flush-innodb.result
@@ -0,0 +1,5 @@
+FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT;
+UNLOCK TABLES;
+CREATE TABLE t1 ( m MEDIUMTEXT ) ENGINE=InnoDB;
+INSERT INTO t1 VALUES ( REPEAT('i',1048576) );
+DROP TABLE t1;
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 0f50f913ab3..c067ff02574 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -692,8 +692,10 @@ PREPARE stmt FROM
  WHERE t1.f1 GROUP BY t1.f1))';
 EXECUTE stmt;
 1
+1
 EXECUTE stmt;
 1
+1
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
 End of 5.1 tests
diff --git a/mysql-test/r/func_group_innodb.result b/mysql-test/r/func_group_innodb.result
index 71f1c6faef0..00baa5f990a 100644
--- a/mysql-test/r/func_group_innodb.result
+++ b/mysql-test/r/func_group_innodb.result
@@ -146,6 +146,19 @@ count(*)	min(7)	max(7)
 0	NULL	NULL
 drop table t1m, t1i, t2m, t2i;
 #
+# Bug#13723054 CRASH WITH MIN/MAX AFTER QUICK_GROUP_MIN_MAX_SELECT::NEXT_MIN
+#
+CREATE TABLE t1(a BLOB, b VARCHAR(255) CHARSET LATIN1, c INT,
+KEY(b, c, a(765))) ENGINE=INNODB;
+INSERT INTO t1(a, b, c) VALUES ('', 'a', 0), ('', 'a', null), ('', 'a', 0);
+SELECT MIN(c) FROM t1 GROUP BY b;
+MIN(c)
+0
+EXPLAIN SELECT MIN(c) FROM t1 GROUP BY b;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	NULL	b	263	NULL	4	Using index for group-by
+DROP TABLE t1;
+#
 # Bug #57954: BIT_AND function returns incorrect results when 
 #   semijoin=on
 CREATE TABLE c (
diff --git a/mysql-test/r/func_if.result b/mysql-test/r/func_if.result
index 3d5ca1805b7..c7f548ae2bc 100644
--- a/mysql-test/r/func_if.result
+++ b/mysql-test/r/func_if.result
@@ -217,3 +217,20 @@ foo
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'a'
 Warning	1292	Truncated incorrect DOUBLE value: 'a'
+#
+# LP bug#998321 Simple query with IF expression causes an
+# assertion abort (see also mysql Bug#12620084)
+#
+SELECT if(0, (SELECT min('hello')), NULL);
+if(0, (SELECT min('hello')), NULL)
+NULL
+SELECT if(1, (SELECT min('hello')), NULL);
+if(1, (SELECT min('hello')), NULL)
+hello
+SELECT if(0, NULL, (SELECT min('hello')));
+if(0, NULL, (SELECT min('hello')))
+hello
+SELECT if(1, NULL, (SELECT min('hello')));
+if(1, NULL, (SELECT min('hello')))
+NULL
+End of 5.2 tests
diff --git a/mysql-test/r/gis-precise.result b/mysql-test/r/gis-precise.result
index 1cd72d0c178..3b07be3930a 100644
--- a/mysql-test/r/gis-precise.result
+++ b/mysql-test/r/gis-precise.result
@@ -434,3 +434,21 @@ ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') , POLYGON
 SELECT ST_INTERSECTS( GeomFromText('MULTILINESTRING( ( 4030 3045 , 3149 2461 , 3004 3831 , 3775 2976 ) )') , GeomFromText('LINESTRING(3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29,3039.07 3175.05,3039.07 3175.05,3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29)') );
 ST_INTERSECTS( GeomFromText('MULTILINESTRING( ( 4030 3045 , 3149 2461 , 3004 3831 , 3775 2976 ) )') , GeomFromText('LINESTRING(3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29,3039.07 3175.05,3039.07 3175.05,3058.41 3187.91,3081.52 3153.19,
 1
+select ASTEXT(ST_BUFFER(ST_GEOMCOLLFROMTEXT(' GEOMETRYCOLLECTION(LINESTRING(100 100, 31 10, 77 80), POLYGON((0 0,4 7,1 1,0 0)), POINT(20 20))'), -3));
+ASTEXT(ST_BUFFER(ST_GEOMCOLLFROMTEXT(' GEOMETRYCOLLECTION(LINESTRING(100 100, 31 10, 77 80), POLYGON((0 0,4 7,1 1,0 0)), POINT(20 20))'), -3))
+POLYGON((3.999999999999999 6.999999999999998,4 7,3.999999999999999 6.999999999999998))
+SELECT ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER( POLYGONFROMTEXT( 'POLYGON( ( 0.0 -3.0,
+  -2.910427500435995 0.727606875108998,
+  -0.910427500435995 8.727606875108998,
+  7.664100588675687 1.503849116986468,
+  1.664100588675687 -2.496150883013531,
+  0.0 -3.0
+))' ), 3 )));
+ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER( POLYGONFROMTEXT( 'POLYGON( ( 0.0 -3.0,
+  -2.910427500435995 0.727606875108998,
+  -0.910427500435995 8.727606875108998,
+  7.664100588675687 1.503849116986468,
+  1.664100588675687 -2.496150883013531,
+  0.0 -3.0
+))' ),
+136
diff --git a/mysql-test/r/gis-rt-precise.result b/mysql-test/r/gis-rt-precise.result
index 4519dcb6d19..3f4f014fb78 100644
--- a/mysql-test/r/gis-rt-precise.result
+++ b/mysql-test/r/gis-rt-precise.result
@@ -20,7 +20,17 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	g	g	34	NULL	8	Using where
 SELECT fid, AsText(g) FROM t1 WHERE ST_Within(g, GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))'));
 fid	AsText(g)
+1	LINESTRING(150 150,150 150)
+3	LINESTRING(148 148,152 152)
+4	LINESTRING(147 147,153 153)
+5	LINESTRING(146 146,154 154)
+6	LINESTRING(145 145,155 155)
+7	LINESTRING(144 144,156 156)
+8	LINESTRING(143 143,157 157)
+9	LINESTRING(142 142,158 158)
+10	LINESTRING(141 141,159 159)
 11	LINESTRING(140 140,160 160)
+2	LINESTRING(149 149,151 151)
 DROP TABLE t1;
 CREATE TABLE t1 (
 fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
@@ -45,5 +55,8 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT fid, AsText(g) FROM t1 WHERE ST_Within(g, 
 GeomFromText('Polygon((40 40,60 40,60 60,40 40))'));
 fid	AsText(g)
+46	LINESTRING(51 41,60 50)
+56	LINESTRING(41 41,50 50)
+45	LINESTRING(51 51,60 60)
 DROP TABLE t1;
 End of 5.5 tests.
diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result
index a1c3f274ed3..26787366358 100644
--- a/mysql-test/r/gis-rtree.result
+++ b/mysql-test/r/gis-rtree.result
@@ -170,7 +170,17 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	g	g	34	NULL	8	Using where
 SELECT fid, AsText(g) FROM t1 WHERE Within(g, GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))'));
 fid	AsText(g)
+1	LINESTRING(150 150,150 150)
+3	LINESTRING(148 148,152 152)
+4	LINESTRING(147 147,153 153)
+5	LINESTRING(146 146,154 154)
+6	LINESTRING(145 145,155 155)
+7	LINESTRING(144 144,156 156)
+8	LINESTRING(143 143,157 157)
+9	LINESTRING(142 142,158 158)
+10	LINESTRING(141 141,159 159)
 11	LINESTRING(140 140,160 160)
+2	LINESTRING(149 149,151 151)
 DROP TABLE t1;
 CREATE TABLE t2 (
 fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
@@ -295,6 +305,10 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT fid, AsText(g) FROM t2 WHERE Within(g, 
 GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))'));
 fid	AsText(g)
+46	LINESTRING(51 41,60 50)
+56	LINESTRING(41 41,50 50)
+45	LINESTRING(51 51,60 60)
+55	LINESTRING(41 51,50 60)
 DELETE FROM t2 WHERE Within(g, Envelope(GeometryFromWKB(Point(10 * 10 - 9, 10 * 10 - 9), Point(10 * 10, 10 * 10))));
 SELECT count(*) FROM t2;
 count(*)
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 83db8bf34af..ca48177b1b5 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -1430,6 +1430,19 @@ count(*)
 DROP DATABASE gis_ogs;
 USE test;
 #
+# BUG#12414917 - ISCLOSED() CRASHES ON 64-BIT BUILDS
+#
+SELECT ISCLOSED(CONVERT(CONCAT('     ', 0x2), BINARY(20)));
+ISCLOSED(CONVERT(CONCAT('     ', 0x2), BINARY(20)))
+NULL
+#
+# BUG#12537203 - CRASH WHEN SUBSELECTING GLOBAL VARIABLES IN 
+# GEOMETRY FUNCTION ARGUMENTS
+#
+SELECT GEOMETRYCOLLECTION((SELECT @@OLD));
+ERROR 22007: Illegal non geometric '' value found during parsing
+End of 5.1 tests
+#
 # Bug#11908153: CRASH AND/OR VALGRIND ERRORS IN FIELD_BLOB::GET_KEY_IMAGE
 #
 CREATE TABLE g1
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index cffed9529d6..222977e5106 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -1976,6 +1976,133 @@ Warning	1292	Truncated incorrect DOUBLE value: 'g'
 Warning	1292	Truncated incorrect DOUBLE value: 'v'
 SET SESSION SQL_MODE=default;
 drop table t1;
+#
+# LP bug#967242 Wrong result (extra rows, not grouped) with JOIN, AND in ON condition, multi-part key, GROUP BY, OR in WHERE
+#
+CREATE TABLE t1 ( a VARCHAR(1) ) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('x');
+CREATE TABLE t2 ( b INT, c VARCHAR(1), KEY (c, b) ) ENGINE=MyISAM;
+INSERT INTO t2 VALUES
+(4, 'd'),(8, 'g'),(3, 'x'),(3, 'f'),
+(0, 'p'),(3, 'j'),(8, 'c');
+SELECT t2_1.b as zzz
+FROM t1 JOIN t2 AS t2_1 JOIN t2 AS t2_2
+ON (t2_2.b = t2_1.b ) AND (t2_2.c = t2_1.c )
+WHERE
+rand() + 1 > 0 OR
+a = t2_1.c
+GROUP BY zzz;
+zzz
+0
+3
+4
+8
+SELECT t2_1.b as zzz
+FROM t1 JOIN t2 AS t2_1 JOIN t2 AS t2_2
+ON (t2_2.b = t2_1.b ) AND (t2_2.c = t2_1.c )
+WHERE
+1 > 0 OR
+a = t2_1.c
+GROUP BY zzz;
+zzz
+0
+3
+4
+8
+SELECT t2_1.b as zzz
+FROM t1 JOIN t2 AS t2_1 JOIN t2 AS t2_2
+ON (t2_2.b = t2_1.b ) AND (t2_2.c = t2_1.c )
+WHERE
+t2_1.b + 1 > 0 OR
+a = t2_1.c
+GROUP BY zzz;
+zzz
+0
+3
+4
+8
+SET @save_optimizer_switch967242=@@optimizer_switch;
+SET optimizer_switch = 'in_to_exists=on';
+SELECT t2_1.b
+FROM t1 JOIN t2 AS t2_1 JOIN t2 AS t2_2
+ON (t2_2.b = t2_1.b ) AND (t2_2.c = t2_1.c )
+WHERE
+( SELECT COUNT(*) FROM t2 ) IS NOT NULL
+OR a = t2_1.c
+GROUP BY t2_1.b;
+b
+0
+3
+4
+8
+SET optimizer_switch=@save_optimizer_switch967242;
+drop table t1, t2;
+#
+# Bug#12578908: SELECT SQL_BUFFER_RESULT OUTPUTS TOO MANY 
+#               ROWS WHEN GROUP IS OPTIMIZED AWAY
+#
+CREATE TABLE t1 (col1 int, col2 int) ;
+INSERT INTO t1 VALUES (10,1),(11,7);
+CREATE TABLE t2 (col1 int, col2 int) ;
+INSERT INTO t2 VALUES (10,8);
+
+EXPLAIN SELECT SQL_BUFFER_RESULT t2.col2 FROM t2 JOIN t1 ON t1.col1 GROUP BY t2.col2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	system	NULL	NULL	NULL	NULL	1	Using temporary
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT SQL_BUFFER_RESULT t2.col2 FROM t2 JOIN t1 ON t1.col1 GROUP BY t2.col2;
+col2
+8
+
+EXPLAIN SELECT t2.col2 FROM t2 JOIN t1 ON t1.col1 GROUP BY t2.col2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	system	NULL	NULL	NULL	NULL	1	
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT t2.col2 FROM t2 JOIN t1 ON t1.col1 GROUP BY t2.col2;
+col2
+8
+
+DROP TABLE t1,t2;
+#
+# BUG#12640437: USING SQL_BUFFER_RESULT RESULTS IN A
+#               DIFFERENT QUERY OUTPUT
+#
+CREATE TABLE t1 (
+a int,
+b varchar(1),
+KEY (b,a)
+);
+INSERT INTO t1 VALUES (1,NULL),(0,'a');
+
+EXPLAIN SELECT SQL_BUFFER_RESULT MIN(a), b FROM t1 WHERE t1.b = 'a' GROUP BY b;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	b	b	9	NULL	2	Using where; Using index for group-by; Using temporary
+
+SELECT SQL_BUFFER_RESULT MIN(a), b FROM t1 WHERE t1.b = 'a' GROUP BY b;
+MIN(a)	b
+0	a
+
+EXPLAIN SELECT MIN(a), b FROM t1 WHERE t1.b = 'a' GROUP BY b;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	b	b	9	NULL	2	Using where; Using index for group-by
+
+SELECT MIN(a), b FROM t1 WHERE t1.b = 'a' GROUP BY b;
+MIN(a)	b
+0	a
+
+DROP TABLE t1;
+#
+# LP bug#993726 Wrong result from a query with ALL subquery predicate in WHERE
+#
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (0);
+SELECT 1 FROM t1 WHERE 1 > ALL(SELECT 1 FROM t1 WHERE a!=0);
+1
+1
+SELECT max(1) FROM t1 WHERE a!=0;
+max(1)
+NULL
+drop table t1;
 # End of 5.2 tests
 #
 # lp:872702: Crash in add_ref_to_table_cond() when grouping by a PK
diff --git a/mysql-test/r/handlersocket.result b/mysql-test/r/handlersocket.result
index dcea3c186b6..a415b12f92d 100644
--- a/mysql-test/r/handlersocket.result
+++ b/mysql-test/r/handlersocket.result
@@ -1,13 +1,14 @@
 install plugin handlersocket soname 'handlersocket.so';
-select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket';
+select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description, plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket';
 plugin_name	handlersocket
 plugin_version	1.0
 plugin_status	ACTIVE
 plugin_type	DAEMON
 plugin_library	handlersocket.so
-plugin_library_version	0.0
+plugin_library_version	1.3
 plugin_author	higuchi dot akira at dena dot jp
-plugin_license	
-plugin_maturity	Unknown
-plugin_auth_version	Unknown
+plugin_description	Direct access into InnoDB
+plugin_license	BSD
+plugin_maturity	Beta
+plugin_auth_version	1.0
 uninstall plugin handlersocket;
diff --git a/mysql-test/r/in_datetime_241.result b/mysql-test/r/in_datetime_241.result
new file mode 100644
index 00000000000..2c5b4bd8db1
--- /dev/null
+++ b/mysql-test/r/in_datetime_241.result
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( a DATE );
+SELECT * FROM t1 WHERE ( SELECT a FROM t1 ) IN ('2012-04-25','2012-04-26');
+a
+DROP TABLE t1;
diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result
index 50b0147b6ad..e5025acc998 100644
--- a/mysql-test/r/index_merge_innodb.result
+++ b/mysql-test/r/index_merge_innodb.result
@@ -745,4 +745,36 @@ WHERE v1  IN  ('f', 'd', 'h', 'u' ) AND i  =  2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	i,v	i	5	const	2	Using where
 DROP TABLE t1;
+#
+# BUG#1006164: Multi-table DELETE that uses innodb + index_merge/intersect may fail to delete rows
+#
+create table t0(a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1 (
+pk int auto_increment, 
+zone_id int,
+modified tinyint,
+primary key(pk),
+key (zone_id),
+key (modified)
+) engine=innodb;
+insert into t1 (zone_id, modified) select 0,0 from t0 A, t0 B, t0 C, t0 D;
+update t1 set zone_id=487, modified=9 where pk=7259;
+update t1 set zone_id=487, modified=9 where pk=7260;
+update t1 set zone_id=830, modified=9 where pk=8434;
+update t1 set zone_id=830, modified=9 where pk=8435;
+update t1 set zone_id=830, modified=9 where pk=8436;
+update t1 set zone_id=830, modified=9 where pk=8437;
+select * from t1 where t1.zone_id=830 AND modified=9;
+pk	zone_id	modified
+8434	830	9
+8435	830	9
+8436	830	9
+8437	830	9
+begin;
+DELETE t1 FROM t1 WHERE t1.zone_id=830 AND modified=9;
+commit;
+select * from t1 where t1.zone_id=830 AND modified=9;
+pk	zone_id	modified
+drop table t0, t1;
 set optimizer_switch= @optimizer_switch_save;
diff --git a/mysql-test/r/innodb_icp.result b/mysql-test/r/innodb_icp.result
index c1d3fa3445d..54ad9ecafad 100644
--- a/mysql-test/r/innodb_icp.result
+++ b/mysql-test/r/innodb_icp.result
@@ -835,6 +835,22 @@ Variable_name	Value
 Handler_icp_attempts	2
 Handler_icp_match	1
 DROP TABLE t1;
+create table t1 (a int,b char(5),primary key (a), key (b(1)));
+insert into t1 values ('a','b');
+Warnings:
+Warning	1366	Incorrect integer value: 'a' for column 'a' at row 1
+select 1 from t1 where a and b >= 'aa';
+1
+drop table t1;
+#
+# Bug#58015 "Assert in row_sel_field_store_in_mysql_format
+#            when running innodb_mrr_icp test"
+#
+create table t1 (a char(2) charset utf8,b double, primary key (a(1)),key (b));
+insert into t1 values ('',1);
+select 1 from t1 where b <= 1 and a <> '';
+1
+drop table t1;
 #
 # BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050 
 #
diff --git a/mysql-test/r/join_cache.result b/mysql-test/r/join_cache.result
index 0892ce7794a..6471a2f8bbd 100644
--- a/mysql-test/r/join_cache.result
+++ b/mysql-test/r/join_cache.result
@@ -3221,7 +3221,7 @@ explain
 select t1.a, count(t2.p) as count
 from t1 left join t2 on t1.a=t2.a and t2.p % 2 = 1 group by t1.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	8	Using temporary; Using filesort
+1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	8	Using index; Using temporary; Using filesort
 1	SIMPLE	t2	ref	i_a	i_a	5	test.t1.a	2	Using where; Using join buffer (flat, BKA join); Key-ordered Rowid-ordered scan
 select t1.a, count(t2.p) as count
 from t1 left join t2 on t1.a=t2.a and t2.p % 2 = 1 group by t1.a;
@@ -4274,7 +4274,7 @@ pk int NOT NULL, i int NOT NULL, v  varchar(1) NOT NULL,
 PRIMARY KEY (pk), INDEX idx1(i), INDEX idx2 (v,i)
 ) COLLATE latin1_bin;
 INSERT INTO t1 VALUES
-(10,8,'v'), (11,8,'f'), (12,5,'v'), (13,8,'s'), (14,8,'a'),
+(10,8,'v'), (11,8,'f'), (13,8,'s'), (14,8,'a'),
 (15,6,'p'), (16,7,'z'), (17,2,'a'), (18,5,'h'), (19,7,'h'),
 (25,3,'m'), (26,5,'a'), (27,9,'n'), (28,1,'d'), (29,107,'a');
 INSERT INTO t1 VALUES
@@ -4327,7 +4327,7 @@ SELECT t2.v FROM t1, t2, t3
 WHERE t3.v <> t2.v AND t3.pk = t2.i AND t1.v = t3.v AND t1.pk*2<100 
 GROUP BY t2.v ORDER BY t1.pk,t2.v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	ALL	idx1	NULL	NULL	NULL	20	Using temporary; Using filesort
+1	SIMPLE	t2	index	idx1	idx2	7	NULL	20	Using index; Using temporary; Using filesort
 1	SIMPLE	t3	eq_ref	PRIMARY,idx2	PRIMARY	4	test.t2.i	1	Using where; Using join buffer (flat, BKA join); Key-ordered Rowid-ordered scan
 1	SIMPLE	t1	ref	idx2	idx2	3	test.t3.v	5	Using where; Using join buffer (incremental, BKA join); Key-ordered Rowid-ordered scan
 SELECT t2.v FROM t1, t2, t3 
@@ -4345,9 +4345,9 @@ SELECT t2.v FROM t1, t2, t3
 WHERE t3.v <> t2.v AND t3.pk = t2.i AND t1.v = t3.v AND t1.pk*2<100 
 GROUP BY t2.v ORDER BY t1.pk,t2.v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	ALL	idx1	NULL	NULL	NULL	20	Using temporary; Using filesort
+1	SIMPLE	t2	index	idx1	idx2	7	NULL	20	Using index; Using temporary; Using filesort
 1	SIMPLE	t3	hash_ALL	PRIMARY,idx2	#hash#PRIMARY	4	test.t2.i	20	Using where; Using join buffer (flat, BNLH join)
-1	SIMPLE	t1	hash_ALL	idx2	#hash#idx2	3	test.t3.v	45	Using where; Using join buffer (incremental, BNLH join)
+1	SIMPLE	t1	hash_ALL	idx2	#hash#idx2	3	test.t3.v	44	Using where; Using join buffer (incremental, BNLH join)
 SELECT t2.v FROM t1, t2, t3
 WHERE t3.v <> t2.v AND t3.pk = t2.i AND t1.v = t3.v AND t1.pk*2<100 
 GROUP BY t2.v ORDER BY t1.pk,t2.v;
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
index ebe8255fd8b..f16b38772a6 100644
--- a/mysql-test/r/join_outer.result
+++ b/mysql-test/r/join_outer.result
@@ -1855,6 +1855,30 @@ f1	f1	f2
 DROP TABLE t1,t2;
 End of 5.1 tests
 #
+# LP BUG#994392: Wrong result with RIGHT/LEFT JOIN and ALL subquery
+# predicate in WHERE condition.
+#
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(9);
+CREATE TABLE t2(b INT);
+INSERT INTO t2 VALUES(8);
+CREATE TABLE t3(c INT);
+INSERT INTO t3 VALUES(3);
+SELECT * FROM t2 RIGHT JOIN t3 ON(c = b) WHERE b < ALL(SELECT a FROM t1 WHERE a <= 7);
+b	c
+NULL	3
+SELECT * FROM t3 LEFT JOIN t2 ON(c = b) WHERE b < ALL(SELECT a FROM t1 WHERE a <= 7);
+c	b
+3	NULL
+SELECT * FROM t2 RIGHT JOIN t3 ON(c = b) WHERE b not in (SELECT a FROM t1 WHERE a <= 7);
+b	c
+NULL	3
+SELECT * FROM t3 LEFT JOIN t2 ON(c = b) WHERE b not in (SELECT a FROM t1 WHERE a <= 7);
+c	b
+3	NULL
+drop table t1,t2,t3;
+End of 5.2 tests
+#
 # LP bug #813447: LEFT JOIN with single-row inner table and
 #                 a subquery in ON expression
 #
@@ -1872,7 +1896,7 @@ SELECT t2.a FROM t1 LEFT JOIN t2 ON (6) IN (SELECT a FROM t3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	100.00	
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
-2	DEPENDENT SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+2	SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 Warnings:
 Note	1003	select `test`.`t2`.`a` AS `a` from `test`.`t2` where 1
 DROP TABLE t1,t2,t3;
diff --git a/mysql-test/r/join_outer_jcl6.result b/mysql-test/r/join_outer_jcl6.result
index 3d0e4cbfc79..a4aaaf6085d 100644
--- a/mysql-test/r/join_outer_jcl6.result
+++ b/mysql-test/r/join_outer_jcl6.result
@@ -1866,6 +1866,30 @@ f1	f1	f2
 DROP TABLE t1,t2;
 End of 5.1 tests
 #
+# LP BUG#994392: Wrong result with RIGHT/LEFT JOIN and ALL subquery
+# predicate in WHERE condition.
+#
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(9);
+CREATE TABLE t2(b INT);
+INSERT INTO t2 VALUES(8);
+CREATE TABLE t3(c INT);
+INSERT INTO t3 VALUES(3);
+SELECT * FROM t2 RIGHT JOIN t3 ON(c = b) WHERE b < ALL(SELECT a FROM t1 WHERE a <= 7);
+b	c
+NULL	3
+SELECT * FROM t3 LEFT JOIN t2 ON(c = b) WHERE b < ALL(SELECT a FROM t1 WHERE a <= 7);
+c	b
+3	NULL
+SELECT * FROM t2 RIGHT JOIN t3 ON(c = b) WHERE b not in (SELECT a FROM t1 WHERE a <= 7);
+b	c
+NULL	3
+SELECT * FROM t3 LEFT JOIN t2 ON(c = b) WHERE b not in (SELECT a FROM t1 WHERE a <= 7);
+c	b
+3	NULL
+drop table t1,t2,t3;
+End of 5.2 tests
+#
 # LP bug #813447: LEFT JOIN with single-row inner table and
 #                 a subquery in ON expression
 #
@@ -1883,7 +1907,7 @@ SELECT t2.a FROM t1 LEFT JOIN t2 ON (6) IN (SELECT a FROM t3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	100.00	
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
-2	DEPENDENT SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+2	SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 Warnings:
 Note	1003	select `test`.`t2`.`a` AS `a` from `test`.`t2` where 1
 DROP TABLE t1,t2,t3;
diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result
index f438a3884eb..1a6f8534cc2 100644
--- a/mysql-test/r/log_state.result
+++ b/mysql-test/r/log_state.result
@@ -320,22 +320,22 @@ TRUNCATE TABLE mysql.slow_log;
 CREATE TABLE t1 (a INT);
 CREATE TABLE t2 (b INT, PRIMARY KEY (b));
 INSERT INTO t2 VALUES (3),(4);
-INSERT INTO t1 VALUES (1+sleep(.01)),(2);
-INSERT INTO t1 SELECT b+sleep(.01) from t2;
-UPDATE t1 SET a=a+sleep(.01) WHERE a>2;
-UPDATE t1 SET a=a+sleep(.01) ORDER BY a DESC;
-UPDATE t2 set b=b+sleep(.01) limit 1;
-UPDATE t1 SET a=a+sleep(.01) WHERE a in (SELECT b from t2);
-DELETE FROM t1 WHERE a=a+sleep(.01) ORDER BY a LIMIT 2;
+INSERT INTO t1 VALUES (1+sleep(.02)),(2);
+INSERT INTO t1 SELECT b+sleep(.02) from t2;
+UPDATE t1 SET a=a+sleep(.02) WHERE a>2;
+UPDATE t1 SET a=a+sleep(.02) ORDER BY a DESC;
+UPDATE t2 set b=b+sleep(.02) limit 1;
+UPDATE t1 SET a=a+sleep(.02) WHERE a in (SELECT b from t2);
+DELETE FROM t1 WHERE a=a+sleep(.02) ORDER BY a LIMIT 2;
 SELECT rows_examined,sql_text FROM mysql.slow_log;
 rows_examined	sql_text
-0	INSERT INTO t1 VALUES (1+sleep(.01)),(2)
-2	INSERT INTO t1 SELECT b+sleep(.01) from t2
-4	UPDATE t1 SET a=a+sleep(.01) WHERE a>2
-8	UPDATE t1 SET a=a+sleep(.01) ORDER BY a DESC
-1	UPDATE t2 set b=b+sleep(.01) limit 1
-4	UPDATE t1 SET a=a+sleep(.01) WHERE a in (SELECT b from t2)
-6	DELETE FROM t1 WHERE a=a+sleep(.01) ORDER BY a LIMIT 2
+0	INSERT INTO t1 VALUES (1+sleep(.02)),(2)
+2	INSERT INTO t1 SELECT b+sleep(.02) from t2
+4	UPDATE t1 SET a=a+sleep(.02) WHERE a>2
+8	UPDATE t1 SET a=a+sleep(.02) ORDER BY a DESC
+1	UPDATE t2 set b=b+sleep(.02) limit 1
+4	UPDATE t1 SET a=a+sleep(.02) WHERE a in (SELECT b from t2)
+6	DELETE FROM t1 WHERE a=a+sleep(.02) ORDER BY a LIMIT 2
 DROP TABLE t1,t2;
 TRUNCATE TABLE mysql.slow_log;
 # end of bug#49756
diff --git a/mysql-test/r/myisam_icp.result b/mysql-test/r/myisam_icp.result
index a8355db55e0..bc7ebf9c439 100644
--- a/mysql-test/r/myisam_icp.result
+++ b/mysql-test/r/myisam_icp.result
@@ -165,7 +165,7 @@ WHERE ts BETWEEN '0000-00-00' AND '2010-00-01 00:00:00'
 ORDER BY ts DESC
 LIMIT 2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	4	Using index condition
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	4	Using where
 
 DROP TABLE t1;
 #
@@ -839,6 +839,22 @@ Variable_name	Value
 Handler_icp_attempts	2
 Handler_icp_match	1
 DROP TABLE t1;
+create table t1 (a int,b char(5),primary key (a), key (b(1)));
+insert into t1 values ('a','b');
+Warnings:
+Warning	1366	Incorrect integer value: 'a' for column 'a' at row 1
+select 1 from t1 where a and b >= 'aa';
+1
+drop table t1;
+#
+# Bug#58015 "Assert in row_sel_field_store_in_mysql_format
+#            when running innodb_mrr_icp test"
+#
+create table t1 (a char(2) charset utf8,b double, primary key (a(1)),key (b));
+insert into t1 values ('',1);
+select 1 from t1 where b <= 1 and a <> '';
+1
+drop table t1;
 drop table if exists t0, t1, t1i, t1m;
 #
 # BUG#826935 Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed
@@ -914,4 +930,23 @@ Warning	1292	Truncated incorrect DOUBLE value: 'c'
 Warning	1292	Truncated incorrect DOUBLE value: 'c'
 SET optimizer_switch=@save_optimizer_switch;
 DROP TABLE t1,t2,t3,t4;
+#
+# BUG#1000051: Query with simple join and ORDER BY takes thousands times longer when run with ICP
+#
+create table t0 (a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1 (a int, col int, filler char(100), key(a, col));
+insert into t1 select A.a + 10*B.a, 1234, 'filler' from t0 A, t0 B, t0 C;
+set @tmp_10000051= @@optimizer_switch;
+set optimizer_switch='mrr=off';
+# Must not use ICP:
+explain select * from t1 where a between 5 and 8 order by a desc, col desc;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	a	a	5	NULL	39	Using where
+set optimizer_switch= @tmp_10000051;
+# Must not use ICP:
+explain select * from t1 where a=3 and col > 500 order by a desc, col desc;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	a	a	10	NULL	10	Using where
+drop table t0, t1;
 set optimizer_switch=@myisam_icp_tmp;
diff --git a/mysql-test/r/mysqlslap.result b/mysql-test/r/mysqlslap.result
index 9defe1d6093..069c9182de2 100644
--- a/mysql-test/r/mysqlslap.result
+++ b/mysql-test/r/mysqlslap.result
@@ -241,3 +241,13 @@ mysql
 performance_schema
 test
 DROP DATABASE bug58090;
+#
+# Bug #11766072 - 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWS
+#
+Benchmark
+	Average number of seconds to run all queries: TIME seconds
+	Minimum number of seconds to run all queries: TIME seconds
+	Maximum number of seconds to run all queries: TIME seconds
+	Number of clients running queries: 1
+	Average number of queries per client: 0
+
diff --git a/mysql-test/r/mysqltest_cont_on_error.result b/mysql-test/r/mysqltest_cont_on_error.result
new file mode 100644
index 00000000000..eaa17028f8d
--- /dev/null
+++ b/mysql-test/r/mysqltest_cont_on_error.result
@@ -0,0 +1,7 @@
+select error;
+mysqltest: At line 1: query 'select error' failed: 1054: Unknown column 'error' in 'field list'
+SELECT ERROR;
+mysqltest: At line 1: query 'SELECT ERROR' failed: 1054: Unknown column 'ERROR' in 'field list'
+SELECT 2;
+2
+2
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index ce0926c6bc1..27131438d16 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -3940,3 +3940,107 @@ Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
 deallocate prepare st;
 drop table t1;
+#
+# LP bug#993459 Execution of PS for a query with GROUP BY
+# returns wrong result (see also mysql bug#13805127)
+#
+PREPARE s1 FROM 
+"
+SELECT c1, t2.c2, count(c3)
+FROM
+  (
+  SELECT 3 as c2 FROM dual WHERE @x = 1
+  UNION
+  SELECT 2       FROM dual WHERE @x = 1 OR @x = 2
+  ) AS t1,
+  (
+  SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+  UNION
+  SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+  UNION
+  SELECT '2012-03-01 01:00:00',       2,       1       FROM dual
+  ) AS t2
+WHERE t2.c2 = t1.c2
+GROUP BY c1, c2
+";
+
+SET @x = 1;
+SELECT c1, t2.c2, count(c3)
+FROM
+(
+SELECT 3 as c2 FROM dual WHERE @x = 1
+UNION
+SELECT 2       FROM dual WHERE @x = 1 OR @x = 2
+) AS t1,
+(
+SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+UNION
+SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+UNION
+SELECT '2012-03-01 01:99345900:00',       2,       1       FROM dual
+) AS t2
+WHERE t2.c2 = t1.c2
+GROUP BY c1, c2;
+c1	c2	count(c3)
+2012-03-01 01:00:00	3	1
+2012-03-01 01:99345900:00	2	1
+2012-03-01 02:00:00	3	1
+
+EXECUTE s1;
+c1	c2	count(c3)
+2012-03-01 01:00:00	2	1
+2012-03-01 01:00:00	3	1
+2012-03-01 02:00:00	3	1
+
+SET @x = 2;
+SELECT c1, t2.c2, count(c3)
+FROM
+(
+SELECT 3 as c2 FROM dual WHERE @x = 1
+UNION
+SELECT 2       FROM dual WHERE @x = 1 OR @x = 2
+) AS t1,
+(
+SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+UNION
+SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+UNION
+SELECT '2012-03-01 01:00:00',       2,       1       FROM dual
+) AS t2
+WHERE t2.c2 = t1.c2
+GROUP BY c1, c2;
+c1	c2	count(c3)
+2012-03-01 01:00:00	2	1
+
+EXECUTE s1;
+c1	c2	count(c3)
+2012-03-01 01:00:00	2	1
+
+SET @x = 1;
+SELECT c1, t2.c2, count(c3)
+FROM
+(
+SELECT 3 as c2 FROM dual WHERE @x = 1
+UNION
+SELECT 2       FROM dual WHERE @x = 1 OR @x = 2
+) AS t1,
+(
+SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+UNION
+SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+UNION
+SELECT '2012-03-01 01:00:00',       2,       1       FROM dual
+) AS t2
+WHERE t2.c2 = t1.c2
+GROUP BY c1, c2;
+c1	c2	count(c3)
+2012-03-01 01:00:00	2	1
+2012-03-01 01:00:00	3	1
+2012-03-01 02:00:00	3	1
+
+EXECUTE s1;
+c1	c2	count(c3)
+2012-03-01 01:00:00	2	1
+2012-03-01 01:00:00	3	1
+2012-03-01 02:00:00	3	1
+DEALLOCATE PREPARE s1;
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index d9cb2d99020..2dd89d0e4bb 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -442,9 +442,11 @@ show global variables like "query_cache_min_res_unit";
 Variable_name	Value
 query_cache_min_res_unit	4096
 set GLOBAL query_cache_min_res_unit=1001;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_min_res_unit value: '1001'
 show global variables like "query_cache_min_res_unit";
 Variable_name	Value
-query_cache_min_res_unit	1008
+query_cache_min_res_unit	1000
 create table t1 (a int not null);
 insert into t1 values (1),(2),(3);
 create table t2 (a int not null);
diff --git a/mysql-test/r/read_only.result b/mysql-test/r/read_only.result
index fead8c2b82b..1ffe2b86f70 100644
--- a/mysql-test/r/read_only.result
+++ b/mysql-test/r/read_only.result
@@ -75,18 +75,16 @@ connection default;
 set global read_only=1;
 ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
 unlock tables ;
-send set global read_only=1;
 set global read_only=1;
-connection con1;
-select @@global.read_only;
-@@global.read_only
-0
-unlock tables ;
 select @@global.read_only;
 @@global.read_only
 1
+connection con1;
+select @@global.read_only;
+@@global.read_only
+1
+unlock tables ;
 connection default;
-reap;
 connection default;
 set global read_only=0;
 BEGIN;
diff --git a/mysql-test/r/read_only_innodb.result b/mysql-test/r/read_only_innodb.result
index 45005b41da8..1e041395d3c 100644
--- a/mysql-test/r/read_only_innodb.result
+++ b/mysql-test/r/read_only_innodb.result
@@ -43,6 +43,15 @@ a
 1
 COMMIT;
 UNLOCK TABLES;
+connection con1;
+lock table t1 read;
+connection default;
+set global read_only=1;
+connection con1;
+unlock tables;
+connection default;
+SET GLOBAL read_only=0;
+UNLOCK TABLES;
 DROP TABLE t1;
 DROP USER test@localhost;
 echo End of 5.1 tests 
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 3533001ccec..30d5ca00bc0 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -5291,3 +5291,15 @@ DROP TABLE t1;
 DROP VIEW view_t1;
 # End of test  BUG#63020
 SET optimizer_switch=@save_optimizer_switch;
+#
+# LP bug#994275 Assertion `real->type() == Item::FIELD_ITEM' failed
+# in add_not_null_conds(JOIN*) with JOIN, ZEROFILL column, PK
+#
+CREATE TABLE t1 ( a INT(6) ZEROFILL );
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 ( b INT PRIMARY KEY );
+INSERT INTO t2 VALUES (3),(4);
+SELECT * FROM t1, t2 WHERE a=3 AND a=b;
+a	b
+drop table t1,t2;
+End of 5.3 tests
diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result
index a5416eb6718..a9c74afdd9c 100644
--- a/mysql-test/r/select_jcl6.result
+++ b/mysql-test/r/select_jcl6.result
@@ -5302,6 +5302,18 @@ DROP TABLE t1;
 DROP VIEW view_t1;
 # End of test  BUG#63020
 SET optimizer_switch=@save_optimizer_switch;
+#
+# LP bug#994275 Assertion `real->type() == Item::FIELD_ITEM' failed
+# in add_not_null_conds(JOIN*) with JOIN, ZEROFILL column, PK
+#
+CREATE TABLE t1 ( a INT(6) ZEROFILL );
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 ( b INT PRIMARY KEY );
+INSERT INTO t2 VALUES (3),(4);
+SELECT * FROM t1, t2 WHERE a=3 AND a=b;
+a	b
+drop table t1,t2;
+End of 5.3 tests
 set join_cache_level=default;
 show variables like 'join_cache_level';
 Variable_name	Value
diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result
index 3533001ccec..30d5ca00bc0 100644
--- a/mysql-test/r/select_pkeycache.result
+++ b/mysql-test/r/select_pkeycache.result
@@ -5291,3 +5291,15 @@ DROP TABLE t1;
 DROP VIEW view_t1;
 # End of test  BUG#63020
 SET optimizer_switch=@save_optimizer_switch;
+#
+# LP bug#994275 Assertion `real->type() == Item::FIELD_ITEM' failed
+# in add_not_null_conds(JOIN*) with JOIN, ZEROFILL column, PK
+#
+CREATE TABLE t1 ( a INT(6) ZEROFILL );
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 ( b INT PRIMARY KEY );
+INSERT INTO t2 VALUES (3),(4);
+SELECT * FROM t1, t2 WHERE a=3 AND a=b;
+a	b
+drop table t1,t2;
+End of 5.3 tests
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index d52318c6c5b..05f9000bb33 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -7807,3 +7807,45 @@ Warnings:
 Error	1424	Recursive stored functions and triggers are not allowed.
 Error	1305	FUNCTION test.f1 does not exist
 DROP FUNCTION f1;
+# ------------------------------------------------------------------
+# -- End of 5.1 tests
+# ------------------------------------------------------------------
+#
+# LP bug#993459 Execution of PS for a query with GROUP BY
+# returns wrong result (see also mysql bug#13805127)
+#
+CREATE PROCEDURE p1(x INT UNSIGNED)
+BEGIN
+SELECT c1, t2.c2, count(c3)
+FROM
+(
+SELECT 3 as c2 FROM dual WHERE x = 1
+UNION
+SELECT 2       FROM dual WHERE x = 1 OR x = 2
+) AS t1,
+(
+SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+UNION
+SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+UNION
+SELECT '2012-03-01 01:00:00',       2,       1       FROM dual
+) AS t2
+WHERE t2.c2 = t1.c2
+GROUP BY c1, c2
+;
+END|
+
+CALL p1(1);
+c1	c2	count(c3)
+2012-03-01 01:00:00	2	1
+2012-03-01 01:00:00	3	1
+2012-03-01 02:00:00	3	1
+CALL p1(2);
+c1	c2	count(c3)
+2012-03-01 01:00:00	2	1
+CALL p1(1);
+c1	c2	count(c3)
+2012-03-01 01:00:00	2	1
+2012-03-01 01:00:00	3	1
+2012-03-01 02:00:00	3	1
+DROP PROCEDURE p1;
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 29b8c41e515..235d211840f 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -1320,7 +1320,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 INSERT INTO t1 (pseudo) VALUES ('test1');
@@ -1330,7 +1330,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 drop table t1;
@@ -3100,7 +3100,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	1	
 1	PRIMARY	r	eq_ref	PRIMARY	PRIMARY	4	const	1	Using where
-2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition
+2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using where
 SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r
 ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
             ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10;
@@ -4585,7 +4585,7 @@ SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
 FROM t1 
 WHERE a = 230;
 MAX(b)	(SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
-NULL	0
+NULL	NULL
 DROP TABLE t1, st1, st2;
 #
 # Bug #48709: Assertion failed in sql_select.cc:11782: 
@@ -5597,6 +5597,15 @@ SELECT 1 FROM
 ERROR 21000: Operand should contain 1 column(s)
 DROP TABLE t1;
 #
+# Bug#13721076 CRASH WITH TIME TYPE/TIMESTAMP() AND WARNINGS IN SUBQUERY
+#
+CREATE TABLE t1(a TIME NOT NULL);
+INSERT INTO t1 VALUES ('00:00:32');
+SELECT 1 FROM t1 WHERE a >
+(SELECT timestamp(a) AS a FROM t1);
+1
+DROP TABLE t1;
+#
 # No BUG#, a case brought from 5.2's innodb_mysql_lock.test
 #
 create table t1 (i int  not null primary key);
@@ -5716,7 +5725,7 @@ WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
 SELECT b FROM t1
 WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
@@ -6521,5 +6530,64 @@ INSERT INTO t1 VALUES (1);
 SELECT a FROM t1 WHERE ( SELECT MIN(a) = 100 );
 a
 drop table t1;
+#
+# LP BUG#985667 Wrong result with subquery in SELECT clause, and constant table in 
+# main query and implicit grouping
+#
+CREATE TABLE t1 (f1 int) engine=MyISAM;
+INSERT INTO t1 VALUES (7),(8);
+CREATE TABLE t2 (f2 int, f3 varchar(1)) engine=MyISAM;
+INSERT INTO t2 VALUES (3,'f');
+EXPLAIN
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	NULL
+EXPLAIN
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+EXPLAIN
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	1
+EXPLAIN
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+drop table t1,t2;
+#
+# LP BUG#1002079 Server crashes in Item_singlerow_subselect::val_int with constant table,
+# HAVING, UNION in subquery
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (7),(0);
+CREATE TABLE t2 (b INT);
+EXPLAIN
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+f1	f2
+drop table t1,t2;
 # return optimizer switch changed in the beginning of this test
 set optimizer_switch=@subselect_tmp;
diff --git a/mysql-test/r/subselect4.result b/mysql-test/r/subselect4.result
index 82360f9fe9f..617d2e9e592 100644
--- a/mysql-test/r/subselect4.result
+++ b/mysql-test/r/subselect4.result
@@ -649,7 +649,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2) as not_in;
 not_in
 NULL
@@ -671,7 +671,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2) as not_in;
 not_in
 NULL
@@ -679,7 +679,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) > 7) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) > 7) as not_in;
 not_in
 1
@@ -687,7 +687,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) is null) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) is null) as not_in;
 not_in
 NULL
@@ -695,7 +695,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2) as not_in;
 not_in
 NULL
@@ -703,7 +703,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2) as not_in;
 not_in
 NULL
@@ -719,28 +719,28 @@ EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4) FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4) FROM t2);
 f1	f2
 EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3+f4, min(f4) FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3+f4, min(f4) FROM t2);
 f1	f2
 EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4)+max(f4) FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4)+max(f4) FROM t2);
 f1	f2
 EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2) as not_in;
 not_in
 NULL
@@ -748,21 +748,21 @@ EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, count(f4) FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, count(f4) FROM t2);
 f1	f2
 EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, f3 + count(f4) FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, f3 + count(f4) FROM t2);
 f1	f2
 EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2) as not_in;
 not_in
 NULL
@@ -770,7 +770,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) > 7) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) > 7) as not_in;
 not_in
 1
@@ -778,7 +778,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) is null) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) is null) as not_in;
 not_in
 NULL
@@ -786,7 +786,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2) as not_in;
 not_in
 NULL
@@ -794,7 +794,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2) as not_in;
 not_in
 NULL
@@ -835,7 +835,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10) as not_in;
 not_in
 NULL
@@ -857,7 +857,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10) as not_in;
 not_in
 NULL
@@ -865,7 +865,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) > 7) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) > 7) as not_in;
 not_in
 1
@@ -873,7 +873,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) is null) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) is null) as not_in;
 not_in
 NULL
@@ -881,7 +881,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2 WHERE f3 > 10) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2 WHERE f3 > 10) as not_in;
 not_in
 NULL
@@ -889,7 +889,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2 WHERE f3 > 10) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2 WHERE f3 > 10) as not_in;
 not_in
 NULL
@@ -905,28 +905,28 @@ EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10);
 f1	f2
 EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3+f4, min(f4) FROM t2 WHERE f3 > 10);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3+f4, min(f4) FROM t2 WHERE f3 > 10);
 f1	f2
 EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4)+max(f4) FROM t2 WHERE f3 > 10);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4)+max(f4) FROM t2 WHERE f3 > 10);
 f1	f2
 EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10) as not_in;
 not_in
 NULL
@@ -934,21 +934,21 @@ EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10);
 f1	f2
 EXPLAIN
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, f3 + count(f4) FROM t2 WHERE f3 > 10);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, f3 + count(f4) FROM t2 WHERE f3 > 10);
 f1	f2
 EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10) as not_in;
 not_in
 NULL
@@ -956,7 +956,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) > 7) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) > 7) as not_in;
 not_in
 1
@@ -964,7 +964,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) is null) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) is null) as not_in;
 not_in
 NULL
@@ -972,7 +972,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2 WHERE f3 > 10) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2 WHERE f3 > 10) as not_in;
 not_in
 NULL
@@ -980,7 +980,7 @@ EXPLAIN
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2 WHERE f3 > 10) as not_in;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
+2	SUBQUERY	t2	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Rowid-ordered scan
 SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2 WHERE f3 > 10) as not_in;
 not_in
 NULL
@@ -1233,7 +1233,7 @@ EXPLAIN
 SELECT i FROM t1 WHERE (1) NOT IN (SELECT i FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	t2	index_subquery	k	k	5	const	2	Using index
+2	SUBQUERY	t2	index_subquery	k	k	5	const	2	Using index
 DROP TABLE t2;
 DROP TABLE t1;
 #
@@ -1252,7 +1252,7 @@ GROUP BY f9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	1	
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
-3	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+3	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
 SELECT COUNT(t2.f3),
 (SELECT COUNT(f3) FROM t1 WHERE t2.f1) AS f9
@@ -1269,7 +1269,7 @@ ORDER BY f9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	1	
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
-3	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+3	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
 SELECT COUNT(t2.f3),
 (SELECT COUNT(f3) FROM t1 WHERE t2.f1) AS f9
@@ -1287,7 +1287,7 @@ GROUP BY f9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	1	
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-3	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+3	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
 SELECT COUNT(t2.f3),
 (SELECT t2.f1 FROM t1 limit 1) AS f9
@@ -1304,7 +1304,7 @@ ORDER BY f9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	1	
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-3	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+3	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
 SELECT COUNT(t2.f3),
 (SELECT t2.f1 FROM t1 limit 1) AS f9
@@ -1387,7 +1387,7 @@ EXPLAIN
 SELECT 'bug' FROM DUAL WHERE ( 5 ) IN ( SELECT * FROM v1 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
@@ -1397,7 +1397,7 @@ EXPLAIN
 SELECT ( 5 ) IN ( SELECT * FROM v1 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
@@ -1408,7 +1408,7 @@ EXPLAIN
 SELECT 'bug' FROM DUAL WHERE ( 5 ) IN (SELECT * FROM v2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
 3	DERIVED	t1	system	NULL	NULL	NULL	NULL	1	
 4	UNION	t2	system	NULL	NULL	NULL	NULL	1	
 NULL	UNION RESULT	<union3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
@@ -1428,7 +1428,7 @@ EXPLAIN
 SELECT ( 5 ) IN ( SELECT * FROM v2 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
 3	DERIVED	t1	system	NULL	NULL	NULL	NULL	1	
 4	UNION	t2	system	NULL	NULL	NULL	NULL	1	
 NULL	UNION RESULT	<union3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
@@ -1440,7 +1440,7 @@ EXPLAIN
 SELECT 'bug' FROM DUAL WHERE ( 5 ) IN ( SELECT * FROM v1 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
@@ -1450,7 +1450,7 @@ EXPLAIN
 SELECT ( 5 ) IN ( SELECT * FROM v1 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
@@ -1461,7 +1461,7 @@ EXPLAIN
 SELECT 'bug' FROM DUAL WHERE ( 5 ) IN (SELECT * FROM v2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
 3	DERIVED	t1	system	NULL	NULL	NULL	NULL	1	
 4	UNION	t2	system	NULL	NULL	NULL	NULL	1	
 NULL	UNION RESULT	<union3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
@@ -1471,7 +1471,7 @@ EXPLAIN
 SELECT 'bug' FROM t3 WHERE ( 5 ) IN (SELECT * FROM v2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t3	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
 3	DERIVED	t1	system	NULL	NULL	NULL	NULL	1	
 4	UNION	t2	system	NULL	NULL	NULL	NULL	1	
 NULL	UNION RESULT	<union3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
@@ -1481,7 +1481,7 @@ EXPLAIN
 SELECT ( 5 ) IN ( SELECT * FROM v2 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using where
 3	DERIVED	t1	system	NULL	NULL	NULL	NULL	1	
 4	UNION	t2	system	NULL	NULL	NULL	NULL	1	
 NULL	UNION RESULT	<union3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
@@ -1632,8 +1632,8 @@ EXPLAIN
 SELECT * FROM t1 WHERE ( 6 ) NOT IN ( SELECT t2.f3 FROM t2 JOIN t3 ON t3.f10 = t2.f10);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-2	DEPENDENT SUBQUERY	t3	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	t2	ref_or_null	f10	f10	10	const,const	2	Using where; Using index
+2	SUBQUERY	t3	system	NULL	NULL	NULL	NULL	1	
+2	SUBQUERY	t2	ref_or_null	f10	f10	10	const,const	2	Using where; Using index
 SELECT * FROM t1 WHERE ( 6 ) NOT IN ( SELECT t2.f3 FROM t2 JOIN t3 ON t3.f10 = t2.f10);
 f4
 drop table t1,t2,t3;
@@ -2014,6 +2014,21 @@ ERROR 21000: Subquery returns more than 1 row
 DROP TABLE t2;
 ERROR 42S02: Unknown table 't2'
 DROP TABLE t1;
+#
+# LP BUG#1000649 EXPLAIN shows incorrectly a non-correlated constant IN subquery is correlated
+#
+create table ten (a int);
+insert into ten values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1 (a int, b int, c int);
+insert into t1 select a,a,a from ten;
+create table five (a int, b int, c int);
+insert into five select a,a,a from ten limit 5;
+set @@optimizer_switch='semijoin=on,in_to_exists=on,materialization=off';
+explain select * from t1 where 33 in (select b from five) or c > 11;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	10	Using where
+2	SUBQUERY	five	ALL	NULL	NULL	NULL	NULL	5	Using where
+drop table ten, t1, five;
 set optimizer_switch=@subselect4_tmp;
 SET optimizer_switch= @@global.optimizer_switch;
 set @@tmp_table_size= @@global.tmp_table_size;
diff --git a/mysql-test/r/subselect_innodb.result b/mysql-test/r/subselect_innodb.result
index 60faea8853f..5ee56b25fee 100644
--- a/mysql-test/r/subselect_innodb.result
+++ b/mysql-test/r/subselect_innodb.result
@@ -259,6 +259,66 @@ Warnings:
 Warning	1292	Incorrect datetime value: '0'
 DROP TABLE t1;
 #
+# Bug #11766300  59387: FAILING ASSERTION: CURSOR->POS_STATE == 1997660512 (BTR_PCUR_IS_POSITIONE
+#
+CREATE TABLE t1 (a INT) ENGINE=INNODB;
+INSERT INTO t1 VALUES (0);
+CREATE TABLE t2 (d BINARY(2), PRIMARY KEY (d(1)), UNIQUE KEY (d)) ENGINE=INNODB;
+SELECT 1 FROM t1 WHERE NOT EXISTS
+(SELECT 1 FROM t2 WHERE d = (SELECT d FROM t2 WHERE a >= 1) ORDER BY d);
+1
+1
+EXPLAIN SELECT 1 FROM t1 WHERE NOT EXISTS
+(SELECT 1 FROM t2 WHERE d = (SELECT d FROM t2 WHERE a >= 1) ORDER BY d);
+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	eq_ref	PRIMARY,d	d	2	func	1	Using where
+3	DEPENDENT SUBQUERY	t2	index	NULL	d	2	NULL	1	Using where; Using index
+DROP TABLE t2;
+CREATE TABLE t2 (b INT, c INT, UNIQUE KEY (b), UNIQUE KEY (b, c )) ENGINE=INNODB;
+INSERT INTO t2 VALUES (1, 1);
+SELECT 1 FROM t1
+WHERE a != (SELECT 1 FROM t2 WHERE a <=> b OR a > '' AND 6 = 7 ORDER BY b, c);
+1
+DROP TABLE t1, t2;
+#
+# Bug #13639204 64111: CRASH ON SELECT SUBQUERY WITH NON UNIQUE
+# INDEX
+#
+CREATE TABLE t1 (
+id int
+) ENGINE=InnoDB;
+INSERT INTO t1 (id) VALUES (11);
+CREATE TABLE t2 (
+t1_id int,
+position int,
+KEY t1_id (t1_id),
+KEY t1_id_position (t1_id,position)
+) ENGINE=InnoDB;
+EXPLAIN SELECT
+(SELECT position FROM t2
+WHERE t2.t1_id = t1.id
+ORDER BY t2.t1_id , t2.position
+LIMIT 10,1
+) AS maxkey
+FROM t1
+LIMIT 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	1	
+2	DEPENDENT SUBQUERY	t2	ref	t1_id,t1_id_position	t1_id_position	5	test.t1.id	1	Using where; Using index
+SELECT
+(SELECT position FROM t2
+WHERE t2.t1_id = t1.id
+ORDER BY t2.t1_id , t2.position
+LIMIT 10,1
+) AS maxkey
+FROM t1
+LIMIT 1;
+maxkey
+NULL
+DROP TABLE t1,t2;
+End of 5.1 tests
+#
 # lp:827416 Crash in select_describe() on EXPLAIN with DISTINCT in nested subqueries
 #
 CREATE TABLE t3 ( b int) ENGINE=InnoDB;
@@ -316,4 +376,19 @@ GROUP BY 1
 MAX( f1 )
 NULL
 drop table t1, t2, t3;
+#
+# LP BUG#1006231 crash in select_describe
+#
+create table t1(a1 int) ENGINE=InnoDB;
+insert into t1 values (1);
+explain
+select 1 from t1 where 1 like (select 1 from t1 where 1 <=> (select 1 from t1 group by a1));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	1	
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	1	
+3	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	1	Using temporary; Using filesort
+select 1 from t1 where 1 like (select 1 from t1 where 1 <=> (select 1 from t1 group by a1));
+1
+1
+drop table t1;
 set optimizer_switch=@subselect_innodb_tmp;
diff --git a/mysql-test/r/subselect_mat.result b/mysql-test/r/subselect_mat.result
index 86442df1e8b..78472e99326 100644
--- a/mysql-test/r/subselect_mat.result
+++ b/mysql-test/r/subselect_mat.result
@@ -1163,7 +1163,7 @@ set @@optimizer_switch='materialization=off,in_to_exists=on';
 explain select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1);
 min(a1)
 NULL
@@ -1182,7 +1182,7 @@ set @@optimizer_switch='materialization=off,in_to_exists=on';
 explain select min(a1) from t1 where 7 in (select b1 from t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 select min(a1) from t1 where 7 in (select b1 from t2);
 min(a1)
 NULL
@@ -1190,7 +1190,7 @@ NULL
 explain select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4;
 min(a1)
 NULL
@@ -1986,6 +1986,19 @@ y
 z
 DROP VIEW v2;
 DROP TABLE t1, t2;
+#
+# BUG#1000269: Wrong result (extra rows) with semijoin+materialization, IN subqueries, join_cache_level>0
+#
+CREATE TABLE t1 (a1 VARCHAR(1), a2 VARCHAR(1)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('b','b'),('e','e');
+CREATE TABLE t2 (b1 VARCHAR(1), b2 VARCHAR(1), KEY(b1)) ENGINE=MyISAM;
+INSERT INTO t2 VALUES ('v','v'),('s','s'),('l','l'), ('y','y'),('c','c'),('i','i');
+SELECT * FROM t1, t2 WHERE b1 IN ( SELECT b2 FROM t2 WHERE b1 > 'o' ) AND ( b1 < 'l' OR a1 IN ('b','c') );
+a1	a2	b1	b2
+b	b	v	v
+b	b	s	s
+b	b	y	y
+DROP TABLE t1,t2;
 # This must be at the end:
 set optimizer_switch=@subselect_sj_mat_tmp;
 set join_cache_level=@save_join_cache_level;
@@ -2234,7 +2247,7 @@ EXPLAIN EXTENDED
 SELECT MAX(t1.b) AS max_res FROM t1 WHERE (9) IN (SELECT a FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	index	NULL	b	5	NULL	2	100.00	Using index
-2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+2	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 Warnings:
 Note	1003	select max(`test`.`t1`.`b`) AS `max_res` from `test`.`t1` where <expr_cache><9>(<in_optimizer>(9,<exists>(select `test`.`t2`.`a` from `test`.`t2` where (9 = `test`.`t2`.`a`))))
 DROP TABLE t1,t2;
diff --git a/mysql-test/r/subselect_mat_cost_bugs.result b/mysql-test/r/subselect_mat_cost_bugs.result
index 96f904c722c..ca4aa57417e 100644
--- a/mysql-test/r/subselect_mat_cost_bugs.result
+++ b/mysql-test/r/subselect_mat_cost_bugs.result
@@ -124,7 +124,7 @@ FROM t3 RIGHT JOIN t1 ON t1.pk = t3.f1
 WHERE t3.f3 OR ( 3 ) IN ( SELECT f2 FROM t2 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 SELECT t1.*
 FROM t3 RIGHT JOIN t1 ON t1.pk = t3.f1
 WHERE t3.f3 OR ( 3 ) IN ( SELECT f2 FROM t2 );
diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result
index e8086b53ead..b08148f8057 100644
--- a/mysql-test/r/subselect_no_mat.result
+++ b/mysql-test/r/subselect_no_mat.result
@@ -1327,7 +1327,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 INSERT INTO t1 (pseudo) VALUES ('test1');
@@ -1337,7 +1337,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 drop table t1;
@@ -3106,7 +3106,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	1	
 1	PRIMARY	r	eq_ref	PRIMARY	PRIMARY	4	const	1	Using where
-2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition
+2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using where
 SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r
 ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
             ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10;
@@ -4529,13 +4529,13 @@ SET join_cache_level=0;
 EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 GROUP BY a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary
 Warnings:
 Note	1003	select 1 AS `1` from `test`.`t1` where <expr_cache><1>(<in_optimizer>(1,<exists>(select min(`test`.`t1`.`a`) from `test`.`t1` group by `test`.`t1`.`a` having (1 = <ref_null_helper>(min(`test`.`t1`.`a`))))))
 EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 WHERE a > 3 GROUP BY a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where; Using temporary
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where; Using temporary
 Warnings:
 Note	1003	select 1 AS `1` from `test`.`t1` where <expr_cache><1>(<in_optimizer>(1,<exists>(select min(`test`.`t1`.`a`) from `test`.`t1` where (`test`.`t1`.`a` > 3) group by `test`.`t1`.`a` having (1 = <ref_null_helper>(min(`test`.`t1`.`a`))))))
 SET join_cache_level=@save_join_cache_level;
@@ -4587,7 +4587,7 @@ SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
 FROM t1 
 WHERE a = 230;
 MAX(b)	(SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
-NULL	0
+NULL	NULL
 DROP TABLE t1, st1, st2;
 #
 # Bug #48709: Assertion failed in sql_select.cc:11782: 
@@ -5599,6 +5599,15 @@ SELECT 1 FROM
 ERROR 21000: Operand should contain 1 column(s)
 DROP TABLE t1;
 #
+# Bug#13721076 CRASH WITH TIME TYPE/TIMESTAMP() AND WARNINGS IN SUBQUERY
+#
+CREATE TABLE t1(a TIME NOT NULL);
+INSERT INTO t1 VALUES ('00:00:32');
+SELECT 1 FROM t1 WHERE a >
+(SELECT timestamp(a) AS a FROM t1);
+1
+DROP TABLE t1;
+#
 # No BUG#, a case brought from 5.2's innodb_mysql_lock.test
 #
 create table t1 (i int  not null primary key);
@@ -5717,7 +5726,7 @@ WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
 SELECT b FROM t1
 WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
@@ -6520,6 +6529,65 @@ INSERT INTO t1 VALUES (1);
 SELECT a FROM t1 WHERE ( SELECT MIN(a) = 100 );
 a
 drop table t1;
+#
+# LP BUG#985667 Wrong result with subquery in SELECT clause, and constant table in 
+# main query and implicit grouping
+#
+CREATE TABLE t1 (f1 int) engine=MyISAM;
+INSERT INTO t1 VALUES (7),(8);
+CREATE TABLE t2 (f2 int, f3 varchar(1)) engine=MyISAM;
+INSERT INTO t2 VALUES (3,'f');
+EXPLAIN
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	NULL
+EXPLAIN
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+EXPLAIN
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	1
+EXPLAIN
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+drop table t1,t2;
+#
+# LP BUG#1002079 Server crashes in Item_singlerow_subselect::val_int with constant table,
+# HAVING, UNION in subquery
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (7),(0);
+CREATE TABLE t2 (b INT);
+EXPLAIN
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+f1	f2
+drop table t1,t2;
 # return optimizer switch changed in the beginning of this test
 set optimizer_switch=@subselect_tmp;
 set optimizer_switch=default;
diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
index 12b1e45c92c..36d03d8db77 100644
--- a/mysql-test/r/subselect_no_opts.result
+++ b/mysql-test/r/subselect_no_opts.result
@@ -1323,7 +1323,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 INSERT INTO t1 (pseudo) VALUES ('test1');
@@ -1333,7 +1333,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 drop table t1;
@@ -3102,7 +3102,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	1	
 1	PRIMARY	r	eq_ref	PRIMARY	PRIMARY	4	const	1	Using where
-2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition
+2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using where
 SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r
 ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
             ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10;
@@ -4525,13 +4525,13 @@ SET join_cache_level=0;
 EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 GROUP BY a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary
 Warnings:
 Note	1003	select 1 AS `1` from `test`.`t1` where <in_optimizer>(1,<exists>(select min(`test`.`t1`.`a`) from `test`.`t1` group by `test`.`t1`.`a` having (1 = <ref_null_helper>(min(`test`.`t1`.`a`)))))
 EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 WHERE a > 3 GROUP BY a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where; Using temporary
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where; Using temporary
 Warnings:
 Note	1003	select 1 AS `1` from `test`.`t1` where <in_optimizer>(1,<exists>(select min(`test`.`t1`.`a`) from `test`.`t1` where (`test`.`t1`.`a` > 3) group by `test`.`t1`.`a` having (1 = <ref_null_helper>(min(`test`.`t1`.`a`)))))
 SET join_cache_level=@save_join_cache_level;
@@ -4583,7 +4583,7 @@ SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
 FROM t1 
 WHERE a = 230;
 MAX(b)	(SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
-NULL	0
+NULL	NULL
 DROP TABLE t1, st1, st2;
 #
 # Bug #48709: Assertion failed in sql_select.cc:11782: 
@@ -5595,6 +5595,15 @@ SELECT 1 FROM
 ERROR 21000: Operand should contain 1 column(s)
 DROP TABLE t1;
 #
+# Bug#13721076 CRASH WITH TIME TYPE/TIMESTAMP() AND WARNINGS IN SUBQUERY
+#
+CREATE TABLE t1(a TIME NOT NULL);
+INSERT INTO t1 VALUES ('00:00:32');
+SELECT 1 FROM t1 WHERE a >
+(SELECT timestamp(a) AS a FROM t1);
+1
+DROP TABLE t1;
+#
 # No BUG#, a case brought from 5.2's innodb_mysql_lock.test
 #
 create table t1 (i int  not null primary key);
@@ -5713,7 +5722,7 @@ WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
 SELECT b FROM t1
 WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
@@ -6516,6 +6525,65 @@ INSERT INTO t1 VALUES (1);
 SELECT a FROM t1 WHERE ( SELECT MIN(a) = 100 );
 a
 drop table t1;
+#
+# LP BUG#985667 Wrong result with subquery in SELECT clause, and constant table in 
+# main query and implicit grouping
+#
+CREATE TABLE t1 (f1 int) engine=MyISAM;
+INSERT INTO t1 VALUES (7),(8);
+CREATE TABLE t2 (f2 int, f3 varchar(1)) engine=MyISAM;
+INSERT INTO t2 VALUES (3,'f');
+EXPLAIN
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	NULL
+EXPLAIN
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+EXPLAIN
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	1
+EXPLAIN
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+drop table t1,t2;
+#
+# LP BUG#1002079 Server crashes in Item_singlerow_subselect::val_int with constant table,
+# HAVING, UNION in subquery
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (7),(0);
+CREATE TABLE t2 (b INT);
+EXPLAIN
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+f1	f2
+drop table t1,t2;
 # return optimizer switch changed in the beginning of this test
 set optimizer_switch=@subselect_tmp;
 set @optimizer_switch_for_subselect_test=null;
diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result
index b9a4f9b23a9..7fcacfda470 100644
--- a/mysql-test/r/subselect_no_scache.result
+++ b/mysql-test/r/subselect_no_scache.result
@@ -1326,7 +1326,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 INSERT INTO t1 (pseudo) VALUES ('test1');
@@ -1336,7 +1336,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 drop table t1;
@@ -3106,7 +3106,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	1	
 1	PRIMARY	r	eq_ref	PRIMARY	PRIMARY	4	const	1	Using where
-2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition
+2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using where
 SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r
 ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
             ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10;
@@ -4591,7 +4591,7 @@ SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
 FROM t1 
 WHERE a = 230;
 MAX(b)	(SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
-NULL	0
+NULL	NULL
 DROP TABLE t1, st1, st2;
 #
 # Bug #48709: Assertion failed in sql_select.cc:11782: 
@@ -5603,6 +5603,15 @@ SELECT 1 FROM
 ERROR 21000: Operand should contain 1 column(s)
 DROP TABLE t1;
 #
+# Bug#13721076 CRASH WITH TIME TYPE/TIMESTAMP() AND WARNINGS IN SUBQUERY
+#
+CREATE TABLE t1(a TIME NOT NULL);
+INSERT INTO t1 VALUES ('00:00:32');
+SELECT 1 FROM t1 WHERE a >
+(SELECT timestamp(a) AS a FROM t1);
+1
+DROP TABLE t1;
+#
 # No BUG#, a case brought from 5.2's innodb_mysql_lock.test
 #
 create table t1 (i int  not null primary key);
@@ -5722,7 +5731,7 @@ WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
 SELECT b FROM t1
 WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
@@ -6527,6 +6536,65 @@ INSERT INTO t1 VALUES (1);
 SELECT a FROM t1 WHERE ( SELECT MIN(a) = 100 );
 a
 drop table t1;
+#
+# LP BUG#985667 Wrong result with subquery in SELECT clause, and constant table in 
+# main query and implicit grouping
+#
+CREATE TABLE t1 (f1 int) engine=MyISAM;
+INSERT INTO t1 VALUES (7),(8);
+CREATE TABLE t2 (f2 int, f3 varchar(1)) engine=MyISAM;
+INSERT INTO t2 VALUES (3,'f');
+EXPLAIN
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	NULL
+EXPLAIN
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+EXPLAIN
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	1
+EXPLAIN
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+drop table t1,t2;
+#
+# LP BUG#1002079 Server crashes in Item_singlerow_subselect::val_int with constant table,
+# HAVING, UNION in subquery
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (7),(0);
+CREATE TABLE t2 (b INT);
+EXPLAIN
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+f1	f2
+drop table t1,t2;
 # return optimizer switch changed in the beginning of this test
 set optimizer_switch=@subselect_tmp;
 set optimizer_switch=default;
diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
index ad6d61e9ec9..405261c9ec6 100644
--- a/mysql-test/r/subselect_no_semijoin.result
+++ b/mysql-test/r/subselect_no_semijoin.result
@@ -1323,7 +1323,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 INSERT INTO t1 (pseudo) VALUES ('test1');
@@ -1333,7 +1333,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a);
 EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1003	select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 drop table t1;
@@ -3102,7 +3102,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	1	
 1	PRIMARY	r	eq_ref	PRIMARY	PRIMARY	4	const	1	Using where
-2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition
+2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using where
 SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r
 ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
             ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10;
@@ -4583,7 +4583,7 @@ SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
 FROM t1 
 WHERE a = 230;
 MAX(b)	(SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b)
-NULL	0
+NULL	NULL
 DROP TABLE t1, st1, st2;
 #
 # Bug #48709: Assertion failed in sql_select.cc:11782: 
@@ -5595,6 +5595,15 @@ SELECT 1 FROM
 ERROR 21000: Operand should contain 1 column(s)
 DROP TABLE t1;
 #
+# Bug#13721076 CRASH WITH TIME TYPE/TIMESTAMP() AND WARNINGS IN SUBQUERY
+#
+CREATE TABLE t1(a TIME NOT NULL);
+INSERT INTO t1 VALUES ('00:00:32');
+SELECT 1 FROM t1 WHERE a >
+(SELECT timestamp(a) AS a FROM t1);
+1
+DROP TABLE t1;
+#
 # No BUG#, a case brought from 5.2's innodb_mysql_lock.test
 #
 create table t1 (i int  not null primary key);
@@ -5713,7 +5722,7 @@ WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
 SELECT b FROM t1
 WHERE ('0') IN ( SELECT a  FROM t1 GROUP BY a )
 GROUP BY b;
@@ -6516,6 +6525,65 @@ INSERT INTO t1 VALUES (1);
 SELECT a FROM t1 WHERE ( SELECT MIN(a) = 100 );
 a
 drop table t1;
+#
+# LP BUG#985667 Wrong result with subquery in SELECT clause, and constant table in 
+# main query and implicit grouping
+#
+CREATE TABLE t1 (f1 int) engine=MyISAM;
+INSERT INTO t1 VALUES (7),(8);
+CREATE TABLE t2 (f2 int, f3 varchar(1)) engine=MyISAM;
+INSERT INTO t2 VALUES (3,'f');
+EXPLAIN
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	NULL
+EXPLAIN
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+EXPLAIN
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	1
+EXPLAIN
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+COUNT(f1)	f4
+0	0
+drop table t1,t2;
+#
+# LP BUG#1002079 Server crashes in Item_singlerow_subselect::val_int with constant table,
+# HAVING, UNION in subquery
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (7),(0);
+CREATE TABLE t2 (b INT);
+EXPLAIN
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+f1	f2
+drop table t1,t2;
 # return optimizer switch changed in the beginning of this test
 set optimizer_switch=@subselect_tmp;
 set @optimizer_switch_for_subselect_test=null;
diff --git a/mysql-test/r/subselect_partial_match.result b/mysql-test/r/subselect_partial_match.result
index 4e37b831326..9dc2b44fd30 100644
--- a/mysql-test/r/subselect_partial_match.result
+++ b/mysql-test/r/subselect_partial_match.result
@@ -879,7 +879,7 @@ EXPLAIN
 SELECT * FROM t1 WHERE (6, 4 ) NOT IN (SELECT b, a FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where
 SELECT * FROM t1 WHERE (6, 4 ) NOT IN (SELECT b, a FROM t2);
 c
 0
@@ -888,7 +888,7 @@ EXPLAIN
 SELECT * FROM t1 WHERE (6, 4 ) NOT IN (SELECT a, b FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where
 SELECT * FROM t1 WHERE (6, 4 ) NOT IN (SELECT a, b FROM t2);
 c
 0
@@ -913,7 +913,7 @@ set @@optimizer_switch='in_to_exists=on,materialization=off';
 EXPLAIN SELECT * FROM t2 WHERE ( 3 , 1 ) NOT IN ( SELECT f1 , f2 FROM t1 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
 SELECT * FROM t2 WHERE ( 3 , 1 ) NOT IN ( SELECT f1 , f2 FROM t1 );
 f3
 5
diff --git a/mysql-test/r/subselect_sj.result b/mysql-test/r/subselect_sj.result
index ca834b21df5..660137affec 100644
--- a/mysql-test/r/subselect_sj.result
+++ b/mysql-test/r/subselect_sj.result
@@ -2671,4 +2671,100 @@ a
 DEALLOCATE PREPARE pstmt;
 DROP VIEW v1;
 DROP TABLE t1, t2;
+#
+# BUG#978479: Wrong result (extra rows) with derived_with_keys+loosescan+semijoin=ON, materialization=OFF
+#
+set @tmp_jcl_978479= @@join_cache_level;
+set join_cache_level=0;
+set @tmp_os_978479= @@optimizer_switch;
+set optimizer_switch = 'derived_with_keys=on,loosescan=on,semijoin=on,materialization=off';
+# Part#1: make sure EXPLAIN is using LooseScan:
+CREATE TABLE t1 ( a INT, b INT );
+INSERT INTO t1 VALUES
+(4,0),(6,8),(3,1),(5,8),(3,9),(2,4),
+(2,6),(9,1),(5,4),(7,7),(5,4);
+CREATE ALGORITHM=TEMPTABLE
+VIEW v1 AS SELECT * FROM t1;
+# This will use LooseScan:
+EXPLAIN
+SELECT * FROM t1 AS t1_1, t1 AS t1_2
+WHERE (t1_1.a, t1_2.a) IN ( SELECT a, b FROM v1 );
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1_1	ALL	NULL	NULL	NULL	NULL	11	Using where
+1	PRIMARY	<derived3>	ref	key0	key0	5	test.t1_1.a	2	Start temporary
+1	PRIMARY	t1_2	ALL	NULL	NULL	NULL	NULL	11	Using where; End temporary
+3	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	11	
+SELECT * FROM t1 AS t1_1, t1 AS t1_2
+WHERE (t1_1.a, t1_2.a) IN ( SELECT a, b FROM v1 );
+a	b	a	b
+3	1	9	1
+5	8	4	0
+3	9	9	1
+2	4	6	8
+2	4	4	0
+2	6	6	8
+2	6	4	0
+5	4	4	0
+7	7	7	7
+5	4	4	0
+DROP VIEW v1;
+DROP TABLE t1;
+set @@join_cache_level= @tmp_jcl_978479;
+set @@optimizer_switch= @tmp_os_978479;
+#
+# BUG#998236: Assertion failure or valgrind errors at best_access_path ...
+#
+CREATE TABLE t1 (a1 VARCHAR(3), a2 VARCHAR(35), KEY(a1,a2)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES
+('USA','Arvada'),('USA','Athens'),('USA','Atlanta'),('USA','Augusta'),
+('USA','Aurora'),('USA','Aurora'),('USA','Austin'),('USA','Bakersfield'),
+('USA','Baltimore'),('USA','Baton'),('USA','Beaumont'),('USA','Bellevue'),
+('USA','Berkeley'),('USA','Billings'),('USA','Birmingham'),('USA','Boise'),
+('USA','Boston'),('USA','Boulder'),('USA','Bridgeport'),('USA','Brockton'),
+('USA','Brownsville'),('USA','Buffalo'),('USA','Burbank'),('USA','Cambridge'),
+('USA','Cape'),('USA','Carrollton'),('USA','Carson'),('USA','Cary'),
+('USA','Cedar'),('USA','Chandler'),('USA','Charleston'),('USA','Charlotte'),
+('USA','Chattanooga'),('USA','Chesapeake'),('USA','Chicago'),('USA','Chula'),
+('USA','Cincinnati'),('USA','Citrus'),('USA','Clarksville'),('USA','Clearwater'),
+('USA','Cleveland'),('USA','Colorado'),('USA','Columbia'),('USA','Columbus'),
+('USA','Columbus'),('USA','Compton'),('USA','Concord'),('USA','Coral'),
+('USA','Corona'),('USA','Corpus'),('USA','Costa'),('USA','Dallas'),('USA','Daly'),
+('USA','Davenport'),('USA','Dayton'),('USA','Denver'),('USA','DesMoines'),
+('USA','Detroit'),('USA','Downey'),('USA','Durham'),('USA','East'),('USA','ElCajon'),
+('USA','ElMonte'),('USA','ElPaso'),('USA','Elgin'),('USA','Elizabeth'),
+('USA','Erie'),('USA','Escondido'),('USA','Eugene'),('USA','Evansville'),
+('USA','Fairfield'),('USA','Fall'),('USA','Fayetteville'),('USA','Flint'),
+('USA','Fontana'),('USA','FortCollins'),('USA','FortLauderdale'),('USA','FortWayne'),
+('USA','FortWorth'),('USA','Fremont'),('USA','Fresno'),('USA','Fullerton'),
+('USA','Gainesville'),('USA','GardenGrove'),('USA','Garland'),('USA','Gary'),
+('USA','Gilbert'),('USA','Glendale'),('USA','Glendale'),('USA','GrandPrairie'),
+('USA','GrandRapids'),('USA','Green Bay'),('USA','Greensboro'),('USA','Hampton'),
+('USA','Hartford'),('USA','Hayward'),('USA','Henderson'),('USA','Hialeah'),
+('USA','Inglewood'),('USA','Livonia');
+CREATE TABLE t3 (c1 VARCHAR(3), c2 VARCHAR(16), PRIMARY KEY (c1,c2)) ENGINE=MyISAM;
+INSERT INTO t3 VALUES ('USA','Chinese'), ('USA','English');
+CREATE TABLE t2 (b1 INT) ENGINE=MyISAM;
+INSERT INTO t2 VALUES (1);
+SELECT alias1.a1 AS field1
+FROM t1 AS alias1, t1 AS alias2
+WHERE alias1.a2 IN ( SELECT a1 FROM t1, t2 )
+AND alias1.a1 IS NULL
+AND ( alias1.a1, alias2.a1 ) IN ( SELECT c1, c1 FROM t3 )
+GROUP BY field1;
+field1
+DROP TABLE t1,t3,t2;
+#
+#  BUG#1002630: Valgrind warnings 'Invalid read' in subselect_engine::calc_const_tables with SELECT
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(7);
+CREATE TABLE t2 (b INT);
+INSERT INTO t2 VALUES (4),(6);
+SELECT ( SELECT SUM(a) FROM t1 ) AS t1sum, b
+FROM t2
+WHERE (1,1) IN ( SELECT MAX(a), MIN(a) FROM t1 )
+GROUP BY b
+HAVING t1sum <> 1;
+t1sum	b
+DROP TABLE t1, t2;
 set optimizer_switch=@subselect_sj_tmp;
diff --git a/mysql-test/r/subselect_sj_jcl6.result b/mysql-test/r/subselect_sj_jcl6.result
index 19f3baac5f2..aa7ad59fda3 100644
--- a/mysql-test/r/subselect_sj_jcl6.result
+++ b/mysql-test/r/subselect_sj_jcl6.result
@@ -2685,6 +2685,102 @@ a
 DEALLOCATE PREPARE pstmt;
 DROP VIEW v1;
 DROP TABLE t1, t2;
+#
+# BUG#978479: Wrong result (extra rows) with derived_with_keys+loosescan+semijoin=ON, materialization=OFF
+#
+set @tmp_jcl_978479= @@join_cache_level;
+set join_cache_level=0;
+set @tmp_os_978479= @@optimizer_switch;
+set optimizer_switch = 'derived_with_keys=on,loosescan=on,semijoin=on,materialization=off';
+# Part#1: make sure EXPLAIN is using LooseScan:
+CREATE TABLE t1 ( a INT, b INT );
+INSERT INTO t1 VALUES
+(4,0),(6,8),(3,1),(5,8),(3,9),(2,4),
+(2,6),(9,1),(5,4),(7,7),(5,4);
+CREATE ALGORITHM=TEMPTABLE
+VIEW v1 AS SELECT * FROM t1;
+# This will use LooseScan:
+EXPLAIN
+SELECT * FROM t1 AS t1_1, t1 AS t1_2
+WHERE (t1_1.a, t1_2.a) IN ( SELECT a, b FROM v1 );
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1_1	ALL	NULL	NULL	NULL	NULL	11	Using where
+1	PRIMARY	<derived3>	ref	key0	key0	5	test.t1_1.a	2	Start temporary
+1	PRIMARY	t1_2	ALL	NULL	NULL	NULL	NULL	11	Using where; End temporary
+3	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	11	
+SELECT * FROM t1 AS t1_1, t1 AS t1_2
+WHERE (t1_1.a, t1_2.a) IN ( SELECT a, b FROM v1 );
+a	b	a	b
+3	1	9	1
+5	8	4	0
+3	9	9	1
+2	4	6	8
+2	4	4	0
+2	6	6	8
+2	6	4	0
+5	4	4	0
+7	7	7	7
+5	4	4	0
+DROP VIEW v1;
+DROP TABLE t1;
+set @@join_cache_level= @tmp_jcl_978479;
+set @@optimizer_switch= @tmp_os_978479;
+#
+# BUG#998236: Assertion failure or valgrind errors at best_access_path ...
+#
+CREATE TABLE t1 (a1 VARCHAR(3), a2 VARCHAR(35), KEY(a1,a2)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES
+('USA','Arvada'),('USA','Athens'),('USA','Atlanta'),('USA','Augusta'),
+('USA','Aurora'),('USA','Aurora'),('USA','Austin'),('USA','Bakersfield'),
+('USA','Baltimore'),('USA','Baton'),('USA','Beaumont'),('USA','Bellevue'),
+('USA','Berkeley'),('USA','Billings'),('USA','Birmingham'),('USA','Boise'),
+('USA','Boston'),('USA','Boulder'),('USA','Bridgeport'),('USA','Brockton'),
+('USA','Brownsville'),('USA','Buffalo'),('USA','Burbank'),('USA','Cambridge'),
+('USA','Cape'),('USA','Carrollton'),('USA','Carson'),('USA','Cary'),
+('USA','Cedar'),('USA','Chandler'),('USA','Charleston'),('USA','Charlotte'),
+('USA','Chattanooga'),('USA','Chesapeake'),('USA','Chicago'),('USA','Chula'),
+('USA','Cincinnati'),('USA','Citrus'),('USA','Clarksville'),('USA','Clearwater'),
+('USA','Cleveland'),('USA','Colorado'),('USA','Columbia'),('USA','Columbus'),
+('USA','Columbus'),('USA','Compton'),('USA','Concord'),('USA','Coral'),
+('USA','Corona'),('USA','Corpus'),('USA','Costa'),('USA','Dallas'),('USA','Daly'),
+('USA','Davenport'),('USA','Dayton'),('USA','Denver'),('USA','DesMoines'),
+('USA','Detroit'),('USA','Downey'),('USA','Durham'),('USA','East'),('USA','ElCajon'),
+('USA','ElMonte'),('USA','ElPaso'),('USA','Elgin'),('USA','Elizabeth'),
+('USA','Erie'),('USA','Escondido'),('USA','Eugene'),('USA','Evansville'),
+('USA','Fairfield'),('USA','Fall'),('USA','Fayetteville'),('USA','Flint'),
+('USA','Fontana'),('USA','FortCollins'),('USA','FortLauderdale'),('USA','FortWayne'),
+('USA','FortWorth'),('USA','Fremont'),('USA','Fresno'),('USA','Fullerton'),
+('USA','Gainesville'),('USA','GardenGrove'),('USA','Garland'),('USA','Gary'),
+('USA','Gilbert'),('USA','Glendale'),('USA','Glendale'),('USA','GrandPrairie'),
+('USA','GrandRapids'),('USA','Green Bay'),('USA','Greensboro'),('USA','Hampton'),
+('USA','Hartford'),('USA','Hayward'),('USA','Henderson'),('USA','Hialeah'),
+('USA','Inglewood'),('USA','Livonia');
+CREATE TABLE t3 (c1 VARCHAR(3), c2 VARCHAR(16), PRIMARY KEY (c1,c2)) ENGINE=MyISAM;
+INSERT INTO t3 VALUES ('USA','Chinese'), ('USA','English');
+CREATE TABLE t2 (b1 INT) ENGINE=MyISAM;
+INSERT INTO t2 VALUES (1);
+SELECT alias1.a1 AS field1
+FROM t1 AS alias1, t1 AS alias2
+WHERE alias1.a2 IN ( SELECT a1 FROM t1, t2 )
+AND alias1.a1 IS NULL
+AND ( alias1.a1, alias2.a1 ) IN ( SELECT c1, c1 FROM t3 )
+GROUP BY field1;
+field1
+DROP TABLE t1,t3,t2;
+#
+#  BUG#1002630: Valgrind warnings 'Invalid read' in subselect_engine::calc_const_tables with SELECT
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(7);
+CREATE TABLE t2 (b INT);
+INSERT INTO t2 VALUES (4),(6);
+SELECT ( SELECT SUM(a) FROM t1 ) AS t1sum, b
+FROM t2
+WHERE (1,1) IN ( SELECT MAX(a), MIN(a) FROM t1 )
+GROUP BY b
+HAVING t1sum <> 1;
+t1sum	b
+DROP TABLE t1, t2;
 set optimizer_switch=@subselect_sj_tmp;
 #
 # BUG#49129: Wrong result with IN-subquery with join_cache_level=6 and firstmatch=off
diff --git a/mysql-test/r/subselect_sj_mat.result b/mysql-test/r/subselect_sj_mat.result
index dc1d9b407fd..e3f73d3993b 100644
--- a/mysql-test/r/subselect_sj_mat.result
+++ b/mysql-test/r/subselect_sj_mat.result
@@ -1198,7 +1198,7 @@ set @@optimizer_switch='materialization=off,in_to_exists=on';
 explain select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1);
 min(a1)
 NULL
@@ -1207,7 +1207,7 @@ set @@optimizer_switch='semijoin=off';
 explain select min(a1) from t1 where 7 in (select b1 from t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 select min(a1) from t1 where 7 in (select b1 from t2);
 min(a1)
 NULL
@@ -1224,7 +1224,7 @@ NULL
 explain select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4;
 min(a1)
 NULL
@@ -2026,6 +2026,19 @@ y
 z
 DROP VIEW v2;
 DROP TABLE t1, t2;
+#
+# BUG#1000269: Wrong result (extra rows) with semijoin+materialization, IN subqueries, join_cache_level>0
+#
+CREATE TABLE t1 (a1 VARCHAR(1), a2 VARCHAR(1)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('b','b'),('e','e');
+CREATE TABLE t2 (b1 VARCHAR(1), b2 VARCHAR(1), KEY(b1)) ENGINE=MyISAM;
+INSERT INTO t2 VALUES ('v','v'),('s','s'),('l','l'), ('y','y'),('c','c'),('i','i');
+SELECT * FROM t1, t2 WHERE b1 IN ( SELECT b2 FROM t2 WHERE b1 > 'o' ) AND ( b1 < 'l' OR a1 IN ('b','c') );
+a1	a2	b1	b2
+b	b	v	v
+b	b	s	s
+b	b	y	y
+DROP TABLE t1,t2;
 # This must be at the end:
 set optimizer_switch=@subselect_sj_mat_tmp;
 set join_cache_level=@save_join_cache_level;
diff --git a/mysql-test/r/table_elim.result b/mysql-test/r/table_elim.result
index 69cd9792299..63b3304641b 100644
--- a/mysql-test/r/table_elim.result
+++ b/mysql-test/r/table_elim.result
@@ -570,6 +570,27 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 #    as that violates the "no interleaving of outer join nests" rule.
 DROP TABLE t1,t2,t3,t4,t5;
 #
+# BUG#997747: Assertion `join->best_read < ((double)1.79..5e+308L)' 
+#             failed in greedy_search with LEFT JOINs and unique keys  
+#
+CREATE TABLE t1 (a1 INT);
+CREATE TABLE t2 (b1 INT);
+CREATE TABLE t3 (c1 INT, UNIQUE KEY(c1));
+CREATE TABLE t4 (d1 INT, UNIQUE KEY(d1));
+CREATE TABLE t5 (e1 INT);
+INSERT INTO t1 VALUES (1),(2);
+INSERT INTO t2 VALUES (2),(3);
+INSERT INTO t3 VALUES (3),(4);
+INSERT INTO t4 VALUES (4),(5);
+INSERT INTO t5 VALUES (5),(6);
+SELECT a1 FROM t1 LEFT JOIN t2 LEFT JOIN t3 LEFT JOIN t4
+ON c1 = d1 ON d1 = b1 ON a1 = b1
+LEFT JOIN t5 ON a1 = e1 ;
+a1
+1
+2
+DROP TABLE t1,t2,t3,t4,t5;
+#
 # BUG#884184: Wrong result with RIGHT JOIN + derived_merge
 #
 CREATE TABLE t1 (a int(11), b varchar(1)) ;
diff --git a/mysql-test/r/type_date.result b/mysql-test/r/type_date.result
index 8d069477f3e..41f590400ea 100644
--- a/mysql-test/r/type_date.result
+++ b/mysql-test/r/type_date.result
@@ -21,6 +21,12 @@ name	cdate	note
 name1	1998-01-01	note01
 name2	1998-01-01	note01
 drop table t1,t2;
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(1);
+SELECT * FROM t1 WHERE LAST_DAY('0000-00-00 00:00:00') IS NULL;
+a
+1
+DROP TABLE t1;
 CREATE TABLE t1 ( datum DATE );
 INSERT INTO t1 VALUES ( "2000-1-1" );
 INSERT INTO t1 VALUES ( "2000-1-2" );
@@ -333,3 +339,17 @@ select @a;
 @a
 0111-01-01
 #
+#
+# BUG LP:1008487 virtual bool Item_cache::is_expensive(): Assertion `example' failed
+#
+create table t1(a date,key(a));
+insert into t1 values ('2012-01-01'),('2012-02-02');
+explain
+select 1 from t1 as t1_0 inner join t1 as t2 on (t1_0.a <=> now()) join t1 on 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1_0	ref	a	a	4	const	0	Using where; Using index
+1	SIMPLE	t2	index	NULL	a	4	NULL	2	Using index; Using join buffer (flat, BNL join)
+1	SIMPLE	t1	index	NULL	a	4	NULL	2	Using index; Using join buffer (incremental, BNL join)
+select 1 from t1 as t1_0 inner join t1 as t2 on (t1_0.a <=> now()) join t1 on 1;
+1
+drop table t1;
diff --git a/mysql-test/r/update_ignore_216.result b/mysql-test/r/update_ignore_216.result
new file mode 100644
index 00000000000..4abc1eae06e
--- /dev/null
+++ b/mysql-test/r/update_ignore_216.result
@@ -0,0 +1,9 @@
+CREATE TABLE t1 ( a INT, b CHAR(3) );
+INSERT INTO t1 VALUES ( 1, 'foo' );
+CREATE TABLE t2 ( c CHAR(3), d INT );
+INSERT INTO t2 VALUES ( 'foo', 1 );
+UPDATE IGNORE t1, t2 SET b = 'bar', c = 'bar'
+  WHERE a != ( SELECT 1 UNION SELECT 2 );
+Warnings:
+Warning	1242	Subquery returns more than 1 row
+DROP TABLE t1, t2;
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
index 3bf8a6a7126..accb88b7f15 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/r/user_var.result
@@ -485,4 +485,10 @@ f1	f2
 1	4
 DROP TRIGGER trg1;
 DROP TABLE t1;
+#
+# Bug #12408412: GROUP_CONCAT + ORDER BY + INPUT/OUTPUT
+#   SAME USER VARIABLE = CRASH
+#
+SET @bug12408412=1;
+SELECT GROUP_CONCAT(@bug12408412 ORDER BY 1) INTO @bug12408412;
 End of 5.5 tests
diff --git a/mysql-test/r/archive-big.result b/mysql-test/suite/archive/archive-big.result
similarity index 100%
rename from mysql-test/r/archive-big.result
rename to mysql-test/suite/archive/archive-big.result
diff --git a/mysql-test/t/archive-big.test b/mysql-test/suite/archive/archive-big.test
similarity index 100%
rename from mysql-test/t/archive-big.test
rename to mysql-test/suite/archive/archive-big.test
diff --git a/mysql-test/r/archive.result b/mysql-test/suite/archive/archive.result
similarity index 100%
rename from mysql-test/r/archive.result
rename to mysql-test/suite/archive/archive.result
diff --git a/mysql-test/t/archive.test b/mysql-test/suite/archive/archive.test
similarity index 100%
rename from mysql-test/t/archive.test
rename to mysql-test/suite/archive/archive.test
diff --git a/mysql-test/r/archive_bitfield.result b/mysql-test/suite/archive/archive_bitfield.result
similarity index 100%
rename from mysql-test/r/archive_bitfield.result
rename to mysql-test/suite/archive/archive_bitfield.result
diff --git a/mysql-test/t/archive_bitfield.test b/mysql-test/suite/archive/archive_bitfield.test
similarity index 100%
rename from mysql-test/t/archive_bitfield.test
rename to mysql-test/suite/archive/archive_bitfield.test
diff --git a/mysql-test/r/archive_debug.result b/mysql-test/suite/archive/archive_debug.result
similarity index 100%
rename from mysql-test/r/archive_debug.result
rename to mysql-test/suite/archive/archive_debug.result
diff --git a/mysql-test/t/archive_debug.test b/mysql-test/suite/archive/archive_debug.test
similarity index 100%
rename from mysql-test/t/archive_debug.test
rename to mysql-test/suite/archive/archive_debug.test
diff --git a/mysql-test/r/archive_gis.result b/mysql-test/suite/archive/archive_gis.result
similarity index 100%
rename from mysql-test/r/archive_gis.result
rename to mysql-test/suite/archive/archive_gis.result
diff --git a/mysql-test/t/archive_gis.test b/mysql-test/suite/archive/archive_gis.test
similarity index 100%
rename from mysql-test/t/archive_gis.test
rename to mysql-test/suite/archive/archive_gis.test
diff --git a/mysql-test/r/archive_plugin.result b/mysql-test/suite/archive/archive_plugin.result
similarity index 100%
rename from mysql-test/r/archive_plugin.result
rename to mysql-test/suite/archive/archive_plugin.result
diff --git a/mysql-test/t/archive_plugin.test b/mysql-test/suite/archive/archive_plugin.test
similarity index 100%
rename from mysql-test/t/archive_plugin.test
rename to mysql-test/suite/archive/archive_plugin.test
diff --git a/mysql-test/r/mysqlhotcopy_archive.result b/mysql-test/suite/archive/mysqlhotcopy_archive.result
similarity index 100%
rename from mysql-test/r/mysqlhotcopy_archive.result
rename to mysql-test/suite/archive/mysqlhotcopy_archive.result
diff --git a/mysql-test/t/mysqlhotcopy_archive.test b/mysql-test/suite/archive/mysqlhotcopy_archive.test
similarity index 100%
rename from mysql-test/t/mysqlhotcopy_archive.test
rename to mysql-test/suite/archive/mysqlhotcopy_archive.test
diff --git a/mysql-test/r/partition_archive.result b/mysql-test/suite/archive/partition_archive.result
similarity index 100%
rename from mysql-test/r/partition_archive.result
rename to mysql-test/suite/archive/partition_archive.result
diff --git a/mysql-test/t/partition_archive.test b/mysql-test/suite/archive/partition_archive.test
similarity index 100%
rename from mysql-test/t/partition_archive.test
rename to mysql-test/suite/archive/partition_archive.test
diff --git a/mysql-test/suite/archive/suite.pm b/mysql-test/suite/archive/suite.pm
new file mode 100644
index 00000000000..eb2ff9f8e26
--- /dev/null
+++ b/mysql-test/suite/archive/suite.pm
@@ -0,0 +1,9 @@
+package My::Suite::Archive;
+
+@ISA = qw(My::Suite);
+
+return ("Need Archive engine" unless $ENV{HA_ARCHIVE_SO} or
+        $::mysqld_variables{'archive'} eq "ON");
+
+bless { };
+
diff --git a/mysql-test/suite/binlog/r/binlog_unsafe.result b/mysql-test/suite/binlog/r/binlog_unsafe.result
index 2f994e9f5fc..2cc1ebdd2d7 100644
--- a/mysql-test/suite/binlog/r/binlog_unsafe.result
+++ b/mysql-test/suite/binlog/r/binlog_unsafe.result
@@ -2678,6 +2678,8 @@ CREATE TABLE replace_table (a INT, b INT, PRIMARY KEY(a));
 INSERT INTO replace_table values (1,1),(2,2);
 CREATE TABLE update_table (a INT, b INT, PRIMARY KEY(a));
 INSERT INTO update_table values (1,1),(2,2);
+CREATE TABLE insert_2_keys (a INT UNIQUE KEY, b INT UNIQUE KEY);
+INSERT INTO insert_2_keys values (1, 1);
 INSERT IGNORE INTO insert_table SELECT * FROM filler_table;
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT IGNORE... SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are ignored. This order cannot be predicted and may differ on master and the slave.
@@ -2701,10 +2703,15 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 CREATE TEMPORARY TABLE temp1 (a INT, b INT, PRIMARY KEY(b)) REPLACE SELECT * FROM filler_table;
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. CREATE... REPLACE SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave.
+INSERT INTO insert_2_keys VALUES (1, 2) 
+ON DUPLICATE KEY UPDATE a=VALUES(a)+10, b=VALUES(b)+10;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE  on a table with more than one UNIQUE KEY is unsafe
 DROP TABLE filler_table;
 DROP TABLE insert_table;
 DROP TABLE update_table;
 DROP TABLE replace_table;
 DROP TABLE create_ignore_test;
 DROP TABLE create_replace_test;
+DROP TABLE insert_2_keys;
 "End of tests"
diff --git a/mysql-test/suite/binlog/t/binlog_unsafe.test b/mysql-test/suite/binlog/t/binlog_unsafe.test
index 3353855fd0c..2de84a58875 100644
--- a/mysql-test/suite/binlog/t/binlog_unsafe.test
+++ b/mysql-test/suite/binlog/t/binlog_unsafe.test
@@ -17,6 +17,7 @@
 #  - CREATE TABLE [IGNORE/REPLACE] SELECT
 #  - INSERT IGNORE...SELECT
 #  - UPDATE IGNORE
+#  - INSERT... ON DUPLICATE KEY UPDATE on a table with two UNIQUE KEYS
 #
 # Note that statements that use stored functions, stored procedures,
 # triggers, views, or prepared statements that invoke unsafe
@@ -715,6 +716,9 @@ DROP TABLE t1;
 #UPDATE IGNORE 
 #CREATE TABLE... IGNORE SELECT 
 #CREATE TABLE... REPLACE SELECT
+#
+###BUG 11765650 - 58637: MARK UPDATES THAT DEPEND ON ORDER OF TWO KEYS UNSAFE 
+#INSERT.... ON DUP KEY UPDATE on a table with more than one UNIQUE KEY
 
 #setup tables
 CREATE TABLE filler_table (a INT, b INT);
@@ -724,6 +728,8 @@ CREATE TABLE replace_table (a INT, b INT, PRIMARY KEY(a));
 INSERT INTO replace_table values (1,1),(2,2);
 CREATE TABLE update_table (a INT, b INT, PRIMARY KEY(a));
 INSERT INTO update_table values (1,1),(2,2);
+CREATE TABLE insert_2_keys (a INT UNIQUE KEY, b INT UNIQUE KEY);
+INSERT INTO insert_2_keys values (1, 1);
 
 #INSERT IGNORE... SELECT
 INSERT IGNORE INTO insert_table SELECT * FROM filler_table;
@@ -741,6 +747,10 @@ CREATE TABLE create_replace_test (a INT, b INT, PRIMARY KEY(b)) REPLACE SELECT *
 #temporary tables should not throw the warning.
 CREATE TEMPORARY TABLE temp1 (a INT, b INT, PRIMARY KEY(b)) REPLACE SELECT * FROM filler_table;
 
+#INSERT.... ON DUP KEY UPDATE on a table with more than one UNIQUE KEY
+INSERT INTO insert_2_keys VALUES (1, 2) 
+       ON DUPLICATE KEY UPDATE a=VALUES(a)+10, b=VALUES(b)+10;
+
 ###clean up
 DROP TABLE filler_table;
 DROP TABLE insert_table;
@@ -748,5 +758,6 @@ DROP TABLE update_table;
 DROP TABLE replace_table;
 DROP TABLE create_ignore_test;
 DROP TABLE create_replace_test;
+DROP TABLE insert_2_keys;
 
 --echo "End of tests"
diff --git a/mysql-test/r/csv.result b/mysql-test/suite/csv/csv.result
similarity index 100%
rename from mysql-test/r/csv.result
rename to mysql-test/suite/csv/csv.result
diff --git a/mysql-test/t/csv.test b/mysql-test/suite/csv/csv.test
similarity index 100%
rename from mysql-test/t/csv.test
rename to mysql-test/suite/csv/csv.test
diff --git a/mysql-test/r/csv_alter_table.result b/mysql-test/suite/csv/csv_alter_table.result
similarity index 100%
rename from mysql-test/r/csv_alter_table.result
rename to mysql-test/suite/csv/csv_alter_table.result
diff --git a/mysql-test/t/csv_alter_table.test b/mysql-test/suite/csv/csv_alter_table.test
similarity index 100%
rename from mysql-test/t/csv_alter_table.test
rename to mysql-test/suite/csv/csv_alter_table.test
diff --git a/mysql-test/r/csv_not_null.result b/mysql-test/suite/csv/csv_not_null.result
similarity index 100%
rename from mysql-test/r/csv_not_null.result
rename to mysql-test/suite/csv/csv_not_null.result
diff --git a/mysql-test/t/csv_not_null.test b/mysql-test/suite/csv/csv_not_null.test
similarity index 100%
rename from mysql-test/t/csv_not_null.test
rename to mysql-test/suite/csv/csv_not_null.test
diff --git a/mysql-test/r/heap.result b/mysql-test/suite/heap/heap.result
similarity index 100%
rename from mysql-test/r/heap.result
rename to mysql-test/suite/heap/heap.result
diff --git a/mysql-test/t/heap.test b/mysql-test/suite/heap/heap.test
similarity index 100%
rename from mysql-test/t/heap.test
rename to mysql-test/suite/heap/heap.test
diff --git a/mysql-test/r/heap_auto_increment.result b/mysql-test/suite/heap/heap_auto_increment.result
similarity index 100%
rename from mysql-test/r/heap_auto_increment.result
rename to mysql-test/suite/heap/heap_auto_increment.result
diff --git a/mysql-test/t/heap_auto_increment.test b/mysql-test/suite/heap/heap_auto_increment.test
similarity index 100%
rename from mysql-test/t/heap_auto_increment.test
rename to mysql-test/suite/heap/heap_auto_increment.test
diff --git a/mysql-test/r/heap_btree.result b/mysql-test/suite/heap/heap_btree.result
similarity index 100%
rename from mysql-test/r/heap_btree.result
rename to mysql-test/suite/heap/heap_btree.result
diff --git a/mysql-test/t/heap_btree.test b/mysql-test/suite/heap/heap_btree.test
similarity index 100%
rename from mysql-test/t/heap_btree.test
rename to mysql-test/suite/heap/heap_btree.test
diff --git a/mysql-test/r/heap_hash.result b/mysql-test/suite/heap/heap_hash.result
similarity index 100%
rename from mysql-test/r/heap_hash.result
rename to mysql-test/suite/heap/heap_hash.result
diff --git a/mysql-test/t/heap_hash.test b/mysql-test/suite/heap/heap_hash.test
similarity index 100%
rename from mysql-test/t/heap_hash.test
rename to mysql-test/suite/heap/heap_hash.test
diff --git a/mysql-test/suite/innodb/r/innodb_bug13635833.result b/mysql-test/suite/innodb/r/innodb_bug13635833.result
new file mode 100644
index 00000000000..6a505bc94f2
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_bug13635833.result
@@ -0,0 +1,45 @@
+SET DEBUG_SYNC='reset';
+create table t1 (f1 integer, key k1 (f1)) engine=innodb;
+create table t2 (f1 int, f2 int, key(f1), key(f2)) engine=innodb;
+create table t3 (f2 int, key(f2)) engine=innodb;
+insert into t1 values (10);
+insert into t2 values (10, 20);
+insert into t3 values (20);
+alter table t2 add constraint c1 foreign key (f1)
+references t1(f1) on update cascade;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) DEFAULT NULL,
+  KEY `k1` (`f1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `f1` int(11) DEFAULT NULL,
+  `f2` int(11) DEFAULT NULL,
+  KEY `f1` (`f1`),
+  KEY `f2` (`f2`),
+  CONSTRAINT `c1` FOREIGN KEY (`f1`) REFERENCES `t1` (`f1`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+show create table t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `f2` int(11) DEFAULT NULL,
+  KEY `f2` (`f2`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SET DEBUG_SYNC='innodb_rename_table_ready SIGNAL update_can_proceed
+                   WAIT_FOR dict_unfreeze';
+alter table t2 add constraint z1 foreign key (f2)
+references t3(f2) on update cascade;
+SET DEBUG_SYNC='innodb_row_update_for_mysql_begin
+                            WAIT_FOR update_can_proceed';
+SET DEBUG_SYNC='innodb_dml_cascade_dict_unfreeze SIGNAL dict_unfreeze
+                            WAIT_FOR  foreign_free_cache';
+update ignore t1 set f1 = 20;
+ERROR HY000: Error on rename of './test/t2' to '#sql2-temporary' (errno: 181)
+SET DEBUG_SYNC='now SIGNAL foreign_free_cache';
+drop table t2;
+drop table t1;
+drop table t3;
+SET DEBUG_SYNC='reset';
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index a1782ea5f6e..2b3d24551c7 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -2365,8 +2365,8 @@ select_type	SIMPLE
 table	t1
 type	index
 possible_keys	NULL
-key	PRIMARY
-key_len	4
+key	b
+key_len	10
 ref	NULL
 rows	10
 Extra	Using index
@@ -2652,7 +2652,7 @@ select_type	SIMPLE
 table	t1
 type	index
 possible_keys	NULL
-key	PRIMARY
+key	b
 key_len	8
 ref	NULL
 rows	3
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
index cea9055b873..46a2e210c6a 100644
--- a/mysql-test/suite/innodb/t/innodb-index.test
+++ b/mysql-test/suite/innodb/t/innodb-index.test
@@ -1,5 +1,10 @@
 -- source include/have_innodb.inc
 
+if (`select plugin_auth_version <= "1.0.17-13.0" from information_schema.plugins where plugin_name='innodb'`)
+{
+  --skip Not fixed in XtraDB 1.0.17-13.0 or earlier
+}
+
 let $MYSQLD_DATADIR= `select @@datadir`;
 
 let $per_table=`select @@innodb_file_per_table`;
diff --git a/mysql-test/suite/innodb/t/innodb-lock.test b/mysql-test/suite/innodb/t/innodb-lock.test
index e3026ac505b..97ae56f933b 100644
--- a/mysql-test/suite/innodb/t/innodb-lock.test
+++ b/mysql-test/suite/innodb/t/innodb-lock.test
@@ -1,5 +1,10 @@
 --source include/have_innodb.inc
 
+if (`select plugin_auth_version <= "1.0.17-13.0" from information_schema.plugins where plugin_name='innodb'`)
+{
+  --skip Not fixed in XtraDB 1.0.17-13.0 or earlier
+}
+
 #
 # Check and select innodb lock type
 #
diff --git a/mysql-test/suite/innodb/t/innodb_bug13635833.test b/mysql-test/suite/innodb/t/innodb_bug13635833.test
new file mode 100644
index 00000000000..4bab6d09f89
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug13635833.test
@@ -0,0 +1,69 @@
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+--source include/not_embedded.inc
+
+if (`select plugin_auth_version <= "1.1.8-24.1" from information_schema.plugins where plugin_name='innodb'`)
+{
+  --skip Not fixed in XtraDB 1.1.8-24.1 or earlier
+}
+
+SET DEBUG_SYNC='reset';
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+create table t1 (f1 integer, key k1 (f1)) engine=innodb;
+create table t2 (f1 int, f2 int, key(f1), key(f2)) engine=innodb;
+create table t3 (f2 int, key(f2)) engine=innodb;
+
+insert into t1 values (10);
+insert into t2 values (10, 20);
+insert into t3 values (20);
+
+alter table t2 add constraint c1 foreign key (f1)
+    references t1(f1) on update cascade;
+
+show create table t1;
+show create table t2;
+show create table t3;
+
+SET DEBUG_SYNC='innodb_rename_table_ready SIGNAL update_can_proceed
+                   WAIT_FOR dict_unfreeze';
+
+--send
+alter table t2 add constraint z1 foreign key (f2)
+    references t3(f2) on update cascade;
+
+connect (thr2,localhost,root,,);
+connection thr2;
+
+SET DEBUG_SYNC='innodb_row_update_for_mysql_begin
+                            WAIT_FOR update_can_proceed';
+SET DEBUG_SYNC='innodb_dml_cascade_dict_unfreeze SIGNAL dict_unfreeze
+                            WAIT_FOR  foreign_free_cache';
+
+--send
+update ignore t1 set f1 = 20;
+
+connection default;
+--replace_regex /'[^']*test\/#sql2-[0-9a-f-]*'/'#sql2-temporary'/
+--error ER_ERROR_ON_RENAME
+reap;
+
+SET DEBUG_SYNC='now SIGNAL foreign_free_cache';
+
+connection thr2;
+reap;
+disconnect thr2;
+--source include/wait_until_disconnected.inc
+
+connection default;
+
+drop table t2;
+drop table t1;
+drop table t3;
+
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
+
+SET DEBUG_SYNC='reset';
diff --git a/mysql-test/suite/innodb/t/innodb_bug60196.test b/mysql-test/suite/innodb/t/innodb_bug60196.test
index fcef3196845..e479b8d6b82 100755
--- a/mysql-test/suite/innodb/t/innodb_bug60196.test
+++ b/mysql-test/suite/innodb/t/innodb_bug60196.test
@@ -41,6 +41,7 @@ INSERT INTO Bug_60196 VALUES (99, 1);
 
 SELECT * FROM bug_60196_FK1;
 SELECT * FROM bug_60196_FK2;
+--sorted_result
 SELECT * FROM bug_60196;
 
 --echo # Stop server
@@ -77,6 +78,7 @@ SELECT * FROM Bug_60196;
 INSERT INTO Bug_60196 VALUES (2, 1);
 INSERT INTO Bug_60196 VALUES (2, 2);
 INSERT INTO Bug_60196 VALUES (2, 3);
+--sorted_result
 SELECT * FROM Bug_60196;
 
 --echo
diff --git a/mysql-test/suite/maria/t/compat_aliases-master.opt b/mysql-test/suite/maria/compat_aliases-master.opt
similarity index 100%
rename from mysql-test/suite/maria/t/compat_aliases-master.opt
rename to mysql-test/suite/maria/compat_aliases-master.opt
diff --git a/mysql-test/suite/maria/r/group_commit.result b/mysql-test/suite/maria/group_commit.result
similarity index 100%
rename from mysql-test/suite/maria/r/group_commit.result
rename to mysql-test/suite/maria/group_commit.result
diff --git a/mysql-test/suite/maria/t/group_commit.test b/mysql-test/suite/maria/group_commit.test
similarity index 100%
rename from mysql-test/suite/maria/t/group_commit.test
rename to mysql-test/suite/maria/group_commit.test
diff --git a/mysql-test/r/maria_icp.result b/mysql-test/suite/maria/icp.result
similarity index 97%
rename from mysql-test/r/maria_icp.result
rename to mysql-test/suite/maria/icp.result
index feca63402a4..a8756a4a6f1 100644
--- a/mysql-test/r/maria_icp.result
+++ b/mysql-test/suite/maria/icp.result
@@ -167,7 +167,7 @@ WHERE ts BETWEEN '0000-00-00' AND '2010-00-01 00:00:00'
 ORDER BY ts DESC
 LIMIT 2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	4	Using index condition
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	4	Using where
 
 DROP TABLE t1;
 #
@@ -841,5 +841,21 @@ Variable_name	Value
 Handler_icp_attempts	2
 Handler_icp_match	1
 DROP TABLE t1;
+create table t1 (a int,b char(5),primary key (a), key (b(1)));
+insert into t1 values ('a','b');
+Warnings:
+Warning	1366	Incorrect integer value: 'a' for column 'a' at row 1
+select 1 from t1 where a and b >= 'aa';
+1
+drop table t1;
+#
+# Bug#58015 "Assert in row_sel_field_store_in_mysql_format
+#            when running innodb_mrr_icp test"
+#
+create table t1 (a char(2) charset utf8,b double, primary key (a(1)),key (b));
+insert into t1 values ('',1);
+select 1 from t1 where b <= 1 and a <> '';
+1
+drop table t1;
 set storage_engine= @save_storage_engine;
 set optimizer_switch=@maria_icp_tmp;
diff --git a/mysql-test/t/maria_icp.test b/mysql-test/suite/maria/icp.test
similarity index 100%
rename from mysql-test/t/maria_icp.test
rename to mysql-test/suite/maria/icp.test
diff --git a/mysql-test/suite/maria/lock.result b/mysql-test/suite/maria/lock.result
new file mode 100644
index 00000000000..101347c7d4c
--- /dev/null
+++ b/mysql-test/suite/maria/lock.result
@@ -0,0 +1,29 @@
+drop table if exists t1,t2;
+Warnings:
+Note	1051	Unknown table 't1'
+Note	1051	Unknown table 't2'
+CREATE TABLE t1 (i INT) ENGINE=Aria;
+CREATE TABLE t2 (i INT) ENGINE=Aria;
+LOCK TABLE t1 WRITE, t2 WRITE;
+DROP TABLE t1;
+UNLOCK TABLES;
+DROP TABLE t2;
+CREATE TABLE t1 (i INT) ENGINE=Aria;
+CREATE TABLE t2 (i INT) ENGINE=Aria;
+LOCK TABLE t1 WRITE, t2 WRITE;
+FLUSH TABLE t1;
+select * from t1;
+i
+unlock tables;
+drop table t1,t2;
+CREATE TABLE t1 (i INT) ENGINE=Aria;
+CREATE TABLE t2 (i INT) ENGINE=Aria;
+LOCK TABLE t1 WRITE, t2 WRITE;
+repair table t1 use_frm;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+select * from t1;
+i
+drop table t2;
+unlock tables;
+drop table t1;
diff --git a/mysql-test/suite/maria/lock.test b/mysql-test/suite/maria/lock.test
new file mode 100644
index 00000000000..6116f0b5f08
--- /dev/null
+++ b/mysql-test/suite/maria/lock.test
@@ -0,0 +1,44 @@
+#
+# Testing of potential problems in Aria with locking
+#
+
+-- source include/have_maria.inc
+
+drop table if exists t1,t2;
+
+#
+# Test for Bug#973039
+# Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE
+# under LOCK 
+# 
+
+# Test DROP TABLE
+
+CREATE TABLE t1 (i INT) ENGINE=Aria;
+CREATE TABLE t2 (i INT) ENGINE=Aria;
+LOCK TABLE t1 WRITE, t2 WRITE;
+# Also fails with FLUSH TABLE t1 and with REPAIR TABLE t1 USE_FRM
+DROP TABLE t1;
+UNLOCK TABLES;
+DROP TABLE t2;
+
+#Test FLUSH TABLE
+
+CREATE TABLE t1 (i INT) ENGINE=Aria;
+CREATE TABLE t2 (i INT) ENGINE=Aria;
+LOCK TABLE t1 WRITE, t2 WRITE;
+FLUSH TABLE t1;
+select * from t1;
+unlock tables;
+drop table t1,t2;
+
+# Test REPAIR ... USE_FRM and unlock tables last
+
+CREATE TABLE t1 (i INT) ENGINE=Aria;
+CREATE TABLE t2 (i INT) ENGINE=Aria;
+LOCK TABLE t1 WRITE, t2 WRITE;
+repair table t1 use_frm;
+select * from t1;
+drop table t2;
+unlock tables;
+drop table t1;
diff --git a/mysql-test/suite/maria/r/locking.result b/mysql-test/suite/maria/locking.result
similarity index 100%
rename from mysql-test/suite/maria/r/locking.result
rename to mysql-test/suite/maria/locking.result
diff --git a/mysql-test/suite/maria/t/locking.test b/mysql-test/suite/maria/locking.test
similarity index 100%
rename from mysql-test/suite/maria/t/locking.test
rename to mysql-test/suite/maria/locking.test
diff --git a/mysql-test/suite/maria/r/maria-autozerofill.result b/mysql-test/suite/maria/maria-autozerofill.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-autozerofill.result
rename to mysql-test/suite/maria/maria-autozerofill.result
diff --git a/mysql-test/suite/maria/t/maria-autozerofill.test b/mysql-test/suite/maria/maria-autozerofill.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-autozerofill.test
rename to mysql-test/suite/maria/maria-autozerofill.test
diff --git a/mysql-test/suite/maria/r/maria-big.result b/mysql-test/suite/maria/maria-big.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-big.result
rename to mysql-test/suite/maria/maria-big.result
diff --git a/mysql-test/suite/maria/t/maria-big.test b/mysql-test/suite/maria/maria-big.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-big.test
rename to mysql-test/suite/maria/maria-big.test
diff --git a/mysql-test/suite/maria/r/maria-big2.result b/mysql-test/suite/maria/maria-big2.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-big2.result
rename to mysql-test/suite/maria/maria-big2.result
diff --git a/mysql-test/suite/maria/t/maria-big2.test b/mysql-test/suite/maria/maria-big2.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-big2.test
rename to mysql-test/suite/maria/maria-big2.test
diff --git a/mysql-test/suite/maria/r/maria-connect.result b/mysql-test/suite/maria/maria-connect.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-connect.result
rename to mysql-test/suite/maria/maria-connect.result
diff --git a/mysql-test/suite/maria/t/maria-connect.test b/mysql-test/suite/maria/maria-connect.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-connect.test
rename to mysql-test/suite/maria/maria-connect.test
diff --git a/mysql-test/suite/maria/t/maria-gis-recovery.opt b/mysql-test/suite/maria/maria-gis-recovery.opt
similarity index 100%
rename from mysql-test/suite/maria/t/maria-gis-recovery.opt
rename to mysql-test/suite/maria/maria-gis-recovery.opt
diff --git a/mysql-test/suite/maria/r/maria-gis-recovery.result b/mysql-test/suite/maria/maria-gis-recovery.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-gis-recovery.result
rename to mysql-test/suite/maria/maria-gis-recovery.result
diff --git a/mysql-test/suite/maria/t/maria-gis-recovery.test b/mysql-test/suite/maria/maria-gis-recovery.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-gis-recovery.test
rename to mysql-test/suite/maria/maria-gis-recovery.test
diff --git a/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result
similarity index 99%
rename from mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
rename to mysql-test/suite/maria/maria-gis-rtree-dynamic.result
index 843e5ae3d37..f4593f2f10a 100644
--- a/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
+++ b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result
@@ -306,6 +306,10 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT fid, AsText(g) FROM t2 WHERE Within(g, 
 GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))'));
 fid	AsText(g)
+45	LINESTRING(51 51,60 60)
+46	LINESTRING(51 41,60 50)
+55	LINESTRING(41 51,50 60)
+56	LINESTRING(41 41,50 50)
 DELETE FROM t2 WHERE Within(g, Envelope(GeometryFromWKB(LineString(Point(10 * 10 - 9, 10 * 10 - 9), Point(10 * 10, 10 * 10)))));
 SELECT count(*) FROM t2;
 count(*)
diff --git a/mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test b/mysql-test/suite/maria/maria-gis-rtree-dynamic.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test
rename to mysql-test/suite/maria/maria-gis-rtree-dynamic.test
diff --git a/mysql-test/suite/maria/r/maria-gis-rtree-trans.result b/mysql-test/suite/maria/maria-gis-rtree-trans.result
similarity index 99%
rename from mysql-test/suite/maria/r/maria-gis-rtree-trans.result
rename to mysql-test/suite/maria/maria-gis-rtree-trans.result
index 8ccc1f5bfdf..c4e773c7e0a 100644
--- a/mysql-test/suite/maria/r/maria-gis-rtree-trans.result
+++ b/mysql-test/suite/maria/maria-gis-rtree-trans.result
@@ -306,6 +306,10 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT fid, AsText(g) FROM t2 WHERE Within(g, 
 GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))'));
 fid	AsText(g)
+45	LINESTRING(51 51,60 60)
+46	LINESTRING(51 41,60 50)
+55	LINESTRING(41 51,50 60)
+56	LINESTRING(41 41,50 50)
 DELETE FROM t2 WHERE Within(g, Envelope(GeometryFromWKB(LineString(Point(10 * 10 - 9, 10 * 10 - 9), Point(10 * 10, 10 * 10)))));
 SELECT count(*) FROM t2;
 count(*)
diff --git a/mysql-test/suite/maria/t/maria-gis-rtree-trans.test b/mysql-test/suite/maria/maria-gis-rtree-trans.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-gis-rtree-trans.test
rename to mysql-test/suite/maria/maria-gis-rtree-trans.test
diff --git a/mysql-test/suite/maria/r/maria-gis-rtree.result b/mysql-test/suite/maria/maria-gis-rtree.result
similarity index 99%
rename from mysql-test/suite/maria/r/maria-gis-rtree.result
rename to mysql-test/suite/maria/maria-gis-rtree.result
index 9945daae75e..430f240d83e 100644
--- a/mysql-test/suite/maria/r/maria-gis-rtree.result
+++ b/mysql-test/suite/maria/maria-gis-rtree.result
@@ -306,6 +306,10 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT fid, AsText(g) FROM t2 WHERE Within(g, 
 GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))'));
 fid	AsText(g)
+45	LINESTRING(51 51,60 60)
+46	LINESTRING(51 41,60 50)
+55	LINESTRING(41 51,50 60)
+56	LINESTRING(41 41,50 50)
 DELETE FROM t2 WHERE Within(g, Envelope(GeometryFromWKB(LineString(Point(10 * 10 - 9, 10 * 10 - 9), Point(10 * 10, 10 * 10)))));
 SELECT count(*) FROM t2;
 count(*)
diff --git a/mysql-test/suite/maria/t/maria-gis-rtree.test b/mysql-test/suite/maria/maria-gis-rtree.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-gis-rtree.test
rename to mysql-test/suite/maria/maria-gis-rtree.test
diff --git a/mysql-test/suite/maria/r/maria-mvcc.result b/mysql-test/suite/maria/maria-mvcc.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-mvcc.result
rename to mysql-test/suite/maria/maria-mvcc.result
diff --git a/mysql-test/suite/maria/t/maria-mvcc.test b/mysql-test/suite/maria/maria-mvcc.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-mvcc.test
rename to mysql-test/suite/maria/maria-mvcc.test
diff --git a/mysql-test/suite/maria/r/maria-no-logging.result b/mysql-test/suite/maria/maria-no-logging.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-no-logging.result
rename to mysql-test/suite/maria/maria-no-logging.result
diff --git a/mysql-test/suite/maria/t/maria-no-logging.test b/mysql-test/suite/maria/maria-no-logging.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-no-logging.test
rename to mysql-test/suite/maria/maria-no-logging.test
diff --git a/mysql-test/suite/maria/r/maria-page-checksum.result b/mysql-test/suite/maria/maria-page-checksum.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-page-checksum.result
rename to mysql-test/suite/maria/maria-page-checksum.result
diff --git a/mysql-test/suite/maria/t/maria-page-checksum.test b/mysql-test/suite/maria/maria-page-checksum.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-page-checksum.test
rename to mysql-test/suite/maria/maria-page-checksum.test
diff --git a/mysql-test/suite/maria/r/maria-partitioning.result b/mysql-test/suite/maria/maria-partitioning.result
similarity index 88%
rename from mysql-test/suite/maria/r/maria-partitioning.result
rename to mysql-test/suite/maria/maria-partitioning.result
index 840c7c0b3b4..bcb88626ff7 100644
--- a/mysql-test/suite/maria/r/maria-partitioning.result
+++ b/mysql-test/suite/maria/maria-partitioning.result
@@ -28,3 +28,7 @@ insert into t1 values (2);
 select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
 a	a
 drop table t1,t2;
+CREATE TABLE t1 ( i INT ) ENGINE=Aria
+PARTITION BY HASH(i) PARTITIONS 2;
+ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
+drop table t1;
diff --git a/mysql-test/suite/maria/t/maria-partitioning.test b/mysql-test/suite/maria/maria-partitioning.test
similarity index 85%
rename from mysql-test/suite/maria/t/maria-partitioning.test
rename to mysql-test/suite/maria/maria-partitioning.test
index 612c44be57e..446cfed770b 100644
--- a/mysql-test/suite/maria/t/maria-partitioning.test
+++ b/mysql-test/suite/maria/maria-partitioning.test
@@ -34,6 +34,15 @@ insert into t1 values (2);
 select * from t2 left join t1 on (t2.a=t1.a) where t2.a='bbb';
 drop table t1,t2;
 
+#
+# LP:990187
+# Assertion `share->reopen == 1' failed at maria_extra on ADD PARTITION
+#
+CREATE TABLE t1 ( i INT ) ENGINE=Aria
+  PARTITION BY HASH(i) PARTITIONS 2;
+ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
+drop table t1;
+
 # Set defaults back
 --disable_result_log
 --disable_query_log
diff --git a/mysql-test/suite/maria/r/maria-preload.result b/mysql-test/suite/maria/maria-preload.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-preload.result
rename to mysql-test/suite/maria/maria-preload.result
diff --git a/mysql-test/suite/maria/t/maria-preload.test b/mysql-test/suite/maria/maria-preload.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-preload.test
rename to mysql-test/suite/maria/maria-preload.test
diff --git a/mysql-test/suite/maria/r/maria-purge.result b/mysql-test/suite/maria/maria-purge.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-purge.result
rename to mysql-test/suite/maria/maria-purge.result
diff --git a/mysql-test/suite/maria/t/maria-purge.test b/mysql-test/suite/maria/maria-purge.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-purge.test
rename to mysql-test/suite/maria/maria-purge.test
diff --git a/mysql-test/suite/maria/t/maria-recover-master.opt b/mysql-test/suite/maria/maria-recover-master.opt
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recover-master.opt
rename to mysql-test/suite/maria/maria-recover-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recover.result b/mysql-test/suite/maria/maria-recover.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-recover.result
rename to mysql-test/suite/maria/maria-recover.result
diff --git a/mysql-test/suite/maria/t/maria-recover.test b/mysql-test/suite/maria/maria-recover.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recover.test
rename to mysql-test/suite/maria/maria-recover.test
diff --git a/mysql-test/suite/maria/t/maria-recovery-big-master.opt b/mysql-test/suite/maria/maria-recovery-big-master.opt
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery-big-master.opt
rename to mysql-test/suite/maria/maria-recovery-big-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery-big.result b/mysql-test/suite/maria/maria-recovery-big.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-recovery-big.result
rename to mysql-test/suite/maria/maria-recovery-big.result
diff --git a/mysql-test/suite/maria/t/maria-recovery-big.test b/mysql-test/suite/maria/maria-recovery-big.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery-big.test
rename to mysql-test/suite/maria/maria-recovery-big.test
diff --git a/mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt b/mysql-test/suite/maria/maria-recovery-bitmap-master.opt
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt
rename to mysql-test/suite/maria/maria-recovery-bitmap-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery-bitmap.result b/mysql-test/suite/maria/maria-recovery-bitmap.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-recovery-bitmap.result
rename to mysql-test/suite/maria/maria-recovery-bitmap.result
diff --git a/mysql-test/suite/maria/t/maria-recovery-bitmap.test b/mysql-test/suite/maria/maria-recovery-bitmap.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery-bitmap.test
rename to mysql-test/suite/maria/maria-recovery-bitmap.test
diff --git a/mysql-test/suite/maria/t/maria-recovery-master.opt b/mysql-test/suite/maria/maria-recovery-master.opt
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery-master.opt
rename to mysql-test/suite/maria/maria-recovery-master.opt
diff --git a/mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt b/mysql-test/suite/maria/maria-recovery-rtree-ft-master.opt
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt
rename to mysql-test/suite/maria/maria-recovery-rtree-ft-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/maria-recovery-rtree-ft.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
rename to mysql-test/suite/maria/maria-recovery-rtree-ft.result
diff --git a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test b/mysql-test/suite/maria/maria-recovery-rtree-ft.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
rename to mysql-test/suite/maria/maria-recovery-rtree-ft.test
diff --git a/mysql-test/suite/maria/r/maria-recovery.result b/mysql-test/suite/maria/maria-recovery.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-recovery.result
rename to mysql-test/suite/maria/maria-recovery.result
diff --git a/mysql-test/suite/maria/t/maria-recovery.test b/mysql-test/suite/maria/maria-recovery.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery.test
rename to mysql-test/suite/maria/maria-recovery.test
diff --git a/mysql-test/suite/maria/t/maria-recovery2-master.opt b/mysql-test/suite/maria/maria-recovery2-master.opt
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery2-master.opt
rename to mysql-test/suite/maria/maria-recovery2-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery2.result b/mysql-test/suite/maria/maria-recovery2.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-recovery2.result
rename to mysql-test/suite/maria/maria-recovery2.result
diff --git a/mysql-test/suite/maria/t/maria-recovery2.test b/mysql-test/suite/maria/maria-recovery2.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery2.test
rename to mysql-test/suite/maria/maria-recovery2.test
diff --git a/mysql-test/suite/maria/t/maria-recovery3-master.opt b/mysql-test/suite/maria/maria-recovery3-master.opt
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery3-master.opt
rename to mysql-test/suite/maria/maria-recovery3-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery3.result b/mysql-test/suite/maria/maria-recovery3.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-recovery3.result
rename to mysql-test/suite/maria/maria-recovery3.result
diff --git a/mysql-test/suite/maria/t/maria-recovery3.test b/mysql-test/suite/maria/maria-recovery3.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-recovery3.test
rename to mysql-test/suite/maria/maria-recovery3.test
diff --git a/mysql-test/suite/maria/r/maria-ucs2.result b/mysql-test/suite/maria/maria-ucs2.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria-ucs2.result
rename to mysql-test/suite/maria/maria-ucs2.result
diff --git a/mysql-test/suite/maria/t/maria-ucs2.test b/mysql-test/suite/maria/maria-ucs2.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria-ucs2.test
rename to mysql-test/suite/maria/maria-ucs2.test
diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/maria.result
similarity index 99%
rename from mysql-test/suite/maria/r/maria.result
rename to mysql-test/suite/maria/maria.result
index c68a8871f83..888c1c10c5e 100644
--- a/mysql-test/suite/maria/r/maria.result
+++ b/mysql-test/suite/maria/maria.result
@@ -2542,8 +2542,12 @@ drop table t1;
 create table t1 (a int) engine=aria transactional=1;
 insert into t1 values (1);
 lock table t1 write concurrent;
-delete from t1;
+delete from t1 where a>0;
 ERROR 42000: The storage engine for the table doesn't support DELETE in WRITE CONCURRENT
+delete from t1;
+ERROR 42000: The storage engine for the table doesn't support TRUNCATE in WRITE CONCURRENT
+truncate t1;
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
 unlock tables;
 drop table t1;
 create table t1 (p int primary key, i int, a char(10), key k1(i), key k2(a))
diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/maria.test
similarity index 99%
rename from mysql-test/suite/maria/t/maria.test
rename to mysql-test/suite/maria/maria.test
index b371394b2b3..6ebcf08d952 100644
--- a/mysql-test/suite/maria/t/maria.test
+++ b/mysql-test/suite/maria/maria.test
@@ -1805,7 +1805,11 @@ insert into t1 values (1);
 lock table t1 write concurrent;
 # should be fixed with fully implemented versioning
 --error ER_CHECK_NOT_IMPLEMENTED
+delete from t1 where a>0;
+--error ER_CHECK_NOT_IMPLEMENTED
 delete from t1;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+truncate t1;
 unlock tables;
 drop table t1;
 
diff --git a/mysql-test/suite/maria/r/maria2.result b/mysql-test/suite/maria/maria2.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria2.result
rename to mysql-test/suite/maria/maria2.result
diff --git a/mysql-test/suite/maria/t/maria2.test b/mysql-test/suite/maria/maria2.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria2.test
rename to mysql-test/suite/maria/maria2.test
diff --git a/mysql-test/suite/maria/r/maria3.result b/mysql-test/suite/maria/maria3.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria3.result
rename to mysql-test/suite/maria/maria3.result
diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/maria3.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria3.test
rename to mysql-test/suite/maria/maria3.test
diff --git a/mysql-test/suite/maria/r/maria_notembedded.result b/mysql-test/suite/maria/maria_notembedded.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria_notembedded.result
rename to mysql-test/suite/maria/maria_notembedded.result
diff --git a/mysql-test/suite/maria/t/maria_notembedded.test b/mysql-test/suite/maria/maria_notembedded.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria_notembedded.test
rename to mysql-test/suite/maria/maria_notembedded.test
diff --git a/mysql-test/suite/maria/r/maria_partition.result b/mysql-test/suite/maria/maria_partition.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria_partition.result
rename to mysql-test/suite/maria/maria_partition.result
diff --git a/mysql-test/suite/maria/t/maria_partition.test b/mysql-test/suite/maria/maria_partition.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria_partition.test
rename to mysql-test/suite/maria/maria_partition.test
diff --git a/mysql-test/suite/maria/r/maria_showlog_error.result b/mysql-test/suite/maria/maria_showlog_error.result
similarity index 100%
rename from mysql-test/suite/maria/r/maria_showlog_error.result
rename to mysql-test/suite/maria/maria_showlog_error.result
diff --git a/mysql-test/suite/maria/t/maria_showlog_error.test b/mysql-test/suite/maria/maria_showlog_error.test
similarity index 100%
rename from mysql-test/suite/maria/t/maria_showlog_error.test
rename to mysql-test/suite/maria/maria_showlog_error.test
diff --git a/mysql-test/suite/maria/r/max_length.result b/mysql-test/suite/maria/max_length.result
similarity index 100%
rename from mysql-test/suite/maria/r/max_length.result
rename to mysql-test/suite/maria/max_length.result
diff --git a/mysql-test/suite/maria/t/max_length.test b/mysql-test/suite/maria/max_length.test
similarity index 100%
rename from mysql-test/suite/maria/t/max_length.test
rename to mysql-test/suite/maria/max_length.test
diff --git a/mysql-test/r/maria_mrr.result b/mysql-test/suite/maria/mrr.result
similarity index 100%
rename from mysql-test/r/maria_mrr.result
rename to mysql-test/suite/maria/mrr.result
diff --git a/mysql-test/t/maria_mrr.test b/mysql-test/suite/maria/mrr.test
similarity index 100%
rename from mysql-test/t/maria_mrr.test
rename to mysql-test/suite/maria/mrr.test
diff --git a/mysql-test/suite/maria/r/optimize.result b/mysql-test/suite/maria/optimize.result
similarity index 100%
rename from mysql-test/suite/maria/r/optimize.result
rename to mysql-test/suite/maria/optimize.result
diff --git a/mysql-test/suite/maria/t/optimize.test b/mysql-test/suite/maria/optimize.test
similarity index 100%
rename from mysql-test/suite/maria/t/optimize.test
rename to mysql-test/suite/maria/optimize.test
diff --git a/mysql-test/suite/maria/r/ps_maria.result b/mysql-test/suite/maria/ps_maria.result
similarity index 100%
rename from mysql-test/suite/maria/r/ps_maria.result
rename to mysql-test/suite/maria/ps_maria.result
diff --git a/mysql-test/suite/maria/t/ps_maria.test b/mysql-test/suite/maria/ps_maria.test
similarity index 100%
rename from mysql-test/suite/maria/t/ps_maria.test
rename to mysql-test/suite/maria/ps_maria.test
diff --git a/mysql-test/suite/maria/t/small_blocksize-master.opt b/mysql-test/suite/maria/small_blocksize-master.opt
similarity index 100%
rename from mysql-test/suite/maria/t/small_blocksize-master.opt
rename to mysql-test/suite/maria/small_blocksize-master.opt
diff --git a/mysql-test/suite/maria/r/small_blocksize.result b/mysql-test/suite/maria/small_blocksize.result
similarity index 100%
rename from mysql-test/suite/maria/r/small_blocksize.result
rename to mysql-test/suite/maria/small_blocksize.result
diff --git a/mysql-test/suite/maria/t/small_blocksize.test b/mysql-test/suite/maria/small_blocksize.test
similarity index 100%
rename from mysql-test/suite/maria/t/small_blocksize.test
rename to mysql-test/suite/maria/small_blocksize.test
diff --git a/mysql-test/suite/maria/truncate.result b/mysql-test/suite/maria/truncate.result
new file mode 100644
index 00000000000..467e0f915dd
--- /dev/null
+++ b/mysql-test/suite/maria/truncate.result
@@ -0,0 +1,37 @@
+CREATE TABLE t1 ( i INT ) ENGINE=Aria PARTITION BY HASH(i) PARTITIONS 2;
+SET AUTOCOMMIT = 0;
+TRUNCATE TABLE t1;
+DROP TABLE t1;
+CREATE TABLE t1 ( i INT ) ENGINE=Aria;
+CREATE TABLE t2 ( i INT ) ENGINE=Aria;
+insert into t1 values(1);
+lock table t1 write;
+truncate table t1;
+select count(*) from t1;
+count(*)
+0
+insert into t1 values(2);
+select count(*) from t1;
+count(*)
+1
+truncate table t1;
+select count(*) from t1;
+count(*)
+0
+insert into t1 values(3);
+select count(*) from t1;
+count(*)
+1
+select * from t2;
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+unlock tables;
+insert into t1 values(4);
+select * from t1;
+i
+3
+4
+truncate t1;
+select count(*) from t1;
+count(*)
+0
+drop table t1,t2;
diff --git a/mysql-test/suite/maria/truncate.test b/mysql-test/suite/maria/truncate.test
new file mode 100644
index 00000000000..3d6e70d9db6
--- /dev/null
+++ b/mysql-test/suite/maria/truncate.test
@@ -0,0 +1,47 @@
+#
+# Testing of potential problems in Aria
+#
+
+-- source include/have_maria.inc
+-- source include/have_partition.inc
+
+--disable_warnings
+--disable_query_log
+drop table if exists t1,t2;
+--enable_query_log
+--enable_warnings
+
+#
+# LP:997460 truncate table on partitioned Aria table fails with ER_ILLEGAL_HA
+#
+
+CREATE TABLE t1 ( i INT ) ENGINE=Aria PARTITION BY HASH(i) PARTITIONS 2;
+SET AUTOCOMMIT = 0;
+TRUNCATE TABLE t1;
+DROP TABLE t1;
+
+#
+# Other truncate tests
+#
+
+CREATE TABLE t1 ( i INT ) ENGINE=Aria;
+CREATE TABLE t2 ( i INT ) ENGINE=Aria;
+insert into t1 values(1);
+lock table t1 write;
+truncate table t1;
+select count(*) from t1;
+insert into t1 values(2);
+select count(*) from t1;
+truncate table t1;
+select count(*) from t1;
+insert into t1 values(3);
+select count(*) from t1;
+# Check that locking is still working
+--error 1100
+select * from t2;
+unlock tables;
+insert into t1 values(4);
+select * from t1;
+truncate t1;
+select count(*) from t1;
+drop table t1,t2;
diff --git a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
index ea738b710fd..26c6d96e786 100644
--- a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
+++ b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
@@ -5,6 +5,8 @@ call mtr.add_suppression("Unsafe statement written to the binary log using state
 CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,
 UNIQUE(b));
 INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE  on a table with more than one UNIQUE KEY is unsafe
 SELECT * FROM t1;
 a	b
 1	10
diff --git a/mysql-test/suite/rpl/r/rpl_report_port.result b/mysql-test/suite/rpl/r/rpl_report_port.result
index ebdd3f889f3..d9887f41ff9 100644
--- a/mysql-test/suite/rpl/r/rpl_report_port.result
+++ b/mysql-test/suite/rpl/r/rpl_report_port.result
@@ -1,8 +1,11 @@
 include/master-slave.inc
 [connection master]
-include/assert.inc [The default value shown for the slave's port number is the actual port number of the slave.]
 include/rpl_restart_server.inc [server_number=2 parameters: --report-port=9000]
 include/start_slave.inc
 [Slave restarted with the report-port set to some value]
 include/assert.inc [The value shown for the slave's port number is 9000 which is the value set for report-port.]
+include/rpl_restart_server.inc [server_number=2 parameters: --report-port=]
+include/start_slave.inc
+[Slave restarted with the report-port set to the value of slave's port number]
+include/assert.inc [The default value shown for the slave's port number is the actual port number of the slave.]
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
index c864850a238..6e2415ebcd8 100644
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
@@ -49,6 +49,10 @@ A	B
 A	I
 X	Y
 X	Z
+include/assert.inc [Counter for COM_COMMIT is consistent with the number of actual commits]
+include/assert.inc [Counter for COM_INSERT is consistent with the number of actual inserts]
+include/assert.inc [Counter for COM_DELETE is consistent with the number of actual deletes]
+include/assert.inc [Counter for COM_UPDATE is consistent with the number of actual updates]
 UPDATE t1 SET c2 = 'Q' WHERE c1 = 'A' AND c2 = 'N';
 SELECT * FROM t1 ORDER BY c1,c2;
 C1	C2
diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
index 0e00695500c..cba1b905d98 100644
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
@@ -49,6 +49,10 @@ A	B
 A	I
 X	Y
 X	Z
+include/assert.inc [Counter for COM_COMMIT is consistent with the number of actual commits]
+include/assert.inc [Counter for COM_INSERT is consistent with the number of actual inserts]
+include/assert.inc [Counter for COM_DELETE is consistent with the number of actual deletes]
+include/assert.inc [Counter for COM_UPDATE is consistent with the number of actual updates]
 UPDATE t1 SET c2 = 'Q' WHERE c1 = 'A' AND c2 = 'N';
 SELECT * FROM t1 ORDER BY c1,c2;
 C1	C2
diff --git a/mysql-test/suite/rpl/r/rpl_row_merge_engine.result b/mysql-test/suite/rpl/r/rpl_row_merge_engine.result
new file mode 100644
index 00000000000..c61167e84e0
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_merge_engine.result
@@ -0,0 +1,16 @@
+include/master-slave.inc
+[connection master]
+CREATE TABLE t1 (a int) ENGINE=MyISAM;
+CREATE TABLE t2 (a int) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (1), (2), (3);
+INSERT INTO t2 VALUES (4), (5), (6);
+CREATE TABLE IF NOT EXISTS t1_merge LIKE t1;
+ALTER TABLE t1_merge ENGINE=MERGE UNION (t2, t1);
+include/diff_tables.inc [master:test.t1, slave:test.t1]
+include/diff_tables.inc [master:test.t2, slave:test.t2]
+UPDATE t1_merge SET a=10 WHERE a=1;
+DELETE FROM t1_merge WHERE a=10;
+include/diff_tables.inc [master:test.t1, slave:test.t1]
+include/diff_tables.inc [master:test.t2, slave:test.t2]
+DROP TABLE t1_merge, t1, t2;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
index 78489449ab8..e736eb1ba12 100644
--- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
@@ -324,7 +324,7 @@ call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received w
 let $slave_errno= ER_DUP_ENTRY
 --source include/wait_for_slave_sql_error.inc
 let $rcvd_heartbeats_before= query_get_value(SHOW STATUS LIKE 'slave_received_heartbeats', Value, 1);
-sleep 2;
+sleep 4;
 let $rcvd_heartbeats_after= query_get_value(SHOW STATUS LIKE 'slave_received_heartbeats', Value, 1);
 let $result= query_get_value(SELECT ($rcvd_heartbeats_after - $rcvd_heartbeats_before) > 0 AS Result, Result, 1);
 --echo Heartbeat events are received while sql thread stopped (1 means 'yes'): $result
diff --git a/mysql-test/suite/rpl/t/rpl_report_port-slave.opt b/mysql-test/suite/rpl/t/rpl_report_port-slave.opt
deleted file mode 100644
index ffe2b2e7016..00000000000
--- a/mysql-test/suite/rpl/t/rpl_report_port-slave.opt
+++ /dev/null
@@ -1 +0,0 @@
---report-port=
diff --git a/mysql-test/suite/rpl/t/rpl_report_port.test b/mysql-test/suite/rpl/t/rpl_report_port.test
index b1b71a2982c..379f9aed946 100644
--- a/mysql-test/suite/rpl/t/rpl_report_port.test
+++ b/mysql-test/suite/rpl/t/rpl_report_port.test
@@ -10,22 +10,18 @@
 #
 #====Method====
 #
-# Start replication with report port not set.This will give the actual port 
-# number of the slave (ie. SLAVE_PORT) for the on doing SHOW SLAVE HOSTS on 
-# the master.
-# Restart the slave server with report port set to 9000 and start the slave.
+# Start replication  with report port set to 9000 and restart the slave.
 # In this case on doing SHOW SLAVE HOSTS on the master, we get the port number
 # of the slave to be 9000.
+# In the second case restart the slave server with report port not set. In this
+# case on doing SHOW SLAVE HOSTS on the master, we get the actual port number
+# of the slave (ie. SLAVE_PORT).
 
 source include/master-slave.inc;
+source include/have_binlog_format_mixed.inc;
 
 connection master;
 
---let $report_port= query_get_value(SHOW SLAVE HOSTS, Port, 1)
---let assert_text= The default value shown for the slave's port number is the actual port number of the slave.
---let assert_cond= $report_port = "$SLAVE_MYPORT"
---source include/assert.inc
-
 # Start the server with some value being passed to the report_port= <option>
 # this will be used incase we have to mask the value of the slave's port
 # number in certain situations.
@@ -46,4 +42,25 @@ connection master;
 --let assert_cond= $report_port = "9000"
 --source include/assert.inc
 
+
+# Start the server with the report-port being passed with no value. So on SHOW SLAVE HOSTS
+# on the master the value of slave's port should be the actual value of the slave port.
+
+--let $rpl_server_number= 2
+--let $rpl_server_parameters= --report-port=
+--source include/rpl_restart_server.inc
+
+connection slave;
+--source include/start_slave.inc
+
+--echo [Slave restarted with the report-port set to the value of slave's port number]
+
+connection master;
+
+# The value reported is the actual value of the slave's port.
+--let $report_port= query_get_value(SHOW SLAVE HOSTS, Port, 1)
+--let assert_text= The default value shown for the slave's port number is the actual port number of the slave.
+--let assert_cond= $report_port = "$SLAVE_MYPORT"
+--source include/assert.inc
+
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_merge_engine.test b/mysql-test/suite/rpl/t/rpl_row_merge_engine.test
new file mode 100644
index 00000000000..5add8dc1cda
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_merge_engine.test
@@ -0,0 +1,50 @@
+#
+# BUG#47103
+# 
+# This test case checks whether the slave crashes or not when there is
+# a merge table in use.
+#
+# Description
+# ===========
+#
+# The test case creates two regular MyISAM tables on the master and
+# one MERGE table. Then it populates the MyISAM tables, updates and 
+# deletes their contents through the merge table. Finally, the slave
+# is synchronized with the master and (after the fix) it won't crash.
+# 
+--source include/master-slave.inc
+--source include/have_binlog_format_row.inc
+--connection master
+
+CREATE TABLE t1 (a int) ENGINE=MyISAM;
+CREATE TABLE t2 (a int) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (1), (2), (3);
+INSERT INTO t2 VALUES (4), (5), (6);
+CREATE TABLE IF NOT EXISTS t1_merge LIKE t1;
+ALTER TABLE t1_merge ENGINE=MERGE UNION (t2, t1);
+
+--sync_slave_with_master
+
+--let diff_tables=master:test.t1, slave:test.t1
+--source include/diff_tables.inc
+
+--let diff_tables=master:test.t2, slave:test.t2
+--source include/diff_tables.inc
+
+--connection master
+UPDATE t1_merge SET a=10 WHERE a=1;
+DELETE FROM t1_merge WHERE a=10;
+
+--sync_slave_with_master
+--connection master
+
+--let diff_tables=master:test.t1, slave:test.t1
+--source include/diff_tables.inc
+
+--let diff_tables=master:test.t2, slave:test.t2
+--source include/diff_tables.inc
+
+DROP TABLE t1_merge, t1, t2;
+--sync_slave_with_master
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
deleted file mode 100644
index 915a2383435..00000000000
--- a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
+++ /dev/null
@@ -1,108 +0,0 @@
-SET @start_value = @@global.binlog_cache_size;
-SELECT @start_value;
-@start_value
-32768
-'#--------------------FN_DYNVARS_006_01------------------------#'
-SET @@global.binlog_cache_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '100'
-SET @@global.binlog_cache_size = DEFAULT;
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-32768
-'#---------------------FN_DYNVARS_006_02-------------------------#'
-SET @@global.binlog_cache_size = @start_value;
-SELECT @@global.binlog_cache_size = 32768;
-@@global.binlog_cache_size = 32768
-1
-'#--------------------FN_DYNVARS_006_03------------------------#'
-SET @@global.binlog_cache_size = 4096;
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-SET @@global.binlog_cache_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '4294967295'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4294963200
-SET @@global.binlog_cache_size = 10000;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '10000'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-8192
-SET @@global.binlog_cache_size = 21221204;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '21221204'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-21217280
-'Bug: Invalid values are coming in variable on assigning valid values'
-'#--------------------FN_DYNVARS_006_04-------------------------#'
-SET @@global.binlog_cache_size = 1024;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '1024'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-SET @@global.binlog_cache_size = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'binlog_cache_size'
-SET @@global.binlog_cache_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '-1024'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-SET @@global.binlog_cache_size = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '42949672950'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-42949668864
-'Bug: Errors are not coming on assigning invalid values to variable'
-SET @@global.binlog_cache_size = ON;
-ERROR 42000: Incorrect argument type to variable 'binlog_cache_size'
-SET @@global.binlog_cache_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'binlog_cache_size'
-'#-------------------FN_DYNVARS_006_05----------------------------#'
-SET @@session.binlog_cache_size = 0;
-ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-'#----------------------FN_DYNVARS_006_06------------------------#'
-SELECT @@global.binlog_cache_size = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='binlog_cache_size';
-@@global.binlog_cache_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_006_07----------------------#'
-SET @@global.binlog_cache_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '1'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-SET @@global.binlog_cache_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '0'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-'Bug: Errors are not coming on assigning TRUE/FALSE to variable'
-'#---------------------FN_DYNVARS_006_08----------------------#'
-SET @@global.binlog_cache_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '1'
-SELECT @@binlog_cache_size = @@global.binlog_cache_size;
-@@binlog_cache_size = @@global.binlog_cache_size
-1
-'#---------------------FN_DYNVARS_006_09----------------------#'
-SET binlog_cache_size = 1;
-ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-SET global.binlog_cache_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_cache_size = 1' at line 1
-SELECT global.binlog_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT binlog_cache_size = @@session.binlog_cache_size;
-ERROR 42S22: Unknown column 'binlog_cache_size' in 'field list'
-SET @@global.binlog_cache_size = @start_value;
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-32768
diff --git a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result
deleted file mode 100644
index 8f1e519dab4..00000000000
--- a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result
+++ /dev/null
@@ -1,108 +0,0 @@
-SET @start_value = @@global.binlog_stmt_cache_size;
-SELECT @start_value;
-@start_value
-32768
-'#--------------------FN_DYNVARS_006_01------------------------#'
-SET @@global.binlog_stmt_cache_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '100'
-SET @@global.binlog_stmt_cache_size = DEFAULT;
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-32768
-'#---------------------FN_DYNVARS_006_02-------------------------#'
-SET @@global.binlog_stmt_cache_size = @start_value;
-SELECT @@global.binlog_stmt_cache_size = 32768;
-@@global.binlog_stmt_cache_size = 32768
-1
-'#--------------------FN_DYNVARS_006_03------------------------#'
-SET @@global.binlog_stmt_cache_size = 4096;
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-SET @@global.binlog_stmt_cache_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '4294967295'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4294963200
-SET @@global.binlog_stmt_cache_size = 10000;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '10000'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-8192
-SET @@global.binlog_stmt_cache_size = 21221204;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '21221204'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-21217280
-'Bug: Invalid values are coming in variable on assigning valid values'
-'#--------------------FN_DYNVARS_006_04-------------------------#'
-SET @@global.binlog_stmt_cache_size = 1024;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '1024'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-SET @@global.binlog_stmt_cache_size = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size'
-SET @@global.binlog_stmt_cache_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '-1024'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-SET @@global.binlog_stmt_cache_size = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '42949672950'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-42949668864
-'Bug: Errors are not coming on assigning invalid values to variable'
-SET @@global.binlog_stmt_cache_size = ON;
-ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size'
-SET @@global.binlog_stmt_cache_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size'
-'#-------------------FN_DYNVARS_006_05----------------------------#'
-SET @@session.binlog_stmt_cache_size = 0;
-ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-'#----------------------FN_DYNVARS_006_06------------------------#'
-SELECT @@global.binlog_stmt_cache_size = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='binlog_stmt_cache_size';
-@@global.binlog_stmt_cache_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_006_07----------------------#'
-SET @@global.binlog_stmt_cache_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '1'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-SET @@global.binlog_stmt_cache_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '0'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-'Bug: Errors are not coming on assigning TRUE/FALSE to variable'
-'#---------------------FN_DYNVARS_006_08----------------------#'
-SET @@global.binlog_stmt_cache_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '1'
-SELECT @@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size;
-@@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size
-1
-'#---------------------FN_DYNVARS_006_09----------------------#'
-SET binlog_stmt_cache_size = 1;
-ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-SET global.binlog_stmt_cache_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_stmt_cache_size = 1' at line 1
-SELECT global.binlog_stmt_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT binlog_stmt_cache_size = @@session.binlog_stmt_cache_size;
-ERROR 42S22: Unknown column 'binlog_stmt_cache_size' in 'field list'
-SET @@global.binlog_stmt_cache_size = @start_value;
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-32768
diff --git a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
deleted file mode 100644
index b332d01f900..00000000000
--- a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
+++ /dev/null
@@ -1,153 +0,0 @@
-SET @start_global_value = @@global.bulk_insert_buffer_size;
-SELECT @start_global_value;
-@start_global_value
-8388608
-SET @start_session_value = @@session.bulk_insert_buffer_size;
-SELECT @start_session_value;
-@start_session_value
-8388608
-'#--------------------FN_DYNVARS_007_01-------------------------#'
-SET @@global.bulk_insert_buffer_size = 100;
-SET @@global.bulk_insert_buffer_size = DEFAULT;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-8388608
-SET @@session.bulk_insert_buffer_size = 200;
-SET @@session.bulk_insert_buffer_size = DEFAULT;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-8388608
-'#--------------------FN_DYNVARS_007_02-------------------------#'
-SET @@global.bulk_insert_buffer_size = @start_global_value;
-SELECT @@global.bulk_insert_buffer_size = 8388608;
-@@global.bulk_insert_buffer_size = 8388608
-1
-SET @@session.bulk_insert_buffer_size = @start_session_value;
-SELECT @@session.bulk_insert_buffer_size = 8388608;
-@@session.bulk_insert_buffer_size = 8388608
-1
-'#--------------------FN_DYNVARS_007_03-------------------------#'
-SET @@global.bulk_insert_buffer_size = 0;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-0
-SET @@global.bulk_insert_buffer_size = 1;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-1
-SET @@global.bulk_insert_buffer_size = 4294967295;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-4294967295
-SET @@global.bulk_insert_buffer_size = 429496;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-429496
-'#--------------------FN_DYNVARS_007_04-------------------------#'
-SET @@session.bulk_insert_buffer_size = 0;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-0
-SET @@session.bulk_insert_buffer_size = 1;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-1
-SET @@session.bulk_insert_buffer_size = 4294967295;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-4294967295
-SET @@session.bulk_insert_buffer_size = 429496;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-429496
-'#------------------FN_DYNVARS_007_05-----------------------#'
-SET @@global.bulk_insert_buffer_size = 42949672950;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-42949672950
-SET @@global.bulk_insert_buffer_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect bulk_insert_buffer_size value: '-1024'
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-0
-SET @@global.bulk_insert_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-SET @@global.bulk_insert_buffer_size = ON;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-SET @@global.bulk_insert_buffer_size = 429496.10;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-SET @@session.bulk_insert_buffer_size = 42949672950;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-42949672950
-SET @@session.bulk_insert_buffer_size = -2;
-Warnings:
-Warning	1292	Truncated incorrect bulk_insert_buffer_size value: '-2'
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-0
-SET @@session.bulk_insert_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-SET @@session.bulk_insert_buffer_size = 429496.10;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-'#------------------FN_DYNVARS_007_06-----------------------#'
-SELECT @@global.bulk_insert_buffer_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='bulk_insert_buffer_size';
-@@global.bulk_insert_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_007_07-----------------------#'
-SELECT @@session.bulk_insert_buffer_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='bulk_insert_buffer_size';
-@@session.bulk_insert_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_007_08-----------------------#'
-SET @@global.bulk_insert_buffer_size = TRUE;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-1
-SET @@global.bulk_insert_buffer_size = FALSE;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-0
-SET @@session.bulk_insert_buffer_size = TRUE;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-1
-SET @@session.bulk_insert_buffer_size = FALSE;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-0
-'#---------------------FN_DYNVARS_007_09----------------------#'
-SET @@bulk_insert_buffer_size = 100;
-SELECT @@bulk_insert_buffer_size = @@local.bulk_insert_buffer_size;
-@@bulk_insert_buffer_size = @@local.bulk_insert_buffer_size
-1
-SELECT @@local.bulk_insert_buffer_size = @@session.bulk_insert_buffer_size;
-@@local.bulk_insert_buffer_size = @@session.bulk_insert_buffer_size
-1
-'#---------------------FN_DYNVARS_007_10----------------------#'
-SET bulk_insert_buffer_size = 1;
-SELECT @@bulk_insert_buffer_size;
-@@bulk_insert_buffer_size
-1
-SET local.bulk_insert_buffer_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1
-SELECT local.bulk_insert_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
-SET session.bulk_insert_buffer_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1
-SELECT session.bulk_insert_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT bulk_insert_buffer_size = @@session.bulk_insert_buffer_size;
-ERROR 42S22: Unknown column 'bulk_insert_buffer_size' in 'field list'
-SET @@global.bulk_insert_buffer_size = @start_global_value;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-8388608
-SET @@session.bulk_insert_buffer_size = @start_session_value;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-8388608
diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
rename to mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result
diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
deleted file mode 100644
index 6acc2398bbd..00000000000
--- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
+++ /dev/null
@@ -1,111 +0,0 @@
-SET @start_value = @@global.delayed_insert_limit;
-SELECT @start_value;
-@start_value
-100
-'#--------------------FN_DYNVARS_024_01------------------------#'
-SET @@global.delayed_insert_limit = 100;
-SET @@global.delayed_insert_limit = DEFAULT;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-100
-'#---------------------FN_DYNVARS_024_02-------------------------#'
-SET @@global.delayed_insert_limit = @start_value;
-SELECT @@global.delayed_insert_limit = 100;
-@@global.delayed_insert_limit = 100
-1
-'#--------------------FN_DYNVARS_024_03------------------------#'
-SET @@global.delayed_insert_limit = 10000;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-10000
-SET @@global.delayed_insert_limit = 4294967295;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-4294967295
-SET @@global.delayed_insert_limit = 1;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-'#--------------------FN_DYNVARS_024_04-------------------------#'
-SET @@global.delayed_insert_limit = 0;
-Warnings:
-Warning	1292	Truncated incorrect delayed_insert_limit value: '0'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-SET @@global.delayed_insert_limit = -1024;
-Warnings:
-Warning	1292	Truncated incorrect delayed_insert_limit value: '-1024'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-SET @@global.delayed_insert_limit = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect delayed_insert_limit value: '42949672950'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-4294967295
-SET @@global.delayed_insert_limit = 429496729.5;
-ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-4294967295
-SET @@global.delayed_insert_limit = ON;
-ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-4294967295
-'#-------------------FN_DYNVARS_024_05----------------------------#'
-SET @@session.delayed_insert_limit = 0;
-ERROR HY000: Variable 'delayed_insert_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@Session.delayed_insert_limit;
-ERROR HY000: Variable 'delayed_insert_limit' is a GLOBAL variable
-'#----------------------FN_DYNVARS_024_06------------------------#'
-SELECT @@global.delayed_insert_limit =
-VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='delayed_insert_limit';
-@@global.delayed_insert_limit =
-VARIABLE_VALUE
-1
-SELECT @@delayed_insert_limit =
-VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='delayed_insert_limit';
-@@delayed_insert_limit =
-VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_024_07----------------------#'
-SET @@global.delayed_insert_limit = TRUE;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-SET @@global.delayed_insert_limit = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect delayed_insert_limit value: '0'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-'#---------------------FN_DYNVARS_024_08----------------------#'
-SET @@global.delayed_insert_limit = 1;
-SELECT @@delayed_insert_limit = @@global.delayed_insert_limit;
-@@delayed_insert_limit = @@global.delayed_insert_limit
-1
-'#---------------------FN_DYNVARS_024_09----------------------#'
-SET delayed_insert_limit = 1;
-ERROR HY000: Variable 'delayed_insert_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@delayed_insert_limit;
-@@delayed_insert_limit
-1
-SET local.delayed_insert_limit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1
-SELECT local.delayed_insert_limit;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.delayed_insert_limit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1
-SELECT global.delayed_insert_limit;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT delayed_insert_limit = @@session.delayed_insert_limit;
-ERROR 42S22: Unknown column 'delayed_insert_limit' in 'field list'
-SET @@global.delayed_insert_limit = @start_value;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-100
diff --git a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
deleted file mode 100644
index 04aad26f0e8..00000000000
--- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
+++ /dev/null
@@ -1,109 +0,0 @@
-SET @start_value = @@global.delayed_queue_size;
-SELECT @start_value;
-@start_value
-1000
-'#--------------------FN_DYNVARS_026_01------------------------#'
-SET @@global.delayed_queue_size = 100;
-SET @@global.delayed_queue_size = DEFAULT;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1000
-'#---------------------FN_DYNVARS_026_02-------------------------#'
-SET @@global.delayed_queue_size = @start_value;
-SELECT @@global.delayed_queue_size = 1000;
-@@global.delayed_queue_size = 1000
-1
-'#--------------------FN_DYNVARS_026_03------------------------#'
-SET @@global.delayed_queue_size = 10000;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-10000
-SET @@global.delayed_queue_size = 4294967295;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-4294967295
-SET @@global.delayed_queue_size = 1;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-'#--------------------FN_DYNVARS_026_04-------------------------#'
-SET @@global.delayed_queue_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect delayed_queue_size value: '0'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-SET @@global.delayed_queue_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect delayed_queue_size value: '-1024'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-SET @@global.delayed_queue_size = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect delayed_queue_size value: '42949672950'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-4294967295
-SET @@global.delayed_queue_size = 429496729.5;
-ERROR 42000: Incorrect argument type to variable 'delayed_queue_size'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-4294967295
-SET @@global.delayed_queue_size = ON;
-ERROR 42000: Incorrect argument type to variable 'delayed_queue_size'
-SELECT @@delayed_queue_size;
-@@delayed_queue_size
-4294967295
-'#-------------------FN_DYNVARS_026_05----------------------------#'
-SET @@session.delayed_queue_size = 0;
-ERROR HY000: Variable 'delayed_queue_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.delayed_queue_size;
-ERROR HY000: Variable 'delayed_queue_size' is a GLOBAL variable
-'#----------------------FN_DYNVARS_026_06------------------------#'
-SELECT @@global.delayed_queue_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='delayed_queue_size';
-@@global.delayed_queue_size = VARIABLE_VALUE
-1
-SELECT @@delayed_queue_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='delayed_queue_size';
-@@delayed_queue_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_026_07----------------------#'
-SET @@global.delayed_queue_size = TRUE;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-SET @@global.delayed_queue_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect delayed_queue_size value: '0'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-'#---------------------FN_DYNVARS_026_08----------------------#'
-SET @@global.delayed_queue_size = 1;
-SELECT @@delayed_queue_size = @@global.delayed_queue_size;
-@@delayed_queue_size = @@global.delayed_queue_size
-1
-'#---------------------FN_DYNVARS_026_09----------------------#'
-SET delayed_queue_size = 1;
-ERROR HY000: Variable 'delayed_queue_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@delayed_queue_size;
-@@delayed_queue_size
-1
-SET local.delayed_queue_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1
-SELECT local.delayed_queue_size;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.delayed_queue_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1
-SELECT global.delayed_queue_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT delayed_queue_size = @@session.delayed_queue_size;
-ERROR 42S22: Unknown column 'delayed_queue_size' in 'field list'
-SET @@global.delayed_queue_size = @start_value;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1000
diff --git a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/join_buffer_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/join_buffer_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
deleted file mode 100644
index fda265910f9..00000000000
--- a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
+++ /dev/null
@@ -1,177 +0,0 @@
-SET @start_global_value = @@global.join_buffer_size;
-SELECT @start_global_value;
-@start_global_value
-131072
-SET @start_session_value = @@session.join_buffer_size;
-SELECT @start_session_value;
-@start_session_value
-131072
-'#--------------------FN_DYNVARS_053_01-------------------------#'
-SET @@global.join_buffer_size = DEFAULT;
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-131072
-SET @@session.join_buffer_size = DEFAULT;
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-131072
-'#--------------------FN_DYNVARS_053_03-------------------------#'
-SET @@global.join_buffer_size = 8200;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-8192
-SET @@global.join_buffer_size = 65536;
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-65536
-SET @@global.join_buffer_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-4294967168
-'#--------------------FN_DYNVARS_053_04-------------------------#'
-SET @@session.join_buffer_size = 8200;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-8192
-SET @@session.join_buffer_size = 65536;
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-65536
-SET @@session.join_buffer_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-4294967168
-'#------------------FN_DYNVARS_053_05-----------------------#'
-SET @@global.join_buffer_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-128
-SET @@global.join_buffer_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '-1024'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-128
-SET @@global.join_buffer_size = 127;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '127'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-128
-SET @@global.join_buffer_size = 42949672951;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-42949672832
-SET @@global.join_buffer_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-42949672832
-SET @@global.join_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-42949672832
-SET @@session.join_buffer_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-128
-SET @@session.join_buffer_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '-1024'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-128
-SET @@session.join_buffer_size = 127;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '127'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-128
-SET @@session.join_buffer_size = 42949672951;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-42949672832
-SET @@session.join_buffer_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-42949672832
-SET @@session.join_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-42949672832
-'#------------------FN_DYNVARS_053_06-----------------------#'
-SELECT @@global.join_buffer_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='join_buffer_size';
-@@global.join_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_053_07-----------------------#'
-SELECT @@session.join_buffer_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='join_buffer_size';
-@@session.join_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_053_08-----------------------#'
-SET @@global.join_buffer_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SET @@global.join_buffer_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '0'
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.join_buffer_size = 10;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '10'
-SELECT @@join_buffer_size = @@global.join_buffer_size;
-@@join_buffer_size = @@global.join_buffer_size
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@join_buffer_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '100'
-SELECT @@join_buffer_size = @@local.join_buffer_size;
-@@join_buffer_size = @@local.join_buffer_size
-1
-SELECT @@local.join_buffer_size = @@session.join_buffer_size;
-@@local.join_buffer_size = @@session.join_buffer_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET join_buffer_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SELECT @@join_buffer_size;
-@@join_buffer_size
-128
-SELECT local.join_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.join_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT join_buffer_size = @@session.join_buffer_size;
-ERROR 42S22: Unknown column 'join_buffer_size' in 'field list'
-SET @@global.join_buffer_size = @start_global_value;
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-131072
-SET @@session.join_buffer_size = @start_session_value;
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-131072
diff --git a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result
rename to mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result
diff --git a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result
deleted file mode 100644
index f2a59e419e4..00000000000
--- a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result
+++ /dev/null
@@ -1,131 +0,0 @@
-SET @start_value = @@global.key_cache_age_threshold;
-SELECT @start_value;
-@start_value
-300
-'#--------------------FN_DYNVARS_056_01------------------------#'
-SET @@global.key_cache_age_threshold = DEFAULT;
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-300
-'#---------------------FN_DYNVARS_056_02-------------------------#'
-SET @@global.key_cache_age_threshold = @start_value;
-SELECT @@global.key_cache_age_threshold = 300;
-@@global.key_cache_age_threshold = 300
-1
-'#--------------------FN_DYNVARS_056_03------------------------#'
-SET @@global.key_cache_age_threshold = 100;
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '4294967295'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-4294967200
-SET @@global.key_cache_age_threshold = 1800;
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-1800
-SET @@global.key_cache_age_threshold = 65535;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '65535'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-65500
-'#--------------------FN_DYNVARS_056_04-------------------------#'
-SET @@global.key_cache_age_threshold = -1;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '-1'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = 42949672951;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '42949672951'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-4294967200
-SET @@global.key_cache_age_threshold = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-4294967200
-SET @@global.key_cache_age_threshold = -1024;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '-1024'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = 99;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '99'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = ON;
-ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = 'test';
-ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-'#-------------------FN_DYNVARS_056_05----------------------------#'
-SET @@session.key_cache_age_threshold = 0;
-ERROR HY000: Variable 'key_cache_age_threshold' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.key_cache_age_threshold;
-ERROR HY000: Variable 'key_cache_age_threshold' is a GLOBAL variable
-'#----------------------FN_DYNVARS_056_06------------------------#'
-SELECT @@global.key_cache_age_threshold = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='key_cache_age_threshold';
-@@global.key_cache_age_threshold = VARIABLE_VALUE
-1
-SELECT @@key_cache_age_threshold = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='key_cache_age_threshold';
-@@key_cache_age_threshold = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_056_07----------------------#'
-SET @@global.key_cache_age_threshold = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '1'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '0'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-'#---------------------FN_DYNVARS_056_08----------------------#'
-SET @@global.key_cache_age_threshold = 101;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '101'
-SELECT @@key_cache_age_threshold = @@global.key_cache_age_threshold;
-@@key_cache_age_threshold = @@global.key_cache_age_threshold
-1
-'#---------------------FN_DYNVARS_056_09----------------------#'
-SET key_cache_age_threshold = 8000;
-ERROR HY000: Variable 'key_cache_age_threshold' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@key_cache_age_threshold;
-@@key_cache_age_threshold
-100
-SET local.key_cache_age_threshold = 10;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1
-SELECT local.key_cache_age_threshold;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.key_cache_age_threshold = 10;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1
-SELECT global.key_cache_age_threshold;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT key_cache_age_threshold = @@session.key_cache_age_threshold;
-ERROR 42S22: Unknown column 'key_cache_age_threshold' in 'field list'
-SET @@global.key_cache_age_threshold = @start_value;
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-300
diff --git a/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result b/mysql-test/suite/sys_vars/r/log_warnings_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
rename to mysql-test/suite/sys_vars/r/log_warnings_basic.result
diff --git a/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result
deleted file mode 100644
index fee7f8966ca..00000000000
--- a/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result
+++ /dev/null
@@ -1,165 +0,0 @@
-SET @start_global_value = @@global.log_warnings;
-SELECT @start_global_value;
-@start_global_value
-1
-SET @start_session_value = @@session.log_warnings;
-SELECT @start_session_value;
-@start_session_value
-1
-'#--------------------FN_DYNVARS_067_01-------------------------#'
-SET @@global.log_warnings = 100;
-SET @@global.log_warnings = DEFAULT;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-1
-SET @@session.log_warnings = 200;
-SET @@session.log_warnings = DEFAULT;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-1
-'#--------------------FN_DYNVARS_067_02-------------------------#'
-SET @@global.log_warnings = DEFAULT;
-SELECT @@global.log_warnings = 1;
-@@global.log_warnings = 1
-1
-SET @@session.log_warnings = DEFAULT;
-SELECT @@session.log_warnings = 1;
-@@session.log_warnings = 1
-1
-'#--------------------FN_DYNVARS_067_03-------------------------#'
-SET @@global.log_warnings = 0;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-SET @@global.log_warnings = 1;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-1
-SET @@global.log_warnings = 60020;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-60020
-SET @@global.log_warnings = 65535;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-65535
-SET @@global.log_warnings = 65536;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-65536
-'#--------------------FN_DYNVARS_067_04-------------------------#'
-SET @@session.log_warnings = 0;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-0
-SET @@session.log_warnings = 1;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-1
-SET @@session.log_warnings = 50050;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-50050
-SET @@session.log_warnings = 65535;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-65535
-SET @@session.log_warnings = 65550;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-65550
-'#------------------FN_DYNVARS_067_05-----------------------#'
-SET @@global.log_warnings = 100000000000;
-Warnings:
-Warning	1292	Truncated incorrect log_warnings value: '100000000000'
-SELECT @@global.log_warnings;
-@@global.log_warnings
-4294967295
-SET @@global.log_warnings = -1024;
-Warnings:
-Warning	1292	Truncated incorrect log_warnings value: '-1024'
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-SET @@global.log_warnings = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'log_warnings'
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-SET @@global.log_warnings = test;
-ERROR 42000: Incorrect argument type to variable 'log_warnings'
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-SET @@session.log_warnings = 100000000000;
-Warnings:
-Warning	1292	Truncated incorrect log_warnings value: '100000000000'
-SELECT @@session.log_warnings;
-@@session.log_warnings
-4294967295
-SET @@session.log_warnings = -2;
-Warnings:
-Warning	1292	Truncated incorrect log_warnings value: '-2'
-SELECT @@session.log_warnings;
-@@session.log_warnings
-0
-SET @@session.log_warnings = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'log_warnings'
-SET @@session.log_warnings = test;
-ERROR 42000: Incorrect argument type to variable 'log_warnings'
-SELECT @@session.log_warnings;
-@@session.log_warnings
-0
-'#------------------FN_DYNVARS_067_06-----------------------#'
-SELECT @@global.log_warnings = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='log_warnings';
-@@global.log_warnings = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_067_07-----------------------#'
-SELECT @@session.log_warnings = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='log_warnings';
-@@session.log_warnings = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_067_08-----------------------#'
-SET @@global.log_warnings = TRUE;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-1
-SET @@global.log_warnings = FALSE;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-'#---------------------FN_DYNVARS_067_09----------------------#'
-SET @@global.log_warnings = 10;
-SELECT @@log_warnings = @@global.log_warnings;
-@@log_warnings = @@global.log_warnings
-0
-'#---------------------FN_DYNVARS_067_10----------------------#'
-SET @@log_warnings = 100;
-SELECT @@log_warnings = @@local.log_warnings;
-@@log_warnings = @@local.log_warnings
-1
-SELECT @@local.log_warnings = @@session.log_warnings;
-@@local.log_warnings = @@session.log_warnings
-1
-'#---------------------FN_DYNVARS_067_11----------------------#'
-SET log_warnings = 1;
-SELECT @@log_warnings;
-@@log_warnings
-1
-SELECT local.log_warnings;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.log_warnings;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT log_warnings = @@session.log_warnings;
-ERROR 42S22: Unknown column 'log_warnings' in 'field list'
-SET @@global.log_warnings = @start_global_value;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-1
-SET @@session.log_warnings = @start_session_value;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-1
diff --git a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result
rename to mysql-test/suite/sys_vars/r/max_connect_errors_basic.result
diff --git a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
deleted file mode 100644
index be1a58394b8..00000000000
--- a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
+++ /dev/null
@@ -1,134 +0,0 @@
-SET @start_value = @@global.max_connect_errors;
-SELECT @start_value;
-@start_value
-10
-'#--------------------FN_DYNVARS_073_01------------------------#'
-SET @@global.max_connect_errors = 5000;
-SET @@global.max_connect_errors = DEFAULT;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-10
-'#---------------------FN_DYNVARS_073_02-------------------------#'
-SET @@global.max_connect_errors = @start_value;
-SELECT @@global.max_connect_errors = 10;
-@@global.max_connect_errors = 10
-1
-'#--------------------FN_DYNVARS_073_03------------------------#'
-SET @@global.max_connect_errors = 4096;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4096
-SET @@global.max_connect_errors = 4294967294;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967294
-SET @@global.max_connect_errors = 4294967295;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = 1;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = 2;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-2
-'#--------------------FN_DYNVARS_073_04-------------------------#'
-SET @@global.max_connect_errors = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '-1'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = 100000000000;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '100000000000'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'max_connect_errors'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = -1024;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '-1024'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = 0;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '0'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '4294967296'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = ON;
-ERROR 42000: Incorrect argument type to variable 'max_connect_errors'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = 'test';
-ERROR 42000: Incorrect argument type to variable 'max_connect_errors'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-'#-------------------FN_DYNVARS_073_05----------------------------#'
-SET @@session.max_connect_errors = 4096;
-ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.max_connect_errors;
-ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable
-'#----------------------FN_DYNVARS_073_06------------------------#'
-SELECT @@global.max_connect_errors = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='max_connect_errors';
-@@global.max_connect_errors = VARIABLE_VALUE
-1
-SELECT @@max_connect_errors = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='max_connect_errors';
-@@max_connect_errors = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_073_07----------------------#'
-SET @@global.max_connect_errors = TRUE;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '0'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-'#---------------------FN_DYNVARS_073_08----------------------#'
-SET @@global.max_connect_errors = 5000;
-SELECT @@max_connect_errors = @@global.max_connect_errors;
-@@max_connect_errors = @@global.max_connect_errors
-1
-'#---------------------FN_DYNVARS_073_09----------------------#'
-SET max_connect_errors = 6000;
-ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@max_connect_errors;
-@@max_connect_errors
-5000
-SET local.max_connect_errors = 7000;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 7000' at line 1
-SELECT local.max_connect_errors;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.max_connect_errors = 8000;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 8000' at line 1
-SELECT global.max_connect_errors;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT max_connect_errors = @@session.max_connect_errors;
-ERROR 42S22: Unknown column 'max_connect_errors' in 'field list'
-SET @@global.max_connect_errors = @start_value;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-10
diff --git a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result
rename to mysql-test/suite/sys_vars/r/max_seeks_for_key_basic.result
diff --git a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result
deleted file mode 100644
index 2973e7e1efd..00000000000
--- a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result
+++ /dev/null
@@ -1,179 +0,0 @@
-SET @start_global_value = @@global.max_seeks_for_key;
-SELECT @start_global_value;
-@start_global_value
-4294967295
-SET @start_session_value = @@session.max_seeks_for_key;
-SELECT @start_session_value;
-@start_session_value
-4294967295
-'#--------------------FN_DYNVARS_083_01-------------------------#'
-SET @@global.max_seeks_for_key = 100;
-SET @@global.max_seeks_for_key = DEFAULT;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = 200;
-SET @@session.max_seeks_for_key = DEFAULT;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295
-'#--------------------FN_DYNVARS_083_02-------------------------#'
-SET @@global.max_seeks_for_key = DEFAULT;
-SELECT @@global.max_seeks_for_key = 4294967295;
-@@global.max_seeks_for_key = 4294967295
-1
-SET @@session.max_seeks_for_key = DEFAULT;
-SELECT @@session.max_seeks_for_key = 4294967295;
-@@session.max_seeks_for_key = 4294967295
-1
-'#--------------------FN_DYNVARS_083_03-------------------------#'
-SET @@global.max_seeks_for_key = 1;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-SET @@global.max_seeks_for_key = 2;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-2
-SET @@global.max_seeks_for_key = 65536;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-65536
-SET @@global.max_seeks_for_key = 4294967295;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@global.max_seeks_for_key = 4294967294;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967294
-'#--------------------FN_DYNVARS_083_04-------------------------#'
-SET @@session.max_seeks_for_key = 1;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-1
-SET @@session.max_seeks_for_key = 2;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-2
-SET @@session.max_seeks_for_key = 4294967295;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = 4294967294;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967294
-SET @@session.max_seeks_for_key = 65535;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-65535
-'#------------------FN_DYNVARS_083_05-----------------------#'
-SET @@global.max_seeks_for_key = 0;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '0'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-SET @@global.max_seeks_for_key = -1024;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '-1024'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-SET @@global.max_seeks_for_key = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '4294967296'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@global.max_seeks_for_key = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@global.max_seeks_for_key = test;
-ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = 0;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '0'
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-1
-SET @@session.max_seeks_for_key = -2;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '-2'
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-1
-SET @@session.max_seeks_for_key = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key'
-SET @@session.max_seeks_for_key = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '4294967296'
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = test;
-ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key'
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295
-'#------------------FN_DYNVARS_083_06-----------------------#'
-SELECT @@global.max_seeks_for_key = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='max_seeks_for_key';
-@@global.max_seeks_for_key = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_083_07-----------------------#'
-SELECT @@session.max_seeks_for_key = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='max_seeks_for_key';
-@@session.max_seeks_for_key = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_083_08-----------------------#'
-SET @@global.max_seeks_for_key = TRUE;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-SET @@global.max_seeks_for_key = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '0'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-'#---------------------FN_DYNVARS_083_09----------------------#'
-SET @@global.max_seeks_for_key = 10;
-SELECT @@max_seeks_for_key = @@global.max_seeks_for_key;
-@@max_seeks_for_key = @@global.max_seeks_for_key
-0
-'#---------------------FN_DYNVARS_083_10----------------------#'
-SET @@max_seeks_for_key = 100;
-SELECT @@max_seeks_for_key = @@local.max_seeks_for_key;
-@@max_seeks_for_key = @@local.max_seeks_for_key
-1
-SELECT @@local.max_seeks_for_key = @@session.max_seeks_for_key;
-@@local.max_seeks_for_key = @@session.max_seeks_for_key
-1
-'#---------------------FN_DYNVARS_083_11----------------------#'
-SET max_seeks_for_key = 1;
-SELECT @@max_seeks_for_key;
-@@max_seeks_for_key
-1
-SELECT local.max_seeks_for_key;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.max_seeks_for_key;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT max_seeks_for_key = @@session.max_seeks_for_key;
-ERROR 42S22: Unknown column 'max_seeks_for_key' in 'field list'
-SET @@global.max_seeks_for_key = @start_global_value;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = @start_session_value;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295
diff --git a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result
rename to mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result
diff --git a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
deleted file mode 100644
index 5daf78fcae1..00000000000
--- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
+++ /dev/null
@@ -1,197 +0,0 @@
-SET @start_global_value = @@global.max_tmp_tables;
-SELECT @start_global_value;
-@start_global_value
-32
-SET @start_session_value = @@session.max_tmp_tables;
-SELECT @start_session_value;
-@start_session_value
-32
-'#--------------------FN_DYNVARS_086_01-------------------------#'
-SET @@global.max_tmp_tables = 1000;
-SET @@global.max_tmp_tables = DEFAULT;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-32
-SET @@session.max_tmp_tables = 1000;
-SET @@session.max_tmp_tables = DEFAULT;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-32
-'#--------------------FN_DYNVARS_086_02-------------------------#'
-SET @@global.max_tmp_tables = DEFAULT;
-SELECT @@global.max_tmp_tables = 32;
-@@global.max_tmp_tables = 32
-1
-SET @@session.max_tmp_tables = DEFAULT;
-SELECT @@session.max_tmp_tables = 32;
-@@session.max_tmp_tables = 32
-1
-'#--------------------FN_DYNVARS_086_03-------------------------#'
-SET @@global.max_tmp_tables = 1;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-SET @@global.max_tmp_tables = 2;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-2
-SET @@global.max_tmp_tables = 65536;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-65536
-SET @@global.max_tmp_tables = 4294967295;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@global.max_tmp_tables = 4294967294;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967294
-'#--------------------FN_DYNVARS_086_04-------------------------#'
-SET @@session.max_tmp_tables = 1;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-1
-SET @@session.max_tmp_tables = 2;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-2
-SET @@session.max_tmp_tables = 65536;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-65536
-SET @@session.max_tmp_tables = 4294967295;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = 4294967294;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967294
-'#------------------FN_DYNVARS_086_05-----------------------#'
-SET @@global.max_tmp_tables = -1024;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '-1024'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-SET @@global.max_tmp_tables = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '4294967296'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@global.max_tmp_tables = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-SET @@global.max_tmp_tables = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '429496729500'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@global.max_tmp_tables = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@global.max_tmp_tables = test;
-ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '4294967296'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-1
-SET @@session.max_tmp_tables = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '429496729500'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = -001;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-1
-SET @@session.max_tmp_tables = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
-SET @@session.max_tmp_tables = 10737418241;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '10737418241'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = test;
-ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-'#------------------FN_DYNVARS_086_06-----------------------#'
-SELECT @@global.max_tmp_tables = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='max_tmp_tables';
-@@global.max_tmp_tables = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_086_07-----------------------#'
-SELECT @@session.max_tmp_tables = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='max_tmp_tables';
-@@session.max_tmp_tables = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_086_08-----------------------#'
-SET @@global.max_tmp_tables = TRUE;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-SET @@global.max_tmp_tables = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '0'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-'#---------------------FN_DYNVARS_086_09----------------------#'
-SET @@global.max_tmp_tables = 20;
-SELECT @@max_tmp_tables = @@global.max_tmp_tables;
-@@max_tmp_tables = @@global.max_tmp_tables
-0
-'#---------------------FN_DYNVARS_086_10----------------------#'
-SET @@max_tmp_tables = 255;
-SELECT @@max_tmp_tables = @@local.max_tmp_tables;
-@@max_tmp_tables = @@local.max_tmp_tables
-1
-SELECT @@local.max_tmp_tables = @@session.max_tmp_tables;
-@@local.max_tmp_tables = @@session.max_tmp_tables
-1
-'#---------------------FN_DYNVARS_086_11----------------------#'
-SET max_tmp_tables = 102;
-SELECT @@max_tmp_tables;
-@@max_tmp_tables
-102
-SELECT local.max_tmp_tables;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.max_tmp_tables;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT max_tmp_tables = @@session.max_tmp_tables;
-ERROR 42S22: Unknown column 'max_tmp_tables' in 'field list'
-SET @@global.max_tmp_tables = @start_global_value;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-32
-SET @@session.max_tmp_tables = @start_session_value;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-32
diff --git a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result
rename to mysql-test/suite/sys_vars/r/max_write_lock_count_basic.result
diff --git a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
deleted file mode 100644
index 59d92d5cfe8..00000000000
--- a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
+++ /dev/null
@@ -1,108 +0,0 @@
-SET @start_global_value = @@global.max_write_lock_count;
-SELECT @start_global_value;
-@start_global_value
-4294967295
-'#--------------------FN_DYNVARS_088_01-------------------------#'
-SET @@global.max_write_lock_count = 1000;
-SET @@global.max_write_lock_count = DEFAULT;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-'#--------------------FN_DYNVARS_088_02-------------------------#'
-SET @@global.max_write_lock_count = DEFAULT;
-SELECT @@global.max_write_lock_count = 4294967295;
-@@global.max_write_lock_count = 4294967295
-1
-'#--------------------FN_DYNVARS_088_03-------------------------#'
-SET @@global.max_write_lock_count = 1;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-SET @@global.max_write_lock_count = 2;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-2
-SET @@global.max_write_lock_count = 65536;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-65536
-SET @@global.max_write_lock_count = 4294967295;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-SET @@global.max_write_lock_count = 4294967294;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967294
-'#------------------FN_DYNVARS_088_04-----------------------#'
-SET @@global.max_write_lock_count = -1024;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '-1024'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-SET @@global.max_write_lock_count = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '4294967296'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-SET @@global.max_write_lock_count = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '-1'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-SET @@global.max_write_lock_count = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '429496729500'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-SET @@global.max_write_lock_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_write_lock_count'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-SET @@global.max_write_lock_count = test;
-ERROR 42000: Incorrect argument type to variable 'max_write_lock_count'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-'#------------------FN_DYNVARS_088_05-----------------------#'
-SELECT @@global.max_write_lock_count = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='max_write_lock_count';
-@@global.max_write_lock_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_088_06-----------------------#'
-SET @@global.max_write_lock_count = TRUE;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-SET @@global.max_write_lock_count = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '0'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-'#---------------------FN_DYNVARS_088_07----------------------#'
-SET @@global.max_write_lock_count = 20;
-SELECT @@max_write_lock_count = @@global.max_write_lock_count;
-@@max_write_lock_count = @@global.max_write_lock_count
-1
-'#---------------------FN_DYNVARS_088_08----------------------#'
-SET @@global.max_write_lock_count = 102;
-SELECT @@max_write_lock_count;
-@@max_write_lock_count
-102
-SELECT local.max_write_lock_count;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT global.max_write_lock_count;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT max_write_lock_count = @@global.max_write_lock_count;
-ERROR 42S22: Unknown column 'max_write_lock_count' in 'field list'
-SET @@global.max_write_lock_count = @start_global_value;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
diff --git a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
rename to mysql-test/suite/sys_vars/r/min_examined_row_limit_basic.result
diff --git a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
deleted file mode 100644
index b4b1b9ae402..00000000000
--- a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
+++ /dev/null
@@ -1,183 +0,0 @@
-SET @start_global_value = @@global.min_examined_row_limit;
-SELECT @start_global_value;
-@start_global_value
-0
-SET @start_session_value = @@session.min_examined_row_limit;
-SELECT @start_session_value;
-@start_session_value
-0
-'#--------------------FN_DYNVARS_089_01-------------------------#'
-SET @@global.min_examined_row_limit = 100;
-SET @@global.min_examined_row_limit = DEFAULT;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-SET @@session.min_examined_row_limit = 200;
-SET @@session.min_examined_row_limit = DEFAULT;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-0
-'#--------------------FN_DYNVARS_089_02-------------------------#'
-SET @@global.min_examined_row_limit = DEFAULT;
-SELECT @@global.min_examined_row_limit = 0;
-@@global.min_examined_row_limit = 0
-1
-SET @@session.min_examined_row_limit = DEFAULT;
-SELECT @@session.min_examined_row_limit = 0;
-@@session.min_examined_row_limit = 0
-1
-'#--------------------FN_DYNVARS_089_03-------------------------#'
-SET @@global.min_examined_row_limit = 0;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-SET @@global.min_examined_row_limit = 1;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-1
-SET @@global.min_examined_row_limit = 60020;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-60020
-SET @@global.min_examined_row_limit = 65535;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-65535
-SET @@global.min_examined_row_limit = 4294967295;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967295
-SET @@global.min_examined_row_limit = 4294967294;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967294
-'#--------------------FN_DYNVARS_089_04-------------------------#'
-SET @@session.min_examined_row_limit = 0;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-0
-SET @@session.min_examined_row_limit = 1;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-1
-SET @@session.min_examined_row_limit = 50050;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-50050
-SET @@session.min_examined_row_limit = 65535;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-65535
-SET @@session.min_examined_row_limit = 4294967295;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967295
-SET @@session.min_examined_row_limit = 4294967294;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967294
-'#------------------FN_DYNVARS_089_05-----------------------#'
-SET @@global.min_examined_row_limit = 429496726;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-429496726
-SET @@global.min_examined_row_limit = -1024;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '-1024'
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-SET @@global.min_examined_row_limit = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '429496729500'
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967295
-SET @@global.min_examined_row_limit = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit'
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967295
-SET @@global.min_examined_row_limit = test;
-ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit'
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967295
-SET @@session.min_examined_row_limit = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '4294967296'
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967295
-SET @@session.min_examined_row_limit = -1;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '-1'
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-0
-SET @@session.min_examined_row_limit = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit'
-SET @@session.min_examined_row_limit = 4294967295021;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '4294967295021'
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967295
-SET @@session.min_examined_row_limit = test;
-ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit'
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967295
-'#------------------FN_DYNVARS_089_06-----------------------#'
-SELECT @@global.min_examined_row_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='min_examined_row_limit';
-@@global.min_examined_row_limit = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_089_07-----------------------#'
-SELECT @@session.min_examined_row_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='min_examined_row_limit';
-@@session.min_examined_row_limit = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_089_08-----------------------#'
-SET @@global.min_examined_row_limit = TRUE;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-1
-SET @@global.min_examined_row_limit = FALSE;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-'#---------------------FN_DYNVARS_089_09----------------------#'
-SET @@global.min_examined_row_limit = 10;
-SELECT @@min_examined_row_limit = @@global.min_examined_row_limit;
-@@min_examined_row_limit = @@global.min_examined_row_limit
-0
-'#---------------------FN_DYNVARS_089_10----------------------#'
-SET @@min_examined_row_limit = 100;
-SELECT @@min_examined_row_limit = @@local.min_examined_row_limit;
-@@min_examined_row_limit = @@local.min_examined_row_limit
-1
-SELECT @@local.min_examined_row_limit = @@session.min_examined_row_limit;
-@@local.min_examined_row_limit = @@session.min_examined_row_limit
-1
-'#---------------------FN_DYNVARS_089_11----------------------#'
-SET min_examined_row_limit = 1;
-SELECT @@min_examined_row_limit;
-@@min_examined_row_limit
-1
-SELECT local.min_examined_row_limit;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.min_examined_row_limit;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT min_examined_row_limit = @@session.min_examined_row_limit;
-ERROR 42S22: Unknown column 'min_examined_row_limit' in 'field list'
-SET @@global.min_examined_row_limit = @start_global_value;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-SET @@session.min_examined_row_limit = @start_session_value;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-0
diff --git a/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result b/mysql-test/suite/sys_vars/r/multi_range_count_basic.result
similarity index 93%
rename from mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
rename to mysql-test/suite/sys_vars/r/multi_range_count_basic.result
index f41870c873b..e078da3f2f6 100644
--- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic.result
@@ -109,11 +109,9 @@ SELECT @@global.multi_range_count;
 @@global.multi_range_count
 1
 SET @@global.multi_range_count = 4294967296;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
 SELECT @@global.multi_range_count;
 @@global.multi_range_count
-4294967296
+4294967295
 SET @@global.multi_range_count = -1024;
 Warnings:
 Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
@@ -122,21 +120,19 @@ SELECT @@global.multi_range_count;
 @@global.multi_range_count
 1
 SET @@global.multi_range_count = 429496729500;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
 SELECT @@global.multi_range_count;
 @@global.multi_range_count
-429496729500
+4294967295
 SET @@global.multi_range_count = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'multi_range_count'
 SELECT @@global.multi_range_count;
 @@global.multi_range_count
-429496729500
+4294967295
 SET @@global.multi_range_count = test;
 ERROR 42000: Incorrect argument type to variable 'multi_range_count'
 SELECT @@global.multi_range_count;
 @@global.multi_range_count
-429496729500
+4294967295
 SET @@session.multi_range_count = 0;
 Warnings:
 Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
@@ -145,11 +141,9 @@ SELECT @@session.multi_range_count;
 @@session.multi_range_count
 1
 SET @@session.multi_range_count = 4294967296;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
 SELECT @@session.multi_range_count;
 @@session.multi_range_count
-4294967296
+4294967295
 SET @@session.multi_range_count = -1;
 Warnings:
 Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
@@ -160,17 +154,15 @@ SELECT @@session.multi_range_count;
 SET @@session.multi_range_count = 65530.34.;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.' at line 1
 SET @@session.multi_range_count = 4294967295021;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
 SELECT @@session.multi_range_count;
 @@session.multi_range_count
-4294967295021
+4294967295
 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
 SET @@session.multi_range_count = test;
 ERROR 42000: Incorrect argument type to variable 'multi_range_count'
 SELECT @@session.multi_range_count;
 @@session.multi_range_count
-4294967295021
+4294967295
 '#------------------FN_DYNVARS_090_06-----------------------#'
 SELECT @@global.multi_range_count = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
diff --git a/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result b/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
deleted file mode 100644
index e7cda15215c..00000000000
--- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
+++ /dev/null
@@ -1,245 +0,0 @@
-SET @start_global_value = @@global.multi_range_count;
-SELECT @start_global_value;
-@start_global_value
-256
-SET @start_session_value = @@session.multi_range_count;
-SELECT @start_session_value;
-@start_session_value
-256
-'#--------------------FN_DYNVARS_090_01-------------------------#'
-SET @@global.multi_range_count = 100;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SET @@global.multi_range_count = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = 200;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SET @@session.multi_range_count = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
-'#--------------------FN_DYNVARS_090_02-------------------------#'
-SET @@global.multi_range_count = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count = 256;
-@@global.multi_range_count = 256
-1
-SET @@session.multi_range_count = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count = 256;
-@@session.multi_range_count = 256
-1
-'#--------------------FN_DYNVARS_090_03-------------------------#'
-SET @@global.multi_range_count = 1;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 60020;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-60020
-SET @@global.multi_range_count = 65535;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-65535
-SET @@global.multi_range_count = 4294967295;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = 4294967294;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967294
-'#--------------------FN_DYNVARS_090_04-------------------------#'
-SET @@session.multi_range_count = 1;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 50050;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-50050
-SET @@session.multi_range_count = 65535;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-65535
-SET @@session.multi_range_count = 4294967295;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-SET @@session.multi_range_count = 4294967294;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967294
-'#------------------FN_DYNVARS_090_05-----------------------#'
-SET @@global.multi_range_count = 0;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 4294967296;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '4294967296'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = -1024;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '-1024'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 429496729500;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '429496729500'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@session.multi_range_count = 0;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '0'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 4294967296;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '4294967296'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-SET @@session.multi_range_count = -1;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '-1'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 65530.34.;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.' at line 1
-SET @@session.multi_range_count = 4294967295021;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '4294967295021'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@session.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-'#------------------FN_DYNVARS_090_06-----------------------#'
-SELECT @@global.multi_range_count = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='multi_range_count';
-@@global.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_07-----------------------#'
-SELECT @@session.multi_range_count = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='multi_range_count';
-@@session.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_08-----------------------#'
-SET @@global.multi_range_count = TRUE;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = FALSE;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_09----------------------#'
-SET @@global.multi_range_count = 10;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@multi_range_count = @@global.multi_range_count;
-@@multi_range_count = @@global.multi_range_count
-0
-'#---------------------FN_DYNVARS_090_10----------------------#'
-SET @@multi_range_count = 100;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@multi_range_count = @@local.multi_range_count;
-@@multi_range_count = @@local.multi_range_count
-1
-SELECT @@local.multi_range_count = @@session.multi_range_count;
-@@local.multi_range_count = @@session.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_11----------------------#'
-SET multi_range_count = 1;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@multi_range_count;
-@@multi_range_count
-1
-SELECT local.multi_range_count;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.multi_range_count;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT multi_range_count = @@session.multi_range_count;
-ERROR 42S22: Unknown column 'multi_range_count' in 'field list'
-SET @@global.multi_range_count = @start_global_value;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = @start_session_value;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
diff --git a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
deleted file mode 100644
index 0cef4de3630..00000000000
--- a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
+++ /dev/null
@@ -1,132 +0,0 @@
-SET @start_global_value = @@global.myisam_max_sort_file_size;
-SELECT @start_global_value;
-@start_global_value
-9223372036853727232
-'#--------------------FN_DYNVARS_094_01-------------------------#'
-SET @@global.myisam_max_sort_file_size = 500000;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '500000'
-SET @@global.myisam_max_sort_file_size = DEFAULT;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-9223372036853727232
-'#--------------------FN_DYNVARS_094_02-------------------------#'
-SET @@global.myisam_max_sort_file_size = DEFAULT;
-SELECT @@global.myisam_max_sort_file_size = 2147483648;
-@@global.myisam_max_sort_file_size = 2147483648
-0
-'#--------------------FN_DYNVARS_094_03-------------------------#'
-SET @@global.myisam_max_sort_file_size = 0;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 1024;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '1024'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 123456789;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '123456789'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-122683392
-SET @@global.myisam_max_sort_file_size = 2147483648*2;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-4294967296
-SET @@global.myisam_max_sort_file_size = 2147483648*1024;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-2199023255552
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-2199023255552
-SET @@global.myisam_max_sort_file_size = 2147483648*2147483648;
-'#--------------------FN_DYNVARS_094_04-------------------------#'
-SET @@myisam_max_sort_file_size = 2;
-ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@session.myisam_max_sort_file_size = 3;
-ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@local.myisam_max_sort_file_size = 4;
-ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-'#------------------FN_DYNVARS_094_05-----------------------#'
-SET @@global.myisam_max_sort_file_size = -1;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '-1'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = -2147483648;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '-2147483648'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = -2147483649;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '-2147483649'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_max_sort_file_size'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 2147483649.56;
-ERROR 42000: Incorrect argument type to variable 'myisam_max_sort_file_size'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 1G;
-ERROR 42000: Incorrect argument type to variable 'myisam_max_sort_file_size'
-'#------------------FN_DYNVARS_094_06-----------------------#'
-SET @@global.myisam_max_sort_file_size = 3000;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '3000'
-SELECT @@global.myisam_max_sort_file_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='myisam_max_sort_file_size';
-@@global.myisam_max_sort_file_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_094_07-----------------------#'
-SELECT count(VARIABLE_VALUE) 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='myisam_max_sort_file_size';
-count(VARIABLE_VALUE)
-1
-'#------------------FN_DYNVARS_094_08-----------------------#'
-SET @@global.myisam_max_sort_file_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '1'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = FALSE;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.myisam_max_sort_file_size = 512;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '512'
-SELECT @@myisam_max_sort_file_size = @@global.myisam_max_sort_file_size;
-@@myisam_max_sort_file_size = @@global.myisam_max_sort_file_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET myisam_max_sort_file_size = 2048;
-ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT myisam_max_sort_file_size;
-ERROR 42S22: Unknown column 'myisam_max_sort_file_size' in 'field list'
-SELECT @@myisam_max_sort_file_size;
-@@myisam_max_sort_file_size
-0
-SET global myisam_max_sort_file_size = 64;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '64'
-SET @@global.myisam_max_sort_file_size = @start_global_value;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-9223372036853727232
diff --git a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic.result
similarity index 98%
rename from mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
rename to mysql-test/suite/sys_vars/r/myisam_repair_threads_basic.result
index 50589c4041c..8ed5277c682 100644
--- a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic.result
@@ -68,32 +68,32 @@ SELECT @@global.myisam_repair_threads ;
 SET @@global.myisam_repair_threads  = 429496729533;
 SELECT @@global.myisam_repair_threads ;
 @@global.myisam_repair_threads
-429496729533
+4294967295
 SET @@global.myisam_repair_threads  = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
 SELECT @@global.myisam_repair_threads ;
 @@global.myisam_repair_threads
-429496729533
+4294967295
 SET @@global.myisam_repair_threads  = test;
 ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
 SELECT @@global.myisam_repair_threads ;
 @@global.myisam_repair_threads
-429496729533
+4294967295
 SET @@global.myisam_repair_threads  = "test";
 ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
 SELECT @@global.myisam_repair_threads ;
 @@global.myisam_repair_threads
-429496729533
+4294967295
 SET @@global.myisam_repair_threads  = 'test';
 ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
 SELECT @@global.myisam_repair_threads ;
 @@global.myisam_repair_threads
-429496729533
+4294967295
 SET @@global.myisam_repair_threads  = ON;
 ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
 SELECT @@global.myisam_repair_threads ;
 @@global.myisam_repair_threads
-429496729533
+4294967295
 SET @@session.myisam_repair_threads  = 0;
 Warnings:
 Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
diff --git a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
deleted file mode 100644
index 491f25a3d07..00000000000
--- a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
+++ /dev/null
@@ -1,180 +0,0 @@
-SET @start_global_value = @@global.myisam_repair_threads;
-SELECT @start_global_value;
-@start_global_value
-1
-SET @start_session_value = @@session.myisam_repair_threads;
-SELECT @start_session_value;
-@start_session_value
-1
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.myisam_repair_threads  = 100;
-SET @@global.myisam_repair_threads  = DEFAULT;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 200;
-SET @@session.myisam_repair_threads  = DEFAULT;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.myisam_repair_threads  = DEFAULT;
-SELECT @@global.myisam_repair_threads  = 1;
-@@global.myisam_repair_threads  = 1
-1
-SET @@session.myisam_repair_threads  = DEFAULT;
-SELECT @@session.myisam_repair_threads  = 1;
-@@session.myisam_repair_threads  = 1
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.myisam_repair_threads  = 1;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = 4294967295;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = 655354;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-655354
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.myisam_repair_threads  = 1;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 4294967295;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-4294967295
-SET @@session.myisam_repair_threads  = 655345;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-655345
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.myisam_repair_threads  = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = -1024;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '-1024'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = 429496729533;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '429496729533'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = 'test';
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = ON;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@session.myisam_repair_threads  = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = -2;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '-2'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.myisam_repair_threads  = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='myisam_repair_threads ';
-@@global.myisam_repair_threads  = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.myisam_repair_threads  = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='myisam_repair_threads ';
-@@session.myisam_repair_threads  = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_08-----------------------#'
-SET @@global.myisam_repair_threads  = TRUE;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.myisam_repair_threads  = 10;
-SELECT @@myisam_repair_threads  = @@global.myisam_repair_threads ;
-@@myisam_repair_threads  = @@global.myisam_repair_threads
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@myisam_repair_threads  = 100;
-SELECT @@myisam_repair_threads  = @@local.myisam_repair_threads ;
-@@myisam_repair_threads  = @@local.myisam_repair_threads
-1
-SELECT @@local.myisam_repair_threads  = @@session.myisam_repair_threads ;
-@@local.myisam_repair_threads  = @@session.myisam_repair_threads
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET myisam_repair_threads  = 1;
-SELECT @@myisam_repair_threads ;
-@@myisam_repair_threads
-1
-SELECT local.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT myisam_repair_threads  = @@session.myisam_repair_threads ;
-ERROR 42S22: Unknown column 'myisam_repair_threads' in 'field list'
-SET @@global.myisam_repair_threads  = @start_global_value;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = @start_session_value;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
diff --git a/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
similarity index 98%
rename from mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
rename to mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
index e6be3c28251..85482be9ad4 100644
--- a/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
@@ -76,32 +76,32 @@ SELECT @@global.myisam_sort_buffer_size  ;
 SET @@global.myisam_sort_buffer_size   = 429496729533;
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = test;
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = "test";
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = 'test';
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = ON;
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@session.myisam_sort_buffer_size   = 0;
 Warnings:
 Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '0'
diff --git a/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
deleted file mode 100644
index b9ecef3e8cc..00000000000
--- a/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
+++ /dev/null
@@ -1,196 +0,0 @@
-SET @start_global_value = @@global.myisam_sort_buffer_size ;
-SELECT @start_global_value;
-@start_global_value
-8388608
-SET @start_session_value = @@session.myisam_sort_buffer_size ;
-SELECT @start_session_value;
-@start_session_value
-8388608
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.myisam_sort_buffer_size   = 100;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '100'
-SET @@global.myisam_sort_buffer_size   = DEFAULT;
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-8388608
-SET @@session.myisam_sort_buffer_size   = 200;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '200'
-SET @@session.myisam_sort_buffer_size   = DEFAULT;
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-8388608
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.myisam_sort_buffer_size   = DEFAULT;
-SELECT @@global.myisam_sort_buffer_size   = 8388608;
-@@global.myisam_sort_buffer_size   = 8388608
-1
-SET @@session.myisam_sort_buffer_size   = DEFAULT;
-SELECT @@session.myisam_sort_buffer_size   = 8388608;
-@@session.myisam_sort_buffer_size   = 8388608
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.myisam_sort_buffer_size   = 4;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '4'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-SET @@global.myisam_sort_buffer_size   = 4294967295;
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = 655354;
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-655354
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.myisam_sort_buffer_size   = 4;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '4'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = 4294967295;
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4294967295
-SET @@session.myisam_sort_buffer_size   = 655345;
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-655345
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.myisam_sort_buffer_size   = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '0'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-SET @@global.myisam_sort_buffer_size   = -1024;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '-1024'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-SET @@global.myisam_sort_buffer_size   = 429496729533;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '429496729533'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = 'test';
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = ON;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@session.myisam_sort_buffer_size   = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '0'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = -2;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '-2'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.myisam_sort_buffer_size   = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='myisam_sort_buffer_size  ';
-@@global.myisam_sort_buffer_size   = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.myisam_sort_buffer_size   = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='myisam_sort_buffer_size  ';
-@@session.myisam_sort_buffer_size   = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_08-----------------------#'
-SET @@global.myisam_sort_buffer_size   = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '1'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-SET @@global.myisam_sort_buffer_size   = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '0'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.myisam_sort_buffer_size   = 10;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '10'
-SELECT @@myisam_sort_buffer_size   = @@global.myisam_sort_buffer_size  ;
-@@myisam_sort_buffer_size   = @@global.myisam_sort_buffer_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@myisam_sort_buffer_size   = 100;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '100'
-SELECT @@myisam_sort_buffer_size   = @@local.myisam_sort_buffer_size  ;
-@@myisam_sort_buffer_size   = @@local.myisam_sort_buffer_size
-1
-SELECT @@local.myisam_sort_buffer_size   = @@session.myisam_sort_buffer_size  ;
-@@local.myisam_sort_buffer_size   = @@session.myisam_sort_buffer_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET myisam_sort_buffer_size   = 1;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '1'
-SELECT @@myisam_sort_buffer_size  ;
-@@myisam_sort_buffer_size
-4096
-SELECT local.myisam_sort_buffer_size  ;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.myisam_sort_buffer_size  ;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT myisam_sort_buffer_size   = @@session.myisam_sort_buffer_size  ;
-ERROR 42S22: Unknown column 'myisam_sort_buffer_size' in 'field list'
-SET @@global.myisam_sort_buffer_size   = @start_global_value;
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-8388608
-SET @@session.myisam_sort_buffer_size   = @start_session_value;
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-8388608
diff --git a/mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result b/mysql-test/suite/sys_vars/r/net_retry_count_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result
rename to mysql-test/suite/sys_vars/r/net_retry_count_basic.result
diff --git a/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result
deleted file mode 100644
index 46eb9d5e1c0..00000000000
--- a/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result
+++ /dev/null
@@ -1,191 +0,0 @@
-SET @start_global_value = @@global.net_retry_count;
-SELECT @start_global_value;
-@start_global_value
-10
-SET @start_session_value = @@session.net_retry_count;
-SELECT @start_session_value;
-@start_session_value
-10
-'#--------------------FN_DYNVARS_111_01-------------------------#'
-SET @@global.net_retry_count = 100;
-SET @@global.net_retry_count = DEFAULT;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-10
-SET @@session.net_retry_count = 200;
-SET @@session.net_retry_count = DEFAULT;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-10
-'#--------------------FN_DYNVARS_111_02-------------------------#'
-SET @@global.net_retry_count = DEFAULT;
-SELECT @@global.net_retry_count = 10;
-@@global.net_retry_count = 10
-1
-SET @@session.net_retry_count = DEFAULT;
-SELECT @@session.net_retry_count = 10;
-@@session.net_retry_count = 10
-1
-'#--------------------FN_DYNVARS_111_03-------------------------#'
-SET @@global.net_retry_count = 1;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-SET @@global.net_retry_count = 2;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-2
-SET @@global.net_retry_count = 4294967295;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@global.net_retry_count = 4294967294;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967294
-SET @@global.net_retry_count = 65536;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-65536
-'#--------------------FN_DYNVARS_111_04-------------------------#'
-SET @@session.net_retry_count = 1;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-1
-SET @@session.net_retry_count = 2;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-2
-SET @@session.net_retry_count = 65535;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-65535
-SET @@session.net_retry_count = 4294967295;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967295
-SET @@session.net_retry_count = 4294967294;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967294
-'#------------------FN_DYNVARS_111_05-----------------------#'
-SET @@global.net_retry_count = 0;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '0'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-SET @@global.net_retry_count = -1024;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '-1024'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-SET @@global.net_retry_count = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '4294967296'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@global.net_retry_count = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '429496729500'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@global.net_retry_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'net_retry_count'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@global.net_retry_count = test;
-ERROR 42000: Incorrect argument type to variable 'net_retry_count'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@session.net_retry_count = 0;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '0'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-1
-SET @@session.net_retry_count = -2;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '-2'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-1
-SET @@session.net_retry_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'net_retry_count'
-SET @@session.net_retry_count = 6555015425;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '6555015425'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967295
-SET @@session.net_retry_count = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '4294967296'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967295
-SET @@session.net_retry_count = test;
-ERROR 42000: Incorrect argument type to variable 'net_retry_count'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967295
-'#------------------FN_DYNVARS_111_06-----------------------#'
-SELECT @@global.net_retry_count = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='net_retry_count';
-@@global.net_retry_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_111_07-----------------------#'
-SELECT @@session.net_retry_count = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='net_retry_count';
-@@session.net_retry_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_111_08-----------------------#'
-SET @@global.net_retry_count = TRUE;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-SET @@global.net_retry_count = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '0'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-'#---------------------FN_DYNVARS_111_09----------------------#'
-SET @@global.net_retry_count = 10;
-SELECT @@net_retry_count = @@global.net_retry_count;
-@@net_retry_count = @@global.net_retry_count
-0
-'#---------------------FN_DYNVARS_111_10----------------------#'
-SET @@net_retry_count = 100;
-SELECT @@net_retry_count = @@local.net_retry_count;
-@@net_retry_count = @@local.net_retry_count
-1
-SELECT @@local.net_retry_count = @@session.net_retry_count;
-@@local.net_retry_count = @@session.net_retry_count
-1
-'#---------------------FN_DYNVARS_111_11----------------------#'
-SET net_retry_count = 1;
-SELECT @@net_retry_count;
-@@net_retry_count
-1
-SELECT local.net_retry_count;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.net_retry_count;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT net_retry_count = @@session.net_retry_count;
-ERROR 42S22: Unknown column 'net_retry_count' in 'field list'
-SET @@global.net_retry_count = @start_global_value;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-10
-SET @@session.net_retry_count = @start_session_value;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-10
diff --git a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/query_alloc_block_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
deleted file mode 100644
index eb6851baa93..00000000000
--- a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
+++ /dev/null
@@ -1,184 +0,0 @@
-SET @start_global_value = @@global.query_alloc_block_size;
-SELECT @start_global_value;
-@start_global_value
-8192
-SET @start_session_value = @@session.query_alloc_block_size;
-SELECT @start_session_value;
-@start_session_value
-8192
-'#--------------------FN_DYNVARS_130_01-------------------------#'
-SET @@global.query_alloc_block_size = 10000;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '10000'
-SET @@global.query_alloc_block_size = DEFAULT;
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-8192
-SET @@session.query_alloc_block_size = 20000;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '20000'
-SET @@session.query_alloc_block_size = DEFAULT;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-8192
-'#--------------------FN_DYNVARS_130_02-------------------------#'
-SET @@global.query_alloc_block_size = DEFAULT;
-SELECT @@global.query_alloc_block_size = 8192;
-@@global.query_alloc_block_size = 8192
-1
-SET @@session.query_alloc_block_size = DEFAULT;
-SELECT @@session.query_alloc_block_size = 8192;
-@@session.query_alloc_block_size = 8192
-1
-'#--------------------FN_DYNVARS_130_03-------------------------#'
-SET @@global.query_alloc_block_size = 1024;
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = 1025;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1025'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = 65536;
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-65536
-'#--------------------FN_DYNVARS_130_04-------------------------#'
-SET @@session.query_alloc_block_size = 1024;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = 1025;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1025'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = 655536;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '655536'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-655360
-'#------------------FN_DYNVARS_130_05-----------------------#'
-SET @@global.query_alloc_block_size = 64;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '64'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = -1;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '-1'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = 1023;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1023'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = test;
-ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = 64;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '64'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = -2;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '-2'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
-SET @@session.query_alloc_block_size = 1023;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1023'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = test;
-ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-'#------------------FN_DYNVARS_130_06-----------------------#'
-SET @@global.query_alloc_block_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1'
-SET @@session.query_alloc_block_size = 12;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '12'
-SELECT @@global.query_alloc_block_size = 
-VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='query_alloc_block_size';
-@@global.query_alloc_block_size = 
-VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_130_07-----------------------#'
-SELECT @@session.query_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='query_alloc_block_size';
-@@session.query_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_130_08-----------------------#'
-SET @@global.query_alloc_block_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '0'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-'#---------------------FN_DYNVARS_130_09----------------------#'
-SET @@global.query_alloc_block_size = 2048;
-SELECT @@query_alloc_block_size = @@global.query_alloc_block_size;
-@@query_alloc_block_size = @@global.query_alloc_block_size
-0
-'#---------------------FN_DYNVARS_130_10----------------------#'
-SET @@query_alloc_block_size = 5000;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '5000'
-SELECT @@query_alloc_block_size = @@local.query_alloc_block_size;
-@@query_alloc_block_size = @@local.query_alloc_block_size
-1
-SELECT @@local.query_alloc_block_size = @@session.query_alloc_block_size;
-@@local.query_alloc_block_size = @@session.query_alloc_block_size
-1
-'#---------------------FN_DYNVARS_130_11----------------------#'
-SET query_alloc_block_size = 1024;
-SELECT @@query_alloc_block_size;
-@@query_alloc_block_size
-1024
-SELECT local.query_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.query_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT query_alloc_block_size = @@session.query_alloc_block_size;
-ERROR 42S22: Unknown column 'query_alloc_block_size' in 'field list'
-SET @@global.query_alloc_block_size = @start_global_value;
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-8192
-SET @@session.query_alloc_block_size = @start_session_value;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-8192
diff --git a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result
rename to mysql-test/suite/sys_vars/r/query_cache_limit_basic.result
diff --git a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result
deleted file mode 100644
index 892bc306bcb..00000000000
--- a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result
+++ /dev/null
@@ -1,129 +0,0 @@
-SET @start_value = @@global.query_cache_limit;
-SELECT @start_value;
-@start_value
-1048576
-'#--------------------FN_DYNVARS_131_01------------------------#'
-SET @@global.query_cache_limit = 99;
-SET @@global.query_cache_limit = DEFAULT;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1048576
-'#---------------------FN_DYNVARS_131_02-------------------------#'
-SET @@global.query_cache_limit = @start_value;
-SELECT @@global.query_cache_limit = 1048576;
-@@global.query_cache_limit = 1048576
-1
-'#--------------------FN_DYNVARS_131_03------------------------#'
-SET @@global.query_cache_limit = 0;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-0
-SET @@global.query_cache_limit = 1;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1
-SET @@global.query_cache_limit = 1048576;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1048576
-SET @@global.query_cache_limit = 1048575;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1048575
-'#--------------------FN_DYNVARS_131_04-------------------------#'
-SET @@global.query_cache_limit = -1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '-1'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-0
-SET @@global.query_cache_limit = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '4294967296'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = 10240022115;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '10240022115'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'query_cache_limit'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = -1024;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '-1024'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-0
-SET @@global.query_cache_limit = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '42949672950'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = ON;
-ERROR 42000: Incorrect argument type to variable 'query_cache_limit'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = 'test';
-ERROR 42000: Incorrect argument type to variable 'query_cache_limit'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-'#-------------------FN_DYNVARS_131_05----------------------------#'
-SET @@session.query_cache_limit = 0;
-ERROR HY000: Variable 'query_cache_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_limit;
-@@query_cache_limit
-4294967295
-'#----------------------FN_DYNVARS_131_06------------------------#'
-SELECT @@global.query_cache_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_limit';
-@@global.query_cache_limit = VARIABLE_VALUE
-1
-SELECT @@query_cache_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_limit';
-@@query_cache_limit = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_131_07----------------------#'
-SET @@global.query_cache_limit = TRUE;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1
-SET @@global.query_cache_limit = FALSE;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-0
-'#---------------------FN_DYNVARS_131_08----------------------#'
-SET @@global.query_cache_limit = 1;
-SELECT @@query_cache_limit = @@global.query_cache_limit;
-@@query_cache_limit = @@global.query_cache_limit
-1
-'#---------------------FN_DYNVARS_131_09----------------------#'
-SET query_cache_limit = 1;
-ERROR HY000: Variable 'query_cache_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_limit;
-@@query_cache_limit
-1
-SET local.query_cache_limit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1
-SELECT local.query_cache_limit;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.query_cache_limit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1
-SELECT global.query_cache_limit;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT query_cache_limit = @@session.query_cache_limit;
-ERROR 42S22: Unknown column 'query_cache_limit' in 'field list'
-SET @@global.query_cache_limit = @start_value;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1048576
diff --git a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result
similarity index 89%
rename from mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result
rename to mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result
index 3d2c02c48fc..bc93f966376 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result
@@ -4,6 +4,8 @@ SELECT @start_value;
 4096
 '#--------------------FN_DYNVARS_132_01------------------------#'
 SET @@global.query_cache_min_res_unit = 99;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_min_res_unit value: '99'
 SET @@global.query_cache_min_res_unit = DEFAULT;
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
@@ -19,6 +21,8 @@ SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
 512
 SET @@global.query_cache_min_res_unit = 1;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_min_res_unit value: '1'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
 512
@@ -27,17 +31,21 @@ SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
 512
 SET @@global.query_cache_min_res_unit = 513;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_min_res_unit value: '513'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-520
+512
 SET @@global.query_cache_min_res_unit = 1048576;
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
 1048576
 SET @@global.query_cache_min_res_unit = 1048575;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_min_res_unit value: '1048575'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-1048576
+1048568
 '#--------------------FN_DYNVARS_132_04-------------------------#'
 SET @@global.query_cache_min_res_unit = -1;
 Warnings:
@@ -50,8 +58,10 @@ Warnings:
 Warning	1292	Truncated incorrect query_cache_min_res_unit value: '4294967296'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-0
+4294967288
 SET @@global.query_cache_min_res_unit = 511;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_min_res_unit value: '511'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
 512
@@ -71,23 +81,23 @@ Warnings:
 Warning	1292	Truncated incorrect query_cache_min_res_unit value: '42949672950'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-0
+4294967288
 SET @@global.query_cache_min_res_unit = ON;
 ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-0
+4294967288
 SET @@global.query_cache_min_res_unit = 'test';
 ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-0
+4294967288
 '#-------------------FN_DYNVARS_132_05----------------------------#'
 SET @@session.query_cache_min_res_unit = 0;
 ERROR HY000: Variable 'query_cache_min_res_unit' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT @@query_cache_min_res_unit;
 @@query_cache_min_res_unit
-0
+4294967288
 '#----------------------FN_DYNVARS_132_06------------------------#'
 SELECT @@global.query_cache_min_res_unit = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
@@ -101,6 +111,8 @@ WHERE VARIABLE_NAME='query_cache_min_res_unit';
 1
 '#---------------------FN_DYNVARS_132_07----------------------#'
 SET @@global.query_cache_min_res_unit = TRUE;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_min_res_unit value: '1'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
 512
@@ -110,6 +122,8 @@ SELECT @@global.query_cache_min_res_unit;
 512
 '#---------------------FN_DYNVARS_132_08----------------------#'
 SET @@global.query_cache_min_res_unit = 1;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_min_res_unit value: '1'
 SELECT @@query_cache_min_res_unit = @@global.query_cache_min_res_unit;
 @@query_cache_min_res_unit = @@global.query_cache_min_res_unit
 1
diff --git a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result
deleted file mode 100644
index f02232d4d39..00000000000
--- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result
+++ /dev/null
@@ -1,135 +0,0 @@
-SET @start_value = @@global.query_cache_min_res_unit;
-SELECT @start_value;
-@start_value
-4096
-'#--------------------FN_DYNVARS_132_01------------------------#'
-SET @@global.query_cache_min_res_unit = 99;
-SET @@global.query_cache_min_res_unit = DEFAULT;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4096
-'#---------------------FN_DYNVARS_132_02-------------------------#'
-SET @@global.query_cache_min_res_unit = @start_value;
-SELECT @@global.query_cache_min_res_unit = 4096;
-@@global.query_cache_min_res_unit = 4096
-1
-'#--------------------FN_DYNVARS_132_03------------------------#'
-SET @@global.query_cache_min_res_unit = 0;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 1;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 512;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 513;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-520
-SET @@global.query_cache_min_res_unit = 1048576;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-1048576
-SET @@global.query_cache_min_res_unit = 1048575;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-1048576
-'#--------------------FN_DYNVARS_132_04-------------------------#'
-SET @@global.query_cache_min_res_unit = -1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_min_res_unit value: '-1'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_min_res_unit value: '4294967296'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4294967296
-SET @@global.query_cache_min_res_unit = 511;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = -1024;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_min_res_unit value: '-1024'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_min_res_unit value: '42949672950'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4294967296
-SET @@global.query_cache_min_res_unit = ON;
-ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4294967296
-SET @@global.query_cache_min_res_unit = 'test';
-ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4294967296
-'#-------------------FN_DYNVARS_132_05----------------------------#'
-SET @@session.query_cache_min_res_unit = 0;
-ERROR HY000: Variable 'query_cache_min_res_unit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_min_res_unit;
-@@query_cache_min_res_unit
-4294967296
-'#----------------------FN_DYNVARS_132_06------------------------#'
-SELECT @@global.query_cache_min_res_unit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_min_res_unit';
-@@global.query_cache_min_res_unit = VARIABLE_VALUE
-1
-SELECT @@query_cache_min_res_unit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_min_res_unit';
-@@query_cache_min_res_unit = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_132_07----------------------#'
-SET @@global.query_cache_min_res_unit = TRUE;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = FALSE;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-'#---------------------FN_DYNVARS_132_08----------------------#'
-SET @@global.query_cache_min_res_unit = 1;
-SELECT @@query_cache_min_res_unit = @@global.query_cache_min_res_unit;
-@@query_cache_min_res_unit = @@global.query_cache_min_res_unit
-1
-'#---------------------FN_DYNVARS_132_09----------------------#'
-SET query_cache_min_res_unit = 1;
-ERROR HY000: Variable 'query_cache_min_res_unit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_min_res_unit;
-@@query_cache_min_res_unit
-512
-SET local.query_cache_min_res_unit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1
-SELECT local.query_cache_min_res_unit;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.query_cache_min_res_unit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1
-SELECT global.query_cache_min_res_unit;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT query_cache_min_res_unit = @@session.query_cache_min_res_unit;
-ERROR 42S22: Unknown column 'query_cache_min_res_unit' in 'field list'
-SET @@global.query_cache_min_res_unit = @start_value;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4096
diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/query_cache_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
deleted file mode 100644
index 319948deefa..00000000000
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
+++ /dev/null
@@ -1,133 +0,0 @@
-SET @start_value = @@global.query_cache_size;
-'#--------------------FN_DYNVARS_133_01------------------------#'
-SET @@global.query_cache_size = 99;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '99'
-SET @@global.query_cache_size = DEFAULT;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-'#---------------------FN_DYNVARS_133_02-------------------------#'
-SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size = @start_value;
-@@global.query_cache_size = @start_value
-1
-'#--------------------FN_DYNVARS_133_03------------------------#'
-SET @@global.query_cache_size = 0;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '1'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 512;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '512'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 1024;
-Warnings:
-Warning	1282	Query cache failed to set size 1024; new query cache size is 0
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 1048576;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-1048576
-SET @@global.query_cache_size = 1048575;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '1048575'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-1047552
-'#--------------------FN_DYNVARS_133_04-------------------------#'
-SET @@global.query_cache_size = -1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '-1'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 511;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '511'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'query_cache_size'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '-1024'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = ON;
-ERROR 42000: Incorrect argument type to variable 'query_cache_size'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'query_cache_size'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-'#-------------------FN_DYNVARS_133_05----------------------------#'
-SET @@session.query_cache_size = 0;
-ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_size;
-@@query_cache_size
-0
-'#----------------------FN_DYNVARS_133_06------------------------#'
-SELECT @@global.query_cache_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_size';
-@@global.query_cache_size = VARIABLE_VALUE
-1
-SELECT @@query_cache_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='query_cache_size';
-@@query_cache_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_133_07----------------------#'
-SET @@global.query_cache_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '1'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = FALSE;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-'#---------------------FN_DYNVARS_133_08----------------------#'
-SET @@global.query_cache_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '1'
-SELECT @@query_cache_size = @@global.query_cache_size;
-@@query_cache_size = @@global.query_cache_size
-1
-'#---------------------FN_DYNVARS_133_09----------------------#'
-SET query_cache_size = 1;
-ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_size;
-@@query_cache_size
-0
-SET local.query_cache_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1
-SELECT local.query_cache_size;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.query_cache_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1
-SELECT global.query_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT query_cache_size = @@session.query_cache_size;
-ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
-SET @@global.query_cache_size = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/range_alloc_block_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result
deleted file mode 100644
index 26b32b56e57..00000000000
--- a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result
+++ /dev/null
@@ -1,187 +0,0 @@
-SET @start_global_value = @@global.range_alloc_block_size;
-SELECT @start_global_value;
-@start_global_value
-4096
-SET @start_session_value = @@session.range_alloc_block_size;
-SELECT @start_session_value;
-@start_session_value
-4096
-'#--------------------FN_DYNVARS_137_01-------------------------#'
-SET @@global.range_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '100'
-SET @@global.range_alloc_block_size = DEFAULT;
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '200'
-SET @@session.range_alloc_block_size = DEFAULT;
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096
-'#--------------------FN_DYNVARS_137_02-------------------------#'
-SET @@global.range_alloc_block_size = DEFAULT;
-SELECT @@global.range_alloc_block_size = 2048;
-@@global.range_alloc_block_size = 2048
-0
-SET @@session.range_alloc_block_size = DEFAULT;
-SELECT @@session.range_alloc_block_size = 2048;
-@@session.range_alloc_block_size = 2048
-0
-'#--------------------FN_DYNVARS_137_03-------------------------#'
-SET @@global.range_alloc_block_size = 2048;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '2048'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@global.range_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967295'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-SET @@global.range_alloc_block_size = 4294967294;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967294'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-'#--------------------FN_DYNVARS_137_04-------------------------#'
-SET @@session.range_alloc_block_size = 2048;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '2048'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967295'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4294966272
-SET @@session.range_alloc_block_size = 4294967294;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967294'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4294966272
-'#------------------FN_DYNVARS_137_05-----------------------#'
-SET @@global.range_alloc_block_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '0'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@global.range_alloc_block_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '-1024'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@global.range_alloc_block_size = 42949672951;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '42949672951'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-SET @@global.range_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-SET @@global.range_alloc_block_size = test;
-ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-SET @@session.range_alloc_block_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '0'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = -2;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '-2'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size'
-SET @@session.range_alloc_block_size = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967296'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4294966272
-SET @@session.range_alloc_block_size = test;
-ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4294966272
-'#------------------FN_DYNVARS_137_06-----------------------#'
-SELECT @@global.range_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='range_alloc_block_size';
-@@global.range_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_137_07-----------------------#'
-SELECT @@session.range_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='range_alloc_block_size';
-@@session.range_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_137_08-----------------------#'
-SET @@global.range_alloc_block_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '1'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@global.range_alloc_block_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '0'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-'#---------------------FN_DYNVARS_137_09----------------------#'
-SET @@global.range_alloc_block_size = 10;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '10'
-SELECT @@range_alloc_block_size = @@global.range_alloc_block_size;
-@@range_alloc_block_size = @@global.range_alloc_block_size
-0
-'#---------------------FN_DYNVARS_137_10----------------------#'
-SET @@range_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '100'
-SELECT @@range_alloc_block_size = @@local.range_alloc_block_size;
-@@range_alloc_block_size = @@local.range_alloc_block_size
-1
-SELECT @@local.range_alloc_block_size = @@session.range_alloc_block_size;
-@@local.range_alloc_block_size = @@session.range_alloc_block_size
-1
-'#---------------------FN_DYNVARS_137_11----------------------#'
-SET range_alloc_block_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '1'
-SELECT @@range_alloc_block_size;
-@@range_alloc_block_size
-4096
-SELECT local.range_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.range_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT range_alloc_block_size = @@session.range_alloc_block_size;
-ERROR 42S22: Unknown column 'range_alloc_block_size' in 'field list'
-SET @@global.range_alloc_block_size = @start_global_value;
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = @start_session_value;
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096
diff --git a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic.result
similarity index 92%
rename from mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result
rename to mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic.result
index 5b685ae3706..af61d40e84e 100644
--- a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result
+++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic.result
@@ -32,26 +32,17 @@ SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
 123456789
 SET @@global.rpl_recovery_rank = 2147483648*2;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
-4294967296
+4294967295
 SET @@global.rpl_recovery_rank = 2147483648*1024;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
-2199023255552
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-2199023255552
+4294967295
 SET @@global.rpl_recovery_rank = 2147483648*2147483648;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
-4611686018427387904
+4294967295
 '#--------------------FN_DYNVARS_142_03-------------------------#'
 SET @@rpl_recovery_rank = 2;
 ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
diff --git a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
deleted file mode 100644
index b3572eda3c7..00000000000
--- a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
+++ /dev/null
@@ -1,144 +0,0 @@
-SET @start_global_value = @@global.rpl_recovery_rank;
-SELECT @start_global_value;
-@start_global_value
-0
-'#--------------------FN_DYNVARS_142_01-------------------------#'
-SET @@global.rpl_recovery_rank = 500000;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SET @@global.rpl_recovery_rank = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-'#--------------------FN_DYNVARS_142_02-------------------------#'
-SET @@global.rpl_recovery_rank = 0;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-SET @@global.rpl_recovery_rank = 1024;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-1024
-SET @@global.rpl_recovery_rank = 123456789;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-123456789
-SET @@global.rpl_recovery_rank = 2147483648*2;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '4294967296'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-4294967295
-SET @@global.rpl_recovery_rank = 2147483648*1024;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '2199023255552'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-4294967295
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-4294967295
-SET @@global.rpl_recovery_rank = 2147483648*2147483648;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '4611686018427387904'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-4294967295
-'#--------------------FN_DYNVARS_142_03-------------------------#'
-SET @@rpl_recovery_rank = 2;
-ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@session.rpl_recovery_rank = 3;
-ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@local.rpl_recovery_rank = 4;
-ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
-'#------------------FN_DYNVARS_142_04-----------------------#'
-SET @@global.rpl_recovery_rank = -1;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '-1'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-SET @@global.rpl_recovery_rank = -2147483648;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '-2147483648'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-SET @@global.rpl_recovery_rank = -2147483649;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '-2147483649'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-SET @@global.rpl_recovery_rank = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'rpl_recovery_rank'
-SET @@global.rpl_recovery_rank = 2147483649.56;
-ERROR 42000: Incorrect argument type to variable 'rpl_recovery_rank'
-SET @@global.rpl_recovery_rank = 1G;
-ERROR 42000: Incorrect argument type to variable 'rpl_recovery_rank'
-'#------------------FN_DYNVARS_142_05-----------------------#'
-SET @@global.rpl_recovery_rank = 3000;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='rpl_recovery_rank';
-@@global.rpl_recovery_rank = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_142_06-----------------------#'
-SELECT count(VARIABLE_VALUE) 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='rpl_recovery_rank';
-count(VARIABLE_VALUE)
-1
-'#------------------FN_DYNVARS_142_07-----------------------#'
-SET @@global.rpl_recovery_rank = TRUE;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-1
-SET @@global.rpl_recovery_rank = FALSE;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-'#---------------------FN_DYNVARS_001_08----------------------#'
-SET @@global.rpl_recovery_rank = 512;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@rpl_recovery_rank = @@global.rpl_recovery_rank;
-@@rpl_recovery_rank = @@global.rpl_recovery_rank
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET rpl_recovery_rank = 2048;
-ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT rpl_recovery_rank;
-ERROR 42S22: Unknown column 'rpl_recovery_rank' in 'field list'
-SELECT @@rpl_recovery_rank;
-@@rpl_recovery_rank
-512
-SET global rpl_recovery_rank = 64;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SET @@global.rpl_recovery_rank = @start_global_value;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
diff --git a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result
rename to mysql-test/suite/sys_vars/r/slave_transaction_retries_basic.result
diff --git a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
deleted file mode 100644
index 86a760a5386..00000000000
--- a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
+++ /dev/null
@@ -1,120 +0,0 @@
-SET @start_global_value = @@global.slave_transaction_retries;
-SELECT @start_global_value;
-@start_global_value
-10
-'#--------------------FN_DYNVARS_149_01-------------------------#'
-SET @@global.slave_transaction_retries = 50;
-SET @@global.slave_transaction_retries = DEFAULT;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-10
-'#--------------------FN_DYNVARS_149_02-------------------------#'
-SET @@global.slave_transaction_retries = DEFAULT;
-SELECT @@global.slave_transaction_retries = 10;
-@@global.slave_transaction_retries = 10
-1
-'#--------------------FN_DYNVARS_149_03-------------------------#'
-SET @@global.slave_transaction_retries = 0;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-0
-SET @@global.slave_transaction_retries = 1;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-1
-SET @@global.slave_transaction_retries = 15;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-15
-SET @@global.slave_transaction_retries = 1024;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-1024
-SET @@global.slave_transaction_retries = 2147483648;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-2147483648
-SET @@global.slave_transaction_retries = 2147483648*2-1;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-SET @@global.slave_transaction_retries = 2147483649*2;
-Warnings:
-Warning	1292	Truncated incorrect slave_transaction_retries value: '4294967298'
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-SET @@global.slave_transaction_retries = 4294967295;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-'#--------------------FN_DYNVARS_149_04-------------------------#'
-SET @@slave_transaction_retries = 2;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@session.slave_transaction_retries = 3;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@local.slave_transaction_retries = 4;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set with SET GLOBAL
-'#------------------FN_DYNVARS_149_05-----------------------#'
-SET @@global.slave_transaction_retries = -1;
-Warnings:
-Warning	1292	Truncated incorrect slave_transaction_retries value: '-1'
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-0
-SET @@global.slave_transaction_retries = 2147483649*2147483649;
-Warnings:
-Warning	1292	Truncated incorrect slave_transaction_retries value: '4611686022722355201'
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-SET @@global.slave_transaction_retries = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = '100';
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = 7483649.56;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = ON;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = OFF;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-'#------------------FN_DYNVARS_149_06-----------------------#'
-SET @@global.slave_transaction_retries = 3000;
-SELECT @@global.slave_transaction_retries = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='slave_transaction_retries';
-@@global.slave_transaction_retries = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_149_07-----------------------#'
-SELECT count(VARIABLE_VALUE) 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='slave_transaction_retries';
-count(VARIABLE_VALUE)
-1
-'#------------------FN_DYNVARS_149_08-----------------------#'
-SET @@global.slave_transaction_retries = TRUE;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-1
-SET @@global.slave_transaction_retries = FALSE;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-0
-'#---------------------FN_DYNVARS_149_09----------------------#'
-SET @@global.slave_transaction_retries = 60*60;
-SELECT @@slave_transaction_retries = @@global.slave_transaction_retries;
-@@slave_transaction_retries = @@global.slave_transaction_retries
-1
-'#---------------------FN_DYNVARS_149_10----------------------#'
-SET slave_transaction_retries = 2048;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT slave_transaction_retries;
-ERROR 42S22: Unknown column 'slave_transaction_retries' in 'field list'
-SELECT @@slave_transaction_retries;
-@@slave_transaction_retries
-3600
-SET global slave_transaction_retries = 99;
-SET @@global.slave_transaction_retries = @start_global_value;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-10
diff --git a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/sort_buffer_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
deleted file mode 100644
index b492a343a9b..00000000000
--- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
+++ /dev/null
@@ -1,140 +0,0 @@
-SET @start_global_value = @@global.sort_buffer_size;
-SET @start_session_value = @@session.sort_buffer_size;
-'#--------------------FN_DYNVARS_151_01-------------------------#'
-SET @@global.sort_buffer_size = 1000;
-SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-2097152
-SET @@session.sort_buffer_size = 2000;
-SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-2097152
-'#--------------------FN_DYNVARS_151_02-------------------------#'
-SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-2097152
-SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-2097152
-'#--------------------FN_DYNVARS_151_03-------------------------#'
-SET @@global.sort_buffer_size = 32776;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-32776
-SET @@global.sort_buffer_size = 32777;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-32777
-SET @@global.sort_buffer_size = 4294967295;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967295
-SET @@global.sort_buffer_size = 4294967294;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967294
-'#--------------------FN_DYNVARS_151_04-------------------------#'
-SET @@session.sort_buffer_size = 32776;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-32776
-SET @@session.sort_buffer_size = 32777;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-32777
-SET @@session.sort_buffer_size = 4294967295;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-4294967295
-SET @@session.sort_buffer_size = 4294967294;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-4294967294
-'#------------------FN_DYNVARS_151_05-----------------------#'
-SET @@global.sort_buffer_size = 32775;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-32775
-SET @@global.sort_buffer_size = -1024;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-1024
-SET @@global.sort_buffer_size = 4294967296;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967296
-SET @@global.sort_buffer_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967296
-SET @@global.sort_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967296
-SET @@session.sort_buffer_size = 32775;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-32775
-SET @@session.sort_buffer_size = -2;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-1024
-SET @@session.sort_buffer_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-SET @@session.sort_buffer_size = 4294967296;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-4294967296
-SET @@session.sort_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-'#------------------FN_DYNVARS_151_06-----------------------#'
-SELECT @@global.sort_buffer_size = VARIABLE_VALUE FROM 
-INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
-@@global.sort_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_151_07-----------------------#'
-SELECT @@session.sort_buffer_size = VARIABLE_VALUE FROM
-INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
-@@session.sort_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_151_08-----------------------#'
-SET @@global.sort_buffer_size = TRUE;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-1024
-SET @@global.sort_buffer_size = FALSE;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-1024
-'#---------------------FN_DYNVARS_151_09----------------------#'
-SET @@global.sort_buffer_size = 9000;
-SELECT @@sort_buffer_size = @@global.sort_buffer_size;
-@@sort_buffer_size = @@global.sort_buffer_size
-0
-'#---------------------FN_DYNVARS_151_10----------------------#'
-SET @@sort_buffer_size = 9000;
-SELECT @@sort_buffer_size = @@local.sort_buffer_size;
-@@sort_buffer_size = @@local.sort_buffer_size
-1
-SELECT @@local.sort_buffer_size = @@session.sort_buffer_size;
-@@local.sort_buffer_size = @@session.sort_buffer_size
-1
-'#---------------------FN_DYNVARS_151_11----------------------#'
-SET sort_buffer_size = 9100;
-SELECT @@sort_buffer_size;
-@@sort_buffer_size
-9100
-SELECT local.sort_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.sort_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT sort_buffer_size = @@session.sort_buffer_size;
-ERROR 42S22: Unknown column 'sort_buffer_size' in 'field list'
-SET @@global.sort_buffer_size = @start_global_value;
-SET @@session.sort_buffer_size = @start_session_value;
diff --git a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
deleted file mode 100644
index a7afc334ba1..00000000000
--- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
+++ /dev/null
@@ -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 --git a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
similarity index 100%
rename from mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
rename to mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
diff --git a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
deleted file mode 100644
index cbd25426408..00000000000
--- a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
+++ /dev/null
@@ -1,162 +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
-'#--------------------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'
-'#------------------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
-1
-'#---------------------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 --git a/mysql-test/suite/sys_vars/inc/binlog_cache_size_basic.inc b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/binlog_cache_size_basic.inc
rename to mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test
deleted file mode 100644
index 7506e2567a0..00000000000
--- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# created by Horst Hunger        2008-05-07                                    #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/binlog_cache_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
deleted file mode 100644
index 384388fd631..00000000000
--- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# created by Horst Hunger        2008-05-07                                    #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/binlog_cache_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc
rename to mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test
deleted file mode 100644
index 5705467b8c4..00000000000
--- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test
deleted file mode 100644
index 763fca05014..00000000000
--- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
rename to mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
deleted file mode 100644
index 55f9f3fe010..00000000000
--- a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
deleted file mode 100644
index 8c8be473074..00000000000
--- a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc
rename to mysql-test/suite/sys_vars/t/delayed_insert_limit_basic.test
diff --git a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test
deleted file mode 100644
index 750202df0f3..00000000000
--- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/delayed_insert_limit_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test
deleted file mode 100644
index 960f00e4bcf..00000000000
--- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/delayed_insert_limit_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc
rename to mysql-test/suite/sys_vars/t/delayed_queue_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test
deleted file mode 100644
index 8c0027b2e3e..00000000000
--- a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/delayed_queue_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test
deleted file mode 100644
index c58da380fe4..00000000000
--- a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/delayed_queue_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc b/mysql-test/suite/sys_vars/t/join_buffer_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc
rename to mysql-test/suite/sys_vars/t/join_buffer_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test
deleted file mode 100644
index 7886b1307ee..00000000000
--- a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/join_buffer_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test
deleted file mode 100644
index 65327e7afea..00000000000
--- a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/join_buffer_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/key_cache_age_threshold_basic.inc b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/key_cache_age_threshold_basic.inc
rename to mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic.test
diff --git a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test
deleted file mode 100644
index 1f10d9a3297..00000000000
--- a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/key_cache_age_threshold_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test
deleted file mode 100644
index a3d27a7eae9..00000000000
--- a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/key_cache_age_threshold_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/log_warnings_basic.inc b/mysql-test/suite/sys_vars/t/log_warnings_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/log_warnings_basic.inc
rename to mysql-test/suite/sys_vars/t/log_warnings_basic.test
diff --git a/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test b/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test
deleted file mode 100644
index c3ebd043b30..00000000000
--- a/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/log_warnings_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test b/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test
deleted file mode 100644
index 15781e7a912..00000000000
--- a/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/log_warnings_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/max_connect_errors_basic.inc b/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/max_connect_errors_basic.inc
rename to mysql-test/suite/sys_vars/t/max_connect_errors_basic.test
diff --git a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test
deleted file mode 100644
index 23aeb1eb8b5..00000000000
--- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/max_connect_errors_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test
deleted file mode 100644
index a206cdb580f..00000000000
--- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/max_connect_errors_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/max_seeks_for_key_basic.inc b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/max_seeks_for_key_basic.inc
rename to mysql-test/suite/sys_vars/t/max_seeks_for_key_basic.test
diff --git a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test
deleted file mode 100644
index fef100cd432..00000000000
--- a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/max_seeks_for_key_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test
deleted file mode 100644
index 3f50a068023..00000000000
--- a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/max_seeks_for_key_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/max_tmp_tables_basic.inc b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/max_tmp_tables_basic.inc
rename to mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test
diff --git a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test
deleted file mode 100644
index 10446926f3d..00000000000
--- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/max_tmp_tables_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test
deleted file mode 100644
index dfc7d76d30e..00000000000
--- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/max_tmp_tables_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/max_write_lock_count_basic.inc b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/max_write_lock_count_basic.inc
rename to mysql-test/suite/sys_vars/t/max_write_lock_count_basic.test
diff --git a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test
deleted file mode 100644
index faaf8666bad..00000000000
--- a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/max_write_lock_count_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
deleted file mode 100644
index 4ecd26bd505..00000000000
--- a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/max_write_lock_count_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc
rename to mysql-test/suite/sys_vars/t/min_examined_row_limit_basic.test
diff --git a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
deleted file mode 100644
index 67ff9594f30..00000000000
--- a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/min_examined_row_limit_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
deleted file mode 100644
index 29a168de906..00000000000
--- a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/min_examined_row_limit_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc b/mysql-test/suite/sys_vars/t/multi_range_count_basic.test
similarity index 95%
rename from mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc
rename to mysql-test/suite/sys_vars/t/multi_range_count_basic.test
index 47e8352196f..b54b3d348aa 100644
--- a/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc
+++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic.test
@@ -108,33 +108,48 @@ SELECT @@session.multi_range_count;
 
 SET @@global.multi_range_count = 0;
 SELECT @@global.multi_range_count;
+--disable_warnings
 SET @@global.multi_range_count = 4294967296;
+--enable_warnings
+--replace_result 4294967296 4294967295
 SELECT @@global.multi_range_count;
 SET @@global.multi_range_count = -1024;
 SELECT @@global.multi_range_count;
+--disable_warnings
 SET @@global.multi_range_count = 429496729500;
+--enable_warnings
+--replace_result 429496729500 4294967295
 SELECT @@global.multi_range_count;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.multi_range_count = 65530.34;
+--replace_result 429496729500 4294967295
 SELECT @@global.multi_range_count;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.multi_range_count = test;
+--replace_result 429496729500 4294967295
 SELECT @@global.multi_range_count;
 
 SET @@session.multi_range_count = 0;
 SELECT @@session.multi_range_count;
+--disable_warnings
 SET @@session.multi_range_count = 4294967296;
+--enable_warnings
+--replace_result 4294967296 4294967295
 SELECT @@session.multi_range_count;
 SET @@session.multi_range_count = -1;
 SELECT @@session.multi_range_count;
 --Error ER_PARSE_ERROR
 SET @@session.multi_range_count = 65530.34.;
+--disable_warnings
 SET @@session.multi_range_count = 4294967295021;
+--enable_warnings
+--replace_result 4294967295021 4294967295
 SELECT @@session.multi_range_count;
 --echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@session.multi_range_count = test;
+--replace_result 4294967295021 4294967295
 SELECT @@session.multi_range_count;
 
 
diff --git a/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test b/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
deleted file mode 100644
index e4c6da9b25a..00000000000
--- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/multi_range_count_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test b/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
deleted file mode 100644
index 8f446633626..00000000000
--- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/multi_range_count_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic.test
similarity index 98%
rename from mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
rename to mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic.test
index 9a975b977eb..a8ab34764ef 100644
--- a/mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
+++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic.test
@@ -36,6 +36,7 @@
 #############################################################
 
 SET @start_global_value = @@global.myisam_max_sort_file_size;
+--replace_result 9223372036853727232 2146435072
 SELECT @start_global_value;
 
 --echo '#--------------------FN_DYNVARS_094_01-------------------------#'
@@ -45,6 +46,7 @@ SELECT @start_global_value;
 
 SET @@global.myisam_max_sort_file_size = 500000;
 SET @@global.myisam_max_sort_file_size = DEFAULT;
+--replace_result 9223372036853727232 2146435072
 SELECT @@global.myisam_max_sort_file_size;
 
 --echo '#--------------------FN_DYNVARS_094_02-------------------------#'
@@ -171,6 +173,7 @@ SET global myisam_max_sort_file_size = 64;
 ####################################
 
 SET @@global.myisam_max_sort_file_size = @start_global_value;
+--replace_result 9223372036853727232 2146435072
 SELECT @@global.myisam_max_sort_file_size;
 
 ########################################################
diff --git a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test
deleted file mode 100644
index 4511759fa69..00000000000
--- a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test
deleted file mode 100644
index 8ae0c086960..00000000000
--- a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic.test
similarity index 97%
rename from mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc
rename to mysql-test/suite/sys_vars/t/myisam_repair_threads_basic.test
index e3aca46536d..b968f00d3b1 100644
--- a/mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc
+++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic.test
@@ -109,29 +109,36 @@ SELECT @@global.myisam_repair_threads ;
 
 SET @@global.myisam_repair_threads  = -1024;
 SELECT @@global.myisam_repair_threads ;
-
+--disable_warnings
 SET @@global.myisam_repair_threads  = 429496729533;
+--enable_warnings
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = 65530.34;
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = test;
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = "test";
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = 'test';
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = ON;
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 
diff --git a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
deleted file mode 100644
index 12adb8aac07..00000000000
--- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/myisam_repair_threads_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
deleted file mode 100644
index 0bdf31b590b..00000000000
--- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/myisam_repair_threads_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test
similarity index 97%
rename from mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
rename to mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test
index c92c2f85adb..c35949ac5f3 100644
--- a/mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
+++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test
@@ -109,28 +109,36 @@ SELECT @@global.myisam_sort_buffer_size  ;
 SET @@global.myisam_sort_buffer_size   = -1024;
 SELECT @@global.myisam_sort_buffer_size  ;
 
+--disable_warnings
 SET @@global.myisam_sort_buffer_size   = 429496729533;
+--enable_warnings
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = 65530.34;
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = test;
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = "test";
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = 'test';
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = ON;
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 
diff --git a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test
deleted file mode 100644
index 5f5c2d1ad21..00000000000
--- a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test
deleted file mode 100644
index e416e8bc486..00000000000
--- a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/net_retry_count_basic.inc b/mysql-test/suite/sys_vars/t/net_retry_count_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/net_retry_count_basic.inc
rename to mysql-test/suite/sys_vars/t/net_retry_count_basic.test
diff --git a/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test b/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test
deleted file mode 100644
index 5256529b55c..00000000000
--- a/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/net_retry_count_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test b/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test
deleted file mode 100644
index b7b0fafb2c9..00000000000
--- a/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/net_retry_count_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
rename to mysql-test/suite/sys_vars/t/query_alloc_block_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test
deleted file mode 100644
index d86ae690990..00000000000
--- a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/query_alloc_block_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test
deleted file mode 100644
index 05267dac320..00000000000
--- a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/query_alloc_block_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/query_cache_limit_basic.inc b/mysql-test/suite/sys_vars/t/query_cache_limit_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/query_cache_limit_basic.inc
rename to mysql-test/suite/sys_vars/t/query_cache_limit_basic.test
diff --git a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test
deleted file mode 100644
index 09ee78519b0..00000000000
--- a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/query_cache_limit_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test
deleted file mode 100644
index 2a64ee01da8..00000000000
--- a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/query_cache_limit_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/query_cache_min_res_unit_basic.inc b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
rename to mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic.test
diff --git a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test
deleted file mode 100644
index 90601919cef..00000000000
--- a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test
deleted file mode 100644
index 37df6cae4d4..00000000000
--- a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc b/mysql-test/suite/sys_vars/t/query_cache_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
rename to mysql-test/suite/sys_vars/t/query_cache_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test b/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test
deleted file mode 100644
index 452ed43b1ca..00000000000
--- a/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/query_cache_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test b/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test
deleted file mode 100644
index 2ba81b66a2f..00000000000
--- a/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/query_cache_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc
rename to mysql-test/suite/sys_vars/t/range_alloc_block_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test
deleted file mode 100644
index 2921bde1d23..00000000000
--- a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/range_alloc_block_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test
deleted file mode 100644
index 3a638009c39..00000000000
--- a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/range_alloc_block_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic.test
similarity index 96%
rename from mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc
rename to mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic.test
index b185eeb21a7..b89cee9bdd4 100644
--- a/mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc
+++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic.test
@@ -57,12 +57,21 @@ SET @@global.rpl_recovery_rank = 1024;
 SELECT @@global.rpl_recovery_rank;
 SET @@global.rpl_recovery_rank = 123456789;
 SELECT @@global.rpl_recovery_rank;
+
+--disable_warnings
 SET @@global.rpl_recovery_rank = 2147483648*2;
+--enable_warnings
+--replace_result 4294967296 4294967295
 SELECT @@global.rpl_recovery_rank;
+--disable_warnings
 SET @@global.rpl_recovery_rank = 2147483648*1024;
+--enable_warnings
+--replace_result 2199023255552 4294967295
 SELECT @@global.rpl_recovery_rank;
-SELECT @@global.rpl_recovery_rank;
+--disable_warnings
 SET @@global.rpl_recovery_rank = 2147483648*2147483648;
+--enable_warnings
+--replace_result 4611686018427387904 4294967295
 SELECT @@global.rpl_recovery_rank;
 
 
diff --git a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test
deleted file mode 100644
index d0929039360..00000000000
--- a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/rpl_recovery_rank_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test
deleted file mode 100644
index 1f6de849999..00000000000
--- a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/rpl_recovery_rank_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
rename to mysql-test/suite/sys_vars/t/slave_transaction_retries_basic.test
diff --git a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test
deleted file mode 100644
index 9cdde198c3d..00000000000
--- a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/slave_transaction_retries_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test
deleted file mode 100644
index 4284bc44bea..00000000000
--- a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/slave_transaction_retries_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
rename to mysql-test/suite/sys_vars/t/sort_buffer_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test
deleted file mode 100644
index 86db7358473..00000000000
--- a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/sort_buffer_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test
deleted file mode 100644
index 8336932fdcc..00000000000
--- a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/sort_buffer_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
rename to mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
deleted file mode 100644
index db7181a7715..00000000000
--- a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
deleted file mode 100644
index 54bfa0fd0dc..00000000000
--- a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
similarity index 100%
rename from mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
rename to mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
diff --git a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
deleted file mode 100644
index 418d223bb47..00000000000
--- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
deleted file mode 100644
index 8f218cea1e0..00000000000
--- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
-
diff --git a/mysql-test/t/aborted_clients.test b/mysql-test/t/aborted_clients.test
new file mode 100644
index 00000000000..fafcfb6b3e9
--- /dev/null
+++ b/mysql-test/t/aborted_clients.test
@@ -0,0 +1,28 @@
+# Test case for MDEV-246, lp:992983
+# Check that ordinary connect/disconnect does not increase aborted_clients
+# status variable, but KILL connection does
+
+-- source include/not_embedded.inc
+-- source include/count_sessions.inc
+
+FLUSH STATUS;
+# Connect/Disconnect look that aborted_clients stays 0
+connect (con1,localhost,root,,);
+disconnect con1;
+connection default;
+-- source include/wait_until_count_sessions.inc
+# Check that there is 0 aborted clients so far
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
+
+# Kill a connection, check that aborted_clients is incremented
+connect(con2,localhost,root,,);
+--disable_reconnect
+--error ER_CONNECTION_KILLED
+KILL CONNECTION_ID();
+disconnect con2;
+connection default;
+-- source include/wait_until_count_sessions.inc
+
+# aborted clients must be 1 now
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
+FLUSH STATUS;
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index 1edee9abf1e..eade7ba721e 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -1230,3 +1230,4 @@ rename table t2 to t1;
 execute stmt1;
 deallocate prepare stmt1;
 drop table t2;
+
diff --git a/mysql-test/t/auto_increment.test b/mysql-test/t/auto_increment.test
index 2854f503034..884e0fabb5e 100644
--- a/mysql-test/t/auto_increment.test
+++ b/mysql-test/t/auto_increment.test
@@ -380,3 +380,19 @@ CREATE TABLE t1 (pk BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY (pk));
 INSERT INTO t1 VALUES (NULL), (18446744073709551615-1), (NULL);
 SELECT * FROM t1;
 DROP TABLE t1;
+
+# MDEV-331 last_insert_id() returns a signed number
+# Check that last_insert_id() generates a signed value
+CREATE TABLE t1 (pk BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY (pk));
+insert into t1 values((1<<63)+1);
+insert into t1 values(null);
+select last_insert_id();
+select * from t1;
+drop table t1;
+
+CREATE TABLE t1 (pk BIGINT AUTO_INCREMENT, PRIMARY KEY (pk));
+insert into t1 values(-5);
+insert into t1 values(null);
+select last_insert_id();
+select * from t1;
+drop table t1;
diff --git a/mysql-test/t/blackhole.test b/mysql-test/t/blackhole.test
new file mode 100644
index 00000000000..1451f7606e0
--- /dev/null
+++ b/mysql-test/t/blackhole.test
@@ -0,0 +1,21 @@
+#
+# Tests for the BLACKHOLE storage engine
+#
+
+--source include/have_blackhole.inc
+
+--echo #
+--echo # Bug #11880012: INDEX_SUBQUERY, BLACKHOLE,
+--echo #                HANG IN PREPARING WITH 100% CPU USAGE
+--echo #
+
+CREATE TABLE t1(a INT NOT NULL);
+INSERT INTO t1 VALUES (1), (2), (3);
+CREATE TABLE t2 (a INT UNSIGNED, b INT, UNIQUE KEY (a, b)) ENGINE=BLACKHOLE;
+
+SELECT 1 FROM t1 WHERE a = ANY (SELECT a FROM t2);
+
+DROP TABLE t1, t2;
+
+--echo End of 5.5 tests 
+
diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test
index c8a5c968fe5..c39b7267f83 100644
--- a/mysql-test/t/cast.test
+++ b/mysql-test/t/cast.test
@@ -400,6 +400,18 @@ connection default;
 disconnect newconn;
 SET @@GLOBAL.max_allowed_packet=default;
 
+--echo #
+--echo # Bug#13519724 63793: CRASH IN DTCOLLATION::SET(DTCOLLATION &SET)
+--echo #
+
+CREATE TABLE t1 (a VARCHAR(50));
+
+SELECT a FROM t1 
+WHERE CAST(a as BINARY)=x'62736D697468' 
+  AND CAST(a AS BINARY)=x'65736D697468';
+
+DROP TABLE t1;
+
 --echo End of 5.1 tests
 
 select cast("2101-00-01 02:03:04" as datetime);
diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test
index e5c6e8371bf..cfe4e80fcbd 100644
--- a/mysql-test/t/connect.test
+++ b/mysql-test/t/connect.test
@@ -397,3 +397,33 @@ DROP USER mysqltest_up2@'%';
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
 
+
+--echo #
+--echo # BUG#1010351: New "via" keyword in 5.2+ can't be used as identifier anymore  
+--echo #
+create table t1 (via int);
+alter table t1 add key(via);
+drop table t1;
+
+create table t1 (col1 int);
+alter table t1 add via int not null;
+drop table t1;
+
+--disable_warnings
+drop procedure if exists p1;
+--enable_warnings
+
+delimiter |;
+create procedure p1(x int)
+foo: loop
+  if x = 0 then
+    leave foo;
+  end if;
+  select 'test';
+  set x = x-1;
+end loop foo|
+
+delimiter ;|
+call p1(2);
+drop procedure p1;
+
diff --git a/mysql-test/t/derived_view.test b/mysql-test/t/derived_view.test
index 03d308b6c45..30811be2934 100644
--- a/mysql-test/t/derived_view.test
+++ b/mysql-test/t/derived_view.test
@@ -1413,6 +1413,43 @@ SELECT * FROM t1;
 drop table t1,t2;
 set optimizer_switch=@save968720_optimizer_switch;
 
+--echo #
+--echo # LP BUG#978847 Server crashes in Item_ref::real_item on
+--echo # INSERT .. SELECT with FROM subquery and derived_merge=ON
+SET @save978847_optimizer_switch=@@optimizer_switch;
+SET optimizer_switch = 'derived_merge=on';
+
+CREATE TABLE t1 ( a INT, b INT );
+INSERT INTO t1 VALUES (2,1),(3,2);
+
+select * from t1;
+INSERT INTO t1 SELECT * FROM
+  ( SELECT * FROM t1 ) AS alias;
+select * from t1;
+prepare stmt1 from  'INSERT INTO t1 SELECT SQL_BIG_RESULT * FROM
+  ( SELECT * FROM t1 ) AS alias';
+execute stmt1;
+select * from t1;
+execute stmt1;
+select * from t1;
+
+drop table t1;
+
+set optimizer_switch=@save978847_optimizer_switch;
+
+
+--echo #
+--echo # LP bug998516 Server hangs on INSERT .. SELECT with derived_merge,
+--echo # FROM subquery, UNION 
+--echo #
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (b INT);
+INSERT INTO t2 VALUES (3),(4);
+INSERT INTO t1 SELECT * FROM ( SELECT * FROM t1 ) AS alias UNION SELECT * FROM t2;
+select * from t1;
+drop table t1,t2;
+
 --echo #
 --echo # end of 5.3 tests
 --echo #
diff --git a/mysql-test/t/errors.test b/mysql-test/t/errors.test
index 82822c87e89..82204e1bfac 100644
--- a/mysql-test/t/errors.test
+++ b/mysql-test/t/errors.test
@@ -171,3 +171,21 @@ SELECT UPDATEXML(-73 * -2465717823867977728,@@global.auto_increment_increment,nu
 --echo #
 --echo # End Bug#57882
 --echo #
+
+#
+# Bug #13031606 VALUES() IN A SELECT STATEMENT CRASHES SERVER
+#
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2(a INT PRIMARY KEY, b INT);
+--error ER_BAD_FIELD_ERROR
+SELECT '' AS b FROM t1 GROUP BY VALUES(b);
+--error ER_BAD_FIELD_ERROR
+REPLACE t2(b) SELECT '' AS b FROM t1 GROUP BY VALUES(b);
+--error ER_BAD_FIELD_ERROR
+UPDATE t2 SET a=(SELECT '' AS b FROM t1 GROUP BY VALUES(b));
+--error ER_BAD_FIELD_ERROR
+INSERT INTO t2 VALUES (1,0) ON DUPLICATE KEY UPDATE
+  b=(SELECT '' AS b FROM t1 GROUP BY VALUES(b));
+INSERT INTO t2(a,b) VALUES (1,0) ON DUPLICATE KEY UPDATE
+  b=(SELECT VALUES(a)+2 FROM t1);
+DROP TABLE t1, t2;
diff --git a/mysql-test/t/flush-innodb.test b/mysql-test/t/flush-innodb.test
new file mode 100644
index 00000000000..207032b1acb
--- /dev/null
+++ b/mysql-test/t/flush-innodb.test
@@ -0,0 +1,9 @@
+--source include/have_innodb.inc
+
+# MDEV-254: Server hang with FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT
+FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT;
+UNLOCK TABLES;
+CREATE TABLE t1 ( m MEDIUMTEXT ) ENGINE=InnoDB;
+INSERT INTO t1 VALUES ( REPEAT('i',1048576) );
+
+DROP TABLE t1;
diff --git a/mysql-test/t/func_crypt.test b/mysql-test/t/func_crypt.test
index 6dedeaa0fef..ca6e712f45c 100644
--- a/mysql-test/t/func_crypt.test
+++ b/mysql-test/t/func_crypt.test
@@ -23,7 +23,9 @@ select old_password('');
 select password('gabbagabbahey');
 select old_password('idkfa');
 select length(password('1'));
+--replace_result 60 13
 select length(encrypt('test'));
+--replace_result  \$2a\$04\$aO....................ql.D6ROU4Byvysj72xrV1ZAkrMKS8I6 aaqPiZY5xR5l.
 select encrypt('test','aa');
 select old_password(NULL);
 select password(NULL);
diff --git a/mysql-test/t/func_group_innodb.test b/mysql-test/t/func_group_innodb.test
index bbc576b0fc7..ccf7aff6e6e 100644
--- a/mysql-test/t/func_group_innodb.test
+++ b/mysql-test/t/func_group_innodb.test
@@ -85,6 +85,19 @@ select count(*), min(7), max(7) from t2m, t1i;
 drop table t1m, t1i, t2m, t2i;
 
 
+--echo #
+--echo # Bug#13723054 CRASH WITH MIN/MAX AFTER QUICK_GROUP_MIN_MAX_SELECT::NEXT_MIN
+--echo #
+
+CREATE TABLE t1(a BLOB, b VARCHAR(255) CHARSET LATIN1, c INT,
+                KEY(b, c, a(765))) ENGINE=INNODB;
+INSERT INTO t1(a, b, c) VALUES ('', 'a', 0), ('', 'a', null), ('', 'a', 0);
+
+SELECT MIN(c) FROM t1 GROUP BY b;
+EXPLAIN SELECT MIN(c) FROM t1 GROUP BY b;
+
+DROP TABLE t1;
+
 --echo #
 --echo # Bug #57954: BIT_AND function returns incorrect results when 
 --echo #   semijoin=on
diff --git a/mysql-test/t/func_if.test b/mysql-test/t/func_if.test
index 5414adddd43..2b89a618aa6 100644
--- a/mysql-test/t/func_if.test
+++ b/mysql-test/t/func_if.test
@@ -193,3 +193,20 @@ sum(distinct(if('a',
                 (select adddate(elt(convert($nines,decimal(64,0)),count(*)),
                                 interval 1 day))
                 , .1))) as foo;
+
+--echo #
+--echo # LP bug#998321 Simple query with IF expression causes an
+--echo # assertion abort (see also mysql Bug#12620084)
+--echo #
+
+SELECT if(0, (SELECT min('hello')), NULL);
+SELECT if(1, (SELECT min('hello')), NULL);
+SELECT if(0, NULL, (SELECT min('hello')));
+SELECT if(1, NULL, (SELECT min('hello')));
+
+--echo End of 5.2 tests
+
+--disable_query_log
+# Restore timezone to default
+set time_zone= @@global.time_zone;
+--enable_query_log
diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test
index a1df990fa8e..b843cf8c364 100644
--- a/mysql-test/t/func_math.test
+++ b/mysql-test/t/func_math.test
@@ -17,6 +17,7 @@ explain extended select round(5.5),round(-5.5);
 select round(5.64,1),round(5.64,2),round(5.64,-1),round(5.64,-2);
 select abs(-10), sign(-5), sign(5), sign(0);
 explain extended select abs(-10), sign(-5), sign(5), sign(0);
+--replace_result  2.0000000000000004 2
 select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2);
 explain extended select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2);
 select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL);
diff --git a/mysql-test/t/gis-precise.test b/mysql-test/t/gis-precise.test
index b48da25c3c9..d021bb0b53d 100644
--- a/mysql-test/t/gis-precise.test
+++ b/mysql-test/t/gis-precise.test
@@ -313,3 +313,15 @@ SELECT ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') ,
 
 SELECT ST_INTERSECTS( GeomFromText('MULTILINESTRING( ( 4030 3045 , 3149 2461 , 3004 3831 , 3775 2976 ) )') , GeomFromText('LINESTRING(3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29,3039.07 3175.05,3039.07 3175.05,3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29)') );
 
+#bug 977201 ST_BUFFER fails with the negative D
+select ASTEXT(ST_BUFFER(ST_GEOMCOLLFROMTEXT(' GEOMETRYCOLLECTION(LINESTRING(100 100, 31 10, 77 80), POLYGON((0 0,4 7,1 1,0 0)), POINT(20 20))'), -3));
+
+#bug 986977 Assertion `!cur_p->event' failed in Gcalc_scan_iterator::arrange_event(int, int)
+SELECT ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER( POLYGONFROMTEXT( 'POLYGON( ( 0.0 -3.0,
+  -2.910427500435995 0.727606875108998,
+  -0.910427500435995 8.727606875108998,
+  7.664100588675687 1.503849116986468,
+  1.664100588675687 -2.496150883013531,
+  0.0 -3.0
+))' ), 3 )));
+
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index a559b16b1f0..f4c9de4e7da 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -1295,6 +1295,24 @@ WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1;
 DROP DATABASE gis_ogs;
 USE test;
 
+
+--echo #
+--echo # BUG#12414917 - ISCLOSED() CRASHES ON 64-BIT BUILDS
+--echo #
+SELECT ISCLOSED(CONVERT(CONCAT('     ', 0x2), BINARY(20)));
+
+--echo #
+--echo # BUG#12537203 - CRASH WHEN SUBSELECTING GLOBAL VARIABLES IN 
+--echo # GEOMETRY FUNCTION ARGUMENTS
+--echo #
+--replace_regex /non geometric .* value/non geometric '' value/
+--error ER_ILLEGAL_VALUE_FOR_TYPE
+SELECT GEOMETRYCOLLECTION((SELECT @@OLD));
+
+
+--echo End of 5.1 tests
+
+
 --echo #
 --echo # Bug#11908153: CRASH AND/OR VALGRIND ERRORS IN FIELD_BLOB::GET_KEY_IMAGE
 --echo #
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index db8bfce2320..1226683ba03 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -1339,6 +1339,117 @@ SELECT alias2.f3 AS field1 , alias2.f1 AS field2 FROM t1 AS alias1 JOIN t1 AS al
 SET SESSION SQL_MODE=default;
 drop table t1;
 
+--echo #
+--echo # LP bug#967242 Wrong result (extra rows, not grouped) with JOIN, AND in ON condition, multi-part key, GROUP BY, OR in WHERE
+--echo #
+
+CREATE TABLE t1 ( a VARCHAR(1) ) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('x');
+CREATE TABLE t2 ( b INT, c VARCHAR(1), KEY (c, b) ) ENGINE=MyISAM;
+INSERT INTO t2 VALUES
+(4, 'd'),(8, 'g'),(3, 'x'),(3, 'f'),
+(0, 'p'),(3, 'j'),(8, 'c');
+
+SELECT t2_1.b as zzz
+FROM t1 JOIN t2 AS t2_1 JOIN t2 AS t2_2
+ON (t2_2.b = t2_1.b ) AND (t2_2.c = t2_1.c )
+WHERE
+rand() + 1 > 0 OR
+a = t2_1.c
+GROUP BY zzz;
+
+SELECT t2_1.b as zzz
+FROM t1 JOIN t2 AS t2_1 JOIN t2 AS t2_2
+ON (t2_2.b = t2_1.b ) AND (t2_2.c = t2_1.c )
+WHERE
+1 > 0 OR
+a = t2_1.c
+GROUP BY zzz;
+
+SELECT t2_1.b as zzz
+FROM t1 JOIN t2 AS t2_1 JOIN t2 AS t2_2
+ON (t2_2.b = t2_1.b ) AND (t2_2.c = t2_1.c )
+WHERE
+t2_1.b + 1 > 0 OR
+a = t2_1.c
+GROUP BY zzz;
+
+SET @save_optimizer_switch967242=@@optimizer_switch;
+SET optimizer_switch = 'in_to_exists=on';
+
+SELECT t2_1.b
+FROM t1 JOIN t2 AS t2_1 JOIN t2 AS t2_2
+    ON (t2_2.b = t2_1.b ) AND (t2_2.c = t2_1.c )
+WHERE
+  ( SELECT COUNT(*) FROM t2 ) IS NOT NULL
+  OR a = t2_1.c
+GROUP BY t2_1.b;
+SET optimizer_switch=@save_optimizer_switch967242;
+
+drop table t1, t2;
+
+--echo #
+--echo # Bug#12578908: SELECT SQL_BUFFER_RESULT OUTPUTS TOO MANY 
+--echo #               ROWS WHEN GROUP IS OPTIMIZED AWAY
+--echo #
+
+CREATE TABLE t1 (col1 int, col2 int) ;
+INSERT INTO t1 VALUES (10,1),(11,7);
+
+CREATE TABLE t2 (col1 int, col2 int) ;
+INSERT INTO t2 VALUES (10,8);
+
+let $q_body=t2.col2 FROM t2 JOIN t1 ON t1.col1 GROUP BY t2.col2;
+
+--echo
+--eval EXPLAIN SELECT SQL_BUFFER_RESULT $q_body
+--eval SELECT SQL_BUFFER_RESULT $q_body
+--echo
+--eval EXPLAIN SELECT $q_body
+--eval SELECT $q_body
+
+--echo
+DROP TABLE t1,t2;
+
+--echo #
+--echo # BUG#12640437: USING SQL_BUFFER_RESULT RESULTS IN A
+--echo #               DIFFERENT QUERY OUTPUT
+--echo #
+
+CREATE TABLE t1 (
+  a int,
+  b varchar(1),
+  KEY (b,a)
+);
+
+INSERT INTO t1 VALUES (1,NULL),(0,'a');
+
+let $query=
+  SELECT SQL_BUFFER_RESULT MIN(a), b FROM t1 WHERE t1.b = 'a' GROUP BY b;
+
+--echo
+--eval EXPLAIN $query
+--echo
+--eval $query
+
+let $query= SELECT MIN(a), b FROM t1 WHERE t1.b = 'a' GROUP BY b;
+--echo
+--eval EXPLAIN $query
+--echo
+--eval $query
+
+--echo
+DROP TABLE t1;
+
+--echo #
+--echo # LP bug#993726 Wrong result from a query with ALL subquery predicate in WHERE
+--echo #
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (0);
+SELECT 1 FROM t1 WHERE 1 > ALL(SELECT 1 FROM t1 WHERE a!=0);
+SELECT max(1) FROM t1 WHERE a!=0;
+drop table t1;
+
 --echo # End of 5.2 tests
 
 --echo #
diff --git a/mysql-test/t/handlersocket.test b/mysql-test/t/handlersocket.test
index 6a7b65797c5..10cb9728fb7 100644
--- a/mysql-test/t/handlersocket.test
+++ b/mysql-test/t/handlersocket.test
@@ -5,6 +5,6 @@ if (`select length('$HANDLERSOCKET_SO') = 0`) {
 }
 
 install plugin handlersocket soname 'handlersocket.so';
---query_vertical select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket'
+--query_vertical select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description, plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket'
 uninstall plugin handlersocket;
 
diff --git a/mysql-test/t/in_datetime_241.test b/mysql-test/t/in_datetime_241.test
new file mode 100644
index 00000000000..f95a456f5e2
--- /dev/null
+++ b/mysql-test/t/in_datetime_241.test
@@ -0,0 +1,9 @@
+#
+# MDEV-241 lp:992722 - Server crashes in get_datetime_value 
+#
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+CREATE TABLE t1 ( a DATE );
+SELECT * FROM t1 WHERE ( SELECT a FROM t1 ) IN ('2012-04-25','2012-04-26');
+DROP TABLE t1;
diff --git a/mysql-test/t/index_merge_innodb.test b/mysql-test/t/index_merge_innodb.test
index ca6ada7fc6f..0fd3c54c787 100644
--- a/mysql-test/t/index_merge_innodb.test
+++ b/mysql-test/t/index_merge_innodb.test
@@ -124,5 +124,38 @@ WHERE v1  IN  ('f', 'd', 'h', 'u' ) AND i  =  2;
 
 DROP TABLE t1;
 
+--echo #
+--echo # BUG#1006164: Multi-table DELETE that uses innodb + index_merge/intersect may fail to delete rows
+--echo #
+
+create table t0(a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+
+create table t1 (
+  pk int auto_increment, 
+  zone_id int,
+  modified tinyint,
+  primary key(pk),
+  key (zone_id),
+  key (modified)
+) engine=innodb;
+
+insert into t1 (zone_id, modified) select 0,0 from t0 A, t0 B, t0 C, t0 D;
+update t1 set zone_id=487, modified=9 where pk=7259;
+update t1 set zone_id=487, modified=9 where pk=7260;
+update t1 set zone_id=830, modified=9 where pk=8434;
+update t1 set zone_id=830, modified=9 where pk=8435;
+update t1 set zone_id=830, modified=9 where pk=8436;
+update t1 set zone_id=830, modified=9 where pk=8437;
+
+select * from t1 where t1.zone_id=830 AND modified=9;
+begin;
+DELETE t1 FROM t1 WHERE t1.zone_id=830 AND modified=9;
+commit;
+select * from t1 where t1.zone_id=830 AND modified=9;
+
+drop table t0, t1;
+
+
 set optimizer_switch= @optimizer_switch_save;
 
diff --git a/mysql-test/t/join_cache.test b/mysql-test/t/join_cache.test
index 7ef1c0da14d..003ffc8ff19 100644
--- a/mysql-test/t/join_cache.test
+++ b/mysql-test/t/join_cache.test
@@ -2464,7 +2464,7 @@ CREATE TABLE t1 (
   PRIMARY KEY (pk), INDEX idx1(i), INDEX idx2 (v,i)
 ) COLLATE latin1_bin;
 INSERT INTO t1 VALUES
-  (10,8,'v'), (11,8,'f'), (12,5,'v'), (13,8,'s'), (14,8,'a'),
+  (10,8,'v'), (11,8,'f'), (13,8,'s'), (14,8,'a'),
   (15,6,'p'), (16,7,'z'), (17,2,'a'), (18,5,'h'), (19,7,'h'),
   (25,3,'m'), (26,5,'a'), (27,9,'n'), (28,1,'d'), (29,107,'a');
 INSERT INTO t1 VALUES
diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test
index a4469728c0f..44f4afd451b 100644
--- a/mysql-test/t/join_outer.test
+++ b/mysql-test/t/join_outer.test
@@ -1441,6 +1441,25 @@ DROP TABLE t1,t2;
 
 --echo End of 5.1 tests
 
+--echo #
+--echo # LP BUG#994392: Wrong result with RIGHT/LEFT JOIN and ALL subquery
+--echo # predicate in WHERE condition.
+--echo #
+
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(9);
+CREATE TABLE t2(b INT);
+INSERT INTO t2 VALUES(8);
+CREATE TABLE t3(c INT);
+INSERT INTO t3 VALUES(3);
+SELECT * FROM t2 RIGHT JOIN t3 ON(c = b) WHERE b < ALL(SELECT a FROM t1 WHERE a <= 7);
+SELECT * FROM t3 LEFT JOIN t2 ON(c = b) WHERE b < ALL(SELECT a FROM t1 WHERE a <= 7);
+SELECT * FROM t2 RIGHT JOIN t3 ON(c = b) WHERE b not in (SELECT a FROM t1 WHERE a <= 7);
+SELECT * FROM t3 LEFT JOIN t2 ON(c = b) WHERE b not in (SELECT a FROM t1 WHERE a <= 7);
+drop table t1,t2,t3;
+
+--echo End of 5.2 tests
+
 --echo #
 --echo # LP bug #813447: LEFT JOIN with single-row inner table and
 --echo #                 a subquery in ON expression
diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test
index d47044fbbee..e8f0bf8c511 100644
--- a/mysql-test/t/log_state.test
+++ b/mysql-test/t/log_state.test
@@ -332,13 +332,13 @@ CREATE TABLE t2 (b INT, PRIMARY KEY (b));
 INSERT INTO t2 VALUES (3),(4);
 
 connect (con2,localhost,root,,);
-INSERT INTO t1 VALUES (1+sleep(.01)),(2);
-INSERT INTO t1 SELECT b+sleep(.01) from t2;
-UPDATE t1 SET a=a+sleep(.01) WHERE a>2;
-UPDATE t1 SET a=a+sleep(.01) ORDER BY a DESC;
-UPDATE t2 set b=b+sleep(.01) limit 1;
-UPDATE t1 SET a=a+sleep(.01) WHERE a in (SELECT b from t2);
-DELETE FROM t1 WHERE a=a+sleep(.01) ORDER BY a LIMIT 2;
+INSERT INTO t1 VALUES (1+sleep(.02)),(2);
+INSERT INTO t1 SELECT b+sleep(.02) from t2;
+UPDATE t1 SET a=a+sleep(.02) WHERE a>2;
+UPDATE t1 SET a=a+sleep(.02) ORDER BY a DESC;
+UPDATE t2 set b=b+sleep(.02) limit 1;
+UPDATE t1 SET a=a+sleep(.02) WHERE a in (SELECT b from t2);
+DELETE FROM t1 WHERE a=a+sleep(.02) ORDER BY a LIMIT 2;
 
 SELECT rows_examined,sql_text FROM mysql.slow_log;
 disconnect con2;
diff --git a/mysql-test/t/myisam_icp.test b/mysql-test/t/myisam_icp.test
index 5bee6e5acaa..508c282b1dc 100644
--- a/mysql-test/t/myisam_icp.test
+++ b/mysql-test/t/myisam_icp.test
@@ -262,5 +262,25 @@ SET optimizer_switch=@save_optimizer_switch;
 
 DROP TABLE t1,t2,t3,t4;
 
+--echo #
+--echo # BUG#1000051: Query with simple join and ORDER BY takes thousands times longer when run with ICP
+--echo #
+create table t0 (a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+
+create table t1 (a int, col int, filler char(100), key(a, col));
+insert into t1 select A.a + 10*B.a, 1234, 'filler' from t0 A, t0 B, t0 C;
+
+set @tmp_10000051= @@optimizer_switch;
+set optimizer_switch='mrr=off';
+--echo # Must not use ICP:
+explain select * from t1 where a between 5 and 8 order by a desc, col desc;
+set optimizer_switch= @tmp_10000051;
+
+--echo # Must not use ICP:
+explain select * from t1 where a=3 and col > 500 order by a desc, col desc;
+
+drop table t0, t1;
+
 set optimizer_switch=@myisam_icp_tmp;
 
diff --git a/mysql-test/t/mysqlslap.test b/mysql-test/t/mysqlslap.test
index 757d2813483..69eaae76409 100644
--- a/mysql-test/t/mysqlslap.test
+++ b/mysql-test/t/mysqlslap.test
@@ -1,6 +1,5 @@
 # Can't run test of external client with embedded server
 --source include/not_embedded.inc
---source include/not_windows.inc
 
 --exec $MYSQL_SLAP --silent --concurrency=5 --iterations=20 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql
 
@@ -37,7 +36,7 @@
 
 --exec $MYSQL_SLAP --only-print --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --engine="heap,myisam" --post-query="SHOW TABLES" --pre-query="SHOW TABLES";
 
- --exec $MYSQL_SLAP --only-print --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --engine="heap,myisam" --post-query="SHOW TABLES" --pre-query="SHOW TABLES" --number-of-queries=6 --commit=1;
+ --exec $MYSQL_SLAP --only-print --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --engine="heap,myisam" --post-query="SHOW TABLES" --pre-query="SHOW TABLES" --number-of-queries=6 --commit=1
 
 --exec $MYSQL_SLAP --silent --concurrency=5 --iterations=1 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --auto-generate-sql-add-autoincrement --auto-generate-sql-load-type=write --detach=2
 
@@ -68,3 +67,9 @@ SHOW DATABASES;
 SHOW DATABASES;
 DROP DATABASE bug58090;
 
+--echo #
+--echo # Bug #11766072 - 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWS
+--echo #
+
+--replace_regex /queries: [0-9]+.[0-9]+/queries: TIME/
+--exec $MYSQL_SLAP
diff --git a/mysql-test/t/mysqltest_cont_on_error.test b/mysql-test/t/mysqltest_cont_on_error.test
new file mode 100644
index 00000000000..c6eeca9b5c3
--- /dev/null
+++ b/mysql-test/t/mysqltest_cont_on_error.test
@@ -0,0 +1,16 @@
+#
+# mysqltest --continue-on-error
+#
+
+-- source include/not_embedded.inc
+
+#
+# with or without --continue-on-error the failing test should return an error
+# but with --continue-on-error, the failing line does not abort the test
+#
+
+--error 1
+--exec echo "select error; select 1;" | $MYSQL_TEST 2>&1
+
+--exec echo "SELECT ERROR; SELECT 2;" | $MYSQL_TEST --continue-on-error 2>&1
+
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index b2f64b8172b..eed45597855 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -3505,6 +3505,94 @@ execute st;
 show status like '%Handler_read%';
 
 deallocate prepare st;
-
 drop table t1;
 
+--echo #
+--echo # LP bug#993459 Execution of PS for a query with GROUP BY
+--echo # returns wrong result (see also mysql bug#13805127)
+--echo #
+
+PREPARE s1 FROM 
+"
+SELECT c1, t2.c2, count(c3)
+FROM
+  (
+  SELECT 3 as c2 FROM dual WHERE @x = 1
+  UNION
+  SELECT 2       FROM dual WHERE @x = 1 OR @x = 2
+  ) AS t1,
+  (
+  SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+  UNION
+  SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+  UNION
+  SELECT '2012-03-01 01:00:00',       2,       1       FROM dual
+  ) AS t2
+WHERE t2.c2 = t1.c2
+GROUP BY c1, c2
+";
+
+--echo
+SET @x = 1;
+SELECT c1, t2.c2, count(c3)
+FROM
+  (
+  SELECT 3 as c2 FROM dual WHERE @x = 1
+  UNION
+  SELECT 2       FROM dual WHERE @x = 1 OR @x = 2
+  ) AS t1,
+  (
+  SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+  UNION
+  SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+  UNION
+  SELECT '2012-03-01 01:99345900:00',       2,       1       FROM dual
+  ) AS t2
+WHERE t2.c2 = t1.c2
+GROUP BY c1, c2;
+--echo
+EXECUTE s1;
+
+--echo
+SET @x = 2;
+SELECT c1, t2.c2, count(c3)
+FROM
+  (
+  SELECT 3 as c2 FROM dual WHERE @x = 1
+  UNION
+  SELECT 2       FROM dual WHERE @x = 1 OR @x = 2
+  ) AS t1,
+  (
+  SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+  UNION
+  SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+  UNION
+  SELECT '2012-03-01 01:00:00',       2,       1       FROM dual
+  ) AS t2
+WHERE t2.c2 = t1.c2
+GROUP BY c1, c2;
+--echo
+EXECUTE s1;
+
+--echo
+SET @x = 1;
+SELECT c1, t2.c2, count(c3)
+FROM
+  (
+  SELECT 3 as c2 FROM dual WHERE @x = 1
+  UNION
+  SELECT 2       FROM dual WHERE @x = 1 OR @x = 2
+  ) AS t1,
+  (
+  SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+  UNION
+  SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+  UNION
+  SELECT '2012-03-01 01:00:00',       2,       1       FROM dual
+  ) AS t2
+WHERE t2.c2 = t1.c2
+GROUP BY c1, c2;
+--echo
+EXECUTE s1;
+
+DEALLOCATE PREPARE s1;
diff --git a/mysql-test/t/read_only.test b/mysql-test/t/read_only.test
index abc016bafce..52349747883 100644
--- a/mysql-test/t/read_only.test
+++ b/mysql-test/t/read_only.test
@@ -169,23 +169,19 @@ connection default;
 --error ER_LOCK_OR_ACTIVE_TRANSACTION
 set global read_only=1;
 unlock tables ;
-# The following call blocks until con1 releases the read lock.
-# Blocking is a limitation, and could be improved.
---echo send set global read_only=1;
-send set global read_only=1;
+
+# after unlock tables in current connection
+# the next command must be executed successfully
+set global read_only=1;
+select @@global.read_only;
 
 --echo connection con1;
 connection con1;
 select @@global.read_only;
 unlock tables ;
-let $wait_condition= SELECT @@global.read_only= 1;
---source include/wait_condition.inc
-select @@global.read_only;
 
 --echo connection default;
 connection default;
---echo reap;
-reap;
 
 # pending transaction / READ_ONLY
 # - is an error in the same connection
diff --git a/mysql-test/t/read_only_innodb.test b/mysql-test/t/read_only_innodb.test
index 3bb626f2ca7..de237fecbb6 100644
--- a/mysql-test/t/read_only_innodb.test
+++ b/mysql-test/t/read_only_innodb.test
@@ -75,7 +75,29 @@ BEGIN;
 SELECT * FROM t1;
 COMMIT;
 
+#
+# Tests that LOCK TABLE doesn't block the SET READ_ONLY=1 for the InnoDB tables
+#
+
 connection default;
+UNLOCK TABLES;
+
+--echo connection con1;
+connection con1;
+lock table t1 read;
+
+--echo connection default;
+connection default;
+set global read_only=1;
+
+--echo connection con1;
+connection con1;
+unlock tables;
+
+--echo connection default;
+connection default;
+SET GLOBAL read_only=0;
+
 UNLOCK TABLES;
 DROP TABLE t1;
 DROP USER test@localhost;
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 44fb3ba46f5..3a85ca3a3a9 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -4447,3 +4447,17 @@ DROP VIEW view_t1;
 
 SET optimizer_switch=@save_optimizer_switch;
 
+--echo #
+--echo # LP bug#994275 Assertion `real->type() == Item::FIELD_ITEM' failed
+--echo # in add_not_null_conds(JOIN*) with JOIN, ZEROFILL column, PK
+--echo #
+
+CREATE TABLE t1 ( a INT(6) ZEROFILL );
+INSERT INTO t1 VALUES (1),(2);
+
+CREATE TABLE t2 ( b INT PRIMARY KEY );
+INSERT INTO t2 VALUES (3),(4);
+SELECT * FROM t1, t2 WHERE a=3 AND a=b;
+drop table t1,t2;
+
+--echo End of 5.3 tests
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index ef99a8a521a..5d92fea0bf1 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -9105,3 +9105,43 @@ delimiter ;$
 SELECT f1();
 
 DROP FUNCTION f1;
+
+--echo # ------------------------------------------------------------------
+--echo # -- End of 5.1 tests
+--echo # ------------------------------------------------------------------
+
+--echo #
+--echo # LP bug#993459 Execution of PS for a query with GROUP BY
+--echo # returns wrong result (see also mysql bug#13805127)
+--echo #
+delimiter |;
+
+CREATE PROCEDURE p1(x INT UNSIGNED)
+BEGIN
+  SELECT c1, t2.c2, count(c3)
+  FROM
+    (
+    SELECT 3 as c2 FROM dual WHERE x = 1
+    UNION
+    SELECT 2       FROM dual WHERE x = 1 OR x = 2
+    ) AS t1,
+    (
+    SELECT '2012-03-01 01:00:00' AS c1, 3 as c2, 1 as c3 FROM dual
+    UNION
+    SELECT '2012-03-01 02:00:00',       3,       2       FROM dual
+    UNION
+    SELECT '2012-03-01 01:00:00',       2,       1       FROM dual
+    ) AS t2
+  WHERE t2.c2 = t1.c2
+  GROUP BY c1, c2
+  ;
+END|
+
+delimiter ;|
+
+--echo
+CALL p1(1);
+CALL p1(2);
+CALL p1(1);
+
+DROP PROCEDURE p1; 
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index f369f10a5e4..b02b1d4a4a0 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -4722,6 +4722,18 @@ SELECT 1 FROM
 
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#13721076 CRASH WITH TIME TYPE/TIMESTAMP() AND WARNINGS IN SUBQUERY
+--echo #
+
+CREATE TABLE t1(a TIME NOT NULL);
+INSERT INTO t1 VALUES ('00:00:32');
+
+SELECT 1 FROM t1 WHERE a >
+(SELECT timestamp(a) AS a FROM t1);
+
+DROP TABLE t1;
+
 --echo #
 --echo # No BUG#, a case brought from 5.2's innodb_mysql_lock.test
 --echo #
@@ -5499,6 +5511,50 @@ SELECT a FROM t1 WHERE ( SELECT MIN(a) = 100 );
 
 drop table t1;
 
+--echo #
+--echo # LP BUG#985667 Wrong result with subquery in SELECT clause, and constant table in 
+--echo # main query and implicit grouping
+--echo #
+
+CREATE TABLE t1 (f1 int) engine=MyISAM;
+INSERT INTO t1 VALUES (7),(8);
+
+CREATE TABLE t2 (f2 int, f3 varchar(1)) engine=MyISAM;
+INSERT INTO t2 VALUES (3,'f');
+
+EXPLAIN
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+
+EXPLAIN
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3;
+
+EXPLAIN
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+SELECT COUNT(f1), f2 > ALL (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+
+EXPLAIN
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+SELECT COUNT(f1), f2 IN (SELECT f1 FROM t1 WHERE f2 > 0) AS f4 FROM t2, t1 WHERE 'v'= f3;
+
+drop table t1,t2;
+
+--echo #
+--echo # LP BUG#1002079 Server crashes in Item_singlerow_subselect::val_int with constant table,
+--echo # HAVING, UNION in subquery
+--echo #
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (7),(0);
+CREATE TABLE t2 (b INT);
+
+EXPLAIN
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+
+SELECT SUM(a) AS f1, a AS f2 FROM (t1, t2) HAVING f2 >= ALL (SELECT 4 UNION SELECT 5) AND f1 = 7;
+
+drop table t1,t2;
 
 --echo # return optimizer switch changed in the beginning of this test
 set optimizer_switch=@subselect_tmp;
diff --git a/mysql-test/t/subselect4.test b/mysql-test/t/subselect4.test
index 8915cdd6500..e6ff625d3fe 100644
--- a/mysql-test/t/subselect4.test
+++ b/mysql-test/t/subselect4.test
@@ -1647,6 +1647,22 @@ CREATE TABLE t2 AS
 DROP TABLE t2;
 DROP TABLE t1;
 
+--echo #
+--echo # LP BUG#1000649 EXPLAIN shows incorrectly a non-correlated constant IN subquery is correlated
+--echo #
+
+create table ten (a int);
+insert into ten values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1 (a int, b int, c int);
+insert into t1 select a,a,a from ten;
+create table five (a int, b int, c int);
+insert into five select a,a,a from ten limit 5;
+
+set @@optimizer_switch='semijoin=on,in_to_exists=on,materialization=off';
+explain select * from t1 where 33 in (select b from five) or c > 11;
+
+drop table ten, t1, five;
+
 
 set optimizer_switch=@subselect4_tmp;
 
diff --git a/mysql-test/t/subselect_innodb.test b/mysql-test/t/subselect_innodb.test
index 27ec36854f4..3af8f31062c 100644
--- a/mysql-test/t/subselect_innodb.test
+++ b/mysql-test/t/subselect_innodb.test
@@ -252,6 +252,62 @@ INSERT INTO t1 VALUES ('2011-05-13', 0);
 SELECT * FROM t1 WHERE b < (SELECT CAST(a as date) FROM t1 GROUP BY a); 
 DROP TABLE t1;
 
+--echo #
+--echo # Bug #11766300  59387: FAILING ASSERTION: CURSOR->POS_STATE == 1997660512 (BTR_PCUR_IS_POSITIONE
+--echo #
+
+CREATE TABLE t1 (a INT) ENGINE=INNODB;
+INSERT INTO t1 VALUES (0);
+CREATE TABLE t2 (d BINARY(2), PRIMARY KEY (d(1)), UNIQUE KEY (d)) ENGINE=INNODB;
+
+SELECT 1 FROM t1 WHERE NOT EXISTS
+(SELECT 1 FROM t2 WHERE d = (SELECT d FROM t2 WHERE a >= 1) ORDER BY d);
+
+EXPLAIN SELECT 1 FROM t1 WHERE NOT EXISTS
+(SELECT 1 FROM t2 WHERE d = (SELECT d FROM t2 WHERE a >= 1) ORDER BY d);
+
+DROP TABLE t2;
+
+CREATE TABLE t2 (b INT, c INT, UNIQUE KEY (b), UNIQUE KEY (b, c )) ENGINE=INNODB;
+INSERT INTO t2 VALUES (1, 1);
+
+SELECT 1 FROM t1
+WHERE a != (SELECT 1 FROM t2 WHERE a <=> b OR a > '' AND 6 = 7 ORDER BY b, c);
+
+DROP TABLE t1, t2;
+
+--echo #
+--echo # Bug #13639204 64111: CRASH ON SELECT SUBQUERY WITH NON UNIQUE
+--echo # INDEX
+--echo #
+CREATE TABLE t1 (
+id int
+) ENGINE=InnoDB;
+INSERT INTO t1 (id) VALUES (11);
+
+CREATE TABLE t2 (
+t1_id int,
+position int,
+KEY t1_id (t1_id),
+KEY t1_id_position (t1_id,position)
+) ENGINE=InnoDB;
+
+let $query=SELECT
+(SELECT position FROM t2
+WHERE t2.t1_id = t1.id
+ORDER BY t2.t1_id , t2.position
+LIMIT 10,1
+) AS maxkey
+FROM t1
+LIMIT 1;
+
+eval EXPLAIN $query;
+eval $query;
+
+DROP TABLE t1,t2;
+
+--echo End of 5.1 tests
+
 --echo #
 --echo # lp:827416 Crash in select_describe() on EXPLAIN with DISTINCT in nested subqueries
 --echo #
@@ -309,4 +365,16 @@ WHERE f2 >= (
 
 drop table t1, t2, t3;
 
+--echo #
+--echo # LP BUG#1006231 crash in select_describe
+--echo #
+
+create table t1(a1 int) ENGINE=InnoDB;
+insert into t1 values (1);
+explain
+select 1 from t1 where 1 like (select 1 from t1 where 1 <=> (select 1 from t1 group by a1));
+select 1 from t1 where 1 like (select 1 from t1 where 1 <=> (select 1 from t1 group by a1));
+drop table t1;
+
+
 set optimizer_switch=@subselect_innodb_tmp;
diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/t/subselect_sj.test
index 2fb6f6b53b8..2facb089718 100644
--- a/mysql-test/t/subselect_sj.test
+++ b/mysql-test/t/subselect_sj.test
@@ -2366,5 +2366,101 @@ DEALLOCATE PREPARE pstmt;
 DROP VIEW v1;
 DROP TABLE t1, t2;
 
+--echo #
+--echo # BUG#978479: Wrong result (extra rows) with derived_with_keys+loosescan+semijoin=ON, materialization=OFF
+--echo #
+
+set @tmp_jcl_978479= @@join_cache_level;
+set join_cache_level=0;
+
+set @tmp_os_978479= @@optimizer_switch;
+set optimizer_switch = 'derived_with_keys=on,loosescan=on,semijoin=on,materialization=off';
+
+--echo # Part#1: make sure EXPLAIN is using LooseScan:
+CREATE TABLE t1 ( a INT, b INT );
+INSERT INTO t1 VALUES
+  (4,0),(6,8),(3,1),(5,8),(3,9),(2,4),
+  (2,6),(9,1),(5,4),(7,7),(5,4);
+
+CREATE ALGORITHM=TEMPTABLE
+  VIEW v1 AS SELECT * FROM t1;
+
+--echo # This will use LooseScan:
+EXPLAIN
+SELECT * FROM t1 AS t1_1, t1 AS t1_2
+  WHERE (t1_1.a, t1_2.a) IN ( SELECT a, b FROM v1 );
+
+SELECT * FROM t1 AS t1_1, t1 AS t1_2
+  WHERE (t1_1.a, t1_2.a) IN ( SELECT a, b FROM v1 );
+
+DROP VIEW v1;
+DROP TABLE t1;
+set @@join_cache_level= @tmp_jcl_978479;
+set @@optimizer_switch= @tmp_os_978479;
+
+--echo #
+--echo # BUG#998236: Assertion failure or valgrind errors at best_access_path ...
+--echo #
+CREATE TABLE t1 (a1 VARCHAR(3), a2 VARCHAR(35), KEY(a1,a2)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES
+('USA','Arvada'),('USA','Athens'),('USA','Atlanta'),('USA','Augusta'),
+('USA','Aurora'),('USA','Aurora'),('USA','Austin'),('USA','Bakersfield'),
+('USA','Baltimore'),('USA','Baton'),('USA','Beaumont'),('USA','Bellevue'),
+('USA','Berkeley'),('USA','Billings'),('USA','Birmingham'),('USA','Boise'),
+('USA','Boston'),('USA','Boulder'),('USA','Bridgeport'),('USA','Brockton'),
+('USA','Brownsville'),('USA','Buffalo'),('USA','Burbank'),('USA','Cambridge'),
+('USA','Cape'),('USA','Carrollton'),('USA','Carson'),('USA','Cary'),
+('USA','Cedar'),('USA','Chandler'),('USA','Charleston'),('USA','Charlotte'),
+('USA','Chattanooga'),('USA','Chesapeake'),('USA','Chicago'),('USA','Chula'),
+('USA','Cincinnati'),('USA','Citrus'),('USA','Clarksville'),('USA','Clearwater'),
+('USA','Cleveland'),('USA','Colorado'),('USA','Columbia'),('USA','Columbus'),
+('USA','Columbus'),('USA','Compton'),('USA','Concord'),('USA','Coral'),
+('USA','Corona'),('USA','Corpus'),('USA','Costa'),('USA','Dallas'),('USA','Daly'),
+('USA','Davenport'),('USA','Dayton'),('USA','Denver'),('USA','DesMoines'),
+('USA','Detroit'),('USA','Downey'),('USA','Durham'),('USA','East'),('USA','ElCajon'),
+('USA','ElMonte'),('USA','ElPaso'),('USA','Elgin'),('USA','Elizabeth'),
+('USA','Erie'),('USA','Escondido'),('USA','Eugene'),('USA','Evansville'),
+('USA','Fairfield'),('USA','Fall'),('USA','Fayetteville'),('USA','Flint'),
+('USA','Fontana'),('USA','FortCollins'),('USA','FortLauderdale'),('USA','FortWayne'),
+('USA','FortWorth'),('USA','Fremont'),('USA','Fresno'),('USA','Fullerton'),
+('USA','Gainesville'),('USA','GardenGrove'),('USA','Garland'),('USA','Gary'),
+('USA','Gilbert'),('USA','Glendale'),('USA','Glendale'),('USA','GrandPrairie'),
+('USA','GrandRapids'),('USA','Green Bay'),('USA','Greensboro'),('USA','Hampton'),
+('USA','Hartford'),('USA','Hayward'),('USA','Henderson'),('USA','Hialeah'),
+('USA','Inglewood'),('USA','Livonia');
+
+CREATE TABLE t3 (c1 VARCHAR(3), c2 VARCHAR(16), PRIMARY KEY (c1,c2)) ENGINE=MyISAM;
+INSERT INTO t3 VALUES ('USA','Chinese'), ('USA','English');
+
+# Not reproducible with 2 rows
+CREATE TABLE t2 (b1 INT) ENGINE=MyISAM;
+INSERT INTO t2 VALUES (1);
+
+SELECT alias1.a1 AS field1
+FROM t1 AS alias1, t1 AS alias2
+WHERE alias1.a2 IN ( SELECT a1 FROM t1, t2 )
+AND alias1.a1 IS NULL
+AND ( alias1.a1, alias2.a1 ) IN ( SELECT c1, c1 FROM t3 )
+GROUP BY field1;
+
+DROP TABLE t1,t3,t2;
+
+--echo #
+--echo #  BUG#1002630: Valgrind warnings 'Invalid read' in subselect_engine::calc_const_tables with SELECT
+--echo #
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(7);
+
+CREATE TABLE t2 (b INT);
+INSERT INTO t2 VALUES (4),(6);
+
+SELECT ( SELECT SUM(a) FROM t1 ) AS t1sum, b
+FROM t2
+WHERE (1,1) IN ( SELECT MAX(a), MIN(a) FROM t1 )
+GROUP BY b
+HAVING t1sum <> 1;
+
+DROP TABLE t1, t2;
+
 # The following command must be the last one the file 
 set optimizer_switch=@subselect_sj_tmp;
diff --git a/mysql-test/t/subselect_sj_mat.test b/mysql-test/t/subselect_sj_mat.test
index a077e9b5af5..4c40b2b5487 100644
--- a/mysql-test/t/subselect_sj_mat.test
+++ b/mysql-test/t/subselect_sj_mat.test
@@ -1664,6 +1664,19 @@ EXECUTE ps;
 DROP VIEW v2;
 DROP TABLE t1, t2;
 
+--echo #
+--echo # BUG#1000269: Wrong result (extra rows) with semijoin+materialization, IN subqueries, join_cache_level>0
+--echo #
+CREATE TABLE t1 (a1 VARCHAR(1), a2 VARCHAR(1)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('b','b'),('e','e');
+
+CREATE TABLE t2 (b1 VARCHAR(1), b2 VARCHAR(1), KEY(b1)) ENGINE=MyISAM;
+INSERT INTO t2 VALUES ('v','v'),('s','s'),('l','l'), ('y','y'),('c','c'),('i','i');
+
+SELECT * FROM t1, t2 WHERE b1 IN ( SELECT b2 FROM t2 WHERE b1 > 'o' ) AND ( b1 < 'l' OR a1 IN ('b','c') );
+
+DROP TABLE t1,t2;
+
 --echo # This must be at the end:
 set optimizer_switch=@subselect_sj_mat_tmp;
 set join_cache_level=@save_join_cache_level;
diff --git a/mysql-test/t/table_elim.test b/mysql-test/t/table_elim.test
index 26b98c9023b..2cca6f501f0 100644
--- a/mysql-test/t/table_elim.test
+++ b/mysql-test/t/table_elim.test
@@ -503,6 +503,28 @@ WHERE t3.f2 ;
 
 DROP TABLE t1,t2,t3,t4,t5;
 
+--echo #
+--echo # BUG#997747: Assertion `join->best_read < ((double)1.79..5e+308L)' 
+--echo #             failed in greedy_search with LEFT JOINs and unique keys  
+--echo #
+CREATE TABLE t1 (a1 INT);
+CREATE TABLE t2 (b1 INT);
+CREATE TABLE t3 (c1 INT, UNIQUE KEY(c1));
+CREATE TABLE t4 (d1 INT, UNIQUE KEY(d1));
+CREATE TABLE t5 (e1 INT);
+
+INSERT INTO t1 VALUES (1),(2);
+INSERT INTO t2 VALUES (2),(3);
+INSERT INTO t3 VALUES (3),(4);
+INSERT INTO t4 VALUES (4),(5);
+INSERT INTO t5 VALUES (5),(6);
+
+SELECT a1 FROM t1 LEFT JOIN t2 LEFT JOIN t3 LEFT JOIN t4
+ON c1 = d1 ON d1 = b1 ON a1 = b1
+LEFT JOIN t5 ON a1 = e1 ;
+
+DROP TABLE t1,t2,t3,t4,t5;
+
 --echo #
 --echo # BUG#884184: Wrong result with RIGHT JOIN + derived_merge
 --echo #
diff --git a/mysql-test/t/type_date.test b/mysql-test/t/type_date.test
index 22b1eb97dad..3129863ab9b 100644
--- a/mysql-test/t/type_date.test
+++ b/mysql-test/t/type_date.test
@@ -26,6 +26,13 @@ INSERT INTO t2 VALUES ('1998-01-02','note02');
 select name,t1.cdate,note from t1,t2 where t1.cdate=t2.cdate and t1.cdate='1998-01-01';
 drop table t1,t2;
 
+# MariaDB lp:993103. WHERE LAST_DAY(zero_date) IS NULL does not evaluate to TRUE.
+
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(1);
+SELECT * FROM t1 WHERE LAST_DAY('0000-00-00 00:00:00') IS NULL;
+DROP TABLE t1;
+
 #
 # Date and BETWEEN
 #
@@ -310,3 +317,13 @@ set @a=(select min(makedate('111','1'))) ;
 select @a;
 --echo #
 
+--echo #
+--echo # BUG LP:1008487 virtual bool Item_cache::is_expensive(): Assertion `example' failed
+--echo #
+create table t1(a date,key(a));
+insert into t1 values ('2012-01-01'),('2012-02-02');
+explain
+select 1 from t1 as t1_0 inner join t1 as t2 on (t1_0.a <=> now()) join t1 on 1;
+select 1 from t1 as t1_0 inner join t1 as t2 on (t1_0.a <=> now()) join t1 on 1;
+drop table t1;
+
diff --git a/mysql-test/t/update_ignore_216.test b/mysql-test/t/update_ignore_216.test
new file mode 100644
index 00000000000..bae3930e1a7
--- /dev/null
+++ b/mysql-test/t/update_ignore_216.test
@@ -0,0 +1,13 @@
+#
+# MDEV-216 lp:976104 - Assertion `0' failed in my_message_sql on UPDATE IGNORE, or unknown error on release build 
+#
+
+CREATE TABLE t1 ( a INT, b CHAR(3) );
+INSERT INTO t1 VALUES ( 1, 'foo' );
+CREATE TABLE t2 ( c CHAR(3), d INT );
+INSERT INTO t2 VALUES ( 'foo', 1 );
+
+UPDATE IGNORE t1, t2 SET b = 'bar', c = 'bar'
+  WHERE a != ( SELECT 1 UNION SELECT 2 );
+
+DROP TABLE t1, t2;
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test
index 6a64343b609..fa23d118634 100644
--- a/mysql-test/t/user_var.test
+++ b/mysql-test/t/user_var.test
@@ -404,4 +404,13 @@ SELECT f1, f2 FROM t1 ORDER BY f2;
 DROP TRIGGER trg1;
 DROP TABLE t1;
 
+
+--echo #
+--echo # Bug #12408412: GROUP_CONCAT + ORDER BY + INPUT/OUTPUT
+--echo #   SAME USER VARIABLE = CRASH
+--echo #
+
+SET @bug12408412=1;
+SELECT GROUP_CONCAT(@bug12408412 ORDER BY 1) INTO @bug12408412;
+
 --echo End of 5.5 tests
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
index 7397990eddb..832cd01e263 100644
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
@@ -67,7 +67,7 @@ ENDIF()
 
 ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES})
 TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} 
- ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET})
+ ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET} ${LIBEXECINFO})
 DTRACE_INSTRUMENT(mysys)
 
 IF(HAVE_BFD_H)
diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
index 551077a81ee..8b3b359ea95 100644
--- a/mysys/my_handler_errors.h
+++ b/mysys/my_handler_errors.h
@@ -1,8 +1,7 @@
 #ifndef MYSYS_MY_HANDLER_ERRORS_INCLUDED
 #define MYSYS_MY_HANDLER_ERRORS_INCLUDED
 
-/* Copyright (c) 2008 MySQL AB
-   Use is subject to license terms.
+/* Copyright (c) 2008, 2012, Oracle 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
@@ -14,8 +13,8 @@
    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 */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 /*
   Errors a handler can give you
@@ -84,6 +83,7 @@ static const char *handler_error_messages[]=
   "Index column length exceeds limit",
   "Index corrupted",
   "Undo record too big",
+  "Table is being used in foreign key check",
   "Row is not visible by the current transaction",
   "Operation was interrupted by end user (probably kill command?)",
   "Disk full"
diff --git a/plugin/auth_dialog/CMakeLists.txt b/plugin/auth_dialog/CMakeLists.txt
index a6f6ee9b173..9b4dcfd99bf 100644
--- a/plugin/auth_dialog/CMakeLists.txt
+++ b/plugin/auth_dialog/CMakeLists.txt
@@ -15,4 +15,4 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 MYSQL_ADD_PLUGIN(dialog dialog.c ${CMAKE_SOURCE_DIR}/libmysql/get_password.c
-  MODULE_ONLY)
+  MODULE_ONLY COMPONENT SharedLibraries)
diff --git a/plugin/handler_socket/CMakeLists.txt b/plugin/handler_socket/CMakeLists.txt
new file mode 100644
index 00000000000..358139eda1e
--- /dev/null
+++ b/plugin/handler_socket/CMakeLists.txt
@@ -0,0 +1,41 @@
+
+IF(WIN32)
+  # Handlersocket does not compile on Windows, compiles but does 
+  # not start on FreeBSD.  
+  RETURN()
+ENDIF()
+
+#Remove -fno-implicit-templates from compiler flags(handlersocket would not work  with  it)
+IF(CMAKE_COMPILER_IS_GNUCXX)
+  STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ENDIF()
+
+INCLUDE_DIRECTORIES(libhsclient)
+
+# Handlersocket client library. We do not distribute it, 
+# it is just compiled in.
+SET(LIBHSCLIENT_SOURCES
+  libhsclient/config.cpp 
+  libhsclient/escape.cpp 
+  libhsclient/fatal.cpp 
+  libhsclient/hstcpcli.cpp 
+  libhsclient/socket.cpp 
+  libhsclient/string_util.cpp
+)
+ADD_CONVENIENCE_LIBRARY(hsclient  ${LIBHSCLIENT_SOURCES})
+# Solaris needs to link some network libraries
+TARGET_LINK_LIBRARIES(hsclient ${LIBSOCKET} ${LIBNLS} ${LIBBIND})
+
+# handlersocket daemon plugin itself.
+SET(HANDLERSOCKET_SOURCES
+  handlersocket/database.cpp
+  handlersocket/handlersocket.cpp
+  handlersocket/hstcpsvr_worker.cpp 
+  handlersocket/hstcpsvr.cpp
+)
+MYSQL_ADD_PLUGIN(handlersocket 
+  ${HANDLERSOCKET_SOURCES} 
+  MODULE_ONLY  COMPONENT Server
+  LINK_LIBRARIES  hsclient
+)
+
diff --git a/plugin/handler_socket/handlersocket/handlersocket.cpp b/plugin/handler_socket/handlersocket/handlersocket.cpp
index 7b60eaa28d3..2595d24a85c 100644
--- a/plugin/handler_socket/handlersocket/handlersocket.cpp
+++ b/plugin/handler_socket/handlersocket/handlersocket.cpp
@@ -197,20 +197,20 @@ static SHOW_VAR daemon_handlersocket_status_variables[] = {
 };
 
 
-mysql_declare_plugin(handlersocket)
+maria_declare_plugin(handlersocket)
 {
   MYSQL_DAEMON_PLUGIN,
   &daemon_handlersocket_plugin,
   "handlersocket",
   "higuchi dot akira at dena dot jp",
-  "",
+  "Direct access into InnoDB",
   PLUGIN_LICENSE_BSD,
   daemon_handlersocket_init,
   daemon_handlersocket_deinit,
   0x0100 /* 1.0 */,
   daemon_handlersocket_status_variables,
   daemon_handlersocket_system_variables,
-  0
+  "1.0",
+  MariaDB_PLUGIN_MATURITY_BETA
 }
-mysql_declare_plugin_end;
-
+maria_declare_plugin_end;
diff --git a/plugin/handler_socket/handlersocket/mysql_incl.hpp b/plugin/handler_socket/handlersocket/mysql_incl.hpp
index d8dba709f28..0fb4fceb143 100644
--- a/plugin/handler_socket/handlersocket/mysql_incl.hpp
+++ b/plugin/handler_socket/handlersocket/mysql_incl.hpp
@@ -13,7 +13,10 @@
 #define HAVE_CONFIG_H
 #endif
 
+#ifndef MYSQL_DYNAMIC_PLUGIN
 #define MYSQL_DYNAMIC_PLUGIN
+#endif
+
 #define MYSQL_SERVER 1
 
 #include <my_config.h>
@@ -33,6 +36,9 @@
 #include <sql_base.h>
 // FIXME FIXME FIXME
 #define safeFree(X) my_free(X)
+#undef pthread_cond_timedwait
+#undef pthread_mutex_lock
+#undef pthread_mutex_unlock
 #define pthread_cond_timedwait  mysql_cond_timedwait
 #define  pthread_mutex_lock  mysql_mutex_lock
 #define  pthread_mutex_unlock  mysql_mutex_unlock
diff --git a/plugin/handler_socket/libhsclient/auto_addrinfo.hpp b/plugin/handler_socket/libhsclient/auto_addrinfo.hpp
index f0c07060be1..aee22a1d0f6 100644
--- a/plugin/handler_socket/libhsclient/auto_addrinfo.hpp
+++ b/plugin/handler_socket/libhsclient/auto_addrinfo.hpp
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
-
+#include <string.h>
 #include "util.hpp"
 
 typedef SOCKET_SIZE_TYPE size_socket;
@@ -34,8 +34,9 @@ struct auto_addrinfo : private noncopyable {
   const addrinfo *get() const { return addr; }
   int resolve(const char *node, const char *service, int flags = 0,
     int family = AF_UNSPEC, int socktype = SOCK_STREAM, int protocol = 0) {
-    reset();
     addrinfo hints;
+    reset();
+    memset(&hints, 0, sizeof(hints));
     hints.ai_flags = flags;
     hints.ai_family = family;
     hints.ai_socktype = socktype;
diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt
index 83c13015671..b4a72620ac5 100644
--- a/regex/CMakeLists.txt
+++ b/regex/CMakeLists.txt
@@ -17,3 +17,5 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
 ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
+
+INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 78456be59d4..5576f32e0c4 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -280,6 +280,9 @@ SET(LIBDL)
 
 SET(NON_THREADED_LIBS ${CLIENT_LIBS})
 SET(mysql_config_COMPONENT COMPONENT Development)
+SET(msql2mysql_COMPONENT COMPONENT Client)
+SET(mysqlaccess_COMPONENT COMPONENT Client)
+SET(mysql_find_rows_COMPONENT COMPONENT Client)
 
 IF(WIN32)
   # On Windows, some .sh and some .pl.in files are configured 
@@ -320,7 +323,6 @@ ELSE()
     mysql_secure_installation
     mysql_zap
     mysqlaccess
-    mysqlaccess.conf
     mysql_convert_table_format
     mysql_find_rows
     mysqlhotcopy
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 02316d218e7..99ce187fcd4 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -116,7 +116,6 @@ sub main
     print "will be disabled\nand some will be enabled.\n\n";
   }
 
-  init_log() if (!defined($opt_log));
   $groupids = $ARGV[1];
   if ($opt_version)
   {
@@ -142,6 +141,7 @@ sub main
 	       !($ARGV[0] =~ m/^stop$/i) &&
 	       !($ARGV[0] =~ m/^report$/i)));
 
+  init_log() if (!defined($opt_log));
   if (!$opt_no_log)
   {
     w2log("$my_progname log file version $VER; run: ",
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 7149c54478a..85008f1eaea 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -234,7 +234,7 @@ ADD_CUSTOM_COMMAND(
   DEPENDS gen_lex_hash
 )
 
-MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc)
+MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc COMPONENT Server)
 SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
 TARGET_LINK_LIBRARIES(mysql_tzinfo_to_sql mysys)
 
@@ -329,8 +329,8 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
 ELSE()
   # Not windows or cross compiling, just install an empty directory
   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
-ENDIF()
-ENDIF()
+ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
+ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
 
 IF(WIN32)
   SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
@@ -371,3 +371,9 @@ IF(WIN32)
     COMPONENT Server)	
   TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
 ENDIF(WIN32)
+
+INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+  FILES_MATCHING PATTERN "*.h"
+  PATTERN examples EXCLUDE
+  PATTERN share EXCLUDE
+  PATTERN CMakeFiles EXCLUDE)
diff --git a/sql/field.cc b/sql/field.cc
index d913e395b1a..6e1851d89d1 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -7860,7 +7860,19 @@ String *Field_set::val_str(String *val_buffer,
   ulonglong tmp=(ulonglong) Field_enum::val_int();
   uint bitnr=0;
 
-  val_buffer->set("", 0, field_charset);
+  if (tmp == 0)
+  {
+    /*
+      Some callers expect *val_buffer to contain the result,
+      so we assign to it, rather than doing 'return &empty_set_string.
+     */
+    *val_buffer= empty_set_string;
+    return val_buffer;
+  }
+
+  val_buffer->set_charset(field_charset);
+  val_buffer->length(0);
+
   while (tmp && bitnr < (uint) typelib->count)
   {
     if (tmp & 1)
diff --git a/sql/field.h b/sql/field.h
index 0b32aab0337..c86c0975117 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -2016,7 +2016,8 @@ public:
     :Field_enum(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
 		    unireg_check_arg, field_name_arg,
                 packlength_arg,
-                typelib_arg,charset_arg)
+                typelib_arg,charset_arg),
+      empty_set_string("", 0, charset_arg)
     {
       flags=(flags & ~ENUM_FLAG) | SET_FLAG;
     }
@@ -2027,8 +2028,11 @@ public:
   virtual bool zero_pack() const { return 1; }
   String *val_str(String*,String *);
   void sql_type(String &str) const;
+  uint size_of() const { return sizeof(*this); }
   enum_field_types real_type() const { return MYSQL_TYPE_SET; }
   bool has_charset(void) const { return TRUE; }
+private:
+  const String empty_set_string;
 };
 
 
@@ -2240,6 +2244,8 @@ public:
   {
     return (flags & (BINCMP_FLAG | BINARY_FLAG)) != 0;
   }
+private:
+  const String empty_set_string;
 };
 
 
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index 37aee93fe82..20da18a129c 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -361,10 +361,11 @@ static void do_save_blob(Copy_field *copy)
 static void do_field_string(Copy_field *copy)
 {
   char buff[MAX_FIELD_WIDTH];
-  copy->tmp.set_quick(buff,sizeof(buff),copy->tmp.charset());
-  copy->from_field->val_str(&copy->tmp);
-  copy->to_field->store(copy->tmp.c_ptr_quick(),copy->tmp.length(),
-                        copy->tmp.charset());
+  String res(buff, sizeof(buff), copy->from_field->charset());
+  res.length(0U);
+
+  copy->from_field->val_str(&res);
+  copy->to_field->store(res.c_ptr_quick(), res.length(), res.charset());
 }
 
 
diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc
index cd3717f186a..251869cad03 100644
--- a/sql/gcalc_slicescan.cc
+++ b/sql/gcalc_slicescan.cc
@@ -576,7 +576,7 @@ int gcalc_set_double(Gcalc_internal_coord *c, double d, double ext)
     c[1]= 0;
     c[0]++;
   }
-  if (sign)
+  if (sign && (c[0] | c[1]))
     c[0]|= GCALC_COORD_MINUS;
 #ifdef GCALC_CHECK_WITH_FLOAT
   GCALC_DBUG_ASSERT(de_check(d, gcalc_get_double(c, 2)));
diff --git a/sql/handler.cc b/sql/handler.cc
index 861a63ec88a..8b3573eb23e 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
    Copyright (c) 2009-2011 Monty Program Ab
 
    This program is free software; you can redistribute it and/or modify
@@ -11,8 +11,8 @@
    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 */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 /** @file handler.cc
 
@@ -365,7 +365,8 @@ int ha_init_errors(void)
   SETMSG(HA_ERR_AUTOINC_ERANGE,         ER_DEFAULT(ER_WARN_DATA_OUT_OF_RANGE));
   SETMSG(HA_ERR_TOO_MANY_CONCURRENT_TRXS, ER_DEFAULT(ER_TOO_MANY_CONCURRENT_TRXS));
   SETMSG(HA_ERR_INDEX_COL_TOO_LONG,	ER_DEFAULT(ER_INDEX_COLUMN_TOO_LONG));
-  SETMSG(HA_ERR_INDEX_CORRUPT,         ER_DEFAULT(ER_INDEX_CORRUPT));
+  SETMSG(HA_ERR_INDEX_CORRUPT,		ER_DEFAULT(ER_INDEX_CORRUPT));
+  SETMSG(HA_ERR_TABLE_IN_FK_CHECK,	ER_DEFAULT(ER_TABLE_IN_FK_CHECK));
   SETMSG(HA_ERR_DISK_FULL,              ER_DEFAULT(ER_DISK_FULL));
 
   /* Register the error messages for use with my_error(). */
@@ -2255,6 +2256,8 @@ double handler::keyread_time(uint index, uint ranges, ha_rows rows)
     The model counts in the time to read index entries from cache.
   */
   ulong len= table->key_info[index].key_length + ref_length;
+  if (index == table->s->primary_key && table->file->primary_key_is_clustered())
+    len= table->s->stored_rec_length;
   double keys_per_block= (stats.block_size/2.0/len+1);
   return (rows + keys_per_block-1)/ keys_per_block +
          len*rows/(stats.block_size+1)/TIME_FOR_COMPARE ;
@@ -3106,6 +3109,9 @@ void handler::print_error(int error, myf errflag)
   case HA_ERR_UNDO_REC_TOO_BIG:
     textno= ER_UNDO_RECORD_TOO_BIG;
     break;
+  case HA_ERR_TABLE_IN_FK_CHECK:
+    textno= ER_TABLE_IN_FK_CHECK;
+    break;
   default:
     {
       /* The error was "unknown" to this function.
diff --git a/sql/handler.h b/sql/handler.h
index e41d325a68f..a2277f8df90 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1047,6 +1047,7 @@ struct handlerton
 				  THD *victim_thd, my_bool signal);
    int (*wsrep_set_checkpoint)(handlerton *hton, const XID* xid);
    int (*wsrep_get_checkpoint)(handlerton *hton, XID* xid);
+
    uint32 license; /* Flag for Engine License */
    /*
      Optional clauses in the CREATE/ALTER TABLE
@@ -1068,7 +1069,7 @@ inline LEX_STRING *hton_name(const handlerton *hton)
 #define HTON_NO_FLAGS                 0
 #define HTON_CLOSE_CURSORS_AT_COMMIT (1 << 0)
 #define HTON_ALTER_NOT_SUPPORTED     (1 << 1) //Engine does not support alter
-#define HTON_CAN_RECREATE            (1 << 2) //Delete all is used fro truncate
+#define HTON_CAN_RECREATE            (1 << 2) //Delete all is used for truncate
 #define HTON_HIDDEN                  (1 << 3) //Engine does not appear in lists
 #define HTON_NOT_USER_SELECTABLE     (1 << 5)
 #define HTON_TEMPORARY_NOT_SUPPORTED (1 << 6) //Having temporary tables not supported
diff --git a/include/mysql/innodb_priv.h b/sql/innodb_priv.h
similarity index 100%
rename from include/mysql/innodb_priv.h
rename to sql/innodb_priv.h
diff --git a/sql/item.cc b/sql/item.cc
index f9032c79c12..3af415fe5c2 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -8191,20 +8191,12 @@ bool Item_insert_value::fix_fields(THD *thd, Item **items)
   }
 
   if (arg->type() == REF_ITEM)
+    arg= static_cast<Item_ref *>(arg)->ref[0];
+  if (arg->type() != FIELD_ITEM)
   {
-    Item_ref *ref= (Item_ref *)arg;
-    if (ref->ref[0]->type() != FIELD_ITEM)
-    {
-      my_error(ER_BAD_FIELD_ERROR, MYF(0), "", "VALUES() function");
-      return TRUE;
-    }
-    arg= ref->ref[0];
+    my_error(ER_BAD_FIELD_ERROR, MYF(0), "", "VALUES() function");
+    return TRUE;
   }
-  /*
-    According to our SQL grammar, VALUES() function can reference
-    only to a column.
-  */
-  DBUG_ASSERT(arg->type() == FIELD_ITEM);
 
   Item_field *field_arg= (Item_field *)arg;
 
@@ -8787,7 +8779,7 @@ bool  Item_cache_temporal::cache_value()
   value_cached= true;
  
   MYSQL_TIME ltime;
-  if (example->get_date(&ltime, TIME_FUZZY_DATE))
+  if (example->get_date_result(&ltime, TIME_FUZZY_DATE))
     value=0;
   else
     value= pack_time(&ltime);
diff --git a/sql/item.h b/sql/item.h
index b3801e6c488..a9c1153d236 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -3889,7 +3889,6 @@ public:
   bool is_null() { return null_value; }
   virtual bool is_expensive()
   {
-    DBUG_ASSERT(example);
     if (value_cached)
       return false;
     return example->is_expensive();
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index d3251bc1fb3..5f1a863d8fd 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -4736,7 +4736,7 @@ longlong Item_func_like::val_int()
 
 Item_func::optimize_type Item_func_like::select_optimize() const
 {
-  if (args[1]->const_item())
+  if (args[1]->const_item() && !args[1]->is_expensive())
   {
     String* res2= args[1]->val_str((String *)&cmp.value2);
     const char *ptr2;
@@ -4823,7 +4823,8 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref)
       We could also do boyer-more for non-const items, but as we would have to
       recompute the tables for each row it's not worth it.
     */
-    if (args[1]->const_item() && !use_strnxfrm(collation.collation))
+    if (args[1]->const_item() && !use_strnxfrm(collation.collation) &&
+        !args[1]->is_expensive())
     {
       String* res2 = args[1]->val_str(&cmp.value2);
       if (!res2)
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 5558b77d67d..de62bc49930 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -252,6 +252,7 @@ public:
   { with_subselect= true; }
   bool fix_fields(THD *, Item **);
   bool fix_left(THD *thd, Item **ref);
+  table_map not_null_tables() const { return 0; }
   bool is_null();
   longlong val_int();
   void cleanup();
@@ -503,6 +504,7 @@ public:
     {}
   virtual void top_level_item() { abort_on_null= 1; }
   bool is_top_level_item() { return abort_on_null; }
+  table_map not_null_tables() const { return 0; }
   longlong val_int();
   enum Functype functype() const { return NOT_ALL_FUNC; }
   const char *func_name() const { return "<not>"; }
@@ -1560,6 +1562,7 @@ public:
   friend int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves,
                          COND **conds);
   void top_level_item() { abort_on_null=1; }
+  bool top_level() { return abort_on_null; }
   void copy_andor_arguments(THD *thd, Item_cond *item);
   bool walk(Item_processor processor, bool walk_subquery, uchar *arg);
   Item *transform(Item_transformer transformer, uchar *arg);
diff --git a/sql/item_func.h b/sql/item_func.h
index 3b1a38cf447..f91107c5445 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1201,6 +1201,7 @@ public:
   {
     if (arg_count)
       max_length= args[0]->max_length;
+    unsigned_flag=1;
   }
   bool fix_fields(THD *thd, Item **ref);
   bool check_vcol_func_processor(uchar *int_arg) 
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index e1f06824d5b..fdd3cab8273 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -1010,6 +1010,13 @@ static void calculate_perpendicular(
 
 int Item_func_buffer::Transporter::single_point(double x, double y)
 {
+  if (buffer_op == Gcalc_function::op_difference)
+  {
+    m_fn->add_operation(Gcalc_function::op_false, 0);
+    return 0;
+  }
+  
+  m_nshapes= 0;
   return add_point_buffer(x, y);
 }
 
@@ -1109,6 +1116,7 @@ int Item_func_buffer::Transporter::start_line()
 {
   if (buffer_op == Gcalc_function::op_difference)
   {
+    m_fn->add_operation(Gcalc_function::op_false, 0);
     skip_line= TRUE;
     return 0;
   }
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index b1829c1892a..5458a2fb968 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -265,6 +265,7 @@ bool Item_subselect::fix_fields(THD *thd_param, Item **ref)
 
       (*ref)= substitution;
       substitution->name= name;
+      substitution->name_length= name_length;
       if (have_to_be_excluded)
 	engine->exclude();
       substitution= 0;
@@ -769,7 +770,8 @@ void Item_subselect::fix_length_and_dec()
 
 table_map Item_subselect::used_tables() const
 {
-  return (table_map) (engine->uncacheable() ? used_tables_cache : 0L);
+  return (table_map) ((engine->uncacheable() & ~UNCACHEABLE_EXPLAIN)? 
+                      used_tables_cache : 0L);
 }
 
 
@@ -900,6 +902,23 @@ void Item_maxmin_subselect::print(String *str, enum_query_type query_type)
 }
 
 
+void Item_maxmin_subselect::no_rows_in_result()
+{
+  value= Item_cache::get_cache(new Item_null());
+  null_value= 0;
+  was_values= 0;
+  make_const();
+}
+
+
+void Item_singlerow_subselect::no_rows_in_result()
+{
+  value= Item_cache::get_cache(new Item_null());
+  reset();
+  make_const();
+}
+
+
 void Item_singlerow_subselect::reset()
 {
   Item_subselect::reset();
@@ -1095,6 +1114,8 @@ void Item_singlerow_subselect::bring_value()
 double Item_singlerow_subselect::val_real()
 {
   DBUG_ASSERT(fixed == 1);
+  if (forced_const)
+    return value->val_real();
   if (!exec() && !value->null_value)
   {
     null_value= FALSE;
@@ -1110,6 +1131,8 @@ double Item_singlerow_subselect::val_real()
 longlong Item_singlerow_subselect::val_int()
 {
   DBUG_ASSERT(fixed == 1);
+  if (forced_const)
+    return value->val_int();
   if (!exec() && !value->null_value)
   {
     null_value= FALSE;
@@ -1124,6 +1147,9 @@ longlong Item_singlerow_subselect::val_int()
 
 String *Item_singlerow_subselect::val_str(String *str)
 {
+  DBUG_ASSERT(fixed == 1);
+  if (forced_const)
+    return value->val_str(str);
   if (!exec() && !value->null_value)
   {
     null_value= FALSE;
@@ -1139,6 +1165,9 @@ String *Item_singlerow_subselect::val_str(String *str)
 
 my_decimal *Item_singlerow_subselect::val_decimal(my_decimal *decimal_value)
 {
+  DBUG_ASSERT(fixed == 1);
+  if (forced_const)
+    return value->val_decimal(decimal_value);
   if (!exec() && !value->null_value)
   {
     null_value= FALSE;
@@ -1154,6 +1183,9 @@ my_decimal *Item_singlerow_subselect::val_decimal(my_decimal *decimal_value)
 
 bool Item_singlerow_subselect::val_bool()
 {
+  DBUG_ASSERT(fixed == 1);
+  if (forced_const)
+    return value->val_bool();
   if (!exec() && !value->null_value)
   {
     null_value= FALSE;
@@ -1167,6 +1199,24 @@ bool Item_singlerow_subselect::val_bool()
 }
 
 
+bool Item_singlerow_subselect::get_date(MYSQL_TIME *ltime,ulonglong fuzzydate)
+{
+  DBUG_ASSERT(fixed == 1);
+  if (forced_const)
+    return value->get_date(ltime, fuzzydate);
+  if (!exec() && !value->null_value)
+  {
+    null_value= FALSE;
+    return value->get_date(ltime, fuzzydate);
+  }
+  else
+  {
+    reset();
+    return 0;
+  }
+}
+
+
 Item_exists_subselect::Item_exists_subselect(st_select_lex *select_lex):
   Item_subselect()
 {
@@ -1323,10 +1373,17 @@ Item* Item_exists_subselect::expr_cache_insert_transformer(uchar *thd_arg)
 }
 
 
+void Item_exists_subselect::no_rows_in_result()
+{
+  value= 0;
+  null_value= 0;
+  make_const();
+}
+
 double Item_exists_subselect::val_real()
 {
   DBUG_ASSERT(fixed == 1);
-  if (exec())
+  if (!forced_const && exec())
   {
     reset();
     return 0;
@@ -1337,7 +1394,7 @@ double Item_exists_subselect::val_real()
 longlong Item_exists_subselect::val_int()
 {
   DBUG_ASSERT(fixed == 1);
-  if (exec())
+  if (!forced_const && exec())
   {
     reset();
     return 0;
@@ -1362,7 +1419,7 @@ longlong Item_exists_subselect::val_int()
 String *Item_exists_subselect::val_str(String *str)
 {
   DBUG_ASSERT(fixed == 1);
-  if (exec())
+  if (!forced_const && exec())
     reset();
   str->set((ulonglong)value,&my_charset_bin);
   return str;
@@ -1385,7 +1442,7 @@ String *Item_exists_subselect::val_str(String *str)
 my_decimal *Item_exists_subselect::val_decimal(my_decimal *decimal_value)
 {
   DBUG_ASSERT(fixed == 1);
-  if (exec())
+  if (!forced_const && exec())
     reset();
   int2my_decimal(E_DEC_FATAL_ERROR, value, 0, decimal_value);
   return decimal_value;
@@ -1395,7 +1452,7 @@ my_decimal *Item_exists_subselect::val_decimal(my_decimal *decimal_value)
 bool Item_exists_subselect::val_bool()
 {
   DBUG_ASSERT(fixed == 1);
-  if (exec())
+  if (!forced_const && exec())
   {
     reset();
     return 0;
@@ -2660,6 +2717,15 @@ void Item_allany_subselect::print(String *str, enum_query_type query_type)
 }
 
 
+void Item_allany_subselect::no_rows_in_result()
+{
+  value= 0;
+  null_value= 0;
+  was_null= 0;
+  make_const();
+}
+
+
 void subselect_engine::set_thd(THD *thd_arg)
 {
   thd= thd_arg;
@@ -2869,7 +2935,7 @@ void subselect_engine::set_row(List<Item> &item_list, Item_cache **row)
     item->decimals= sel_item->decimals;
     item->unsigned_flag= sel_item->unsigned_flag;
     maybe_null= sel_item->maybe_null;
-    if (!(row[i]= Item_cache::get_cache(sel_item)))
+    if (!(row[i]= Item_cache::get_cache(sel_item, sel_item->cmp_type())))
       return;
     row[i]->setup(sel_item);
  //psergey-backport-timours:   row[i]->store(sel_item);
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 57f413f1ccd..0e0f61aedd9 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -158,6 +158,11 @@ public:
     eliminated= FALSE;
     null_value= 1;
   }
+  /**
+    Set the subquery result to the default value for the predicate when the
+    subquery is known to produce an empty result.
+  */
+  void no_rows_in_result()= 0;
   virtual bool select_transformer(JOIN *join);
   bool assigned() { return value_assigned; }
   void assigned(bool a) { value_assigned= a; }
@@ -274,6 +279,7 @@ public:
   subs_type substype() { return SINGLEROW_SUBS; }
 
   void reset();
+  void no_rows_in_result();
   bool select_transformer(JOIN *join);
   void store(uint i, Item* item);
   double val_real();
@@ -281,6 +287,7 @@ public:
   String *val_str (String *);
   my_decimal *val_decimal(my_decimal *);
   bool val_bool();
+  bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate);
   enum Item_result result_type() const;
   enum_field_types field_type() const;
   void fix_length_and_dec();
@@ -326,6 +333,7 @@ public:
   bool any_value() { return was_values; }
   void register_value() { was_values= TRUE; }
   void reset_value_registration() { was_values= FALSE; }
+  void no_rows_in_result();
 };
 
 /* exists subselect */
@@ -347,6 +355,7 @@ public:
     eliminated= FALSE;
     value= 0;
   }
+  void no_rows_in_result();
 
   enum Item_result result_type() const { return INT_RESULT;}
   longlong val_int();
@@ -676,6 +685,7 @@ public:
   virtual void print(String *str, enum_query_type query_type);
   bool is_maxmin_applicable(JOIN *join);
   bool transform_into_max_min(JOIN *join);
+  void no_rows_in_result();
 };
 
 
diff --git a/sql/lock.cc b/sql/lock.cc
index 7ae3b23ff24..854e7ddf78d 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -1055,6 +1055,15 @@ void Global_read_lock::unlock_global_read_lock(THD *thd)
 
   DBUG_ASSERT(m_mdl_global_shared_lock && m_state);
 
+  if (thd->global_disable_checkpoint)
+  {
+    thd->global_disable_checkpoint= 0;
+    if (!--global_disable_checkpoint)
+    {
+      ha_checkpoint_state(0);                   // Enable checkpoints
+    }
+  }
+
   if (m_mdl_blocks_commits_lock)
   {
     thd->mdl_context.release_lock(m_mdl_blocks_commits_lock);
diff --git a/sql/log_event.cc b/sql/log_event.cc
index ccfa1ae73e2..95ac3fc278c 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -3227,6 +3227,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
   if (!(start= data_buf = (Log_event::Byte*) my_malloc(catalog_len + 1 +
                                               time_zone_len + 1 +
                                               data_len + 1 +
+                                              QUERY_CACHE_DB_LENGTH_SIZE +
                                               QUERY_CACHE_FLAGS_SIZE +
                                               user.length + 1 +
                                               host.length + 1 +
@@ -6066,6 +6067,11 @@ int Xid_log_event::do_apply_event(Relay_log_info const *rli)
   res= trans_commit(thd); /* Automatically rolls back on error. */
   thd->mdl_context.release_transactional_locks();
 
+  /*
+    Increment the global status commit count variable
+  */
+  status_var_increment(thd->status_var.com_stat[SQLCOM_COMMIT]);
+
   return res;
 }
 
@@ -8174,9 +8180,24 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
     {
       DBUG_PRINT("debug", ("Checking compability of tables to lock - tables_to_lock: %p",
                            rli->tables_to_lock));
+
+      /**
+        When using RBR and MyISAM MERGE tables the base tables that make
+        up the MERGE table can be appended to the list of tables to lock.
+  
+        Thus, we just check compatibility for those that tables that have
+        a correspondent table map event (ie, those that are actually going
+        to be accessed while applying the event). That's why the loop stops
+        at rli->tables_to_lock_count .
+
+        NOTE: The base tables are added here are removed when 
+              close_thread_tables is called.
+       */
       RPL_TABLE_LIST *ptr= rli->tables_to_lock;
-      for ( ; ptr ; ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_global))
+      for (uint i= 0 ; ptr && (i < rli->tables_to_lock_count);
+           ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_global), i++)
       {
+        DBUG_ASSERT(ptr->m_tabledef_valid);
         TABLE *conv_table;
         if (!ptr->m_tabledef.compatible_with(thd, const_cast<Relay_log_info*>(rli),
                                              ptr->table, &conv_table))
@@ -8214,10 +8235,10 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
       Rows_log_event, we can invalidate the query cache for the
       associated table.
      */
-    for (TABLE_LIST *ptr= rli->tables_to_lock ; ptr ; ptr= ptr->next_global)
-    {
+    TABLE_LIST *ptr= rli->tables_to_lock;
+    for (uint i=0 ;  ptr && (i < rli->tables_to_lock_count); ptr= ptr->next_global, i++)
       const_cast<Relay_log_info*>(rli)->m_table_map.set_table(ptr->table_id, ptr->table);
-    }
+
 #ifdef HAVE_QUERY_CACHE
     query_cache.invalidate_locked_for_write(thd, rli->tables_to_lock);
 #endif
@@ -9248,9 +9269,9 @@ check_table_map(Relay_log_info const *rli, RPL_TABLE_LIST *table_list)
     res= FILTERED_OUT;
   else
   {
-    for(RPL_TABLE_LIST *ptr= static_cast<RPL_TABLE_LIST*>(rli->tables_to_lock);
-        ptr; 
-        ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_local))
+    RPL_TABLE_LIST *ptr= static_cast<RPL_TABLE_LIST*>(rli->tables_to_lock);
+    for(uint i=0 ; ptr && (i< rli->tables_to_lock_count); 
+        ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_local), i++)
     {
       if (ptr->table_id == table_list->table_id)
       {
@@ -9514,6 +9535,12 @@ Write_rows_log_event::do_before_row_operations(const Slave_reporting_capability
 {
   int error= 0;
 
+  /*
+    Increment the global status insert count variable
+  */
+  if (get_flags(STMT_END_F))
+    status_var_increment(thd->status_var.com_stat[SQLCOM_INSERT]);
+
   /**
      todo: to introduce a property for the event (handler?) which forces
      applying the event in the replace (idempotent) fashion.
@@ -10532,6 +10559,12 @@ Delete_rows_log_event::Delete_rows_log_event(const char *buf, uint event_len,
 int 
 Delete_rows_log_event::do_before_row_operations(const Slave_reporting_capability *const)
 {
+  /*
+    Increment the global status delete count variable
+   */
+  if (get_flags(STMT_END_F))
+    status_var_increment(thd->status_var.com_stat[SQLCOM_DELETE]);
+
   if ((m_table->file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION) &&
       m_table->s->primary_key < MAX_KEY)
   {
@@ -10681,6 +10714,12 @@ Update_rows_log_event::Update_rows_log_event(const char *buf, uint event_len,
 int 
 Update_rows_log_event::do_before_row_operations(const Slave_reporting_capability *const)
 {
+  /*
+    Increment the global status update count variable
+  */
+  if (get_flags(STMT_END_F))
+    status_var_increment(thd->status_var.com_stat[SQLCOM_UPDATE]);
+
   int err;
   if ((err= find_key()))
     return err;
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc
index 104a77c65a7..040b35d28f1 100644
--- a/sql/log_event_old.cc
+++ b/sql/log_event_old.cc
@@ -126,8 +126,10 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info
 
     {
       RPL_TABLE_LIST *ptr= rli->tables_to_lock;
-      for ( ; ptr ; ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_global))
+      for (uint i= 0 ; ptr&& (i< rli->tables_to_lock_count); 
+           ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_global), i++)
       {
+        DBUG_ASSERT(ptr->m_tabledef_valid);
         TABLE *conv_table;
         if (!ptr->m_tabledef.compatible_with(thd, const_cast<Relay_log_info*>(rli),
                                              ptr->table, &conv_table))
@@ -158,10 +160,9 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info
       Old_rows_log_event, we can invalidate the query cache for the
       associated table.
      */
-    for (TABLE_LIST *ptr= rli->tables_to_lock ; ptr ; ptr= ptr->next_global)
-    {
+    TABLE_LIST *ptr= rli->tables_to_lock;
+    for (uint i=0; ptr && (i < rli->tables_to_lock_count); ptr= ptr->next_global, i++)
       const_cast<Relay_log_info*>(rli)->m_table_map.set_table(ptr->table_id, ptr->table);
-    }
 #ifdef HAVE_QUERY_CACHE
     query_cache.invalidate_locked_for_write(thd, rli->tables_to_lock);
 #endif
@@ -1548,7 +1549,8 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli)
 
     {
       RPL_TABLE_LIST *ptr= rli->tables_to_lock;
-      for ( ; ptr ; ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_global))
+      for (uint i= 0 ; ptr&& (i< rli->tables_to_lock_count);
+           ptr= static_cast<RPL_TABLE_LIST*>(ptr->next_global), i++)
       {
         TABLE *conv_table;
         if (ptr->m_tabledef.compatible_with(thd, const_cast<Relay_log_info*>(rli),
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a88e76972e4..eaaff295ae0 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1400,13 +1400,13 @@ static void close_connections(void)
   {
     if (base_ip_sock != INVALID_SOCKET)
     {
-      (void) shutdown(base_ip_sock, SHUT_RDWR);
+      (void) mysql_socket_shutdown(base_ip_sock, SHUT_RDWR);
       (void) closesocket(base_ip_sock);
       base_ip_sock= INVALID_SOCKET;
     }
     if (extra_ip_sock != INVALID_SOCKET)
     {
-      (void) shutdown(extra_ip_sock, SHUT_RDWR);
+      (void) mysql_socket_shutdown(extra_ip_sock, SHUT_RDWR);
       (void) closesocket(extra_ip_sock);
       extra_ip_sock= INVALID_SOCKET;
     }
@@ -1438,7 +1438,7 @@ static void close_connections(void)
 #ifdef HAVE_SYS_UN_H
   if (unix_sock != INVALID_SOCKET)
   {
-    (void) shutdown(unix_sock, SHUT_RDWR);
+    (void) mysql_socket_shutdown(unix_sock, SHUT_RDWR);
     (void) closesocket(unix_sock);
     (void) unlink(mysqld_unix_port);
     unix_sock= INVALID_SOCKET;
@@ -1585,7 +1585,7 @@ static void close_socket(my_socket sock, const char *info)
   if (sock != INVALID_SOCKET)
   {
     DBUG_PRINT("info", ("calling shutdown on %s socket", info));
-    (void) shutdown(sock, SHUT_RDWR);
+    (void) mysql_socket_shutdown(sock, SHUT_RDWR);
 #if defined(__NETWARE__)
     /*
       The following code is disabled for normal systems as it causes MySQL
@@ -2353,7 +2353,10 @@ static void network_init(void)
   {
     report_port= mysqld_port;
   }
-  DBUG_ASSERT(report_port != 0);
+#ifndef DBUG_OFF
+  if (!opt_disable_networking)
+    DBUG_ASSERT(report_port != 0);
+#endif
   if (!opt_disable_networking && !opt_bootstrap)
   {
     if (mysqld_port)
@@ -6257,7 +6260,7 @@ void handle_connections_sockets()
 	  if (req.sink)
 	    ((void (*)(int))req.sink)(req.fd);
 
-	  (void) shutdown(new_sock, SHUT_RDWR);
+	  (void) mysql_socket_shutdown(new_sock, SHUT_RDWR);
 	  (void) closesocket(new_sock);
 	  continue;
 	}
@@ -6273,7 +6276,7 @@ void handle_connections_sockets()
                   (SOCKET_SIZE_TYPE *)&dummyLen) < 0  )
       {
 	sql_perror("Error on new connection socket");
-	(void) shutdown(new_sock, SHUT_RDWR);
+	(void) mysql_socket_shutdown(new_sock, SHUT_RDWR);
 	(void) closesocket(new_sock);
 	continue;
       }
@@ -6285,7 +6288,7 @@ void handle_connections_sockets()
 
     if (!(thd= new THD))
     {
-      (void) shutdown(new_sock, SHUT_RDWR);
+      (void) mysql_socket_shutdown(new_sock, SHUT_RDWR);
       (void) closesocket(new_sock);
       continue;
     }
@@ -6304,7 +6307,7 @@ void handle_connections_sockets()
         vio_delete(vio_tmp);
       else
       {
-	(void) shutdown(new_sock, SHUT_RDWR);
+	(void) mysql_socket_shutdown(new_sock, SHUT_RDWR);
 	(void) closesocket(new_sock);
       }
       delete thd;
@@ -6809,7 +6812,7 @@ struct my_option my_long_options[]=
 #endif
   {"debug-no-sync", 0,
    "Disables system sync calls. Only for running tests or debugging!",
-   &my_disable_sync, &my_disable_sync, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
+   &my_disable_sync, &my_disable_sync, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_REPLICATION
   {"debug-sporadic-binlog-dump-fail", 0,
    "Option used by mysql-test for debugging and testing of replication.",
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index c6ee117213d..0390ac1101e 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1616,6 +1616,9 @@ int imerge_list_or_tree(RANGE_OPT_PARAM *param,
       param           Context info for the operation
       merges   IN/OUT List of imerges to push the range part of 'tree' into
       tree            SEL_TREE whose range part is to be pushed into imerges
+      replace         if the pushdow operation for a imerge is a success
+                      then the original imerge is replaced for the result
+                      of the pushdown 
 
   DESCRIPTION
     For each imerge from the list merges the function pushes the range part
@@ -1633,7 +1636,12 @@ int imerge_list_or_tree(RANGE_OPT_PARAM *param,
     If the result of the pushdown operation for the imerge mi returns an
     imerge with no trees then then not only nothing is added to the list 
     merges but mi itself is removed from the list. 
-     
+
+  TODO
+    Optimize the code in order to not create new SEL_IMERGE and new SER_TREE
+    objects when 'replace' is TRUE. (Currently this function is called always
+    with this parameter equal to TRUE.)
+    
   RETURN
     1    if no imerges are left in the list merges             
     0    otherwise
@@ -1642,7 +1650,8 @@ int imerge_list_or_tree(RANGE_OPT_PARAM *param,
 static
 int imerge_list_and_tree(RANGE_OPT_PARAM *param,
                          List<SEL_IMERGE> *merges,
-                         SEL_TREE *tree)
+                         SEL_TREE *tree, 
+                         bool replace)
 {
   SEL_IMERGE *imerge;
   SEL_IMERGE *new_imerge= NULL;
@@ -1659,8 +1668,11 @@ int imerge_list_and_tree(RANGE_OPT_PARAM *param,
       if (new_imerge->trees == new_imerge->trees_next)
         it.remove();
       else
-      {         
-        new_merges.push_back(new_imerge);
+      { 
+        if (replace)
+          it.replace(new_imerge);
+        else        
+          new_merges.push_back(new_imerge);
         new_imerge= NULL;
       }
     }
@@ -2056,7 +2068,24 @@ end:
     doing_key_read= 1;
     head->mark_columns_used_by_index(index);
   }
+
   head->prepare_for_position();
+
+  if (head->no_keyread)
+  {
+    /*
+      We can get here when doing multi-table delete and having index_merge
+      condition on a table that we're deleting from. It probably doesn't make
+      sense to use index_merge, but de-facto it is used.
+
+      When it is used, we need to index columns to be read (before maria-5.3,
+      read_multi_range_first() would set it). 
+      We shouldn't call mark_columns_used_by_index(), because it calls 
+      enable_keyread(), which is not allowed.
+    */
+    head->mark_columns_used_by_index_no_reset(index, head->read_set);
+  }
+
   head->file= org_file;
   head->key_read= org_key_read;
   bitmap_copy(&column_bitmap, head->read_set);
@@ -8011,10 +8040,10 @@ int and_range_trees(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2,
       tree1 represents the formula RT1 AND MT1,
         where RT1 = R1_1 AND ... AND R1_k1, MT1=M1_1 AND ... AND M1_l1;
       tree2 represents the formula RT2 AND MT2 
-        where RT2 = R2_1 AND ... AND R2_k2, MT2=M2_1 and ... and M2_l2.
+        where RT2 = R2_1 AND ... AND R2_k2, MT2=M2_1 AND ... AND M2_l2.
 
     The result tree will represent the formula of the the following structure:
-      RT AND MT1 AND MT2 AND RT1MT2 AND RT2MT1, such that
+      RT AND RT1MT2 AND RT2MT1, such that
         rt is a tree obtained by range intersection of trees tree1 and tree2,
         RT1MT2 = RT1M2_1 AND ... AND RT1M2_l2,
         RT2MT1 = RT2M1_1 AND ... AND RT2M1_l1,
@@ -8032,11 +8061,22 @@ int and_range_trees(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2,
     tree, while the corresponding imerges are removed altogether from its
     imerge part. 
     
-  NOTE.
+  NOTE
     The pushdown operation of range trees into imerges is needed to be able
     to construct valid imerges for the condition like this:
       key1_p1=c1 AND (key1_p2 BETWEEN c21 AND c22 OR key2 < c2)
 
+  NOTE
+    Currently we do not support intersection between indexes and index merges.
+    When this will be supported the list of imerges for the result tree
+    should include also imerges from M1 and M2. That's why an extra parameter
+    is added to the function imerge_list_and_tree. If we call the function
+    with the last parameter equal to FALSE then MT1 and MT2 will be preserved
+    in the imerge list of the result tree. This can lead to the exponential
+    growth of the imerge list though. 
+    Currently the last parameter of imerge_list_and_tree calls is always
+    TRUE.
+
   RETURN
     The result tree, if a success
     0 - otherwise.        
@@ -8067,9 +8107,9 @@ SEL_TREE *tree_and(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2)
   }
 
   if (!tree1->merges.is_empty())
-    imerge_list_and_tree(param, &tree1->merges, tree2);
+    imerge_list_and_tree(param, &tree1->merges, tree2, TRUE);
   if (!tree2->merges.is_empty())
-    imerge_list_and_tree(param, &tree2->merges, tree1);
+    imerge_list_and_tree(param, &tree2->merges, tree1, TRUE);
   if (and_range_trees(param, tree1, tree2, tree1))
     DBUG_RETURN(tree1);
   imerge_list_and_list(&tree1->merges, &tree2->merges);
@@ -13271,7 +13311,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min()
     if (min_max_arg_part && min_max_arg_part->field->is_null())
     {
       /* Find the first subsequent record without NULL in the MIN/MAX field. */
-      key_copy(tmp_record, record, index_info, 0);
+      key_copy(tmp_record, record, index_info, max_used_key_length);
       result= file->ha_index_read_map(record, tmp_record,
                                       make_keypart_map(real_key_parts),
                                       HA_READ_AFTER_KEY);
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index 56b76f5982e..a5a68d0d306 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -3176,6 +3176,25 @@ at_sjmat_pos(const JOIN *join, table_map remaining_tables, const JOIN_TAB *tab,
 }
 
 
+/*
+  Re-calculate values of join->best_positions[start..end].prefix_record_count
+*/
+
+static void recalculate_prefix_record_count(JOIN *join, uint start, uint end)
+{
+  for (uint j= start; j < end ;j++)
+  {
+    double prefix_count;
+    if (j == join->const_tables)
+      prefix_count= 1.0;
+    else
+      prefix_count= join->best_positions[j-1].prefix_record_count *
+                    join->best_positions[j-1].records_read;
+
+    join->best_positions[j].prefix_record_count= prefix_count;
+  }
+}
+
 
 /*
   Fix semi-join strategies for the picked join order
@@ -3245,6 +3264,8 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join)
       sjm->is_sj_scan= FALSE;
       memcpy(pos - sjm->tables + 1, sjm->positions, 
              sizeof(POSITION) * sjm->tables);
+      recalculate_prefix_record_count(join, tablenr - sjm->tables + 1,
+                                      tablenr);
       first= tablenr - sjm->tables + 1;
       join->best_positions[first].n_sj_tables= sjm->tables;
       join->best_positions[first].sj_strategy= SJ_OPT_MATERIALIZE;
@@ -3258,6 +3279,7 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join)
       first= pos->sjmat_picker.sjm_scan_last_inner - sjm->tables + 1;
       memcpy(join->best_positions + first, 
              sjm->positions, sizeof(POSITION) * sjm->tables);
+      recalculate_prefix_record_count(join, first, first + sjm->tables);
       join->best_positions[first].sj_strategy= SJ_OPT_MATERIALIZE_SCAN;
       join->best_positions[first].n_sj_tables= sjm->tables;
       /* 
@@ -5433,11 +5455,17 @@ bool JOIN::choose_subquery_plan(table_map join_tables)
     if (in_subs->inject_in_to_exists_cond(this))
       return TRUE;
     /*
-      It is IN->EXISTS transformation so we should mark subquery as
-      dependent
+      If the injected predicate is correlated the IN->EXISTS transformation
+      make the subquery dependent.
     */
-    in_subs->unit->uncacheable|= UNCACHEABLE_DEPENDENT_INJECTED;
-    select_lex->uncacheable|= UNCACHEABLE_DEPENDENT_INJECTED;
+    if ((in_to_exists_where &&
+         in_to_exists_where->used_tables() & OUTER_REF_TABLE_BIT) ||
+        (in_to_exists_having &&
+         in_to_exists_having->used_tables() & OUTER_REF_TABLE_BIT))
+    {
+      in_subs->unit->uncacheable|= UNCACHEABLE_DEPENDENT_INJECTED;
+      select_lex->uncacheable|= UNCACHEABLE_DEPENDENT_INJECTED;
+    }
     select_limit= 1;
   }
   else
@@ -5467,8 +5495,8 @@ bool JOIN::choose_tableless_subquery_plan()
     /*
       If the optimizer determined that his query has an empty result,
       in most cases the subquery predicate is a known constant value -
-      either FALSE or NULL. The implementation of Item_subselect::reset()
-      determines which one.
+      either of TRUE, FALSE or NULL. The implementation of
+      Item_subselect::no_rows_in_result() determines which one.
     */
     if (zero_result_cause)
     {
@@ -5476,14 +5504,13 @@ bool JOIN::choose_tableless_subquery_plan()
       {
         /*
           Both group by queries and non-group by queries without aggregate
-          functions produce empty subquery result.
+          functions produce empty subquery result. There is no need to further
+          rewrite the subquery because it will not be executed at all.
         */
-        subs_predicate->reset();
-        subs_predicate->make_const();
         return FALSE;
       }
 
-      /* TODO:
+      /* @todo
          A further optimization is possible when a non-group query with
          MIN/MAX/COUNT is optimized by opt_sum_query. Then, if there are
          only MIN/MAX functions over an empty result set, the subquery
diff --git a/sql/opt_subselect.h b/sql/opt_subselect.h
index a12e0c11620..7b8f3142851 100644
--- a/sql/opt_subselect.h
+++ b/sql/opt_subselect.h
@@ -146,7 +146,9 @@ public:
   
   void add_keyuse(table_map remaining_tables, KEYUSE *keyuse)
   {
-    if (try_loosescan && keyuse->sj_pred_no != UINT_MAX)
+    if (try_loosescan && keyuse->sj_pred_no != UINT_MAX &&
+        (keyuse->table->file->index_flags(keyuse->key, 0, 1 ) & HA_READ_ORDER))
+
     {
       if (!(remaining_tables & keyuse->used_tables))
       {
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 430c201d3e6..cbec039b3e4 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -415,7 +415,7 @@ int opt_sum_query(THD *thd,
 	  }
           removed_tables|= table->map;
         }
-        else if (!expr->const_item() || !is_exact_count)
+        else if (!expr->const_item() || !is_exact_count || conds)
         {
           /*
             The optimization is not applicable in both cases:
@@ -425,6 +425,8 @@ int opt_sum_query(THD *thd,
             NULL if the query does not return any rows. Thus, if we are not
             able to determine if the query returns any rows, we can't apply
             the optimization and replace MIN/MAX with a constant.
+            (c) there is a WHERE clause. The WHERE conditions may result in
+            an empty result, but the clause cannot be taken into account here.
           */
           const_result= 0;
           break;
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index 699aa7e2b95..a6e3aa7ed66 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -86,6 +86,40 @@ write_escaped_string(IO_CACHE *file, LEX_STRING *val_s)
   return FALSE;
 }
 
+static ulonglong view_algo_to_frm(ulonglong val)
+{
+  switch(val)
+  {
+    case VIEW_ALGORITHM_UNDEFINED:
+      return VIEW_ALGORITHM_UNDEFINED_FRM;
+    case VIEW_ALGORITHM_MERGE:
+      return VIEW_ALGORITHM_MERGE_FRM;
+    case VIEW_ALGORITHM_TMPTABLE:
+      return VIEW_ALGORITHM_TMPTABLE_FRM;
+  }
+  DBUG_ASSERT(0); /* Should never happen */
+  return VIEW_ALGORITHM_UNDEFINED;
+}
+
+static ulonglong view_algo_from_frm(ulonglong val)
+{
+  switch(val)
+  {
+    case VIEW_ALGORITHM_UNDEFINED_FRM:
+      return VIEW_ALGORITHM_UNDEFINED;
+    case VIEW_ALGORITHM_MERGE_FRM:
+      return VIEW_ALGORITHM_MERGE;
+    case VIEW_ALGORITHM_TMPTABLE_FRM:
+      return VIEW_ALGORITHM_TMPTABLE;
+  }
+
+  /*
+    Early versions of MariaDB 5.2/5.3 had identical in-memory and frm values
+    Return input value.
+  */
+  return val;
+}
+
 
 /**
   Write parameter value to IO_CACHE.
@@ -124,8 +158,14 @@ write_parameter(IO_CACHE *file, uchar* base, File_option *parameter)
     break;
   }
   case FILE_OPTIONS_ULONGLONG:
+  case FILE_OPTIONS_VIEW_ALGO:
   {
-    num.set(*((ulonglong *)(base + parameter->offset)), &my_charset_bin);
+    ulonglong val= *(ulonglong *)(base + parameter->offset);
+
+    if (parameter->type == FILE_OPTIONS_VIEW_ALGO)
+      val= view_algo_to_frm(val);
+
+    num.set(val, &my_charset_bin);
     if (my_b_append(file, (const uchar *)num.ptr(), num.length()))
       DBUG_RETURN(TRUE);
     break;
@@ -769,6 +809,7 @@ File_parser::parse(uchar* base, MEM_ROOT *mem_root,
 	  break;
 	}
 	case FILE_OPTIONS_ULONGLONG:
+	case FILE_OPTIONS_VIEW_ALGO:
 	  if (!(eol= strchr(ptr, '\n')))
 	  {
 	    my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
@@ -777,8 +818,12 @@ File_parser::parse(uchar* base, MEM_ROOT *mem_root,
 	  }
           {
             int not_used;
-	    *((ulonglong*)(base + parameter->offset))=
-              my_strtoll10(ptr, 0, &not_used);
+            ulonglong val= (ulonglong)my_strtoll10(ptr, 0, &not_used);
+
+            if (parameter->type == FILE_OPTIONS_VIEW_ALGO)
+              val= view_algo_from_frm(val);
+
+            *((ulonglong*)(base + parameter->offset))= val;
           }
 	  ptr= eol+1;
 	  break;
diff --git a/sql/parse_file.h b/sql/parse_file.h
index 20e3051e671..2a0266e98b7 100644
--- a/sql/parse_file.h
+++ b/sql/parse_file.h
@@ -31,6 +31,7 @@ enum file_opt_type {
   FILE_OPTIONS_STRING,		/**< String (LEX_STRING) */
   FILE_OPTIONS_ESTRING,		/**< Escaped string (LEX_STRING) */
   FILE_OPTIONS_ULONGLONG,	/**< ulonglong parameter (ulonglong) */
+  FILE_OPTIONS_VIEW_ALGO,	/**< Similar to longlong, but needs conversion */
   FILE_OPTIONS_TIMESTAMP,	/**< timestamp (LEX_STRING have to be
 				   allocated with length 20 (19+1) */
   FILE_OPTIONS_STRLIST,         /**< list of escaped strings
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index e1efbc7ee4c..940fc201bae 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -1268,6 +1268,23 @@ void Relay_log_info::cleanup_context(THD *thd, bool error)
 
 void Relay_log_info::clear_tables_to_lock()
 {
+  DBUG_ENTER("Relay_log_info::clear_tables_to_lock()");
+#ifndef DBUG_OFF
+  /**
+    When replicating in RBR and MyISAM Merge tables are involved
+    open_and_lock_tables (called in do_apply_event) appends the 
+    base tables to the list of tables_to_lock. Then these are 
+    removed from the list in close_thread_tables (which is called 
+    before we reach this point).
+
+    This assertion just confirms that we get no surprises at this
+    point.
+   */
+  uint i=0;
+  for (TABLE_LIST *ptr= tables_to_lock ; ptr ; ptr= ptr->next_global, i++) ;
+  DBUG_ASSERT(i == tables_to_lock_count);
+#endif  
+
   while (tables_to_lock)
   {
     uchar* to_free= reinterpret_cast<uchar*>(tables_to_lock);
@@ -1292,10 +1309,12 @@ void Relay_log_info::clear_tables_to_lock()
     my_free(to_free);
   }
   DBUG_ASSERT(tables_to_lock == NULL && tables_to_lock_count == 0);
+  DBUG_VOID_RETURN;
 }
 
 void Relay_log_info::slave_close_thread_tables(THD *thd)
 {
+  DBUG_ENTER("Relay_log_info::slave_close_thread_tables(THD *thd)");
   thd->stmt_da->can_overwrite_status= TRUE;
   thd->is_error() ? trans_rollback_stmt(thd) : trans_commit_stmt(thd);
   thd->stmt_da->can_overwrite_status= FALSE;
@@ -1317,5 +1336,6 @@ void Relay_log_info::slave_close_thread_tables(THD *thd)
     thd->mdl_context.release_statement_locks();
 
   clear_tables_to_lock();
+  DBUG_VOID_RETURN;
 }
 #endif
diff --git a/sql/share/CMakeLists.txt b/sql/share/CMakeLists.txt
index e0521bdd328..e0d5fb6c1a7 100644
--- a/sql/share/CMakeLists.txt
+++ b/sql/share/CMakeLists.txt
@@ -48,8 +48,8 @@ FOREACH (dir ${dirs})
  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} 
   DESTINATION  ${INSTALL_MYSQLSHAREDIR} COMPONENT Server)
 ENDFOREACH()
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
-  PATTERN "languages.html" EXCLUDE
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR}
+  COMPONENT Common PATTERN "languages.html" EXCLUDE
 )
 
 INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server)
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 8510eb1f1ac..140220dfa9c 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6492,6 +6492,15 @@ ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT
 ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC
   eng "CREATE TABLE... SELECT...  on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are inserted. This order cannot be predicted and may differ on master and the slave."
 
+ER_BINLOG_UNSAFE_INSERT_TWO_KEYS
+  eng "INSERT... ON DUPLICATE KEY UPDATE  on a table with more than one UNIQUE KEY is unsafe"
+
+ER_TABLE_IN_FK_CHECK
+  eng "Table is being used in foreign key check."
+
+ER_UNUSED_1
+  eng "You should never see it"
+
 #
 #  End of 5.5 error messages.
 #
diff --git a/sql/slave.cc b/sql/slave.cc
index ee48b2008dc..94a485cbe29 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1832,7 +1832,9 @@ Waiting for the slave SQL thread to free enough relay log space");
 #endif
     if (rli->sql_force_rotate_relay)
     {
+      mysql_mutex_lock(&active_mi->data_lock);
       rotate_relay_log(rli->mi);
+      mysql_mutex_unlock(&active_mi->data_lock);
       rli->sql_force_rotate_relay= false;
     }
 
@@ -4439,10 +4441,9 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
       (event_pos= uint4korr(buf+LOG_POS_OFFSET)) > mi->master_log_pos + inc_pos)
   {
     inc_pos= event_pos - mi->master_log_pos;
-    DBUG_PRINT("info", ("Adjust master_log_pos %lu->%lu to account for "
+    DBUG_PRINT("info", ("Adjust master_log_pos %llu->%llu to account for "
                         "master-side filtering",
-                        (unsigned long)(mi->master_log_pos + inc_pos),
-                        event_pos));
+                        mi->master_log_pos + inc_pos, event_pos));
   }
 
   /*
@@ -5405,7 +5406,10 @@ int rotate_relay_log(Master_info* mi)
     output in SHOW SLAVE STATUS meanwhile. So we harvest now.
     If the log is closed, then this will just harvest the last writes, probably
     0 as they probably have been harvested.
+
+    Note that it needs to be protected by mi->data_lock.
   */
+  mysql_mutex_assert_owner(&mi->data_lock);
   rli->relay_log.harvest_bytes_written(&rli->log_space_total);
 end:
   DBUG_RETURN(error);
diff --git a/sql/spatial.cc b/sql/spatial.cc
index 4dfc20716fc..1616f93241d 100644
--- a/sql/spatial.cc
+++ b/sql/spatial.cc
@@ -716,7 +716,8 @@ int Gis_line_string::is_closed(int *closed) const
     return 0;
   }
   data+= 4;
-  if (no_data(data, POINT_DATA_SIZE * n_points))
+  if (n_points == 0 ||
+      no_data(data, POINT_DATA_SIZE * n_points))
     return 1;
 
   /* Get first point */
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 15c3999be54..41c04b9c413 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -8559,14 +8559,16 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio,
   if (find_mpvio_user(mpvio))
     return packet_error;
 
-  if (thd->client_capabilities & CLIENT_PLUGIN_AUTH)
+  if ((thd->client_capabilities & CLIENT_PLUGIN_AUTH) &&
+      (client_plugin < (char *)net->read_pos + pkt_len))
   {
-    if (client_plugin >= (char *)net->read_pos + pkt_len)
-      return packet_error;
     client_plugin= fix_plugin_ptr(client_plugin);
   }
   else
   {
+    /* Some clients lie. Sad, but true */
+    thd->client_capabilities &= ~CLIENT_PLUGIN_AUTH;
+
     if (thd->client_capabilities & CLIENT_SECURE_CONNECTION)
       client_plugin= native_password_plugin_name.str;
     else
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index f8c602e6482..8d0f2e5634f 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -80,6 +80,7 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list,
 {
   int error= 0;
   TABLE tmp_table, *table;
+  TABLE_LIST *pos_in_locked_tables= 0;
   TABLE_SHARE *share;
   bool has_mdl_lock= FALSE;
   char from[FN_REFLEN],tmp[FN_REFLEN+32];
@@ -194,9 +195,13 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list,
       Table was successfully open in mysql_admin_table(). Now we need
       to close it, but leave it protected by exclusive metadata lock.
     */
-    if (wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN))
+    pos_in_locked_tables= table->pos_in_locked_tables;
+    if (wait_while_table_is_used(thd, table,
+                                 HA_EXTRA_PREPARE_FOR_FORCED_CLOSE))
       goto end;
-    close_all_tables_for_name(thd, table_list->table->s, FALSE);
+    /* Close table but don't remove from locked list */
+    close_all_tables_for_name(thd, table_list->table->s,
+                              HA_EXTRA_NOT_USED);
     table_list->table= 0;
   }
   /*
@@ -230,18 +235,25 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list,
     goto end;
   }
 
-  if (thd->locked_tables_list.reopen_tables(thd))
-    goto end;
-
-  /*
-    Now we should be able to open the partially repaired table
-    to finish the repair in the handler later on.
-  */
-  if (open_table(thd, table_list, thd->mem_root, &ot_ctx))
+  if (thd->locked_tables_list.locked_tables())
   {
-    error= send_check_errmsg(thd, table_list, "repair",
-                             "Failed to open partially repaired table");
-    goto end;
+    if (thd->locked_tables_list.reopen_tables(thd))
+      goto end;
+    /* Restore the table in the table list with the new opened table */
+    table_list->table= pos_in_locked_tables->table;
+  }
+  else
+  {
+    /*
+      Now we should be able to open the partially repaired table
+      to finish the repair in the handler later on.
+    */
+    if (open_table(thd, table_list, thd->mem_root, &ot_ctx))
+    {
+      error= send_check_errmsg(thd, table_list, "repair",
+                               "Failed to open partially repaired table");
+      goto end;
+    }
   }
 
 end:
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index da93cfeb001..be30e085b05 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1101,7 +1101,7 @@ bool close_cached_tables(THD *thd, TABLE_LIST *tables,
     TABLE_LIST *tables_to_reopen= (tables ? tables :
                                   thd->locked_tables_list.locked_tables());
 
-    /* Close open HANLER instances to avoid self-deadlock. */
+    /* Close open HANDLER instances to avoid self-deadlock. */
     mysql_ha_flush_tables(thd, tables_to_reopen);
 
     for (TABLE_LIST *table_list= tables_to_reopen; table_list;
@@ -1115,12 +1115,13 @@ bool close_cached_tables(THD *thd, TABLE_LIST *tables,
       if (! table)
         continue;
 
-      if (wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN))
+      if (wait_while_table_is_used(thd, table,
+                                   HA_EXTRA_PREPARE_FOR_FORCED_CLOSE))
       {
         result= TRUE;
         goto err_with_reopen;
       }
-      close_all_tables_for_name(thd, table->s, FALSE);
+      close_all_tables_for_name(thd, table->s, HA_EXTRA_NOT_USED);
     }
   }
 
@@ -1386,9 +1387,11 @@ static void close_open_tables(THD *thd)
   @param[in] share   table share, but is just a handy way to
                      access the table cache key
 
-  @param[in] remove_from_locked_tables
-                     TRUE if the table is being dropped or renamed.
-                     In that case the documented behaviour is to
+  @param[in] extra
+                     HA_EXTRA_PREPRE_FOR_DROP if the table is being dropped
+                     HA_EXTRA_PREPARE_FOR_REANME if the table is being renamed
+                     HA_EXTRA_NOT_USED           no drop/rename
+                     In case of drop/reanme the documented behaviour is to
                      implicitly remove the table from LOCK TABLES
                      list.
 
@@ -1397,7 +1400,7 @@ static void close_open_tables(THD *thd)
 
 void
 close_all_tables_for_name(THD *thd, TABLE_SHARE *share,
-                          bool remove_from_locked_tables)
+                          ha_extra_function extra)
 {
   char key[MAX_DBKEY_LENGTH];
   uint key_length= share->table_cache_key.length;
@@ -1416,19 +1419,20 @@ close_all_tables_for_name(THD *thd, TABLE_SHARE *share,
     {
       thd->locked_tables_list.unlink_from_list(thd,
                                                table->pos_in_locked_tables,
-                                               remove_from_locked_tables);
+                                               extra != HA_EXTRA_NOT_USED);
+      /* Inform handler that there is a drop table or a rename going on */
+      if (extra != HA_EXTRA_NOT_USED && table->db_stat)
+      {
+        table->file->extra(extra);
+        extra= HA_EXTRA_NOT_USED;               // Call extra once!
+      }
+
       /*
         Does nothing if the table is not locked.
         This allows one to use this function after a table
         has been unlocked, e.g. in partition management.
       */
       mysql_lock_remove(thd, thd->lock, table);
-
-      /* Inform handler that table will be dropped after close */
-#ifdef MERGE_FOR_MONTY_TO_FIX
-      if (remove_from_locked_tables && table->db_stat) /* Not true for partitioned tables. */
-        table->file->extra(HA_EXTRA_PREPARE_FOR_DROP);
-#endif
       close_thread_table(thd, prev);
     }
     else
@@ -1987,8 +1991,8 @@ next:
                  ("convert merged to materialization to resolve the conflict"));
       derived->change_refs_to_fields();
       derived->set_materialized_derived();
+      goto retry;
     }
-    goto retry;
   }
   DBUG_RETURN(res);
 }
@@ -2318,6 +2322,7 @@ bool rename_temporary_table(THD* thd, TABLE *table, const char *db,
    @param function HA_EXTRA_PREPARE_FOR_DROP if table is to be deleted
                    HA_EXTRA_FORCE_REOPEN if table is not be used
                    HA_EXTRA_PREPARE_FOR_RENAME if table is to be renamed
+                   HA_EXTRA_NOT_USED             Don't call extra()
 
    @note When returning, the table will be unusable for other threads
          until metadata lock is downgraded.
@@ -2342,7 +2347,8 @@ bool wait_while_table_is_used(THD *thd, TABLE *table,
                    table->s->db.str, table->s->table_name.str,
                    FALSE);
   /* extra() call must come only after all instances above are closed */
-  (void) table->file->extra(function);
+  if (function != HA_EXTRA_NOT_USED)
+    (void) table->file->extra(function);
   DBUG_RETURN(FALSE);
 }
 
@@ -3390,7 +3396,6 @@ Locked_tables_list::init_locked_tables(THD *thd)
 
 void
 Locked_tables_list::unlock_locked_tables(THD *thd)
-
 {
   if (thd)
   {
@@ -3412,7 +3417,8 @@ Locked_tables_list::unlock_locked_tables(THD *thd)
         Clear the position in the list, the TABLE object will be
         returned to the table cache.
       */
-      table_list->table->pos_in_locked_tables= NULL;
+      if (table_list->table)                    // If not closed
+        table_list->table->pos_in_locked_tables= NULL;
     }
     thd->leave_locked_tables_mode();
 
@@ -5776,6 +5782,32 @@ bool lock_tables(THD *thd, TABLE_LIST *tables, uint count,
         has_write_table_with_auto_increment_and_select(tables))
       thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_WRITE_AUTOINC_SELECT);
 
+    /* 
+     INSERT...ON DUPLICATE KEY UPDATE on a table with more than one unique keys
+     can be unsafe.
+     */
+    uint unique_keys= 0;
+    for (TABLE_LIST *query_table= tables; query_table && unique_keys <= 1;
+         query_table= query_table->next_global)
+      if(query_table->table)
+      {
+        uint keys= query_table->table->s->keys, i= 0;
+        unique_keys= 0;
+        for (KEY* keyinfo= query_table->table->s->key_info;
+             i < keys && unique_keys <= 1; i++, keyinfo++)
+        {
+          if (keyinfo->flags & HA_NOSAME)
+            unique_keys++;
+        }
+        if (!query_table->placeholder() &&
+            query_table->lock_type >= TL_WRITE_ALLOW_WRITE &&
+            unique_keys > 1 && thd->lex->sql_command == SQLCOM_INSERT &&
+            /* Duplicate key update is not supported by INSERT DELAYED */
+            thd->command != COM_DELAYED_INSERT &&
+            thd->lex->duplicates == DUP_UPDATE)
+          thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_INSERT_TWO_KEYS);
+      }
+ 
     /* We have to emulate LOCK TABLES if we are statement needs prelocking. */
     if (thd->lex->requires_prelocking())
     {
@@ -8535,6 +8567,11 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
         }
       }
 #endif
+      /*
+         field_iterator.create_item() builds used_items which we
+         have to save because changes made once and they are persistent
+      */
+      tables->persistent_used_items= tables->used_items;
 
       if ((field= field_iterator.field()))
       {
@@ -9285,6 +9322,7 @@ void tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
   uint key_length;
   TABLE *table;
   TABLE_SHARE *share;
+  DBUG_ENTER("tdc_remove_table");
 
   if (! has_lock)
     mysql_mutex_lock(&LOCK_open);
@@ -9342,6 +9380,7 @@ void tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
 
   if (! has_lock)
     mysql_mutex_unlock(&LOCK_open);
+  DBUG_VOID_RETURN;
 }
 
 
diff --git a/sql/sql_base.h b/sql/sql_base.h
index e602aba98a9..3deb97c9730 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -289,7 +289,7 @@ bool close_cached_tables(THD *thd, TABLE_LIST *tables,
                          bool wait_for_refresh, ulong timeout);
 bool close_cached_connection_tables(THD *thd, LEX_STRING *connect_string);
 void close_all_tables_for_name(THD *thd, TABLE_SHARE *share,
-                               bool remove_from_locked_tables);
+                               ha_extra_function extra);
 OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild);
 void tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
                       const char *db, const char *table_name,
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 210d259f364..96814562757 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1348,9 +1348,10 @@ ulong Query_cache::resize(ulong query_cache_size_arg)
 
 ulong Query_cache::set_min_res_unit(ulong size)
 {
+  DBUG_ASSERT(size % 8 == 0);
   if (size < min_allocation_unit)
-    size= min_allocation_unit;
-  return (min_result_data_size= ALIGN_SIZE(size));
+    size= ALIGN_SIZE(min_allocation_unit);
+  return (min_result_data_size= size);
 }
 
 
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index 134fd055110..87291e80a85 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -41,7 +41,7 @@ typedef struct st_changed_table_list CHANGED_TABLE_LIST;
 #define QUERY_CACHE_DEF_TABLE_HASH_SIZE		1024
 
 /* minimal result data size when data allocated */
-#define QUERY_CACHE_MIN_RESULT_DATA_SIZE	1024*4
+#define QUERY_CACHE_MIN_RESULT_DATA_SIZE	(1024*4)
 
 /* 
    start estimation of first result block size only when number of queries
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 283327abe61..5fb809c4da3 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3210,13 +3210,42 @@ int select_exists_subselect::send_data(List<Item> &items)
 int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
 {
   unit= u;
+  List_iterator_fast<my_var> var_li(var_list);
+  List_iterator_fast<Item> it(list);
+  Item *item;
+  my_var *mv;
+  Item_func_set_user_var **suv;
   
   if (var_list.elements != list.elements)
   {
     my_message(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT,
                ER(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT), MYF(0));
     return 1;
-  }               
+  }
+
+  /*
+    Iterate over the destination variables and mark them as being
+    updated in this query.
+    We need to do this at JOIN::prepare time to ensure proper
+    const detection of Item_func_get_user_var that is determined
+    by the presence of Item_func_set_user_vars
+  */
+
+  suv= set_var_items= (Item_func_set_user_var **) 
+    sql_alloc(sizeof(Item_func_set_user_var *) * list.elements);
+
+  while ((mv= var_li++) && (item= it++))
+  {
+    if (!mv->local)
+    {
+      *suv= new Item_func_set_user_var(mv->s, item);
+      (*suv)->fix_fields(thd, 0);
+    }
+    else
+      *suv= NULL;
+    suv++;
+  }
+
   return 0;
 }
 
@@ -3536,6 +3565,7 @@ int select_dumpvar::send_data(List<Item> &items)
   List_iterator<Item> it(items);
   Item *item;
   my_var *mv;
+  Item_func_set_user_var **suv;
   DBUG_ENTER("select_dumpvar::send_data");
 
   if (unit->offset_limit_cnt)
@@ -3548,20 +3578,19 @@ int select_dumpvar::send_data(List<Item> &items)
     my_message(ER_TOO_MANY_ROWS, ER(ER_TOO_MANY_ROWS), MYF(0));
     DBUG_RETURN(1);
   }
-  while ((mv= var_li++) && (item= it++))
+  for (suv= set_var_items; ((mv= var_li++) && (item= it++)); suv++)
   {
     if (mv->local)
     {
+      DBUG_ASSERT(!*suv);
       if (thd->spcont->set_variable(thd, mv->offset, &item))
 	    DBUG_RETURN(1);
     }
     else
     {
-      Item_func_set_user_var *suv= new Item_func_set_user_var(mv->s, item);
-      if (suv->fix_fields(thd, 0))
-        DBUG_RETURN (1);
-      suv->save_item_result(item);
-      if (suv->update())
+      DBUG_ASSERT(*suv);
+      (*suv)->save_item_result(item);
+      if ((*suv)->update())
         DBUG_RETURN (1);
     }
   }
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 96a67fccaef..1dc38539670 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -4079,6 +4079,7 @@ public:
 
 class select_dumpvar :public select_result_interceptor {
   ha_rows row_count;
+  Item_func_set_user_var **set_var_items;
 public:
   List<my_var> var_list;
   select_dumpvar()  { var_list.empty(); row_count= 0;}
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index f7887b2e8b9..3ffdb1384c1 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -67,7 +67,8 @@ Query_tables_list::binlog_stmt_unsafe_errcode[BINLOG_STMT_UNSAFE_COUNT] =
   ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT,
   ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT,
   ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC,
-  ER_BINLOG_UNSAFE_UPDATE_IGNORE
+  ER_BINLOG_UNSAFE_UPDATE_IGNORE,
+  ER_BINLOG_UNSAFE_INSERT_TWO_KEYS
 };
 
 
@@ -3431,6 +3432,11 @@ bool st_select_lex::optimize_unflattened_subqueries()
           continue;
       }
 
+      bool empty_union_result= true;
+      /*
+        If the subquery is a UNION, optimize all the subqueries in the UNION. If
+        there is no UNION, then the loop will execute once for the subquery.
+      */
       for (SELECT_LEX *sl= un->first_select(); sl; sl= sl->next_select())
       {
         JOIN *inner_join= sl->join;
@@ -3453,9 +3459,19 @@ bool st_select_lex::optimize_unflattened_subqueries()
         res= inner_join->optimize();
         inner_join->select_options= save_options;
         un->thd->lex->current_select= save_select;
+        if (empty_union_result)
+        {
+          /*
+            If at least one subquery in a union is non-empty, the UNION result
+            is non-empty. If there is no UNION, the only subquery is non-empy.
+          */
+          empty_union_result= inner_join->empty_result();
+        }
         if (res)
           return TRUE;
       }
+      if (empty_union_result)
+        subquery_predicate->no_rows_in_result();
     }
   }
   return FALSE;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index f1ee6cf22ec..7da0cc48298 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1427,6 +1427,12 @@ public:
     */
     BINLOG_STMT_UNSAFE_UPDATE_IGNORE,
 
+    /**
+      INSERT... ON DUPLICATE KEY UPDATE on a table with more than one
+      UNIQUE KEYS  is unsafe.
+    */
+    BINLOG_STMT_UNSAFE_INSERT_TWO_KEYS,
+
     /* The last element of this enumeration type. */
     BINLOG_STMT_UNSAFE_COUNT
   };
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 9ba0569f1e0..a9c79589faa 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -6270,7 +6270,7 @@ static void alter_partition_lock_handling(ALTER_PARTITION_PARAM_TYPE *lpt)
   THD *thd= lpt->thd;
 
   if (lpt->old_table)
-    close_all_tables_for_name(thd, lpt->old_table->s, FALSE);
+    close_all_tables_for_name(thd, lpt->old_table->s, HA_EXTRA_NOT_USED);
   if (lpt->table)
   {
     /*
@@ -6307,7 +6307,7 @@ static int alter_close_tables(ALTER_PARTITION_PARAM_TYPE *lpt, bool close_old)
   }
   if (close_old && lpt->old_table)
   {
-    close_all_tables_for_name(lpt->thd, lpt->old_table->s, FALSE);
+    close_all_tables_for_name(lpt->thd, lpt->old_table->s, HA_EXTRA_NOT_USED);
     lpt->old_table= 0;
   }
   DBUG_RETURN(0);
@@ -6640,7 +6640,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
         mysql_write_frm(lpt, WFRM_WRITE_SHADOW) ||
         ERROR_INJECT_CRASH("crash_drop_partition_2") ||
         ERROR_INJECT_ERROR("fail_drop_partition_2") ||
-        wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN) ||
+        wait_while_table_is_used(thd, table, HA_EXTRA_NOT_USED) ||
         ERROR_INJECT_CRASH("crash_drop_partition_3") ||
         ERROR_INJECT_ERROR("fail_drop_partition_3") ||
         (close_table_on_failure= TRUE, FALSE) ||
@@ -6714,7 +6714,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
         mysql_write_frm(lpt, WFRM_WRITE_SHADOW) ||
         ERROR_INJECT_CRASH("crash_add_partition_2") ||
         ERROR_INJECT_ERROR("fail_add_partition_2") ||
-        wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN) ||
+        wait_while_table_is_used(thd, table, HA_EXTRA_NOT_USED) ||
         ERROR_INJECT_CRASH("crash_add_partition_3") ||
         ERROR_INJECT_ERROR("fail_add_partition_3") ||
         (close_table_on_failure= TRUE, FALSE) ||
@@ -6820,7 +6820,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
         mysql_change_partitions(lpt) ||
         ERROR_INJECT_CRASH("crash_change_partition_4") ||
         ERROR_INJECT_ERROR("fail_change_partition_4") ||
-        wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN) ||
+        wait_while_table_is_used(thd, table, HA_EXTRA_NOT_USED) ||
         ERROR_INJECT_CRASH("crash_change_partition_5") ||
         ERROR_INJECT_ERROR("fail_change_partition_5") ||
         write_log_final_change_partition(lpt) ||
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 4e80549fe9d..76c4c17f41f 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -739,15 +739,14 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
   }
   bzero(&plugin_dl, sizeof(plugin_dl));
   /* Compile dll path */
-  dlpathlen=
-    strxnmov(dlpath, sizeof(dlpath) - 1, opt_plugin_dir, "/", dl->str, NullS) -
-    dlpath;
+  strxnmov(dlpath, sizeof(dlpath) - 1, opt_plugin_dir, "/", dl->str, NullS);
   (void) unpack_filename(dlpath, dlpath);
   plugin_dl.ref_count= 1;
   /* Open new dll handle */
   if (!(plugin_dl.handle= dlopen(dlpath, RTLD_NOW)))
   {
     const char *errmsg=dlerror();
+    dlpathlen= strlen(dlpath);
     if (!strncmp(dlpath, errmsg, dlpathlen))
     { // if errmsg starts from dlpath, trim this prefix.
       errmsg+=dlpathlen;
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index cb33110d9eb..ba9ef757de6 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -24,6 +24,7 @@
 #include "sql_db.h"      // my_dbopt_cleanup
 #include "hostname.h"    // hostname_cache_refresh
 #include "sql_repl.h"    // reset_master, reset_slave
+#include "rpl_mi.h"      // Master_info::data_lock
 #include "debug_sync.h"
 
 static void disable_checkpoints(THD *thd);
@@ -156,10 +157,10 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,
   if (options & REFRESH_RELAY_LOG)
   {
 #ifdef HAVE_REPLICATION
-    mysql_mutex_lock(&LOCK_active_mi);
+    mysql_mutex_lock(&active_mi->data_lock);
     if (rotate_relay_log(active_mi))
       *write_to_binlog= -1;
-    mysql_mutex_unlock(&LOCK_active_mi);
+    mysql_mutex_unlock(&active_mi->data_lock);
 #endif
   }
 #ifdef HAVE_QUERY_CACHE
@@ -254,9 +255,9 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,
         {
           /*
             It is not safe to upgrade the metadata lock without GLOBAL IX lock.
-            This can happen with FLUSH TABLES <list> WITH READ LOCK as we in these
-            cases don't take a GLOBAL IX lock in order to be compatible with
-            global read lock.
+            This can happen with FLUSH TABLES <list> WITH READ LOCK as we in
+            these cases don't take a GLOBAL IX lock in order to be compatible
+            with global read lock.
           */
           if (thd->open_tables &&
               !thd->mdl_context.is_lock_owner(MDL_key::GLOBAL, "", "",
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8f8ecd1725d..223e5c44fcf 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -114,7 +114,8 @@ static store_key *get_store_key(THD *thd,
 				uint maybe_null);
 static bool make_outerjoin_info(JOIN *join);
 static Item*
-make_cond_after_sjm(Item *root_cond, Item *cond, table_map tables, table_map sjm_tables);
+make_cond_after_sjm(Item *root_cond, Item *cond, table_map tables, 
+                    table_map sjm_tables, bool inside_or_clause);
 static bool make_join_select(JOIN *join,SQL_SELECT *select,COND *item);
 static void revise_cache_usage(JOIN_TAB *join_tab);
 static bool make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after);
@@ -1333,8 +1334,19 @@ JOIN::optimize()
         store_key *key_copy= tab->ref.key_copy[key_copy_index];
         if (key_copy->type() == store_key::FIELD_STORE_KEY)
         {
-          store_key_field *field_copy= ((store_key_field *)key_copy);
-          field_copy->change_source_field((Item_field *) item);
+          if (item->basic_const_item())
+          {
+            /* It is constant propagated here */
+            tab->ref.key_copy[key_copy_index]=
+              new store_key_const_item(*tab->ref.key_copy[key_copy_index],
+                                       item);
+          }
+          else
+          {
+            store_key_field *field_copy= ((store_key_field *)key_copy);
+            DBUG_ASSERT(item->type() == Item::FIELD_ITEM);
+            field_copy->change_source_field((Item_field *) item);
+          }
         }
       }
       key_copy_index++;
@@ -1523,7 +1535,6 @@ JOIN::optimize()
     simple_order=1;
     select_distinct= 0;                       // No need in distinct for 1 row
     group_optimized_away= 1;
-    implicit_grouping= TRUE;
   }
 
   calc_group_buffer(this, group_list);
@@ -2321,6 +2332,8 @@ JOIN::exec()
   List<Item> *curr_all_fields= &all_fields;
   List<Item> *curr_fields_list= &fields_list;
   TABLE *curr_tmp_table= 0;
+  bool tmp_having_used_tables_updated= FALSE;
+
   /*
     Initialize examined rows here because the values from all join parts
     must be accumulated in examined_row_count. Hence every join
@@ -2569,12 +2582,22 @@ JOIN::exec()
     if (curr_tmp_table->distinct)
       curr_join->select_distinct=0;		/* Each row is unique */
     
+
+    /*
+      curr_join->join_free() will call JOIN::cleanup(full=TRUE). It will not 
+      be safe to call update_used_tables() after that.
+    */
+    if (curr_join->tmp_having)
+    {
+      curr_join->tmp_having->update_used_tables();
+      tmp_having_used_tables_updated= TRUE;
+    }
+
     curr_join->join_free();			/* Free quick selects */
+
     if (curr_join->select_distinct && ! curr_join->group_list)
     {
       thd_proc_info(thd, "Removing duplicates");
-      if (curr_join->tmp_having)
-	curr_join->tmp_having->update_used_tables();
       if (remove_duplicates(curr_join, curr_tmp_table,
 			    *curr_fields_list, curr_join->tmp_having))
 	DBUG_VOID_RETURN;
@@ -2651,7 +2674,8 @@ JOIN::exec()
 	! curr_join->sort_and_group)
     {
       // Some tables may have been const
-      curr_join->tmp_having->update_used_tables();
+      if (!tmp_having_used_tables_updated)
+        curr_join->tmp_having->update_used_tables();
       JOIN_TAB *curr_table= &curr_join->join_tab[curr_join->const_tables];
       table_map used_tables= (curr_join->const_table_map |
 			      curr_table->table->map);
@@ -5567,7 +5591,6 @@ best_access_path(JOIN      *join,
             tmp= best_time;                    // Do nothing
         }
 
-        DBUG_ASSERT(tmp > 0 || record_count == 0);
         tmp += s->startup_cost;
         loose_scan_opt.check_ref_access_part2(key, start_key, records, tmp);
       } /* not ft_key */
@@ -7772,16 +7795,19 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j,
       }
       keyuse++;
     } while (keyuse->table == table && keyuse->key == key);
+
+    if (!keyparts && allow_full_scan)
+    {
+      /* It's a LooseIndexScan strategy scanning whole index */
+      j->type= JT_ALL;
+      j->index= key;
+      DBUG_RETURN(FALSE);
+    }
+
+    DBUG_ASSERT(length > 0);
+    DBUG_ASSERT(keyparts != 0);
   } /* not ftkey */
   
-  if (!keyparts && allow_full_scan)
-  {
-    /* It's a LooseIndexScan strategy scanning whole index */
-    j->type= JT_ALL;
-    j->index= key;
-    DBUG_RETURN(FALSE);
-  }
-
   /* set up fieldref */
   j->ref.key_parts= keyparts;
   j->ref.key_length= length;
@@ -8007,7 +8033,31 @@ JOIN::make_simple_join(JOIN *parent, TABLE *temp_table)
   tmp_table_param.copy_field= tmp_table_param.copy_field_end=0;
   first_record= sort_and_group=0;
   send_records= (ha_rows) 0;
-  group= 0;
+
+  if (group_optimized_away && !tmp_table_param.precomputed_group_by)
+  {
+    /*
+      If grouping has been optimized away, a temporary table is
+      normally not needed unless we're explicitly requested to create
+      one (e.g. due to a SQL_BUFFER_RESULT hint or INSERT ... SELECT).
+
+      In this case (grouping was optimized away), temp_table was
+      created without a grouping expression and JOIN::exec() will not
+      perform the necessary grouping (by the use of end_send_group()
+      or end_write_group()) if JOIN::group is set to false.
+
+      There is one exception: if the loose index scan access method is
+      used to read into the temporary table, grouping and aggregate
+      functions are handled.
+    */
+    // the temporary table was explicitly requested
+    DBUG_ASSERT(test(select_options & OPTION_BUFFER_RESULT));
+    // the temporary table does not have a grouping expression
+    DBUG_ASSERT(!temp_table->group); 
+  }
+  else
+    group= false;
+
   row_limit= unit->select_limit_cnt;
   do_send_rows= row_limit ? 1 : 0;
 
@@ -8136,6 +8186,16 @@ static void add_not_null_conds(JOIN *join)
           Item *item= tab->ref.items[keypart];
           Item *notnull;
           Item *real= item->real_item();
+          if (real->basic_const_item())
+          {
+            /*
+              It could be constant instead of field after constant
+              propagation.
+            */
+            DBUG_ASSERT(real->is_expensive() || // prevent early expensive eval
+                        !real->is_null()); // NULLs are not propagated
+            continue;
+          }
           DBUG_ASSERT(real->type() == Item::FIELD_ITEM);
           Item_field *not_null_item= (Item_field*)real;
           JOIN_TAB *referred_tab= not_null_item->field->table->reginfo.join_tab;
@@ -8517,7 +8577,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
         if (tab->bush_children)
         {
           // Reached the materialization tab
-          tmp= make_cond_after_sjm(cond, cond, save_used_tables, used_tables);
+          tmp= make_cond_after_sjm(cond, cond, save_used_tables, used_tables, 
+                                   /*inside_or_clause=*/FALSE);
           used_tables= save_used_tables | used_tables;
           save_used_tables= 0;
         }
@@ -10080,12 +10141,14 @@ make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after)
       {
         join->need_tmp= 1;
         join->simple_order= join->simple_group= 0;
-        if (sort_by_tab->type == JT_NEXT)
+        if (sort_by_tab->type == JT_NEXT && 
+            !sort_by_tab->table->covering_keys.is_set(sort_by_tab->index))
         {
           sort_by_tab->type= JT_ALL;
           sort_by_tab->read_first_record= join_init_read_record;
         }
-        else if (sort_by_tab->type == JT_HASH_NEXT)
+        else if (sort_by_tab->type == JT_HASH_NEXT &&
+                 !sort_by_tab->table->covering_keys.is_set(sort_by_tab->index))
         {
           sort_by_tab->type= JT_HASH;
           sort_by_tab->read_first_record= join_init_read_record;
@@ -12178,9 +12241,10 @@ static COND* substitute_for_best_equal_field(JOIN_TAB *context_tab,
 
   @param cond       condition whose multiple equalities are to be checked
   @param table      constant table that has been read
+  @param const_key  mark key parts as constant
 */
 
-static void update_const_equal_items(COND *cond, JOIN_TAB *tab)
+static void update_const_equal_items(COND *cond, JOIN_TAB *tab, bool const_key)
 {
   if (!(cond->used_tables() & tab->table->map))
     return;
@@ -12191,7 +12255,10 @@ static void update_const_equal_items(COND *cond, JOIN_TAB *tab)
     List_iterator_fast<Item> li(*cond_list);
     Item *item;
     while ((item= li++))
-      update_const_equal_items(item, tab);
+      update_const_equal_items(item, tab,
+                               (((Item_cond*) cond)->top_level() &&
+                                ((Item_cond*) cond)->functype() ==
+                                Item_func::COND_AND_FUNC));
   }
   else if (cond->type() == Item::FUNC_ITEM && 
            ((Item_cond*) cond)->functype() == Item_func::MULT_EQUAL_FUNC)
@@ -12221,7 +12288,8 @@ static void update_const_equal_items(COND *cond, JOIN_TAB *tab)
           TABLE *tab= field->table;
           KEYUSE *use;
           for (use= stat->keyuse; use && use->table == tab; use++)
-            if (!use->is_for_hash_join() && possible_keys.is_set(use->key) && 
+            if (const_key &&
+                !use->is_for_hash_join() && possible_keys.is_set(use->key) && 
                 tab->key_info[use->key].key_part[use->keypart].field ==
                 field)
               tab->const_key_parts[use->key]|= use->keypart_map;
@@ -16428,7 +16496,7 @@ join_read_const_table(JOIN_TAB *tab, POSITION *pos)
     List_iterator<TABLE_LIST> ti(join->select_lex->leaf_tables);
     /* Check appearance of new constant items in Item_equal objects */
     if (join->conds)
-      update_const_equal_items(join->conds, tab);
+      update_const_equal_items(join->conds, tab, TRUE);
     while ((tbl= ti++))
     {
       TABLE_LIST *embedded;
@@ -16437,7 +16505,7 @@ join_read_const_table(JOIN_TAB *tab, POSITION *pos)
       {
         embedded= embedding;
         if (embedded->on_expr)
-           update_const_equal_items(embedded->on_expr, tab);
+           update_const_equal_items(embedded->on_expr, tab, TRUE);
         embedding= embedded->embedding;
       }
       while (embedding &&
@@ -17723,13 +17791,14 @@ make_cond_for_table_from_pred(THD *thd, Item *root_cond, Item *cond,
 */
 static COND *
 make_cond_after_sjm(Item *root_cond, Item *cond, table_map tables, 
-                    table_map sjm_tables)
+                    table_map sjm_tables, bool inside_or_clause)
 {
   /*
     We assume that conditions that refer to only join prefix tables or 
     sjm_tables have already been checked.
   */
-  if ((!(cond->used_tables() & ~tables) || 
+  if (!inside_or_clause && 
+      (!(cond->used_tables() & ~tables) || 
        !(cond->used_tables() & ~sjm_tables)))
     return (COND*) 0;				// Already checked
 
@@ -17746,7 +17815,8 @@ make_cond_after_sjm(Item *root_cond, Item *cond, table_map tables,
       Item *item;
       while ((item=li++))
       {
-	Item *fix=make_cond_after_sjm(root_cond, item, tables, sjm_tables);
+	Item *fix=make_cond_after_sjm(root_cond, item, tables, sjm_tables, 
+                                      inside_or_clause);
 	if (fix)
 	  new_cond->argument_list()->push_back(fix);
       }
@@ -17776,7 +17846,8 @@ make_cond_after_sjm(Item *root_cond, Item *cond, table_map tables,
       Item *item;
       while ((item=li++))
       {
-	Item *fix= make_cond_after_sjm(root_cond, item, tables, 0L);
+	Item *fix= make_cond_after_sjm(root_cond, item, tables, sjm_tables,
+                                       /*inside_or_clause= */TRUE);
 	if (!fix)
 	  return (COND*) 0;			// Always true
 	new_cond->argument_list()->push_back(fix);
@@ -18265,7 +18336,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
   int ref_key;
   uint UNINIT_VAR(ref_key_parts);
   int order_direction= 0;
-  uint used_key_parts;
+  uint used_key_parts= 0;
   TABLE *table=tab->table;
   SQL_SELECT *select=tab->select;
   key_map usable_keys;
@@ -18276,6 +18347,9 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
   bool changed_key= false;
   DBUG_ENTER("test_if_skip_sort_order");
 
+  /* Check that we are always called with first non-const table */
+  DBUG_ASSERT(tab == tab->join->join_tab + tab->join->const_tables);
+
   /*
     Keys disabled by ALTER TABLE ... DISABLE KEYS should have already
     been taken into account.
@@ -18361,9 +18435,9 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
           KEYUSE *keyuse= tab->keyuse;
           while (keyuse->key != new_ref_key && keyuse->table == tab->table)
             keyuse++;
-
           if (create_ref_for_key(tab->join, tab, keyuse, FALSE,
-                                 tab->join->const_table_map))
+                                 (tab->join->const_table_map |
+                                  OUTER_REF_TABLE_BIT)))
             goto use_filesort;
 
           pick_table_access_method(tab);
@@ -18583,6 +18657,14 @@ check_reverse_order:
           tab->limit= 0;
           goto use_filesort;           // Reverse sort failed -> filesort
         }
+        /*
+          Cancel Pushed Index Condition, as it doesn't work for reverse scans.
+        */
+        if (tab->select && tab->select->pre_idx_push_select_cond)
+	{
+          tab->set_cond(tab->select->pre_idx_push_select_cond);
+           tab->table->file->cancel_pushed_idx_cond();
+        }
         if (select->quick == save_quick)
           save_quick= 0;                // make_reverse() consumed it
         select->set_quick(tmp);
@@ -18598,6 +18680,14 @@ check_reverse_order:
         */
         tab->read_first_record= join_read_last_key;
         tab->read_record.read_record= join_read_prev_same;
+        /*
+          Cancel Pushed Index Condition, as it doesn't work for reverse scans.
+        */
+        if (tab->select && tab->select->pre_idx_push_select_cond)
+	{
+          tab->set_cond(tab->select->pre_idx_push_select_cond);
+           tab->table->file->cancel_pushed_idx_cond();
+        }
       }
     }
     else if (select && select->quick)
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 53f2356853e..c4553148cc6 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -36,7 +36,7 @@
 
 
 #if defined(WITH_ARIA_STORAGE_ENGINE)
-#include "../storage/maria/ha_maria.h"
+#include <maria.h>
 #endif
 #if defined(USE_ARIA_FOR_TMP_TABLES)
 #define TMP_ENGINE_HTON maria_hton
@@ -1319,6 +1319,7 @@ public:
     return (do_send_rows && implicit_grouping && !group_optimized_away &&
             having_value != Item::COND_FALSE);
   }
+  bool empty_result() { return (zero_result_cause && !implicit_grouping); }
   bool change_result(select_result *result);
   bool is_top_level_join() const
   {
@@ -1464,6 +1465,11 @@ public:
       to_field=field_arg->new_key_field(thd->mem_root, field_arg->table,
                                         ptr, null, 1);
   }
+  store_key(store_key &arg)
+    :Sql_alloc(), null_key(arg.null_key), to_field(arg.to_field),
+             null_ptr(arg.null_ptr), err(arg.err)
+
+  {}
   virtual ~store_key() {}			/** Not actually needed */
   virtual enum Type type() const=0;
   virtual const char *name() const=0;
@@ -1568,6 +1574,10 @@ public:
 	       null_ptr_arg ? null_ptr_arg : item_arg->maybe_null ?
 	       &err : (uchar*) 0, length), item(item_arg), use_value(val)
   {}
+  store_key_item(store_key &arg, Item *new_item, bool val)
+    :store_key(arg), item(new_item), use_value(val)
+  {}
+
 
   enum Type type() const { return ITEM_STORE_KEY; }
   const char *name() const { return "func"; }
@@ -1613,11 +1623,14 @@ public:
   store_key_const_item(THD *thd, Field *to_field_arg, uchar *ptr,
 		       uchar *null_ptr_arg, uint length,
 		       Item *item_arg)
-    :store_key_item(thd, to_field_arg,ptr,
+    :store_key_item(thd, to_field_arg, ptr,
 		    null_ptr_arg ? null_ptr_arg : item_arg->maybe_null ?
 		    &err : (uchar*) 0, length, item_arg, FALSE), inited(0)
   {
   }
+  store_key_const_item(store_key &arg, Item *new_item)
+    :store_key_item(arg, new_item, FALSE), inited(0)
+  {}
 
   enum Type type() const { return CONST_ITEM_STORE_KEY; }
   const char *name() const { return "const"; }
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 5687a2220fe..ef05a472ab7 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -69,7 +69,7 @@ static int copy_data_between_tables(THD *thd, TABLE *,TABLE *,
                                     enum enum_enable_or_disable, bool);
 
 static bool prepare_blob_field(THD *thd, Create_field *sql_field);
-static bool check_engine(THD *, const char *, HA_CREATE_INFO *);
+static bool check_engine(THD *, const char *, const char *, HA_CREATE_INFO *);
 static int mysql_prepare_create_table(THD *, HA_CREATE_INFO *, Alter_info *,
                                       bool, uint *, handler *, KEY **, uint *,
                                       int);
@@ -2126,7 +2126,8 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
           error= -1;
           goto err;
         }
-        close_all_tables_for_name(thd, table->table->s, TRUE);
+        close_all_tables_for_name(thd, table->table->s,
+                                  HA_EXTRA_PREPARE_FOR_DROP);
         table->table= 0;
       }
 
@@ -2134,11 +2135,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
       DBUG_ASSERT(thd->mdl_context.is_lock_owner(MDL_key::TABLE, table->db,
                                                  table->table_name,
                                                  MDL_EXCLUSIVE));
-      if (thd->killed)
-      {
-        error= -1;
-        goto err;
-      }
+
       alias= (lower_case_table_names == 2) ? table->alias : table->table_name;
       /* remove .frm file and engine files */
       path_length= build_table_filename(path, sizeof(path) - 1, db, alias,
@@ -4052,7 +4049,7 @@ bool mysql_create_table_no_lock(THD *thd,
                MYF(0));
     DBUG_RETURN(TRUE);
   }
-  if (check_engine(thd, table_name, create_info))
+  if (check_engine(thd, db, table_name, create_info))
     DBUG_RETURN(TRUE);
 
   set_table_default_charset(thd, create_info, (char*) db);
@@ -6103,7 +6100,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
       create_info->db_type= old_db_type;
   }
 
-  if (check_engine(thd, new_name, create_info))
+  if (check_engine(thd, new_db, new_name, create_info))
     goto err;
   new_db_type= create_info->db_type;
 
@@ -6194,7 +6191,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
       */
       if (wait_while_table_is_used(thd, table, extra_func))
         goto err;
-      close_all_tables_for_name(thd, table->s, TRUE);
+      close_all_tables_for_name(thd, table->s, HA_EXTRA_PREPARE_FOR_RENAME);
       /*
         Then, we want check once again that target table does not exist.
         Actually the order of these two steps does not matter since
@@ -6904,7 +6901,9 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
   }
 
   close_all_tables_for_name(thd, table->s,
-                            new_name != table_name || new_db != db);
+                            new_name != table_name || new_db != db ?
+                            HA_EXTRA_PREPARE_FOR_RENAME :
+                            HA_EXTRA_NOT_USED);
 
   error=0;
   table_list->table= table= 0;                  /* Safety */
@@ -7581,16 +7580,32 @@ err:
   DBUG_RETURN(TRUE);
 }
 
-static bool check_engine(THD *thd, const char *table_name,
-                         HA_CREATE_INFO *create_info)
+/**
+  @brief Check if the table can be created in the specified storage engine.
+
+  Checks if the storage engine is enabled and supports the given table
+  type (e.g. normal, temporary, system). May do engine substitution
+  if the requested engine is disabled.
+
+  @param thd          Thread descriptor.
+  @param db_name      Database name.
+  @param table_name   Name of table to be created.
+  @param create_info  Create info from parser, including engine.
+
+  @retval true  Engine not available/supported, error has been reported.
+  @retval false Engine available/supported.
+*/
+static bool check_engine(THD *thd, const char *db_name,
+                         const char *table_name, HA_CREATE_INFO *create_info)
 {
+  DBUG_ENTER("check_engine");
   handlerton **new_engine= &create_info->db_type;
   handlerton *req_engine= *new_engine;
   bool no_substitution=
         test(thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION);
   if (!(*new_engine= ha_checktype(thd, ha_legacy_type(req_engine),
                                   no_substitution, 1)))
-    return TRUE;
+    DBUG_RETURN(true);
 
   if (req_engine && req_engine != *new_engine)
   {
@@ -7608,9 +7623,10 @@ static bool check_engine(THD *thd, const char *table_name,
       my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0),
                hton_name(*new_engine)->str, "TEMPORARY");
       *new_engine= 0;
-      return TRUE;
+      DBUG_RETURN(true);
     }
     *new_engine= myisam_hton;
   }
-  return FALSE;
+
+  DBUG_RETURN(false);
 }
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 149c2431324..00baa0b596f 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -561,7 +561,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
   if (result)
     goto end;
 
-  close_all_tables_for_name(thd, table->s, FALSE);
+  close_all_tables_for_name(thd, table->s, HA_EXTRA_NOT_USED);
   /*
     Reopen the table if we were under LOCK TABLES.
     Ignore the return value for now. It's better to
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc
index 6745d461df5..d8c14f0dec8 100644
--- a/sql/sql_truncate.cc
+++ b/sql/sql_truncate.cc
@@ -361,12 +361,12 @@ bool Truncate_statement::lock_table(THD *thd, TABLE_LIST *table_ref,
   {
     DEBUG_SYNC(thd, "upgrade_lock_for_truncate");
     /* To remove the table from the cache we need an exclusive lock. */
-    if (wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN))
+    if (wait_while_table_is_used(thd, table, HA_EXTRA_PREPARE_FOR_DROP))
       DBUG_RETURN(TRUE);
     m_ticket_downgrade= table->mdl_ticket;
     /* Close if table is going to be recreated. */
     if (*hton_can_recreate)
-      close_all_tables_for_name(thd, table->s, FALSE);
+      close_all_tables_for_name(thd, table->s, HA_EXTRA_NOT_USED);
   }
   else
   {
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index cb536b79413..53abf1bbe15 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1410,11 +1410,7 @@ bool mysql_multi_update(THD *thd,
   DBUG_PRINT("info",("res: %d  report_error: %d", res, (int) thd->is_error()));
   res|= thd->is_error();
   if (unlikely(res))
-  {
-    /* If we had a another error reported earlier then this will be ignored */
-    (*result)->send_error(ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR));
     (*result)->abort_result_set();
-  }
   thd->abort_on_warning= 0;
   DBUG_RETURN(res);
 }
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index b6a7cf010ed..bbc5c324573 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -752,7 +752,7 @@ static File_option view_parameters[]=
   FILE_OPTIONS_ULONGLONG},
  {{ C_STRING_WITH_LEN("algorithm")},
   my_offsetof(TABLE_LIST, algorithm),
-  FILE_OPTIONS_ULONGLONG},
+  FILE_OPTIONS_VIEW_ALGO},
  {{ C_STRING_WITH_LEN("definer_user")},
   my_offsetof(TABLE_LIST, definer.user),
   FILE_OPTIONS_STRING},
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 34e015e1f9b..e968dd12ca0 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -13252,6 +13252,7 @@ keyword_sp:
         | X509_SYM                 {}
         | XML_SYM                  {}
         | YEAR_SYM                 {}
+        | VIA_SYM               {}
         ;
 
 /* Option functions */
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index b8c21f9621e..49fc526a16f 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -1596,14 +1596,15 @@ static bool fix_read_only(sys_var *self, THD *thd, enum_var_type type)
   }
 
   /*
-    Perform a 'FLUSH TABLES WITH READ LOCK'.
-    This is a 3 step process:
-    - [1] lock_global_read_lock()
-    - [2] close_cached_tables()
-    - [3] make_global_read_lock_block_commit()
-    [1] prevents new connections from obtaining tables locked for write.
-    [2] waits until all existing connections close their tables.
-    [3] prevents transactions from being committed.
+    READ_ONLY=1 prevents write locks from being taken on tables and
+    blocks transactions from committing. We therefore should make sure
+    that no such events occur while setting the read_only variable.
+    This is a 2 step process:
+    [1] lock_global_read_lock()
+      Prevents connections from obtaining new write locks on
+      tables. Note that we can still have active rw transactions.
+    [2] make_global_read_lock_block_commit()
+      Prevents transactions from committing.
   */
 
   read_only= opt_readonly;
@@ -1612,19 +1613,6 @@ static bool fix_read_only(sys_var *self, THD *thd, enum_var_type type)
   if (thd->global_read_lock.lock_global_read_lock(thd))
     goto end_with_mutex_unlock;
 
-  /*
-    This call will be blocked by any connection holding a READ or WRITE lock.
-    Ideally, we want to wait only for pending WRITE locks, but since:
-    con 1> LOCK TABLE T FOR READ;
-    con 2> LOCK TABLE T FOR WRITE; (blocked by con 1)
-    con 3> SET GLOBAL READ ONLY=1; (blocked by con 2)
-    can cause to wait on a read lock, it's required for the client application
-    to unlock everything, and acceptable for the server to wait on all locks.
-  */
-  if ((result= close_cached_tables(thd, NULL, TRUE,
-                                   thd->variables.lock_wait_timeout)))
-    goto end_with_read_lock;
-
   if ((result= thd->global_read_lock.make_global_read_lock_block_commit(thd)))
     goto end_with_read_lock;
 
@@ -1892,7 +1880,7 @@ static Sys_var_ulong Sys_query_cache_min_res_unit(
        "The minimum size for blocks allocated by the query cache",
        GLOBAL_VAR(query_cache_min_res_unit), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, UINT_MAX), DEFAULT(QUERY_CACHE_MIN_RESULT_DATA_SIZE),
-       BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
+       BLOCK_SIZE(8), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_qcache_min_res_unit));
 
 static const char *query_cache_type_names[]= { "OFF", "ON", "DEMAND", 0 };
diff --git a/sql/table.cc b/sql/table.cc
index dc8ab3c6b42..40304dc6fdc 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -6696,7 +6696,8 @@ bool TABLE_LIST::change_refs_to_fields()
       We need to restore the pointers after the execution of the
       prepared statement.
     */
-    thd->change_item_tree((Item **)&ref->ref, (Item*)materialized_items + idx);
+    thd->change_item_tree((Item **)&ref->ref,
+                          (Item*)(materialized_items + idx));
   }
 
   return FALSE;
diff --git a/sql/table.h b/sql/table.h
index 7b50caae536..f3f9d5ac036 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1363,12 +1363,6 @@ typedef struct st_schema_table
 /*
   Types of derived tables. The ending part is a bitmap of phases that are
   applicable to a derived table of the type.
- * /
-#define VIEW_ALGORITHM_UNDEFINED        0
-#define VIEW_ALGORITHM_MERGE            1 + DT_COMMON + DT_MERGE
-#define DERIVED_ALGORITHM_MERGE         2 + DT_COMMON + DT_MERGE
-#define VIEW_ALGORITHM_TMPTABLE         3 + DT_COMMON + DT_MATERIALIZE
-#define DERIVED_ALGORITHM_MATERIALIZE   4 + DT_COMMON + DT_MATERIALIZE
 */
 #define DTYPE_ALGORITHM_UNDEFINED    0
 #define DTYPE_VIEW                   1
@@ -1401,7 +1395,16 @@ typedef struct st_schema_table
 
 #define VIEW_ALGORITHM_UNDEFINED 0
 #define VIEW_ALGORITHM_MERGE    (DTYPE_VIEW | DTYPE_MERGE)
-#define VIEW_ALGORITHM_TMPTABLE (DTYPE_VIEW + DTYPE_MATERIALIZE )
+#define VIEW_ALGORITHM_TMPTABLE (DTYPE_VIEW | DTYPE_MATERIALIZE)
+
+/*
+  View algorithm values as stored in the FRM. Values differ from in-memory
+  representation for backward compatibility.
+*/
+
+#define VIEW_ALGORITHM_UNDEFINED_FRM  0
+#define VIEW_ALGORITHM_MERGE_FRM      1
+#define VIEW_ALGORITHM_TMPTABLE_FRM   2
 
 #define JOIN_TYPE_LEFT	1
 #define JOIN_TYPE_RIGHT	2
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc
index 03ccb3fa861..7e5bbd11c69 100644
--- a/sql/threadpool_common.cc
+++ b/sql/threadpool_common.cc
@@ -167,7 +167,6 @@ void threadpool_remove_connection(THD *thd)
   worker_context.save();
 
   thread_attach(thd);
-  thd->killed= KILL_CONNECTION;
   thd->net.reading_or_writing= 0;
 
   end_connection(thd);
diff --git a/sql/threadpool_win.cc b/sql/threadpool_win.cc
index c8cc38e612a..6359f81cd2b 100644
--- a/sql/threadpool_win.cc
+++ b/sql/threadpool_win.cc
@@ -573,6 +573,10 @@ static VOID CALLBACK io_completion_callback(PTP_CALLBACK_INSTANCE instance,
   }
 
   connection_t *connection = (connection_t*)context;
+
+  if (io_result != ERROR_SUCCESS)
+    goto error;
+
   THD *thd= connection->thd;
   ulonglong old_timeout = connection->timeout;
   connection->timeout = ULONGLONG_MAX;
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
index 036dd374cb0..6c8eba08afb 100644
--- a/storage/blackhole/ha_blackhole.cc
+++ b/storage/blackhole/ha_blackhole.cc
@@ -289,7 +289,6 @@ int ha_blackhole::index_first(uchar * buf)
   DBUG_ENTER("ha_blackhole::index_first");
   rc= HA_ERR_END_OF_FILE;
   DBUG_RETURN(rc);
-  DBUG_RETURN(HA_ERR_END_OF_FILE);
 }
 
 
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 17ac1e962aa..2c65fd657a9 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -380,7 +380,6 @@ const char **ha_example::bas_ext() const
   return ha_example_exts;
 }
 
-
 /**
   @brief
   Used for opening tables. The name will be the name of the file.
diff --git a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
index ce4988c1bfd..5be94a10374 100644
--- a/storage/innobase/dict/dict0dict.c
+++ b/storage/innobase/dict/dict0dict.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -11,8 +11,8 @@ 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
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
@@ -55,6 +55,8 @@ UNIV_INTERN dict_index_t*	dict_ind_compact;
 #include "m_ctype.h" /* my_isspace() */
 #include "ha_prototypes.h" /* innobase_strcasecmp(), innobase_casedn_str()*/
 #include "row0upd.h"
+#include "m_string.h"
+#include "my_sys.h"
 
 #include <ctype.h>
 
@@ -2329,6 +2331,8 @@ dict_foreign_free(
 /*==============*/
 	dict_foreign_t*	foreign)	/*!< in, own: foreign key struct */
 {
+	ut_a(foreign->foreign_table->n_foreign_key_checks_running == 0);
+
 	mem_heap_free(foreign->heap);
 }
 
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 52df97e5eee..dbcf55e7495 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2012, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, 2009 Google Inc.
 Copyright (c) 2009, Percona Inc.
 
@@ -49,7 +49,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <m_ctype.h>
 #include <mysys_err.h>
 #include <mysql/plugin.h>
-#include <mysql/innodb_priv.h>
+#include <innodb_priv.h>
 #include <mysql/psi/psi.h>
 #include <my_sys.h>
 
@@ -1047,6 +1047,9 @@ convert_error_code_to_mysql(
 	case DB_OUT_OF_FILE_SPACE:
 		return(HA_ERR_RECORD_FILE_FULL);
 
+	case DB_TABLE_IN_FK_CHECK:
+		return(HA_ERR_TABLE_IN_FK_CHECK);
+
 	case DB_TABLE_IS_BEING_USED:
 		return(HA_ERR_WRONG_COMMAND);
 
@@ -6380,6 +6383,7 @@ ha_innobase::index_read(
 	DBUG_ENTER("index_read");
 
 	ut_a(prebuilt->trx == thd_to_trx(user_thd));
+	ut_ad(key_len != 0 || find_flag != HA_READ_KEY_EXACT);
 
 	ha_statistic_increment(&SSV::ha_read_key_count);
 
@@ -8354,6 +8358,8 @@ innobase_rename_table(
 	normalize_table_name(norm_to, to);
 	normalize_table_name(norm_from, from);
 
+	DEBUG_SYNC_C("innodb_rename_table_ready");
+
 	/* Serialize data dictionary operations with dictionary mutex:
 	no deadlocks can occur then in these operations */
 
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index 9b34275ec9f..7ed076bdbd2 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -24,7 +24,7 @@ Smart ALTER TABLE
 #include <unireg.h>
 #include <mysqld_error.h>
 #include <sql_lex.h>                            // SQLCOM_CREATE_INDEX
-#include <mysql/innodb_priv.h>
+#include <innodb_priv.h>
 
 extern "C" {
 #include "log0log.h"
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index af168c3f848..abbb8b10ce7 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -33,7 +33,7 @@ Created July 18, 2007 Vasil Dimov
 #include <my_sys.h>
 #include "i_s.h"
 #include <sql_plugin.h>
-#include <mysql/innodb_priv.h>
+#include <innodb_priv.h>
 
 extern "C" {
 #include "btr0types.h"
diff --git a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
index 6fd48826165..2916f39f3fe 100644
--- a/storage/innobase/include/buf0types.h
+++ b/storage/innobase/include/buf0types.h
@@ -68,7 +68,7 @@ enum buf_io_fix {
 enum buf_remove_t {
 	BUF_REMOVE_ALL_NO_WRITE,	/*!< Remove all pages from the buffer
 					pool, don't write or sync to disk */
-	BUF_REMOVE_FLUSH_NO_WRITE,	/*!< Remove only, from the flush list,
+	BUF_REMOVE_FLUSH_NO_WRITE	/*!< Remove only, from the flush list,
 					don't write or sync to disk */
 };
 
diff --git a/storage/innobase/include/db0err.h b/storage/innobase/include/db0err.h
index e0952f0709d..95ccef16be0 100644
--- a/storage/innobase/include/db0err.h
+++ b/storage/innobase/include/db0err.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -11,8 +11,8 @@ 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
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
@@ -112,6 +112,8 @@ enum db_err {
 					limit */
 	DB_INDEX_CORRUPT,		/* we have corrupted index */
 	DB_UNDO_RECORD_TOO_BIG,		/* the undo log record is too big */
+	DB_TABLE_IN_FK_CHECK,		/* table is being used in foreign
+					key check */
 
 	/* The following are partial failure codes */
 	DB_FAIL = 1000,
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index 50837d262c3..ce7181e7bd5 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -303,11 +303,17 @@ management to ensure correct alignment for doubles etc. */
 /* Maximum number of parallel threads in a parallelized operation */
 #define UNIV_MAX_PARALLELISM	32
 
-/* The maximum length of a table name. This is the MySQL limit and is
-defined in mysql_com.h like NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN, the
-number does not include a terminating '\0'. InnoDB probably can handle
-longer names internally */
-#define MAX_TABLE_NAME_LEN	192
+/** This is the "mbmaxlen" for my_charset_filename (defined in
+strings/ctype-utf8.c), which is used to encode File and Database names. */
+#define FILENAME_CHARSET_MAXNAMLEN	5
+
+/** The maximum length of an encode table name in bytes.  The max
+table and database names are NAME_CHAR_LEN (64) characters. After the
+encoding, the max length would be NAME_CHAR_LEN (64) *
+FILENAME_CHARSET_MAXNAMLEN (5) = 320 bytes. The number does not include a
+terminating '\0'. InnoDB can handle longer names internally */
+#define MAX_TABLE_NAME_LEN	320
+
 
 /* The maximum length of a database name. Like MAX_TABLE_NAME_LEN this is
 the MySQL's NAME_LEN, see check_and_convert_db_name(). */
diff --git a/storage/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c
index 172b997ac08..a829e6990b2 100644
--- a/storage/innobase/row/row0ins.c
+++ b/storage/innobase/row/row0ins.c
@@ -49,6 +49,8 @@ Created 4/20/1996 Heikki Tuuri
 #include "data0data.h"
 #include "usr0sess.h"
 #include "buf0lru.h"
+#include "m_string.h"
+#include "my_sys.h"
 
 #define	ROW_INS_PREV	1
 #define	ROW_INS_NEXT	2
@@ -1102,6 +1104,9 @@ row_ins_foreign_check_on_constraint(
 	release the latch. */
 
 	row_mysql_unfreeze_data_dictionary(thr_get_trx(thr));
+
+	DEBUG_SYNC_C("innodb_dml_cascade_dict_unfreeze");
+
 	row_mysql_freeze_data_dictionary(thr_get_trx(thr));
 
 	mtr_start(mtr);
diff --git a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
index 8ea09b5c6ee..20e8c13ea70 100644
--- a/storage/innobase/row/row0mysql.c
+++ b/storage/innobase/row/row0mysql.c
@@ -51,6 +51,9 @@ Created 9/17/2000 Heikki Tuuri
 #include "btr0sea.h"
 #include "fil0fil.h"
 #include "ibuf0ibuf.h"
+#include "m_string.h"
+#include "my_sys.h"
+
 
 /** Provide optional 4.x backwards compatibility for 5.0 and above */
 UNIV_INTERN ibool	row_rollback_on_timeout	= FALSE;
@@ -1443,6 +1446,8 @@ row_update_for_mysql(
 		return(DB_ERROR);
 	}
 
+	DEBUG_SYNC_C("innodb_row_update_for_mysql_begin");
+
 	trx->op_info = "updating or deleting";
 
 	row_mysql_delay_if_needed();
@@ -3828,6 +3833,7 @@ row_rename_table_for_mysql(
 	ulint		n_constraints_to_drop	= 0;
 	ibool		old_is_tmp, new_is_tmp;
 	pars_info_t*	info			= NULL;
+	int		retry;
 
 	ut_a(old_name != NULL);
 	ut_a(new_name != NULL);
@@ -3910,6 +3916,25 @@ row_rename_table_for_mysql(
 		}
 	}
 
+	/* Is a foreign key check running on this table? */
+	for (retry = 0; retry < 100
+	     && table->n_foreign_key_checks_running > 0; ++retry) {
+		row_mysql_unlock_data_dictionary(trx);
+		os_thread_yield();
+		row_mysql_lock_data_dictionary(trx);
+	}
+
+	if (table->n_foreign_key_checks_running > 0) {
+		ut_print_timestamp(stderr);
+		fputs(" InnoDB: Error: in ALTER TABLE ", stderr);
+		ut_print_name(stderr, trx, TRUE, old_name);
+		fprintf(stderr, "\n"
+			"InnoDB: a FOREIGN KEY check is running.\n"
+			"InnoDB: Cannot rename table.\n");
+		err = DB_TABLE_IN_FK_CHECK;
+		goto funct_exit;
+	}
+
 	/* We use the private SQL parser of Innobase to generate the query
 	graphs needed in updating the dictionary data from system tables. */
 
diff --git a/storage/innobase/ut/ut0ut.c b/storage/innobase/ut/ut0ut.c
index f6dfb3ba0b3..117a777cb98 100644
--- a/storage/innobase/ut/ut0ut.c
+++ b/storage/innobase/ut/ut0ut.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, Oracle Corpn. All Rights Reserved.
+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
@@ -11,8 +11,8 @@ 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
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
@@ -718,6 +718,8 @@ ut_strerr(
 		return("Undo record too big");
 	case DB_END_OF_INDEX:
 		return("End of index");
+	case DB_TABLE_IN_FK_CHECK:
+		return("Table is being used in foreign key check");
 	/* do not add default: in order to produce a warning if new code
 	is added to the enum but not added here */
 	}
diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt
index bd6c200be90..2817e11681c 100644
--- a/storage/maria/CMakeLists.txt
+++ b/storage/maria/CMakeLists.txt
@@ -52,20 +52,20 @@ MYSQL_ADD_PLUGIN(aria ${ARIA_SOURCES}
 
 TARGET_LINK_LIBRARIES(aria myisam)
 
-MYSQL_ADD_EXECUTABLE(aria_ftdump maria_ftdump.c)
+MYSQL_ADD_EXECUTABLE(aria_ftdump maria_ftdump.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(aria_ftdump aria)
 
-MYSQL_ADD_EXECUTABLE(aria_chk maria_chk.c)
+MYSQL_ADD_EXECUTABLE(aria_chk maria_chk.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(aria_chk aria)
 
-MYSQL_ADD_EXECUTABLE(aria_read_log maria_read_log.c)
+MYSQL_ADD_EXECUTABLE(aria_read_log maria_read_log.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(aria_read_log aria)
 
-MYSQL_ADD_EXECUTABLE(aria_dump_log  maria_dump_log.c unittest/ma_loghandler_examples.c)
+MYSQL_ADD_EXECUTABLE(aria_dump_log  maria_dump_log.c unittest/ma_loghandler_examples.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(aria_dump_log aria)
 SET_TARGET_PROPERTIES(aria_dump_log PROPERTIES COMPILE_FLAGS "-DMARIA_DUMP_LOG")
 
-MYSQL_ADD_EXECUTABLE(aria_pack maria_pack.c)
+MYSQL_ADD_EXECUTABLE(aria_pack maria_pack.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(aria_pack aria)
 
 IF(WITH_UNIT_TESTS AND FALSE)
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index ae7e686d2f0..2b67f29f9f8 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -2537,9 +2537,10 @@ int ha_maria::extra_opt(enum ha_extra_function operation, ulong cache_size)
 
 int ha_maria::delete_all_rows()
 {
-#ifdef EXTRA_DEBUG
   THD *thd= table->in_use;
   TRN *trn= file->trn;
+  CHECK_UNTIL_WE_FULLY_IMPLEMENTED_VERSIONING("TRUNCATE in WRITE CONCURRENT");
+#ifdef EXTRA_DEBUG
   if (trn && ! (trnman_get_flags(trn) & TRN_STATE_INFO_LOGGED))
   {
     trnman_set_flags(trn, trnman_get_flags(trn) | TRN_STATE_INFO_LOGGED |
@@ -2548,16 +2549,19 @@ int ha_maria::delete_all_rows()
                                    (uchar*) thd->query(), thd->query_length());
   }
 #endif
-  if (file->s->now_transactional &&
-      ((table->in_use->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) ||
-       table->in_use->locked_tables_mode))
+  /*
+    If we are under LOCK TABLES, we have to do a commit as
+    delete_all_rows() can't be rolled back
+  */
+  if (table->in_use->locked_tables_mode && trn &&
+      trnman_has_locked_tables(trn))
   {
-    /*
-      We are not in autocommit mode or user have done LOCK TABLES.
-      We must do the delete row by row to be able to rollback the command
-    */
-    return HA_ERR_WRONG_COMMAND;
+    int error;
+    if ((error= implicit_commit(thd, 1)))
+      return error;
   }
+
+  /* Note that this can't be rolled back */
   return maria_delete_all_rows(file);
 }
 
@@ -2775,10 +2779,11 @@ int ha_maria::implicit_commit(THD *thd, bool new_trn)
 #error this method should be removed
 #endif
   TRN *trn;
-  int error= 0;
+  int error;
+  uint locked_tables;
   TABLE *table;
   DBUG_ENTER("ha_maria::implicit_commit");
-  if (!maria_hton)
+  if (!maria_hton || !(trn= THD_TRN))
     DBUG_RETURN(0);
   if (!new_trn && (thd->locked_tables_mode == LTM_LOCK_TABLES ||
                    thd->locked_tables_mode == LTM_PRELOCKED_UNDER_LOCK_TABLES))
@@ -2792,60 +2797,59 @@ int ha_maria::implicit_commit(THD *thd, bool new_trn)
     DBUG_PRINT("info", ("locked_tables, skipping"));
     DBUG_RETURN(0);
   }
-  if ((trn= THD_TRN) != NULL)
+  locked_tables= trnman_has_locked_tables(trn);
+  error= 0;
+  if (unlikely(ma_commit(trn)))
+    error= 1;
+  if (!new_trn)
   {
-    uint locked_tables= trnman_has_locked_tables(trn);
-    if (unlikely(ma_commit(trn)))
-      error= 1;
-    if (!new_trn)
-    {
-      /*
-        To be extra safe, we should also reset file->trn for all open
-        tables as some calls, like extra() may access it. We take care
-        of this in extra() by resetting file->trn if THD_TRN is 0.
-      */
-      THD_TRN= NULL;
-      goto end;
-    }
     /*
-      We need to create a new transaction and put it in THD_TRN. Indeed,
-      tables may be under LOCK TABLES, and so they will start the next
-      statement assuming they have a trn (see ha_maria::start_stmt()).
+      To be extra safe, we should also reset file->trn for all open
+      tables as some calls, like extra() may access it. We take care
+      of this in extra() by resetting file->trn if THD_TRN is 0.
     */
-    trn= trnman_new_trn(& thd->transaction.wt);
-    THD_TRN= trn;
-    if (unlikely(trn == NULL))
+    THD_TRN= NULL;
+    goto end;
+  }
+  /*
+    We need to create a new transaction and put it in THD_TRN. Indeed,
+    tables may be under LOCK TABLES, and so they will start the next
+    statement assuming they have a trn (see ha_maria::start_stmt()).
+  */
+  trn= trnman_new_trn(& thd->transaction.wt);
+  THD_TRN= trn;
+  if (unlikely(trn == NULL))
+  {
+    error= HA_ERR_OUT_OF_MEM;
+    goto end;
+  }
+  /*
+    Move all locked tables to the new transaction
+    We must do it here as otherwise file->thd and file->state may be
+    stale pointers. We can't do this in start_stmt() as we don't know
+    when we should call _ma_setup_live_state() and in some cases, like
+    in check table, we use the table without calling start_stmt().
+  */
+  for (table=thd->open_tables; table ; table=table->next)
+  {
+    if (table->db_stat && table->file->ht == maria_hton)
     {
-      error= HA_ERR_OUT_OF_MEM;
-      goto end;
-    }
-    /*
-      Move all locked tables to the new transaction
-      We must do it here as otherwise file->thd and file->state may be
-      stale pointers. We can't do this in start_stmt() as we don't know
-      when we should call _ma_setup_live_state() and in some cases, like
-      in check table, we use the table without calling start_stmt().
-     */
-    for (table=thd->open_tables; table ; table=table->next)
-    {
-      if (table->db_stat && table->file->ht == maria_hton)
+      MARIA_HA *handler= ((ha_maria*) table->file)->file;
+      if (handler->s->base.born_transactional)
       {
-        MARIA_HA *handler= ((ha_maria*) table->file)->file;
-        if (handler->s->base.born_transactional)
+        _ma_set_trn_for_table(handler, trn);
+        /* If handler uses versioning */
+        if (handler->s->lock_key_trees)
         {
-          _ma_set_trn_for_table(handler, trn);
-          /* If handler uses versioning */
-          if (handler->s->lock_key_trees)
-          {
-            if (_ma_setup_live_state(handler))
-              error= HA_ERR_OUT_OF_MEM;
-          }
+          if (_ma_setup_live_state(handler))
+            error= HA_ERR_OUT_OF_MEM;
         }
       }
     }
-    /* This is just a commit, tables stay locked if they were: */
-    trnman_reset_locked_tables(trn, locked_tables);
   }
+  /* This is just a commit, tables stay locked if they were: */
+  trnman_reset_locked_tables(trn, locked_tables);
+
 end:
   DBUG_RETURN(error);
 }
diff --git a/storage/maria/ma_checkpoint.c b/storage/maria/ma_checkpoint.c
index 2f5ba72a40e..30124b2205d 100644
--- a/storage/maria/ma_checkpoint.c
+++ b/storage/maria/ma_checkpoint.c
@@ -763,6 +763,8 @@ static int collect_tables(LEX_STRING *str, LSN checkpoint_start_log_horizon)
   PAGECACHE_FLUSH_FILTER filter;
   DBUG_ENTER("collect_tables");
 
+  LINT_INIT(state_copies_horizon);
+
   /* let's make a list of distinct shares */
   mysql_mutex_lock(&THR_LOCK_maria);
   for (nb= 0, pos= maria_open_list; pos; pos= pos->next)
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index 801efd3f07c..341bbc6088f 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -7474,6 +7474,8 @@ static void translog_force_current_buffer_to_finish()
   uint16 left= TRANSLOG_PAGE_SIZE - log_descriptor.bc.current_page_fill;
   uint16 current_page_fill, write_counter, previous_offset;
   DBUG_ENTER("translog_force_current_buffer_to_finish");
+  LINT_INIT(current_page_fill);
+
   DBUG_PRINT("enter", ("Buffer #%u 0x%lx  "
                        "Buffer addr: (%lu,0x%lx)  "
                        "Page addr: (%lu,0x%lx)  "
diff --git a/storage/maria/ma_rt_index.c b/storage/maria/ma_rt_index.c
index 79ae751f3ff..0d187c81692 100644
--- a/storage/maria/ma_rt_index.c
+++ b/storage/maria/ma_rt_index.c
@@ -196,6 +196,12 @@ int maria_rtree_find_first(MARIA_HA *info, MARIA_KEY *key, uint32 search_flag)
   uint nod_cmp_flag;
   MARIA_KEYDEF *keyinfo= key->keyinfo;
 
+  /*
+    At the moment index can only properly handle the
+    MBR_INTERSECT, so we use it for all sorts of queries.
+    TODO: better searsh for CONTAINS/WITHIN.
+  */
+  search_flag= nod_cmp_flag= MBR_INTERSECT;
   if ((root= info->s->state.key_root[keyinfo->key_nr]) == HA_OFFSET_ERROR)
   {
     my_errno= HA_ERR_END_OF_FILE;
@@ -213,8 +219,11 @@ int maria_rtree_find_first(MARIA_HA *info, MARIA_KEY *key, uint32 search_flag)
   info->maria_rtree_recursion_depth= -1;
   info->keyread_buff_used= 1;
 
-  nod_cmp_flag= ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
-                 MBR_WITHIN : MBR_INTERSECT);
+  /*
+    TODO better search for CONTAINS/WITHIN.
+    nod_cmp_flag= ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
+                   MBR_WITHIN : MBR_INTERSECT);
+  */
   return maria_rtree_find_req(info, keyinfo, search_flag, nod_cmp_flag, root,
                               0);
 }
@@ -241,6 +250,12 @@ int maria_rtree_find_next(MARIA_HA *info, uint keynr, uint32 search_flag)
   uint32 nod_cmp_flag;
   MARIA_KEYDEF *keyinfo= info->s->keyinfo + keynr;
   DBUG_ASSERT(info->last_key.keyinfo == keyinfo);
+  /*
+    At the moment index can only properly handle the
+    MBR_INTERSECT, so we use it for all sorts of queries.
+    TODO: better searsh for CONTAINS/WITHIN.
+  */
+  search_flag= nod_cmp_flag= MBR_INTERSECT;
 
   if (info->update & HA_STATE_DELETED)
     return maria_rtree_find_first(info, &info->last_key, search_flag);
@@ -284,8 +299,11 @@ int maria_rtree_find_next(MARIA_HA *info, uint keynr, uint32 search_flag)
     return -1;
   }
 
-  nod_cmp_flag= (((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
-                  MBR_WITHIN : MBR_INTERSECT));
+  /*
+    TODO better search for CONTAINS/WITHIN.
+    nod_cmp_flag= (((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
+                    MBR_WITHIN : MBR_INTERSECT));
+  */
   return maria_rtree_find_req(info, keyinfo, search_flag, nod_cmp_flag, root,
                               0);
 }
diff --git a/storage/maria/ma_test3.c b/storage/maria/ma_test3.c
index d2ce68fc063..c11de6f8242 100644
--- a/storage/maria/ma_test3.c
+++ b/storage/maria/ma_test3.c
@@ -17,7 +17,7 @@
 
 #ifndef _WIN32 /*no fork() in Windows*/
 
-#include "maria.h"
+#include "maria_def.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
diff --git a/storage/maria/maria_def.h b/storage/maria/maria_def.h
index a2a19924a73..1eb720c9607 100644
--- a/storage/maria/maria_def.h
+++ b/storage/maria/maria_def.h
@@ -16,6 +16,7 @@
 /* This file is included by all internal maria files */
 
 #include "maria.h"				/* Structs & some defines */
+#include "ma_pagecache.h"
 #include <myisampack.h>				/* packing of keys */
 #include <my_tree.h>
 #include <my_bitmap.h>
@@ -45,6 +46,75 @@
 /* maria_open() flag, specific for maria_pack */
 #define HA_OPEN_IGNORE_MOVED_STATE (1U << 30)
 
+extern PAGECACHE maria_pagecache_var, *maria_pagecache;
+int maria_assign_to_pagecache(MARIA_HA *info, ulonglong key_map,
+			      PAGECACHE *key_cache);
+void maria_change_pagecache(PAGECACHE *old_key_cache,
+			    PAGECACHE *new_key_cache);
+
+typedef struct st_maria_sort_info
+{
+  /* sync things */
+  mysql_mutex_t mutex;
+  mysql_cond_t cond;
+  MARIA_HA *info, *new_info;
+  HA_CHECK *param;
+  char *buff;
+  SORT_KEY_BLOCKS *key_block, *key_block_end;
+  SORT_FT_BUF *ft_buf;
+  my_off_t filelength, dupp, buff_length;
+  pgcache_page_no_t page;
+  ha_rows max_records;
+  uint current_key, total_keys;
+  uint got_error, threads_running;
+  myf myf_rw;
+  enum data_file_type new_data_file_type, org_data_file_type;
+} MARIA_SORT_INFO;
+
+typedef struct st_maria_sort_param
+{
+  pthread_t thr;
+  IO_CACHE read_cache, tempfile, tempfile_for_exceptions;
+  DYNAMIC_ARRAY buffpek;
+  MARIA_BIT_BUFF bit_buff;               /* For parallel repair of packrec. */
+  
+  MARIA_KEYDEF *keyinfo;
+  MARIA_SORT_INFO *sort_info;
+  HA_KEYSEG *seg;
+  uchar **sort_keys;
+  uchar *rec_buff;
+  void *wordlist, *wordptr;
+  MEM_ROOT wordroot;
+  uchar *record;
+  MY_TMPDIR *tmpdir;
+
+  /* 
+    The next two are used to collect statistics, see maria_update_key_parts for
+    description.
+  */
+  ulonglong unique[HA_MAX_KEY_SEG+1];
+  ulonglong notnull[HA_MAX_KEY_SEG+1];
+
+  MARIA_RECORD_POS pos,max_pos,filepos,start_recpos, current_filepos;
+  uint key, key_length,real_key_length,sortbuff_size;
+  uint maxbuffers, keys, find_length, sort_keys_length;
+  my_bool fix_datafile, master;
+  my_bool calc_checksum;                /* calculate table checksum */
+  size_t rec_buff_size;
+
+  int (*key_cmp)(struct st_maria_sort_param *, const void *, const void *);
+  int (*key_read)(struct st_maria_sort_param *, uchar *);
+  int (*key_write)(struct st_maria_sort_param *, const uchar *);
+  void (*lock_in_memory)(HA_CHECK *);
+  int (*write_keys)(struct st_maria_sort_param *, register uchar **,
+                         uint , struct st_buffpek *, IO_CACHE *);
+  uint (*read_to_buffer)(IO_CACHE *,struct st_buffpek *, uint);
+  int (*write_key)(struct st_maria_sort_param *, IO_CACHE *,uchar *,
+                   uint, uint);
+} MARIA_SORT_PARAM;
+
+int maria_write_data_suffix(MARIA_SORT_INFO *sort_info, my_bool fix_datafile);
+
 struct st_transaction;
 
 /* undef map from my_nosys; We need test-if-disk full */
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
index 5abd8c29e64..97c1bc78d95 100644
--- a/storage/myisam/CMakeLists.txt
+++ b/storage/myisam/CMakeLists.txt
@@ -34,16 +34,16 @@ MYSQL_ADD_PLUGIN(myisam ${MYISAM_SOURCES}
 
 TARGET_LINK_LIBRARIES(myisam mysys)
 
-MYSQL_ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c)
+MYSQL_ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(myisam_ftdump myisam)
 
-MYSQL_ADD_EXECUTABLE(myisamchk myisamchk.c)
+MYSQL_ADD_EXECUTABLE(myisamchk myisamchk.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(myisamchk myisam)
 
-MYSQL_ADD_EXECUTABLE(myisamlog myisamlog.c)
+MYSQL_ADD_EXECUTABLE(myisamlog myisamlog.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(myisamlog myisam)
 
-MYSQL_ADD_EXECUTABLE(myisampack myisampack.c)
+MYSQL_ADD_EXECUTABLE(myisampack myisampack.c COMPONENT Server)
 TARGET_LINK_LIBRARIES(myisampack myisam)
 
 IF(WITH_UNIT_TESTS AND FALSE)
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 3f99dfc2186..4fbd94a1a3b 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -2177,6 +2177,7 @@ static int myisam_init(void *p)
   myisam_hton->panic= myisam_panic;
   myisam_hton->flags= HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES;
   mi_killed= mi_killed_in_mariadb;
+
   return 0;
 }
 
diff --git a/storage/myisam/rt_index.c b/storage/myisam/rt_index.c
index c26dba92823..9f0a9103c7a 100644
--- a/storage/myisam/rt_index.c
+++ b/storage/myisam/rt_index.c
@@ -175,6 +175,13 @@ int rtree_find_first(MI_INFO *info, uint keynr, uchar *key, uint key_length,
   uint nod_cmp_flag;
   MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
 
+  /*
+    At the moment index can only properly handle the
+    MBR_INTERSECT, so we use it for all sorts of queries.
+    TODO: better searsh for CONTAINS/WITHIN.
+  */
+  search_flag= nod_cmp_flag= MBR_INTERSECT;
+
   if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
   {
     my_errno= HA_ERR_END_OF_FILE;
@@ -192,8 +199,11 @@ int rtree_find_first(MI_INFO *info, uint keynr, uchar *key, uint key_length,
   info->rtree_recursion_depth = -1;
   info->buff_used = 1;
   
-  nod_cmp_flag = ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ? 
-        MBR_WITHIN : MBR_INTERSECT);
+  /*
+    TODO better search for CONTAINS/WITHIN.
+    nod_cmp_flag= ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
+                   MBR_WITHIN : MBR_INTERSECT);
+  */
   return rtree_find_req(info, keyinfo, search_flag, nod_cmp_flag, root, 0);
 }
 
@@ -218,6 +228,12 @@ int rtree_find_next(MI_INFO *info, uint keynr, uint search_flag)
   my_off_t root;
   uint nod_cmp_flag;
   MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
+  /*
+    At the moment index can only properly handle the
+    MBR_INTERSECT, so we use it for all sorts of queries.
+    TODO: better searsh for CONTAINS/WITHIN.
+  */
+  search_flag= nod_cmp_flag= MBR_INTERSECT;
 
   if (info->update & HA_STATE_DELETED)
     return rtree_find_first(info, keynr, info->lastkey, info->lastkey_length,
@@ -252,8 +268,11 @@ int rtree_find_next(MI_INFO *info, uint keynr, uint search_flag)
     return -1;
   }
   
-  nod_cmp_flag = ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ? 
-        MBR_WITHIN : MBR_INTERSECT);
+  /*
+    TODO better search for CONTAINS/WITHIN.
+    nod_cmp_flag= (((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
+                    MBR_WITHIN : MBR_INTERSECT));
+  */
   return rtree_find_req(info, keyinfo, search_flag, nod_cmp_flag, root, 0);
 }
 
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 4a869cf64b0..82c69b0dc7a 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -51,7 +51,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <m_ctype.h>
 #include <mysys_err.h>
 #include <mysql/plugin.h>
-#include <mysql/innodb_priv.h>
+#include <innodb_priv.h>
 #include <mysql/psi/psi.h>
 #include <my_sys.h>
 
diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc
index ef802c0d373..e20e4797dd5 100644
--- a/storage/xtradb/handler/handler0alter.cc
+++ b/storage/xtradb/handler/handler0alter.cc
@@ -25,7 +25,7 @@ Smart ALTER TABLE
 #include <mysqld_error.h>
 #include <sql_class.h>
 #include <sql_lex.h>                            // SQLCOM_CREATE_INDEX
-#include <mysql/innodb_priv.h>
+#include <innodb_priv.h>
 
 extern "C" {
 #include "log0log.h"
diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc
index 3b87b860a4a..1c40b87bbbd 100644
--- a/storage/xtradb/handler/i_s.cc
+++ b/storage/xtradb/handler/i_s.cc
@@ -34,7 +34,7 @@ Created July 18, 2007 Vasil Dimov
 #include <my_sys.h>
 #include "i_s.h"
 #include <sql_plugin.h>
-#include <mysql/innodb_priv.h>
+#include <innodb_priv.h>
 
 extern "C" {
 #include "btr0pcur.h"	/* for file sys_tables related info. */
diff --git a/storage/xtradb/row/row0sel.c b/storage/xtradb/row/row0sel.c
index 8e6b01f2a6d..be2f5d0fcd0 100644
--- a/storage/xtradb/row/row0sel.c
+++ b/storage/xtradb/row/row0sel.c
@@ -2678,7 +2678,6 @@ row_sel_field_store_in_mysql_format(
 	case DATA_DECIMAL:
 		/* Above are the valid column types for MySQL data. */
 #endif /* UNIV_DEBUG */
-		ut_ad(templ->mysql_col_len == len);
 		memcpy(dest, data, len);
 	}
 }
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index 58e59e2f938..6fbd52a64eb 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates.
+# Copyright (c) 2012, Monty Program Ab
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -65,6 +66,7 @@ IF(UNIX)
   ENDFOREACH()
   IF(INSTALL_SUPPORTFILESDIR)
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
+    INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
   ENDIF()
 
   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
@@ -97,4 +99,30 @@ IF(UNIX)
     DESTINATION ${inst_location} COMPONENT SupportFiles
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+  IF (INSTALL_SYSCONFDIR)
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
+            RENAME mysql COMPONENT SupportFiles)
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql.server
+            DESTINATION  ${INSTALL_SYSCONFDIR}/init.d
+            RENAME mysql COMPONENT SupportFiles
+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
+            GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+    INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
+            COMPONENT Common)
+    INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d
+            COMPONENT SharedLibraries)
+    INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d
+            COMPONENT Client)
+    INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d
+            COMPONENT IniFiles)
+
+    # This is for SuSE:
+    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+                   ${INSTALL_SYSCONFDIR}/init.d/mysql
+                   ${INSTALL_SBINDIR}/rcmysql
+                   WORKING_DIRECTORY \$ENV{DESTDIR}${prefix})"
+                   COMPONENT SupportFiles)
+  ENDIF(INSTALL_SYSCONFDIR)
 ENDIF()
diff --git a/support-files/rpm/client.cnf b/support-files/rpm/client.cnf
new file mode 100644
index 00000000000..9028505a98a
--- /dev/null
+++ b/support-files/rpm/client.cnf
@@ -0,0 +1,13 @@
+#
+# These two groups are read by the client library
+# Use it for options that affect all clients, but not the server
+#
+
+
+[client]
+
+# This group is not read by mysql client library,
+# If you use the same .cnf file for MySQL and MariaDB,
+# use it for MariaDB-only client options
+[client-mariadb]
+
diff --git a/support-files/rpm/my.cnf b/support-files/rpm/my.cnf
new file mode 100644
index 00000000000..913b88f8328
--- /dev/null
+++ b/support-files/rpm/my.cnf
@@ -0,0 +1,11 @@
+#
+# This group is read both both by the client and the server
+# use it for options that affect everything
+#
+[client-server]
+
+#
+# include all files from the config directory
+#
+!includedir /etc/my.cnf.d
+
diff --git a/support-files/rpm/mysql-clients.cnf b/support-files/rpm/mysql-clients.cnf
new file mode 100644
index 00000000000..3df9b7b955f
--- /dev/null
+++ b/support-files/rpm/mysql-clients.cnf
@@ -0,0 +1,23 @@
+#
+# These groups are read by MariaDB command-line tools
+# Use it for options that affect only one utility
+#
+
+[mysql]
+
+[mysql_upgrade]
+
+[mysqladmin]
+
+[mysqlbinlog]
+
+[mysqlcheck]
+
+[mysqldump]
+
+[mysqlimport]
+
+[mysqlshow]
+
+[mysqlslap]
+
diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh
new file mode 100644
index 00000000000..88ff059ff22
--- /dev/null
+++ b/support-files/rpm/server-postin.sh
@@ -0,0 +1,69 @@
+mysql_datadir=%{mysqldatadir}
+
+# Create data directory
+mkdir -p $mysql_datadir/{mysql,test}
+
+# Make MySQL start/shutdown automatically when the machine does it.
+if [ $1 = 1 ] ; then
+  if [ -x /sbin/chkconfig ] ; then
+          /sbin/chkconfig --add mysql
+  fi
+fi
+
+# Create a MySQL user and group. Do not report any problems if it already
+# exists.
+groupadd -r %{mysqld_group} 2> /dev/null || true
+useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true 
+# The user may already exist, make sure it has the proper group nevertheless (BUG#12823)
+usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
+
+# Change permissions so that the user that will run the MySQL daemon
+# owns all database files.
+chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
+
+# Initiate databases
+%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
+
+# Upgrade databases if needed would go here - but it cannot be automated yet
+
+# Change permissions again to fix any new files.
+chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
+
+# Fix permissions for the permission database so that only the user
+# can read them.
+chmod -R og-rw $mysql_datadir/mysql
+
+# install SELinux files - but don't override existing ones
+SETARGETDIR=/etc/selinux/targeted/src/policy
+SEDOMPROG=$SETARGETDIR/domains/program
+SECONPROG=$SETARGETDIR/file_contexts/program
+if [ -f /etc/redhat-release ] \
+   && grep -q "Red Hat Enterprise Linux .. release 4" /etc/redhat-release \
+   || grep -q "CentOS release 4" /etc/redhat-release ; then
+   echo
+   echo
+   echo 'Notes regarding SELinux on this platform:'
+   echo '========================================='
+   echo
+   echo 'The default policy might cause server startup to fail because it is '
+   echo 'not allowed to access critical files. In this case, please update '
+   echo 'your installation. '
+   echo
+   echo 'The default policy might also cause inavailability of SSL related '
+   echo 'features because the server is not allowed to access /dev/random '
+   echo 'and /dev/urandom. If this is a problem, please do the following: '
+   echo 
+   echo '  1) install selinux-policy-targeted-sources from your OS vendor'
+   echo '  2) add the following two lines to '$SEDOMPROG/mysqld.te':'
+   echo '       allow mysqld_t random_device_t:chr_file read;'
+   echo '       allow mysqld_t urandom_device_t:chr_file read;'
+   echo '  3) cd to '$SETARGETDIR' and issue the following command:'
+   echo '       make load'
+   echo
+   echo
+fi
+
+if [ -x sbin/restorecon ] ; then
+	sbin/restorecon -R var/lib/mysql
+fi
+
diff --git a/support-files/rpm/server-postun.sh b/support-files/rpm/server-postun.sh
new file mode 100644
index 00000000000..652d59154ae
--- /dev/null
+++ b/support-files/rpm/server-postun.sh
@@ -0,0 +1,7 @@
+if [ $1 -ge 1 ]; then
+  if [ -x %{_sysconfdir}/init.d/mysql ] ; then
+    # only restart the server if it was alredy running
+    %{_sysconfdir}/init.d/mysql status > /dev/null 2>&1 && \
+    %{_sysconfdir}/init.d/mysql restart
+  fi
+fi
diff --git a/support-files/rpm/server-prein.sh b/support-files/rpm/server-prein.sh
new file mode 100644
index 00000000000..9194f2b0656
--- /dev/null
+++ b/support-files/rpm/server-prein.sh
@@ -0,0 +1,66 @@
+# Check if we can safely upgrade.  An upgrade is only safe if it's from one
+# of our RPMs in the same version family.
+
+installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
+if [ $? -eq 0 -a -n "$installed" ]; then
+  vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
+  version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
+  myvendor='%{mysql_vendor}'
+  myversion='%{mysqlversion}'
+
+  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 MariaDB 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 MariaDB $new_family may not
+be safe in all cases.  A manual dump and restore using mysqldump is
+recommended.  It is important to review the MariaDB manual's Upgrading
+section for version-specific incompatibilities.
+"
+  fi
+
+  if [ -n "$error_text" ]; then
+    cat <<HERE >&2
+
+******************************************************************
+A MySQL or MariaDB 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 MariaDB-shared package.
+- Install the new MariaDB packages supplied by $myvendor
+- Ensure that the MariaDB server is started
+- Run the 'mysql_upgrade' program
+
+This is a brief description of the upgrade process.  Important details
+can be found in the MariaDB manual, in the Upgrading section.
+******************************************************************
+HERE
+    exit 1
+  fi
+fi
+
diff --git a/support-files/rpm/server-preun.sh b/support-files/rpm/server-preun.sh
new file mode 100644
index 00000000000..7ef48f1c8d4
--- /dev/null
+++ b/support-files/rpm/server-preun.sh
@@ -0,0 +1,14 @@
+if [ $1 = 0 ] ; then
+	# Stop MySQL before uninstalling it
+	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
+		%{_sysconfdir}/init.d/mysql stop > /dev/null
+	fi
+        # Don't start it automatically anymore
+	if [ -x /sbin/chkconfig ] ; then
+		/sbin/chkconfig --del mysql
+	fi
+fi
+
+# We do not remove the mysql user since it may still own a lot of
+# database files.
+
diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
new file mode 100644
index 00000000000..8cf2c74dbe4
--- /dev/null
+++ b/support-files/rpm/server.cnf
@@ -0,0 +1,25 @@
+#
+# These groups are read by MariaDB server
+# Use it for options that only the server (but not clients) should see
+#
+# See the examples of server my.cnf files in /usr/share/mysql/
+#
+
+[mysqld]
+
+[server]
+
+[embedded]
+
+# This group is only read by MariaDB-5.5 servers.
+# If you use the same .cnf file for MariaDB of different versions,
+# use this group for options that older servers don't understand
+[mysqld-5.5]
+
+# These two groups are only read by MariaDB servers, not by MySQL.
+# If you use the same .cnf file for MySQL and MariaDB,
+# you can put MariaDB-only options here
+[mariadb]
+
+[mariadb-5.5]
+
diff --git a/support-files/rpm/shared-post.sh b/support-files/rpm/shared-post.sh
new file mode 100644
index 00000000000..8b0c822426a
--- /dev/null
+++ b/support-files/rpm/shared-post.sh
@@ -0,0 +1 @@
+/sbin/ldconfig
diff --git a/unittest/mysys/base64-t.c b/unittest/mysys/base64-t.c
index a8a5d166a1a..ed19c4de851 100644
--- a/unittest/mysys/base64-t.c
+++ b/unittest/mysys/base64-t.c
@@ -24,7 +24,7 @@
 #define BASE64_ROWS 4                           /* Number of ok(..) */
 
 int
-main(int argc,char *argv[])
+main(int argc __attribute__((unused)),char *argv[])
 {
   int i, cmp;
   size_t j, k, l, dst_len, needed_length;
diff --git a/unittest/mysys/bitmap-t.c b/unittest/mysys/bitmap-t.c
index bcfb9835c10..0666f4eaa15 100644
--- a/unittest/mysys/bitmap-t.c
+++ b/unittest/mysys/bitmap-t.c
@@ -520,7 +520,7 @@ error:
   return TRUE;
 }
 
-int main(int argc,char *argv[])
+int main(int argc __attribute__((unused)),char *argv[])
 {
   int i;
   int const min_size = 1;
diff --git a/unittest/mysys/my_malloc-t.c b/unittest/mysys/my_malloc-t.c
index 40d9492b039..52d73434150 100644
--- a/unittest/mysys/my_malloc-t.c
+++ b/unittest/mysys/my_malloc-t.c
@@ -17,7 +17,7 @@
 #include <my_sys.h>
 #include "tap.h"
 
-int main(int argc,char *argv[])
+int main(int argc __attribute__((unused)),char *argv[])
 {
   void *p;
   MY_INIT(argv[0]);
diff --git a/vio/viosocket.c b/vio/viosocket.c
index 406073a5fc5..8e28e7661a9 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -24,6 +24,11 @@
   the file descriptior.
 */
 
+#ifdef __WIN__
+  #include <winsock2.h>
+  #include <MSWSock.h>
+  #pragma comment(lib, "ws2_32.lib")
+#endif
 #include "vio_priv.h"
 #include "my_context.h"
 #include <mysql_async.h>
@@ -369,6 +374,37 @@ vio_was_interrupted(Vio *vio __attribute__((unused)))
 }
 
 
+int
+mysql_socket_shutdown(my_socket mysql_socket, int how)
+{
+  int result;
+
+#ifdef __WIN__
+  static LPFN_DISCONNECTEX DisconnectEx = NULL;
+  if (DisconnectEx == NULL)
+  {
+    DWORD dwBytesReturned;
+    GUID guidDisconnectEx = WSAID_DISCONNECTEX;
+    WSAIoctl(mysql_socket, SIO_GET_EXTENSION_FUNCTION_POINTER,
+             &guidDisconnectEx, sizeof(GUID),
+             &DisconnectEx, sizeof(DisconnectEx), 
+             &dwBytesReturned, NULL, NULL);
+  }
+#endif
+
+  /* Non instrumented code */
+#ifdef __WIN__
+  if (DisconnectEx)
+    result= (DisconnectEx(mysql_socket, (LPOVERLAPPED) NULL,
+                          (DWORD) 0, (DWORD) 0) == TRUE) ? 0 : -1;
+  else
+#endif
+    result= shutdown(mysql_socket, how);
+
+  return result;
+}
+
+
 int vio_close(Vio * vio)
 {
   int r=0;
@@ -381,7 +417,7 @@ int vio_close(Vio * vio)
       vio->type == VIO_TYPE_SSL);
 
     DBUG_ASSERT(vio->sd >= 0);
-    if (shutdown(vio->sd, SHUT_RDWR))
+    if (mysql_socket_shutdown(vio->sd, SHUT_RDWR))
       r= -1;
     if (closesocket(vio->sd))
       r= -1;
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
index 795732e946b..0b5e2f98f16 100644
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -24,6 +24,7 @@ FIND_PATH(WIX_DIR heat.exe
   "$ENV{ProgramFiles}/Windows Installer XML v3/bin"
   "$ENV{ProgramFiles}/Windows Installer XML v3.5/bin"
   "$ENV{ProgramFiles}/Windows Installer XML v3.6/bin"
+  "$ENV{WIX}/bin"
 )
 
 SET(CPACK_WIX_PACKAGE_BASE_NAME "MariaDB")
diff --git a/win/packaging/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake
index 0722ecbbccb..356d6ef4b89 100644
--- a/win/packaging/CPackWixConfig.cmake
+++ b/win/packaging/CPackWixConfig.cmake
@@ -9,7 +9,7 @@ IF(ESSENTIALS)
  ENDIF()
 ELSE()
   SET(CPACK_COMPONENTS_USED 
-    "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo")
+    "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo;Common")
 ENDIF()
 
 SET( WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents")
@@ -34,6 +34,7 @@ SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
 # Always install (hidden), includes Readme files
 SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
 SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
+SET(CPACK_COMPONENT_COMMON_GROUP "AlwaysInstall")
 
 # Feature MySQL Server
 SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MariaDB Server")
diff --git a/win/packaging/ca/CMakeLists.txt b/win/packaging/ca/CMakeLists.txt
index 7dd30123587..940e9e3a7d1 100644
--- a/win/packaging/ca/CMakeLists.txt
+++ b/win/packaging/ca/CMakeLists.txt
@@ -22,28 +22,40 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql)
 
 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
   SET(WIX_ARCH_SUFFIX "_x64")
+  SET(WIX36_ARCH_SUFFIX "x64")
 ELSE()
   SET(WIX_ARCH_SUFFIX)
+  SET(WIX36_ARCH_SUFFIX "x86")
 ENDIF()
 
 IF(MSVC_VERSION EQUAL 1400)
   SET(WIX35_MSVC_SUFFIX "_2005")
 ELSEIF(MSVC_VERSION EQUAL 1500)
   SET(WIX35_MSVC_SUFFIX "_2008")
+  SET(WIX36_MSVC_SUFFIX "VS2008")
 ELSEIF(MSVC_VERSION EQUAL 1600)
   SET(WIX35_MSVC_SUFFIX "_2010")
+  SET(WIX36_MSVC_SUFFIX "VS2010")
 ELSE()
   # When next VS is out, add the correct version here
   MESSAGE(FATAL_ERROR "Unknown VS version")
 ENDIF()
+INCLUDE_DIRECTORIES(${WIX_DIR}/../SDK/${WIX36_MSVC_SUFFIX}/inc)
 
 FIND_LIBRARY(WIX_WCAUTIL_LIBRARY 
   NAMES wcautil${WIX_ARCH_SUFFIX}  wcautil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX}
-  HINTS ${WIX_DIR}/../SDK/lib)
+  wcautil
+  PATHS 
+  ${WIX_DIR}/../SDK/lib 
+  ${WIX_DIR}/../SDK/${WIX36_MSVC_SUFFIX}/lib/${WIX36_ARCH_SUFFIX})
 
 FIND_LIBRARY(WIX_DUTIL_LIBRARY 
   NAMES dutil${WIX_ARCH_SUFFIX}  dutil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX}
-  PATHS ${WIX_DIR}/../SDK/lib)
+  dutil
+  PATHS 
+  ${WIX_DIR}/../SDK/lib
+  ${WIX_DIR}/../SDK/${WIX36_MSVC_SUFFIX}/lib/${WIX36_ARCH_SUFFIX}
+  )
 
 ADD_VERSION_INFO(wixca SHARED WIXCA_SOURCES)
 ADD_LIBRARY(wixca SHARED EXCLUDE_FROM_ALL ${WIXCA_SOURCES})
diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in
index d02791d3b9f..a8ca35906e8 100644
--- a/win/packaging/create_msi.cmake.in
+++ b/win/packaging/create_msi.cmake.in
@@ -8,6 +8,7 @@ SET(VERSION "@VERSION@")
 SET(MAJOR_VERSION "@MAJOR_VERSION@")
 SET(MINOR_VERSION "@MINOR_VERSION@")
 SET(PATCH_VERSION "@PATCH_VERSION@")
+SET(TINY_VERSION "@TINY_VERSION@")
 SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
 SET(MANUFACTURER "@MANUFACTURER@")
 SET(WIXCA_LOCATION "@WIXCA_LOCATION@")
@@ -421,7 +422,7 @@ EXECUTE_PROCESS(
 
 EXECUTE_PROCESS(
  COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension 
- -ext WixFirewallExtension
+ -ext WixFirewallExtension -sice:ICE61
   mysql_server.wixobj  extra.wixobj -out  ${CPACK_PACKAGE_FILE_NAME}.msi
   ${EXTRA_LIGHT_ARGS}
 )
diff --git a/win/packaging/mysql_server.wxs.in b/win/packaging/mysql_server.wxs.in
index 82c17d7577c..79fde801cf5 100644
--- a/win/packaging/mysql_server.wxs.in
+++ b/win/packaging/mysql_server.wxs.in
@@ -4,7 +4,7 @@
     Id="*" 
     UpgradeCode="@CPACK_WIX_UPGRADE_CODE@"
     Name="@CPACK_WIX_PACKAGE_NAME@" 
-    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" 
+    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@" 
     Language="1033" 
     Manufacturer="@MANUFACTURER@">
     
@@ -26,14 +26,16 @@
       <UpgradeVersion 
         Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
         IncludeMinimum="yes"
-        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
+        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"
+        IncludeMaximum="yes"
         Property="OLDERVERSIONBEINGUPGRADED"
         MigrateFeatures="yes"
         />
      <?endif?>
       <UpgradeVersion 
-        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
+        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"
         Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.999"
+        IncludeMinimum="no"
         OnlyDetect="yes"
         Property="NEWERVERSIONDETECTED" />
     </Upgrade>