Merge lp:~laurynas-biveinis/percona-server/merge-5.5.39 into lp:percona-server/5.5

[Laurynas Biveinis]

Merge MySQL 5.5.39, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.5.39,
and taking the upstream fix for bug 1346122.

Revert our fix for bug 1262439 to take the upstream fix
(http://bugs.mysql.com/bug.php?id=71250).

Revert Oracle fix for bug 1277351 /
http://bugs.mysql.com/bug.php?id=71603 and keep the MariaDB fix in
5.5.

Revert our fix for bug 1171941 to take the upstream fix (rev
4676). The Oracle fix loses the feature of returning occasional
"change authentication plugin" error, which should be fine. Adapt the
utility user feature to the fix by initializing the new
ACL_USER::can_authenticate field in acl_init_utility_user.

Add changes necessary for the upstream fix of
http://bugs.mysql.com/bug.php?id=69954, that introduced new mutex,
LOCK_thd_remove: release it in threadpool_remove_connection, change
timeout_check in threadpool_unix.cc to take LOCK_thd_remove instead of
LOCK_thread_count.

Add testases for fixed-in-upstream
http://bugs.mysql.com/bug.php?id=72665,
http://bugs.mysql.com/bug.php?id=71585 (bug 1278072), and
http://bugs.mysql.com/bug.php?id=71858 (bug 1286186).

Re-order error messages in errmsg-utf8.txt to keep the upstream error
numbering intact, re-record affected testcases.

Imported man pages from mysql-5.5.39.tar.gz.

    http://jenkins.percona.com/job/percona-server-5.5-param/1037/

[Alexey Kopytov (akopytov)]

- what’s wrong with Oracle’s fix for bug 1277351 /
http://bugs.mysql.com/bug.php?id=71603

- I don’t see any revisions with fixes for
  http://bugs.mysql.com/bug.php?id=72665 (what is it anyway?),
  http://bugs.mysql.com/bug.php?id=71585 (bug 1278072), and
  http://bugs.mysql.com/bug.php?id=71858 (bug 1286186)?

- I don’t see any changes to errmsg-utf8.txt, nor any changes in .result
  files that might be relevant to “re-record affected testcases”?

review: Needs Information

[Laurynas Biveinis (laurynas-biveinis)]

> - what’s wrong with Oracle’s fix for bug 1277351 /
> http://bugs.mysql.com/bug.php?id=71603

Nothing is wrong with that fix, it's just that this bug is part of the MDEV-382 bug batch. The other fixes of MDEV-382 are not reverted in 5.5 at the moment, and in general it is easiest to revert the whole batch at the same time, separate from other work such as merges. But this particular bug fix happens to be local enough to be reverted with the merge, if you want me to.

> - I don’t see any revisions with fixes for
> http://bugs.mysql.com/bug.php?id=72665 (what is it anyway?),
> http://bugs.mysql.com/bug.php?id=71585 (bug 1278072), and
> http://bugs.mysql.com/bug.php?id=71858 (bug 1286186)?

72665 fix is lp:mysql-server/5.5 commit 4666. The other two have been fixed in a release before, 5.5.38, but I missed the fact at the time. I don't have their revisions handy, can dig up if needed.

72665 is

CREATE TABLE t1(c42 tinyblob not null, c45 TEXT, unique(c42 (255)), unique(c45 (255))) ENGINE=innodb;

ALTER TABLE t1 MODIFY c45 SET('') NOT NULL;

DROP TABLE t1;

140516 9:19:16 InnoDB: Assertion failure in thread 4608106496 in file ha_innodb.cc line 7215
InnoDB: Failing assertion: primary_key_no == -1 || primary_key_no == 0

> - I don’t see any changes to errmsg-utf8.txt, nor any changes in .result
> files that might be relevant to “re-record affected testcases”?

I mixed up the commit messages, this bit should have gone to the 5.6.20 merge one.

[Alexey Kopytov (akopytov)]

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

Repushed the branch to fix the commit message (errmsg-utf8.txt bit).

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-03 13:14:25 +0000
+++ CMakeLists.txt	2014-08-22 10:00:31 +0000
@@ -25,6 +25,14 @@
  CMAKE_POLICY(SET CMP0022 OLD)
 ENDIF()
 
+# We use the LOCATION target property (CMP0026)
+# and get_target_property() for non-existent targets (CMP0045)
+IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
+   CMAKE_VERSION VERSION_GREATER "3.0.0")
+ CMAKE_POLICY(SET CMP0026 OLD)
+ CMAKE_POLICY(SET CMP0045 OLD)
+ENDIF()
+
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
@@ -434,7 +442,6 @@
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
-  ADD_SUBDIRECTORY(packaging/rpm-uln)
   ADD_SUBDIRECTORY(packaging/rpm-oel)
 ENDIF()
 
 
=== modified file 'VERSION'
--- VERSION	2014-06-11 13:42:04 +0000
+++ VERSION	2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=38
-MYSQL_VERSION_EXTRA=-35.2
+MYSQL_VERSION_PATCH=39
+MYSQL_VERSION_EXTRA=-36.0
 
=== modified file 'client/mysqladmin.cc'
--- client/mysqladmin.cc	2013-03-19 14:53:48 +0000
+++ client/mysqladmin.cc	2014-08-22 10:00:31 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -71,6 +71,7 @@
                                   char *argument);
 static my_bool sql_connect(MYSQL *mysql, uint wait);
 static int execute_commands(MYSQL *mysql,int argc, char **argv);
+static char **mask_password(int argc, char ***argv);
 static int drop_db(MYSQL *mysql,const char *db);
 extern "C" sig_handler endprog(int signal_number);
 static void nice_time(ulong sec,char *buff);
@@ -304,9 +305,9 @@
 
 int main(int argc,char *argv[])
 {
-  int error= 0, ho_error;
+  int error= 0, ho_error, temp_argc;
   MYSQL mysql;
-  char **commands, **save_argv;
+  char **commands, **save_argv, **temp_argv;
 
   MY_INIT(argv[0]);
   mysql_init(&mysql);
@@ -318,6 +319,9 @@
     free_defaults(save_argv);
     exit(ho_error);
   }
+  temp_argv= mask_password(argc, &argv);
+  temp_argc= argc;
+
   if (debug_info_flag)
     my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO;
   if (debug_check_flag)
@@ -328,7 +332,7 @@
     usage();
     exit(1);
   }
-  commands = argv;
+  commands = temp_argv;
   if (tty_password)
     opt_password = get_tty_password(NullS);
 
@@ -476,6 +480,13 @@
   my_free(shared_memory_base_name);
 #endif
   free_defaults(save_argv);
+  temp_argc--;
+  while(temp_argc >= 0)
+  {
+    my_free(temp_argv[temp_argc]);
+    temp_argc--;
+  }
+  my_free(temp_argv);
   my_end(my_end_arg);
   exit(error ? 1 : 0);
   return 0;
@@ -1089,6 +1100,47 @@
   return 0;
 }
 
+/**
+   @brief Masking the password if it is passed as command line argument.
+
+   @details It works in Linux and changes cmdline in ps and /proc/pid/cmdline,
+            but it won't work for history file of shell.
+            The command line arguments are copied to another array and the
+            password in the argv is masked. This function is called just after
+            "handle_options" because in "handle_options", the agrv pointers
+            are altered which makes freeing of dynamically allocated memory
+            difficult. The password masking is done before all other operations
+            in order to minimise the time frame of password visibility via cmdline.
+
+   @param argc            command line options (count)
+   @param argv            command line options (values)
+
+   @return temp_argv      copy of argv
+*/
+
+static char **mask_password(int argc, char ***argv)
+{
+  char **temp_argv;
+  temp_argv= (char **)(my_malloc(sizeof(char *) * argc, MYF(MY_WME)));
+  argc--;
+  while (argc > 0)
+  {
+    temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
+    if (find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_PASSWORD ||
+        find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_OLD_PASSWORD)
+    {
+      char *start= (*argv)[argc];
+      while (*start)
+        *start++= 'x';
+      start= (*argv)[argc];
+      if (*start)
+        start[1]= 0;                         /* Cut length of argument */
+     }
+    argc--;
+  }
+  temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
+  return(temp_argv);
+}
 
 static void print_version(void)
 {
 
=== modified file 'client/mysqldump.c'
--- client/mysqldump.c	2013-12-16 08:19:34 +0000
+++ client/mysqldump.c	2014-08-22 10:00:31 +0000
@@ -5991,19 +5991,36 @@
       dump_all_tablespaces();
     dump_all_databases();
   }
-  else if (argc > 1 && !opt_databases)
-  {
-    /* Only one database and selected table(s) */
-    if (!opt_alltspcs && !opt_notspcs)
-      dump_tablespaces_for_tables(*argv, (argv + 1), (argc -1));
-    dump_selected_tables(*argv, (argv + 1), (argc - 1));
-  }
   else
   {
-    /* One or more databases, all tables */
-    if (!opt_alltspcs && !opt_notspcs)
-      dump_tablespaces_for_databases(argv);
-    dump_databases(argv);
+    // Check all arguments meet length condition. Currently database and table
+    // names are limited to NAME_LEN bytes and stack-based buffers assumes
+    // that escaped name will be not longer than NAME_LEN*2 + 2 bytes long.
+    int argument;
+    for (argument= 0; argument < argc; argument++)
+    {
+      size_t argument_length= strlen(argv[argument]);
+      if (argument_length > NAME_LEN)
+      {
+        die(EX_CONSCHECK, "[ERROR] Argument '%s' is too long, it cannot be "
+          "name for any table or database.\n", argv[argument]);
+      }
+    }
+
+    if (argc > 1 && !opt_databases)
+    {
+      /* Only one database and selected table(s) */
+      if (!opt_alltspcs && !opt_notspcs)
+        dump_tablespaces_for_tables(*argv, (argv + 1), (argc - 1));
+      dump_selected_tables(*argv, (argv + 1), (argc - 1));
+    }
+    else
+    {
+      /* One or more databases, all tables */
+      if (!opt_alltspcs && !opt_notspcs)
+        dump_tablespaces_for_databases(argv);
+      dump_databases(argv);
+    }
   }
 
   /* if --dump-slave , start the slave sql thread */
 
=== modified file 'cmake/dtrace.cmake'
--- cmake/dtrace.cmake	2013-08-02 09:40:55 +0000
+++ cmake/dtrace.cmake	2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -75,13 +75,6 @@
    ${CMAKE_BINARY_DIR}/include/probes_mysql_dtrace.h
    ${CMAKE_BINARY_DIR}/include/probes_mysql_nodtrace.h
   )
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-   # Systemtap object
-   EXECUTE_PROCESS(
-     COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
-     -o ${CMAKE_BINARY_DIR}/probes_mysql.o
-   )
-  ENDIF()
   ADD_CUSTOM_TARGET(gen_dtrace_header
   DEPENDS  
   ${CMAKE_BINARY_DIR}/include/probes_mysql.d
@@ -100,12 +93,7 @@
   IF(ENABLE_DTRACE)
     ADD_DEPENDENCIES(${target} gen_dtrace_header)
 
-    IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-      TARGET_LINK_LIBRARIES(${target}  ${CMAKE_BINARY_DIR}/probes_mysql.o)
-    ENDIF()
-
-    # On Solaris, invoke dtrace -G to generate object file and
-    # link it together with target.
+    # Invoke dtrace to generate object file and link it together with target.
     IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
       SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir)
       SET(outfile ${objdir}/${target}_dtrace.o)
@@ -122,6 +110,21 @@
           -P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
         WORKING_DIRECTORY ${objdir}
       )
+    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+      # dtrace on Linux runs gcc and uses flags from environment
+      SET(CFLAGS_SAVED $ENV{CFLAGS})
+      SET(ENV{CFLAGS} ${CMAKE_C_FLAGS})
+      SET(outfile "${CMAKE_BINARY_DIR}/probes_mysql.o")
+      # Systemtap object
+      EXECUTE_PROCESS(
+        COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
+        -o ${outfile}
+        )
+      SET(ENV{CFLAGS} ${CFLAGS_SAVED})
+    ENDIF()
+
+    # Do not try to extend the library if we have not built the .o file
+    IF(outfile)
       # Add full  object path to linker flags
       GET_TARGET_PROPERTY(target_type ${target} TYPE)
       IF(NOT target_type MATCHES "STATIC")
@@ -133,12 +136,12 @@
         # but maybe one day this will be fixed.
         GET_TARGET_PROPERTY(target_location ${target} LOCATION)
         ADD_CUSTOM_COMMAND(
-         TARGET ${target} POST_BUILD
-         COMMAND ${CMAKE_AR} r  ${target_location} ${outfile}
-	 COMMAND ${CMAKE_RANLIB} ${target_location}
-        )
-       # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
-       SET(TARGET_OBJECT_DIRECTORY_${target}  ${objdir} CACHE INTERNAL "")
+          TARGET ${target} POST_BUILD
+          COMMAND ${CMAKE_AR} r  ${target_location} ${outfile}
+	  COMMAND ${CMAKE_RANLIB} ${target_location}
+          )
+        # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
+        SET(TARGET_OBJECT_DIRECTORY_${target}  ${objdir} CACHE INTERNAL "")
       ENDIF()
     ENDIF()
   ENDIF()
 
=== modified file 'cmake/install_macros.cmake'
--- cmake/install_macros.cmake	2014-01-23 08:02:47 +0000
+++ cmake/install_macros.cmake	2014-08-22 10:00:31 +0000
@@ -21,26 +21,35 @@
     GET_TARGET_PROPERTY(location ${target} LOCATION)
     GET_TARGET_PROPERTY(type ${target} TYPE)
     IF(NOT INSTALL_LOCATION)
-      IF(type MATCHES "STATIC_LIBRARY" OR type MATCHES "MODULE_LIBRARY" OR type MATCHES "SHARED_LIBRARY")
+      IF(type MATCHES "STATIC_LIBRARY"
+          OR type MATCHES "MODULE_LIBRARY"
+          OR type MATCHES "SHARED_LIBRARY")
         SET(INSTALL_LOCATION "lib")
       ELSEIF(type MATCHES "EXECUTABLE")
         SET(INSTALL_LOCATION "bin")
       ELSE()
-        MESSAGE(FATAL_ERROR "cannot determine type of ${target}. Don't now where to install")
+        MESSAGE(FATAL_ERROR
+          "cannot determine type of ${target}. Don't now where to install")
      ENDIF()
     ENDIF()
     STRING(REPLACE ".exe" ".pdb" pdb_location ${location})
     STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
     STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})
     IF(CMAKE_GENERATOR MATCHES "Visual Studio")
-      STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location})
+      STRING(REPLACE
+        "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
+        pdb_location ${pdb_location})
     ENDIF()
     IF(target STREQUAL "mysqld")
 	  SET(comp Server)
     ELSE()
       SET(comp Debuginfo)
     ENDIF()	  
-    INSTALL(FILES ${pdb_location} DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
+    # No .pdb file for static libraries.
+    IF(NOT type MATCHES "STATIC_LIBRARY")
+      INSTALL(FILES ${pdb_location}
+        DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
+    ENDIF()
   ENDFOREACH()
   ENDIF()
 ENDMACRO()
 
=== modified file 'cmake/os/Windows.cmake'
--- cmake/os/Windows.cmake	2011-06-30 15:46:53 +0000
+++ cmake/os/Windows.cmake	2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -62,22 +62,30 @@
 ENDIF()
 
 IF(MSVC)
-  # Enable debug info also in Release build, and create PDB to be able to analyze 
-  # crashes
+  # Enable debug info also in Release build,
+  # and create PDB to be able to analyze crashes.
+  FOREACH(type EXE SHARED MODULE)
+   SET(CMAKE_{type}_LINKER_FLAGS_RELEASE
+     "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
+  ENDFOREACH()
+  
+  # Force static runtime libraries
+  # - Choose debugging information:
+  #     /Z7
+  #     Produces an .obj file containing full symbolic debugging
+  #     information for use with the debugger. The symbolic debugging
+  #     information includes the names and types of variables, as well as
+  #     functions and line numbers. No .pdb file is produced by the compiler.
   FOREACH(lang C CXX)
-    SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Zi")
-  ENDFOREACH()
-  FOREACH(type EXE SHARED MODULE)
-   SET(CMAKE_{type}_LINKER_FLAGS_RELEASE "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
-  ENDFOREACH()
-  
-  # Force static runtime libraries
+    SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Z7")
+  ENDFOREACH()
   FOREACH(flag 
-   CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO 
-   CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT 
+   CMAKE_C_FLAGS_RELEASE    CMAKE_C_FLAGS_RELWITHDEBINFO 
+   CMAKE_C_FLAGS_DEBUG      CMAKE_C_FLAGS_DEBUG_INIT 
    CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
-   CMAKE_CXX_FLAGS_DEBUG  CMAKE_CXX_FLAGS_DEBUG_INIT)
+   CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT)
    STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
+   STRING(REPLACE "/Zi"  "/Z7" "${flag}" "${${flag}}")
   ENDFOREACH()
   
   # Remove support for exceptions
@@ -107,7 +115,6 @@
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /we4099")
 
-
   IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
     # _WIN64 is defined by the compiler itself. 
     # Yet, we define it here again   to work around a bug with  Intellisense 
 
=== modified file 'extra/yassl/CMakeLists.txt'
--- extra/yassl/CMakeLists.txt	2014-01-06 05:22:35 +0000
+++ extra/yassl/CMakeLists.txt	2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,7 +37,6 @@
 ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(yassl)
 
-INSTALL_DEBUG_SYMBOLS(yassl)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 
=== modified file 'extra/yassl/src/ssl.cpp'
--- extra/yassl/src/ssl.cpp	2013-02-26 05:35:17 +0000
+++ extra/yassl/src/ssl.cpp	2014-08-22 10:00:31 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -790,7 +790,10 @@
             strncpy(name, path, MAX_PATH - 1 - HALF_PATH);
             strncat(name, "/", 1);
             strncat(name, entry->d_name, HALF_PATH);
-            if (stat(name, &buf) < 0) return SSL_BAD_STAT;
+            if (stat(name, &buf) < 0) {
+                closedir(dir);
+                return SSL_BAD_STAT;
+            }
      
             if (S_ISREG(buf.st_mode))
                 ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);
 
=== modified file 'extra/yassl/taocrypt/CMakeLists.txt'
--- extra/yassl/taocrypt/CMakeLists.txt	2014-01-06 05:22:35 +0000
+++ extra/yassl/taocrypt/CMakeLists.txt	2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,7 +36,6 @@
 ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(taocrypt)
 
-INSTALL_DEBUG_SYMBOLS(taocrypt)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 
=== modified file 'extra/yassl/taocrypt/include/asn.hpp'
--- extra/yassl/taocrypt/include/asn.hpp	2013-02-26 05:35:17 +0000
+++ extra/yassl/taocrypt/include/asn.hpp	2014-08-22 10:00:31 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -294,9 +294,9 @@
     byte*     signature_;
     char      issuer_[ASN_NAME_MAX];    // Names
     char      subject_[ASN_NAME_MAX];   // Names
-    char      beforeDate_[MAX_DATE_SZ]; // valid before date
-    char      afterDate_[MAX_DATE_SZ];  // valid after date
-    bool      verify_;                  // Default to yes, but could be off
+    char      beforeDate_[MAX_DATE_SZ+1]; // valid before date, +null term
+    char      afterDate_[MAX_DATE_SZ+1];  // valid after date, +null term
+    bool      verify_;                    // Default to yes, but could be off
 
     void   ReadHeader();
     void   Decode(SignerList*, CertType);
 
=== modified file 'include/mysql/thread_pool_priv.h'
--- include/mysql/thread_pool_priv.h	2013-02-26 05:35:17 +0000
+++ include/mysql/thread_pool_priv.h	2014-08-22 10:00:31 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -49,6 +49,8 @@
 void thd_set_thread_stack(THD *thd, char *stack_start);
 void thd_lock_thread_count(THD *thd);
 void thd_unlock_thread_count(THD *thd);
+void thd_lock_thread_remove(THD *thd);
+void thd_unlock_thread_remove(THD *thd);
 void thd_close_connection(THD *thd);
 THD *thd_get_current_thd();
 void thd_new_connection_setup(THD *thd, char *stack_start);
 
=== modified file 'libmysql/CMakeLists.txt'
--- libmysql/CMakeLists.txt	2014-03-27 15:42:21 +0000
+++ libmysql/CMakeLists.txt	2014-08-22 10:00:31 +0000
@@ -168,7 +168,6 @@
 MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
 
 # Visual Studio users need debug  static library for debug projects
-INSTALL_DEBUG_SYMBOLS(clientlib)
 IF(MSVC)
  INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug)
  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
 
=== modified file 'libmysql/authentication_win/CMakeLists.txt'
--- libmysql/authentication_win/CMakeLists.txt	2014-01-06 05:22:35 +0000
+++ libmysql/authentication_win/CMakeLists.txt	2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@
 
 SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
 
-INSTALL_DEBUG_SYMBOLS(auth_win_client)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 
=== modified file 'man/comp_err.1'
--- man/comp_err.1	2014-06-03 13:14:25 +0000
+++ man/comp_err.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBcomp_err\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/innochecksum.1'
--- man/innochecksum.1	2014-06-03 13:14:25 +0000
+++ man/innochecksum.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBinnochecksum\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/msql2mysql.1'
--- man/msql2mysql.1	2014-06-03 13:14:25 +0000
+++ man/msql2mysql.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmsql2mysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/my_print_defaults.1'
--- man/my_print_defaults.1	2014-06-03 13:14:25 +0000
+++ man/my_print_defaults.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmy_print_defaults\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/myisam_ftdump.1'
--- man/myisam_ftdump.1	2014-06-03 13:14:25 +0000
+++ man/myisam_ftdump.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisam_ftdump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/myisamchk.1'
--- man/myisamchk.1	2014-06-03 13:14:25 +0000
+++ man/myisamchk.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisamchk\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -250,7 +250,7 @@
 supports the following options, which can be specified on the command line or in the
 [myisamchk]
 group of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .SH "MYISAMCHK GENERAL OPTIONS"
 .\" options: myisamchk
 .\" myisamchk: options
 
=== modified file 'man/myisamlog.1'
--- man/myisamlog.1	2014-06-03 13:14:25 +0000
+++ man/myisamlog.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisamlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/myisampack.1'
--- man/myisampack.1	2014-06-03 13:14:25 +0000
+++ man/myisampack.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisampack\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -122,7 +122,7 @@
 .PP
 \fBmyisampack\fR
 supports the following options\&. It also reads option files and supports the options for processing them described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+Section\ \&4.2.7, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysql-stress-test.pl.1'
--- man/mysql-stress-test.pl.1	2014-06-03 13:14:25 +0000
+++ man/mysql-stress-test.pl.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-stress-test.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/06/2014
+.\"      Date: 07/04/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "05/06/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "07/04/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql-test-run.pl.1'
--- man/mysql-test-run.pl.1	2014-06-03 13:14:25 +0000
+++ man/mysql-test-run.pl.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-test-run.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/06/2014
+.\"      Date: 07/04/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-TEST\-RUN\" "1" "05/06/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-TEST\-RUN\" "1" "07/04/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql.1'
--- man/mysql.1	2014-06-03 13:14:25 +0000
+++ man/mysql.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -122,7 +122,7 @@
 and
 [client]
 groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -158,11 +158,32 @@
 \fBmysql\fR
 to start faster, but you must issue the
 rehash
-command if you want to use name completion\&.
+command or its
+\e#
+shortcut if you want to use name completion\&.
 .sp
 To complete a name, enter the first part and press Tab\&. If the name is unambiguous,
 \fBmysql\fR
 completes it\&. Otherwise, you can press Tab again to see the possible names that begin with what you have typed so far\&. Completion does not occur if there is no default database\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+This feature requires a MySQL client that is compiled with the
+\fBreadline\fR
+library\&. Typically, the
+\fBreadline\fR
+library is not available on Windows\&.
+.sp .5v
+.RE
 .RE
 .sp
 .RS 4
@@ -550,7 +571,7 @@
 .sp
 Execute the statement and quit\&. The default output format is like that produced with
 \fB\-\-batch\fR\&. See
-Section\ \&4.2.3.1, \(lqUsing Options on the Command Line\(rq, for some examples\&. With this option,
+Section\ \&4.2.4, \(lqUsing Options on the Command Line\(rq, for some examples\&. With this option,
 \fBmysql\fR
 does not use the history file\&.
 .RE
@@ -718,7 +739,7 @@
 \fB\-A\fR
 .sp
 This has the same effect as
-\fB\-skip\-auto\-rehash\fR\&. See the description for
+\fB\-\-skip\-auto\-rehash\fR\&. See the description for
 \fB\-\-auto\-rehash\fR\&.
 .RE
 .sp
@@ -1793,8 +1814,8 @@
 \(lq;\(rq, instances of that character are sent to the server without interpretation\&. However, the server itself still interprets
 \(lq;\(rq
 as a statement delimiter and processes statements accordingly\&. This behavior on the server side comes into play for multiple\-statement execution (see
-Section\ \&22.8.17, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
-Section\ \&19.1, \(lqDefining Stored Programs\(rq)\&.
+Section\ \&23.8.17, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
+Section\ \&20.1, \(lqDefining Stored Programs\(rq)\&.
 .RE
 .sp
 .RS 4
@@ -1925,7 +1946,7 @@
 nowarning,
 \ew
 .sp
-Enable display of warnings after each statement\&.
+Disable display of warnings after each statement\&.
 .RE
 .sp
 .RS 4
@@ -2606,7 +2627,7 @@
 In this example, note that the backslashes are doubled\&. If you set the prompt using the
 prompt
 option in an option file, it is advisable to double the backslashes when using the special prompt options\&. There is some overlap in the set of permissible prompt options and the set of special escape sequences that are recognized in option files\&. (The rules for escape sequences in option files are listed in
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.) The overlap may cause you problems if you use single backslashes\&. For example,
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.) The overlap may cause you problems if you use single backslashes\&. For example,
 \es
 is interpreted as a space rather than as the current seconds value\&. The following example shows how to define a prompt within an option file to include the current time in
 HH:MM:SS>
@@ -2918,7 +2939,7 @@
 .RE
 .\}
 .PP
-The search string can contain the the wildcard characters
+The search string can contain the wildcard characters
 \(lq%\(rq
 and
 \(lq_\(rq\&. These have the same meaning as for pattern\-matching operations performed with the
@@ -3313,7 +3334,7 @@
 option\&.
 .PP
 For more information about auto\-reconnect and its effect on state information when a reconnection occurs, see
-Section\ \&22.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.
+Section\ \&23.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
 
=== modified file 'man/mysql.server.1'
--- man/mysql.server.1	2014-06-03 13:14:25 +0000
+++ man/mysql.server.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql.server\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_client_test.1'
--- man/mysql_client_test.1	2014-06-03 13:14:25 +0000
+++ man/mysql_client_test.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_client_test\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/06/2014
+.\"      Date: 07/04/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CLIENT_TEST" "1" "05/06/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL_CLIENT_TEST" "1" "07/04/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_config.1'
--- man/mysql_config.1	2014-06-03 13:14:25 +0000
+++ man/mysql_config.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_convert_table_format.1'
--- man/mysql_convert_table_format.1	2014-06-03 13:14:25 +0000
+++ man/mysql_convert_table_format.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_convert_table_format\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONVERT_TAB" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_CONVERT_TAB" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_find_rows.1'
--- man/mysql_find_rows.1	2014-06-03 13:14:25 +0000
+++ man/mysql_find_rows.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_find_rows\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIND_ROWS\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_FIND_ROWS\F" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_fix_extensions.1'
--- man/mysql_fix_extensions.1	2014-06-03 13:14:25 +0000
+++ man/mysql_fix_extensions.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_fix_extensions\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_EXTENSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_FIX_EXTENSI" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_install_db.1'
--- man/mysql_install_db.1	2014-06-03 13:14:25 +0000
+++ man/mysql_install_db.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_install_db\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_INSTALL_DB\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_INSTALL_DB\" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -121,7 +121,7 @@
 [mysqld]
 group\&.) Other options are passed to
 \fBmysqld\fR\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysql_plugin.1'
--- man/mysql_plugin.1	2014-06-03 13:14:25 +0000
+++ man/mysql_plugin.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_plugin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_PLUGIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_PLUGIN\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -164,7 +164,7 @@
 \fB\-\-datadir\fR, and
 \fB\-\-plugin\-dir\fR
 options and ignores others\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysql_secure_installation.1'
--- man/mysql_secure_installation.1	2014-06-03 13:14:25 +0000
+++ man/mysql_secure_installation.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_secure_installation\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SECURE_INST" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_SECURE_INST" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_setpermission.1'
--- man/mysql_setpermission.1	2014-06-03 13:14:25 +0000
+++ man/mysql_setpermission.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_setpermission\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SETPERMISSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_SETPERMISSI" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_tzinfo_to_sql.1'
--- man/mysql_tzinfo_to_sql.1	2014-06-03 13:14:25 +0000
+++ man/mysql_tzinfo_to_sql.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_tzinfo_to_sql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_TZINFO_TO_S" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_TZINFO_TO_S" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_upgrade.1'
--- man/mysql_upgrade.1	2014-06-03 13:14:25 +0000
+++ man/mysql_upgrade.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_upgrade\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_UPGRADE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_UPGRADE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -115,9 +115,11 @@
 .RS 4
 .\}
 .nf
-mysqlcheck \-\-all\-databases \-\-check\-upgrade \-\-auto\-repair
-mysql < \fIfix_priv_tables\fR
-mysqlcheck \-\-all\-databases \-\-check\-upgrade \-\-fix\-db\-names \-\-fix\-table\-names
+mysqlcheck \-\-no\-defaults \-\-all\-databases
+ \-\-fix\-db\-names \-\-fix\-table\-names
+mysqlcheck \-\-no\-defaults \-\-check\-upgrade \-\-all\-databases
+ \-\-auto\-repair
+mysql < fix_priv_tables
 .fi
 .if n \{\
 .RE
@@ -133,6 +135,28 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+\fBmysql_upgrade\fR
+also adds
+\fB\-\-write\-binlog\fR
+or
+\fB\-\-skip\-write\-binlog\fR
+to the
+\fBmysqlcheck\fR
+commands, depending on whether the
+\fB\-\-write\-binlog\fR
+option was specified on the
+\fBmysql_upgrade\fR
+command\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 Because
 \fBmysql_upgrade\fR
 invokes
@@ -208,7 +232,7 @@
 \fBmysqlcheck\fR\&. For example, it might be necessary to specify the
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR
 option\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysql_waitpid.1'
--- man/mysql_waitpid.1	2014-06-03 13:14:25 +0000
+++ man/mysql_waitpid.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_waitpid\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_WAITPID\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_WAITPID\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_zap.1'
--- man/mysql_zap.1	2014-06-03 13:14:25 +0000
+++ man/mysql_zap.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_zap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_ZAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_ZAP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqlaccess.1'
--- man/mysqlaccess.1	2014-06-03 13:14:25 +0000
+++ man/mysqlaccess.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlaccess\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLACCESS\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLACCESS\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqladmin.1'
--- man/mysqladmin.1	2014-06-03 13:14:25 +0000
+++ man/mysqladmin.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqladmin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLADMIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLADMIN\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -84,7 +84,7 @@
 Tell the server to write debug information to the error log\&. Format and content of this information is subject to change\&.
 .sp
 This includes information about the Event Scheduler\&. See
-Section\ \&19.4.5, \(lqEvent Scheduler Status\(rq\&.
+Section\ \&20.4.5, \(lqEvent Scheduler Status\(rq\&.
 .RE
 .sp
 .RS 4
@@ -610,7 +610,7 @@
 and
 [client]
 groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysqlbinlog.1'
--- man/mysqlbinlog.1	2014-06-03 13:14:25 +0000
+++ man/mysqlbinlog.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlbinlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBINLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLBINLOG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -43,7 +43,7 @@
 \fBmysqlbinlog\fR
 to display the contents of relay log files written by a slave server in a replication setup because relay logs have the same format as binary logs\&. The binary log and relay log are discussed further in
 Section\ \&5.2.4, \(lqThe Binary Log\(rq, and
-Section\ \&16.2.2, \(lqReplication Relay and Status Logs\(rq\&.
+Section\ \&17.2.2, \(lqReplication Relay and Status Logs\(rq\&.
 .PP
 Invoke
 \fBmysqlbinlog\fR
@@ -74,7 +74,7 @@
 .PP
 The output includes events contained in
 binlog\&.000003\&. For statement\-based logging, event information includes the SQL statement, the ID of the server on which it was executed, the timestamp when the statement was executed, how much time it took, and so forth\&. For row\-based logging, the event indicates a row change rather than an SQL statement\&. See
-Section\ \&16.1.2, \(lqReplication Formats\(rq, for information about logging modes\&.
+Section\ \&17.1.2, \(lqReplication Formats\(rq, for information about logging modes\&.
 .PP
 Events are preceded by header comments that provide additional information\&. For example:
 .sp
@@ -92,7 +92,7 @@
 .PP
 In the first line, the number following
 at
-indicates the starting position of the event in the binary log file\&.
+indicates the file offset, or starting position, of the event in the binary log file\&.
 .PP
 The second line starts with a date and time indicating when the statement started on the server where the event originated\&. For replication, this timestamp is propagated to slave servers\&.
 server id
@@ -107,6 +107,39 @@
 is the time spent executing the event, on a master server\&. On a slave, it is the difference of the end execution time on the slave minus the beginning execution time on the master\&. The difference serves as an indicator of how much replication lags behind the master\&.
 error_code
 indicates the result from executing the event\&. Zero means that no error occurred\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+When using event groups, the file offsets of all events are grouped together and the comments of all events are grouped together\&. For example:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+# at 587
+# at 630
+# at 5662
+#140627 13:16:52 server id 1  end_log_pos 630     Table_map: `test`\&.`t1` mapped to number 41
+#140627 13:16:52 server id 1  end_log_pos 5662     Write_rows: table id 41
+#140627 13:16:52 server id 1  end_log_pos 10694     Write_rows: table id 41 flags: STMT_END_F
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+The three file offsets do not represent blank events\&.
+.sp .5v
+.RE
 .PP
 The output from
 \fBmysqlbinlog\fR
@@ -134,7 +167,7 @@
 and
 [client]
 groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysqlbug.1'
--- man/mysqlbug.1	2014-06-03 13:14:25 +0000
+++ man/mysqlbug.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlbug\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBUG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLBUG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqlcheck.1'
--- man/mysqlcheck.1	2014-06-03 13:14:25 +0000
+++ man/mysqlcheck.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlcheck\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLCHECK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLCHECK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -205,7 +205,7 @@
 and
 [client]
 groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -238,7 +238,13 @@
 .sp
 Check all tables in all databases\&. This is the same as using the
 \fB\-\-databases\fR
-option and naming all the databases on the command line\&.
+option and naming all the databases on the command line, except that the
+INFORMATION_SCHEMA
+and
+performace_schema
+databases are not dumped\&. They can be dumped by explicitly naming them with the
+\fB\-\-databases\fR
+option\&.
 .RE
 .sp
 .RS 4
@@ -410,6 +416,15 @@
 Process all tables in the named databases\&. Normally,
 \fBmysqlcheck\fR
 treats the first name argument on the command line as a database name and following names as table names\&. With this option, it treats all name arguments as database names\&.
+.sp
+This option may be used to dump the
+INFORMATION_SCHEMA
+and
+performace_schema
+databases, which normally are not dumped even with
+\fB\-\-all\-databases\fR\&. option\&. (Also use the
+\fB\-\-skip\-lock\-tables\fR
+option\&.)
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysqld.8'
--- man/mysqld.8	2014-06-03 13:14:25 +0000
+++ man/mysqld.8	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqld_multi.1'
--- man/mysqld_multi.1	2014-06-03 13:14:25 +0000
+++ man/mysqld_multi.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_multi\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -701,7 +701,7 @@
 .\}
 .PP
 See
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
 
=== modified file 'man/mysqld_safe.1'
--- man/mysqld_safe.1	2014-06-03 13:14:25 +0000
+++ man/mysqld_safe.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_safe\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_SAFE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD_SAFE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -70,7 +70,7 @@
 if they are specified on the command line, but ignored if they are specified in the
 [mysqld_safe]
 group of an option file\&. See
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .PP
 \fBmysqld_safe\fR
 reads all options from the
@@ -106,7 +106,7 @@
 .PP
 \fBmysqld_safe\fR
 supports the following options\&. It also reads option files and supports the options for processing them described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+Section\ \&4.2.7, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysqldump.1'
--- man/mysqldump.1	2014-06-03 13:14:25 +0000
+++ man/mysqldump.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqldump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLDUMP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -104,7 +104,7 @@
 backups with minimal disruption; it can also back up tables from
 MyISAM
 and other storage engines; and it provides a number of convenient options to accommodate different backup scenarios\&. See
-Section\ \&24.2, \(lqMySQL Enterprise Backup\(rq\&.
+Section\ \&25.2, \(lqMySQL Enterprise Backup\(rq\&.
 .RE
 .sp
 .RS 4
@@ -175,12 +175,12 @@
 \fBmysqldump\fR
 does not dump the
 INFORMATION_SCHEMA
-database by default\&.
-\fBmysqldump\fR
-dumps
-INFORMATION_SCHEMA
-only if you name it explicitly on the command line, although currently you must also use the
+or
+performance_schema
+database by default\&. To dump either of these, name it explicitly on the command line and also use the
 \fB\-\-skip\-lock\-tables\fR
+option\&. You can also name them with the
+\fB\-\-databases\fR
 option\&. Before MySQL 5\&.5
 \fBmysqldump\fR
 silently ignores
@@ -344,7 +344,7 @@
 and
 [client]
 groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -2641,7 +2641,7 @@
 .\" mysqldump: workarounds
 .PP
 If you encounter problems backing up views, please read the section that covers restrictions on views which describes a workaround for backing up views when this fails due to insufficient privileges\&. See
-Section\ \&E.5, \(lqRestrictions on Views\(rq\&.
+Section\ \&D.5, \(lqRestrictions on Views\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
 
=== modified file 'man/mysqldumpslow.1'
--- man/mysqldumpslow.1	2014-06-03 13:14:25 +0000
+++ man/mysqldumpslow.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqldumpslow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMPSLOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLDUMPSLOW\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqlhotcopy.1'
--- man/mysqlhotcopy.1	2014-06-03 13:14:25 +0000
+++ man/mysqlhotcopy.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlhotcopy\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLHOTCOPY\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLHOTCOPY\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -114,7 +114,7 @@
 and
 [client]
 groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysqlimport.1'
--- man/mysqlimport.1	2014-06-03 13:14:25 +0000
+++ man/mysqlimport.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlimport\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -79,7 +79,7 @@
 and
 [client]
 groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysqlshow.1'
--- man/mysqlshow.1	2014-06-03 13:14:25 +0000
+++ man/mysqlshow.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlshow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSHOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLSHOW\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -126,7 +126,7 @@
 and
 [client]
 groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysqlslap.1'
--- man/mysqlslap.1	2014-06-03 13:14:25 +0000
+++ man/mysqlslap.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlslap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSLAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLSLAP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -163,7 +163,7 @@
 and
 [client]
 groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
 
=== modified file 'man/mysqltest.1'
--- man/mysqltest.1	2014-06-03 13:14:25 +0000
+++ man/mysqltest.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqltest\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/06/2014
+.\"      Date: 07/04/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQLTEST\FR" "1" "05/06/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQLTEST\FR" "1" "07/04/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb-common-options.1'
--- man/ndb-common-options.1	2014-06-03 13:14:25 +0000
+++ man/ndb-common-options.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: Options Common to MySQL Cluster Programs
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "OPTIONS COMMON TO MY" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "OPTIONS COMMON TO MY" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -97,7 +97,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
@@ -217,10 +217,10 @@
 .sp 1
 .PP
 For options specific to individual MySQL Cluster programs, see
-Section\ \&17.4, \(lqMySQL Cluster Programs\(rq\&.
+Section\ \&18.4, \(lqMySQL Cluster Programs\(rq\&.
 .PP
 See
-Section\ \&17.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for
+Section\ \&18.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for
 \fBmysqld\fR
 options relating to MySQL Cluster\&.
 .sp
@@ -371,7 +371,7 @@
 .\}
 .sp
 For more information, see
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq\&.
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq\&.
 .RE
 .sp
 .RS 4
@@ -559,7 +559,7 @@
 .sp 1
 Sets this node\*(Aqs MySQL Cluster node ID\&.
 \fIThe range of permitted values depends on the node\*(Aqs type (data, management, or API) and the MySQL Cluster software version\fR\&. See
-Section\ \&17.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.
+Section\ \&18.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.
 .RE
 .sp
 .RS 4
@@ -634,7 +634,7 @@
 Prints the MySQL Cluster version number of the executable\&. The version number is relevant because not all versions can be used together, and the MySQL Cluster startup process verifies that the versions of the binaries being used can co\-exist in the same cluster\&. This is also important when performing an online (rolling) software upgrade or downgrade of MySQL Cluster\&.
 .sp
 See
-Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.
+Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.
 .RE
 .SH "COPYRIGHT"
 .br
 
=== modified file 'man/ndb_blob_tool.1'
--- man/ndb_blob_tool.1	2014-06-03 13:14:25 +0000
+++ man/ndb_blob_tool.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_blob_tool\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_BLOB_TOOL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_BLOB_TOOL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -94,7 +94,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.14.\ \&ndb_blob_tool Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.14.\ \&ndb_blob_tool Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
@@ -478,7 +478,7 @@
 column parts are created by
 NDB
 for this column\&. See
-Section\ \&11.6, \(lqData Type Storage Requirements\(rq, for more information\&.
+Section\ \&11.7, \(lqData Type Storage Requirements\(rq, for more information\&.
 .SH "COPYRIGHT"
 .br
 .PP
 
=== modified file 'man/ndb_config.1'
--- man/ndb_config.1	2014-06-03 13:14:25 +0000
+++ man/ndb_config.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CONFIG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -69,7 +69,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.15.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.15.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
@@ -427,7 +427,7 @@
 .TE
 .sp 1
 Specifies the connection string to use in connecting to the management server\&. The format for the connection string is the same as described in
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, and defaults to
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, and defaults to
 localhost:1186\&.
 .RE
 .sp
@@ -1230,7 +1230,7 @@
 .\}
 .nf
 shell> \fBndb_config \-\-configinfo \-\-xml\fR
-<configvariables protocolversion="1" ndbversionstring="5\&.5\&.37\-ndb\-7\&.2\&.17"
+<configvariables protocolversion="1" ndbversionstring="5\&.5\&.38\-ndb\-7\&.2\&.18"
                     ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
                     ndbversionbuild="6">
   <section name="SYSTEM">
 
=== modified file 'man/ndb_cpcd.1'
--- man/ndb_cpcd.1	2014-06-03 13:14:25 +0000
+++ man/ndb_cpcd.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_cpcd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_CPCD\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CPCD\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb_delete_all.1'
--- man/ndb_delete_all.1	2014-06-03 13:14:25 +0000
+++ man/ndb_delete_all.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_delete_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DELETE_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DELETE_ALL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -70,7 +70,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.16.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.16.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndb_desc.1'
--- man/ndb_desc.1	2014-06-03 13:14:25 +0000
+++ man/ndb_desc.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_desc\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DESC\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DESC\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -238,7 +238,7 @@
 .\}
 .PP
 (For more information on the statements just shown and the objects created by them, see
-Section\ \&17.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
+Section\ \&18.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
 Section\ \&13.1.14, \(lqCREATE LOGFILE GROUP Syntax\(rq, and
 Section\ \&13.1.18, \(lqCREATE TABLESPACE Syntax\(rq\&.)
 .PP
@@ -333,7 +333,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.17.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.17.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndb_drop_index.1'
--- man/ndb_drop_index.1	2014-06-03 13:14:25 +0000
+++ man/ndb_drop_index.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_drop_index\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_INDEX\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DROP_INDEX\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -68,7 +68,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.18.\ \&ndb_drop_index Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.18.\ \&ndb_drop_index Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
@@ -123,7 +123,7 @@
 Reading table information for completion of table and column names
 You can turn off this feature to get a quicker startup with \-A
 Welcome to the MySQL monitor\&.  Commands end with ; or \eg\&.
-Your MySQL connection id is 7 to server version: 5\&.5\&.37\-ndb\-7\&.2\&.17
+Your MySQL connection id is 7 to server version: 5\&.5\&.38\-ndb\-7\&.2\&.18
 Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
 mysql> \fBSHOW TABLES;\fR
 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
 
=== modified file 'man/ndb_drop_table.1'
--- man/ndb_drop_table.1	2014-06-03 13:14:25 +0000
+++ man/ndb_drop_table.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_drop_table\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_TABLE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DROP_TABLE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -66,7 +66,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.19.\ \&ndb_drop_table Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.19.\ \&ndb_drop_table Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndb_error_reporter.1'
--- man/ndb_error_reporter.1	2014-06-03 13:14:25 +0000
+++ man/ndb_error_reporter.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_error_reporter\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_ERROR_REPORTE" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_ERROR_REPORTE" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -58,7 +58,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.20.\ \&ndb_error_reporter Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.20.\ \&ndb_error_reporter Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndb_index_stat.1'
--- man/ndb_index_stat.1	2014-06-03 13:14:25 +0000
+++ man/ndb_index_stat.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_index_stat\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_INDEX_STAT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_INDEX_STAT\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -65,22 +65,70 @@
 in the
 test
 database:
+.\" ndb_index_stat: interpreting output
+.\" ndb_index_stat: example
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
 shell> \fBndb_index_stat \-d test mytable\fR
-table:mytable index:PRIMARY fragCount:4
-sampleVersion:2 loadTime:1336751773 sampleCount:0 keyBytes:0
-query cache: valid:1 sampleCount:0 totalBytes:0
-times in ms: save: 12\&.380 sort: 0\&.001
+table:City index:PRIMARY fragCount:2
+sampleVersion:3 loadTime:1399585986 sampleCount:1994 keyBytes:7976
+query cache: valid:1 sampleCount:1994 totalBytes:27916
+times in ms: save: 7\&.133 sort: 1\&.974 sort per sample: 0\&.000
 NDBT_ProgramExit: 0 \- OK
 .fi
 .if n \{\
 .RE
 .\}
 .PP
+sampleVersion
+is the version number of the cache from which the statistics data is taken\&. Running
+\fBndb_index_stat\fR
+with the
+\fB\-\-update\fR
+option causes sampleVersion to be incremented\&.
+.PP
+loadTime
+shows when the cache was last updated\&. This is expressed as seconds since the Unix Epoch\&.
+.PP
+sampleCount
+is the number of index entries found per partition\&. You can estimate the total number of entries by multiplying this by the number of fragments (shown as
+fragCount)\&.
+.PP
+sampleCount cab be compared with the cardinality of
+SHOW INDEX
+or
+INFORMATION_SCHEMA\&.STATISTICS, although the latter two provide a view of the table as a whole, while
+\fBndb_index_stat\fR
+provides a per\-fragment average\&.
+.PP
+keyBytes
+is the number of bytes used by the index\&. In this example, the primary key is an integer, which requires four bytes for each index, so
+keyBytes
+can be calculated in this case as shown here:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+    keyBytes = sampleCount * (4 bytes per index) = 1994 * 4 = 7976
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This information can also be obtained using the corresponding column definitions from
+INFORMATION_SCHEMA\&.COLUMNS
+(this requires a MySQL Server and a MySQL client application)\&.
+.PP
+totalBytes
+is the total memory consumed by all indexes on the table, in bytes\&.
+.PP
+Timings shown in the preceding examples are specific to each invocation of
+\fBndb_index_stat\fR\&.
+.PP
 The
 \fB\-\-verbose\fR
 option provides some additional output, as shown here:
@@ -118,7 +166,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.21.\ \&ndb_index_stat Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.21.\ \&ndb_index_stat Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndb_mgm.1'
--- man/ndb_mgm.1	2014-06-03 13:14:25 +0000
+++ man/ndb_mgm.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_mgm\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_MGM\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -87,7 +87,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.13.\ \&ndb_mgm Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.13.\ \&ndb_mgm Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
@@ -176,7 +176,7 @@
 option works with the
 \fBmysql\fR
 command\-line client\&. See
-Section\ \&4.2.3.1, \(lqUsing Options on the Command Line\(rq\&.
+Section\ \&4.2.4, \(lqUsing Options on the Command Line\(rq\&.
 .if n \{\
 .sp
 .\}
@@ -247,7 +247,7 @@
 Additional information about using
 \fBndb_mgm\fR
 can be found in
-Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq\&.
+Section\ \&18.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
 
=== modified file 'man/ndb_mgmd.8'
--- man/ndb_mgmd.8	2014-06-03 13:14:25 +0000
+++ man/ndb_mgmd.8	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_mgmd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGMD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_MGMD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -54,7 +54,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.12.\ \&ndb_mgmd Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.12.\ \&ndb_mgmd Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
@@ -86,9 +86,7 @@
 .PP
 --config-file=file,
 .PP
--f,
-.PP
--c
+-f
 T}:T{
 Specify the cluster configuration file; in NDB\-6\&.4\&.0 and later, needs
             \-\-reload or \-\-initial to override configuration cache if
@@ -431,7 +429,7 @@
 ON), can be used to disable the management server\*(Aqs configuration cache, so that it reads its configuration from
 config\&.ini
 every time it starts (see
-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. You can do this by starting the
+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. You can do this by starting the
 \fBndb_mgmd\fR
 process with any one of the following options:
 .sp
@@ -622,7 +620,7 @@
 \fBndb_mgmd\fR
 was started with
 \fB\-\-config\-cache=OFF\fR\&. See
-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq, for more information\&.
+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq, for more information\&.
 .sp
 Formerly, using this option together with
 \fB\-\-initial\fR
@@ -812,7 +810,7 @@
 .TE
 .sp 1
 Configuration data is cached internally, rather than being read from the cluster global configuration file each time the management server is started (see
-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using the
+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using the
 \fB\-\-initial\fR
 option overrides this behavior, by forcing the management server to delete any existing cache files, and then to re\-read the configuration data from the cluster configuration file and to build a new cache\&.
 .sp
@@ -835,7 +833,7 @@
 ignores
 \fB\-\-initial\fR
 unless it is the only management server running\&. This behavior also has implications when performing a rolling restart of a MySQL Cluster with multiple management nodes\&. See
-Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
+Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
 .sp
 Formerly, using this option together with the
 \fB\-\-config\-file\fR
@@ -1022,7 +1020,7 @@
 .TE
 .sp 1
 In MySQL Cluster NDB 7\&.2, configuration data is stored internally rather than being read from the cluster global configuration file each time the management server is started (see
-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using this option forces the management server to check its internal data store against the cluster configuration file and to reload the configuration if it finds that the configuration file does not match the cache\&. Existing configuration cache files are preserved, but not used\&.
+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using this option forces the management server to check its internal data store against the cluster configuration file and to reload the configuration if it finds that the configuration file does not match the cache\&. Existing configuration cache files are preserved, but not used\&.
 .sp
 This differs in two ways from the
 \fB\-\-initial\fR
@@ -1041,7 +1039,7 @@
 ignores
 \fB\-\-reload\fR
 unless it is the only management server running\&. This behavior also has implications when performing a rolling restart of a MySQL Cluster with multiple management nodes\&. See
-Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
+Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
 .RE
 .sp
 .RS 4
@@ -1166,7 +1164,7 @@
 The same is true with regard to the connection string used with any
 \fBmysqld\fR
 processes that you wish to start as MySQL Cluster SQL nodes connected to this cluster\&. See
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for more information\&.
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for more information\&.
 .sp
 When used with
 \fBndb_mgmd\fR, this option affects the behavior of the management node with regard to other management nodes only\&. Do not confuse it with the
@@ -1200,7 +1198,7 @@
 It is not strictly necessary to specify a connection string when starting the management server\&. However, if you are using more than one management server, a connection string should be provided and each node in the cluster should specify its node ID explicitly\&.
 .PP
 See
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information about using connection strings\&.
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information about using connection strings\&.
 \fBndb_mgmd\fR(8), describes other options for
 \fBndb_mgmd\fR\&.
 .PP
@@ -1227,7 +1225,7 @@
 .\" config.ini (MySQL Cluster)
 config\&.ini
 is the configuration file for the cluster as a whole\&. This file is created by the user and read by the management server\&.
-Section\ \&17.3, \(lqConfiguration of MySQL Cluster NDB 7.2\(rq, discusses how to set up this file\&.
+Section\ \&18.3, \(lqConfiguration of MySQL Cluster NDB 7.2\(rq, discusses how to set up this file\&.
 .RE
 .sp
 .RS 4
@@ -1240,7 +1238,7 @@
 .\}
 ndb_\fInode_id\fR_cluster\&.log
 is the cluster events log file\&. Examples of such events include checkpoint startup and completion, node startup events, node failures, and levels of memory usage\&. A complete listing of cluster events with descriptions may be found in
-Section\ \&17.5, \(lqManagement of MySQL Cluster\(rq\&.
+Section\ \&18.5, \(lqManagement of MySQL Cluster\(rq\&.
 .sp
 When the size of the cluster log reaches one million bytes, the file is renamed to
 ndb_\fInode_id\fR_cluster\&.log\&.\fIseq_id\fR, where
 
=== modified file 'man/ndb_print_backup_file.1'
--- man/ndb_print_backup_file.1	2014-06-03 13:14:25 +0000
+++ man/ndb_print_backup_file.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_print_backup_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_BACKUP_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_BACKUP_" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -57,7 +57,7 @@
 BACKUP\-\fI#\fR, where
 \fI#\fR
 is the sequence number for the backup\&. For more information about cluster backup files and their contents, see
-Section\ \&17.5.3.1, \(lqMySQL Cluster Backup Concepts\(rq\&.
+Section\ \&18.5.3.1, \(lqMySQL Cluster Backup Concepts\(rq\&.
 .PP
 Like
 \fBndb_print_schema_file\fR
 
=== modified file 'man/ndb_print_schema_file.1'
--- man/ndb_print_schema_file.1	2014-06-03 13:14:25 +0000
+++ man/ndb_print_schema_file.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_print_schema_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SCHEMA_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_SCHEMA_" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb_print_sys_file.1'
--- man/ndb_print_sys_file.1	2014-06-03 13:14:25 +0000
+++ man/ndb_print_sys_file.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_print_sys_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SYS_FIL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_SYS_FIL" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb_restore.1'
--- man/ndb_restore.1	2014-06-03 13:14:25 +0000
+++ man/ndb_restore.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_restore\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_RESTORE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_RESTORE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -48,7 +48,7 @@
 must be executed once for each of the backup files that were created by the
 START BACKUP
 command used to create the backup (see
-Section\ \&17.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq)\&. This is equal to the number of data nodes in the cluster at the time that the backup was created\&.
+Section\ \&18.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq)\&. This is equal to the number of data nodes in the cluster at the time that the backup was created\&.
 .\" single user mode (MySQL Cluster): and ndb_restore
 .if n \{\
 .sp
@@ -65,7 +65,7 @@
 .PP
 Before using
 \fBndb_restore\fR, it is recommended that the cluster be running in single user mode, unless you are restoring multiple data nodes in parallel\&. See
-Section\ \&17.5.8, \(lqMySQL Cluster Single User Mode\(rq, for more information\&.
+Section\ \&18.5.8, \(lqMySQL Cluster Single User Mode\(rq, for more information\&.
 .sp .5v
 .RE
 .PP
@@ -78,7 +78,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.23.\ \&ndb_restore Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.23.\ \&ndb_restore Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
@@ -130,6 +130,7 @@
 l l l
 l l l
 l l l
+l l l
 l l l.
 T{
 .PP
@@ -463,9 +464,9 @@
 .PP
 --exclude-tables=table-list
 T}:T{
-List of one or more tables to exclude (includes those in same database
-            that are not not named); each table reference must include
-            the database name
+List of one or more tables to exclude (includes those in the same
+            database that are not named); each table reference must
+            include the database name
 T}:T{
 .PP
 All MySQL 5\&.5 based releases
@@ -494,8 +495,9 @@
 .PP
 --rebuild-indexes
 T}:T{
-Causes multi\-threaded ordered index rebuilding of indexes found in the
-            backup\&.
+Causes multi\-threaded rebuilding of ordered indexes found in the backup\&.
+            Number of threads used is determined by setting
+            BuildIndexThreads parameter\&.
 T}:T{
 .PP
 All MySQL 5\&.5 based releases
@@ -550,8 +552,20 @@
 .PP
 All MySQL 5\&.5 based releases
 T}
+T{
+.PP
+--exclude-intermediate-sql-tables[=TRUE|FALSE]
+T}:T{
+If TRUE (the default), do not restore any intermediate tables (having
+            names prefixed with \*(Aq#sql\-\*(Aq) that were left over from
+            copying ALTER TABLE operations\&.
+T}:T{
+.PP
+ADDED: NDB 7\&.2\&.17
+T}
 .TE
 .sp 1
+.\" ndb_restore: typical and required options
 .PP
 Typical options for this utility are shown here:
 .sp
@@ -566,13 +580,25 @@
 .RE
 .\}
 .PP
+Normally, when restoring from a MySQL Cluster backup,
+\fBndb_restore\fR
+requires at a minimum the
+\fB\-\-nodeid\fR
+(short form:
+\fB\-n\fR),
+\fB\-\-backupid\fR
+(short form:
+\fB\-b\fR), and
+\fB\-\-backup_path\fR
+options\&.
+.PP
 .\" restore_connect option (ndb_restore)
 The
 \fB\-c\fR
 option is used to specify a connection string which tells
 ndb_restore
 where to locate the cluster management server\&. (See
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information on connection strings\&.) If this option is not used, then
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information on connection strings\&.) If this option is not used, then
 \fBndb_restore\fR
 attempts to connect to a management server on
 localhost:1186\&. This utility acts as a cluster API node, and so requires a free connection
@@ -590,7 +616,7 @@
 section in
 config\&.ini
 that is not being used for a MySQL server or other application for this reason (see
-Section\ \&17.3.2.7, \(lqDefining SQL and Other API Nodes in a MySQL Cluster\(rq)\&.
+Section\ \&18.3.2.7, \(lqDefining SQL and Other API Nodes in a MySQL Cluster\(rq)\&.
 .PP
 You can verify that
 \fBndb_restore\fR
@@ -713,7 +739,7 @@
 INT
 or
 BIGINT\&. See
-Section\ \&16.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for a table of type conversions currently supported by attribute promotion\&.
+Section\ \&17.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for a table of type conversions currently supported by attribute promotion\&.
 .PP
 Attribute promotion by
 \fBndb_restore\fR
@@ -828,7 +854,7 @@
 option\&. Using
 \fB\-\-lossy\-conversions\fR
 allows lossy conversions of column values (type demotions or changes in sign) when restoring data from backup\&. With some exceptions, the rules governing demotion are the same as for MySQL replication; see
-Section\ \&16.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for information about specific type conversions currently supported by attribute demotion\&.
+Section\ \&17.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for information about specific type conversions currently supported by attribute demotion\&.
 .PP
 \fBndb_restore\fR
 reports any truncation of data that it performs during lossy conversions once per attribute and column\&.
@@ -882,7 +908,7 @@
 option is used to specify the ID or sequence number of the backup, and is the same number shown by the management client in the
 Backup \fIbackup_id\fR completed
 message displayed upon completion of a backup\&. (See
-Section\ \&17.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq\&.)
+Section\ \&18.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq\&.)
 .if n \{\
 .sp
 .\}
@@ -910,7 +936,7 @@
 in the
 id
 column is updated if it already exists; such a row is inserted if it does not already exist\&. (See
-Section\ \&17.6.9, \(lqMySQL Cluster Backups With MySQL Cluster Replication\(rq\&.)
+Section\ \&18.6.9, \(lqMySQL Cluster Backups With MySQL Cluster Replication\(rq\&.)
 .PP
 .\" restore_data option (ndb_restore)
 \fB\-\-restore_data\fR
@@ -942,7 +968,7 @@
 This works only if the privilege tables were converted to
 NDB
 before the backup was taken\&. For more information, see
-Section\ \&17.5.14, \(lqDistributed MySQL Privileges for MySQL Cluster\(rq\&.
+Section\ \&18.5.14, \(lqDistributed MySQL Privileges for MySQL Cluster\(rq\&.
 .PP
 .\" backup_path option (ndb_restore)
 .\" ndb_restore: backup_path option
@@ -971,7 +997,7 @@
 must be run twice\(emonce for each database node in the cluster where the backup was taken\&. However,
 \fBndb_restore\fR
 cannot always restore backups made from a cluster running one version of MySQL to a cluster running a different MySQL version\&. See
-Section\ \&17.2.7, \(lqUpgrading and Downgrading MySQL Cluster NDB 7.2\(rq, for more information\&.
+Section\ \&18.2.7, \(lqUpgrading and Downgrading MySQL Cluster NDB 7.2\(rq, for more information\&.
 .if n \{\
 .sp
 .\}
@@ -1413,7 +1439,7 @@
 This option stops
 \fBndb_restore\fR
 from restoring any MySQL Cluster Disk Data objects, such as tablespaces and log file groups; see
-Section\ \&17.5.12, \(lqMySQL Cluster Disk Data Tables\(rq, for more information about these\&.
+Section\ \&18.5.12, \(lqMySQL Cluster Disk Data Tables\(rq, for more information about these\&.
 .PP
 .\" ndb_restore: parallelism option
 .\" parallelism option (ndb_restore)
@@ -1938,7 +1964,27 @@
 \fBndb_restore\fR
 to cause multi\-threaded rebuilding of the ordered indexes while restoring a native
 NDB
-backup\&.
+backup\&. The number of threads used for building ordered indexes by
+\fBndb_restore\fR
+with this option is controlled by the
+BuildIndexThreads
+data node configuration parameter (MySQL Cluster NDB 6\&.3\&.30 and later; MySQL Cluster NDB 7\&.0\&.11 and later)\&.
+.\" indexes: and ndb_restore
+.PP
+It is necessary to use this option only for the first run of
+\fBndb_restore\fR; this causes all ordered indexes to be rebuilt without using
+\fB\-\-rebuild\-indexes\fR
+again when restoring subsequent nodes\&. You should use this option prior to inserting new rows into the database; otherwise, it is possible for a row to be inserted that later causes a unique constraint violation when trying to rebuild the indexes\&.
+.PP
+Rebuilding of unique indexes uses disk write bandwidth for redo logging and local checkpointing\&. An insufficient amount of this bandwith can lead to redo buffer overload or log overload errors\&. In such cases you can run
+\fBndb_restore\fR
+\fB\-\-rebuild\-indexes\fR
+again; the process resumes at the point where the error occurred\&. You can also do this when you have encountered temporarary errors\&. You can repeat execution of
+\fBndb_restore\fR
+\fB\-\-rebuild\-indexes\fR
+indefinitely; you may be able to stop such errors by reducing the value of
+DiskCheckpointSpeed
+to provide additional disk bandwidth to redo logging\&.
 .PP
 .\" ndb_restore: skip-broken-objects option
 .\" skip-broken-objects option (ndb_restore)
@@ -2079,6 +2125,62 @@
 .sp .5v
 .RE
 .PP
+.\" ndb_restore: exclude-intermediate-sql-tables option
+.\" exclude-intermediate-sql-tables option (ndb_restore)
+\fB\-\-exclude\-intermediate\-sql\-tables[=TRUE|FALSE]\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s
+l l s s
+^ l l s
+^ l l s.
+T{
+\fBIntroduced\fR
+T}:T{
+5\&.5\&.37\-ndb\-7\&.2\&.17
+T}
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-exclude\-intermediate\-sql\-tables[=TRUE|FALSE]
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values\fR
+T}
+:T{
+\fBType\fR
+T}:T{
+boolean
+T}
+:T{
+\fBDefault\fR
+T}:T{
+TRUE
+T}
+.TE
+.sp 1
+.PP
+When performing copying
+ALTER TABLE
+operations,
+\fBmysqld\fR
+creates intermediate tables (whose names are prefixed with
+#sql\-)\&. When
+TRUE, the
+\fB\-\-exclude\-intermediate\-sql\-tables\fR
+option keeps
+\fBndb_restore\fR
+from restoring such tables that may have been left over from such operations\&. This option is
+TRUE
+by default\&.
+.PP
+The
+\fB\-\-exclude\-intermediate\-sql\-tables\fR
+option was introduced in MySQL Cluster NDB 7\&.2\&.17\&. (Bug #17882305)
+.PP
 \fBError reporting\fR. .\" ndb_restore: errors
 \fBndb_restore\fR
 reports both temporary and permanent errors\&. In the case of temporary errors, it may able to recover from them, and reports
 
=== modified file 'man/ndb_select_all.1'
--- man/ndb_select_all.1	2014-06-03 13:14:25 +0000
+++ man/ndb_select_all.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_select_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SELECT_ALL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -61,7 +61,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.24.\ \&ndb_select_all Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.24.\ \&ndb_select_all Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
@@ -454,8 +454,8 @@
 Adds a
 GCI
 column to the output showing the global checkpoint at which each row was last updated\&. See
-Section\ \&17.1, \(lqMySQL Cluster Overview\(rq, and
-Section\ \&17.5.6.2, \(lqMySQL Cluster Log Events\(rq, for more information about checkpoints\&.
+Section\ \&18.1, \(lqMySQL Cluster Overview\(rq, and
+Section\ \&18.5.6.2, \(lqMySQL Cluster Log Events\(rq, for more information about checkpoints\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/ndb_select_count.1'
--- man/ndb_select_count.1	2014-06-03 13:14:25 +0000
+++ man/ndb_select_count.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_select_count\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_COUNT\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SELECT_COUNT\" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -61,7 +61,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.25.\ \&ndb_select_count Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.25.\ \&ndb_select_count Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndb_show_tables.1'
--- man/ndb_show_tables.1	2014-06-03 13:14:25 +0000
+++ man/ndb_show_tables.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_show_tables\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SHOW_TABLES\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SHOW_TABLES\F" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -52,7 +52,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.26.\ \&ndb_show_tables Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.26.\ \&ndb_show_tables Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndb_size.pl.1'
--- man/ndb_size.pl.1	2014-06-03 13:14:25 +0000
+++ man/ndb_size.pl.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_size.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SIZE\&.PL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SIZE\&.PL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -102,7 +102,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.27.\ \&ndb_size\&.pl Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.27.\ \&ndb_size\&.pl Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndb_waiter.1'
--- man/ndb_waiter.1	2014-06-03 13:14:25 +0000
+++ man/ndb_waiter.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_waiter\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_WAITER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_WAITER\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -142,7 +142,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.28.\ \&ndb_waiter Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.28.\ \&ndb_waiter Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndbd.8'
--- man/ndbd.8	2014-06-03 13:14:25 +0000
+++ man/ndbd.8	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndbd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.10.\ \&ndbd Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.10.\ \&ndbd Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
@@ -556,7 +556,7 @@
 .IP \(bu 2.3
 .\}
 MySQL Cluster Disk Data files (see
-Section\ \&17.5.12, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
+Section\ \&18.5.12, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
 .RE
 .sp
 This option also has no effect on recovery of data by a data node that is just starting (or restarting) from data nodes that are already running\&. This recovery of data occurs automatically, and requires no user intervention in a MySQL Cluster that is running normally\&.
@@ -756,7 +756,7 @@
 connects to the management server, obtains configuration data from it, and initializes communication objects\&. However, it does not actually start the execution engine until specifically requested to do so by the management server\&. This can be accomplished by issuing the proper
 START
 command in the management client (see
-Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
+Section\ \&18.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
 .RE
 .sp
 .RS 4
@@ -1163,7 +1163,7 @@
 .\}
 .PP
 See
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for additional information about this issue\&.
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for additional information about this issue\&.
 \fBndbd\fR(8), describes other options for
 \fBndbd\fR\&.
 .PP
@@ -1189,7 +1189,7 @@
 For a machine with many CPUs it is possible to use several
 \fBndbd\fR
 processes which belong to different node groups; however, such a configuration is still considered experimental and is not supported for MySQL 5\&.5 in a production setting\&. See
-Section\ \&17.1.6, \(lqKnown Limitations of MySQL Cluster\(rq\&.
+Section\ \&18.1.6, \(lqKnown Limitations of MySQL Cluster\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
 
=== modified file 'man/ndbd_redo_log_reader.1'
--- man/ndbd_redo_log_reader.1	2014-06-03 13:14:25 +0000
+++ man/ndbd_redo_log_reader.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndbd_redo_log_reader\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBD_REDO_LOG_REA" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBD_REDO_LOG_REA" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -55,7 +55,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.22.\ \&ndbd_redo_log_reader Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.22.\ \&ndbd_redo_log_reader Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndbinfo_select_all.1'
--- man/ndbinfo_select_all.1	2014-06-03 13:14:25 +0000
+++ man/ndbinfo_select_all.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndbinfo_select_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBINFO_SELECT_AL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBINFO_SELECT_AL" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -121,7 +121,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.11.\ \&ndbinfo_select_all Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.11.\ \&ndbinfo_select_all Options and Variables: MySQL Cluster NDB 7.2
 .TS
 allbox tab(:);
 lB lB lB.
 
=== modified file 'man/ndbmtd.8'
--- man/ndbmtd.8	2014-06-03 13:14:25 +0000
+++ man/ndbmtd.8	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndbmtd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBMTD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBMTD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@
 also apply to
 \fBndbmtd\fR\&. For more information about these options and parameters, see
 \fBndbd\fR(8), and
-Section\ \&17.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
+Section\ \&18.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
 .PP
 \fBndbmtd\fR
 is also file system\-compatible with
 
=== modified file 'man/perror.1'
--- man/perror.1	2014-06-03 13:14:25 +0000
+++ man/perror.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBperror\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBPERROR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBPERROR\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/replace.1'
--- man/replace.1	2014-06-03 13:14:25 +0000
+++ man/replace.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBreplace\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBREPLACE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBREPLACE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/resolve_stack_dump.1'
--- man/resolve_stack_dump.1	2014-06-03 13:14:25 +0000
+++ man/resolve_stack_dump.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBresolve_stack_dump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBRESOLVE_STACK_DUM" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBRESOLVE_STACK_DUM" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -125,7 +125,7 @@
 .RE
 .PP
 For more information, see
-Section\ \&23.4.1.5, \(lqUsing a Stack Trace\(rq\&.
+Section\ \&24.4.1.5, \(lqUsing a Stack Trace\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
 
=== modified file 'man/resolveip.1'
--- man/resolveip.1	2014-06-03 13:14:25 +0000
+++ man/resolveip.1	2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBresolveip\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2014
+.\"      Date: 07/18/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBRESOLVEIP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBRESOLVEIP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'mysql-test/extra/rpl_tests/rpl_stop_slave.test'
--- mysql-test/extra/rpl_tests/rpl_stop_slave.test	2010-12-20 14:15:01 +0000
+++ mysql-test/extra/rpl_tests/rpl_stop_slave.test	2014-08-22 10:00:31 +0000
@@ -42,6 +42,10 @@
 connection slave1;
 --echo # To resume slave SQL thread
 SET DEBUG_SYNC= 'now SIGNAL signal.continue';
+# wait for the sql thread to come out of the
+# waiting phase before resetting the signals
+--let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and info LIKE '%INSERT INTO t1 VALUES (1)%'
+--source include/wait_condition.inc
 SET DEBUG_SYNC= 'RESET';
 
 --echo
 
=== added file 'mysql-test/include/stop_dump_threads.inc'
--- mysql-test/include/stop_dump_threads.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/stop_dump_threads.inc	2014-08-22 10:00:31 +0000
@@ -0,0 +1,32 @@
+# ==== Purpose ====
+#
+# Stop all dump threads on the server of the current connection.
+#
+# ==== Usage ====
+#
+# --source include/stop_dump_threads.inc
+
+--let $include_filename= stop_dump_threads.inc
+--source include/begin_include_file.inc
+
+
+--let $_sdt_show_rpl_debug_info_old= $show_rpl_debug_info
+--let $show_rpl_debug_info= 1
+--disable_query_log
+--disable_result_log
+
+--let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
+
+while ($_sdt_dump_thread_id != '')
+{
+  eval KILL $_sdt_dump_thread_id;
+  --let $wait_condition= SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = $_sdt_dump_thread_id
+  --source include/wait_condition.inc
+
+  --let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
+}
+
+--let $show_rpl_debug_info= $_sdt_show_rpl_debug_info_old
+
+--let $include_filename= stop_dump_threads.inc
+--source include/end_include_file.inc
 
=== modified file 'mysql-test/include/uninstall_semisync.inc'
--- mysql-test/include/uninstall_semisync.inc	2013-03-29 03:58:31 +0000
+++ mysql-test/include/uninstall_semisync.inc	2014-08-22 10:00:31 +0000
@@ -13,6 +13,11 @@
 UNINSTALL PLUGIN rpl_semi_sync_slave;
 
 --connection master
+# After BUG#17638477 fix, uninstallation of rpl_semi_sync_master
+#  is not allowed when there are semi sync slaves. Hence kill
+#  all dump threads before uninstalling it.
+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
+--source include/stop_dump_threads.inc
 UNINSTALL PLUGIN rpl_semi_sync_master;
 --enable_warnings
 
 
=== added file 'mysql-test/r/bug71858.result'
--- mysql-test/r/bug71858.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/bug71858.result	2014-08-22 10:00:31 +0000
@@ -0,0 +1,10 @@
+SELECT table_schema, table_name, column_name, column_type FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_NAME IN ( 'ooooooooooooooooooooooooooooooooooooo' 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa '
+'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cc' 'ccccccccccccc' 'wwwwwwwwwwwwwwwwwww' 'rrrrrrrrrrrrrrrr'
+'tttttttttttttttttttt' 'yyyyyyyyyyyyyyyyyyy' 'uuuuuuuuuuuuuuuuuuuuuuuuuuuu' 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiii'
+'oooooooooooooooooooo' 'ppppppppppppppppppppppppppppp' 'jjjjjjjjjjjj' 'kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk'
+'lllllllllllllllllllllllllllllllllllllll' 'zzzzzzzzzzzzzzz' 'xxxxxxxxxxxxxxxxx' 'cccccccccc'
+'vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+'nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn' ) AND TABLE_SCHEMA='AA_BBB' AND COLUMN_TYPE='PRI'
+ORDER BY 2;
+table_schema	table_name	column_name	column_type
 
=== modified file 'mysql-test/r/failed_auth_3909.result'
--- mysql-test/r/failed_auth_3909.result	2013-04-30 11:48:24 +0000
+++ mysql-test/r/failed_auth_3909.result	2014-08-22 10:00:31 +0000
@@ -8,12 +8,12 @@
 Warning	1364	Field 'x509_subject' doesn't have a default value
 flush privileges;
 connect(localhost,u1,,test,MASTER_PORT,MASTER_SOCKET);
-ERROR HY000: Plugin 'bar' is not loaded
+ERROR 28000: Access denied for user 'u1'@'localhost' (using password: NO)
 connect(localhost,u2,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: NO)
 connect(localhost,u2,password,test,MASTER_PORT,MASTER_SOCKET);
 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
-ERROR HY000: Plugin 'bar' is not loaded
+ERROR 28000: Access denied for user 'u1'@'localhost' (using password: NO)
 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: NO)
 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
 delete from mysql.user where plugin = 'bar';
 
=== modified file 'mysql-test/r/group_min_max.result'
--- mysql-test/r/group_min_max.result	2013-05-13 11:45:25 +0000
+++ mysql-test/r/group_min_max.result	2014-08-22 10:00:31 +0000
@@ -3001,7 +3001,7 @@
 0	NULL
 EXPLAIN SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	NULL	a	5	NULL	9	Using index for group-by
+1	SIMPLE	t2	index	NULL	a	15	NULL	16	Using index
 SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
 SUM(DISTINCT a)	MAX(b)
 1	8
@@ -3029,7 +3029,7 @@
 168
 EXPLAIN SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	NULL	a	5	NULL	9	Using index for group-by
+1	SIMPLE	t2	index	NULL	a	15	NULL	16	Using index
 SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
 (SUM(DISTINCT a) + MAX(b))
 9
@@ -3057,3 +3057,55 @@
 1	SIMPLE	t1	range	NULL	PRIMARY	5	NULL	9	Using index for group-by (scanning)
 drop table t1;
 # End of test#50539.
+#
+# Bug#17217128 -  BAD INTERACTION BETWEEN MIN/MAX AND
+#                 "HAVING SUM(DISTINCT)": WRONG RESULTS.
+#
+CREATE TABLE t (a INT, b INT, KEY(a,b));
+INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5);
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+a	SUM(DISTINCT a)	MIN(b)
+1	1	0
+2	2	2
+3	3	2
+4	4	4
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+a	SUM(DISTINCT a)	MAX(b)
+1	1	1
+2	2	2
+3	3	3
+4	4	5
+EXPLAIN SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+a	MAX(b)
+1	1
+2	2
+3	3
+4	5
+EXPLAIN SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+SUM(DISTINCT a)	MIN(b)	MAX(b)
+10	0	5
+EXPLAIN SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+a	SUM(DISTINCT a)	MIN(b)	MAX(b)
+1	1	0	1
+2	2	2	2
+3	3	2	3
+4	4	4	5
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+DROP TABLE t;
 
=== modified file 'mysql-test/r/group_min_max_innodb.result'
--- mysql-test/r/group_min_max_innodb.result	2013-05-23 08:39:28 +0000
+++ mysql-test/r/group_min_max_innodb.result	2014-08-22 10:00:31 +0000
@@ -118,3 +118,171 @@
 1
 DROP TABLE t1;
 End of 5.5 tests
+#
+# Bug#17909656 - WRONG RESULTS FOR A SIMPLE QUERY WITH GROUP BY
+#
+CREATE TABLE t0 (
+i1 INTEGER NOT NULL
+);
+INSERT INTO t0 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
+(11),(12),(13),(14),(15),(16),(17),(18),(19),(20),
+(21),(22),(23),(24),(25),(26),(27),(28),(29),(30);
+CREATE TABLE t1 (
+c1 CHAR(1) NOT NULL,
+i1 INTEGER NOT NULL,
+i2 INTEGER NOT NULL,
+UNIQUE KEY k1 (c1,i2)
+) ENGINE=InnoDB;
+INSERT INTO t1 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'F',i1,i1 FROM t0;
+CREATE TABLE t2 (
+c1 CHAR(1) NOT NULL,
+i1 INTEGER NOT NULL,
+i2 INTEGER NOT NULL,
+UNIQUE KEY k2 (c1,i1,i2)
+) ENGINE=InnoDB;
+INSERT INTO t2 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'F',i1,i1 FROM t0;
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	31	Using where; Using index
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
+GROUP BY c1;
+c1	max(i2)
+C	17
+F	30
+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	31	Using where; Using index
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
+GROUP BY c1;
+c1	max(i2)
+C	30
+F	17
+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	1	Using where; Using index for group-by
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
+GROUP BY c1;
+c1	max(i2)
+C	17
+F	17
+EXPLAIN SELECT c1, max(i2) FROM t1 
+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	3	Using where; Using index
+SELECT c1, max(i2) FROM t1 
+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
+GROUP BY c1;
+c1	max(i2)
+C	30
+EXPLAIN SELECT c1, i1, max(i2) FROM t2
+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
+GROUP BY c1,i1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	k2	k2	9	NULL	59	Using where; Using index for group-by
+SELECT c1, i1, max(i2) FROM t2
+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
+GROUP BY c1,i1;
+c1	i1	max(i2)
+C	17	17
+F	17	17
+EXPLAIN SELECT c1, i1, max(i2) FROM t2 
+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
+GROUP BY c1,i1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	k2	k2	9	NULL	58	Using where; Using index for group-by
+SELECT c1, i1, max(i2) FROM t2 
+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
+GROUP BY c1,i1;
+c1	i1	max(i2)
+C	17	17
+F	17	17
+EXPLAIN SELECT c1, i1, max(i2) FROM t2 
+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
+GROUP BY c1,i1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	k2	k2	5	NULL	181	Using where; Using index for group-by
+SELECT c1, i1, max(i2) FROM t2 
+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
+GROUP BY c1,i1;
+c1	i1	max(i2)
+A	17	17
+B	17	17
+C	1	1
+C	2	2
+C	3	3
+C	4	4
+C	5	5
+C	6	6
+C	7	7
+C	8	8
+C	9	9
+C	10	10
+C	11	11
+C	12	12
+C	13	13
+C	14	14
+C	15	15
+C	16	16
+C	17	17
+C	18	18
+C	19	19
+C	20	20
+C	21	21
+C	22	22
+C	23	23
+C	24	24
+C	25	25
+C	26	26
+C	27	27
+C	28	28
+C	29	29
+C	30	30
+D	17	17
+E	17	17
+F	1	1
+F	2	2
+F	3	3
+F	4	4
+F	5	5
+F	6	6
+F	7	7
+F	8	8
+F	9	9
+F	10	10
+F	11	11
+F	12	12
+F	13	13
+F	14	14
+F	15	15
+F	16	16
+F	17	17
+F	18	18
+F	19	19
+F	20	20
+F	21	21
+F	22	22
+F	23	23
+F	24	24
+F	25	25
+F	26	26
+F	27	27
+F	28	28
+F	29	29
+F	30	30
+DROP TABLE t0,t1,t2;
 
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- mysql-test/r/mysqld--help-notwin.result	2014-01-23 05:14:14 +0000
+++ mysql-test/r/mysqld--help-notwin.result	2014-08-22 10:00:31 +0000
@@ -792,8 +792,8 @@
  --thread-statistics Control TABLE_STATISTICS running, when userstat is
  enabled
  --time-format=name  The TIME format (ignored)
- --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
- currently supported)
+ --timed-mutexes     Specify whether to time mutexes. Deprecated, has no
+ effect.
  --tmp-table-size=#  If an internal in-memory temporary table exceeds this
  size, MySQL will automatically convert it to an on-disk
  MyISAM table
 
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- mysql-test/r/mysqld--help-win.result	2014-01-23 05:14:14 +0000
+++ mysql-test/r/mysqld--help-win.result	2014-08-22 10:00:31 +0000
@@ -750,8 +750,8 @@
  one-thread-per-connection, no-threads, pool-of-threads
  --thread-stack=#    The stack size for each thread
  --time-format=name  The TIME format (ignored)
- --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
- currently supported)
+ --timed-mutexes     Specify whether to time mutexes. Deprecated, has no
+ effect.
  --tmp-table-size=#  If an internal in-memory temporary table exceeds this
  size, MySQL will automatically convert it to an on-disk
  MyISAM table
 
=== modified file 'mysql-test/r/partition_archive.result'
--- mysql-test/r/partition_archive.result	2009-08-11 12:18:26 +0000
+++ mysql-test/r/partition_archive.result	2014-08-22 10:00:31 +0000
@@ -126,3 +126,29 @@
 count(*)
 100
 drop table t1;
+#
+#BUG 18618561: FAILED ALTER TABLE ENGINE CHANGE WITH PARTITIONS
+#              CORRUPTS FRM
+CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
+PARTITIONS 5;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) NOT NULL,
+  PRIMARY KEY (`fld1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (fld1)
+PARTITIONS 5 */
+ALTER TABLE t1 ENGINE= ARCHIVE;
+ERROR HY000: Can't create table 'test.#sql-temporary' (errno: 1)
+#After the patch, the ENGINE is correctly displayed as MyISAM
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) NOT NULL,
+  PRIMARY KEY (`fld1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (fld1)
+PARTITIONS 5 */
+#Cleanup.
+DROP TABLE t1;
 
=== modified file 'mysql-test/r/partition_pruning.result'
--- mysql-test/r/partition_pruning.result	2012-03-14 20:57:15 +0000
+++ mysql-test/r/partition_pruning.result	2014-08-22 10:00:31 +0000
@@ -3294,3 +3294,117 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0,p1,p2	ALL	NULL	NULL	NULL	NULL	100	Using where
 drop table t0, t1;
+#
+# Bug#71095: Wrong results with PARTITION BY LIST COLUMNS()
+#
+CREATE TABLE t1
+(c1 int,
+c2 int,
+c3 int,
+c4 int,
+PRIMARY KEY (c1,c2))
+PARTITION BY LIST COLUMNS (c2)
+(PARTITION p1 VALUES IN (1,2),
+PARTITION p2 VALUES IN (3,4));
+INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
+INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+c1	c2	c3	c4
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+c1	c2	c3	c4
+1	1	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+c1	c2	c3	c4
+1	1	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+c1	c2	c3	c4
+1	1	1	1
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+c1	c2	c3	c4
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+c1	c2	c3	c4
+1	1	1	1
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+c1	c2	c3	c4
+1	1	1	1
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+c1	c2	c3	c4
+2	3	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+c1	c2	c3	c4
+2	3	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+c1	c2	c3	c4
+2	3	1	1
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+c1	c2	c3	c4
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+c1	c2	c3	c4
+2	3	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+c1	c2	c3	c4
+2	3	1	1
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+c1	c2	c3	c4
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+c1	c2	c3	c4
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+c1	c2	c3	c4
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1	const	PRIMARY	PRIMARY	8	const,const	1	
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	const	PRIMARY	PRIMARY	8	const,const	1	
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	const	PRIMARY	PRIMARY	8	const,const	1	
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+DROP TABLE t1;
 
=== modified file 'mysql-test/r/percona_bug1289599.result'
--- mysql-test/r/percona_bug1289599.result	2014-03-13 18:25:59 +0000
+++ mysql-test/r/percona_bug1289599.result	2014-08-22 10:00:31 +0000
@@ -1,8 +1,8 @@
 update mysql.user set plugin='auth_socket';
 flush privileges;
 connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
-ERROR HY000: Plugin 'auth_socket' is not loaded
-ERROR HY000: Plugin 'auth_socket' is not loaded
+ERROR 28000: Access denied for user 'USER'@'localhost' (using password: NO)
+ERROR 28000: Access denied for user 'USER'@'localhost' (using password: NO)
 install plugin auth_socket soname 'auth_socket.so';
 connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
 Got one of the listed errors
 
=== modified file 'mysql-test/r/plugin.result'
--- mysql-test/r/plugin.result	2013-05-19 18:08:06 +0000
+++ mysql-test/r/plugin.result	2014-08-22 10:00:31 +0000
@@ -143,3 +143,73 @@
 @@SESSION.example_double_thdvar
 1000.500000
 UNINSTALL PLUGIN example;
+#
+# BUG#18008907 - DEADLOCK BETWEEN MYSQL_CHANGE_USER(), SHOW VARIABLES AND INSTALL PLUGIN
+#
+CREATE PROCEDURE p_install()
+BEGIN
+INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
+END
+|
+CREATE PROCEDURE p_show_vars()
+BEGIN
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES;
+END|
+connect con1, localhost, root,,;
+# Case 18008907_1: Deadlock situation cause by
+#                  con1: has LOCK_system_variables_hash and waits on LOCK_plugin  AND
+#                  default: has LOCK_plugin and waits on LOCK_system_variables_hash.
+#
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
+call p_show_vars();;
+connection default;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
+call p_install();;
+connection con1;
+COUNT(*)
+#
+SET DEBUG_SYNC='RESET';
+connection default;
+ERROR HY000: Can't open shared library
+SET DEBUG_SYNC='RESET';
+# Case 18008907_2: Deadlock situation caused by
+#                  default: has LOCK_system_variables_hash and waits on LOCK_global_system_variables,
+#                  con1: has LOCK_plugin and waits on LOCK_system_variables_hash AND
+#                  con2: has LOCK_global_system_variables and waits on LOCK_plugin.
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
+call p_show_vars();;
+connection con1;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
+call p_install();;
+connect con2, localhost, root,,;
+SET DEBUG_SYNC='now WAIT_FOR create_connection';
+connection con1;
+ERROR HY000: Can't open shared library
+connection default;
+COUNT(*)
+#
+Warnings:
+#	1639	debug sync point wait timed out
+disconnect con2;
+# Case 18008907_3: Testing Concurrent "Show Variables" and "Plugin Uninstall" operations.
+INSTALL PLUGIN example SONAME 'ha_example.so';
+connection con1;
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
+call p_show_vars();;
+connect con2, localhost, root,,;
+SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
+UNINSTALL PLUGIN example;;
+connection default;
+SET DEBUG_SYNC='now SIGNAL go';
+connection con1;
+COUNT(*)
+#
+connection con2;
+connection default;
+DROP PROCEDURE p_show_vars;
+DROP PROCEDURE p_install;
+SET DEBUG_SYNC='RESET';
+disconnect con1;
+disconnect con2;
 
=== modified file 'mysql-test/r/plugin_auth_qa_3.result'
--- mysql-test/r/plugin_auth_qa_3.result	2010-10-22 08:20:17 +0000
+++ mysql-test/r/plugin_auth_qa_3.result	2014-08-22 10:00:31 +0000
@@ -6,6 +6,6 @@
 current_user()	user()	@@local.proxy_user	@@local.external_user
 qa_test_11_dest@%	qa_test_11_user@localhost	'qa_test_11_user'@'%'	'qa_test_11_user'@'%'
 exec MYSQL PLUGIN_AUTH_OPT --default_auth=qa_auth_client -h localhost -P MASTER_MYPORT -u qa_test_2_user --password=qa_test_11_dest test_user_db -e "SELECT current_user(),user(),@@local.proxy_user,@@local.external_user;" 2>&1
-ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: NO)
+ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: YES)
 DROP USER qa_test_11_user, qa_test_11_dest;
 DROP DATABASE test_user_db;
 
=== added file 'mysql-test/r/show_processlist.result'
--- mysql-test/r/show_processlist.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/show_processlist.result	2014-08-22 10:00:31 +0000
@@ -0,0 +1,47 @@
+Bug#17283409  4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
+SHOW BINLOGS
+connect connection1,localhost,root,,test,$MASTER_MYPORT,;
+connection default;
+SET DEBUG_SYNC='before_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
+SHOW PROCESSLIST;
+connection connection1;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect connection2,localhost,root,,test,$MASTER_MYPORT,;
+connect connection3,localhost,root,,test,$MASTER_MYPORT,;
+SET DEBUG_SYNC='now SIGNAL go';
+connection default;
+Id	User	Host	db	Command	Time	State	Info	Rows_sent	Rows_examined	Rows_read
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+SET DEBUG_SYNC='after_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
+SHOW PROCESSLIST;
+connection connection1;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect connection4,localhost,root,,test,$MASTER_MYPORT,;
+connect connection5,localhost,root,,test,$MASTER_MYPORT,;
+SET DEBUG_SYNC='now SIGNAL go';
+connection default;
+Id	User	Host	db	Command	Time	State	Info	Rows_sent	Rows_examined	Rows_read
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info	Rows_sent	Rows_examined	Rows_read
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>	X	X	X
+"Cleanup"
+SET DEBUG_SYNC='RESET';
+disconnect connection1;
+disconnect connection2;
+disconnect connection3;
+disconnect connection4;
+disconnect connection5;
 
=== modified file 'mysql-test/r/union.result'
--- mysql-test/r/union.result	2011-07-11 09:27:52 +0000
+++ mysql-test/r/union.result	2014-08-22 10:00:31 +0000
@@ -1826,3 +1826,37 @@
 SELECT(SELECT 1 AS a FROM dual ORDER BY a DESC LIMIT 1) AS dev;
 dev
 1
+#
+# Bug #17059925 : UNIONS COMPUTES ROWS_EXAMINED INCORRECTLY
+#
+SET @old_slow_query_log= @@global.slow_query_log;
+SET @old_log_output= @@global.log_output;
+SET @old_long_query_time= @@long_query_time;
+SET GLOBAL log_output= "TABLE";
+SET GLOBAL slow_query_log= ON;
+SET SESSION long_query_time= 0;
+CREATE TABLE t17059925 (a INT);
+CREATE TABLE t2 (b INT);
+CREATE TABLE t3 (c INT);
+INSERT INTO t17059925 VALUES (1), (2), (3);
+INSERT INTO t2 VALUES (4), (5), (6);
+INSERT INTO t3 VALUES (7), (8), (9);
+TRUNCATE table mysql.slow_log;
+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3;
+a
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT sql_text, rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%t17059925%';
+sql_text	rows_examined
+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3	18
+DROP TABLE t17059925, t2, t3;
+SET @@long_query_time= @old_long_query_time;
+SET @@global.log_output= @old_log_output;
+SET @@global.slow_query_log= @old_slow_query_log;
 
=== modified file 'mysql-test/r/variables.result'
--- mysql-test/r/variables.result	2013-06-27 15:35:20 +0000
+++ mysql-test/r/variables.result	2014-08-22 10:00:31 +0000
@@ -188,6 +188,8 @@
 @@concurrent_insert
 AUTO
 set global timed_mutexes=ON;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 show variables like 'timed_mutexes';
 Variable_name	Value
 timed_mutexes	ON
@@ -195,6 +197,8 @@
 VARIABLE_NAME	VARIABLE_VALUE
 TIMED_MUTEXES	ON
 set global timed_mutexes=0;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 show variables like 'timed_mutexes';
 Variable_name	Value
 timed_mutexes	OFF
 
=== modified file 'mysql-test/r/view.result'
--- mysql-test/r/view.result	2012-03-14 00:57:03 +0000
+++ mysql-test/r/view.result	2014-08-22 10:00:31 +0000
@@ -4109,3 +4109,40 @@
 DROP DATABASE IF EXISTS nodb;
 CREATE VIEW nodb.a AS SELECT 1;
 ERROR 42000: Unknown database 'nodb'
+#
+# BUG#14117018 - MYSQL SERVER CREATES INVALID VIEW DEFINITION
+# BUG#18405221 - SHOW CREATE VIEW OUTPUT INCORRECT
+#
+CREATE VIEW v1 AS (SELECT '' FROM DUAL);
+CREATE VIEW v2 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL);
+CREATE VIEW v3 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL);
+CREATE VIEW v4 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+(SELECT '' AS col2 FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL);
+# Name for the column in select1 is set properly with or
+# without this fix.
+SHOW CREATE VIEW v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS (select '' AS `Name_exp_1`)	latin1	latin1_swedish_ci
+# Name for the column in select2 is set with this fix.
+# Without this fix, name would not have set for the
+# columns in select2.
+SHOW CREATE VIEW v2;
+View	Create View	character_set_client	collation_connection
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `Name_exp_2`)	latin1	latin1_swedish_ci
+# Name for the field item in select2 & select3 is set with this fix.
+# Without this fix, name would not have set for the
+# columns in select2 & select3.
+SHOW CREATE VIEW v3;
+View	Create View	character_set_client	collation_connection
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `Name_exp_2`) union all (select '' AS `Name_exp_3`)	latin1	latin1_swedish_ci
+# Name for the field item in select3 is set with this fix.
+# Without this fix, name would not have set for the
+# columns in select3.
+SHOW CREATE VIEW v4;
+View	Create View	character_set_client	collation_connection
+v4	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `col2`) union all (select '' AS `Name_exp_3`)	latin1	latin1_swedish_ci
+DROP VIEW v1, v2, v3, v4;
 
=== modified file 'mysql-test/suite/binlog/t/binlog_killed.test'
--- mysql-test/suite/binlog/t/binlog_killed.test	2010-05-31 09:18:27 +0000
+++ mysql-test/suite/binlog/t/binlog_killed.test	2014-08-22 10:00:31 +0000
@@ -340,6 +340,14 @@
 # common cleanup 
 #
 
+connection con1;
+disconnect con1;
+--source include/wait_until_disconnected.inc
+connection con2;
+disconnect con2;
+--source include/wait_until_disconnected.inc
+connection default;
+
 drop table t1,t2,t3;
 
 --echo end of the tests
 
=== added file 'mysql-test/suite/innodb/r/bug71585.result'
--- mysql-test/suite/innodb/r/bug71585.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/r/bug71585.result	2014-08-22 10:00:31 +0000
@@ -0,0 +1,9 @@
+CREATE TABLE files (
+`PATH` varchar(150) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+`CONTENTS` mediumtext COLLATE utf8_unicode_ci NOT NULL,
+PRIMARY KEY (`PATH`)
+) ENGINE=innodb DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+INSERT INTO `files` (PATH,CONTENTS) VALUES ('X',repeat('0',8104));
+update files set path='x' where path='X';
+update files set path='X' where path='x';
+DROP TABLE files;
 
=== added file 'mysql-test/suite/innodb/r/bug72665.result'
--- mysql-test/suite/innodb/r/bug72665.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/r/bug72665.result	2014-08-22 10:00:31 +0000
@@ -0,0 +1,11 @@
+CREATE TABLE t1(c42 tinyblob not null, c45 TEXT, unique(c42 (255)), unique(c45 (255))) ENGINE=InnoDB;
+ALTER TABLE t1 MODIFY c45 SET('') NOT NULL;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c42` tinyblob NOT NULL,
+  `c45` set('') NOT NULL,
+  UNIQUE KEY `c42` (`c42`(255)),
+  UNIQUE KEY `c45` (`c45`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t1;
 
=== added file 'mysql-test/suite/innodb/r/innodb-fk.result'
--- mysql-test/suite/innodb/r/innodb-fk.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/r/innodb-fk.result	2014-08-22 10:00:31 +0000
@@ -0,0 +1,35 @@
+#
+# Bug #18806829 OPENING INNODB TABLES WITH MANY FOREIGN KEY
+# REFERENCES IS SLOW/CRASHES SEMAPHORE
+#
+create table t1 (f1 int primary key) engine=innodb;
+insert into t1 values (5);
+insert into t1 values (2882);
+insert into t1 values (10);
+update t1 set f1 = 28 where f1 = 2882;
+select * from fk_120;
+f1
+5
+10
+28
+select * from fk_1;
+f1
+5
+10
+28
+select * from fk_50;
+f1
+5
+10
+28
+drop table t1;
+#
+# Check if restrict is working fine.
+#
+create table t1 (f1 int primary key) engine=innodb;
+delete from t1 where f1 = 29;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`fk_29`, CONSTRAINT `pc29` FOREIGN KEY (`f1`) REFERENCES `t1` (`f1`))
+select * from fk_29;
+f1
+29
+drop table t1;
 
=== added file 'mysql-test/suite/innodb/t/bug71585.test'
--- mysql-test/suite/innodb/t/bug71585.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/bug71585.test	2014-08-22 10:00:31 +0000
@@ -0,0 +1,19 @@
+--source include/have_innodb.inc
+
+# Testcase for http://bugs.mysql.com/bug.php?id=71585:
+# second UPDATE statement causes
+# InnoDB: Assertion failure in thread 140299335526144 in file row0upd.c line 1793
+# InnoDB: Failing assertion: !(data[BTR_EXTERN_LEN] & BTR_EXTERN_OWNER_FLAG)
+
+CREATE TABLE files (
+`PATH` varchar(150) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+`CONTENTS` mediumtext COLLATE utf8_unicode_ci NOT NULL,
+PRIMARY KEY (`PATH`)
+) ENGINE=innodb DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+INSERT INTO `files` (PATH,CONTENTS) VALUES ('X',repeat('0',8104));
+
+update files set path='x' where path='X';
+update files set path='X' where path='x';
+
+DROP TABLE files;
 
=== added file 'mysql-test/suite/innodb/t/bug72665.test'
--- mysql-test/suite/innodb/t/bug72665.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/bug72665.test	2014-08-22 10:00:31 +0000
@@ -0,0 +1,14 @@
+--source include/have_innodb.inc
+
+# Testcase for http://bugs.mysql.com/bug.php?id=72665:
+# ALTER TABLE causes
+# InnoDB: Assertion failure in thread 4608106496 in file ha_innodb.cc line 7215
+# InnoDB: Failing assertion: primary_key_no == -1 || primary_key_no == 0
+
+CREATE TABLE t1(c42 tinyblob not null, c45 TEXT, unique(c42 (255)), unique(c45 (255))) ENGINE=InnoDB;
+
+ALTER TABLE t1 MODIFY c45 SET('') NOT NULL;
+
+SHOW CREATE TABLE t1;
+
+DROP TABLE t1;
 
=== added file 'mysql-test/suite/innodb/t/innodb-fk.test'
--- mysql-test/suite/innodb/t/innodb-fk.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/innodb-fk.test	2014-08-22 10:00:31 +0000
@@ -0,0 +1,86 @@
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+--echo #
+--echo # Bug #18806829 OPENING INNODB TABLES WITH MANY FOREIGN KEY
+--echo # REFERENCES IS SLOW/CRASHES SEMAPHORE
+--echo #
+
+create table t1 (f1 int primary key) engine=innodb;
+insert into t1 values (5);
+insert into t1 values (2882);
+insert into t1 values (10);
+
+let $fk_tables = 120;
+
+--disable_query_log
+let $i = $fk_tables;
+while ($i)
+{
+  eval create table fk_$i (f1 int primary key,
+          constraint pc$i foreign key (f1) references t1(f1)
+          on delete cascade on update cascade);
+  eval insert into fk_$i values (5);
+  eval insert into fk_$i values (2882);
+  eval insert into fk_$i values (10);
+  dec $i;
+}
+--enable_query_log
+
+--source include/restart_mysqld.inc
+
+update t1 set f1 = 28 where f1 = 2882;
+
+select * from fk_120;
+select * from fk_1;
+select * from fk_50;
+
+--disable_query_log
+let $i = $fk_tables;
+while ($i)
+{
+  eval drop table fk_$i;
+  dec $i;
+}
+--enable_query_log
+
+drop table t1;
+
+--echo #
+--echo # Check if restrict is working fine.
+--echo #
+
+create table t1 (f1 int primary key) engine=innodb;
+
+let $fk_tables = 30;
+
+--disable_query_log
+let $i = $fk_tables;
+while ($i)
+{
+  eval create table fk_$i (f1 int primary key,
+          constraint pc$i foreign key (f1) references t1(f1)
+          on delete restrict on update restrict);
+  eval insert into t1 values ($i);
+  eval insert into fk_$i values ($i);
+  dec $i;
+}
+--enable_query_log
+
+--source include/restart_mysqld.inc
+
+--error ER_ROW_IS_REFERENCED_2
+delete from t1 where f1 = 29;
+select * from fk_29;
+
+--disable_query_log
+let $i = $fk_tables;
+while ($i)
+{
+  eval drop table fk_$i;
+  dec $i;
+}
+--enable_query_log
+
+drop table t1;
+
 
=== modified file 'mysql-test/suite/innodb/t/innodb_bug60196-master.opt'
--- mysql-test/suite/innodb/t/innodb_bug60196-master.opt	2013-12-03 00:19:45 +0000
+++ mysql-test/suite/innodb/t/innodb_bug60196-master.opt	2014-08-22 10:00:31 +0000
@@ -1,1 +1,1 @@
---lower-case-table-names=2
+--lower-case-table-names=2
 
=== added file 'mysql-test/suite/rpl/r/rpl_4threads_deadlock.result'
--- mysql-test/suite/rpl/r/rpl_4threads_deadlock.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/r/rpl_4threads_deadlock.result	2014-08-22 10:00:31 +0000
@@ -0,0 +1,43 @@
+include/master-slave.inc
+[connection master]
+FLUSH LOGS;
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='+d,before_dump_thread_acquires_current_mutex,processlist_acquiring_dump_threads_LOCK_thd_data';
+include/stop_slave.inc
+include/start_slave.inc
+"Wait_for dump_thread_signal"
+SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
+SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go';
+SHOW BINARY LOGS;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go';
+PURGE BINARY LOGS BEFORE '9999-12-31';
+"Wait_for parked2"
+SET DEBUG_SYNC='now WAIT_FOR parked2';
+SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go';
+SELECT * FROM information_schema.processlist;
+"Wait_for parked3"
+SET DEBUG_SYNC='now WAIT_FOR parked3';
+SET DEBUG_SYNC='now SIGNAL go';
+include/stop_slave.inc
+include/start_slave.inc
+"Wait_for dump_thread_signal"
+SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
+SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go';
+SHOW BINARY LOGS;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go';
+PURGE BINARY LOGS BEFORE '9999-12-31';
+"Wait_for parked2"
+SET DEBUG_SYNC='now WAIT_FOR parked2';
+SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go';
+SHOW PROCESSLIST;
+"Wait_for parked3"
+SET DEBUG_SYNC='now WAIT_FOR parked3';
+SET DEBUG_SYNC='now SIGNAL go';
+"Cleanup"
+SET DEBUG_SYNC='RESET';
+SET GLOBAL DEBUG=@save_debug;
+include/rpl_end.inc
 
=== modified file 'mysql-test/suite/rpl/r/rpl_semi_sync.result'
--- mysql-test/suite/rpl/r/rpl_semi_sync.result	2012-10-02 18:05:51 +0000
+++ mysql-test/suite/rpl/r/rpl_semi_sync.result	2014-08-22 10:00:31 +0000
@@ -386,6 +386,7 @@
 include/stop_slave.inc
 [ on master ]
 set sql_log_bin=0;
+include/stop_dump_threads.inc
 UNINSTALL PLUGIN rpl_semi_sync_master;
 set sql_log_bin=1;
 SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
@@ -439,9 +440,8 @@
 #
 # Clean up
 #
+include/uninstall_semisync.inc
 include/stop_slave.inc
-UNINSTALL PLUGIN rpl_semi_sync_slave;
-UNINSTALL PLUGIN rpl_semi_sync_master;
 change master to master_user='root',master_password='';
 include/start_slave.inc
 drop table t1;
 
=== added file 'mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result'
--- mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result	2014-08-22 10:00:31 +0000
@@ -0,0 +1,36 @@
+include/master-slave.inc
+[connection master]
+INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_PLUGIN';
+INSTALL PLUGIN rpl_semi_sync_slave SONAME 'SEMISYNC_SLAVE_PLUGIN';
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+UNINSTALL PLUGIN rpl_semi_sync_master;
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (1);
+DROP TABLE t1;
+include/install_semisync.inc
+call mtr.add_suppression("Plugin 'rpl_semi_sync_slave' cannot be uninstalled now");
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+ERROR HY000: Unknown error
+call mtr.add_suppression("Plugin 'rpl_semi_sync_master' cannot be uninstalled now");
+UNINSTALL PLUGIN rpl_semi_sync_master;
+ERROR HY000: Unknown error
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (2);
+DROP TABLE t1;
+include/assert.inc [semi sync slave status should be ON.]
+include/assert.inc [semi sync master status should be ON.]
+include/assert.inc [semi sync master clients should be 1.]
+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
+include/assert.inc [semi sync master clients should be 1.]
+UNINSTALL PLUGIN rpl_semi_sync_master;
+ERROR HY000: Unknown error
+include/stop_slave.inc
+SET GLOBAL rpl_semi_sync_slave_enabled = OFF;
+include/start_slave.inc
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+include/assert.inc [semi sync master clients should be 0.]
+UNINSTALL PLUGIN rpl_semi_sync_master;
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (3);
+DROP TABLE t1;
+include/rpl_end.inc
 
=== modified file 'mysql-test/suite/rpl/r/rpl_stop_slave.result'
--- mysql-test/suite/rpl/r/rpl_stop_slave.result	2011-03-17 12:12:25 +0000
+++ mysql-test/suite/rpl/r/rpl_stop_slave.result	2014-08-22 10:00:31 +0000
@@ -93,10 +93,12 @@
 CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
 CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES(1, 1);
+include/stop_slave.inc
 [connection master]
+include/stop_dump_threads.inc
 SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
 [connection slave]
-include/restart_slave.inc
+include/start_slave.inc
 BEGIN;
 UPDATE t1 SET c2 = 2 WHERE c1 = 1;
 [connection master]
@@ -115,8 +117,11 @@
 [connection slave]
 include/wait_for_slave_to_stop.inc
 [connection slave1]
+[connection master]
+SET GLOBAL debug= '$debug_save';
+include/stop_dump_threads.inc
+[connection slave1]
 include/start_slave.inc
 [connection master]
 DROP TABLE t1, t2;
-SET GLOBAL debug= $debug_save;
 include/rpl_end.inc
 
=== added file 'mysql-test/suite/rpl/t/rpl_4threads_deadlock.test'
--- mysql-test/suite/rpl/t/rpl_4threads_deadlock.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_4threads_deadlock.test	2014-08-22 10:00:31 +0000
@@ -0,0 +1,117 @@
+###############################################################################
+# Bug#17283409  4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
+#                        SHOW BINLOGS
+# Problem:  A deadlock was occuring when 4 threads were involved in acquiring
+#                locks
+#     Thread 1: Dump thread ( Slave is reconnecting, so on Master, a new dump
+#                    thread is trying kill zombie dump threads. It acquired
+#                    thread's LOCK_thd_data and it is about to acquire
+#                    mysys_var->current_mutex ( which LOCK_log)
+#     Thread 2: Application thread is executing show binlogs and acquired
+#                    LOCK_log and it is about to acquire LOCK_index.
+#     Thread 3: Applicaiton thread is executing Purge binary logs and acquired
+#                    LOCK_index and it is about to acquire LOCK_thread_count.
+#     Thread 4: Application thread is executing show processlist and acquired
+#                    LOCK_thread_count and it is about to acquire zombie dump
+#                    thread's LOCK_thd_data.
+#     Deadlock : Thread 1 -> Thread 2 -> Thread 3-> Thread 4 -> Thread 1
+# The same above deadlock was observed when thread 4 is replaced with another
+# thread which is executing 'SELECT * FROM information_schema.processlist'
+# command and acquired LOCK_thread_count and it is about to acquire zombie
+# dump thread's LOCK_thd_data.
+# Fix: Introuced a new lock (Lock_thread_remove) which will guard the thread
+# deletion (exit process) and the same lock is used in show processlist
+# execution instead of LOCK_thread_count. i.e., After the patch, Server allows
+# new threads to join the system but it will not any threads to execute its
+# 'cleanup' process.  Now the new lock order is: LOCK_thread_remove ->
+# LOCK_thd_data -> LOCK_log -> LOCK_index -> LOCK_thread_count Both the above
+# scenarios are tested with the below test code and it proves that there is no
+# deadlock after the fix.
+###############################################################################
+--source include/have_debug_sync.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+connect(master2,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect(master3,127.0.0.1,root,,test,$MASTER_MYPORT,);
+--connection master
+# Create atleast one binary log, otherwise purge logs command, show binary
+# logs command do not hit the DEBUG_SYNC points.
+FLUSH LOGS;
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='+d,before_dump_thread_acquires_current_mutex,processlist_acquiring_dump_threads_LOCK_thd_data';
+
+# Iteration 1 with "SHOW PROCESSLIST command"
+# Iteration 2 with "SELECT * FROM information_schema.processlist"
+--let $iter=2
+while ($iter)
+{
+  --connection slave
+  --source include/stop_slave.inc
+  --source include/start_slave.inc
+  # Thread 1
+  --connection master
+  --echo "Wait_for dump_thread_signal"
+  SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
+
+  # Thread 2
+  --connection master1
+  SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go';
+  --send SHOW BINARY LOGS
+
+  --connection master
+  echo "Wait_for parked1";
+  SET DEBUG_SYNC='now WAIT_FOR parked1';
+
+  # Thread 3
+  --connection master2
+  SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go';
+  --send PURGE BINARY LOGS BEFORE '9999-12-31'
+
+  --connection master
+  echo "Wait_for parked2";
+  SET DEBUG_SYNC='now WAIT_FOR parked2';
+
+  # Thread 4
+  --connection master3
+  SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go';
+  if ($iter == 1)
+  {
+    --let $query=SHOW PROCESSLIST
+  }
+  if ($iter == 2)
+  {
+    --let $query=SELECT * FROM information_schema.processlist
+  }
+  --send_eval $query
+
+  --connection master
+  echo "Wait_for parked3";
+  SET DEBUG_SYNC='now WAIT_FOR parked3';
+
+  --connection master
+  SET DEBUG_SYNC='now SIGNAL go';
+
+  # Output of each command vary depends on other tests ran in suite(output vary
+  # in Pb2 runs), so lets ignore output. Anyways, we are interested in seeing
+  # that there is no deadlock.
+  --disable_result_log
+  --connection master1
+  --reap
+  --connection master2
+  --reap
+  --connection master3
+  --reap
+  --enable_result_log
+
+  --dec $iter
+}
+
+--echo "Cleanup"
+--disconnect master2
+--disconnect master3
+
+--connection master
+SET DEBUG_SYNC='RESET';
+SET GLOBAL DEBUG=@save_debug;
+source include/rpl_end.inc;
 
=== modified file 'mysql-test/suite/rpl/t/rpl_semi_sync.test'
--- mysql-test/suite/rpl/t/rpl_semi_sync.test	2012-10-02 18:05:51 +0000
+++ mysql-test/suite/rpl/t/rpl_semi_sync.test	2014-08-22 10:00:31 +0000
@@ -545,6 +545,7 @@
 connection master;
 echo [ on master ];
 set sql_log_bin=0;
+--source include/stop_dump_threads.inc
 UNINSTALL PLUGIN rpl_semi_sync_master;
 set sql_log_bin=1;
 enable_query_log;
@@ -598,19 +599,10 @@
 --echo #
 --echo # Clean up
 --echo #
+--source include/uninstall_semisync.inc
 
 connection slave;
 source include/stop_slave.inc;
-UNINSTALL PLUGIN rpl_semi_sync_slave;
-
-connection master;
-# The dump thread may still be running on the master, and so the following
-# UNINSTALL could generate a warning about the plugin is busy.
-disable_warnings;
-UNINSTALL PLUGIN rpl_semi_sync_master;
-enable_warnings;
-
-connection slave;
 change master to master_user='root',master_password='';
 source include/start_slave.inc;
 
 
=== added file 'mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt'
--- mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt	2014-08-22 10:00:31 +0000
@@ -0,0 +1,1 @@
+$SEMISYNC_PLUGIN_OPT
 
=== added file 'mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt'
--- mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt	2014-08-22 10:00:31 +0000
@@ -0,0 +1,1 @@
+$SEMISYNC_PLUGIN_OPT
 
=== added file 'mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test'
--- mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test	2014-08-22 10:00:31 +0000
@@ -0,0 +1,145 @@
+###############################################################################
+# Bug#17638477 UNINSTALL AND INSTALL SEMI-SYNC PLUGIN CAUSES SLAVES TO BREAK
+#  Problem: Uninstallation of Semi sync plugin should be blocked when it is
+#  in use.
+#  Test case: Uninstallation of semi sync should be allowed
+#   On Master:
+#     1) When there is no dump thread
+#     2) When there are no semi sync slaves (i.e., async replication).
+#   On Slave:
+#     1) When there is no I/O thread
+#     2) When there are no semi sync enabled I/O thread (i.e.,async replication).
+###############################################################################
+
+--source include/have_semisync_plugin.inc
+--source include/not_embedded.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+###############################################################################
+# Case 1: Uninstallation of semi sync plugins should be allowed when it is
+#  not in use i.e., when asynchronous replication is active.
+###############################################################################
+# Step 1.1: Install semi sync master plugin on master
+--replace_result $SEMISYNC_MASTER_PLUGIN SEMISYNC_MASTER_PLUGIN
+eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+
+# Step 1.2: Install semi sync slave plugin on slave
+--connection slave
+--replace_result $SEMISYNC_SLAVE_PLUGIN SEMISYNC_SLAVE_PLUGIN
+eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+
+# Step 1.3: Uninstallation of semisync plugin on master and slave should be
+#  allowed at this state as there is no semi sync replication enabled between
+#  master and slave.
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+--connection master
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+# Step 1.4: Check that replication is working fine at the end of the test case.
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (1);
+DROP TABLE t1;
+--sync_slave_with_master
+
+###############################################################################
+# Case 2: Uninstallation of semi sync plugins should be disallowed
+#  when it is in use i.e., when semi sync replication is active
+###############################################################################
+# Step 2.1: Install and enable semi sync replication between master and slave
+--source include/install_semisync.inc
+
+# Step 2.2: Check that rpl_semi_sync_slave uninstallation on Slave is not
+#  possible at this state
+--connection slave
+call mtr.add_suppression("Plugin 'rpl_semi_sync_slave' cannot be uninstalled now");
+--error ER_UNKNOWN_ERROR
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+
+# Step 2.3: Check that rpl_semi_sync_master uninstallation on Master is not
+#  possible at this state
+--connection master
+call mtr.add_suppression("Plugin 'rpl_semi_sync_master' cannot be uninstalled now");
+--error ER_UNKNOWN_ERROR
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+# Step 2.4: Check that replication is working fine at the end of the test case.
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (2);
+DROP TABLE t1;
+--sync_slave_with_master
+
+# Step 2.5: Make sure rpl_semi_sync_master_status on Master and
+# rpl_semi_sync_slave_staus on Slave are ON
+--let $slave_status=[show status like "Rpl_semi_sync_slave_status", Value, 1]
+--let assert_cond= "$slave_status" = "ON"
+--let assert_text= semi sync slave status should be ON.
+--source include/assert.inc
+
+--connection master
+--let $master_status=[show status like "Rpl_semi_sync_master_status", Value, 1]
+--let assert_cond= "$master_status" = "ON"
+--let assert_text= semi sync master status should be ON.
+--source include/assert.inc
+
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 1
+--let assert_text= semi sync master clients should be 1.
+--source include/assert.inc
+
+###############################################################################
+# Case 3: Uninstallation of semi sync plugin should be disallowed when there
+#  are semi sync slaves even though rpl_semi_sync_master_enabled= OFF;.
+###############################################################################
+# Step 3.1: Disable semi sync on master
+--connection master
+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
+
+# Step 3.2: Check that still Rpl_semi_sync_master_clients is 1
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 1
+--let assert_text= semi sync master clients should be 1.
+--source include/assert.inc
+
+# Step 3.3: Since Rpl_semi_sync_master_clients is 1, uninstallation of
+#  rpl_semi_sync_master should be disallowed.
+--error ER_UNKNOWN_ERROR
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+###############################################################################
+# Case 4: Uninstallation of semi sync plugin should be allowed when it is not
+#  in use. Same as Case 1 but this case is to check the case after enabling and
+#  disabling semi sync replication.
+###############################################################################
+
+# Step 4.1: Stop IO thread on slave.
+--connection slave
+--source include/stop_slave.inc
+
+# Step 4.2: Disable semi sync on slave.
+SET GLOBAL rpl_semi_sync_slave_enabled = OFF;
+
+# Step 4.3: Start IO thread on slave.
+--source include/start_slave.inc
+
+# Step 4.4: Uninstall semi sync plugin, it should be successful now.
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+
+# Step 4.5: On Master, check that semi sync slaves are now '0'.
+--connection master
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 0
+--let assert_text= semi sync master clients should be 0.
+--source include/assert.inc
+
+# Step 4.6: So uninstalling semi sync plugin should be allowed
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+# Step 4.7: Check that replication is working fine at the end of the test case
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (3);
+DROP TABLE t1;
+--sync_slave_with_master
+
+# Cleanup
+source include/rpl_end.inc;
 
=== modified file 'mysql-test/suite/rpl/t/rpl_stop_slave.test'
--- mysql-test/suite/rpl/t/rpl_stop_slave.test	2011-03-17 12:12:25 +0000
+++ mysql-test/suite/rpl/t/rpl_stop_slave.test	2014-08-22 10:00:31 +0000
@@ -72,14 +72,17 @@
 INSERT INTO t1 VALUES(1, 1);
 
 sync_slave_with_master;
+--source include/stop_slave.inc
 
 --source include/rpl_connection_master.inc
+# make sure that there are no zombie threads
+--source include/stop_dump_threads.inc
 
 let $debug_save= `SELECT @@GLOBAL.debug`;
 SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
 
 --source include/rpl_connection_slave.inc
-source include/restart_slave_sql.inc;
+--source include/start_slave.inc
 
 BEGIN;
 UPDATE t1 SET c2 = 2 WHERE c1 = 1;
@@ -91,6 +94,10 @@
 UPDATE t1 SET c2 = 3 WHERE c1 = 1;
 COMMIT;
 
+# wait for the dump thread reach the sync point
+--let $wait_condition= select count(*)=1 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
+--source include/wait_condition.inc
+
 --source include/rpl_connection_slave1.inc
 let $show_statement= SHOW PROCESSLIST;
 let $field= Info;
@@ -103,7 +110,12 @@
 ROLLBACK;
 
 --source include/rpl_connection_master.inc
+
 SET DEBUG_SYNC= 'now SIGNAL signal.continue';
+# wait for the dump thread to come out of the
+# waiting phase before resetting the signals
+--let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
+--source include/wait_condition.inc
 SET DEBUG_SYNC= 'RESET';
 
 --source include/rpl_connection_slave.inc
@@ -111,9 +123,22 @@
 
 --source include/rpl_connection_slave1.inc
 reap;
+
+# Slave has stopped, thence lets make sure that
+# we kill the zombie dump threads. Also, make
+# sure that we disable the DBUG_EXECUTE_IF
+# that would set the dump thread to wait
+--source include/rpl_connection_master.inc
+SET GLOBAL debug= '$debug_save';
+# make sure that there are no zombie threads
+--source include/stop_dump_threads.inc
+
+--source include/rpl_connection_slave1.inc
+# now the dump thread on the master will start
+# from a clean slate, i.e. without the
+# DBUG_EXECUTE_IF set
 source include/start_slave.inc;
 
 --source include/rpl_connection_master.inc
 DROP TABLE t1, t2;
-SET GLOBAL debug= $debug_save;
 --source include/rpl_end.inc
 
=== modified file 'mysql-test/suite/sys_vars/r/timed_mutexes_basic.result'
--- mysql-test/suite/sys_vars/r/timed_mutexes_basic.result	2009-10-09 13:34:07 +0000
+++ mysql-test/suite/sys_vars/r/timed_mutexes_basic.result	2014-08-22 10:00:31 +0000
@@ -4,7 +4,11 @@
 0
 '#--------------------FN_DYNVARS_177_01------------------------#'
 SET @@global.timed_mutexes = 1;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SET @@global.timed_mutexes = DEFAULT;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
@@ -17,15 +21,21 @@
 SELECT global.timed_mutexes;
 ERROR 42S02: Unknown table 'global' in field list
 SET global timed_mutexes = 1;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
 '#--------------------FN_DYNVARS_177_03------------------------#'
 SET @@global.timed_mutexes = 0;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
 SET @@global.timed_mutexes = 1;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
@@ -82,23 +92,33 @@
 ON
 '#---------------------FN_DYNVARS_177_08-------------------------#'
 SET @@global.timed_mutexes = OFF;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
 SET @@global.timed_mutexes = ON;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
 '#---------------------FN_DYNVARS_177_09----------------------#'
 SET @@global.timed_mutexes = TRUE;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
 SET @@global.timed_mutexes = FALSE;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
 SET @@global.timed_mutexes = @global_start_value;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
 
=== added file 'mysql-test/t/bug71858.test'
--- mysql-test/t/bug71858.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/bug71858.test	2014-08-22 10:00:31 +0000
@@ -0,0 +1,14 @@
+# Testcase for http://bugs.mysql.com/bug.php?id=71858 (bug 1286186):
+
+# mysqld: /home/openxs/bzr/percona-5.6/sql/mdl.h:348:
+# void MDL_key::mdl_key_init(MDL_key::enum_mdl_namespace, const char*, const char*): Assertion `strlen(db) <= (64*3) && strlen(name) <= (64*3)' failed.
+
+SELECT table_schema, table_name, column_name, column_type FROM INFORMATION_SCHEMA.COLUMNS
+       WHERE TABLE_NAME IN ( 'ooooooooooooooooooooooooooooooooooooo' 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa '
+'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cc' 'ccccccccccccc' 'wwwwwwwwwwwwwwwwwww' 'rrrrrrrrrrrrrrrr'
+'tttttttttttttttttttt' 'yyyyyyyyyyyyyyyyyyy' 'uuuuuuuuuuuuuuuuuuuuuuuuuuuu' 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiii'
+'oooooooooooooooooooo' 'ppppppppppppppppppppppppppppp' 'jjjjjjjjjjjj' 'kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk'
+'lllllllllllllllllllllllllllllllllllllll' 'zzzzzzzzzzzzzzz' 'xxxxxxxxxxxxxxxxx' 'cccccccccc'
+'vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+'nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn' ) AND TABLE_SCHEMA='AA_BBB' AND COLUMN_TYPE='PRI'
+ORDER BY 2;
 
=== modified file 'mysql-test/t/failed_auth_3909.test'
--- mysql-test/t/failed_auth_3909.test	2013-04-30 11:48:24 +0000
+++ mysql-test/t/failed_auth_3909.test	2014-08-22 10:00:31 +0000
@@ -3,15 +3,12 @@
 #
 # MDEV-3909 remote user enumeration
 #
-# verify that for some failed login attemps (with wrong user names)
-# the server requests a plugin
-#
 optimize table mysql.user;
 insert mysql.user (user,plugin) values ('foo','bar'),('bar','bar'),('baz','bar');
 flush privileges;
 
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
---error ER_PLUGIN_IS_NOT_LOADED
+--error ER_ACCESS_DENIED_ERROR
 connect (fail,localhost,u1);
 
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
@@ -22,7 +19,7 @@
 --error ER_ACCESS_DENIED_ERROR
 connect (fail,localhost,u2,password);
 
---error ER_PLUGIN_IS_NOT_LOADED
+--error ER_ACCESS_DENIED_ERROR
 change_user u1;
 
 --error ER_ACCESS_DENIED_ERROR
 
=== modified file 'mysql-test/t/group_min_max.test'
--- mysql-test/t/group_min_max.test	2013-05-13 11:45:25 +0000
+++ mysql-test/t/group_min_max.test	2014-08-22 10:00:31 +0000
@@ -1243,3 +1243,27 @@
 drop table t1;
 --echo # End of test#50539.
 
+--echo #
+--echo # Bug#17217128 -  BAD INTERACTION BETWEEN MIN/MAX AND
+--echo #                 "HAVING SUM(DISTINCT)": WRONG RESULTS.
+--echo #
+
+CREATE TABLE t (a INT, b INT, KEY(a,b));
+INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5);
+ANALYZE TABLE t;
+
+SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+
+SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+EXPLAIN SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+
+SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+EXPLAIN SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+
+SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+EXPLAIN SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+
+SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+DROP TABLE t;
 
=== modified file 'mysql-test/t/group_min_max_innodb.test'
--- mysql-test/t/group_min_max_innodb.test	2011-10-19 12:07:14 +0000
+++ mysql-test/t/group_min_max_innodb.test	2014-08-22 10:00:31 +0000
@@ -137,3 +137,96 @@
 DROP TABLE t1;
 
 --echo End of 5.5 tests
+
+--echo #
+--echo # Bug#17909656 - WRONG RESULTS FOR A SIMPLE QUERY WITH GROUP BY
+--echo #
+
+CREATE TABLE t0 (
+  i1 INTEGER NOT NULL
+);
+
+INSERT INTO t0 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
+                      (11),(12),(13),(14),(15),(16),(17),(18),(19),(20),
+                      (21),(22),(23),(24),(25),(26),(27),(28),(29),(30);
+
+CREATE TABLE t1 (
+  c1 CHAR(1) NOT NULL,
+  i1 INTEGER NOT NULL,
+  i2 INTEGER NOT NULL,
+  UNIQUE KEY k1 (c1,i2)
+) ENGINE=InnoDB;
+
+INSERT INTO t1 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'F',i1,i1 FROM t0;
+                 
+CREATE TABLE t2 (
+  c1 CHAR(1) NOT NULL,
+  i1 INTEGER NOT NULL,
+  i2 INTEGER NOT NULL,
+  UNIQUE KEY k2 (c1,i1,i2)
+) ENGINE=InnoDB;
+
+INSERT INTO t2 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'F',i1,i1 FROM t0;
+
+-- disable_result_log
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+-- enable_result_log
+
+let query=
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
+GROUP BY c1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
+GROUP BY c1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
+GROUP BY c1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, max(i2) FROM t1 
+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
+GROUP BY c1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, i1, max(i2) FROM t2
+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
+GROUP BY c1,i1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, i1, max(i2) FROM t2 
+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
+GROUP BY c1,i1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, i1, max(i2) FROM t2 
+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
+GROUP BY c1,i1;
+eval EXPLAIN $query;
+eval $query;
+
+DROP TABLE t0,t1,t2;
 
=== modified file 'mysql-test/t/long_tmpdir-master.sh'
--- mysql-test/t/long_tmpdir-master.sh	2007-06-11 19:06:20 +0000
+++ mysql-test/t/long_tmpdir-master.sh	2014-08-22 10:00:31 +0000
@@ -1,3 +1,5 @@
+#! /bin/bash
+
 d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789"
 test -d "$d" || mkdir "$d"
 rm -f "$d"/*
 
=== modified file 'mysql-test/t/lowercase_mixed_tmpdir-master.sh'
--- mysql-test/t/lowercase_mixed_tmpdir-master.sh	2007-04-30 21:16:46 +0000
+++ mysql-test/t/lowercase_mixed_tmpdir-master.sh	2014-08-22 10:00:31 +0000
@@ -1,3 +1,5 @@
+#! /bin/bash
+
 # This test requires a non-lowercase tmpdir directory on a case-sensitive
 # filesystem.
 
 
=== modified file 'mysql-test/t/lowercase_table4-master.opt'
--- mysql-test/t/lowercase_table4-master.opt	2013-12-03 00:23:27 +0000
+++ mysql-test/t/lowercase_table4-master.opt	2014-08-22 10:00:31 +0000
@@ -1,1 +1,1 @@
---lower-case-table-names=2
+--lower-case-table-names=2
 
=== modified file 'mysql-test/t/partition_archive.test'
--- mysql-test/t/partition_archive.test	2009-08-11 12:18:26 +0000
+++ mysql-test/t/partition_archive.test	2014-08-22 10:00:31 +0000
@@ -126,3 +126,21 @@
 select count(*) from t1;
 drop table t1;
 
+
+--echo #
+--echo #BUG 18618561: FAILED ALTER TABLE ENGINE CHANGE WITH PARTITIONS
+--echo #              CORRUPTS FRM
+
+CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
+PARTITIONS 5;
+SHOW CREATE TABLE t1;
+
+--replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ENGINE= ARCHIVE;
+
+--echo #After the patch, the ENGINE is correctly displayed as MyISAM
+SHOW CREATE TABLE t1;
+
+--echo #Cleanup.
+DROP TABLE t1;
 
=== modified file 'mysql-test/t/partition_pruning.test'
--- mysql-test/t/partition_pruning.test	2010-09-13 13:56:56 +0000
+++ mysql-test/t/partition_pruning.test	2014-08-22 10:00:31 +0000
@@ -1410,3 +1410,51 @@
 explain partitions select * from t1 where a between 10 and 10+33;
 
 drop table t0, t1;
+
+--echo #
+--echo # Bug#71095: Wrong results with PARTITION BY LIST COLUMNS()
+--echo #
+CREATE TABLE t1
+(c1 int,
+ c2 int,
+ c3 int,
+ c4 int,
+ PRIMARY KEY (c1,c2))
+PARTITION BY LIST COLUMNS (c2)
+(PARTITION p1 VALUES IN (1,2),
+ PARTITION p2 VALUES IN (3,4));
+INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
+INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+DROP TABLE t1;
 
=== modified file 'mysql-test/t/percona_bug1289599.test'
--- mysql-test/t/percona_bug1289599.test	2014-03-13 18:25:59 +0000
+++ mysql-test/t/percona_bug1289599.test	2014-08-22 10:00:31 +0000