Merge lp:~laurynas-biveinis/percona-server/merge-5.6.19 into lp:percona-server/5.6

[Laurynas Biveinis]

Merge MySQL 5.6.19, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.6.18,
taking the upstream fix for bug 1303749
(http://bugs.mysql.com/bug.php?id=69641).

Revert our fix for bug 1279671 aka
http://bugs.mysql.com/bug.php?id=71708 partially (keeping the
autoinc_mutex bits). A full revert and autoinc_mutex part
reimplementation using the upstream framework is possible, but mostly
redundant work at this stage (5.7 includes full fix, thus not much to
gain by reverting it in 5.6).

Revert ours and take the upstream fix for bug 1274827 aka
http://bugs.mysql.com/bug.php?id=71089.

Replace mysql-test/include/linux.inc with the upstream version.

Update testcases percona_processlist_row_stats and
percona_show_slave_status_nolock to work with the upstream DEBUG_SYNC
changes that introduced NO_CLEAR_EVENT keyword and changed signal
semantics for the case of more than one waiter on a signal (Oracle
18221750, 14765080).

Import man pages from mysql-5.6.19.tar.gz.

http://jenkins.percona.com/job/percona-server-5.6-param/615/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file '.bzrignore'
--- .bzrignore	2014-04-25 10:55:01 +0000
+++ .bzrignore	2014-06-05 04:33:53 +0000
@@ -524,7 +524,6 @@
 examples/*.ds?
 examples/*.vcproj
 examples/udf_example/udf_example.def
-extra/.deps/charset2html.Po
 extra/.deps/comp_err.Po
 extra/.deps/innochecksum.Po
 extra/.deps/my_print_defaults.Po
@@ -533,7 +532,6 @@
 extra/.deps/replace.Po
 extra/.deps/resolve_stack_dump.Po
 extra/.deps/resolveip.Po
-extra/charset2html
 extra/comp_err
 extra/created_include_files
 extra/innochecksum
@@ -1507,7 +1505,6 @@
 mysys/.deps/tree.Po
 mysys/.deps/trie.Po
 mysys/.deps/typelib.Po
-mysys/charset2html
 mysys/getopt.c
 mysys/getopt1.c
 mysys/main.cc

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-27 08:19:04 +0000
+++ CMakeLists.txt	2014-06-05 04:33:53 +0000
@@ -19,9 +19,10 @@
  CMAKE_POLICY(VERSION 2.8)
 endif()
 
-#fix for http://bugs.mysql.com/bug.php?id=71089
-IF(NOT(CMAKE_VERSION VERSION_LESS "2.8.12"))
-  CMAKE_POLICY(SET CMP0022 OLD)
+# We use PROPERTIES LINK_INTERFACE_LIBRARIES. See cmake --help-policy CMP0022
+IF(CMAKE_VERSION VERSION_EQUAL "2.8.12" OR
+   CMAKE_VERSION VERSION_GREATER "2.8.12")
+ CMAKE_POLICY(SET CMP0022 OLD)
 ENDIF()
 
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
@@ -477,6 +478,10 @@
   IF(WIN32)
     ADD_DEFINITIONS( /D _VARIADIC_MAX=10 )
   ENDIF()
+  # libc++ doesn't have tuple in tr1
+  IF(HAVE_LLVM_LIBCPP)
+    ADD_DEFINITIONS(-DGTEST_USE_OWN_TR1_TUPLE=1)
+  ENDIF()
   ADD_SUBDIRECTORY(unittest/gunit)
 ENDIF()
 

=== modified file 'VERSION'
--- VERSION	2014-05-27 08:19:04 +0000
+++ VERSION	2014-06-05 04:33:53 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=17
-MYSQL_VERSION_EXTRA=-65.0
+MYSQL_VERSION_PATCH=19
+MYSQL_VERSION_EXTRA=-66.1

=== modified file 'client/mysqldump.c'
--- client/mysqldump.c	2014-05-06 13:04:32 +0000
+++ client/mysqldump.c	2014-06-05 04:33:53 +0000
@@ -3029,7 +3029,7 @@
 
       if (strcmp (table_type, "VIEW") == 0)         /* view */
         print_comment(sql_file, 0,
-                      "\n--\n-- Temporary table structure for view %s\n--\n\n",
+                      "\n--\n-- Temporary view structure for view %s\n--\n\n",
                       result_table);
       else
         print_comment(sql_file, 0,
@@ -3056,7 +3056,7 @@
         char *scv_buff= NULL;
         my_ulonglong n_cols;
 
-        verbose_msg("-- It's a view, create dummy table for view\n");
+        verbose_msg("-- It's a view, create dummy view\n");
 
         /* save "show create" statement for later */
         if ((row= mysql_fetch_row(result)) && (scv_buff=row[1]))
@@ -3129,7 +3129,7 @@
           fprintf(sql_file,
                   "SET @saved_cs_client     = @@character_set_client;\n"
                   "SET character_set_client = utf8;\n"
-                  "/*!50001 CREATE TABLE %s (\n",
+                  "/*!50001 CREATE VIEW %s AS SELECT \n",
                   result_table);
 
           /*
@@ -3138,31 +3138,24 @@
             there should be a _trailing_ comma.
           */
 
+
           row= mysql_fetch_row(result);
 
           /*
-            The actual column type doesn't matter anyway, since the table will
-            be dropped at run time.
-            We do tinyint to avoid hitting the row size limit.
+            A temporary view is created to resolve the view interdependencies.
+            This temporary view is dropped when the actual view is created.
           */
-          fprintf(sql_file, "  %s tinyint NOT NULL",
+
+          fprintf(sql_file, " 1 AS %s",
                   quote_name(row[0], name_buff, 0));
 
           while((row= mysql_fetch_row(result)))
           {
-            /* col name, col type */
-            fprintf(sql_file, ",\n  %s tinyint NOT NULL",
+            fprintf(sql_file, ",\n 1 AS %s",
                     quote_name(row[0], name_buff, 0));
           }
 
-          /*
-            Stand-in tables are always MyISAM tables as the default
-            engine might have a column-limit that's lower than the
-            number of columns in the view, and MyISAM support is
-            guaranteed to be in the server anyway.
-          */
-          fprintf(sql_file,
-                  "\n) ENGINE=MyISAM */;\n"
+          fprintf(sql_file,"*/;\n"
                   "SET character_set_client = @saved_cs_client;\n");
 
           check_io(sql_file);
@@ -6148,15 +6141,8 @@
                 "\n--\n-- Final view structure for view %s\n--\n\n",
                 result_table);
 
-  /* Table might not exist if this view was dumped with --tab. */
-  fprintf(sql_file, "/*!50001 DROP TABLE IF EXISTS %s*/;\n", opt_quoted_table);
-  if (opt_drop)
-  {
-    fprintf(sql_file, "/*!50001 DROP VIEW IF EXISTS %s*/;\n",
-            opt_quoted_table);
-    check_io(sql_file);
-  }
-
+  verbose_msg("-- Dropping the temporary view structure created\n");
+  fprintf(sql_file, "/*!50001 DROP VIEW IF EXISTS %s*/;\n", opt_quoted_table);
 
   my_snprintf(query, sizeof(query),
               "SELECT CHECK_OPTION, DEFINER, SECURITY_TYPE, "

=== modified file 'cmake/os/WindowsCache.cmake'
--- cmake/os/WindowsCache.cmake	2013-07-15 10:44:54 +0000
+++ cmake/os/WindowsCache.cmake	2014-06-05 04:33:53 +0000
@@ -20,6 +20,7 @@
 # different results.
 
 IF(MSVC)
+SET(HAVE_LLVM_LIBCPP CACHE  INTERNAL "")
 SET(HAVE_ACCESS 1 CACHE  INTERNAL "")
 SET(HAVE_AIO_H CACHE  INTERNAL "")
 SET(HAVE_AIO_READ CACHE  INTERNAL "")

=== modified file 'cmake/ssl.cmake'
--- cmake/ssl.cmake	2014-02-17 11:12:40 +0000
+++ cmake/ssl.cmake	2014-06-05 04:33:53 +0000
@@ -232,7 +232,8 @@
       MYSQL_USE_BUNDLED_SSL()
     ENDIF()
   ELSE()
-    MESSAGE(SEND_ERROR "Wrong option for WITH_SSL. Valid values are: " ${WITH_SSL_DOC})
+    MESSAGE(SEND_ERROR
+      "Wrong option for WITH_SSL. Valid values are : ${WITH_SSL_DOC}")
   ENDIF()
 ENDMACRO()
 

=== modified file 'config.h.cmake'
--- config.h.cmake	2014-04-25 10:55:01 +0000
+++ config.h.cmake	2014-06-05 04:33:53 +0000
@@ -19,6 +19,7 @@
 /* Headers we may want to use. */
 #cmakedefine STDC_HEADERS 1
 #cmakedefine _GNU_SOURCE 1
+#cmakedefine HAVE_LLVM_LIBCPP 1
 #cmakedefine HAVE_ALLOCA_H 1
 #cmakedefine HAVE_AIO_H 1
 #cmakedefine HAVE_ARPA_INET_H 1

=== modified file 'configure.cmake'
--- configure.cmake	2014-05-28 07:42:34 +0000
+++ configure.cmake	2014-06-05 04:33:53 +0000
@@ -21,6 +21,7 @@
 INCLUDE (CheckFunctionExists)
 INCLUDE (CheckCCompilerFlag)
 INCLUDE (CheckCSourceRuns)
+INCLUDE (CheckCXXSourceRuns)
 INCLUDE (CheckSymbolExists)
 
 
@@ -86,6 +87,19 @@
   ENDIF()
 ENDIF()
 
+# Check to see if we are using LLVM's libc++ rather than e.g. libstd++
+# Can then check HAVE_LLBM_LIBCPP later without including e.g. ciso646.
+CHECK_CXX_SOURCE_RUNS("
+#include <ciso646>
+int main()
+{
+#ifdef _LIBCPP_VERSION
+  return 0;
+#else
+  return 1;
+#endif
+}" HAVE_LLVM_LIBCPP)
+
 MACRO(DIRNAME IN OUT)
   GET_FILENAME_COMPONENT(${OUT} ${IN} PATH)
 ENDMACRO()

=== removed file 'extra/charset2html.c'
--- extra/charset2html.c	2013-03-20 05:56:02 +0000
+++ extra/charset2html.c	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-/* Copyright (c) 2000, 2002-2004, 2007, 2008 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA 
- */
-
-/*
-  Written by Alexander Barkov to check what 
-  a charset is in your favorite web browser
-*/
-
-#include <my_global.h>
-#include <m_ctype.h>
-#include <my_sys.h>
-#include <mysql_version.h>
-
-#include <stdio.h>
-
-typedef struct char_info_st 
-{
-  int cod;
-  int srt;
-  int uni;
-  int low;
-  int upp;
-  int ctp;
-} MY_CH;
-
-static int chcmp(const void *vf, const void *vs)
-{
-  const MY_CH *f=vf;
-  const MY_CH *s=vs;
-  
-  return f->srt-s->srt ? f->srt-s->srt : f->uni-s->uni;
-}
-
-static void print_cs(CHARSET_INFO *cs)
-{
-  uint  i;
-  int   srt;
-  int   clr=0;
-  MY_CH ch[256];
-    
-  printf("<HTML>\n");
-  printf("<HEAD>\n");
-  printf("</HEAD>\n");
-  printf("<BODY><PRE>\n");
-  printf("Charset %s\n",cs->name);
-
-  printf("<TABLE>\n");
-  printf("<TR><TH>Code<TH>Uni<TH>Sort<TH>Ctype<TH>Ch<TH>Lo<TH>Up</TR>");
-  
-  for (i=0; i<256; i++)
-  {
-    ch[i].cod=i;
-    ch[i].srt=cs->sort_order ? cs->sort_order[i] : i;
-    ch[i].uni=cs->tab_to_uni[i];
-    ch[i].low=cs->tab_to_uni[cs->to_lower[i]];
-    ch[i].upp=cs->tab_to_uni[cs->to_upper[i]];
-    ch[i].ctp=cs->ctype[i+1];
-  }
-  
-  qsort(ch,256,sizeof(MY_CH),&chcmp);
-  srt=ch[0].srt;
-  
-  for (i=0; i<256; i++)
-  {
-    clr = (srt!=ch[i].srt) ? !clr : clr;
-    
-    printf("<TR bgcolor=#%s>",clr ? "DDDDDD" : "EEEE99");
-    printf("<TD>%02X",ch[i].cod);
-    printf("<TD>%04X",ch[i].uni);
-    printf("<TD>%02X",ch[i].srt);
-    
-    printf("<TD>%s%s%s%s%s%s%s%s",
-    		ch[i].ctp & _MY_U ? "U" : "",
-    		ch[i].ctp & _MY_L ? "L" : "",
-    		ch[i].ctp & _MY_NMR ? "N" : "",
-    		ch[i].ctp & _MY_SPC ? "S" : "",
-    		ch[i].ctp & _MY_PNT ? "P" : "",
-    		ch[i].ctp & _MY_CTR ? "C" : "",
-    		ch[i].ctp & _MY_B ? "B" : "",
-    		ch[i].ctp & _MY_X ? "X" : "");
-    
-    if ((ch[i].uni >= 0x80) && (ch[i].uni <= 0x9F))
-    {
-      /* 
-       Control characters 0x0080..0x009F are dysplayed by some
-       browers as if they were letters. Don't print them to
-       avoid confusion.
-      */
-      printf("<TD>ctrl<TD>ctrl<TD>ctrl");
-    }
-    else
-    {
-      printf("<TD>&#%d;",ch[i].uni);
-      printf("<TD>&#%d;",ch[i].low);
-      printf("<TD>&#%d;",ch[i].upp);
-    }
-    printf("</TR>\n");
-    srt=ch[i].srt;
-  }
-  printf("</TABLE>\n");
-  printf("</PRE></BODY>\n");
-  printf("</HTML>\n");
-}
-
-static void print_index()
-{
-  CHARSET_INFO **cs;
-  int clr=0; 
-  
-  get_charset_by_name("",MYF(0));	/* To execute init_available_charsets */
-  
-  printf("All charsets\n");
-  printf("<table border=1>\n");
-  printf("<tr bgcolor=EEEE99><th>ID<th>Charset<th>Collation<th>Def<th>Bin<th>Com<th>Comment\n");
-  for (cs=all_charsets ; cs < all_charsets+256; cs++)
-  {
-    if (!cs[0])
-      continue;
-    printf("<tr bgcolor=#%s><td><a href=\"?%s\">%d</a><td>%s<td>%s<td>%s<td>%s<td>%s<td>%s\n",
-    	   (clr= !clr) ? "DDDDDD" : "EEEE99",
-    	   cs[0]->name,cs[0]->number,cs[0]->csname,
-    	   cs[0]->name,
-    	   (cs[0]->state & MY_CS_PRIMARY)  ? "def " : "&nbsp;",
-    	   (cs[0]->state & MY_CS_BINSORT)  ? "bin " : "&nbsp;",
-    	   (cs[0]->state & MY_CS_COMPILED) ? "com " : "&nbsp;",
-    	   cs[0]->comment);
-  }
-  printf("</table>\n");
-}
-
-int main(int argc, char **argv) {
-  const char *the_set = NULL;
-  int argcnt = 1;
-  CHARSET_INFO *cs;
-
-  if (getenv("SCRIPT_NAME"))
-  {
-    printf("Content-Type: text/html\r\n\r\n");
-  }
-  my_init();
-
-  if (argc > argcnt && argv[argcnt][0] == '-' && argv[argcnt][1] == '#')
-  {
-    DBUG_PUSH(argv[argcnt++]+2);
-  }
-
-  if (argc > argcnt)
-    the_set = argv[argcnt++];
-
-  if (argc > argcnt)
-    charsets_dir = argv[argcnt++];
-
-  if (!the_set)
-  {
-    print_index();
-    return 0;
-  }
-  
-  if (!(cs= get_charset_by_name(the_set, MYF(MY_WME))))
-    return 1;
-
-  print_cs(cs);
-
-  return 0;
-}

=== modified file 'extra/mysql_waitpid.c'
--- extra/mysql_waitpid.c	2011-09-07 10:08:09 +0000
+++ extra/mysql_waitpid.c	2014-06-05 04:33:53 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -64,6 +64,10 @@
 
   progname= argv[0];
 
+  fprintf(stderr, 
+	  "Warning: %s is deprecated and will be removed in a future version.\n", 
+	  progname);
+
   if (handle_options(&argc, &argv, my_long_options, get_one_option))
     exit(-1);
   if (!argv[0] || !argv[1] || (pid= atoi(argv[0])) <= 0 ||

=== modified file 'include/errmsg.h'
--- include/errmsg.h	2013-08-14 03:57:21 +0000
+++ include/errmsg.h	2014-06-05 04:33:53 +0000
@@ -1,7 +1,7 @@
 #ifndef ERRMSG_INCLUDED
 #define ERRMSG_INCLUDED
 
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,7 +33,9 @@
 #define CR_MIN_ERROR		2000	/* For easier client code */
 #define CR_MAX_ERROR		2999
 #if !defined(ER)
-#define ER(X) client_errors[(X)-CR_MIN_ERROR]
+#define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \
+               client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_ERROR])
+
 #endif
 #define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
 

=== modified file 'include/my_base.h'
--- include/my_base.h	2014-04-24 05:16:52 +0000
+++ include/my_base.h	2014-06-05 04:33:53 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -543,7 +543,6 @@
 #define HA_STATE_BUFF_SAVED	512	/* If current keybuff is info->buff */
 #define HA_STATE_ROW_CHANGED	1024	/* To invalide ROW cache */
 #define HA_STATE_EXTEND_BLOCK	2048
-#define HA_STATE_RNEXT_SAME	4096	/* rnext_same occupied lastkey2 */
 
 /* myisampack expects no more than 32 field types. */
 enum en_fieldtype {

=== modified file 'include/my_default.h'
--- include/my_default.h	2014-01-06 05:23:19 +0000
+++ include/my_default.h	2014-06-05 04:33:53 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
                          char **group_suffix, char **login_path);
 int my_load_defaults(const char *conf_file, const char **groups,
                      int *argc, char ***argv, const char ***);
+int check_file_permissions(const char *file_name);
 int load_defaults(const char *conf_file, const char **groups,
                   int *argc, char ***argv);
 int my_search_option_files(const char *conf_file, int *argc,

=== modified file 'include/my_global.h'
--- include/my_global.h	2013-12-05 17:23:10 +0000
+++ include/my_global.h	2014-06-05 04:33:53 +0000
@@ -776,38 +776,28 @@
 #define SIZE_T_MAX      (~((size_t) 0))
 #endif
 
-#ifndef isfinite
-#ifdef HAVE_FINITE
-#define isfinite(x) finite(x)
-#else
-#define finite(x) (1.0 / fabs(x) > 0.0)
-#endif /* HAVE_FINITE */
-#endif /* isfinite */
-
 #include <math.h>
-#ifndef HAVE_ISNAN
-#define isnan(x) ((x) != (x))
-#endif
-C_MODE_START
-extern double my_double_isnan(double x);
-C_MODE_END
 
-#ifdef HAVE_ISINF
-/* Check if C compiler is affected by GCC bug #39228 */
-#if !defined(__cplusplus) && defined(HAVE_BROKEN_ISINF)
-/* Force store/reload of the argument to/from a 64-bit double */
-static inline double my_isinf(double x)
-{
-  volatile double t= x;
-  return isinf(t);
-}
+#if (__cplusplus >= 201103L)
+  /* For C++11 use the new std functions rather than C99 macros. */
+  #include <cmath>
+  #define my_isfinite(X) std::isfinite(X)
+  #define my_isnan(X) std::isnan(X)
+  #define my_isinf(X) std::isinf(X)
 #else
-/* System-provided isinf() is available and safe to use */
-#define my_isinf(X) isinf(X)
-#endif
-#else /* !HAVE_ISINF */
-#define my_isinf(X) (!finite(X) && !isnan(X))
-#endif
+  #ifdef HAVE_LLVM_LIBCPP /* finite is deprecated in libc++ */
+    #define my_isfinite(X) isfinite(X)
+  #else
+    #define my_isfinite(X) finite(X)
+  #endif
+  #define my_isnan(X) isnan(X)
+  #ifdef HAVE_ISINF
+    /* System-provided isinf() is available and safe to use */
+    #define my_isinf(X) isinf(X)
+  #else /* !HAVE_ISINF */
+    #define my_isinf(X) (!my_isfinite(X) && !my_isnan(X))
+  #endif
+#endif /* __cplusplus >= 201103L */
 
 /* Define missing math constants. */
 #ifndef M_PI

=== modified file 'libmysql/errmsg.c'
--- libmysql/errmsg.c	2013-08-14 03:57:21 +0000
+++ libmysql/errmsg.c	2014-06-05 04:33:53 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -108,6 +108,8 @@
 
 void init_client_errs(void)
 {
+  compile_time_assert(array_elements(client_errors) ==
+                      (CR_ERROR_LAST - CR_ERROR_FIRST + 2));
   (void) my_error_register(get_client_errmsgs, CR_ERROR_FIRST, CR_ERROR_LAST);
 }
 

=== modified file 'libmysql/libmysql.c'
--- libmysql/libmysql.c	2014-04-25 10:55:01 +0000
+++ libmysql/libmysql.c	2014-06-05 04:33:53 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1335,6 +1335,10 @@
     res= net_realloc(net, buf_length + length);
     if (res)
     {
+      if (net->last_errno == ER_OUT_OF_RESOURCES)
+        net->last_errno= CR_OUT_OF_MEMORY;
+      else if (net->last_errno == ER_NET_PACKET_TOO_LARGE)
+        net->last_errno= CR_NET_PACKET_TOO_LARGE;
       strmov(net->sqlstate, unknown_sqlstate);
       strmov(net->last_error, ER(net->last_errno));
     }

=== modified file 'man/comp_err.1'
--- man/comp_err.1	2014-05-27 08:19:04 +0000
+++ man/comp_err.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/innochecksum.1'
--- man/innochecksum.1	2014-05-27 08:19:04 +0000
+++ man/innochecksum.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/msql2mysql.1'
--- man/msql2mysql.1	2014-05-27 08:19:04 +0000
+++ man/msql2mysql.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/my_print_defaults.1'
--- man/my_print_defaults.1	2014-05-27 08:19:04 +0000
+++ man/my_print_defaults.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/myisam_ftdump.1'
--- man/myisam_ftdump.1	2014-05-27 08:19:04 +0000
+++ man/myisam_ftdump.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/myisamchk.1'
--- man/myisamchk.1	2014-05-27 08:19:04 +0000
+++ man/myisamchk.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -249,10 +249,8 @@
 \fBmyisamchk\fR
 supports the following options, which can be specified on the command line or in the
 [myisamchk]
-group of an option file\&.
-\fBmyisamchk\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+group of an option file\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .SH "MYISAMCHK GENERAL OPTIONS"
 .\" options: myisamchk
 .\" myisamchk: options
@@ -320,6 +318,108 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" myisamchk: defaults-extra-file option
+.\" defaults-extra-file option: myisamchk
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" myisamchk: defaults-file option
+.\" defaults-file option: myisamchk
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" myisamchk: defaults-group-suffix option
+.\" defaults-group-suffix option: myisamchk
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmyisamchk\fR
+normally reads the
+[myisamchk]
+group\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmyisamchk\fR
+also reads the
+[myisamchk_other]
+group\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" myisamchk: no-defaults option
+.\" no-defaults option: myisamchk
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" myisamchk: print-defaults option
+.\" print-defaults option: myisamchk
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" myisamchk: silent option
 .\" silent option: myisamchk
 \fB\-\-silent\fR,

=== modified file 'man/myisamlog.1'
--- man/myisamlog.1	2014-05-27 08:19:04 +0000
+++ man/myisamlog.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/myisampack.1'
--- man/myisampack.1	2014-05-27 08:19:04 +0000
+++ man/myisampack.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql-stress-test.pl.1'
--- man/mysql-stress-test.pl.1	2014-05-27 08:19:04 +0000
+++ man/mysql-stress-test.pl.1	2014-06-05 04:33:53 +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: 03/10/2014
+.\"      Date: 05/03/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "03/10/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "05/03/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -498,7 +498,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

=== modified file 'man/mysql-test-run.pl.1'
--- man/mysql-test-run.pl.1	2014-05-27 08:19:04 +0000
+++ man/mysql-test-run.pl.1	2014-06-05 04:33:53 +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: 03/10/2014
+.\"      Date: 05/03/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-TEST\-RUN\" "1" "03/10/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-TEST\-RUN\" "1" "05/03/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1582,7 +1582,7 @@
 was added in MySQL 5\&.1\&.45 as a more logical alternative to
 \fB\-\-build\-thread\fR\&. If both are used,
 \fB\-\-port\-base\fR
-takes presedence\&.
+takes precedence\&.
 .RE
 .sp
 .RS 4
@@ -2551,7 +2551,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

=== modified file 'man/mysql.1'
--- man/mysql.1	2014-05-27 08:19:04 +0000
+++ man/mysql.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -121,10 +121,8 @@
 [mysql]
 and
 [client]
-groups of an option file\&.
-\fBmysql\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -481,6 +479,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql: defaults-extra-file option
+.\" defaults-extra-file option: mysql
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql: defaults-file option
+.\" defaults-file option: mysql
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql: defaults-group-suffix option
+.\" defaults-group-suffix option: mysql
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysql\fR
+normally reads the
+[client]
+and
+[mysql]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysql\fR
+also reads the
+[client_other]
+and
+[mysql_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql: delimiter option
 .\" delimiter option: mysql
 \fB\-\-delimiter=\fR\fB\fIstr\fR\fR
@@ -780,6 +842,33 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql: no-defaults option
+.\" no-defaults option: mysql
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql: one-database option
 .\" one-database option: mysql
 \fB\-\-one\-database\fR,
@@ -988,6 +1077,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql: print-defaults option
+.\" print-defaults option: mysql
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql: prompt option
 .\" prompt option: mysql
 \fB\-\-prompt=\fR\fB\fIformat_str\fR\fR
@@ -2657,8 +2761,7 @@
 in your home directory\&. To specify a different file, set the value of the
 MYSQL_HISTFILE
 environment variable\&.
-        How Logging Occurs
-.PP
+How Logging Occurs.PP
 Statement logging occurs as follows:
 .sp
 .RS 4
@@ -2813,8 +2916,7 @@
 .RE
 .\}
 .sp
-        Controlling the History File
-.PP
+Controlling the History File.PP
 The
 \&.mysql_history
 file should be protected with a restrictive access mode because sensitive information might be written to it, such as the text of SQL statements that contain passwords\&. See

=== modified file 'man/mysql.server.1'
--- man/mysql.server.1	2014-05-27 08:19:04 +0000
+++ man/mysql.server.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql_client_test.1'
--- man/mysql_client_test.1	2014-05-27 08:19:04 +0000
+++ man/mysql_client_test.1	2014-06-05 04:33:53 +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: 03/10/2014
+.\"      Date: 05/03/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CLIENT_TEST" "1" "03/10/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL_CLIENT_TEST" "1" "05/03/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -335,7 +335,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

=== modified file 'man/mysql_config.1'
--- man/mysql_config.1	2014-05-27 08:19:04 +0000
+++ man/mysql_config.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql_config_editor.1'
--- man/mysql_config_editor.1	2014-04-24 05:16:52 +0000
+++ man/mysql_config_editor.1	2014-06-05 04:33:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_config_editor\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG_EDIT" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG_EDIT" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -284,8 +284,7 @@
 option is used\&. This permits passwords to be specified in a safer way than on the command line even if
 \fB\-\-no\-defaults\fR
 is present\&.
-        \fBmysql_config_editor\fR Commands
-.PP
+\fBmysql_config_editor\fR Commands.PP
 This section describes the permitted
 \fBmysql_config_editor\fR
 commands, and the interpretation of options that have a command\-specific meaning\&. In addition,
@@ -667,8 +666,7 @@
 \fB\-\-skip\-warn\fR
 option\&.
 .RE
-        \fBmysql_config_editor\fR Options
-.PP
+\fBmysql_config_editor\fR Options.PP
 \fBmysql_config_editor\fR
 supports the following options\&.
 .sp

=== modified file 'man/mysql_convert_table_format.1'
--- man/mysql_convert_table_format.1	2014-05-27 08:19:04 +0000
+++ man/mysql_convert_table_format.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONVERT_TAB" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONVERT_TAB" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql_find_rows.1'
--- man/mysql_find_rows.1	2014-05-27 08:19:04 +0000
+++ man/mysql_find_rows.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIND_ROWS\F" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_FIND_ROWS\F" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql_fix_extensions.1'
--- man/mysql_fix_extensions.1	2014-05-27 08:19:04 +0000
+++ man/mysql_fix_extensions.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_EXTENSI" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_FIX_EXTENSI" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql_install_db.1'
--- man/mysql_install_db.1	2014-05-27 08:19:04 +0000
+++ man/mysql_install_db.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_INSTALL_DB\" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_INSTALL_DB\" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -82,7 +82,7 @@
 .\}
 .PP
 Because the MySQL server,
-\fBmysqld\fR, needs to access the data directory when it runs later, you should either run
+\fBmysqld\fR, must access the data directory when it runs later, you should either run
 \fBmysql_install_db\fR
 from the same system account that will be used for running
 \fBmysqld\fR
@@ -111,15 +111,7 @@
 .if n \{\
 .RE
 .\}
-.PP
-\fBmysql_install_db\fR
-needs to invoke
-\fBmysqld\fR
-with the
-\fB\-\-bootstrap\fR
-and
-\fB\-\-skip\-grant\-tables\fR
-options\&.
+.sp
 .if n \{\
 .sp
 .\}
@@ -133,32 +125,56 @@
 .ps -1
 .br
 .PP
-If you have set a custom
-TMPDIR
-environment variable when performing the installation, and the specified directory is not accessible,
-\fBmysql_install_db\fR
-may fail\&. If so, unset
-TMPDIR
-or set
-TMPDIR
-to point to the system temporary directory (usually
-/tmp)\&.
-.PP
 After
 \fBmysql_install_db\fR
 sets up the
 InnoDB
-system tablespace, changes to some of tablespace characteristics require setting up a whole new
+system tablespace, changes to some tablespace characteristics require setting up a whole new
 instance\&. This includes the file name of the first file in the system tablespace and the number of undo logs\&. If you do not want to use the default values, make sure that the settings for the
 innodb_data_file_path
 and
 innodb_log_file_size
-configuration options are in place in the MySQL
+configuration parameters are in place in the MySQL
 configuration file
 before running
+\fBmysql_install_db\fR\&. Also make sure to specify as necessary other parameters that affect the creation and location of
+InnoDB
+files, such as
+innodb_data_home_dir
+and
+innodb_log_group_home_dir\&.
+.PP
+If those options are in your configuration file but that file is not in a location that MySQL reads by default, specify the file location using the
+\fB\-\-defaults\-extra\-file\fR
+option when you run
 \fBmysql_install_db\fR\&.
 .sp .5v
 .RE
+.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
+If you have set a custom
+TMPDIR
+environment variable when performing the installation, and the specified directory is not accessible,
+\fBmysql_install_db\fR
+may fail\&. If so, unset
+TMPDIR
+or set
+TMPDIR
+to point to the system temporary directory (usually
+/tmp)\&.
+.sp .5v
+.RE
 .PP
 \fBmysql_install_db\fR
 supports the following options, which can be specified on the command line or in the
@@ -170,9 +186,21 @@
 group\&.) Other options are passed to
 \fBmysqld\fR\&. For information about option files, see
 Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
-\fBmysql_install_db\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_install_db: help option
+.\" help option: mysql_install_db
+\fB\-\-help\fR
+.sp
+Display a help message and exit\&.
+.RE
 .sp
 .RS 4
 .ie n \{\
@@ -197,6 +225,38 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_install_db: builddir option
+.\" builddir option: mysql_install_db
+\fB\-\-builddir=\fR\fB\fIpath\fR\fR
+.sp
+For use with
+\fB\-\-srcdir\fR
+and out\-of\-source builds\&. Set this to the location of the directory where the built files reside\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_install_db: cross-bootstrap option
+.\" cross-bootstrap option: mysql_install_db
+\fB\-\-cross\-bootstrap\fR
+.sp
+For internal use\&. This option is used for building system tables on one host intended for another\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_install_db: datadir option
 .\" datadir option: mysql_install_db
 .\" mysql_install_db: ldata option
@@ -217,13 +277,61 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" defaults-extra-file option
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" defaults-file option
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_install_db: force option
 .\" force option: mysql_install_db
 \fB\-\-force\fR
 .sp
 Cause
 \fBmysql_install_db\fR
-to run even if DNS does not work\&. Grant table entries that normally use host names will use IP addresses\&.
+to run even if DNS does not work\&. Grant table entries normally created using host names will use IP addresses instead\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" no-defaults option
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
 .RE
 .sp
 .RS 4
@@ -252,9 +360,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Create a random password, assign it to the initial MySQL
+The installation process creates a random password, assigns it to the initial MySQL
 root
-accounts, and set the
+accounts, and sets the
 \(lqpassword expired\(rq
 flag for those accounts\&.
 .RE
@@ -267,7 +375,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Write the initial password file to the
+.\" .mysql_secret file
+The initial random
+root
+password is written to the
 \&.mysql_secret
 file in the directory named by the
 HOME
@@ -295,14 +406,14 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Not create anonymous\-user MySQL accounts\&.
+No anonymous\-user MySQL accounts are created\&.
 .RE
 .sp
 As a result of these actions, it is necessary after installation to start the server, connect as
 root
 using the password written to the
 \&.mysql_secret
-file, and to assign a new
+file, and to select a new
 root
 password\&. Until this is done,
 root

=== modified file 'man/mysql_plugin.1'
--- man/mysql_plugin.1	2014-05-27 08:19:04 +0000
+++ man/mysql_plugin.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_PLUGIN\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_PLUGIN\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql_secure_installation.1'
--- man/mysql_secure_installation.1	2014-05-27 08:19:04 +0000
+++ man/mysql_secure_installation.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SECURE_INST" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_SECURE_INST" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql_setpermission.1'
--- man/mysql_setpermission.1	2014-05-27 08:19:04 +0000
+++ man/mysql_setpermission.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SETPERMISSI" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_SETPERMISSI" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql_tzinfo_to_sql.1'
--- man/mysql_tzinfo_to_sql.1	2014-05-27 08:19:04 +0000
+++ man/mysql_tzinfo_to_sql.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_TZINFO_TO_S" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_TZINFO_TO_S" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysql_upgrade.1'
--- man/mysql_upgrade.1	2014-05-27 08:19:04 +0000
+++ man/mysql_upgrade.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_UPGRADE\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_UPGRADE\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -235,10 +235,8 @@
 groups of an option file\&. Other options are passed to
 \fBmysqlcheck\fR\&. For example, it might be necessary to specify the
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR
-option\&.
-\fBmysql_upgrade\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+option\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -362,6 +360,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_upgrade: defaults-extra-file option
+.\" defaults-extra-file option: mysql_upgrade
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: defaults-file option
+.\" defaults-file option: mysql_upgrade
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: defaults-group-suffix option
+.\" defaults-group-suffix option: mysql_upgrade
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysql_upgrade\fR
+normally reads the
+[client]
+and
+[mysql_upgrade]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysql_upgrade\fR
+also reads the
+[client_other]
+and
+[mysql_upgrade_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_upgrade: force option
 .\" force option: mysql_upgrade
 \fB\-\-force\fR
@@ -383,6 +445,33 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_upgrade: no-defaults option
+.\" no-defaults option: mysql_upgrade
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_upgrade: plugin-dir option
 .\" plugin-dir option: mysql_upgrade
 \fB\-\-plugin\-dir=\fR\fB\fIpath\fR\fR
@@ -405,6 +494,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_upgrade: print-defaults option
+.\" print-defaults option: mysql_upgrade
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_upgrade: tmpdir option
 .\" tmpdir option: mysql_upgrade
 \fB\-\-tmpdir=\fR\fB\fIpath\fR\fR,

=== modified file 'man/mysql_waitpid.1'
--- man/mysql_waitpid.1	2014-05-27 08:19:04 +0000
+++ man/mysql_waitpid.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_WAITPID\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_WAITPID\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,6 +40,8 @@
 kill()
 system call and Unix signals, so it runs on Unix and Unix\-like systems\&.
 .PP
+This program is deprecated as of MySQL 5\&.6\&.19 and is removed in MySQL 5\&.7\&.
+.PP
 Invoke
 \fBmysql_waitpid\fR
 like this:

=== modified file 'man/mysql_zap.1'
--- man/mysql_zap.1	2014-05-27 08:19:04 +0000
+++ man/mysql_zap.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_ZAP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_ZAP\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,6 +40,8 @@
 \fBps\fR
 command and Unix signals, so it runs on Unix and Unix\-like systems\&.
 .PP
+This program is deprecated as of MySQL 5\&.6\&.19 and is removed in MySQL 5\&.7\&.
+.PP
 Invoke
 \fBmysql_zap\fR
 like this:

=== modified file 'man/mysqlaccess.1'
--- man/mysqlaccess.1	2014-05-27 08:19:04 +0000
+++ man/mysqlaccess.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLACCESS\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLACCESS\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysqladmin.1'
--- man/mysqladmin.1	2014-05-27 08:19:04 +0000
+++ man/mysqladmin.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLADMIN\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLADMIN\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -577,10 +577,8 @@
 [mysqladmin]
 and
 [client]
-groups of an option file\&.
-\fBmysqladmin\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -757,6 +755,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqladmin: defaults-extra-file option
+.\" defaults-extra-file option: mysqladmin
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: defaults-file option
+.\" defaults-file option: mysqladmin
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqladmin
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqladmin\fR
+normally reads the
+[client]
+and
+[mysqladmin]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqladmin\fR
+also reads the
+[client_other]
+and
+[mysqladmin_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqladmin: enable-cleartext-plugin option
 .\" enable-cleartext-plugin option: mysqladmin
 \fB\-\-enable\-cleartext\-plugin\fR
@@ -850,6 +912,33 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqladmin: no-defaults option
+.\" no-defaults option: mysqladmin
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqladmin: password option
 .\" password option: mysqladmin
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
@@ -931,6 +1020,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqladmin: print-defaults option
+.\" print-defaults option: mysqladmin
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqladmin: protocol option
 .\" protocol option: mysqladmin
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR

=== modified file 'man/mysqlbinlog.1'
--- man/mysqlbinlog.1	2014-05-27 08:19:04 +0000
+++ man/mysqlbinlog.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBINLOG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLBINLOG\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -133,10 +133,8 @@
 [mysqlbinlog]
 and
 [client]
-groups of an option file\&.
-\fBmysqlbinlog\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -577,6 +575,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: defaults-extra-file option
+.\" defaults-extra-file option: mysqlbinlog
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlbinlog: defaults-file option
+.\" defaults-file option: mysqlbinlog
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlbinlog: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlbinlog
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlbinlog\fR
+normally reads the
+[client]
+and
+[mysqlbinlog]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlbinlog\fR
+also reads the
+[client_other]
+and
+[mysqlbinlog_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: disable-log-bin option
 .\" disable-log-bin option: mysqlbinlog
 \fB\-\-disable\-log\-bin\fR,
@@ -768,6 +830,33 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: no-defaults option
+.\" no-defaults option: mysqlbinlog
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: offset option
 .\" offset option: mysqlbinlog
 \fB\-\-offset=\fR\fB\fIN\fR\fR,
@@ -855,6 +944,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: print-defaults option
+.\" print-defaults option: mysqlbinlog
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: protocol option
 .\" protocol option: mysqlbinlog
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
@@ -2588,8 +2692,7 @@
 \fB\-\-to\-last\-log\fR
 to read to the last log file because that option is implied\&.
 .RE
-        Output File Naming
-.PP
+Output File Naming.PP
 Without
 \fB\-\-raw\fR,
 \fBmysqlbinlog\fR
@@ -2647,8 +2750,8 @@
 T}
 .TE
 .sp 1
-        Example: \fBmysqldump\fR + \fBmysqlbinlog\fR for Backup and Restore
-.PP
+Example: \fBmysqldump\fR + \fBmysqlbinlog\fR
+        for Backup and Restore.PP
 The following example describes a simple scenario that shows how to use
 \fBmysqldump\fR
 and

=== modified file 'man/mysqlbug.1'
--- man/mysqlbug.1	2014-05-27 08:19:04 +0000
+++ man/mysqlbug.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBUG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLBUG\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -35,7 +35,7 @@
 \fBmysqlbug\fR
 .SH "DESCRIPTION"
 .PP
-This program is obsolete\&.
+This program is obsolete\&. It is deprecated as of MySQL 5\&.6\&.19 and is removed in MySQL 5\&.7\&.
 .PP
 The normal way to report bugs is to visit
 \m[blue]\fB\%http://bugs.mysql.com/\fR\m[], which is the address for our bugs database\&. This database is public and can be browsed and searched by anyone\&. If you log in to the system, you can enter new reports\&.

=== modified file 'man/mysqlcheck.1'
--- man/mysqlcheck.1	2014-05-27 08:19:04 +0000
+++ man/mysqlcheck.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLCHECK\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLCHECK\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -204,10 +204,8 @@
 [mysqlcheck]
 and
 [client]
-groups of an option file\&.
-\fBmysqlcheck\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -488,6 +486,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlcheck: defaults-extra-file option
+.\" defaults-extra-file option: mysqlcheck
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlcheck: defaults-file option
+.\" defaults-file option: mysqlcheck
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlcheck: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlcheck
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlcheck\fR
+normally reads the
+[client]
+and
+[mysqlcheck]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlcheck\fR
+also reads the
+[client_other]
+and
+[mysqlcheck_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlcheck: extended option
 .\" extended option: mysqlcheck
 \fB\-\-extended\fR,
@@ -645,6 +707,33 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlcheck: no-defaults option
+.\" no-defaults option: mysqlcheck
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlcheck: optimize option
 .\" optimize option: mysqlcheck
 \fB\-\-optimize\fR,
@@ -744,6 +833,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlcheck: print-defaults option
+.\" print-defaults option: mysqlcheck
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlcheck: protocol option
 .\" protocol option: mysqlcheck
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR

=== modified file 'man/mysqld.8'
--- man/mysqld.8	2014-05-27 08:19:04 +0000
+++ man/mysqld.8	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD\FR" "8" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLD\FR" "8" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysqld_multi.1'
--- man/mysqld_multi.1	2014-05-27 08:19:04 +0000
+++ man/mysqld_multi.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysqld_safe.1'
--- man/mysqld_safe.1	2014-05-27 08:19:04 +0000
+++ man/mysqld_safe.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_SAFE\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLD_SAFE\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysqldump.1'
--- man/mysqldump.1	2014-05-27 08:19:04 +0000
+++ man/mysqldump.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLDUMP\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -69,8 +69,7 @@
 statements that change the database collation\&. These may be used when dumping stored programs to preserve their character encodings\&. To reload a dump file containing such statements, the
 ALTER
 privilege for the affected database is required\&.
-        Performance and Scalability Considerations
-.PP
+Performance and Scalability Considerations.PP
 mysqldump
 advantages include the convenience and flexibility of viewing or even editing the output before restoring\&. You can clone databases for development and DBA work, or produce slight variations of an existing database for testing\&. It is not intended as a fast or scalable solution for backing up substantial amounts of data\&. With large data sizes, even if the backup step takes a reasonable time, restoring the data can be very slow because replaying the SQL statements involves disk I/O for insertion, index creation, and so on\&.
 .PP
@@ -144,8 +143,7 @@
 For additional information about
 \fBmysqldump\fR, see
 Section\ \&7.4, \(lqUsing mysqldump for Backups\(rq\&.
-        Syntax
-.PP
+Syntax.PP
 There are in general three ways to use
 \fBmysqldump\fR\(emin order to dump a set of one or more tables, a set of one or more complete databases, or an entire MySQL server\(emas shown here:
 .sp
@@ -172,19 +170,15 @@
 \fBmysqldump\fR
 supports, issue the command
 \fBmysqldump \-\-help\fR\&.
-        Option Syntax \- Alphabetical Summary
-.PP
+Option Syntax \- Alphabetical Summary.PP
 \fBmysqldump\fR
 supports the following options, which can be specified on the command line or in the
 [mysqldump]
 and
 [client]
-groups of an option file\&.
-\fBmysqldump\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
-        Connection Options
-.PP
+groups of an option file\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Connection Options.PP
 The
 \fBmysqldump\fR
 command logs into a MySQL server to extract information\&. The following options specify how to connect to the MySQL server, either on the same machine or a remote system\&.
@@ -502,8 +496,115 @@
 net_buffer_length
 variable in the MySQL server is at least this large\&.
 .RE
-        DDL Options
-.PP
+Option\-File Options.PP
+These options are used to control which option files to read\&.
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: defaults-extra-file option
+.\" defaults-extra-file option: mysqldump
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: defaults-file option
+.\" defaults-file option: mysqldump
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqldump
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqldump\fR
+normally reads the
+[client]
+and
+[mysqldump]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqldump\fR
+also reads the
+[client_other]
+and
+[mysqldump_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: no-defaults option
+.\" no-defaults option: mysqldump
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: print-defaults option
+.\" print-defaults option: mysqldump
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+DDL Options.PP
 Usage scenarios for
 \fBmysqldump\fR
 include setting up an entire new MySQL instance (including database tables), and replacing data inside an existing instance with existing databases and tables\&. The following options let you specify which things to tear down and set up when restoring a dump, by encoding various DDL statements within the dump file\&.
@@ -690,8 +791,7 @@
 INSERT
 statements\&.
 .RE
-        Debug Options
-.PP
+Debug Options.PP
 The following options print debugging information, encode debugging information in the dump file, or let the dump operation proceed regardless of potential problems\&.
 .sp
 .RS 4
@@ -888,8 +988,7 @@
 .sp
 Verbose mode\&. Print more information about what the program does\&.
 .RE
-        Help Options
-.PP
+Help Options.PP
 The following options display information about the
 \fBmysqldump\fR
 command itself\&.
@@ -925,8 +1024,7 @@
 .sp
 Display version information and exit\&.
 .RE
-        Internationalization Options
-.PP
+Internationalization Options.PP
 The following options change how the
 \fBmysqldump\fR
 command represents character data with national language settings\&.
@@ -1007,8 +1105,7 @@
 statement, use
 \fB\-\-skip\-set\-charset\fR\&.
 .RE
-        Replication Options
-.PP
+Replication Options.PP
 The
 \fBmysqldump\fR
 command is frequently used to create an empty instance, or an instance including data, on a slave server in a replication configuration\&. The following options apply to dumping and restoring data on replication master and slave servers\&.
@@ -1216,8 +1313,7 @@
 .sp 1
 This option was added in MySQL 5\&.6\&.9\&.
 .RE
-        Format Options
-.PP
+Format Options.PP
 The following options specify how to represent the entire dump file or certain kinds of data in the dump file\&. They also control whether certain optional information is written to the dump file\&.
 .sp
 .RS 4
@@ -1626,8 +1722,7 @@
 \fB\-\-routines\fR
 option from working correctly\(emthat is, no stored routines, triggers, or events could be dumped in XML format\&. (Bug #11760384, Bug #52792)
 .RE
-        Filtering Options
-.PP
+Filtering Options.PP
 The following options control which kinds of schema objects are written to the dump file: by category, such as triggers or events; by name, for example, choosing which databases and tables to dump; or even filtering rows from the table data using a
 WHERE
 clause\&.
@@ -1833,8 +1928,7 @@
 .RE
 .\}
 .RE
-        Performance Options
-.PP
+Performance Options.PP
 The following options are the most relevant for the performance particularly of the restore operations\&. For large data sets, restore operation (processing the
 INSERT
 statements in the dump file) is the most time\-consuming part\&. When it is urgent to restore data quickly, plan and test the performance of this stage in advance\&. For restore times measured in hours, you might prefer an alternative backup and restore solution, such as
@@ -2000,8 +2094,7 @@
 \fB\-\-opt\fR
 option\&.
 .RE
-        Transactional Options
-.PP
+Transactional Options.PP
 The following options trade off the performance of the dump operation, against the reliability and consistency of the exported data\&.
 .sp
 .RS 4
@@ -2226,7 +2319,7 @@
 \fB\-\-quick\fR
 option\&.
 .RE
-        Option Groups
+Option Groups
 .sp
 .RS 4
 .ie n \{\
@@ -2267,8 +2360,7 @@
 would not have the intended effect; it is the same as
 \fB\-\-skip\-opt\fR
 by itself\&.
-        Examples
-.PP
+Examples.PP
 To make a backup of an entire database:
 .sp
 .if n \{\
@@ -2443,8 +2535,7 @@
 \fB\-\-disable\-keys\fR
 \fB\-\-lock\-tables\fR\&.
 .RE
-        Restrictions
-      .\" mysqldump: views
+Restrictions.\" mysqldump: views
 .\" mysqldump: problems
 .\" mysqldump: workarounds
 .PP

=== modified file 'man/mysqldumpslow.1'
--- man/mysqldumpslow.1	2014-05-27 08:19:04 +0000
+++ man/mysqldumpslow.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMPSLOW\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLDUMPSLOW\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysqlhotcopy.1'
--- man/mysqlhotcopy.1	2014-05-27 08:19:04 +0000
+++ man/mysqlhotcopy.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLHOTCOPY\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLHOTCOPY\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/mysqlimport.1'
--- man/mysqlimport.1	2014-05-27 08:19:04 +0000
+++ man/mysqlimport.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -78,10 +78,8 @@
 [mysqlimport]
 and
 [client]
-groups of an option file\&.
-\fBmysqlimport\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -258,6 +256,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: defaults-extra-file option
+.\" defaults-extra-file option: mysqlimport
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlimport: defaults-file option
+.\" defaults-file option: mysqlimport
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlimport: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlimport
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlimport\fR
+normally reads the
+[client]
+and
+[mysqlimport]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlimport\fR
+also reads the
+[client_other]
+and
+[mysqlimport_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: delete option
 .\" delete option: mysqlimport
 \fB\-\-delete\fR,
@@ -468,6 +530,33 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: no-defaults option
+.\" no-defaults option: mysqlimport
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: password option
 .\" password option: mysqlimport
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
@@ -551,6 +640,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: print-defaults option
+.\" print-defaults option: mysqlimport
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: protocol option
 .\" protocol option: mysqlimport
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR

=== modified file 'man/mysqlshow.1'
--- man/mysqlshow.1	2014-05-27 08:19:04 +0000
+++ man/mysqlshow.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSHOW\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLSHOW\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -125,10 +125,8 @@
 [mysqlshow]
 and
 [client]
-groups of an option file\&.
-\fBmysqlshow\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -305,6 +303,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlshow: defaults-extra-file option
+.\" defaults-extra-file option: mysqlshow
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlshow: defaults-file option
+.\" defaults-file option: mysqlshow
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlshow: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlshow
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlshow\fR
+normally reads the
+[client]
+and
+[mysqlshow]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlshow\fR
+also reads the
+[client_other]
+and
+[mysqlshow_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlshow: host option
 .\" host option: mysqlshow
 \fB\-\-host=\fR\fB\fIhost_name\fR\fR,
@@ -362,6 +424,33 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlshow: no-defaults option
+.\" no-defaults option: mysqlshow
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlshow: password option
 .\" password option: mysqlshow
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
@@ -445,6 +534,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlshow: print-defaults option
+.\" print-defaults option: mysqlshow
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlshow: protocol option
 .\" protocol option: mysqlshow
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR

=== modified file 'man/mysqlslap.1'
--- man/mysqlslap.1	2014-05-27 08:19:04 +0000
+++ man/mysqlslap.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSLAP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLSLAP\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -162,10 +162,8 @@
 [mysqlslap]
 and
 [client]
-groups of an option file\&.
-\fBmysqlslap\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files, see
+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -527,6 +525,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: defaults-extra-file option
+.\" defaults-extra-file option: mysqlslap
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlslap: defaults-file option
+.\" defaults-file option: mysqlslap
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlslap: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlslap
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlslap\fR
+normally reads the
+[client]
+and
+[mysqlslap]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlslap\fR
+also reads the
+[client_other]
+and
+[mysqlslap_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: delimiter option
 .\" delimiter option: mysqlslap
 \fB\-\-delimiter=\fR\fB\fIstr\fR\fR,
@@ -668,6 +730,33 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: no-defaults option
+.\" no-defaults option: mysqlslap
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.sp
+The exception is that the
+\&.mylogin\&.cnf
+file, if it exists, is read in all cases\&. This permits passwords to be specified in a safer way than on the command line even when
+\fB\-\-no\-defaults\fR
+is used\&. (\&.mylogin\&.cnf
+is created by the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&.)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: number-char-cols option
 .\" number-char-cols option: mysqlslap
 \fB\-\-number\-char\-cols=\fR\fB\fIN\fR\fR,
@@ -853,21 +942,6 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysqlslap: shared-memory-base-name option
-.\" shared-memory-base-name option: mysqlslap
-\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
-.sp
-On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. This option applies only if the server supports shared\-memory connections\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 .\" mysqlslap: post-system option
 .\" post-system option: mysqlslap
 \fB\-\-post\-system=\fR\fB\fIstr\fR\fR
@@ -917,6 +991,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: print-defaults option
+.\" print-defaults option: mysqlslap
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: protocol option
 .\" protocol option: mysqlslap
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
@@ -984,6 +1073,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: shared-memory-base-name option
+.\" shared-memory-base-name option: mysqlslap
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. This option applies only if the server supports shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: silent option
 .\" silent option: mysqlslap
 \fB\-\-silent\fR,

=== modified file 'man/mysqltest.1'
--- man/mysqltest.1	2014-05-27 08:19:04 +0000
+++ man/mysqltest.1	2014-06-05 04:33:53 +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: 03/10/2014
+.\"      Date: 05/03/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQLTEST\FR" "1" "03/10/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQLTEST\FR" "1" "05/03/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -909,7 +909,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
@@ -921,7 +921,7 @@
 .IP " 1." 4
 The SHA-256 Authentication Plugin
 .RS 4
-\%http://dev.mysql.com/doc/refman/5.6/en/sha256-authentication-plugin.html
+\%http://dev.mysql.com/doc/refman/5.7/en/sha256-authentication-plugin.html
 .RE
 .SH "SEE ALSO"
 For more information, please refer to the MySQL Reference Manual,

=== modified file 'man/ndb-common-options.1'
--- man/ndb-common-options.1	2014-04-24 05:16:52 +0000
+++ man/ndb-common-options.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "OPTIONS COMMON TO MY" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "OPTIONS COMMON TO MY" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/ndb_blob_tool.1'
--- man/ndb_blob_tool.1	2014-05-27 08:19:04 +0000
+++ man/ndb_blob_tool.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_BLOB_TOOL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_BLOB_TOOL\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -386,8 +386,7 @@
 .sp 1
 Provide extra information in the tool\*(Aqs output regarding its progress\&.
 .RE
-        Example
-.PP
+Example.PP
 First we create an
 NDB
 table in the

=== modified file 'man/ndb_config.1'
--- man/ndb_config.1	2014-05-27 08:19:04 +0000
+++ man/ndb_config.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_CONFIG\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1230,7 +1230,7 @@
 .\}
 .nf
 shell> \fBndb_config \-\-configinfo \-\-xml\fR
-<configvariables protocolversion="1" ndbversionstring="5\&.6\&.16\-ndb\-7\&.3\&.5"
+<configvariables protocolversion="1" ndbversionstring="5\&.6\&.17\-ndb\-7\&.3\&.6"
                     ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
                     ndbversionbuild="6">
   <section name="SYSTEM">
@@ -1384,7 +1384,7 @@
 \fB\-\-configinfo\fR
 serves no purpose\&.
 .RE
-        Examples
+Examples
 .sp
 .RS 4
 .ie n \{\

=== modified file 'man/ndb_cpcd.1'
--- man/ndb_cpcd.1	2014-05-27 08:19:04 +0000
+++ man/ndb_cpcd.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_CPCD\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_CPCD\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/ndb_delete_all.1'
--- man/ndb_delete_all.1	2014-05-27 08:19:04 +0000
+++ man/ndb_delete_all.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_DELETE_ALL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_DELETE_ALL\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,7 +42,7 @@
 DELETE
 or even
 TRUNCATE TABLE\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4

=== modified file 'man/ndb_desc.1'
--- man/ndb_desc.1	2014-05-27 08:19:04 +0000
+++ man/ndb_desc.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_DESC\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_DESC\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -39,7 +39,7 @@
 provides a detailed description of one or more
 NDB
 tables\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -52,8 +52,7 @@
 .RE
 .\}
 .sp
-        Sample Output
-.PP
+Sample Output.PP
 MySQL table creation and population statements:
 .sp
 .if n \{\

=== modified file 'man/ndb_drop_index.1'
--- man/ndb_drop_index.1	2014-05-27 08:19:04 +0000
+++ man/ndb_drop_index.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_INDEX\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_DROP_INDEX\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@
 NDB
 table\&.
 \fIIt is recommended that you use this utility only as an example for writing NDB API applications\fR\(emsee the Warning later in this section for details\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -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\&.6\&.16\-ndb\-7\&.3\&.5
+Your MySQL connection id is 7 to server version: 5\&.6\&.17\-ndb\-7\&.3\&.6
 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-05-27 08:19:04 +0000
+++ man/ndb_drop_table.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_TABLE\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_DROP_TABLE\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@
 statement on an
 NDB
 table\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4

=== modified file 'man/ndb_error_reporter.1'
--- man/ndb_error_reporter.1	2014-05-27 08:19:04 +0000
+++ man/ndb_error_reporter.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_ERROR_REPORTE" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_ERROR_REPORTE" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -113,7 +113,7 @@
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4

=== modified file 'man/ndb_index_stat.1'
--- man/ndb_index_stat.1	2014-04-24 05:16:52 +0000
+++ man/ndb_index_stat.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_INDEX_STAT\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_INDEX_STAT\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -37,8 +37,7 @@
 .PP
 \fBndb_index_stat\fR
 \&.\&.\&.
-        Usage
-.PP
+Usage.PP
 To obtain basic index statistics about a given
 NDB
 table, invoke
@@ -108,8 +107,7 @@
 .RE
 .\}
 .sp
-        Options
-.PP
+Options.PP
 The following table includes options that are specific to the MySQL Cluster
 \fBndb_index_stat\fR
 utility\&. Additional descriptions are listed following the table\&. For options common to most MySQL Cluster programs (including

=== modified file 'man/ndb_mgm.1'
--- man/ndb_mgm.1	2014-05-27 08:19:04 +0000
+++ man/ndb_mgm.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGM\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_MGM\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/ndb_mgmd.8'
--- man/ndb_mgmd.8	2014-05-27 08:19:04 +0000
+++ man/ndb_mgmd.8	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGMD\FR" "8" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_MGMD\FR" "8" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/ndb_print_backup_file.1'
--- man/ndb_print_backup_file.1	2014-05-27 08:19:04 +0000
+++ man/ndb_print_backup_file.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_BACKUP_" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_PRINT_BACKUP_" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -37,7 +37,7 @@
 .PP
 \fBndb_print_backup_file\fR
 obtains diagnostic information from a cluster backup file\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -68,8 +68,7 @@
 utilities that are intended to be run on a management server host or to connect to a management server)
 \fBndb_print_backup_file\fR
 must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
-        Additional Options
-.PP
+Additional Options.PP
 None\&.
 .SH "COPYRIGHT"
 .br

=== modified file 'man/ndb_print_schema_file.1'
--- man/ndb_print_schema_file.1	2014-05-27 08:19:04 +0000
+++ man/ndb_print_schema_file.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SCHEMA_" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_PRINT_SCHEMA_" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -37,7 +37,7 @@
 .PP
 \fBndb_print_schema_file\fR
 obtains diagnostic information from a cluster schema file\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -62,8 +62,7 @@
 utilities that are intended to be run on a management server host or to connect to a management server)
 \fBndb_schema_backup_file\fR
 must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
-        Additional Options
-.PP
+Additional Options.PP
 None\&.
 .SH "COPYRIGHT"
 .br

=== modified file 'man/ndb_print_sys_file.1'
--- man/ndb_print_sys_file.1	2014-05-27 08:19:04 +0000
+++ man/ndb_print_sys_file.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SYS_FIL" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_PRINT_SYS_FIL" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -37,7 +37,7 @@
 .PP
 \fBndb_print_sys_file\fR
 obtains diagnostic information from a MySQL Cluster system file\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -65,8 +65,7 @@
 utilities that are intended to be run on a management server host or to connect to a management server)
 \fBndb_print_backup_file\fR
 must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
-        Additional Options
-.PP
+Additional Options.PP
 None\&.
 .SH "COPYRIGHT"
 .br

=== modified file 'man/ndb_restore.1'
--- man/ndb_restore.1	2014-05-27 08:19:04 +0000
+++ man/ndb_restore.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_RESTORE\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_RESTORE\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/ndb_select_all.1'
--- man/ndb_select_all.1	2014-05-27 08:19:04 +0000
+++ man/ndb_select_all.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_ALL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_SELECT_ALL\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@
 NDB
 table to
 stdout\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -505,8 +505,7 @@
 .sp
 Causes any table data to be omitted\&.
 .RE
-        Sample Output
-.PP
+Sample Output.PP
 Output from a MySQL
 SELECT
 statement:

=== modified file 'man/ndb_select_count.1'
--- man/ndb_select_count.1	2014-05-27 08:19:04 +0000
+++ man/ndb_select_count.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_COUNT\" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_SELECT_COUNT\" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@
 NDB
 tables\&. With a single table, the result is equivalent to that obtained by using the MySQL statement
 SELECT COUNT(*) FROM \fItbl_name\fR\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -114,7 +114,7 @@
 .PP
 You can obtain row counts from multiple tables in the same database by listing the table names separated by spaces when invoking this command, as shown under
 \fBSample Output\fR\&.
-        Sample Output
+Sample Output
 .sp
 .if n \{\
 .RS 4

=== modified file 'man/ndb_setup.py.1'
--- man/ndb_setup.py.1	2014-04-24 05:16:52 +0000
+++ man/ndb_setup.py.1	2014-06-05 04:33:53 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_setup.py\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_SETUP\&.PY\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_SETUP\&.PY\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -43,8 +43,7 @@
 \fBndb_setup\&.py\fR
 is invoked, see
 Section\ \&17.2.1, \(lqThe MySQL Cluster Auto-Installer\(rq\&.
-        Usage
-.PP
+Usage.PP
 All platforms:
 .sp
 .if n \{\

=== modified file 'man/ndb_show_tables.1'
--- man/ndb_show_tables.1	2014-05-27 08:19:04 +0000
+++ man/ndb_show_tables.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_SHOW_TABLES\F" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_SHOW_TABLES\F" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -136,7 +136,7 @@
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4

=== modified file 'man/ndb_size.pl.1'
--- man/ndb_size.pl.1	2014-05-27 08:19:04 +0000
+++ man/ndb_size.pl.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_SIZE\&.PL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_SIZE\&.PL\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -38,7 +38,7 @@
 This is a Perl script that can be used to estimate the amount of space that would be required by a MySQL database if it were converted to use the
 NDBCLUSTER
 storage engine\&. Unlike the other utilities discussed in this section, it does not require access to a MySQL Cluster (in fact, there is no reason for it to do so)\&. However, it does need to access the MySQL server on which the database to be tested resides\&.
-        Requirements
+Requirements
 .sp
 .RS 4
 .ie n \{\
@@ -228,7 +228,7 @@
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4

=== modified file 'man/ndb_waiter.1'
--- man/ndb_waiter.1	2014-05-27 08:19:04 +0000
+++ man/ndb_waiter.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_WAITER\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_WAITER\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -223,7 +223,7 @@
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -234,7 +234,7 @@
 .if n \{\
 .RE
 .\}
-        Additional Options
+Additional Options
 .sp
 .RS 4
 .ie n \{\

=== modified file 'man/ndbd.8'
--- man/ndbd.8	2014-05-27 08:19:04 +0000
+++ man/ndbd.8	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDBD\FR" "8" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDBD\FR" "8" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/ndbd_redo_log_reader.1'
--- man/ndbd_redo_log_reader.1	2014-05-27 08:19:04 +0000
+++ man/ndbd_redo_log_reader.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDBD_REDO_LOG_REA" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDBD_REDO_LOG_REA" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -99,7 +99,7 @@
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4

=== modified file 'man/ndbinfo_select_all.1'
--- man/ndbinfo_select_all.1	2014-04-24 05:16:52 +0000
+++ man/ndbinfo_select_all.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDBINFO_SELECT_AL" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDBINFO_SELECT_AL" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/ndbmtd.8'
--- man/ndbmtd.8	2014-05-27 08:19:04 +0000
+++ man/ndbmtd.8	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDBMTD\FR" "8" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDBMTD\FR" "8" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/perror.1'
--- man/perror.1	2014-05-27 08:19:04 +0000
+++ man/perror.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBPERROR\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBPERROR\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/replace.1'
--- man/replace.1	2014-05-27 08:19:04 +0000
+++ man/replace.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBREPLACE\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBREPLACE\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/resolve_stack_dump.1'
--- man/resolve_stack_dump.1	2014-05-27 08:19:04 +0000
+++ man/resolve_stack_dump.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBRESOLVE_STACK_DUM" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBRESOLVE_STACK_DUM" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'man/resolveip.1'
--- man/resolveip.1	2014-05-27 08:19:04 +0000
+++ man/resolveip.1	2014-06-05 04:33:53 +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: 03/14/2014
+.\"      Date: 05/05/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBRESOLVEIP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBRESOLVEIP\FR" "1" "05/05/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'mysql-test/collections/default.experimental'
--- mysql-test/collections/default.experimental	2013-12-05 17:23:10 +0000
+++ mysql-test/collections/default.experimental	2014-06-05 04:33:53 +0000
@@ -14,7 +14,6 @@
 parts.partition_debug_innodb             # Bug#14150368 2013-03-07 anitha Failing very frequently on PB2
 
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
-rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
 rpl.rpl_spec_variables @solaris          # Bug #17337114 2013-08-20 Luis Soares failing on pb2 with timeout for 'CHECK WARNINGS'
 rpl.rpl_gtid_logs_without_rotate_or_stop_event @windows    # Bug#16207800 2013-02-09 anitha Fails very frequently on windows

=== modified file 'mysql-test/extra/rpl_tests/rpl_deadlock.test'
--- mysql-test/extra/rpl_tests/rpl_deadlock.test	2012-12-17 16:33:13 +0000
+++ mysql-test/extra/rpl_tests/rpl_deadlock.test	2014-06-05 04:33:53 +0000
@@ -181,9 +181,7 @@
 
 let $slave_sql_errno= 1205; # ER_LOCK_TIMEOUT
 let $show_slave_sql_error= 0;
-let $rpl_debug= 1;
 source include/wait_for_slave_sql_error.inc;
-let $rpl_debug= 0;
 
 rollback;
 

=== added file 'mysql-test/extra/rpl_tests/rpl_kill_query.inc'
--- mysql-test/extra/rpl_tests/rpl_kill_query.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/extra/rpl_tests/rpl_kill_query.inc	2014-06-05 04:33:53 +0000
@@ -0,0 +1,129 @@
+# ==== Purpose ====
+#
+# This is an auxiliary file used by rpl_kill_query.test.
+#
+# The purpose is to generate a statement that updates a
+# non-transactional table, and kill the statement in the middle,
+# so that it gets half-executed.
+#
+# ==== Usage ====
+#
+# --let $database= DATABASE
+# --let $table= TABLE
+# --source include/rpl_kill_query.inc
+#
+# Parameters:
+#   $database
+#     The current database will be set to $database before executing the
+#     killed statement.
+#
+#   $table
+#     The statement will modify this table.
+#
+# Assumptions:
+# - $database should *not* be created before executing this script.
+#
+# ==== Implementation ====
+#
+# Apparently, not all statements can be killed in the middle; a simple
+# INSERT does not seem to work.  One case that can be killed is an
+# INSERT with a trigger; then there is a check for being killed in the
+# trigger invocation.
+#
+# So our approach is to put a BEFORE INSERT trigger on the table.  The
+# trigger will execute fast for the first row, and go to sleep for the
+# second row. This allows us to kill the query in the middle of the
+# sleep. Then, we make sure to wait until *after* the first row is
+# inserted, and *before* the sleep is finished.  That ensures that at
+# least one row is inserted in the trigger table, and not both rows
+# are inserted in the main table, so the statement is half-executed,
+# as required.
+#
+# To sleep on the second row, we use a SLEEP() inside a condition that
+# is triggered only for the second row.
+#
+# To indicate to other threads that the first row has been inserted,
+# we do SET @@GLOBAL.BINLOG_FORMAT = ROW before going to sleep.  (It
+# does not seem to be enough to wait for rows to be inserted in the
+# main table or trigger table, probably since locks prevent other
+# threads from seeing the partial insert even in a non-transactional
+# table.)  This will not affect execution since the global values is
+# only used as default for new connections.
+#
+# As a sanity-check, we verify that after the query is killed, at most
+# one row has been inserted in the main table, and at least one row
+# has been inserted in the second table.
+
+
+--let $_rkq_current_database_old= `SELECT DATABASE()`
+
+--let $assert_cond= @@GLOBAL.BINLOG_FORMAT = "STATEMENT"
+--let $assert_text= Test only works if binlog_format is statement
+--source include/assert.inc
+
+# Get connection id
+--source include/rpl_connection_master.inc
+--let $connection_id= `SELECT CONNECTION_ID()`
+
+# Create database, table, and trigger table
+eval CREATE DATABASE $database;
+eval USE $database;
+eval CREATE TABLE $table (a INT) ENGINE = MyISAM;
+eval CREATE TABLE trigger_table (a INT) ENGINE = MyISAM;
+
+# This master-only trigger will sleep for N seconds when the value N
+# is inserted to a row.
+SET SQL_LOG_BIN=0;
+--delimiter |
+eval
+CREATE TRIGGER trig1 BEFORE INSERT ON $table FOR EACH ROW
+BEGIN
+  IF NEW.a != 0 THEN
+    SET @@GLOBAL.BINLOG_FORMAT = 'row';
+    DO SLEEP(1000000);
+  END IF;
+  INSERT INTO trigger_table VALUES (1);
+END|
+--delimiter ;
+SET SQL_LOG_BIN=1;
+
+# Sleep 1000000 seconds before inserting the second row.
+--send
+eval INSERT INTO $table VALUES (0), (1);
+
+# Wait until the sleep for the second row happens.
+--source include/rpl_connection_master1.inc
+
+--let $wait_condition= SELECT @@GLOBAL.BINLOG_FORMAT = 'ROW'
+--let $show_rpl_debug_info= 1
+--source include/wait_condition.inc
+
+# Kill query.
+--replace_result $connection_id <CONNECTION_ID>
+eval KILL QUERY $connection_id;
+
+# Get the error message.
+--source include/rpl_connection_master.inc
+--error ER_QUERY_INTERRUPTED
+reap;
+
+SET @@GLOBAL.BINLOG_FORMAT = 'STATEMENT';
+
+# Check that at most one row was inserted in main table.
+--let $assert_text= At most one row should be inserted in $database.$table
+--let $assert_cond= COUNT(*) <= 1 FROM $database.$table
+--source include/assert.inc
+
+# Check that at least one row was inserted in trigger table.
+--let $assert_text= At least one row should be inserted in $database.trigger_table
+--let $assert_cond= COUNT(*) >= 1 FROM $database.trigger_table
+--source include/assert.inc
+
+# Clean up.
+SET SQL_LOG_BIN=0;
+eval DROP TRIGGER trig1;
+SET SQL_LOG_BIN=1;
+DROP TABLE trigger_table;
+eval DROP TABLE $table;
+eval DROP DATABASE $database;
+--eval USE $_rkq_current_database_old

=== modified file 'mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc'
--- mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2013-05-12 06:24:46 +0000
+++ mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2014-06-05 04:33:53 +0000
@@ -119,9 +119,7 @@
   --let $rpl_server_number= 2
   --let $rpl_server_parameters= --skip-slave-start --relay-log-recovery=0 --slave-parallel-workers=0
 
-  --let $rpl_debug= 1
   --source include/rpl_start_server.inc
-  --let $rpl_debug= 0
 
   START SLAVE UNTIL SQL_AFTER_MTS_GAPS;
   --let $slave_param= Until_Condition
@@ -134,9 +132,7 @@
   --echo ** regular restart **
   --let $rpl_server_number= 2
   --let $rpl_server_parameters= --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1
-  --let $rpl_debug= 1
   --source include/rpl_restart_server.inc
-  --let $rpl_debug= 0
 
   #### Checking if the recovery worked and the coordinator has an updated state. ####
   --connection slave

=== modified file 'mysql-test/include/begin_include_file.inc'
--- mysql-test/include/begin_include_file.inc	2012-01-19 12:23:48 +0000
+++ mysql-test/include/begin_include_file.inc	2014-06-05 04:33:53 +0000
@@ -74,6 +74,13 @@
 if ($rpl_debug)
 {
   --echo $_include_file_indent==== BEGIN include/$include_filename ====
+  # Print this text (just once) to prevent checking in result files containing
+  # debug info.
+  if (!$printed_this_should_not_be_checked_in)
+  {
+    --echo DO_NOT_CHECK_IN_THIS_LINE: \$rpl_debug should only be used for debugging. Never check in a test that has $rpl_debug=1.
+    --let $printed_this_should_not_be_checked_in= 1
+  }
 }
 
 --let $_include_file_enabled_warnings= $ENABLED_WARNINGS$_include_file_enabled_warnings

=== added file 'mysql-test/include/change_file_perms.inc'
--- mysql-test/include/change_file_perms.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/change_file_perms.inc	2014-06-05 04:33:53 +0000
@@ -0,0 +1,12 @@
+# $file_perms need to be in octal base
+# Provide a file name and the required new file permissions.
+# The file's permissions will be changed as per the input file
+# permissions.
+
+--perl
+use strict;
+my $file_perms= $ENV{'_FILE_PERMS_'} or die "File permissions are not set";
+my $input_file= $ENV{'_INPUT_FILE_'} or die "Input file is not set";
+die ('Unable to find file \'$input_file\'') unless (-e $input_file);
+chmod(oct($file_perms), $input_file) or die ('Unable to set file permissions for file \'$input_file\'');
+EOF

=== modified file 'mysql-test/include/eval.inc'
--- mysql-test/include/eval.inc	2012-02-01 10:50:36 +0000
+++ mysql-test/include/eval.inc	2014-06-05 04:33:53 +0000
@@ -36,7 +36,6 @@
 #
 # --let $eval_expr= [SHOW SLAVE STATUS, Relay_Log_Pos, 1] + 47
 # [--let $eval_no_result= 1]
-# [--let $eval_quiet= 1]
 # [--let $rpl_debug= 1]
 # --source include/eval.inc
 # --echo Result was '$eval_result'

=== added file 'mysql-test/include/gtid_step_assert.inc'
--- mysql-test/include/gtid_step_assert.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/gtid_step_assert.inc	2014-06-05 04:33:53 +0000
@@ -0,0 +1,96 @@
+# ==== Purpose ====
+#
+# Assert that exactly one GTID (or a specified number) was added to
+# @@GLOBAL.GTID_EXECUTED since last call to gtid_step_reset.inc or
+# gtid_step_assert.inc
+#
+# ==== Usage ====
+#
+# [--let $gtid_step_count= N]
+# [--let $gtid_step_only_count= [0|1]]
+# [--let $gtid_step_uuid= UUID]
+# --source include/gtid_step_assert.inc
+#
+# Parameters:
+#   $gtid_step_count
+#     Assert that N GTIDs were added to @@GLOBAL.GTID_EXECUTED. If
+#     this is not given, the default value is 1.
+#
+#   $gtid_step_only_count
+#     By default, this script checks the numeric component of the
+#     GTIDs added to @@GLOBAL.GTID_EXECUTED to see that the correct
+#     number was generated.  If this parameter is nonzero, it only
+#     counts the number of added GTIDs to see that it is equal to
+#     $gtid_step_count, without caring that they were generated in
+#     order (or generated on this server).
+#
+#   $gtid_step_uuid
+#     By default, when $gtid_step_count is not set, asserts that the
+#     uuid component of all GTIDs added to @@GLOBAL.GTID_EXECUTED is
+#     equal to @@GLOBAL.SERVER_UUID.  If this parameter is given, uses
+#     that UUID instead.
+#
+# ==== Example ====
+#
+# # (1) Remember the current position.
+# --source include/gtid_step_reset.inc
+# CREATE TABLE t1 (a INT);
+# # (2) Assert that exactly one GTID was generated since (1).
+# --source include/gtid_step_assert.inc
+# INSERT INTO t1 VALUES (1);
+# INSERT INTO t1 VALUES (2);
+# # (3) Assert that exactly 2 GTIDs were generated since (2).
+# --let $gtid_step_count= 2
+# --source include/gtid_step_assert.inc
+# # (4) Assert that no GTID was generated since (3).
+# --let $gtid_step_count= 0
+# --source include/gtid_step_assert.inc
+
+if ($uuidf == '')
+{
+  --die You must source gtid_utils.inc before using gtid_step_assert.inc
+}
+
+--let $_gtid_step_count= 1
+if ($gtid_step_count != '')
+{
+  --let $_gtid_step_count= $gtid_step_count
+}
+
+--let $_gtid_step_only_count= 0
+if ($gtid_step_only_count != '')
+{
+  --let $_gtid_step_only_count= $gtid_step_only_count
+}
+
+--let $include_filename= gtid_step_assert.inc [count=$_gtid_step_count, only_count=$_gtid_step_only_count]
+--source include/begin_include_file.inc
+
+--let $_gtid_step_uuid= $gtid_step_uuid
+if ($_gtid_step_uuid == '')
+{
+  --let $_gtid_step_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+}
+
+--let $_gsa_extra_debug_eval_old= $extra_debug_eval
+--let $extra_debug_eval= @@GLOBAL.GTID_EXECUTED, GTID_NEXT_GENERATED_SET("$gtid_step_last", "$_gtid_step_uuid", $_gtid_step_count), GTID_SUBTRACT(@@GLOBAL.GTID_EXECUTED, "$gtid_step_last")
+
+if ($_gtid_step_only_count)
+{
+  --let $assert_text= Exactly $_gtid_step_count GTIDs should have been committed since last invocation
+  --let $assert_cond= GTID_COUNT(GTID_SUBTRACT(@@GLOBAL.GTID_EXECUTED, "$gtid_step_last")) = $_gtid_step_count
+  --source include/assert.inc
+}
+if (!$_gtid_step_only_count)
+{
+  --let $assert_text= Exactly $_gtid_step_count GTIDs should have been generated since last invocation
+  --let $assert_cond= GTID_NEXT_GENERATED_SET("$gtid_step_last", "$_gtid_step_uuid", $_gtid_step_count) = GTID_SUBTRACT(@@GLOBAL.GTID_EXECUTED, "$gtid_step_last")
+  --source include/assert.inc
+}
+
+--let $extra_debug_eval= $_gsa_extra_debug_eval_old
+
+--source include/gtid_step_reset.inc
+
+--let $include_filename= gtid_step_assert.inc
+--source include/end_include_file.inc

=== added file 'mysql-test/include/gtid_step_reset.inc'
--- mysql-test/include/gtid_step_reset.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/gtid_step_reset.inc	2014-06-05 04:33:53 +0000
@@ -0,0 +1,18 @@
+# ==== Purpose ====
+#
+# Remember the current value of @@GLOBAL.GTID_EXECUTED to be used by
+# subsequent calls to gtid_step_assert.inc
+#
+# ==== Usage ====
+#
+# --source include/gtid_step_reset.inc
+#
+# See gtid_step_assert.inc for details and examples.
+
+--let $include_filename= gtid_step_reset.inc
+--source include/begin_include_file.inc
+
+--let $gtid_step_last= `SELECT @@GLOBAL.GTID_EXECUTED`
+
+--let $include_filename= gtid_step_reset.inc
+--source include/end_include_file.inc

=== modified file 'mysql-test/include/gtid_utils.inc'
--- mysql-test/include/gtid_utils.inc	2012-01-30 19:56:21 +0000
+++ mysql-test/include/gtid_utils.inc	2014-06-05 04:33:53 +0000
@@ -4,22 +4,33 @@
 # The functions are typically useful to check assertions related to
 # GTIDs. The following functions are defined:
 #
-#   GTID_IS_EQUAL(g1, g2)
-#     True if g1 and g2 are the same set
-#   GTID_IS_DISJOINT(g1, g2)
-#     True if g1 and g2 are disjoint
-#   GTID_IS_DISJOINT_UNION(g1, g2, sum)
-#     True if sum is the disjoint union of g1 and g2
-#   GTID_UNION(g1, g2)
-#     Return the union of g1 and g2
-#   GTID_INTERSECTION(g1, g2)
-#     Return the union of g1 and g2
-#   GTID_SYMMETRIC_DIFFERENCE(g1, g2)
-#     Return the symmetric difference of g1 and g2
-#   GTID_SUBTRACT_UUID(gtid, uuid)
+#   GTID_IS_EQUAL(gtid_set_1, gtid_set_2)
+#     True if gtid_set_1 and gtid_set_2 are the same set
+#   GTID_IS_DISJOINT(gtid_set_1, gtid_set_2)
+#     True if gtid_set_1 and gtid_set_2 are disjoint
+#   GTID_IS_DISJOINT_UNION(gtid_set_1, gtid_set_2, sum)
+#     True if sum is the disjoint union of gtid_set_1 and gtid_set_2
+#   GTID_NORMALIZE(gtid_set)
+#     Return the gtid set in a normalized form: all uuids in alphabetic
+#     order, all intervals compressed and in order, no whitespace, all
+#     lowercase.
+#   GTID_UNION(gtid_set_1, gtid_set_2)
+#     Return the union of gtid_set_1 and gtid_set_2
+#   GTID_INTERSECTION(gtid_set_1, gtid_set_2)
+#     Return the intersection of gtid_set_1 and gtid_set_2
+#   GTID_SYMMETRIC_DIFFERENCE(gtid_set_1, gtid_set_2)
+#     Return the symmetric difference of gtid_set_1 and gtid_set_2
+#   GTID_SUBTRACT_UUID(gtid_set, uuid)
 #     Remove the UUID from the GTID set
-#   GTID_INTERSECTION_WITH_UUID(gtid, uuid)
+#   GTID_INTERSECTION_WITH_UUID(gtid_set, uuid)
 #     Return only the gtids with the given uuid from the GTID set
+#   GTID_COUNT(gtid_set)
+#     Return the number of gtids in the gtid_set.
+#   GTID_NEXT_GENERATED(gtid_set, uuid)
+#     Return the next GNO that will be generated for the given uuid.
+#   GTID_NEXT_GENERATED_SET(gtid_set, uuid, count)
+#     Return the GTID set consisting of the next 'count' GTIDs that will
+#     be generated for the given uuid.
 #   GTID_COMPARE(old, diff, new)
 #     The same as GTID_IS_DISJOINT_UNION, except it has the following
 #     additional feature: if diff begins by '~', then it returns true
@@ -38,10 +49,18 @@
 #
 # ==== Usage ====
 #
+# You should not normally source this file directly; instead set
+# $rpl_gtid_utils=1 before sourcing master-slave.inc or rpl_init.inc.
+# Then, the functions are automatically dropped in rpl_end.inc, and
+# RESET MASTER is executed so that the functions do not pollute the
+# binary log.
+#
+# If you really need to use this file manually, do this:
+#
 #  1. Create the stored functions at the beginning of the test script:
 #
 #       --source include/gtid_utils.inc
-# 
+#
 #  2. Use the functions as you like during the test script.
 #
 #  3. Delete the stored functions at the end of the test script:
@@ -52,7 +71,10 @@
 --let $include_filename= gtid_utils.inc
 --source include/begin_include_file.inc
 
---disable_query_log
+if (!$rpl_debug)
+{
+  --disable_query_log
+}
 
 --delimiter |
 
@@ -75,60 +97,131 @@
 --let $uuidf= ffffffff-ffff-ffff-ffff-ffffffffffff
 
 # Return nonzero if the two gtid_sets are equal.
-CREATE FUNCTION GTID_IS_EQUAL(g1 TEXT(10000), g2 TEXT(10000))
+CREATE FUNCTION GTID_IS_EQUAL(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
 RETURNS INT
-BEGIN
-  RETURN GTID_SUBSET(g1, g2) AND GTID_SUBSET(g2, g1);
-END|
+RETURN GTID_SUBSET(gtid_set_1, gtid_set_2) AND GTID_SUBSET(gtid_set_2, gtid_set_1)|
 
 # Return nonzero if the two gtid_sets are disjoint.
-CREATE FUNCTION GTID_IS_DISJOINT(g1 TEXT(10000), g2 TEXT(10000))
-RETURNS INT
-BEGIN
-  RETURN GTID_SUBSET(g1, GTID_SUBTRACT(g1, g2));
-END|
-
-# Return true if g1 union g2 = sum, and g1 and g2 are disjoint.
-CREATE FUNCTION GTID_IS_DISJOINT_UNION(g1 TEXT(10000), g2 TEXT(10000), sum TEXT(10000))
-RETURNS INT
-BEGIN
-  RETURN GTID_IS_EQUAL(GTID_SUBTRACT(sum, g1), g2) AND
-         GTID_IS_EQUAL(GTID_SUBTRACT(sum, g2), g1);
-END|
-
-# Return the union of g1 and g2.
-CREATE FUNCTION GTID_UNION(g1 TEXT(10000), g2 TEXT(10000))
-RETURNS TEXT(10000)
-BEGIN
-  RETURN GTID_SUBTRACT(CONCAT(g1, ',', g2), '');
-END|
-
-# Return the intersection of g1 and g2.
-CREATE FUNCTION GTID_INTERSECT(g1 TEXT(10000), g2 TEXT(10000))
-RETURNS TEXT(10000)
-BEGIN
-  RETURN GTID_SUBTRACT(g1, GTID_SUBTRACT(g1, g2));
-END|
-
-# Return the symmetric difference between g1 and g2.
-CREATE FUNCTION GTID_SYMMETRIC_DIFFERENCE(g1 TEXT(10000), g2 TEXT(10000))
-RETURNS TEXT(10000)
-BEGIN
-  RETURN SUBTRACT(CONCAT(g1, ',', g2), GTID_INTERSECTION(g1, g2));
-END|
+CREATE FUNCTION GTID_IS_DISJOINT(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
+RETURNS INT
+RETURN GTID_SUBSET(gtid_set_1, GTID_SUBTRACT(gtid_set_1, gtid_set_2))|
+
+# Return true if gtid_set_1 union gtid_set_2 = sum, and gtid_set_1 and gtid_set_2 are disjoint.
+CREATE FUNCTION GTID_IS_DISJOINT_UNION(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000), sum TEXT(10000))
+RETURNS INT
+RETURN GTID_IS_EQUAL(GTID_SUBTRACT(sum, gtid_set_1), gtid_set_2) AND
+       GTID_IS_EQUAL(GTID_SUBTRACT(sum, gtid_set_2), gtid_set_1)|
+
+# Return a normalized form of the GTID (all uppercase, no whitespace,
+# no duplicates, uuids in alphabetic order, intervals in numeric
+# order).
+CREATE FUNCTION GTID_NORMALIZE(g TEXT(10000))
+RETURNS TEXT(10000)
+RETURN GTID_SUBTRACT(g, '')|
+
+# Return the union of gtid_set_1 and gtid_set_2.
+CREATE FUNCTION GTID_UNION(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
+RETURNS TEXT(10000)
+RETURN GTID_NORMALIZE(CONCAT(gtid_set_1, ',', gtid_set_2))|
+
+# Return the intersection of gtid_set_1 and gtid_set_2.
+CREATE FUNCTION GTID_INTERSECTION(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
+RETURNS TEXT(10000)
+RETURN GTID_SUBTRACT(gtid_set_1, GTID_SUBTRACT(gtid_set_1, gtid_set_2))|
+
+# Return the symmetric difference between gtid_set_1 and gtid_set_2.
+CREATE FUNCTION GTID_SYMMETRIC_DIFFERENCE(gtid_set_1 TEXT(10000), gtid_set_2 TEXT(10000))
+RETURNS TEXT(10000)
+RETURN GTID_SUBTRACT(CONCAT(gtid_set_1, ',', gtid_set_2), GTID_INTERSECTION(gtid_set_1, gtid_set_2))|
 
 # Return the gtid with uuid removed.
-CREATE FUNCTION GTID_SUBTRACT_UUID(gtid TEXT(10000), uuid TEXT(10000))
+CREATE FUNCTION GTID_SUBTRACT_UUID(gtid_set TEXT(10000), uuid TEXT(100))
 RETURNS TEXT(10000)
-BEGIN
-  RETURN GTID_SUBTRACT(gtid, CONCAT(UUID, ':1-', 1 << 62));
-END|
+RETURN GTID_SUBTRACT(gtid_set, CONCAT(UUID, ':1-', 1 << 63 - 1))|
 
 # Return the intersection of gtid and uuid.
-CREATE FUNCTION GTID_INTERSECT_UUID(gtid TEXT(10000), uuid TEXT(10000))
-RETURNS TEXT(10000)
-BEGIN
-  RETURN GTID_SUBTRACT(gtid, GTID_SUBTRACT_UUID(gtid, uuid));
+CREATE FUNCTION GTID_INTERSECTION_WITH_UUID(gtid_set TEXT(10000), uuid TEXT(100))
+RETURNS TEXT(10000)
+RETURN GTID_SUBTRACT(gtid_set, GTID_SUBTRACT_UUID(gtid_set, uuid))|
+
+# If the first argument is nonzero, return it, else return the second argument
+CREATE FUNCTION IFZERO(a INT, b INT)
+RETURNS INT
+RETURN IF(a = 0, b, a)|
+
+# Like the builtin LOCATE, but returns length+1 rather than 0 if nothing found.
+CREATE FUNCTION LOCATE2(needle TEXT(10000), haystack TEXT(10000), offset INT)
+RETURNS INT
+RETURN IFZERO(LOCATE(needle, haystack, offset), LENGTH(haystack) + 1)|
+
+# Return the number of GTIDs in the given GTID set.
+CREATE FUNCTION GTID_COUNT(gtid_set TEXT(10000))
+RETURNS INT
+BEGIN
+  DECLARE result BIGINT DEFAULT 0;
+  DECLARE colon_pos INT;
+  DECLARE next_dash_pos INT;
+  DECLARE next_colon_pos INT;
+  DECLARE next_comma_pos INT;
+  SET gtid_set = GTID_NORMALIZE(gtid_set);
+  SET colon_pos = LOCATE2(':', gtid_set, 1);
+  WHILE colon_pos != LENGTH(gtid_set) + 1 DO
+     SET next_dash_pos = LOCATE2('-', gtid_set, colon_pos + 1);
+     SET next_colon_pos = LOCATE2(':', gtid_set, colon_pos + 1);
+     SET next_comma_pos = LOCATE2(',', gtid_set, colon_pos + 1);
+     IF next_dash_pos < next_colon_pos AND next_dash_pos < next_comma_pos THEN
+       SET result = result +
+         SUBSTR(gtid_set, next_dash_pos + 1,
+                LEAST(next_colon_pos, next_comma_pos) - (next_dash_pos + 1)) -
+         SUBSTR(gtid_set, colon_pos + 1, next_dash_pos - (colon_pos + 1)) + 1;
+     ELSE
+       SET result = result + 1;
+     END IF;
+     SET colon_pos = next_colon_pos;
+  END WHILE;
+  RETURN result;
+END|
+
+# Return the next GNO (numeric component) to be generated for the given UUID
+CREATE FUNCTION GTID_NEXT_GENERATED(gtid_set TEXT(10000), uuid TEXT(100))
+RETURNS INT
+BEGIN
+  DECLARE gtid_uuid TEXT(10000) DEFAULT GTID_INTERSECTION_WITH_UUID(gtid_set, uuid);
+  DECLARE colon_pos INT DEFAULT LOCATE2(':', gtid_uuid, 1);
+  DECLARE next_dash_pos INT DEFAULT LOCATE2('-', gtid_uuid, colon_pos + 1);
+  DECLARE next_comma_pos INT DEFAULT LOCATE2(',', gtid_uuid, colon_pos + 1);
+  DECLARE next_colon_pos INT DEFAULT LOCATE2(':', gtid_uuid, colon_pos + 1);
+  IF gtid_uuid = '' THEN
+    RETURN 1;
+  ELSEIF SUBSTR(gtid_uuid, colon_pos + 1,
+                 LEAST(next_dash_pos, next_comma_pos, next_colon_pos) -
+                 (colon_pos + 1)) != '1' THEN
+    RETURN 1;
+  ELSEIF next_dash_pos < LEAST(next_comma_pos, next_colon_pos) THEN
+    RETURN SUBSTR(gtid_uuid, next_dash_pos + 1,
+                  LEAST(next_comma_pos, next_colon_pos) -
+                  (next_dash_pos + 1)) + 1;
+  ELSE
+    RETURN 2;
+  END IF;
+END|
+
+# Return a GTID set consisting of the the next 'count' GTIDs that will
+# be generated for the given UUID.
+# This is inefficient if count is big, consider optimizing it if needed.
+CREATE FUNCTION GTID_NEXT_GENERATED_SET(gtid_set TEXT(10000), uuid TEXT(100), count INT)
+RETURNS TEXT(10000)
+BEGIN
+  DECLARE result TEXT(10000) DEFAULT '';
+  DECLARE number INT;
+  DECLARE new_gtid VARCHAR(100);
+  WHILE count > 0 DO
+    SET new_gtid = CONCAT(uuid, ':', GTID_NEXT_GENERATED(gtid_set, uuid));
+    SET result = GTID_UNION(result, new_gtid);
+    SET gtid_set = GTID_UNION(gtid_set, new_gtid);
+    SET count = count - 1;
+  END WHILE;
+  RETURN result;
 END|
 
 # Return true if gtid_set 'new' is obtained by adding 'diff' to 'old',
@@ -137,16 +230,7 @@
 # removed) from 'new'.
 CREATE FUNCTION GTID_COMPARE(old TEXT(10000), diff TEXT(10000), new TEXT(10000))
 RETURNS INT
-BEGIN
-  DECLARE tilde_pos INT DEFAULT LOCATE('~', diff);
-  DECLARE to_add TEXT(10000);
-  DECLARE to_remove TEXT(10000);
-  IF tilde_pos != 0 THEN
-    RETURN GTID_IS_DISJOINT_UNION(new, SUBSTR(diff, 2), old);
-  ELSE
-    RETURN GTID_IS_DISJOINT_UNION(old, diff, new);
-  END IF;
-END|
+RETURN IF(SUBSTR(diff, 1, 1) != '~', GTID_IS_DISJOINT_UNION(old, diff, new), GTID_IS_DISJOINT_UNION(new, SUBSTR(diff, 2), old))|
 
 # convert strings like '1:4-5,97:1' to
 # '01010101-0101-0101-0101-010101010101:4-5,97979797-9797-9797-9797-979797979797:1'

=== modified file 'mysql-test/include/gtid_utils_end.inc'
--- mysql-test/include/gtid_utils_end.inc	2012-01-25 13:43:19 +0000
+++ mysql-test/include/gtid_utils_end.inc	2014-06-05 04:33:53 +0000
@@ -14,11 +14,17 @@
 DROP FUNCTION GTID_IS_EQUAL;
 DROP FUNCTION GTID_IS_DISJOINT;
 DROP FUNCTION GTID_IS_DISJOINT_UNION;
+DROP FUNCTION GTID_NORMALIZE;
 DROP FUNCTION GTID_UNION;
-DROP FUNCTION GTID_INTERSECT;
+DROP FUNCTION GTID_INTERSECTION;
 DROP FUNCTION GTID_SYMMETRIC_DIFFERENCE;
 DROP FUNCTION GTID_SUBTRACT_UUID;
-DROP FUNCTION GTID_INTERSECT_UUID;
+DROP FUNCTION GTID_INTERSECTION_WITH_UUID;
+DROP FUNCTION IFZERO;
+DROP FUNCTION LOCATE2;
+DROP FUNCTION GTID_COUNT;
+DROP FUNCTION GTID_NEXT_GENERATED;
+DROP FUNCTION GTID_NEXT_GENERATED_SET;
 DROP FUNCTION GTID_COMPARE;
 DROP FUNCTION NUMBER_TO_UUID;
 DROP FUNCTION UUID_TO_NUMBER;

=== added file 'mysql-test/include/linux.inc'
--- mysql-test/include/linux.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/linux.inc	2014-06-05 04:33:53 +0000
@@ -0,0 +1,5 @@
+if (`select convert(@@version_compile_os using latin1) IN ("Linux") = 0`)
+{
+  skip Needs Linux;
+}
+

=== removed file 'mysql-test/include/linux.inc'
--- mysql-test/include/linux.inc	2013-10-03 06:42:52 +0000
+++ mysql-test/include/linux.inc	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-if (`select convert(@@version_compile_os using latin1) LIKE 'Linux' = 0`)
-{
-  skip Need Linux;
-}
-

=== modified file 'mysql-test/include/master-slave.inc'
--- mysql-test/include/master-slave.inc	2013-02-05 11:23:16 +0000
+++ mysql-test/include/master-slave.inc	2014-06-05 04:33:53 +0000
@@ -12,12 +12,13 @@
 #   [--let $rpl_debug= 1]
 #   [--let $slave_timeout= NUMBER]
 #   [--let $use_gtids= 1]
+#   [--let $rpl_gtid_utils= 1]
 #   --source include/master-slave.inc
 #
 # Parameters:
 #   $rpl_check_server_ids, $rpl_skip_reset_master_and_slave,
 #   $rpl_skip_change_master, $rpl_skip_start_slave, $rpl_debug,
-#   $slave_timeout, $use_gtids
+#   $slave_timeout, $use_gtids, $rpl_gtid_utils
 #     See include/rpl_init.inc
 #
 #   $rpl_server_count

=== added file 'mysql-test/include/rpl_connection_master1.inc'
--- mysql-test/include/rpl_connection_master1.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/rpl_connection_master1.inc	2014-06-05 04:33:53 +0000
@@ -0,0 +1,2 @@
+let $rpl_connection_name= master1;
+source include/rpl_connection.inc;

=== modified file 'mysql-test/include/rpl_end.inc'
--- mysql-test/include/rpl_end.inc	2014-04-24 05:16:52 +0000
+++ mysql-test/include/rpl_end.inc	2014-06-05 04:33:53 +0000
@@ -16,6 +16,7 @@
 #
 # [--let $rpl_only_running_threads= 1]
 # [--let $rpl_debug= 1]
+# [--let $rpl_gtid_utils= 1]
 # --source include/rpl_end.inc
 #
 # Parameters:
@@ -27,6 +28,9 @@
 #   $rpl_debug
 #     See include/rpl_init.inc
 #
+#   $rpl_gtid_utils
+#     Source include/gtid_utils_end.inc on every server.
+#
 # Note:
 #   This script will fail if Last_SQL_Error or Last_IO_Error is
 #   nonempty.  If you expect an error in the SQL thread, you should
@@ -88,6 +92,7 @@
 # mtr configures server 2 to be a slave before it runs the test. We
 # have to restore that state now, so we change topology to 1->2.
 --let $rpl_topology= none
+--let $use_gtids= 0
 --source include/rpl_change_topology.inc
 
 
@@ -96,6 +101,15 @@
 --let $_rpl_one= _1
 while ($_rpl_server)
 {
+  if ($rpl_gtid_utils)
+  {
+    # Drop gtid_utils
+    --let $rpl_connection_name= server_$_rpl_server
+    --source include/rpl_connection.inc
+    --source include/gtid_utils_end.inc
+    --connection default
+  }
+  # Unconfigure connections
   --disconnect server_$_rpl_server
   --disconnect server_$_rpl_server$_rpl_one
   --dec $_rpl_server

=== modified file 'mysql-test/include/rpl_init.inc'
--- mysql-test/include/rpl_init.inc	2014-04-24 05:16:52 +0000
+++ mysql-test/include/rpl_init.inc	2014-06-05 04:33:53 +0000
@@ -51,6 +51,7 @@
 #    [--let $rpl_debug= 1]
 #    [--let $slave_timeout= NUMBER]
 #    [--let $use_gtids= 1]
+#    [--let $rpl_gtid_utils= 1]
 #    --source include/rpl_init.inc
 #
 #    Parameters:
@@ -107,6 +108,10 @@
 #    $use_gtids
 #      Use option MASTER_AUTO_POSITION = 1 to CHANGE MASTER.
 #
+#    $rpl_gtid_utils
+#      Create stored functions for GTID manipulation on every server (see
+#      gtid_utils.inc).
+#
 #
 # ==== Side effects ====
 #
@@ -198,6 +203,10 @@
   --let $rpl_connection_name= server_$_rpl_server
   --source include/rpl_connection.inc
   USE test;
+  if ($rpl_gtid_utils)
+  {
+    --source include/gtid_utils.inc
+  }
   if (!$rpl_skip_reset_master_and_slave)
   {
     RESET MASTER;

=== modified file 'mysql-test/include/rpl_stop_server.inc'
--- mysql-test/include/rpl_stop_server.inc	2013-08-20 09:38:01 +0000
+++ mysql-test/include/rpl_stop_server.inc	2014-06-05 04:33:53 +0000
@@ -6,6 +6,7 @@
 #
 # --let $rpl_server_number= N
 # [--let $rpl_debug= 1]
+# [--let $rpl_force_stop= 1]
 # --source include/rpl_stop_server.inc
 #
 # Parameters:
@@ -17,6 +18,8 @@
 #
 #   $rpl_debug
 #     See include/rpl_init.inc
+#   $rpl_force_stop
+#     Kill the server immediately i.e., --shutdown_server 0
 #
 # ==== See also ====
 #
@@ -48,11 +51,15 @@
 
 # Send shutdown to the connected server and give
 # it 14 seconds to die before zapping it
-shutdown_server 14;
-
+--let $shutdown_server_timeout= 14
+if ($rpl_force_stop)
+{
+   # if force_stop is set, shutdown server immediately(equal to killing the server)
+   --let $shutdown_server_timeout= 0
+}
+shutdown_server $shutdown_server_timeout;
 --source include/wait_until_disconnected.inc
 
-
 --let $rpl_connection_name= $_rpl_stop_server_old_connection
 --source include/rpl_connection.inc
 --dec $_include_file_depth