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

[Laurynas Biveinis]

Merge MySQL 5.6.16,
https://blueprints.launchpad.net/percona-server/+spec/merge-5.6.16.

Revert our fix for bug 1182572 / upstream
http://bugs.mysql.com/bug.php?id=68354.

The merge of upstream fix for http://bugs.mysql.com/bug.php?id=68079
that introduced atomic buffer pool page reference counting and
required changes in flushing required changes for both XtraDB buffer
pool mutex split and the new XtraDB LRU flushing algorithm:
- Make buf_flush_page() to hold the LRU list mutex iff called for a
  single page LRU flush. Release it by the time we are committed to
  flushing a page and cannot decide otherwise anymore. Adjust callers
  accordingly.
- Postpone page hash unlock in buf_page_init_for_read() until the
  buffer page has been I/O-fixed and its frame X latched. This is to
  avoid buf_pool_validate_instance() observing inconsistent buffer
  pool state.
- Move I/O read time userstat accounting from buf_page_get_gen() to
  buf_wait_for_read().

Moved ER_QUERY_TIMEOUT to the end of 5.6 error messages to avoid
renumbering of the new error messages introduced by Oracle.

This merge also takes an upstream fix for bug 691601 /
http://bugs.mysql.com/bug.php?id=61746.

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

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

[Laurynas Biveinis (laurynas-biveinis)]

A merge regression in that buf_flush_page_and_try_neighbors() will return an uninitialized value if doing flush list flushing and encountering a page not ready for flush:

...
 ibool flushed;
...
 if (buf_flush_ready_for_flush(bpage, flush_type)) {
...
  flushed = TRUE;
 } else if (flush_type == BUF_FLUSH_LRU) {
...
  flushed = FALSE;
 }
...
 return(flushed);

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

bug 1281046.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-05 10:00:04 +0000
+++ CMakeLists.txt	2014-02-17 11:30:39 +0000
@@ -173,11 +173,7 @@
 # Whether the maintainer mode compiler options should be enabled.
 IF(MYSQL_MAINTAINER_MODE)
   IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
-    IF(WITH_INNODB_MEMCACHED)
-      SET_MYSQL_MAINTAINER_GNU_C_OPTIONS_NO_WERROR()
-    ELSE()
-      SET_MYSQL_MAINTAINER_GNU_C_OPTIONS()
-    ENDIF()
+    SET_MYSQL_MAINTAINER_GNU_C_OPTIONS()
   ENDIF()
   IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS()
@@ -338,6 +334,10 @@
 OPTION(INNODB_COMPILER_HINTS "Compile InnoDB with compiler hints" ON)
 MARK_AS_ADVANCED(INNODB_COMPILER_HINTS)
 
+OPTION(INNODB_PAGE_ATOMIC_REF_COUNT "Use atomics for the page reference count"
+       ON)
+MARK_AS_ADVANCED(INNODB_PAGE_ATOMIC_REF_COUNT)
+
 IF (NOT MAX_INDEXES)
   SET(MAX_INDEXES 64)
 ENDIF()
@@ -398,6 +398,15 @@
   SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
 ENDIF()
 
+OPTION(TMPDIR
+"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in <stdio.h>" OFF)
+IF(TMPDIR)
+  # Quote it, to make it a const char string.
+  SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
+ELSE()
+  # Do not quote it, to refer to the P_tmpdir macro in <stdio.h>.
+  SET(DEFAULT_TMPDIR "P_tmpdir")
+ENDIF()
 
 # Run platform tests
 INCLUDE(configure.cmake)
 
=== modified file 'README.MySQL'
--- README.MySQL	2013-10-08 05:04:18 +0000
+++ README.MySQL	2014-02-17 11:30:39 +0000
@@ -5,7 +5,7 @@
 is released under the version 2 of the GNU General Public License. 
 MySQL is brought to you by Oracle.
 
-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the COPYING file.
 
 
=== modified file 'VERSION'
--- VERSION	2013-12-20 03:15:04 +0000
+++ VERSION	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=15
-MYSQL_VERSION_EXTRA=-62.0
+MYSQL_VERSION_PATCH=16
+MYSQL_VERSION_EXTRA=-64.0
 
=== modified file 'client/mysql_plugin.c'
--- client/mysql_plugin.c	2013-10-09 11:17:06 +0000
+++ client/mysql_plugin.c	2014-02-17 11:30:39 +0000
@@ -892,7 +892,7 @@
       strncat(buff, FN_DIRSEP, sizeof(buff) - strlen(buff) - 1);
 #endif
       buff[sizeof(buff) - 1]= 0;
-      my_delete(opt_basedir, MYF(0));
+      my_free(opt_basedir);
       opt_basedir= my_strdup(buff, MYF(MY_FAE));
     }
   }
 
=== modified file 'client/mysqldump.c'
--- client/mysqldump.c	2013-12-16 08:45:31 +0000
+++ client/mysqldump.c	2014-02-17 11:30:39 +0000
@@ -492,7 +492,8 @@
     "are not enabled on the server, an error is generated. If OFF is "
     "used, this option does nothing. If AUTO is used and GTIDs are enabled "
     "on the server, 'SET @@GLOBAL.GTID_PURGED' is added to the output. "
-    "If GTIDs are disabled, AUTO does nothing. Default is AUTO.",
+    "If GTIDs are disabled, AUTO does nothing. If no value is supplied "
+    "then the default (AUTO) value will be considered.",
     0, 0, 0, GET_STR, OPT_ARG,
     0, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
@@ -936,9 +937,10 @@
     break;
   case (int) OPT_SET_GTID_PURGED:
     {
-      opt_set_gtid_purged_mode= find_type_or_exit(argument,
-                                                  &set_gtid_purged_mode_typelib,
-                                                  opt->name)-1;
+      if (argument)
+        opt_set_gtid_purged_mode= find_type_or_exit(argument,
+                                                    &set_gtid_purged_mode_typelib,
+                                                    opt->name)-1;
       break;
     }
   }
@@ -4879,6 +4881,12 @@
     else
       verbose_msg("-- dump_all_tables_in_db : logs flushed successfully!\n");
   }
+  if (opt_single_transaction && mysql_get_server_version(mysql) >= 50500)
+  {
+    verbose_msg("-- Setting savepoint...\n");
+    if (mysql_query_with_error_report(mysql, 0, "SAVEPOINT sp"))
+      DBUG_RETURN(1);
+  }
   while ((table= getTableName(0)))
   {
     char *end= strmov(afterdot, table);
@@ -4896,6 +4904,23 @@
           maybe_exit(EX_MYSQLERR);
         }
       }
+
+      /**
+        ROLLBACK TO SAVEPOINT in --single-transaction mode to release metadata
+        lock on table which was already dumped. This allows to avoid blocking
+        concurrent DDL on this table without sacrificing correctness, as we
+        won't access table second time and dumps created by --single-transaction
+        mode have validity point at the start of transaction anyway.
+        Note that this doesn't make --single-transaction mode with concurrent
+        DDL safe in general case. It just improves situation for people for whom
+        it might be working.
+      */
+      if (opt_single_transaction && mysql_get_server_version(mysql) >= 50500)
+      {
+        verbose_msg("-- Rolling back to savepoint sp...\n");
+        if (mysql_query_with_error_report(mysql, 0, "ROLLBACK TO SAVEPOINT sp"))
+          maybe_exit(EX_MYSQLERR);
+      }
     }
     else
     {
@@ -4918,6 +4943,14 @@
       }
     }
   }
+
+  if (opt_single_transaction && mysql_get_server_version(mysql) >= 50500)
+  {
+    verbose_msg("-- Releasing savepoint...\n");
+    if (mysql_query_with_error_report(mysql, 0, "RELEASE SAVEPOINT sp"))
+      DBUG_RETURN(1);
+  }
+
   if (opt_events && mysql_get_server_version(mysql) >= 50106)
   {
     DBUG_PRINT("info", ("Dumping events for database %s", database));
@@ -5160,6 +5193,13 @@
   if (opt_xml)
     print_xml_tag(md_result_file, "", "\n", "database", "name=", db, NullS);
 
+  if (opt_single_transaction && mysql_get_server_version(mysql) >= 50500)
+  {
+    verbose_msg("-- Setting savepoint...\n");
+    if (mysql_query_with_error_report(mysql, 0, "SAVEPOINT sp"))
+      DBUG_RETURN(1);
+  }
+
   /* Dump each selected table */
   for (pos= dump_tables; pos < end; pos++)
   {
@@ -5175,6 +5215,31 @@
         maybe_exit(EX_MYSQLERR);
       }
     }
+
+    /**
+      ROLLBACK TO SAVEPOINT in --single-transaction mode to release metadata
+      lock on table which was already dumped. This allows to avoid blocking
+      concurrent DDL on this table without sacrificing correctness, as we
+      won't access table second time and dumps created by --single-transaction
+      mode have validity point at the start of transaction anyway.
+      Note that this doesn't make --single-transaction mode with concurrent
+      DDL safe in general case. It just improves situation for people for whom
+      it might be working.
+    */
+    if (opt_single_transaction && mysql_get_server_version(mysql) >= 50500)
+    {
+      verbose_msg("-- Rolling back to savepoint sp...\n");
+      if (mysql_query_with_error_report(mysql, 0, "ROLLBACK TO SAVEPOINT sp"))
+        maybe_exit(EX_MYSQLERR);
+    }
+  }
+
+  if (opt_single_transaction && mysql_get_server_version(mysql) >= 50500)
+  {
+    verbose_msg("-- Releasing savepoint...\n");
+    if (mysql_query_with_error_report(mysql, 0, "RELEASE SAVEPOINT sp"))
+      DBUG_RETURN(1);
+
   }
 
   /* Dump each selected view */
 
=== modified file 'cmake/build_configurations/compiler_options.cmake'
--- cmake/build_configurations/compiler_options.cmake	2013-10-09 11:17:06 +0000
+++ cmake/build_configurations/compiler_options.cmake	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'cmake/build_configurations/feature_set.cmake'
--- cmake/build_configurations/feature_set.cmake	2013-10-09 11:17:06 +0000
+++ cmake/build_configurations/feature_set.cmake	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'cmake/create_initial_db.cmake.in'
--- cmake/create_initial_db.cmake.in	2013-02-26 05:45:28 +0000
+++ cmake/create_initial_db.cmake.in	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'cmake/libutils.cmake'
--- cmake/libutils.cmake	2013-07-23 05:19:27 +0000
+++ cmake/libutils.cmake	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'cmake/maintainer.cmake'
--- cmake/maintainer.cmake	2013-05-12 06:24:46 +0000
+++ cmake/maintainer.cmake	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,23 +33,6 @@
   SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error")
 ENDMACRO()
 
-MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS_NO_WERROR)
-  SET(MY_MAINTAINER_WARNINGS
-      "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing")
-
-  CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
-                        HAVE_DECLARATION_AFTER_STATEMENT)
-  IF(HAVE_DECLARATION_AFTER_STATEMENT)
-    SET(MY_MAINTAINER_DECLARATION_AFTER_STATEMENT
-        "-Wdeclaration-after-statement")
-  ENDIF()
-  SET(MY_MAINTAINER_C_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} ${MY_MAINTAINER_DECLARATION_AFTER_STATEMENT}"
-      CACHE STRING "C warning options used in maintainer builds.")
-  # Do not make warnings in checks into errors.
-  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error")
-ENDMACRO()
-
 
 # Setup G++ (GNU C++ compiler) warning options.
 MACRO(SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS)
 
=== modified file 'cmake/os/AIX.cmake'
--- cmake/os/AIX.cmake	2013-10-09 11:17:06 +0000
+++ cmake/os/AIX.cmake	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'cmake/ssl.cmake'
--- cmake/ssl.cmake	2014-01-28 10:42:55 +0000
+++ cmake/ssl.cmake	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'cmake/zlib.cmake'
--- cmake/zlib.cmake	2013-02-21 08:01:03 +0000
+++ cmake/zlib.cmake	2014-02-17 11:30:39 +0000
@@ -1,5 +1,4 @@
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'config.h.cmake'
--- config.h.cmake	2013-10-15 11:37:57 +0000
+++ config.h.cmake	2014-02-17 11:30:39 +0000
@@ -555,6 +555,7 @@
    InnoDB config options
 */
 #cmakedefine INNODB_COMPILER_HINTS
+#cmakedefine INNODB_PAGE_ATOMIC_REF_COUNT
 
 /* Character sets and collations */
 #cmakedefine MYSQL_DEFAULT_CHARSET_NAME "@MYSQL_DEFAULT_CHARSET_NAME@"
@@ -640,6 +641,7 @@
 #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
 #cmakedefine PLUGINDIR "@PLUGINDIR@"
 #cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@"
+#cmakedefine DEFAULT_TMPDIR @DEFAULT_TMPDIR@
 
 #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"
 
 
=== modified file 'configure.cmake'
--- configure.cmake	2013-12-05 17:23:10 +0000
+++ configure.cmake	2014-02-17 11:30:39 +0000
@@ -58,6 +58,7 @@
 SET(SIGNAL_WITH_VIO_SHUTDOWN 1)
 
 # Always enable -Wall for gnu C/C++
+# Remember to strip off these in scripts/CMakeLists.txt
 IF(CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter")
 ENDIF()
@@ -65,6 +66,7 @@
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 ENDIF()
 
+# Remember to strip off these in scripts/CMakeLists.txt
 IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   SET(CMAKE_CXX_FLAGS
     "${CMAKE_CXX_FLAGS} -Wall -Wno-null-conversion -Wno-unused-private-field")
@@ -1042,7 +1044,7 @@
   "
   HAVE_SOLARIS_STYLE_GETHOST)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
+IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 IF(WITH_ATOMIC_OPS STREQUAL "up")
   SET(MY_ATOMIC_MODE_DUMMY 1 CACHE BOOL "Assume single-CPU mode, no concurrency")
 ELSEIF(WITH_ATOMIC_OPS STREQUAL "rwlocks")
@@ -1073,6 +1075,11 @@
     return 0;
   }"
   HAVE_GCC_ATOMIC_BUILTINS)
+  IF(NOT HAVE_GCC_ATOMIC_BUILTINS)
+    MESSAGE(WARNING
+    "Unsupported version of GCC/Clang is used which does not support Atomic "
+    "Builtins. Using pthread rwlocks instead.")
+  ENDIF(NOT HAVE_GCC_ATOMIC_BUILTINS)
 ELSE()
   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
 ENDIF()
 
=== modified file 'extra/innochecksum.cc'
--- extra/innochecksum.cc	2013-05-10 09:39:17 +0000
+++ extra/innochecksum.cc	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
   Published with a permission.
 */
 
+#include <my_config.h>
 #include <my_global.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -72,9 +73,9 @@
 static my_bool verbose;
 static my_bool debug;
 static my_bool just_count;
-static ulong start_page;
-static ulong end_page;
-static ulong do_page;
+static ullint start_page;
+static ullint end_page;
+static ullint do_page;
 static my_bool use_end_page;
 static my_bool do_one_page;
 static my_bool display_format;
@@ -95,7 +96,7 @@
 {
   ulong flags;
 
-  int bytes= fread(buf, 1, UNIV_PAGE_SIZE_MIN, f);
+  ulong bytes= ulong(fread(buf, 1, UNIV_PAGE_SIZE_MIN, f));
 
   if (ferror(f))
   {
@@ -106,7 +107,7 @@
   if (bytes != UNIV_PAGE_SIZE_MIN)
   {
     fprintf(stderr, "Error; Was not able to read the minimum page size ");
-    fprintf(stderr, "of %d bytes.  Bytes read was %d\n", UNIV_PAGE_SIZE_MIN, bytes);
+    fprintf(stderr, "of %d bytes.  Bytes read was %lu\n", UNIV_PAGE_SIZE_MIN, bytes);
     return FALSE;
   }
 
@@ -125,6 +126,76 @@
   return TRUE;
 }
 
+#ifdef __WIN__
+/***********************************************//*
+ @param		[in] error	error no. from the getLastError().
+
+ @retval error message corresponding to error no.
+*/
+static
+char*
+win32_error_message(
+	int	error)
+{
+	static char err_msg[1024] = {'\0'};
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+		NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+		(LPTSTR)err_msg, sizeof(err_msg), NULL );
+
+	return (err_msg);
+}
+#endif /* __WIN__ */
+
+/***********************************************//*
+ @param [in] name	name of file.
+ @retval file pointer; file pointer is NULL when error occured.
+*/
+
+FILE*
+open_file(
+	const char*	name)
+{
+	int	fd;		/* file descriptor. */
+	FILE*	fil_in;
+#ifdef __WIN__
+	HANDLE		hFile;		/* handle to open file. */
+	DWORD		access;		/* define access control */
+	int		flags;		/* define the mode for file
+					descriptor */
+
+	access = GENERIC_READ;
+	flags = _O_RDONLY | _O_BINARY;
+	hFile = CreateFile(
+			(LPCTSTR) name, access, 0L, NULL,
+			OPEN_EXISTING, NULL, NULL);
+
+	if (hFile == INVALID_HANDLE_VALUE) {
+		/* print the error message. */
+		fprintf(stderr, "Filename::%s %s\n",
+			win32_error_message(GetLastError()));
+
+			return (NULL);
+		}
+
+	/* get the file descriptor. */
+	fd= _open_osfhandle((intptr_t)hFile, flags);
+#else /* __WIN__ */
+
+	int	create_flag;
+	create_flag = O_RDONLY;
+
+	fd = open(name, create_flag);
+	if ( -1 == fd) {
+		perror("open");
+		return (NULL);
+	}
+
+#endif /* __WIN__ */
+
+	fil_in = fdopen(fd, "rb");
+
+	return (fil_in);
+}
 
 /* command line argument to do page checks (that's it) */
 /* another argument to specify page ranges... seek to right spot and go from there */
@@ -146,14 +217,14 @@
   {"format_info", 'f', "Display information about the file format and exit",
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"start_page", 's', "Start on this page number (0 based).",
-    &start_page, &start_page, 0, GET_ULONG, REQUIRED_ARG,
-    0, 0, (longlong) 2L*1024L*1024L*1024L, 0, 1, 0},
+    &start_page, &start_page, 0, GET_ULL, REQUIRED_ARG,
+    0, 0, ULONGLONG_MAX, 0, 1, 0},
   {"end_page", 'e', "End at this page number (0 based).",
-    &end_page, &end_page, 0, GET_ULONG, REQUIRED_ARG,
-    0, 0, (longlong) 2L*1024L*1024L*1024L, 0, 1, 0},
+    &end_page, &end_page, 0, GET_ULL, REQUIRED_ARG,
+    0, 0, ULONGLONG_MAX, 0, 1, 0},
   {"page", 'p', "Check only this page (0 based).",
-    &do_page, &do_page, 0, GET_ULONG, REQUIRED_ARG,
-    0, 0, (longlong) 2L*1024L*1024L*1024L, 0, 1, 0},
+    &do_page, &do_page, 0, GET_ULL, REQUIRED_ARG,
+    0, 0, ULONGLONG_MAX, 0, 1, 0},
 
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
@@ -288,12 +359,17 @@
   time_t now;                    /* current time */
   time_t lastt;                  /* last time */
   ulint oldcsum, oldcsumfield, csum, csumfield, crc32, logseq, logseqfield;
+
                                  /* ulints for checksum storage */
-  struct stat st;                /* for stat, if you couldn't guess */
+  /* stat, to get file size. */
+#ifdef __WIN__
+  struct _stat64 st;
+#else
+  struct stat st;
+#endif
   unsigned long long int size;   /* size of file (has to be 64 bits) */
   ulint pages;                   /* number of pages in file */
   off_t offset= 0;
-  int fd;
 
   printf("InnoDB offline file checksum utility.\n");
 
@@ -316,7 +392,11 @@
   }
 
   /* stat the file to get size and page count */
+#ifdef __WIN__
+  if (_stat64(filename, &st))
+#else
   if (stat(filename, &st))
+#endif
   {
     fprintf(stderr, "Error; %s cannot be found\n", filename);
     return 1;
@@ -324,11 +404,8 @@
   size= st.st_size;
 
   /* Open the file for reading */
-  f= fopen(filename, "rb");
-  if (f == NULL)
-  {
-    fprintf(stderr, "Error; %s cannot be opened", filename);
-    perror(" ");
+  f= open_file(filename);
+  if (f == NULL) {
     return 1;
   }
 
@@ -357,28 +434,25 @@
   {
     printf("file %s = %llu bytes (%lu pages)...\n", filename, size, pages);
     if (do_one_page)
-      printf("InnoChecksum; checking page %lu\n", do_page);
+      printf("InnoChecksum; checking page %llu\n", do_page);
     else
-      printf("InnoChecksum; checking pages in range %lu to %lu\n", start_page, use_end_page ? end_page : (pages - 1));
+      printf("InnoChecksum; checking pages in range %llu to %llu\n", start_page, use_end_page ? end_page : (pages - 1));
   }
 
   /* seek to the necessary position, ignore with -f as we only need to read the
   first page */
   if (start_page && !display_format)
   {
-    fd= fileno(f);
-    if (!fd)
-    {
-      perror("Error; Unable to obtain file descriptor number");
-      return 1;
-    }
 
     offset= (off_t)start_page * (off_t)physical_page_size;
 
-    if (lseek(fd, offset, SEEK_SET) != offset)
-    {
-      perror("Error; Unable to seek to necessary offset");
-      return 1;
+#ifdef __WIN__
+	if (_fseeki64(f, offset, SEEK_SET)) {
+#else
+	if (fseeko(f, offset, SEEK_SET)) {
+#endif /* __WIN__ */
+	perror("Error; Unable to seek to necessary offset");
+	return 1;
     }
   }
 
@@ -387,7 +461,7 @@
   lastt= 0;
   while (!feof(f))
   {
-    bytes= fread(buf, 1, physical_page_size, f);
+    bytes= ulong(fread(buf, 1, physical_page_size, f));
     if (!bytes && feof(f))
       return 0;
 
 
=== modified file 'extra/yassl/CMakeLists.txt'
--- extra/yassl/CMakeLists.txt	2013-10-09 05:56:33 +0000
+++ extra/yassl/CMakeLists.txt	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/yassl_error.hpp'
--- extra/yassl/include/yassl_error.hpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/include/yassl_error.hpp	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/yassl_types.hpp'
--- extra/yassl/include/yassl_types.hpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/include/yassl_types.hpp	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/src/handshake.cpp'
--- extra/yassl/src/handshake.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/src/handshake.cpp	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/src/yassl_error.cpp'
--- extra/yassl/src/yassl_error.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/src/yassl_error.cpp	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/src/yassl_imp.cpp'
--- extra/yassl/src/yassl_imp.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/src/yassl_imp.cpp	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/taocrypt/CMakeLists.txt'
--- extra/yassl/taocrypt/CMakeLists.txt	2013-10-09 05:56:33 +0000
+++ extra/yassl/taocrypt/CMakeLists.txt	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'include/atomic/nolock.h'
--- include/atomic/nolock.h	2011-06-30 15:46:53 +0000
+++ include/atomic/nolock.h	2014-02-17 11:30:39 +0000
@@ -1,7 +1,8 @@
 #ifndef ATOMIC_NOLOCK_INCLUDED
 #define ATOMIC_NOLOCK_INCLUDED
 
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. reserved.
+   reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,25 +17,15 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
-    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-    || defined(HAVE_SOLARIS_ATOMIC)
-
-#  ifdef MY_ATOMIC_MODE_DUMMY
-#    define LOCK_prefix ""
-#  else
-#    define LOCK_prefix "lock"
-#  endif
 /*
   We choose implementation as follows:
   ------------------------------------
   On Windows using Visual C++ the native implementation should be
   preferrable. When using gcc we prefer the Solaris implementation
   before the gcc because of stability preference, we choose gcc
-  builtins if available, otherwise we choose the somewhat broken
-  native x86 implementation. If neither Visual C++ or gcc we still
-  choose the Solaris implementation on Solaris (mainly for SunStudio
-  compilers).
+  builtins if available, otherwise we fallback to rw locks. If
+  neither Visual C++ or gcc we still choose the Solaris
+  implementation on Solaris (mainly for SunStudio compilers).
 */
 #  if defined(_MSV_VER)
 #    include "generic-msvc.h"
@@ -43,13 +34,10 @@
 #      include "solaris.h"
 #    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
 #      include "gcc_builtins.h"
-#    elif defined(__i386__) || defined(__x86_64__)
-#      include "x86-gcc.h"
 #    endif
 #  elif defined(HAVE_SOLARIS_ATOMIC)
 #    include "solaris.h"
 #  endif
-#endif
 
 #if defined(make_atomic_cas_body)
 /*
 
=== modified file 'include/atomic/rwlock.h'
--- include/atomic/rwlock.h	2013-06-04 06:48:27 +0000
+++ include/atomic/rwlock.h	2014-02-17 11:30:39 +0000
@@ -1,7 +1,7 @@
 #ifndef ATOMIC_RWLOCK_INCLUDED
 #define ATOMIC_RWLOCK_INCLUDED
 
-/* Copyright (c) 2006, 2013 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== removed file 'include/atomic/x86-gcc.h'
--- include/atomic/x86-gcc.h	2013-05-10 09:39:17 +0000
+++ include/atomic/x86-gcc.h	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-#ifndef ATOMIC_X86_GCC_INCLUDED
-#define ATOMIC_X86_GCC_INCLUDED
-
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-/*
-  XXX 64-bit atomic operations can be implemented using
-  cmpxchg8b, if necessary. Though I've heard that not all 64-bit
-  architectures support double-word (128-bit) cas.
-*/
-
-/*
-  No special support of 8 and 16 bit operations are implemented here
-  currently.
-*/
-#undef MY_ATOMIC_HAS_8_AND_16
-
-#ifdef __x86_64__
-#  ifdef MY_ATOMIC_NO_XADD
-#    define MY_ATOMIC_MODE "gcc-amd64" LOCK_prefix "-no-xadd"
-#  else
-#    define MY_ATOMIC_MODE "gcc-amd64" LOCK_prefix
-#  endif
-#else
-#  ifdef MY_ATOMIC_NO_XADD
-#    define MY_ATOMIC_MODE "gcc-x86" LOCK_prefix "-no-xadd"
-#  else
-#    define MY_ATOMIC_MODE "gcc-x86" LOCK_prefix
-#  endif
-#endif
-
-/* fix -ansi errors while maintaining readability */
-#ifndef asm
-#define asm __asm__
-#endif
-
-#ifndef MY_ATOMIC_NO_XADD
-#define make_atomic_add_body(S)         make_atomic_add_body ## S
-#define make_atomic_cas_body(S)         make_atomic_cas_body ## S
-#endif
-
-#define make_atomic_add_body32                                  \
-  asm volatile (LOCK_prefix "; xadd %0, %1;"                    \
-                : "+r" (v), "=m" (*a)                           \
-                : "m" (*a)                                      \
-                : "memory")
-
-#define make_atomic_cas_body32                                  \
-  __typeof__(*cmp) sav;                                         \
-  asm volatile (LOCK_prefix "; cmpxchg %3, %0; setz %2;"	\
-                : "=m" (*a), "=a" (sav), "=q" (ret)             \
-                : "r" (set), "m" (*a), "a" (*cmp)               \
-                : "memory");                                    \
-  if (!ret)                                                     \
-    *cmp= sav
-
-#ifdef __x86_64__
-#define make_atomic_add_body64 make_atomic_add_body32
-#define make_atomic_cas_body64 make_atomic_cas_body32
-
-#define make_atomic_fas_body(S)                                 \
-  asm volatile ("xchg %0, %1;"                                  \
-                : "+r" (v), "=m" (*a)                           \
-                : "m" (*a)                                      \
-                : "memory")
-
-/*
-  Actually 32/64-bit reads/writes are always atomic on x86_64,
-  nonetheless issue memory barriers as appropriate.
-*/
-#define make_atomic_load_body(S)                                \
-  /* Serialize prior load and store operations. */              \
-  asm volatile ("mfence" ::: "memory");                         \
-  ret= *a;                                                      \
-  /* Prevent compiler from reordering instructions. */          \
-  asm volatile ("" ::: "memory")
-#define make_atomic_store_body(S)                               \
-  asm volatile ("; xchg %0, %1;"                                \
-                : "=m" (*a), "+r" (v)                           \
-                : "m" (*a)                                      \
-                : "memory")
-
-#else
-/*
-  Use default implementations of 64-bit operations since we solved
-  the 64-bit problem on 32-bit platforms for CAS, no need to solve it
-  once more for ADD, LOAD, STORE and FAS as well.
-  Since we already added add32 support, we need to define add64
-  here, but we haven't defined fas, load and store at all, so
-  we can fallback on default implementations.
-*/
-#define make_atomic_add_body64                                  \
-  int64 tmp=*a;                                                 \
-  while (!my_atomic_cas64(a, &tmp, tmp+v)) ;                    \
-  v=tmp;
-
-/*
-  cmpxchg8b works on both 32-bit platforms and 64-bit platforms but
-  the code here is only used on 32-bit platforms, on 64-bit
-  platforms the much simpler make_atomic_cas_body32 will work
-  fine.
-*/
-#define make_atomic_cas_body64                                     \
-  asm volatile ("movl %%edi, -4(%%esp);"                           \
-                "leal %0, %%edi;"                                  \
-                "xchgl %%ebx, %%esi;"                              \
-                LOCK_prefix "; cmpxchg8b (%%edi);"                 \
-                "movl %%esi, %%ebx;"                               \
-                "movl -4(%%esp), %%edi;"                           \
-                "setz %1;"                                         \
-                : "+m" (*a), "=q" (ret), "+A" (*cmp)               \
-                : "S" ((int32)(set & 0xFFFFFFFF)),                 \
-                  "c" ((int32)(set >> 32))                         \
-                : "memory", "flags")
-#endif
-
-/*
-  The implementation of make_atomic_cas_body32 is adaptable to
-  the OS word size, so on 64-bit platforms it will automatically
-  adapt to 64-bits and so it will work also on 64-bit platforms
-*/
-#define make_atomic_cas_bodyptr make_atomic_cas_body32
-
-#ifdef MY_ATOMIC_MODE_DUMMY
-#define make_atomic_load_body(S)   ret=*a
-#define make_atomic_store_body(S)  *a=v
-#endif
-#endif /* ATOMIC_X86_GCC_INCLUDED */
 
=== modified file 'include/big_endian.h'
--- include/big_endian.h	2013-10-09 11:17:06 +0000
+++ include/big_endian.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/byte_order_generic.h'
--- include/byte_order_generic.h	2013-06-11 06:50:33 +0000
+++ include/byte_order_generic.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/byte_order_generic_x86.h'
--- include/byte_order_generic_x86.h	2013-06-11 06:50:33 +0000
+++ include/byte_order_generic_x86.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/byte_order_generic_x86_64.h'
--- include/byte_order_generic_x86_64.h	2013-06-11 06:50:33 +0000
+++ include/byte_order_generic_x86_64.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/little_endian.h'
--- include/little_endian.h	2013-10-09 11:17:06 +0000
+++ include/little_endian.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/my_base.h'
--- include/my_base.h	2013-12-05 17:23:10 +0000
+++ include/my_base.h	2014-02-17 11:30:39 +0000
@@ -482,7 +482,8 @@
 #define HA_ERR_INNODB_READ_ONLY   187    /* InnoDB is in read only mode. */
 #define HA_ERR_FTS_EXCEED_RESULT_CACHE_LIMIT  188 /* FTS query exceeds result cache limit */
 #define HA_ERR_TEMP_FILE_WRITE_FAILURE	189	/* Temporary file write failure */
-#define HA_ERR_LAST               189    /* Copy of last error nr */
+#define HA_ERR_INNODB_FORCED_RECOVERY 190	/* Innodb is in force recovery mode */
+#define HA_ERR_LAST 190    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
 
=== modified file 'include/my_dbug.h'
--- include/my_dbug.h	2013-04-29 13:07:37 +0000
+++ include/my_dbug.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. 
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/my_default.h'
--- include/my_default.h	2013-10-09 11:17:06 +0000
+++ include/my_default.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/my_getopt.h'
--- include/my_getopt.h	2013-10-23 08:48:28 +0000
+++ include/my_getopt.h	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/my_pthread.h'
--- include/my_pthread.h	2013-10-15 11:37:57 +0000
+++ include/my_pthread.h	2014-02-17 11:30:39 +0000
@@ -136,7 +136,7 @@
 int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr);
 int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			   struct timespec *abstime);
+			   const struct timespec *abstime);
 int pthread_cond_signal(pthread_cond_t *cond);
 int pthread_cond_broadcast(pthread_cond_t *cond);
 int pthread_cond_destroy(pthread_cond_t *cond);
 
=== modified file 'include/myisam.h'
--- include/myisam.h	2013-10-30 23:22:43 +0000
+++ include/myisam.h	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/mysql/innodb_priv.h'
--- include/mysql/innodb_priv.h	2013-10-09 11:17:06 +0000
+++ include/mysql/innodb_priv.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/mysql/plugin.h'
--- include/mysql/plugin.h	2013-10-23 08:48:28 +0000
+++ include/mysql/plugin.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'include/mysql/plugin_audit.h'
--- include/mysql/plugin_audit.h	2013-08-23 03:57:09 +0000
+++ include/mysql/plugin_audit.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
 
=== modified file 'include/mysql/psi/mysql_thread.h'
--- include/mysql/psi/mysql_thread.h	2012-08-22 01:40:20 +0000
+++ include/mysql/psi/mysql_thread.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -1167,7 +1167,7 @@
 static inline int inline_mysql_cond_timedwait(
   mysql_cond_t *that,
   mysql_mutex_t *mutex,
-  struct timespec *abstime
+  const struct timespec *abstime
 #ifdef HAVE_PSI_COND_INTERFACE
   , const char *src_file, uint src_line
 #endif
 
=== modified file 'include/mysql/service_thread_scheduler.h'
--- include/mysql/service_thread_scheduler.h	2013-10-09 11:17:06 +0000
+++ include/mysql/service_thread_scheduler.h	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
=== modified file 'include/welcome_copyright_notice.h'
--- include/welcome_copyright_notice.h	2013-08-21 07:44:58 +0000
+++ include/welcome_copyright_notice.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2014"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL
 
=== modified file 'libmysql/authentication_win/CMakeLists.txt'
--- libmysql/authentication_win/CMakeLists.txt	2013-10-09 05:56:33 +0000
+++ libmysql/authentication_win/CMakeLists.txt	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/authentication_win/common.cc'
--- libmysql/authentication_win/common.cc	2013-10-09 11:17:06 +0000
+++ libmysql/authentication_win/common.cc	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/authentication_win/common.h'
--- libmysql/authentication_win/common.h	2013-10-09 11:17:06 +0000
+++ libmysql/authentication_win/common.h	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/authentication_win/handshake_client.cc'
--- libmysql/authentication_win/handshake_client.cc	2013-10-09 11:17:06 +0000
+++ libmysql/authentication_win/handshake_client.cc	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/authentication_win/log_client.cc'
--- libmysql/authentication_win/log_client.cc	2013-10-09 11:17:06 +0000
+++ libmysql/authentication_win/log_client.cc	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/authentication_win/plugin_client.cc'
--- libmysql/authentication_win/plugin_client.cc	2013-10-09 11:17:06 +0000
+++ libmysql/authentication_win/plugin_client.cc	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/conf_to_src.c'
--- libmysql/conf_to_src.c	2013-03-20 05:56:02 +0000
+++ libmysql/conf_to_src.c	2014-02-17 11:30:39 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysqld/lib_sql.cc'
--- libmysqld/lib_sql.cc	2013-12-16 08:45:31 +0000
+++ libmysqld/lib_sql.cc	2014-02-17 11:30:39 +0000
@@ -587,7 +587,7 @@
     opt_mysql_tmpdir=getenv("TMP");
 #endif
   if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
-    opt_mysql_tmpdir=(char*) P_tmpdir;		/* purecov: inspected */
+    opt_mysql_tmpdir= const_cast<char*>(DEFAULT_TMPDIR); /* purecov: inspected*/
 
   init_ssl();
   umask(((~my_umask) & 0666));
 
=== modified file 'libservices/my_thread_scheduler_service.c'
--- libservices/my_thread_scheduler_service.c	2013-10-09 11:17:06 +0000
+++ libservices/my_thread_scheduler_service.c	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
=== modified file 'libservices/thd_wait_service.c'
--- libservices/thd_wait_service.c	2013-10-09 11:17:06 +0000
+++ libservices/thd_wait_service.c	2014-02-17 11:30:39 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
=== modified file 'man/comp_err.1'
--- man/comp_err.1	2013-12-16 08:45:31 +0000
+++ man/comp_err.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -83,7 +83,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: help option.\" help option: comp_err\fB\-\-help\fR,
+.\" comp_err: help option
+.\" help option: comp_err
+\fB\-\-help\fR,
 \fB\-?\fR
 .sp
 Display a help message and exit\&.
@@ -97,7 +99,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: charset option.\" charset option: comp_err\fB\-\-charset=\fR\fB\fIpath\fR\fR,
+.\" comp_err: charset option
+.\" charset option: comp_err
+\fB\-\-charset=\fR\fB\fIpath\fR\fR,
 \fB\-C \fR\fB\fIpath\fR\fR
 .sp
 The character set directory\&. The default is
@@ -112,7 +116,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: debug option.\" debug option: comp_err\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
+.\" comp_err: debug option
+.\" debug option: comp_err
+\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
 \fB\-# \fR\fB\fIdebug_options\fR\fR
 .sp
 Write a debugging log\&. A typical
@@ -130,7 +136,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: debug-info option.\" debug-info option: comp_err\fB\-\-debug\-info\fR,
+.\" comp_err: debug-info option
+.\" debug-info option: comp_err
+\fB\-\-debug\-info\fR,
 \fB\-T\fR
 .sp
 Print some debugging information when the program exits\&.
@@ -144,7 +152,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: header_file option.\" header_file option: comp_err\fB\-\-header_file=\fR\fB\fIfile_name\fR\fR,
+.\" comp_err: header_file option
+.\" header_file option: comp_err
+\fB\-\-header_file=\fR\fB\fIfile_name\fR\fR,
 \fB\-H \fR\fB\fIfile_name\fR\fR
 .sp
 The name of the error header file\&. The default is
@@ -159,7 +169,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: in_file option.\" in_file option: comp_err\fB\-\-in_file=\fR\fB\fIfile_name\fR\fR,
+.\" comp_err: in_file option
+.\" in_file option: comp_err
+\fB\-\-in_file=\fR\fB\fIfile_name\fR\fR,
 \fB\-F \fR\fB\fIfile_name\fR\fR
 .sp
 The name of the input file\&. The default is
@@ -174,7 +186,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: name_file option.\" name_file option: comp_err\fB\-\-name_file=\fR\fB\fIfile_name\fR\fR,
+.\" comp_err: name_file option
+.\" name_file option: comp_err
+\fB\-\-name_file=\fR\fB\fIfile_name\fR\fR,
 \fB\-N \fR\fB\fIfile_name\fR\fR
 .sp
 The name of the error name file\&. The default is
@@ -189,7 +203,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: out_dir option.\" out_dir option: comp_err\fB\-\-out_dir=\fR\fB\fIpath\fR\fR,
+.\" comp_err: out_dir option
+.\" out_dir option: comp_err
+\fB\-\-out_dir=\fR\fB\fIpath\fR\fR,
 \fB\-D \fR\fB\fIpath\fR\fR
 .sp
 The name of the output base directory\&. The default is
@@ -204,7 +220,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: out_file option.\" out_file option: comp_err\fB\-\-out_file=\fR\fB\fIfile_name\fR\fR,
+.\" comp_err: out_file option
+.\" out_file option: comp_err
+\fB\-\-out_file=\fR\fB\fIfile_name\fR\fR,
 \fB\-O \fR\fB\fIfile_name\fR\fR
 .sp
 The name of the output file\&. The default is
@@ -219,7 +237,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: statefile option.\" statefile option: comp_err\fB\-\-statefile=\fR\fB\fIfile_name\fR\fR,
+.\" comp_err: statefile option
+.\" statefile option: comp_err
+\fB\-\-statefile=\fR\fB\fIfile_name\fR\fR,
 \fB\-S \fR\fB\fIfile_name\fR\fR
 .sp
 The name for the SQLSTATE header file\&. The default is
@@ -234,7 +254,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" comp_err: version option.\" version option: comp_err\fB\-\-version\fR,
+.\" comp_err: version option
+.\" version option: comp_err
+\fB\-\-version\fR,
 \fB\-V\fR
 .sp
 Display version information and exit\&.
@@ -242,7 +264,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 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/innochecksum.1'
--- man/innochecksum.1	2013-12-16 08:45:31 +0000
+++ man/innochecksum.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,7 +42,11 @@
 InnoDB
 tablespace file, calculates the checksum for each page, compares the calculated checksum to the stored checksum, and reports mismatches, which indicate damaged pages\&. It was originally developed to speed up verifying the integrity of tablespace files after power outages but can also be used after file copies\&. Because checksum mismatches will cause
 InnoDB
-to deliberately shut down a running server, it can be preferable to use this tool rather than waiting for a server in production usage to encounter the damaged pages\&.
+to deliberately shut down a running server, it can be preferable to use this tool rather than waiting for a server in production usage to encounter the damaged pages\&. As of MySQL 5\&.6\&.16,
+\fBinnochecksum\fR
+supports files greater than 2GB in size\&. Previously,
+\fBinnochecksum\fR
+only supported files up to 2GB in size\&.
 .PP
 \fBinnochecksum\fR
 cannot be used on tablespace files that the server already has open\&. For such files, you should use
@@ -150,7 +154,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 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/msql2mysql.1'
--- man/msql2mysql.1	2013-12-16 08:45:31 +0000
+++ man/msql2mysql.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -69,7 +69,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 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/my_print_defaults.1'
--- man/my_print_defaults.1	2013-12-16 08:45:31 +0000
+++ man/my_print_defaults.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -72,7 +72,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" my_print_defaults: help option.\" help option: my_print_defaults\fB\-\-help\fR,
+.\" my_print_defaults: help option
+.\" help option: my_print_defaults
+\fB\-\-help\fR,
 \fB\-?\fR
 .sp
 Display a help message and exit\&.
@@ -86,8 +88,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" my_print_defaults: config-file option.\" config-file option: my_print_defaults\fB\-\-config\-file=\fR\fB\fIfile_name\fR\fR,
-.\" my_print_defaults: defaults-file option.\" defaults-file option: my_print_defaults\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR,
+.\" my_print_defaults: config-file option
+.\" config-file option: my_print_defaults
+\fB\-\-config\-file=\fR\fB\fIfile_name\fR\fR,
+.\" my_print_defaults: defaults-file option
+.\" defaults-file option: my_print_defaults
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR,
 \fB\-c \fR\fB\fIfile_name\fR\fR
 .sp
 Read only the given option file\&.
@@ -101,7 +107,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" my_print_defaults: debug option.\" debug option: my_print_defaults\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
+.\" my_print_defaults: debug option
+.\" debug option: my_print_defaults
+\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
 \fB\-# \fR\fB\fIdebug_options\fR\fR
 .sp
 Write a debugging log\&. A typical
@@ -119,8 +127,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" my_print_defaults: defaults-extra-file option.\" defaults-extra-file option: my_print_defaults\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR,
-.\" my_print_defaults: extra-file option.\" extra-file option: my_print_defaults\fB\-\-extra\-file=\fR\fB\fIfile_name\fR\fR,
+.\" my_print_defaults: defaults-extra-file option
+.\" defaults-extra-file option: my_print_defaults
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR,
+.\" my_print_defaults: extra-file option
+.\" extra-file option: my_print_defaults
+\fB\-\-extra\-file=\fR\fB\fIfile_name\fR\fR,
 \fB\-e \fR\fB\fIfile_name\fR\fR
 .sp
 Read this option file after the global option file but (on Unix) before the user option file\&.
@@ -134,7 +146,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" my_print_defaults: defaults-group-suffix option.\" defaults-group-suffix option: my_print_defaults\fB\-\-defaults\-group\-suffix=\fR\fB\fIsuffix\fR\fR,
+.\" my_print_defaults: defaults-group-suffix option
+.\" defaults-group-suffix option: my_print_defaults
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIsuffix\fR\fR,
 \fB\-g \fR\fB\fIsuffix\fR\fR
 .sp
 In addition to the groups named on the command line, read groups that have the given suffix\&.
@@ -148,7 +162,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" login-path option\fB\-\-login\-path=\fR\fB\fIname\fR\fR,
+.\" login-path option
+\fB\-\-login\-path=\fR\fB\fIname\fR\fR,
 \fB\-l \fR\fB\fIname\fR\fR
 .sp
 Read options from the named login path in the
@@ -165,7 +180,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" my_print_defaults: no-defaults option.\" no-defaults option: my_print_defaults\fB\-\-no\-defaults\fR,
+.\" my_print_defaults: no-defaults option
+.\" no-defaults option: my_print_defaults
+\fB\-\-no\-defaults\fR,
 \fB\-n\fR
 .sp
 Return an empty string\&.
@@ -179,7 +196,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" my_print_defaults: verbose option.\" verbose option: my_print_defaults\fB\-\-verbose\fR,
+.\" my_print_defaults: verbose option
+.\" verbose option: my_print_defaults
+\fB\-\-verbose\fR,
 \fB\-v\fR
 .sp
 Verbose mode\&. Print more information about what the program does\&.
@@ -193,7 +212,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" my_print_defaults: version option.\" version option: my_print_defaults\fB\-\-version\fR,
+.\" my_print_defaults: version option
+.\" version option: my_print_defaults
+\fB\-\-version\fR,
 \fB\-V\fR
 .sp
 Display version information and exit\&.
@@ -201,7 +222,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 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/myisam_ftdump.1'
--- man/myisam_ftdump.1	2013-12-16 08:45:31 +0000
+++ man/myisam_ftdump.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -160,8 +160,11 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisam_ftdump: help option.\" help option: myisam_ftdump\fB\-\-help\fR,
-\fB\-h\fR\fB\-?\fR
+.\" myisam_ftdump: help option
+.\" help option: myisam_ftdump
+\fB\-\-help\fR,
+\fB\-h\fR
+\fB\-?\fR
 .sp
 Display a help message and exit\&.
 .RE
@@ -174,7 +177,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisam_ftdump: count option.\" count option: myisam_ftdump\fB\-\-count\fR,
+.\" myisam_ftdump: count option
+.\" count option: myisam_ftdump
+\fB\-\-count\fR,
 \fB\-c\fR
 .sp
 Calculate per\-word statistics (counts and global weights)\&.
@@ -188,7 +193,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisam_ftdump: dump option.\" dump option: myisam_ftdump\fB\-\-dump\fR,
+.\" myisam_ftdump: dump option
+.\" dump option: myisam_ftdump
+\fB\-\-dump\fR,
 \fB\-d\fR
 .sp
 Dump the index, including data offsets and word weights\&.
@@ -202,7 +209,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisam_ftdump: length option.\" length option: myisam_ftdump\fB\-\-length\fR,
+.\" myisam_ftdump: length option
+.\" length option: myisam_ftdump
+\fB\-\-length\fR,
 \fB\-l\fR
 .sp
 Report the length distribution\&.
@@ -216,7 +225,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisam_ftdump: stats option.\" stats option: myisam_ftdump\fB\-\-stats\fR,
+.\" myisam_ftdump: stats option
+.\" stats option: myisam_ftdump
+\fB\-\-stats\fR,
 \fB\-s\fR
 .sp
 Report global index statistics\&. This is the default operation if no other operation is specified\&.
@@ -230,7 +241,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisam_ftdump: verbose option.\" verbose option: myisam_ftdump\fB\-\-verbose\fR,
+.\" myisam_ftdump: verbose option
+.\" verbose option: myisam_ftdump
+\fB\-\-verbose\fR,
 \fB\-v\fR
 .sp
 Verbose mode\&. Print more output about what the program does\&.
@@ -238,7 +251,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 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/myisamchk.1'
--- man/myisamchk.1	2013-12-16 08:45:31 +0000
+++ man/myisamchk.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -268,7 +268,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: help option.\" help option: myisamchk\fB\-\-help\fR,
+.\" myisamchk: help option
+.\" help option: myisamchk
+\fB\-\-help\fR,
 \fB\-?\fR
 .sp
 Display a help message and exit\&. Options are grouped by type of operation\&.
@@ -282,7 +284,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: HELP option.\" HELP option: myisamchk\fB\-\-HELP\fR,
+.\" myisamchk: HELP option
+.\" HELP option: myisamchk
+\fB\-\-HELP\fR,
 \fB\-H\fR
 .sp
 Display a help message and exit\&. Options are presented in a single list\&.
@@ -296,7 +300,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: debug option.\" debug option: myisamchk\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
+.\" myisamchk: debug option
+.\" debug option: myisamchk
+\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
 \fB\-# \fR\fB\fIdebug_options\fR\fR
 .sp
 Write a debugging log\&. A typical
@@ -314,7 +320,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: silent option.\" silent option: myisamchk\fB\-\-silent\fR,
+.\" myisamchk: silent option
+.\" silent option: myisamchk
+\fB\-\-silent\fR,
 \fB\-s\fR
 .sp
 Silent mode\&. Write output only when errors occur\&. You can use
@@ -332,7 +340,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: verbose option.\" verbose option: myisamchk\fB\-\-verbose\fR,
+.\" myisamchk: verbose option
+.\" verbose option: myisamchk
+\fB\-\-verbose\fR,
 \fB\-v\fR
 .sp
 Verbose mode\&. Print more information about what the program does\&. This can be used with
@@ -352,7 +362,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: version option.\" version option: myisamchk\fB\-\-version\fR,
+.\" myisamchk: version option
+.\" version option: myisamchk
+\fB\-\-version\fR,
 \fB\-V\fR
 .sp
 Display version information and exit\&.
@@ -366,7 +378,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: wait option.\" wait option: myisamchk\fB\-\-wait\fR,
+.\" myisamchk: wait option
+.\" wait option: myisamchk
+\fB\-\-wait\fR,
 \fB\-w\fR
 .sp
 Instead of terminating with an error if the table is locked, wait until the table is unlocked before continuing\&. If you are running
@@ -638,7 +652,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: check option.\" check option: myisamchk\fB\-\-check\fR,
+.\" myisamchk: check option
+.\" check option: myisamchk
+\fB\-\-check\fR,
 \fB\-c\fR
 .sp
 Check the table for errors\&. This is the default operation if you specify no option that selects an operation type explicitly\&.
@@ -652,7 +668,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: check-only-changed option.\" check-only-changed option: myisamchk\fB\-\-check\-only\-changed\fR,
+.\" myisamchk: check-only-changed option
+.\" check-only-changed option: myisamchk
+\fB\-\-check\-only\-changed\fR,
 \fB\-C\fR
 .sp
 Check only tables that have changed since the last check\&.
@@ -666,7 +684,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: extend-check option.\" extend-check option: myisamchk\fB\-\-extend\-check\fR,
+.\" myisamchk: extend-check option
+.\" extend-check option: myisamchk
+\fB\-\-extend\-check\fR,
 \fB\-e\fR
 .sp
 Check the table very thoroughly\&. This is quite slow if the table has many indexes\&. This option should only be used in extreme cases\&. Normally,
@@ -695,7 +715,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: fast option.\" fast option: myisamchk\fB\-\-fast\fR,
+.\" myisamchk: fast option
+.\" fast option: myisamchk
+\fB\-\-fast\fR,
 \fB\-F\fR
 .sp
 Check only tables that haven\*(Aqt been closed properly\&.
@@ -709,7 +731,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: force option.\" force option: myisamchk\fB\-\-force\fR,
+.\" myisamchk: force option
+.\" force option: myisamchk
+\fB\-\-force\fR,
 \fB\-f\fR
 .sp
 Do a repair operation automatically if
@@ -729,7 +753,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: information option.\" information option: myisamchk\fB\-\-information\fR,
+.\" myisamchk: information option
+.\" information option: myisamchk
+\fB\-\-information\fR,
 \fB\-i\fR
 .sp
 Print informational statistics about the table that is checked\&.
@@ -743,7 +769,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: medium-check option.\" medium-check option: myisamchk\fB\-\-medium\-check\fR,
+.\" myisamchk: medium-check option
+.\" medium-check option: myisamchk
+\fB\-\-medium\-check\fR,
 \fB\-m\fR
 .sp
 Do a check that is faster than an
@@ -759,7 +787,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: read-only option.\" read-only option: myisamchk\fB\-\-read\-only\fR,
+.\" myisamchk: read-only option
+.\" read-only option: myisamchk
+\fB\-\-read\-only\fR,
 \fB\-T\fR
 .sp
 Do not mark the table as checked\&. This is useful if you use
@@ -777,7 +807,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: update-state option.\" update-state option: myisamchk\fB\-\-update\-state\fR,
+.\" myisamchk: update-state option
+.\" update-state option: myisamchk
+\fB\-\-update\-state\fR,
 \fB\-U\fR
 .sp
 Store information in the
@@ -807,7 +839,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: backup option.\" backup option: myisamchk\fB\-\-backup\fR,
+.\" myisamchk: backup option
+.\" backup option: myisamchk
+\fB\-\-backup\fR,
 \fB\-B\fR
 .sp
 Make a backup of the
@@ -824,7 +858,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: character-sets-dir option.\" character-sets-dir option: myisamchk\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
+.\" myisamchk: character-sets-dir option
+.\" character-sets-dir option: myisamchk
+\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
 .sp
 The directory where character sets are installed\&. See
 Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
@@ -838,7 +874,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: correct-checksum option.\" correct-checksum option: myisamchk\fB\-\-correct\-checksum\fR
+.\" myisamchk: correct-checksum option
+.\" correct-checksum option: myisamchk
+\fB\-\-correct\-checksum\fR
 .sp
 Correct the checksum information for the table\&.
 .RE
@@ -851,7 +889,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: data-file-length option.\" data-file-length option: myisamchk\fB\-\-data\-file\-length=\fR\fB\fIlen\fR\fR,
+.\" myisamchk: data-file-length option
+.\" data-file-length option: myisamchk
+\fB\-\-data\-file\-length=\fR\fB\fIlen\fR\fR,
 \fB\-D \fR\fB\fIlen\fR\fR
 .sp
 The maximum length of the data file (when re\-creating data file when it is
@@ -866,7 +906,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: extend-check option.\" extend-check option: myisamchk\fB\-\-extend\-check\fR,
+.\" myisamchk: extend-check option
+.\" extend-check option: myisamchk
+\fB\-\-extend\-check\fR,
 \fB\-e\fR
 .sp
 Do a repair that tries to recover every possible row from the data file\&. Normally, this also finds a lot of garbage rows\&. Do not use this option unless you are desperate\&.
@@ -885,7 +927,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: force option.\" force option: myisamchk\fB\-\-force\fR,
+.\" myisamchk: force option
+.\" force option: myisamchk
+\fB\-\-force\fR,
 \fB\-f\fR
 .sp
 Overwrite old intermediate files (files with names like
@@ -900,7 +944,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: keys-used option.\" keys-used option: myisamchk\fB\-\-keys\-used=\fR\fB\fIval\fR\fR,
+.\" myisamchk: keys-used option
+.\" keys-used option: myisamchk
+\fB\-\-keys\-used=\fR\fB\fIval\fR\fR,
 \fB\-k \fR\fB\fIval\fR\fR
 .sp
 For
@@ -916,7 +962,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: no-symlinks option.\" no-symlinks option: myisamchk\fB\-\-no\-symlinks\fR,
+.\" myisamchk: no-symlinks option
+.\" no-symlinks option: myisamchk
+\fB\-\-no\-symlinks\fR,
 \fB\-l\fR
 .sp
 Do not follow symbolic links\&. Normally
@@ -932,7 +980,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: max-record-length option.\" max-record-length option: myisamchk\fB\-\-max\-record\-length=\fR\fB\fIlen\fR\fR
+.\" myisamchk: max-record-length option
+.\" max-record-length option: myisamchk
+\fB\-\-max\-record\-length=\fR\fB\fIlen\fR\fR
 .sp
 Skip rows larger than the given length if
 \fBmyisamchk\fR
@@ -947,7 +997,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: parallel-recover option.\" parallel-recover option: myisamchk\fB\-\-parallel\-recover\fR,
+.\" myisamchk: parallel-recover option
+.\" parallel-recover option: myisamchk
+\fB\-\-parallel\-recover\fR,
 \fB\-p\fR
 .sp
 Use the same technique as
@@ -965,7 +1017,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: quick option.\" quick option: myisamchk\fB\-\-quick\fR,
+.\" myisamchk: quick option
+.\" quick option: myisamchk
+\fB\-\-quick\fR,
 \fB\-q\fR
 .sp
 Achieve a faster repair by modifying only the index file, not the data file\&. You can specify this option twice to force
@@ -981,7 +1035,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: recover option.\" recover option: myisamchk\fB\-\-recover\fR,
+.\" myisamchk: recover option
+.\" recover option: myisamchk
+\fB\-\-recover\fR,
 \fB\-r\fR
 .sp
 Do a repair that can fix almost any problem except unique keys that are not unique (which is an extremely unlikely error with
@@ -1007,7 +1063,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: safe-recover option.\" safe-recover option: myisamchk\fB\-\-safe\-recover\fR,
+.\" myisamchk: safe-recover option
+.\" safe-recover option: myisamchk
+\fB\-\-safe\-recover\fR,
 \fB\-o\fR
 .sp
 Do a repair using an old recovery method that reads through all rows in order and updates all index trees based on the rows found\&. This is an order of magnitude slower than
@@ -1033,7 +1091,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: set-character-set option.\" set-character-set option: myisamchk\fB\-\-set\-character\-set=\fR\fB\fIname\fR\fR
+.\" myisamchk: set-character-set option
+.\" set-character-set option: myisamchk
+\fB\-\-set\-character\-set=\fR\fB\fIname\fR\fR
 .sp
 Change the character set used by the table indexes\&. This option was replaced by
 \fB\-\-set\-collation\fR
@@ -1048,7 +1108,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: set-collation option.\" set-collation option: myisamchk\fB\-\-set\-collation=\fR\fB\fIname\fR\fR
+.\" myisamchk: set-collation option
+.\" set-collation option: myisamchk
+\fB\-\-set\-collation=\fR\fB\fIname\fR\fR
 .sp
 Specify the collation to use for sorting table indexes\&. The character set name is implied by the first part of the collation name\&.
 .RE
@@ -1061,7 +1123,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: sort-recover option.\" sort-recover option: myisamchk\fB\-\-sort\-recover\fR,
+.\" myisamchk: sort-recover option
+.\" sort-recover option: myisamchk
+\fB\-\-sort\-recover\fR,
 \fB\-n\fR
 .sp
 Force
@@ -1077,7 +1141,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: tmpdir option.\" tmpdir option: myisamchk\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR,
+.\" myisamchk: tmpdir option
+.\" tmpdir option: myisamchk
+\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR,
 \fB\-t \fR\fB\fIpath\fR\fR
 .sp
 The path of the directory to be used for storing temporary files\&. If this is not set,
@@ -1097,7 +1163,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: unpack option.\" unpack option: myisamchk\fB\-\-unpack\fR,
+.\" myisamchk: unpack option
+.\" unpack option: myisamchk
+\fB\-\-unpack\fR,
 \fB\-u\fR
 .sp
 Unpack a table that was packed with
@@ -1116,7 +1184,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: analyze option.\" analyze option: myisamchk\fB\-\-analyze\fR,
+.\" myisamchk: analyze option
+.\" analyze option: myisamchk
+\fB\-\-analyze\fR,
 \fB\-a\fR
 .sp
 Analyze the distribution of key values\&. This improves join performance by enabling the join optimizer to better choose the order in which to join the tables and which indexes it should use\&. To obtain information about the key distribution, use a
@@ -1134,7 +1204,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: block-search option.\" block-search option: myisamchk\fB\-\-block\-search=\fR\fB\fIoffset\fR\fR,
+.\" myisamchk: block-search option
+.\" block-search option: myisamchk
+\fB\-\-block\-search=\fR\fB\fIoffset\fR\fR,
 \fB\-b \fR\fB\fIoffset\fR\fR
 .sp
 Find the record that a block at the given offset belongs to\&.
@@ -1148,7 +1220,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: description option.\" description option: myisamchk\fB\-\-description\fR,
+.\" myisamchk: description option
+.\" description option: myisamchk
+\fB\-\-description\fR,
 \fB\-d\fR
 .sp
 Print some descriptive information about the table\&. Specifying the
@@ -1165,7 +1239,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: set-auto-increment[ option.\" set-auto-increment[ option: myisamchk\fB\-\-set\-auto\-increment[=\fR\fB\fIvalue\fR\fR\fB]\fR,
+.\" myisamchk: set-auto-increment[ option
+.\" set-auto-increment[ option: myisamchk
+\fB\-\-set\-auto\-increment[=\fR\fB\fIvalue\fR\fR\fB]\fR,
 \fB\-A[\fR\fB\fIvalue\fR\fR\fB]\fR
 .sp
 Force
@@ -1187,7 +1263,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: sort-index option.\" sort-index option: myisamchk\fB\-\-sort\-index\fR,
+.\" myisamchk: sort-index option
+.\" sort-index option: myisamchk
+\fB\-\-sort\-index\fR,
 \fB\-S\fR
 .sp
 Sort the index tree blocks in high\-low order\&. This optimizes seeks and makes table scans that use indexes faster\&.
@@ -1201,7 +1279,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisamchk: sort-records option.\" sort-records option: myisamchk\fB\-\-sort\-records=\fR\fB\fIN\fR\fR,
+.\" myisamchk: sort-records option
+.\" sort-records option: myisamchk
+\fB\-\-sort\-records=\fR\fB\fIN\fR\fR,
 \fB\-R \fR\fB\fIN\fR\fR
 .sp
 Sort records according to a particular index\&. This makes your data much more localized and may speed up range\-based
@@ -2412,7 +2492,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 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/myisamlog.1'
--- man/myisamlog.1	2013-12-16 08:45:31 +0000
+++ man/myisamlog.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -228,7 +228,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 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/myisampack.1'
--- man/myisampack.1	2013-12-16 08:45:31 +0000
+++ man/myisampack.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -83,6 +83,18 @@
 .\}
 After packing a table, it becomes read only\&. This is generally intended (such as when accessing packed tables on a CD)\&.
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBmyisampack\fR
+does not support partitioned tables\&.
+.RE
 .PP
 Invoke
 \fBmyisampack\fR
@@ -120,7 +132,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: help option.\" help option: myisampack\fB\-\-help\fR,
+.\" myisampack: help option
+.\" help option: myisampack
+\fB\-\-help\fR,
 \fB\-?\fR
 .sp
 Display a help message and exit\&.
@@ -134,7 +148,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: backup option.\" backup option: myisampack\fB\-\-backup\fR,
+.\" myisampack: backup option
+.\" backup option: myisampack
+\fB\-\-backup\fR,
 \fB\-b\fR
 .sp
 Make a backup of each table\*(Aqs data file using the name
@@ -149,7 +165,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: character-sets-dir option.\" character-sets-dir option: myisampack\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
+.\" myisampack: character-sets-dir option
+.\" character-sets-dir option: myisampack
+\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
 .sp
 The directory where character sets are installed\&. See
 Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
@@ -163,7 +181,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: debug option.\" debug option: myisampack\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
+.\" myisampack: debug option
+.\" debug option: myisampack
+\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
 \fB\-# [\fR\fB\fIdebug_options\fR\fR\fB]\fR
 .sp
 Write a debugging log\&. A typical
@@ -181,7 +201,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: force option.\" force option: myisampack\fB\-\-force\fR,
+.\" myisampack: force option
+.\" force option: myisampack
+\fB\-\-force\fR,
 \fB\-f\fR
 .sp
 Produce a packed table even if it becomes larger than the original or if the intermediate file from an earlier invocation of
@@ -210,7 +232,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: join option.\" join option: myisampack\fB\-\-join=\fR\fB\fIbig_tbl_name\fR\fR,
+.\" myisampack: join option
+.\" join option: myisampack
+\fB\-\-join=\fR\fB\fIbig_tbl_name\fR\fR,
 \fB\-j \fR\fB\fIbig_tbl_name\fR\fR
 .sp
 Join all tables named on the command line into a single packed table
@@ -238,7 +262,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: silent option.\" silent option: myisampack\fB\-\-silent\fR,
+.\" myisampack: silent option
+.\" silent option: myisampack
+\fB\-\-silent\fR,
 \fB\-s\fR
 .sp
 Silent mode\&. Write output only when errors occur\&.
@@ -252,7 +278,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: test option.\" test option: myisampack\fB\-\-test\fR,
+.\" myisampack: test option
+.\" test option: myisampack
+\fB\-\-test\fR,
 \fB\-t\fR
 .sp
 Do not actually pack the table, just test packing it\&.
@@ -266,7 +294,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: tmpdir option.\" tmpdir option: myisampack\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR,
+.\" myisampack: tmpdir option
+.\" tmpdir option: myisampack
+\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR,
 \fB\-T \fR\fB\fIpath\fR\fR
 .sp
 Use the named directory as the location where
@@ -282,7 +312,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: verbose option.\" verbose option: myisampack\fB\-\-verbose\fR,
+.\" myisampack: verbose option
+.\" verbose option: myisampack
+\fB\-\-verbose\fR,
 \fB\-v\fR
 .sp
 Verbose mode\&. Write information about the progress of the packing operation and its result\&.
@@ -296,7 +328,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: version option.\" version option: myisampack\fB\-\-version\fR,
+.\" myisampack: version option
+.\" version option: myisampack
+\fB\-\-version\fR,
 \fB\-V\fR
 .sp
 Display version information and exit\&.
@@ -310,7 +344,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" myisampack: wait option.\" wait option: myisampack\fB\-\-wait\fR,
+.\" myisampack: wait option
+.\" wait option: myisampack
+\fB\-\-wait\fR,
 \fB\-w\fR
 .sp
 Wait and retry if the table is in use\&. If the
@@ -817,7 +853,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 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-stress-test.pl.1'
--- man/mysql-stress-test.pl.1	2013-12-16 08:45:31 +0000
+++ man/mysql-stress-test.pl.1	2014-02-17 11:30:39 +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: 11/13/2013
+.\"      Date: 01/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "11/13/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "01/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -67,7 +67,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: help option.\" help option: mysql-stress-test.pl\fB\-\-help\fR
+.\" mysql-stress-test.pl: help option
+.\" help option: mysql-stress-test.pl
+\fB\-\-help\fR
 .sp
 Display a help message and exit\&.
 .RE
@@ -80,7 +82,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: abort-on-error option.\" abort-on-error option: mysql-stress-test.pl\fB\-\-abort\-on\-error=\fR\fB\fIN\fR\fR
+.\" mysql-stress-test.pl: abort-on-error option
+.\" abort-on-error option: mysql-stress-test.pl
+\fB\-\-abort\-on\-error=\fR\fB\fIN\fR\fR
 .sp
 Causes the program to abort if an error with severity less than or equal to N was encountered\&. Set to 1 to abort on any error\&.
 .RE
@@ -93,7 +97,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: check-tests-file option.\" check-tests-file option: mysql-stress-test.pl\fB\-\-check\-tests\-file\fR
+.\" mysql-stress-test.pl: check-tests-file option
+.\" check-tests-file option: mysql-stress-test.pl
+\fB\-\-check\-tests\-file\fR
 .sp
 Periodically check the file that lists the tests to be run\&. If it has been modified, reread the file\&. This can be useful if you update the list of tests to be run during a stress test\&.
 .RE
@@ -106,7 +112,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: cleanup option.\" cleanup option: mysql-stress-test.pl\fB\-\-cleanup\fR
+.\" mysql-stress-test.pl: cleanup option
+.\" cleanup option: mysql-stress-test.pl
+\fB\-\-cleanup\fR
 .sp
 Force cleanup of the working directory\&.
 .RE
@@ -119,7 +127,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: log-error-details option.\" log-error-details option: mysql-stress-test.pl\fB\-\-log\-error\-details\fR
+.\" mysql-stress-test.pl: log-error-details option
+.\" log-error-details option: mysql-stress-test.pl
+\fB\-\-log\-error\-details\fR
 .sp
 Log error details in the global error log file\&.
 .RE
@@ -132,7 +142,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: loop-count option.\" loop-count option: mysql-stress-test.pl\fB\-\-loop\-count=\fR\fB\fIN\fR\fR
+.\" mysql-stress-test.pl: loop-count option
+.\" loop-count option: mysql-stress-test.pl
+\fB\-\-loop\-count=\fR\fB\fIN\fR\fR
 .sp
 In sequential test mode, the number of loops to execute before exiting\&.
 .RE
@@ -145,7 +157,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: mysqltest option.\" mysqltest option: mysql-stress-test.pl\fB\-\-mysqltest=\fR\fB\fIpath\fR\fR
+.\" mysql-stress-test.pl: mysqltest option
+.\" mysqltest option: mysql-stress-test.pl
+\fB\-\-mysqltest=\fR\fB\fIpath\fR\fR
 .sp
 The path name to the
 \fBmysqltest\fR
@@ -160,7 +174,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: server-database option.\" server-database option: mysql-stress-test.pl\fB\-\-server\-database=\fR\fB\fIdb_name\fR\fR
+.\" mysql-stress-test.pl: server-database option
+.\" server-database option: mysql-stress-test.pl
+\fB\-\-server\-database=\fR\fB\fIdb_name\fR\fR
 .sp
 The database to use for the tests\&. The default is
 test\&.
@@ -174,7 +190,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: server-host option.\" server-host option: mysql-stress-test.pl\fB\-\-server\-host=\fR\fB\fIhost_name\fR\fR
+.\" mysql-stress-test.pl: server-host option
+.\" server-host option: mysql-stress-test.pl
+\fB\-\-server\-host=\fR\fB\fIhost_name\fR\fR
 .sp
 The host name of the local host to use for making a TCP/IP connection to the local server\&. By default, the connection is made to
 localhost
@@ -189,7 +207,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: server-logs-dir option.\" server-logs-dir option: mysql-stress-test.pl\fB\-\-server\-logs\-dir=\fR\fB\fIpath\fR\fR
+.\" mysql-stress-test.pl: server-logs-dir option
+.\" server-logs-dir option: mysql-stress-test.pl
+\fB\-\-server\-logs\-dir=\fR\fB\fIpath\fR\fR
 .sp
 This option is required\&.
 \fIpath\fR
@@ -204,7 +224,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: server-password option.\" server-password option: mysql-stress-test.pl\fB\-\-server\-password=\fR\fB\fIpassword\fR\fR
+.\" mysql-stress-test.pl: server-password option
+.\" server-password option: mysql-stress-test.pl
+\fB\-\-server\-password=\fR\fB\fIpassword\fR\fR
 .sp
 The password to use when connecting to the server\&.
 .RE
@@ -217,7 +239,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: server-port option.\" server-port option: mysql-stress-test.pl\fB\-\-server\-port=\fR\fB\fIport_num\fR\fR
+.\" mysql-stress-test.pl: server-port option
+.\" server-port option: mysql-stress-test.pl
+\fB\-\-server\-port=\fR\fB\fIport_num\fR\fR
 .sp
 The TCP/IP port number to use for connecting to the server\&. The default is 3306\&.
 .RE
@@ -230,7 +254,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: server-socket option.\" server-socket option: mysql-stress-test.pl\fB\-\-server\-socket=\fR\fB\fIfile_name\fR\fR
+.\" mysql-stress-test.pl: server-socket option
+.\" server-socket option: mysql-stress-test.pl
+\fB\-\-server\-socket=\fR\fB\fIfile_name\fR\fR
 .sp
 For connections to
 localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&. The default if
@@ -245,7 +271,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: server-user option.\" server-user option: mysql-stress-test.pl\fB\-\-server\-user=\fR\fB\fIuser_name\fR\fR
+.\" mysql-stress-test.pl: server-user option
+.\" server-user option: mysql-stress-test.pl
+\fB\-\-server\-user=\fR\fB\fIuser_name\fR\fR
 .sp
 The MySQL user name to use when connecting to the server\&. The default is
 root\&.
@@ -259,7 +287,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: sleep-time option.\" sleep-time option: mysql-stress-test.pl\fB\-\-sleep\-time=\fR\fB\fIN\fR\fR
+.\" mysql-stress-test.pl: sleep-time option
+.\" sleep-time option: mysql-stress-test.pl
+\fB\-\-sleep\-time=\fR\fB\fIN\fR\fR
 .sp
 The delay in seconds between test executions\&.
 .RE
@@ -272,7 +302,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: stress-basedir option.\" stress-basedir option: mysql-stress-test.pl\fB\-\-stress\-basedir=\fR\fB\fIpath\fR\fR
+.\" mysql-stress-test.pl: stress-basedir option
+.\" stress-basedir option: mysql-stress-test.pl
+\fB\-\-stress\-basedir=\fR\fB\fIpath\fR\fR
 .sp
 This option is required\&.
 \fIpath\fR
@@ -287,7 +319,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: stress-datadir option.\" stress-datadir option: mysql-stress-test.pl\fB\-\-stress\-datadir=\fR\fB\fIpath\fR\fR
+.\" mysql-stress-test.pl: stress-datadir option
+.\" stress-datadir option: mysql-stress-test.pl
+\fB\-\-stress\-datadir=\fR\fB\fIpath\fR\fR
 .sp
 The directory of data files to be used during testing\&. The default location is the
 data
@@ -304,7 +338,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: stress-init-file option.\" stress-init-file option: mysql-stress-test.pl\fB\-\-stress\-init\-file[=\fR\fB\fIpath\fR\fR\fB]\fR
+.\" mysql-stress-test.pl: stress-init-file option
+.\" stress-init-file option: mysql-stress-test.pl
+\fB\-\-stress\-init\-file[=\fR\fB\fIpath\fR\fR\fB]\fR
 .sp
 \fIfile_name\fR
 is the location of the file that contains the list of tests to be run once to initialize the database for the testing\&. If missing, the default file is
@@ -320,7 +356,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: stress-mode option.\" stress-mode option: mysql-stress-test.pl\fB\-\-stress\-mode=\fR\fB\fImode\fR\fR
+.\" mysql-stress-test.pl: stress-mode option
+.\" stress-mode option: mysql-stress-test.pl
+\fB\-\-stress\-mode=\fR\fB\fImode\fR\fR
 .sp
 This option indicates the test order in stress\-test mode\&. The
 \fImode\fR
@@ -340,7 +378,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: stress-suite-basedir option.\" stress-suite-basedir option: mysql-stress-test.pl\fB\-\-stress\-suite\-basedir=\fR\fB\fIpath\fR\fR
+.\" mysql-stress-test.pl: stress-suite-basedir option
+.\" stress-suite-basedir option: mysql-stress-test.pl
+\fB\-\-stress\-suite\-basedir=\fR\fB\fIpath\fR\fR
 .sp
 This option is required\&.
 \fIpath\fR
@@ -363,7 +403,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: stress-tests-file option.\" stress-tests-file option: mysql-stress-test.pl\fB\-\-stress\-tests\-file[=\fR\fB\fIfile_name\fR\fR\fB]\fR
+.\" mysql-stress-test.pl: stress-tests-file option
+.\" stress-tests-file option: mysql-stress-test.pl
+\fB\-\-stress\-tests\-file[=\fR\fB\fIfile_name\fR\fR\fB]\fR
 .sp
 Use this option to run the stress tests\&.
 \fIfile_name\fR
@@ -383,7 +425,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: suite option.\" suite option: mysql-stress-test.pl\fB\-\-suite=\fR\fB\fIsuite_name\fR\fR
+.\" mysql-stress-test.pl: suite option
+.\" suite option: mysql-stress-test.pl
+\fB\-\-suite=\fR\fB\fIsuite_name\fR\fR
 .sp
 Run the named test suite\&. The default name is
 main
@@ -400,7 +444,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: test-count option.\" test-count option: mysql-stress-test.pl\fB\-\-test\-count=\fR\fB\fIN\fR\fR
+.\" mysql-stress-test.pl: test-count option
+.\" test-count option: mysql-stress-test.pl
+\fB\-\-test\-count=\fR\fB\fIN\fR\fR
 .sp
 The number of tests to execute before exiting\&.
 .RE
@@ -413,7 +459,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: test-duration option.\" test-duration option: mysql-stress-test.pl\fB\-\-test\-duration=\fR\fB\fIN\fR\fR
+.\" mysql-stress-test.pl: test-duration option
+.\" test-duration option: mysql-stress-test.pl
+\fB\-\-test\-duration=\fR\fB\fIN\fR\fR
 .sp
 The duration of stress testing in seconds\&.
 .RE
@@ -426,7 +474,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: threads option.\" threads option: mysql-stress-test.pl\fB\-\-threads=\fR\fB\fIN\fR\fR
+.\" mysql-stress-test.pl: threads option
+.\" threads option: mysql-stress-test.pl
+\fB\-\-threads=\fR\fB\fIN\fR\fR
 .sp
 The number of threads\&. The default is 1\&.
 .RE
@@ -439,7 +489,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-stress-test.pl: verbose option.\" verbose option: mysql-stress-test.pl\fB\-\-verbose\fR
+.\" mysql-stress-test.pl: verbose option
+.\" verbose option: mysql-stress-test.pl
+\fB\-\-verbose\fR
 .sp
 Verbose mode\&. Print more information about what the program does\&.
 .RE
 
=== modified file 'man/mysql-test-run.pl.1'
--- man/mysql-test-run.pl.1	2013-12-16 08:45:31 +0000
+++ man/mysql-test-run.pl.1	2014-02-17 11:30:39 +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: 11/13/2013
+.\"      Date: 01/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-TEST\-RUN\" "1" "11/13/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-TEST\-RUN\" "1" "01/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -401,7 +401,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: help option.\" help option: mysql-test-run.pl\fB\-\-help\fR,
+.\" mysql-test-run.pl: help option
+.\" help option: mysql-test-run.pl
+\fB\-\-help\fR,
 \fB\-h\fR
 .sp
 Display a help message and exit\&.
@@ -415,7 +417,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: big-test option.\" big-test option: mysql-test-run.pl\fB\-\-big\-test\fR
+.\" mysql-test-run.pl: big-test option
+.\" big-test option: mysql-test-run.pl
+\fB\-\-big\-test\fR
 .sp
 Allow tests marked as "big" to run\&. Tests can be thus marked by including the line
 \-\-source include/big_test\&.inc, and they will only be run if this option is given, or if the environment variable
@@ -433,7 +437,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: boot-dbx option.\" boot-dbx option: mysql-test-run.pl\fB\-\-boot\-dbx\fR
+.\" mysql-test-run.pl: boot-dbx option
+.\" boot-dbx option: mysql-test-run.pl
+\fB\-\-boot\-dbx\fR
 .sp
 Run the
 \fBmysqld\fR
@@ -450,7 +456,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: boot-ddd option.\" boot-ddd option: mysql-test-run.pl\fB\-\-boot\-ddd\fR
+.\" mysql-test-run.pl: boot-ddd option
+.\" boot-ddd option: mysql-test-run.pl
+\fB\-\-boot\-ddd\fR
 .sp
 Run the
 \fBmysqld\fR
@@ -467,7 +475,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: boot-gdb option.\" boot-gdb option: mysql-test-run.pl\fB\-\-boot\-gdb\fR
+.\" mysql-test-run.pl: boot-gdb option
+.\" boot-gdb option: mysql-test-run.pl
+\fB\-\-boot\-gdb\fR
 .sp
 Run the
 \fBmysqld\fR
@@ -484,7 +494,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: build-thread option.\" build-thread option: mysql-test-run.pl\fB\-\-build\-thread=\fR\fB\fInumber\fR\fR
+.\" mysql-test-run.pl: build-thread option
+.\" build-thread option: mysql-test-run.pl
+\fB\-\-build\-thread=\fR\fB\fInumber\fR\fR
 .sp
 Specify a number to calculate port numbers from\&. The formula is 10 *
 \fIbuild_thread\fR
@@ -511,7 +523,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: callgrind option.\" callgrind option: mysql-test-run.pl\fB\-\-callgrind\fR
+.\" mysql-test-run.pl: callgrind option
+.\" callgrind option: mysql-test-run.pl
+\fB\-\-callgrind\fR
 .sp
 Instructs
 \fBvalgrind\fR
@@ -527,7 +541,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: check-testcases option.\" check-testcases option: mysql-test-run.pl\fB\-\-check\-testcases\fR
+.\" mysql-test-run.pl: check-testcases option
+.\" check-testcases option: mysql-test-run.pl
+\fB\-\-check\-testcases\fR
 .sp
 Check test cases for side effects\&. This is done by checking system state before and after each test case; if there is any difference, a warning to that effect will be written, but the test case will not be marked as failed because of it\&. This check is enabled by default\&.
 .RE
@@ -540,7 +556,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: clean-vardir option.\" clean-vardir option: mysql-test-run.pl\fB\-\-clean\-vardir\fR
+.\" mysql-test-run.pl: clean-vardir option
+.\" clean-vardir option: mysql-test-run.pl
+\fB\-\-clean\-vardir\fR
 .sp
 Clean up the
 var
@@ -560,7 +578,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: client-bindir option.\" client-bindir option: mysql-test-run.pl\fB\-\-client\-bindir=\fR\fB\fIpath\fR\fR
+.\" mysql-test-run.pl: client-bindir option
+.\" client-bindir option: mysql-test-run.pl
+\fB\-\-client\-bindir=\fR\fB\fIpath\fR\fR
 .sp
 The path to the directory where client binaries are located\&.
 .RE
@@ -573,7 +593,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: client-dbx option.\" client-dbx option: mysql-test-run.pl\fB\-\-client\-dbx\fR
+.\" mysql-test-run.pl: client-dbx option
+.\" client-dbx option: mysql-test-run.pl
+\fB\-\-client\-dbx\fR
 .sp
 Start
 \fBmysqltest\fR
@@ -590,7 +612,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: client-ddd option.\" client-ddd option: mysql-test-run.pl\fB\-\-client\-ddd\fR
+.\" mysql-test-run.pl: client-ddd option
+.\" client-ddd option: mysql-test-run.pl
+\fB\-\-client\-ddd\fR
 .sp
 Start
 \fBmysqltest\fR
@@ -607,7 +631,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: client-debugger option.\" client-debugger option: mysql-test-run.pl\fB\-\-client\-debugger=\fR\fB\fIdebugger\fR\fR
+.\" mysql-test-run.pl: client-debugger option
+.\" client-debugger option: mysql-test-run.pl
+\fB\-\-client\-debugger=\fR\fB\fIdebugger\fR\fR
 .sp
 Start
 \fBmysqltest\fR
@@ -622,7 +648,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: client-gdb option.\" client-gdb option: mysql-test-run.pl\fB\-\-client\-gdb\fR
+.\" mysql-test-run.pl: client-gdb option
+.\" client-gdb option: mysql-test-run.pl
+\fB\-\-client\-gdb\fR
 .sp
 Start
 \fBmysqltest\fR
@@ -639,7 +667,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: client-libdir option.\" client-libdir option: mysql-test-run.pl\fB\-\-client\-libdir=\fR\fB\fIpath\fR\fR
+.\" mysql-test-run.pl: client-libdir option
+.\" client-libdir option: mysql-test-run.pl
+\fB\-\-client\-libdir=\fR\fB\fIpath\fR\fR
 .sp
 The path to the directory where client libraries are located\&.
 .RE
@@ -652,7 +682,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: combination option.\" combination option: mysql-test-run.pl\fB\-\-combination=\fR\fB\fIvalue\fR\fR
+.\" mysql-test-run.pl: combination option
+.\" combination option: mysql-test-run.pl
+\fB\-\-combination=\fR\fB\fIvalue\fR\fR
 .sp
 Extra option to pass to
 \fBmysqld\fR\&. The value should consist of a single
@@ -681,7 +713,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: comment option.\" comment option: mysql-test-run.pl\fB\-\-comment=\fR\fB\fIstr\fR\fR
+.\" mysql-test-run.pl: comment option
+.\" comment option: mysql-test-run.pl
+\fB\-\-comment=\fR\fB\fIstr\fR\fR
 .sp
 Write
 \fIstr\fR
@@ -697,7 +731,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: compress option.\" compress option: mysql-test-run.pl\fB\-\-compress\fR
+.\" mysql-test-run.pl: compress option
+.\" compress option: mysql-test-run.pl
+\fB\-\-compress\fR
 .sp
 Compress all information sent between the client and the server if both support compression\&.
 .RE
@@ -710,7 +746,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: cursor-protocol option.\" cursor-protocol option: mysql-test-run.pl\fB\-\-cursor\-protocol\fR
+.\" mysql-test-run.pl: cursor-protocol option
+.\" cursor-protocol option: mysql-test-run.pl
+\fB\-\-cursor\-protocol\fR
 .sp
 Pass the
 \fB\-\-cursor\-protocol\fR
@@ -728,7 +766,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: dbx option.\" gdb option: mysql-test-run.pl\fB\-\-dbx\fR
+.\" mysql-test-run.pl: dbx option
+.\" gdb option: mysql-test-run.pl
+\fB\-\-dbx\fR
 .sp
 Start
 \fBmysqld\fR
@@ -745,7 +785,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: ddd option.\" ddd option: mysql-test-run.pl\fB\-\-ddd\fR
+.\" mysql-test-run.pl: ddd option
+.\" ddd option: mysql-test-run.pl
+\fB\-\-ddd\fR
 .sp
 Start
 \fBmysqld\fR
@@ -762,7 +804,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: debug option.\" debug option: mysql-test-run.pl\fB\-\-debug\fR
+.\" mysql-test-run.pl: debug option
+.\" debug option: mysql-test-run.pl
+\fB\-\-debug\fR
 .sp
 Dump trace output for all clients and servers\&.
 .RE
@@ -775,7 +819,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: debugger option.\" debugger option: mysql-test-run.pl\fB\-\-debugger=\fR\fB\fIdebugger\fR\fR
+.\" mysql-test-run.pl: debugger option
+.\" debugger option: mysql-test-run.pl
+\fB\-\-debugger=\fR\fB\fIdebugger\fR\fR
 .sp
 Start
 \fBmysqld\fR
@@ -790,7 +836,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: debug-server option.\" debug-server option: mysql-test-run.pl\fB\-\-debug\-server\fR
+.\" mysql-test-run.pl: debug-server option
+.\" debug-server option: mysql-test-run.pl
+\fB\-\-debug\-server\fR
 .sp
 Runs
 mysqld\&.debug
@@ -816,7 +864,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: debug-sync-timeout option.\" debug-sync-timeout option: mysql-test-run.pl\fB\-\-debug\-sync\-timeout=\fR\fB\fIN\fR\fR
+.\" mysql-test-run.pl: debug-sync-timeout option
+.\" debug-sync-timeout option: mysql-test-run.pl
+\fB\-\-debug\-sync\-timeout=\fR\fB\fIN\fR\fR
 .sp
 Controls whether the Debug Sync facility for testing and debugging is enabled\&. The option value is a timeout in seconds\&. The default value is 300\&. A value of 0 disables Debug Sync\&. The value of this option also becomes the default timeout for individual synchronization points\&.
 .sp
@@ -844,7 +894,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: default-myisam option.\" default-myisam option: mysql-test-run.pl\fB\-\-default\-myisam\fR
+.\" mysql-test-run.pl: default-myisam option
+.\" default-myisam option: mysql-test-run.pl
+\fB\-\-default\-myisam\fR
 .sp
 Use MyISAM as default engine for all except InnoDB\-specific tests\&. This option was added in MySQL 5\&.5 and is on by default\&. It may be changed to off by default in a later release\&. See also
 \fB\-\-nodefault\-myisam\fR\&.
@@ -858,7 +910,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: defaults-file option.\" default-file option: mysql-test-run.pl\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.\" mysql-test-run.pl: defaults-file option
+.\" default-file option: mysql-test-run.pl
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
 .sp
 Use the named file as fixed config file template for all tests\&.
 .RE
@@ -871,7 +925,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: defaults_extra_file option.\" default_extra_file option: mysql-test-run.pl\fB\-\-defaults_extra_file=\fR\fB\fIfile_name\fR\fR
+.\" mysql-test-run.pl: defaults_extra_file option
+.\" default_extra_file option: mysql-test-run.pl
+\fB\-\-defaults_extra_file=\fR\fB\fIfile_name\fR\fR
 .sp
 Add setting from the named file to all generated configs\&.
 .RE
@@ -884,7 +940,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: do-test option.\" do-test option: mysql-test-run.pl\fB\-\-do\-test=\fR\fB\fIprefix\fR\fR
+.\" mysql-test-run.pl: do-test option
+.\" do-test option: mysql-test-run.pl
+\fB\-\-do\-test=\fR\fB\fIprefix\fR\fR
 .sp
 Run all test cases having a name that begins with the given
 \fIprefix\fR
@@ -918,7 +976,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: embedded-server option.\" embedded-server option: mysql-test-run.pl\fB\-\-embedded\-server\fR
+.\" mysql-test-run.pl: embedded-server option
+.\" embedded-server option: mysql-test-run.pl
+\fB\-\-embedded\-server\fR
 .sp
 Use a version of
 \fBmysqltest\fR
@@ -933,7 +993,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: enable-disabled option.\" enable-disabled option: mysql-test-run.pl\fB\-\-enable\-disabled\fR
+.\" mysql-test-run.pl: enable-disabled option
+.\" enable-disabled option: mysql-test-run.pl
+\fB\-\-enable\-disabled\fR
 .sp
 Ignore any
 disabled\&.def
@@ -948,7 +1010,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: experimental option.\" experimental option: mysql-test-run.pl\fB\-\-experimental=\fR\fB\fIfile_name\fR\fR
+.\" mysql-test-run.pl: experimental option
+.\" experimental option: mysql-test-run.pl
+\fB\-\-experimental=\fR\fB\fIfile_name\fR\fR
 .sp
 Specify a file that contains a list of test cases that should be displayed with the
 [ exp\-fail ]
@@ -971,7 +1035,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: extern option.\" extern option: mysql-test-run.pl\fB\-\-extern\fR\fIoption\fR=\fIvalue\fR
+.\" mysql-test-run.pl: extern option
+.\" extern option: mysql-test-run.pl
+\fB\-\-extern\fR
+\fIoption\fR=\fIvalue\fR
 .sp
 Use an already running server\&. The option/value pair is what is needed by the
 \fBmysql\fR
@@ -1004,7 +1071,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: fast option.\" fast option: mysql-test-run.pl\fB\-\-fast\fR
+.\" mysql-test-run.pl: fast option
+.\" fast option: mysql-test-run.pl
+\fB\-\-fast\fR
 .sp
 Do not perform controlled shutdown when servers need to be restarted or at the end of the test run\&. This is equivalent to using
 \-\-shutdown\-timeout=0\&.
@@ -1018,7 +1087,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: force option.\" force option: mysql-test-run.pl\fB\-\-force\fR
+.\" mysql-test-run.pl: force option
+.\" force option: mysql-test-run.pl
+\fB\-\-force\fR
 .sp
 Normally,
 \fBmysql\-test\-run\&.pl\fR
@@ -1035,7 +1106,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: force-restart option.\" force-restart option: mysql-test-run.pl\fB\-\-force\-restart\fR
+.\" mysql-test-run.pl: force-restart option
+.\" force-restart option: mysql-test-run.pl
+\fB\-\-force\-restart\fR
 .sp
 Always restart the server(s) between each tast case, whether it\*(Aqs needed or not\&. Will also restart between repeated runs of the same test case\&. This may be useful e\&.g\&. when looking for the source of a memory leak, as there will only have been one test run before the server exits\&.
 .sp
@@ -1052,7 +1125,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: gcov option.\" gcov option: mysql-test-run.pl\fB\-\-gcov\fR
+.\" mysql-test-run.pl: gcov option
+.\" gcov option: mysql-test-run.pl
+\fB\-\-gcov\fR
 .sp
 Run tests with the
 \fBgcov\fR
@@ -1067,7 +1142,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: gdb option.\" gdb option: mysql-test-run.pl\fB\-\-gdb\fR
+.\" mysql-test-run.pl: gdb option
+.\" gdb option: mysql-test-run.pl
+\fB\-\-gdb\fR
 .sp
 Start
 \fBmysqld\fR
@@ -1084,7 +1161,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: gprof option.\" gprof option: mysql-test-run.pl\fB\-\-gprof\fR
+.\" mysql-test-run.pl: gprof option
+.\" gprof option: mysql-test-run.pl
+\fB\-\-gprof\fR
 .sp
 Run tests with the
 \fBgprof\fR
@@ -1101,8 +1180,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: include-ndbcluster option.\" include-ndbcluster option: mysql-test-run.pl\fB\-\-include\-ndbcluster\fR,
-.\" mysql-test-run.pl: include-ndb option.\" include-ndb option: mysql-test-run.pl\fB\-\-include\-ndb\fR
+.\" mysql-test-run.pl: include-ndbcluster option
+.\" include-ndbcluster option: mysql-test-run.pl
+\fB\-\-include\-ndbcluster\fR,
+.\" mysql-test-run.pl: include-ndb option
+.\" include-ndb option: mysql-test-run.pl
+\fB\-\-include\-ndb\fR
 .sp
 Run also tests that need Cluster\&. This is the default behavior up to MySQL 5\&.1\&.51\&. From MySQL 5\&.1\&.52 this option has been added to re\-enable running Cluster tests\&.
 .RE
@@ -1115,7 +1198,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: manual-dbx option.\" manual-dbx option: mysql-test-run.pl\fB\-\-manual\-dbx\fR
+.\" mysql-test-run.pl: manual-dbx option
+.\" manual-dbx option: mysql-test-run.pl
+\fB\-\-manual\-dbx\fR
 .sp
 Use a server that has already been started by the user in the
 \fBdbx\fR
@@ -1130,7 +1215,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: manual-ddd option.\" manual-ddd option: mysql-test-run.pl\fB\-\-manual\-ddd\fR
+.\" mysql-test-run.pl: manual-ddd option
+.\" manual-ddd option: mysql-test-run.pl
+\fB\-\-manual\-ddd\fR
 .sp
 Use a server that has already been started by the user in the
 \fBddd\fR
@@ -1145,7 +1232,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: manual-debug option.\" manual-debug option: mysql-test-run.pl\fB\-\-manual\-debug\fR
+.\" mysql-test-run.pl: manual-debug option
+.\" manual-debug option: mysql-test-run.pl
+\fB\-\-manual\-debug\fR
 .sp
 Use a server that has already been started by the user in a debugger\&.
 .RE
@@ -1158,7 +1247,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: manual-gdb option.\" manual-gdb option: mysql-test-run.pl\fB\-\-manual\-gdb\fR
+.\" mysql-test-run.pl: manual-gdb option
+.\" manual-gdb option: mysql-test-run.pl
+\fB\-\-manual\-gdb\fR
 .sp
 Use a server that has already been started by the user in the
 \fBgdb\fR
@@ -1173,7 +1264,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: mark-progress option.\" mark-progress option: mysql-test-run.pl\fB\-\-mark\-progress\fR
+.\" mysql-test-run.pl: mark-progress option
+.\" mark-progress option: mysql-test-run.pl
+\fB\-\-mark\-progress\fR
 .sp
 Marks progress with timing (in milliseconds) and line number in
 var/log/\fItestname\fR\&.progress\&.
@@ -1187,7 +1280,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: max-connections option.\" max-connections option: mysql-test-run.pl\fB\-\-max\-connections=\fR\fB\fInum\fR\fR
+.\" mysql-test-run.pl: max-connections option
+.\" max-connections option: mysql-test-run.pl
+\fB\-\-max\-connections=\fR\fB\fInum\fR\fR
 .sp
 The maximum number of simultaneous server connections that may be used per test\&. If not set, the maximum is 128\&. Minimum allowed limit is 8, maximum is 5120\&. Corresponds to the same option for
 \fBmysqltest\fR\&.
@@ -1203,7 +1298,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: max-save-core option.\" max-save-core option: mysql-test-run.pl\fB\-\-max\-save\-core=\fR\fB\fIN\fR\fR
+.\" mysql-test-run.pl: max-save-core option
+.\" max-save-core option: mysql-test-run.pl
+\fB\-\-max\-save\-core=\fR\fB\fIN\fR\fR
 .sp
 Limit the number of core files saved, to avoid filling up disks in case of a frequently crashing server\&. Defaults to 5, set to 0 for no limit\&. May also be set with the environment variable
 MTR_MAX_SAVE_CORE
@@ -1217,7 +1314,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: max-save-datadir option.\" max-save-datadir option: mysql-test-run.pl\fB\-\-max\-save\-datadir=\fR\fB\fIN\fR\fR
+.\" mysql-test-run.pl: max-save-datadir option
+.\" max-save-datadir option: mysql-test-run.pl
+\fB\-\-max\-save\-datadir=\fR\fB\fIN\fR\fR
 .sp
 Limit the number of data directories saved after failed tests, to avoid filling up disks in case of frequent failures\&. Defaults to 20, set to 0 for no limit\&. May also be set with the environment variable
 MTR_MAX_SAVE_DATADIR
@@ -1231,7 +1330,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: max-test-fail option.\" max-test-fail option: mysql-test-run.pl\fB\-\-max\-test\-fail=\fR\fB\fIN\fR\fR
+.\" mysql-test-run.pl: max-test-fail option
+.\" max-test-fail option: mysql-test-run.pl
+\fB\-\-max\-test\-fail=\fR\fB\fIN\fR\fR
 .sp
 Stop execution after the specified number of tests have failed, to avoid using up resources (and time) in case of massive failures\&. retries are noe counted, nor are failures of tests marked experimental\&. Defaults to 10, set to 0 for no limit\&. May also be set with the environment variable
 MTR_MAX_TEST_FAIL
@@ -1245,7 +1346,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: mem option.\" mem option: mysql-test-run.pl\fB\-\-mem\fR
+.\" mysql-test-run.pl: mem option
+.\" mem option: mysql-test-run.pl
+\fB\-\-mem\fR
 .sp
 This option is not supported on Windows\&.
 .sp
@@ -1280,7 +1383,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: mysqld option.\" mysqld option: mysql-test-run.pl\fB\-\-mysqld=\fR\fB\fIvalue\fR\fR
+.\" mysql-test-run.pl: mysqld option
+.\" mysqld option: mysql-test-run.pl
+\fB\-\-mysqld=\fR\fB\fIvalue\fR\fR
 .sp
 Extra option to pass to
 \fBmysqld\fR\&. Only one option may be specified in
@@ -1298,7 +1403,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: mysqld-env option.\" mysqld-env option: mysql-test-run.pl\fB\-\-mysqld\-env=\fR\fB\fIvariable\fR\fR\fB=\fR\fB\fIvalue\fR\fR
+.\" mysql-test-run.pl: mysqld-env option
+.\" mysqld-env option: mysql-test-run.pl
+\fB\-\-mysqld\-env=\fR\fB\fIvariable\fR\fR\fB=\fR\fB\fIvalue\fR\fR
 .sp
 Sets (or changes) an environment variable before starting
 \fBmysqld\fR\&. Varibles set in the environment from which you run
@@ -1321,7 +1428,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: ndb-connectstring option.\" ndb-connectstring option: mysql-test-run.pl\fB\-\-ndb\-connectstring=\fR\fB\fIstr\fR\fR
+.\" mysql-test-run.pl: ndb-connectstring option
+.\" ndb-connectstring option: mysql-test-run.pl
+\fB\-\-ndb\-connectstring=\fR\fB\fIstr\fR\fR
 .sp
 Pass
 \fB\-\-ndb\-connectstring=\fR\fB\fIstr\fR\fR
@@ -1338,7 +1447,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: nocheck-testcases option.\" nocheck-testcases option: mysql-test-run.pl\fB\-\-nocheck\-testcases\fR
+.\" mysql-test-run.pl: nocheck-testcases option
+.\" nocheck-testcases option: mysql-test-run.pl
+\fB\-\-nocheck\-testcases\fR
 .sp
 Disable the check for test case side effects; see
 \fB\-\-check\-testcases\fR
@@ -1353,7 +1464,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: nodefault-myisam option.\" nodefault-myisam option: mysql-test-run.pl\fB\-\-nodefault\-myisam\fR
+.\" mysql-test-run.pl: nodefault-myisam option
+.\" nodefault-myisam option: mysql-test-run.pl
+\fB\-\-nodefault\-myisam\fR
 .sp
 Do not override the build\-in default engine to use MyISAM instead for non\-InnoDB tests\&. This option was added in MySQL 5\&.5\&. Since the existing collection of tests were originally adapted for MyISAM as default, many tests will fail when this option is used, because the test behaves differently or produces different output when the engine switches to InnoDB\&.
 .RE
@@ -1366,7 +1479,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: noreorder option.\" noreorder option: mysql-test-run.pl\fB\-\-noreorder\fR
+.\" mysql-test-run.pl: noreorder option
+.\" noreorder option: mysql-test-run.pl
+\fB\-\-noreorder\fR
 .sp
 Do not reorder tests to reduce number of restarts, but run them in exactly the order given\&. If a whole suite is to be run, the tests are run in alphabetic order, though similiar combinations will be grouped together\&. If more than one suite is listed, the tests are run one suite at a time, in the order listed\&.
 .RE
@@ -1379,7 +1494,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: notimer option.\" notimer option: mysql-test-run.pl\fB\-\-notimer\fR
+.\" mysql-test-run.pl: notimer option
+.\" notimer option: mysql-test-run.pl
+\fB\-\-notimer\fR
 .sp
 Cause
 \fBmysqltest\fR
@@ -1394,7 +1511,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: nounit-tests option.\" nounit-tests option: mysql-test-run.pl\fB\-\-nounit\-tests\fR
+.\" mysql-test-run.pl: nounit-tests option
+.\" nounit-tests option: mysql-test-run.pl
+\fB\-\-nounit\-tests\fR
 .sp
 Do not run unit tests, overriding default behaviour or setting of the
 MTR_UNIT_TESTS
@@ -1411,7 +1530,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: nowarnings option.\" nowarnings option: mysql-test-run.pl\fB\-\-nowarnings\fR
+.\" mysql-test-run.pl: nowarnings option
+.\" nowarnings option: mysql-test-run.pl
+\fB\-\-nowarnings\fR
 .sp
 Do not look for and report errors and warning in the server logs\&.
 .RE
@@ -1424,7 +1545,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: parallel option.\" parallel option: mysql-test-run.pl\fB\-\-parallel={\fR\fB\fIN\fR\fR\fB|auto}\fR
+.\" mysql-test-run.pl: parallel option
+.\" parallel option: mysql-test-run.pl
+\fB\-\-parallel={\fR\fB\fIN\fR\fR\fB|auto}\fR
 .sp
 Run tests using
 \fIN\fR
@@ -1442,7 +1565,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: port-base option.\" port-base option: mysql-test-run.pl\fB\-\-port\-base=\fR\fB\fIP\fR\fR
+.\" mysql-test-run.pl: port-base option
+.\" port-base option: mysql-test-run.pl
+\fB\-\-port\-base=\fR\fB\fIP\fR\fR
 .sp
 Specify base of port numbers to be used; a block of 10 will be allocated\&.
 \fIP\fR
@@ -1468,7 +1593,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: print-testcases option.\" print-testcases option: mysql-test-run.pl\fB\-\-print\-testcases\fR
+.\" mysql-test-run.pl: print-testcases option
+.\" print-testcases option: mysql-test-run.pl
+\fB\-\-print\-testcases\fR
 .sp
 Do not run any tests, but print details about all tests, in the order they would have been run\&.
 .RE
@@ -1481,7 +1608,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: ps-protocol option.\" ps-protocol option: mysql-test-run.pl\fB\-\-ps\-protocol\fR
+.\" mysql-test-run.pl: ps-protocol option
+.\" ps-protocol option: mysql-test-run.pl
+\fB\-\-ps\-protocol\fR
 .sp
 Pass the
 \fB\-\-ps\-protocol\fR
@@ -1497,7 +1626,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: record option.\" record option: mysql-test-run.pl\fB\-\-record\fR
+.\" mysql-test-run.pl: record option
+.\" record option: mysql-test-run.pl
+\fB\-\-record\fR
 .sp
 Pass the
 \fB\-\-record\fR
@@ -1513,7 +1644,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: reorder option.\" reorder option: mysql-test-run.pl\fB\-\-reorder\fR
+.\" mysql-test-run.pl: reorder option
+.\" reorder option: mysql-test-run.pl
+\fB\-\-reorder\fR
 .sp
 Reorder tests to minimize the number of server restarts needed\&. This is the default behavior\&. There is no guarantee that a particular set of tests will always end up in the same order\&.
 .RE
@@ -1526,7 +1659,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: repeat option.\" repeat option: mysql-test-run.pl\fB\-\-repeat=\fR\fB\fIN\fR\fR
+.\" mysql-test-run.pl: repeat option
+.\" repeat option: mysql-test-run.pl
+\fB\-\-repeat=\fR\fB\fIN\fR\fR
 .sp
 Run each test
 \fIN\fR
@@ -1541,7 +1676,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: report-features option.\" report-features option: mysql-test-run.pl\fB\-\-report\-features\fR
+.\" mysql-test-run.pl: report-features option
+.\" report-features option: mysql-test-run.pl
+\fB\-\-report\-features\fR
 .sp
 Display the output of
 SHOW ENGINES
@@ -1557,7 +1694,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: report-times option.\" report-times option: mysql-test-run.pl\fB\-\-report\-times\fR
+.\" mysql-test-run.pl: report-times option
+.\" report-times option: mysql-test-run.pl
+\fB\-\-report\-times\fR
 .sp
 At the end of the test run, write a summary of how much time was spent in various phases of execution\&. If you run with
 \fB\-\-parallel\fR, the total will exceed the wall clock time passed, since it will be summed over all threads\&.
@@ -1579,7 +1718,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: retry option.\" retry option: mysql-test-run.pl\fB\-\-retry=\fR\fB\fIN\fR\fR
+.\" mysql-test-run.pl: retry option
+.\" retry option: mysql-test-run.pl
+\fB\-\-retry=\fR\fB\fIN\fR\fR
 .sp
 If a test fails, it is retried up to a maximum of
 \fIN\fR
@@ -1604,7 +1745,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: retry-failure option.\" retry-failure option: mysql-test-run.pl\fB\-\-retry\-failure=\fR\fB\fIN\fR\fR
+.\" mysql-test-run.pl: retry-failure option
+.\" retry-failure option: mysql-test-run.pl
+\fB\-\-retry\-failure=\fR\fB\fIN\fR\fR
 .sp
 Allow a failed and retried test to fail more than the default 2 times before giving it up\&. Setting it to 0 or 1 effectively turns off retries
 .RE
@@ -1617,7 +1760,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: shutdown-timeout option.\" shutdown-timeout option: mysql-test-run.pl\fB\-\-shutdown\-timeout=\fR\fB\fISECONDS\fR\fR
+.\" mysql-test-run.pl: shutdown-timeout option
+.\" shutdown-timeout option: mysql-test-run.pl
+\fB\-\-shutdown\-timeout=\fR\fB\fISECONDS\fR\fR
 .sp
 Max number of seconds to wait for servers to do controlled shutdown before killing them\&. Default is 10\&.
 .RE
@@ -1630,7 +1775,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: skip-combinations option.\" skip-combinations option: mysql-test-run.pl\fB\-\-skip\-combinations\fR
+.\" mysql-test-run.pl: skip-combinations option
+.\" skip-combinations option: mysql-test-run.pl
+\fB\-\-skip\-combinations\fR
 .sp
 Do not apply combinations; ignore combinations file or option\&.
 .RE
@@ -1643,8 +1790,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: skip-ndbcluster option.\" skip-ndbcluster option: mysql-test-run.pl\fB\-\-skip\-ndbcluster\fR,
-.\" mysql-test-run.pl: skip-ndb option.\" skip-ndb option: mysql-test-run.pl\fB\-\-skip\-ndb\fR
+.\" mysql-test-run.pl: skip-ndbcluster option
+.\" skip-ndbcluster option: mysql-test-run.pl
+\fB\-\-skip\-ndbcluster\fR,
+.\" mysql-test-run.pl: skip-ndb option
+.\" skip-ndb option: mysql-test-run.pl
+\fB\-\-skip\-ndb\fR
 .sp
 Do not start NDB Cluster; skip Cluster test cases\&. From MySQL 5\&.1\&.52, this is the default and so this option does not do anything but is kept for backwards compatibility\&.
 .RE
@@ -1657,8 +1808,12 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: skip-ndbcluster-slave option.\" skip-ndbcluster-slave option: mysql-test-run.pl\fB\-\-skip\-ndbcluster\-slave\fR,
-.\" mysql-test-run.pl: skip-ndb-slave option.\" skip-ndb-slave option: mysql-test-run.pl\fB\-\-skip\-ndb\-slave\fR
+.\" mysql-test-run.pl: skip-ndbcluster-slave option
+.\" skip-ndbcluster-slave option: mysql-test-run.pl
+\fB\-\-skip\-ndbcluster\-slave\fR,
+.\" mysql-test-run.pl: skip-ndb-slave option
+.\" skip-ndb-slave option: mysql-test-run.pl
+\fB\-\-skip\-ndb\-slave\fR
 .sp
 Do not start an NDB Cluster slave\&.
 .RE
@@ -1671,7 +1826,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: skip-rpl option.\" skip-rpl option: mysql-test-run.pl\fB\-\-skip\-rpl\fR
+.\" mysql-test-run.pl: skip-rpl option
+.\" skip-rpl option: mysql-test-run.pl
+\fB\-\-skip\-rpl\fR
 .sp
 Skip replication test cases\&.
 .RE
@@ -1684,7 +1841,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: skip-ssl option.\" skip-ssl option: mysql-test-run.pl\fB\-\-skip\-ssl\fR
+.\" mysql-test-run.pl: skip-ssl option
+.\" skip-ssl option: mysql-test-run.pl
+\fB\-\-skip\-ssl\fR
 .sp
 Do not start
 \fBmysqld\fR
@@ -1699,7 +1858,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: skip-test option.\" skip-test option: mysql-test-run.pl\fB\-\-skip\-test=\fR\fB\fIregex\fR\fR
+.\" mysql-test-run.pl: skip-test option
+.\" skip-test option: mysql-test-run.pl
+\fB\-\-skip\-test=\fR\fB\fIregex\fR\fR
 .sp
 Specify a regular expression to be applied to test case names\&. Cases with names that match the expression are skipped\&. tests to skip\&.
 .sp
@@ -1718,7 +1879,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: skip-test-list option.\" skip-test-list option: mysql-test-run.pl\fB\-\-skip\-test\-list=\fR\fB\fIfile\fR\fR
+.\" mysql-test-run.pl: skip-test-list option
+.\" skip-test-list option: mysql-test-run.pl
+\fB\-\-skip\-test\-list=\fR\fB\fIfile\fR\fR
 .sp
 Specify a file listing tests that should be skipped (disabled)\&.
 .sp
@@ -1753,7 +1916,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: sleep option.\" sleep option: mysql-test-run.pl\fB\-\-sleep=\fR\fB\fIN\fR\fR
+.\" mysql-test-run.pl: sleep option
+.\" sleep option: mysql-test-run.pl
+\fB\-\-sleep=\fR\fB\fIN\fR\fR
 .sp
 Pass
 \fB\-\-sleep=\fR\fB\fIN\fR\fR
@@ -1769,7 +1934,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: sp-protocol option.\" sp-protocol option: mysql-test-run.pl\fB\-\-sp\-protocol\fR
+.\" mysql-test-run.pl: sp-protocol option
+.\" sp-protocol option: mysql-test-run.pl
+\fB\-\-sp\-protocol\fR
 .sp
 Pass the
 \fB\-\-sp\-protocol\fR
@@ -1785,7 +1952,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: ssl option.\" ssl option: mysql-test-run.pl\fB\-\-ssl\fR
+.\" mysql-test-run.pl: ssl option
+.\" ssl option: mysql-test-run.pl
+\fB\-\-ssl\fR
 .sp
 If
 \fBmysql\-test\-run\&.pl\fR
@@ -1807,7 +1976,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: start option.\" start option: mysql-test-run.pl\fB\-\-start\fR
+.\" mysql-test-run.pl: start option
+.\" start option: mysql-test-run.pl
+\fB\-\-start\fR
 .sp
 Initialize and start servers with the startup settings for the specified test case\&. You can use this option to start a server to which you can connect later\&. For example, after building a source distribution you can start a server and connect to it with the
 \fBmysql\fR
@@ -1841,7 +2012,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: start-and-exit option.\" start-and-exit option: mysql-test-run.pl\fB\-\-start\-and\-exit\fR
+.\" mysql-test-run.pl: start-and-exit option
+.\" start-and-exit option: mysql-test-run.pl
+\fB\-\-start\-and\-exit\fR
 .sp
 This is similar to
 \fB\-\-start\fR, but
@@ -1865,7 +2038,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: start-dirty option.\" start-dirty option: mysql-test-run.pl\fB\-\-start\-dirty\fR
+.\" mysql-test-run.pl: start-dirty option
+.\" start-dirty option: mysql-test-run.pl
+\fB\-\-start\-dirty\fR
 .sp
 This is similar to
 \fB\-\-start\fR, but will skip the database initialization phase and assume that database files are already available\&. Usually this means you must have run another test first\&.
@@ -1879,7 +2054,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: start-from option.\" start-from option: mysql-test-run.pl\fB\-\-start\-from=\fR\fB\fItest_name\fR\fR
+.\" mysql-test-run.pl: start-from option
+.\" start-from option: mysql-test-run.pl
+\fB\-\-start\-from=\fR\fB\fItest_name\fR\fR
 .sp
 \fBmysql\-test\-run\&.pl\fR
 sorts the list of names of the test cases to be run, and then begins with
@@ -1894,7 +2071,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: strace-client option.\" strace-client option: mysql-test-run.pl\fB\-\-strace\-client\fR
+.\" mysql-test-run.pl: strace-client option
+.\" strace-client option: mysql-test-run.pl
+\fB\-\-strace\-client\fR
 .sp
 Create
 \fBstrace\fR
@@ -1917,7 +2096,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: strace-server option.\" strace-server option: mysql-test-run.pl\fB\-\-strace\-server\fR
+.\" mysql-test-run.pl: strace-server option
+.\" strace-server option: mysql-test-run.pl
+\fB\-\-strace\-server\fR
 .sp
 Create
 \fBstrace\fR
@@ -1939,7 +2120,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: stress option.\" stress option: mysql-test-run.pl\fB\-\-stress=\fR\fB\fIstress options\fR\fR
+.\" mysql-test-run.pl: stress option
+.\" stress option: mysql-test-run.pl
+\fB\-\-stress=\fR\fB\fIstress options\fR\fR
 .sp
 Start a server, but instead of running a test, run
 \fBmysql\-stress\-test\&.pl\fR
@@ -1961,7 +2144,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: suite option.\" suite option: mysql-test-run.pl\fB\-\-suite=\fR\fB\fIsuite_name\fR\fR
+.\" mysql-test-run.pl: suite option
+.\" suite option: mysql-test-run.pl
+\fB\-\-suite=\fR\fB\fIsuite_name\fR\fR
 .sp
 Run the named test suite\&. The default name is
 main
@@ -1978,7 +2163,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: suite-timeout option.\" suite-timeout option: mysql-test-run.pl\fB\-\-suite\-timeout=\fR\fB\fIminutes\fR\fR
+.\" mysql-test-run.pl: suite-timeout option
+.\" suite-timeout option: mysql-test-run.pl
+\fB\-\-suite\-timeout=\fR\fB\fIminutes\fR\fR
 .sp
 Specify the maximum test suite runtime\&.
 .RE
@@ -1991,7 +2178,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: testcase-timeout option.\" testcase-timeout option: mysql-test-run.pl\fB\-\-testcase\-timeout\fR
+.\" mysql-test-run.pl: testcase-timeout option
+.\" testcase-timeout option: mysql-test-run.pl
+\fB\-\-testcase\-timeout\fR
 .sp
 Specify the maximum test case runtime\&.
 .RE
@@ -2004,7 +2193,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: timediff option.\" timediff option: mysql-test-run.pl\fB\-\-timediff\fR
+.\" mysql-test-run.pl: timediff option
+.\" timediff option: mysql-test-run.pl
+\fB\-\-timediff\fR
 .sp
 Adds to each test report for a test case, the total time in sconds and milliseconds passed since the preceding test ended\&. This option can only be used together with
 \fB\-\-timestamp\fR, and has no effect without it\&.
@@ -2018,7 +2209,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: timer option.\" timer option: mysql-test-run.pl\fB\-\-timer\fR
+.\" mysql-test-run.pl: timer option
+.\" timer option: mysql-test-run.pl
+\fB\-\-timer\fR
 .sp
 Cause
 \fBmysqltest\fR
@@ -2034,7 +2227,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: timestamp option.\" timestamp option: mysql-test-run.pl\fB\-\-timestamp\fR
+.\" mysql-test-run.pl: timestamp option
+.\" timestamp option: mysql-test-run.pl
+\fB\-\-timestamp\fR
 .sp
 Prints a timestamp before the test case name in each test report line, showing when the test ended\&.
 .RE
@@ -2047,7 +2242,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: tmpdir option.\" tmpdir option: mysql-test-run.pl\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR
+.\" mysql-test-run.pl: tmpdir option
+.\" tmpdir option: mysql-test-run.pl
+\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR
 .sp
 The directory where temporary file are stored\&. The default location is
 \&./var/tmp\&. The environment variable
@@ -2063,7 +2260,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: unit-tests option.\" unit-tests option: mysql-test-run.pl\fB\-\-unit\-tests\fR
+.\" mysql-test-run.pl: unit-tests option
+.\" unit-tests option: mysql-test-run.pl
+\fB\-\-unit\-tests\fR
 .sp
 Force running of unit tests, overriding default behaviour or setting of the
 MTR_UNIT_TESTS
@@ -2080,7 +2279,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: user option.\" user option: mysql-test-run.pl\fB\-\-user=\fR\fB\fIuser_name\fR\fR
+.\" mysql-test-run.pl: user option
+.\" user option: mysql-test-run.pl
+\fB\-\-user=\fR\fB\fIuser_name\fR\fR
 .sp
 The MySQL user name to use when connecting to the server\&.
 .RE
@@ -2093,7 +2294,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: user-args option.\" user-args option: mysql-test-run.pl\fB\-\-user\-args\fR
+.\" mysql-test-run.pl: user-args option
+.\" user-args option: mysql-test-run.pl
+\fB\-\-user\-args\fR
 .sp
 Drops all non\-essential command line arguments to the
 \fBmysqld\fR
@@ -2118,7 +2321,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: valgrind option.\" valgrind option: mysql-test-run.pl\fB\-\-valgrind\fR
+.\" mysql-test-run.pl: valgrind option
+.\" valgrind option: mysql-test-run.pl
+\fB\-\-valgrind\fR
 .sp
 Run
 \fBmysqltest\fR
@@ -2146,7 +2351,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: valgrind-mysqld option.\" valgrind-mysqld option: mysql-test-run.pl\fB\-\-valgrind\-mysqld\fR
+.\" mysql-test-run.pl: valgrind-mysqld option
+.\" valgrind-mysqld option: mysql-test-run.pl
+\fB\-\-valgrind\-mysqld\fR
 .sp
 Run the
 \fBmysqld\fR
@@ -2162,7 +2369,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: valgrind-mysqltest option.\" valgrind-mysqltest option: mysql-test-run.pl\fB\-\-valgrind\-mysqltest\fR
+.\" mysql-test-run.pl: valgrind-mysqltest option
+.\" valgrind-mysqltest option: mysql-test-run.pl
+\fB\-\-valgrind\-mysqltest\fR
 .sp
 Run
 \fBmysqltest\fR
@@ -2178,7 +2387,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: valgrind-options option.\" valgrind-options option: mysql-test-run.pl\fB\-\-valgrind\-option=\fR\fB\fIstr\fR\fR
+.\" mysql-test-run.pl: valgrind-options option
+.\" valgrind-options option: mysql-test-run.pl
+\fB\-\-valgrind\-option=\fR\fB\fIstr\fR\fR
 .sp
 Extra options to pass to
 \fBvalgrind\fR\&.
@@ -2192,7 +2403,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: valgrind-path option.\" valgrind-path option: mysql-test-run.pl\fB\-\-valgrind\-path=\fR\fB\fIpath\fR\fR
+.\" mysql-test-run.pl: valgrind-path option
+.\" valgrind-path option: mysql-test-run.pl
+\fB\-\-valgrind\-path=\fR\fB\fIpath\fR\fR
 .sp
 Specify the path name to the
 \fBvalgrind\fR
@@ -2207,7 +2420,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: vardir option.\" vardir option: mysql-test-run.pl\fB\-\-vardir=\fR\fB\fIpath\fR\fR
+.\" mysql-test-run.pl: vardir option
+.\" vardir option: mysql-test-run.pl
+\fB\-\-vardir=\fR\fB\fIpath\fR\fR
 .sp
 Specify the path where files generated during the test run are stored\&. The default location is
 \&./var\&. The environment variable
@@ -2223,7 +2438,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: verbose option.\" verbose option: mysql-test-run.pl\fB\-\-verbose\fR
+.\" mysql-test-run.pl: verbose option
+.\" verbose option: mysql-test-run.pl
+\fB\-\-verbose\fR
 .sp
 Give more verbose output regarding test execution\&. Use the option twice to get even more output\&. Note that the output generated within each test case is not affected\&.
 .RE
@@ -2236,7 +2453,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: verbose-restart option.\" verbose-restart option: mysql-test-run.pl\fB\-\-verbose\-restart\fR
+.\" mysql-test-run.pl: verbose-restart option
+.\" verbose-restart option: mysql-test-run.pl
+\fB\-\-verbose\-restart\fR
 .sp
 Write when and why servers are restarted between test cases\&.
 .RE
@@ -2249,7 +2468,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: view-protocol option.\" view-protocol option: mysql-test-run.pl\fB\-\-view\-protocol\fR
+.\" mysql-test-run.pl: view-protocol option
+.\" view-protocol option: mysql-test-run.pl
+\fB\-\-view\-protocol\fR
 .sp
 Pass the
 \fB\-\-view\-protocol\fR
@@ -2265,10 +2486,13 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: vs-config option.\" vs-config option: mysql-test-run.pl\fB\-\-vs\-config=\fR\fB\fIconfig_val\fR\fR
+.\" mysql-test-run.pl: vs-config option
+.\" vs-config option: mysql-test-run.pl
+\fB\-\-vs\-config=\fR\fB\fIconfig_val\fR\fR
 .sp
 Specify the configuration used to build MySQL (for example,
-\fB\-\-vs\-config=debug\fR\fB\-\-vs\-config=release\fR)\&. This option is for Windows only\&.
+\fB\-\-vs\-config=debug\fR
+\fB\-\-vs\-config=release\fR)\&. This option is for Windows only\&.
 .RE
 .sp
 .RS 4
@@ -2279,7 +2503,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: wait-all option.\" wait-all option: mysql-test-run.pl\fB\-\-wait\-all\fR
+.\" mysql-test-run.pl: wait-all option
+.\" wait-all option: mysql-test-run.pl
+\fB\-\-wait\-all\fR
 .sp
 If
 \fB\-\-start\fR
@@ -2298,7 +2524,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: warnings option.\" warnings option: mysql-test-run.pl\fB\-\-warnings\fR
+.\" mysql-test-run.pl: warnings option
+.\" warnings option: mysql-test-run.pl
+\fB\-\-warnings\fR
 .sp
 Search the server log for errors or warning after each test and report any suspicious ones; if any are found, the test will be marked as failed\&. This is the default behavior, it may be turned off with
 \fB\-\-nowarnings\fR\&.
@@ -2312,7 +2540,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: with-ndbcluster-only option.\" with-ndbcluster-only option: mysql-test-run.pl\fB\-\-with\-ndbcluster\-only\fR
+.\" mysql-test-run.pl: with-ndbcluster-only option
+.\" with-ndbcluster-only option: mysql-test-run.pl
+\fB\-\-with\-ndbcluster\-only\fR
 .sp
 Run only test cases that have
 ndb
 
=== modified file 'man/mysql.1'
--- man/mysql.1	2013-12-16 08:45:31 +0000
+++ man/mysql.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -134,7 +134,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: help option.\" help option: mysql\fB\-\-help\fR,
+.\" mysql: help option
+.\" help option: mysql
+\fB\-\-help\fR,
 \fB\-?\fR
 .sp
 Display a help message and exit\&.
@@ -148,7 +150,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: auto-rehash option.\" auto-rehash option: mysql\fB\-\-auto\-rehash\fR
+.\" mysql: auto-rehash option
+.\" auto-rehash option: mysql
+\fB\-\-auto\-rehash\fR
 .sp
 Enable automatic rehashing\&. This option is on by default, which enables database, table, and column name completion\&. Use
 \fB\-\-disable\-auto\-rehash\fR
@@ -171,7 +175,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: auto-vertical-output option.\" auto-vertical-output option: mysql\fB\-\-auto\-vertical\-output\fR
+.\" mysql: auto-vertical-output option
+.\" auto-vertical-output option: mysql
+\fB\-\-auto\-vertical\-output\fR
 .sp
 Cause result sets to be displayed vertically if they are too wide for the current window, and using normal tabular format otherwise\&. (This applies to statements terminated by
 ;
@@ -187,7 +193,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: batch option.\" batch option: mysql\fB\-\-batch\fR,
+.\" mysql: batch option
+.\" batch option: mysql
+\fB\-\-batch\fR,
 \fB\-B\fR
 .sp
 Print results using tab as the column separator, with each row on a new line\&. With this option,
@@ -207,7 +215,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: binary-mode option.\" binary-mode option: mysql\fB\-\-binary\-mode\fR
+.\" mysql: binary-mode option
+.\" binary-mode option: mysql
+\fB\-\-binary\-mode\fR
 .sp
 This option helps when processing
 \fBmysqlbinlog\fR
@@ -246,7 +256,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: bind-address option.\" bind-address option: mysql\fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
+.\" mysql: bind-address option
+.\" bind-address option: mysql
+\fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
 .sp
 On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
 .sp
@@ -261,7 +273,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: character-sets-dir option.\" character-sets-dir option: mysql\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
+.\" mysql: character-sets-dir option
+.\" character-sets-dir option: mysql
+\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
 .sp
 The directory where character sets are installed\&. See
 Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
@@ -275,7 +289,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: column-names option.\" column-names option: mysql\fB\-\-column\-names\fR
+.\" mysql: column-names option
+.\" column-names option: mysql
+\fB\-\-column\-names\fR
 .sp
 Write column names in results\&.
 .RE
@@ -288,7 +304,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: column-type-info option.\" column-type-info option: mysql\fB\-\-column\-type\-info\fR,
+.\" mysql: column-type-info option
+.\" column-type-info option: mysql
+\fB\-\-column\-type\-info\fR,
 \fB\-m\fR
 .sp
 Display result set metadata\&.
@@ -302,7 +320,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: comments option.\" comments option: mysql\fB\-\-comments\fR,
+.\" mysql: comments option
+.\" comments option: mysql
+\fB\-\-comments\fR,
 \fB\-c\fR
 .sp
 Whether to preserve comments in statements sent to the server\&. The default is \-\-skip\-comments (discard comments), enable with \-\-comments (preserve comments)\&.
@@ -316,7 +336,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: compress option.\" compress option: mysql\fB\-\-compress\fR,
+.\" mysql: compress option
+.\" compress option: mysql
+\fB\-\-compress\fR,
 \fB\-C\fR
 .sp
 Compress all information sent between the client and the server if both support compression\&.
@@ -330,7 +352,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: connect-expired-password option.\" connect-expired-password option: mysql\fB\-\-connect\-expired\-password\fR
+.\" mysql: connect-expired-password option
+.\" connect-expired-password option: mysql
+\fB\-\-connect\-expired\-password\fR
 .sp
 Indicate to the server that the client is can handle sandbox mode if the account used to connect has an expired password\&. This can be useful for noninteractive invocations of
 \fBmysql\fR
@@ -346,7 +370,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: database option.\" database option: mysql\fB\-\-database=\fR\fB\fIdb_name\fR\fR,
+.\" mysql: database option
+.\" database option: mysql
+\fB\-\-database=\fR\fB\fIdb_name\fR\fR,
 \fB\-D \fR\fB\fIdb_name\fR\fR
 .sp
 The database to use\&. This is useful primarily in an option file\&.
@@ -360,7 +386,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: debug option.\" debug option: mysql\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
+.\" mysql: debug option
+.\" debug option: mysql
+\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
 \fB\-# [\fR\fB\fIdebug_options\fR\fR\fB]\fR
 .sp
 Write a debugging log\&. A typical
@@ -378,7 +406,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: debug-check option.\" debug-check option: mysql\fB\-\-debug\-check\fR
+.\" mysql: debug-check option
+.\" debug-check option: mysql
+\fB\-\-debug\-check\fR
 .sp
 Print some debugging information when the program exits\&.
 .RE
@@ -391,7 +421,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: debug-info option.\" debug-info option: mysql\fB\-\-debug\-info\fR,
+.\" mysql: debug-info option
+.\" debug-info option: mysql
+\fB\-\-debug\-info\fR,
 \fB\-T\fR
 .sp
 Print debugging information and memory and CPU usage statistics when the program exits\&.
@@ -405,7 +437,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: default-auth option.\" default-auth option: mysql\fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
+.\" mysql: default-auth option
+.\" default-auth option: mysql
+\fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
 The client\-side authentication plugin to use\&. See
 Section\ \&6.3.7, \(lqPluggable Authentication\(rq\&.
@@ -419,7 +453,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: default-character-set option.\" default-character-set option: mysql\fB\-\-default\-character\-set=\fR\fB\fIcharset_name\fR\fR
+.\" mysql: default-character-set option
+.\" default-character-set option: mysql
+\fB\-\-default\-character\-set=\fR\fB\fIcharset_name\fR\fR
 .sp
 Use
 \fIcharset_name\fR
@@ -445,7 +481,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: delimiter option.\" delimiter option: mysql\fB\-\-delimiter=\fR\fB\fIstr\fR\fR
+.\" mysql: delimiter option
+.\" delimiter option: mysql
+\fB\-\-delimiter=\fR\fB\fIstr\fR\fR
 .sp
 Set the statement delimiter\&. The default is the semicolon character (\(lq;\(rq)\&.
 .RE
@@ -458,7 +496,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: disable named commands.\" disable named command: mysql\fB\-\-disable\-named\-commands\fR
+.\" mysql: disable named commands
+.\" disable named command: mysql
+\fB\-\-disable\-named\-commands\fR
 .sp
 Disable named commands\&. Use the
 \e*
@@ -478,7 +518,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: enable-cleartext-plugin option.\" enable-cleartext-plugin option: mysql\fB\-\-enable\-cleartext\-plugin\fR
+.\" mysql: enable-cleartext-plugin option
+.\" enable-cleartext-plugin option: mysql
+\fB\-\-enable\-cleartext\-plugin\fR
 .sp
 Enable the
 mysql_clear_password
@@ -494,7 +536,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: execute option.\" execute option: mysql\fB\-\-execute=\fR\fB\fIstatement\fR\fR,
+.\" mysql: execute option
+.\" execute option: mysql
+\fB\-\-execute=\fR\fB\fIstatement\fR\fR,
 \fB\-e \fR\fB\fIstatement\fR\fR
 .sp
 Execute the statement and quit\&. The default output format is like that produced with
@@ -512,7 +556,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: force option.\" force option: mysql\fB\-\-force\fR,
+.\" mysql: force option
+.\" force option: mysql
+\fB\-\-force\fR,
 \fB\-f\fR
 .sp
 Continue even if an SQL error occurs\&.
@@ -526,7 +572,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: histignore option.\" histignore option: mysql\fB\-\-histignore\fR
+.\" mysql: histignore option
+.\" histignore option: mysql
+\fB\-\-histignore\fR
 .sp
 A colon\-separated list of one or more patterns specifying statements to ignore for logging purposes\&. These patterns are added to the default pattern list ("*IDENTIFIED*:*PASSWORD*")\&. The value specified for this option affects logging of statements written to the history file\&. For more information, see
 the section called \(lqMYSQL LOGGING\(rq\&. This option was added in MySQL 5\&.6\&.8\&.
@@ -540,7 +588,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: host option.\" host option: mysql\fB\-\-host=\fR\fB\fIhost_name\fR\fR,
+.\" mysql: host option
+.\" host option: mysql
+\fB\-\-host=\fR\fB\fIhost_name\fR\fR,
 \fB\-h \fR\fB\fIhost_name\fR\fR
 .sp
 Connect to the MySQL server on the given host\&.
@@ -554,7 +604,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: html option.\" html option: mysql\fB\-\-html\fR,
+.\" mysql: html option
+.\" html option: mysql
+\fB\-\-html\fR,
 \fB\-H\fR
 .sp
 Produce HTML output\&.
@@ -568,7 +620,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: ignore-spaces option.\" ignore-spaces option: mysql\fB\-\-ignore\-spaces\fR,
+.\" mysql: ignore-spaces option
+.\" ignore-spaces option: mysql
+\fB\-\-ignore\-spaces\fR,
 \fB\-i\fR
 .sp
 Ignore spaces after function names\&. The effect of this is described in the discussion for the
@@ -585,7 +639,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: init-command option.\" init-command option: mysql\fB\-\-init\-command=str\fR
+.\" mysql: init-command option
+.\" init-command option: mysql
+\fB\-\-init\-command=str\fR
 .sp
 SQL statement to execute after connecting to the server\&. If auto\-reconnect is enabled, the statement is executed again after reconnection occurs\&.
 .RE
@@ -598,7 +654,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: line-numbers option.\" line-numbers option: mysql\fB\-\-line\-numbers\fR
+.\" mysql: line-numbers option
+.\" line-numbers option: mysql
+\fB\-\-line\-numbers\fR
 .sp
 Write line numbers for errors\&. Disable this with
 \fB\-\-skip\-line\-numbers\fR\&.
@@ -612,7 +670,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: local-infile option.\" local-infile option: mysql\fB\-\-local\-infile[={0|1}]\fR
+.\" mysql: local-infile option
+.\" local-infile option: mysql
+\fB\-\-local\-infile[={0|1}]\fR
 .sp
 Enable or disable
 LOCAL
@@ -636,7 +696,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: named-commands option.\" named-commands option: mysql\fB\-\-named\-commands\fR,
+.\" mysql: named-commands option
+.\" named-commands option: mysql
+\fB\-\-named\-commands\fR,
 \fB\-G\fR
 .sp
 Enable named
@@ -659,7 +721,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: no-auto-rehash option.\" no-auto-rehash option: mysql\fB\-\-no\-auto\-rehash\fR,
+.\" mysql: no-auto-rehash option
+.\" no-auto-rehash option: mysql
+\fB\-\-no\-auto\-rehash\fR,
 \fB\-A\fR
 .sp
 This has the same effect as
@@ -675,7 +739,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: no-beep option.\" no-beep option: mysql\fB\-\-no\-beep\fR,
+.\" mysql: no-beep option
+.\" no-beep option: mysql
+\fB\-\-no\-beep\fR,
 \fB\-b\fR
 .sp
 Do not beep when errors occur\&.
@@ -689,7 +755,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: one-database option.\" one-database option: mysql\fB\-\-one\-database\fR,
+.\" mysql: one-database option
+.\" one-database option: mysql
+\fB\-\-one\-database\fR,
 \fB\-o\fR
 .sp
 Ignore statements except those that occur while the default database is the one named on the command line\&. This option is rudimentary and should be used with care\&. Statement filtering is based only on
@@ -791,7 +859,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: pager option.\" pager option: mysql\fB\-\-pager[=\fR\fB\fIcommand\fR\fR\fB]\fR
+.\" mysql: pager option
+.\" pager option: mysql
+\fB\-\-pager[=\fR\fB\fIcommand\fR\fR\fB]\fR
 .sp
 Use the given command for paging query output\&. If the command is omitted, the default pager is the value of your
 PAGER
@@ -811,7 +881,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: password option.\" password option: mysql\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
+.\" mysql: password option
+.\" password option: mysql
+\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
 \fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
 .sp
 The password to use when connecting to the server\&. If you use the short option form (\fB\-p\fR), you
@@ -838,7 +910,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: pipe option.\" pipe option: mysql\fB\-\-pipe\fR,
+.\" mysql: pipe option
+.\" pipe option: mysql
+\fB\-\-pipe\fR,
 \fB\-W\fR
 .sp
 On Windows, connect to the server using a named pipe\&. This option applies only if the server supports named\-pipe connections\&.
@@ -852,7 +926,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: plugin-dir option.\" plugin-dir option: mysql\fB\-\-plugin\-dir=\fR\fB\fIpath\fR\fR
+.\" mysql: plugin-dir option
+.\" plugin-dir option: mysql
+\fB\-\-plugin\-dir=\fR\fB\fIpath\fR\fR
 .sp
 The directory in which to look for plugins\&. It may be necessary to specify this option if the
 \fB\-\-default\-auth\fR
@@ -870,7 +946,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: port option.\" port option: mysql.\" TCP/IP\fB\-\-port=\fR\fB\fIport_num\fR\fR,
+.\" mysql: port option
+.\" port option: mysql
+.\" TCP/IP
+\fB\-\-port=\fR\fB\fIport_num\fR\fR,
 \fB\-P \fR\fB\fIport_num\fR\fR
 .sp
 The TCP/IP port number to use for the connection\&.
@@ -884,7 +963,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: prompt option.\" prompt option: mysql\fB\-\-prompt=\fR\fB\fIformat_str\fR\fR
+.\" mysql: prompt option
+.\" prompt option: mysql
+\fB\-\-prompt=\fR\fB\fIformat_str\fR\fR
 .sp
 Set the prompt to the specified format\&. The default is
 mysql>\&. The special sequences that the prompt can contain are described in
@@ -899,7 +980,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: protocol option.\" protocol option: mysql\fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
+.\" mysql: protocol option
+.\" protocol option: mysql
+\fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
 .sp
 The connection protocol to use for connecting to the server\&. It is useful when the other connection parameters normally would cause a protocol to be used other than the one you want\&. For details on the permissible values, see
 Section\ \&4.2.2, \(lqConnecting to the MySQL Server\(rq\&.
@@ -913,7 +996,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: quick option.\" quick option: mysql\fB\-\-quick\fR,
+.\" mysql: quick option
+.\" quick option: mysql
+\fB\-\-quick\fR,
 \fB\-q\fR
 .sp
 Do not cache each query result, print each row as it is received\&. This may slow down the server if the output is suspended\&. With this option,
@@ -929,7 +1014,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: raw option.\" raw option: mysql\fB\-\-raw\fR,
+.\" mysql: raw option
+.\" raw option: mysql
+\fB\-\-raw\fR,
 \fB\-r\fR
 .sp
 For tabular output, the
@@ -982,7 +1069,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: reconnect option.\" reconnect option: mysql\fB\-\-reconnect\fR
+.\" mysql: reconnect option
+.\" reconnect option: mysql
+\fB\-\-reconnect\fR
 .sp
 If the connection to the server is lost, automatically try to reconnect\&. A single reconnect attempt is made each time the connection is lost\&. To suppress reconnection behavior, use
 \fB\-\-skip\-reconnect\fR\&.
@@ -996,7 +1085,11 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: safe-updates option.\" safe-updates option: mysql.\" mysql: i-am-a-dummy option.\" i-am-a-dummy option: mysql\fB\-\-safe\-updates\fR,
+.\" mysql: safe-updates option
+.\" safe-updates option: mysql
+.\" mysql: i-am-a-dummy option
+.\" i-am-a-dummy option: mysql
+\fB\-\-safe\-updates\fR,
 \fB\-\-i\-am\-a\-dummy\fR,
 \fB\-U\fR
 .sp
@@ -1018,7 +1111,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: secure-auth option.\" secure-auth option: mysql\fB\-\-secure\-auth\fR
+.\" mysql: secure-auth option
+.\" secure-auth option: mysql
+\fB\-\-secure\-auth\fR
 .sp
 Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. As of MySQL 5\&.6\&.7, this option is enabled by default; use
 \fB\-\-skip\-secure\-auth\fR
@@ -1048,7 +1143,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: server-public-key-path option.\" server-public-key-path option: mysql\fB\-\-server\-public\-key\-path=\fR\fBfile_name\fR
+.\" mysql: server-public-key-path option
+.\" server-public-key-path option: mysql
+\fB\-\-server\-public\-key\-path=\fR\fBfile_name\fR
 .sp
 The path name to a file containing the server RSA public key\&. The file must be in PEM format\&. The public key is used for RSA encryption of the client password for connections to the server made using accounts that authenticate with the
 sha256_password
@@ -1075,7 +1172,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: show-warnings option.\" show-warnings option: mysql\fB\-\-show\-warnings\fR
+.\" mysql: show-warnings option
+.\" show-warnings option: mysql
+\fB\-\-show\-warnings\fR
 .sp
 Cause warnings to be shown after each statement if there are any\&. This option applies to interactive and batch mode\&.
 .RE
@@ -1088,7 +1187,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: sigint-ignore option.\" sigint-ignore option: mysql\fB\-\-sigint\-ignore\fR
+.\" mysql: sigint-ignore option
+.\" sigint-ignore option: mysql
+\fB\-\-sigint\-ignore\fR
 .sp
 Ignore
 SIGINT
@@ -1104,7 +1205,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: silent option.\" silent option: mysql\fB\-\-silent\fR,
+.\" mysql: silent option
+.\" silent option: mysql
+\fB\-\-silent\fR,
 \fB\-s\fR
 .sp
 Silent mode\&. Produce less output\&. This option can be given multiple times to produce less and less output\&.
@@ -1122,7 +1225,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: skip-column-names option.\" skip-column-names option: mysql\fB\-\-skip\-column\-names\fR,
+.\" mysql: skip-column-names option
+.\" skip-column-names option: mysql
+\fB\-\-skip\-column\-names\fR,
 \fB\-N\fR
 .sp
 Do not write column names in results\&.
@@ -1136,7 +1241,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: skip-line-numbers option.\" skip-line-numbers option: mysql\fB\-\-skip\-line\-numbers\fR,
+.\" mysql: skip-line-numbers option
+.\" skip-line-numbers option: mysql
+\fB\-\-skip\-line\-numbers\fR,
 \fB\-L\fR
 .sp
 Do not write line numbers for errors\&. Useful when you want to compare result files that include error messages\&.
@@ -1150,7 +1257,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: socket option.\" socket option: mysql\fB\-\-socket=\fR\fB\fIpath\fR\fR,
+.\" mysql: socket option
+.\" socket option: mysql
+\fB\-\-socket=\fR\fB\fIpath\fR\fR,
 \fB\-S \fR\fB\fIpath\fR\fR
 .sp
 For connections to
@@ -1165,7 +1274,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: SSL options.\" SSL options: mysql\fB\-\-ssl*\fR
+.\" mysql: SSL options
+.\" SSL options: mysql
+\fB\-\-ssl*\fR
 .sp
 Options that begin with
 \fB\-\-ssl\fR
@@ -1181,7 +1292,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: table option.\" table option: mysql\fB\-\-table\fR,
+.\" mysql: table option
+.\" table option: mysql
+\fB\-\-table\fR,
 \fB\-t\fR
 .sp
 Display output in table format\&. This is the default for interactive use, but can be used to produce table output in batch mode\&.
@@ -1195,7 +1308,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: tee option.\" tee option: mysql\fB\-\-tee=\fR\fB\fIfile_name\fR\fR
+.\" mysql: tee option
+.\" tee option: mysql
+\fB\-\-tee=\fR\fB\fIfile_name\fR\fR
 .sp
 Append a copy of output to the given file\&. This option works only in interactive mode\&.
 the section called \(lqMYSQL COMMANDS\(rq, discusses tee files further\&.
@@ -1209,7 +1324,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: unbuffered option.\" unbuffered option: mysql\fB\-\-unbuffered\fR,
+.\" mysql: unbuffered option
+.\" unbuffered option: mysql
+\fB\-\-unbuffered\fR,
 \fB\-n\fR
 .sp
 Flush the buffer after each query\&.
@@ -1223,7 +1340,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: user option.\" user option: mysql\fB\-\-user=\fR\fB\fIuser_name\fR\fR,
+.\" mysql: user option
+.\" user option: mysql
+\fB\-\-user=\fR\fB\fIuser_name\fR\fR,
 \fB\-u \fR\fB\fIuser_name\fR\fR
 .sp
 The MySQL user name to use when connecting to the server\&.
@@ -1237,7 +1356,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: verbose option.\" verbose option: mysql\fB\-\-verbose\fR,
+.\" mysql: verbose option
+.\" verbose option: mysql
+\fB\-\-verbose\fR,
 \fB\-v\fR
 .sp
 Verbose mode\&. Produce more output about what the program does\&. This option can be given multiple times to produce more and more output\&. (For example,
@@ -1253,7 +1374,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: version option.\" version option: mysql\fB\-\-version\fR,
+.\" mysql: version option
+.\" version option: mysql
+\fB\-\-version\fR,
 \fB\-V\fR
 .sp
 Display version information and exit\&.
@@ -1267,7 +1390,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: vertical option.\" vertical option: mysql\fB\-\-vertical\fR,
+.\" mysql: vertical option
+.\" vertical option: mysql
+\fB\-\-vertical\fR,
 \fB\-E\fR
 .sp
 Print query output rows vertically (one line per column value)\&. Without this option, you can specify vertical output for individual statements by terminating them with
@@ -1282,7 +1407,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: wait option.\" wait option: mysql\fB\-\-wait\fR,
+.\" mysql: wait option
+.\" wait option: mysql
+\fB\-\-wait\fR,
 \fB\-w\fR
 .sp
 If the connection cannot be established, wait and retry instead of aborting\&.
@@ -1296,7 +1423,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: xml option.\" xml option: mysql\fB\-\-xml\fR,
+.\" mysql: xml option
+.\" xml option: mysql
+\fB\-\-xml\fR,
 \fB\-X\fR
 .sp
 Produce XML output\&.
@@ -1365,7 +1494,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" timeout: connect_timeout variable.\" connect_timeout variableconnect_timeout
+.\" timeout: connect_timeout variable
+.\" connect_timeout variable
+connect_timeout
 .sp
 The number of seconds before connection timeout\&. (Default value is
 0\&.)
@@ -1379,7 +1510,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" max_allowed_packet variablemax_allowed_packet
+.\" max_allowed_packet variable
+max_allowed_packet
 .sp
 The maximum size of the buffer for client/server communication\&. The default is 16MB, the maximum is 1GB\&.
 .RE
@@ -1392,7 +1524,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" max_join_size variablemax_join_size
+.\" max_join_size variable
+max_join_size
 .sp
 The automatic limit for rows in a join when using
 \fB\-\-safe\-updates\fR\&. (Default value is 1,000,000\&.)
@@ -1406,7 +1539,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" net_buffer_length variablenet_buffer_length
+.\" net_buffer_length variable
+net_buffer_length
 .sp
 The buffer size for TCP/IP and socket communication\&. (Default value is 16KB\&.)
 .RE
@@ -1419,7 +1553,8 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" select_limit variableselect_limit
+.\" select_limit variable
+select_limit
 .sp
 The automatic limit for
 SELECT
@@ -1509,7 +1644,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: help command.\" help command: mysqlhelp [\fIarg\fR],
+.\" mysql: help command
+.\" help command: mysql
+help [\fIarg\fR],
 \eh [\fIarg\fR],
 \e? [\fIarg\fR],
 ? [\fIarg\fR]
@@ -1534,7 +1671,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: charset command.\" charset command: mysqlcharset \fIcharset_name\fR,
+.\" mysql: charset command
+.\" charset command: mysql
+charset \fIcharset_name\fR,
 \eC \fIcharset_name\fR
 .sp
 Change the default character set and issue a
@@ -1552,7 +1691,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: clear command.\" clear command: mysqlclear,
+.\" mysql: clear command
+.\" clear command: mysql
+clear,
 \ec
 .sp
 Clear the current input\&. Use this if you change your mind about executing the statement that you are entering\&.
@@ -1566,7 +1707,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: connect command.\" connect command: mysqlconnect [\fIdb_name\fR \fIhost_name\fR]],
+.\" mysql: connect command
+.\" connect command: mysql
+connect [\fIdb_name\fR \fIhost_name\fR]],
 \er [\fIdb_name\fR \fIhost_name\fR]]
 .sp
 Reconnect to the server\&. The optional database name and host name arguments may be given to specify the default database or the host where the server is running\&. If omitted, the current values are used\&.
@@ -1580,7 +1723,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: delimiter command.\" delimiter command: mysqldelimiter \fIstr\fR,
+.\" mysql: delimiter command
+.\" delimiter command: mysql
+delimiter \fIstr\fR,
 \ed \fIstr\fR
 .sp
 Change the string that
@@ -1620,7 +1765,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: edit command.\" edit command: mysqledit,
+.\" mysql: edit command
+.\" edit command: mysql
+edit,
 \ee
 .sp
 Edit the current input statement\&.
@@ -1646,7 +1793,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: ego command.\" ego command: mysqlego,
+.\" mysql: ego command
+.\" ego command: mysql
+ego,
 \eG
 .sp
 Send the current statement to the server to be executed and display the result using vertical format\&.
@@ -1660,7 +1809,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: exit command.\" exit command: mysqlexit,
+.\" mysql: exit command
+.\" exit command: mysql
+exit,
 \eq
 .sp
 Exit
@@ -1675,7 +1826,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: go command.\" go command: mysqlgo,
+.\" mysql: go command
+.\" go command: mysql
+go,
 \eg
 .sp
 Send the current statement to the server to be executed\&.
@@ -1689,7 +1842,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: nopager command.\" nopager command: mysqlnopager,
+.\" mysql: nopager command
+.\" nopager command: mysql
+nopager,
 \en
 .sp
 Disable output paging\&. See the description for
@@ -1708,7 +1863,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: notee command.\" notee command: mysqlnotee,
+.\" mysql: notee command
+.\" notee command: mysql
+notee,
 \et
 .sp
 Disable output copying to the tee file\&. See the description for
@@ -1723,7 +1880,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: nowarning command.\" nowarning command: mysqlnowarning,
+.\" mysql: nowarning command
+.\" nowarning command: mysql
+nowarning,
 \ew
 .sp
 Enable display of warnings after each statement\&.
@@ -1737,7 +1896,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: pager command.\" pager command: mysqlpager [\fIcommand\fR],
+.\" mysql: pager command
+.\" pager command: mysql
+pager [\fIcommand\fR],
 \eP [\fIcommand\fR]
 .sp
 Enable output paging\&. By using the
@@ -1775,7 +1936,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: print command.\" print command: mysqlprint,
+.\" mysql: print command
+.\" print command: mysql
+print,
 \ep
 .sp
 Print the current input statement without executing it\&.
@@ -1789,7 +1952,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: prompt command.\" prompt command: mysqlprompt [\fIstr\fR],
+.\" mysql: prompt command
+.\" prompt command: mysql
+prompt [\fIstr\fR],
 \eR [\fIstr\fR]
 .sp
 Reconfigure the
@@ -1812,7 +1977,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: quit command.\" quit command: mysqlquit,
+.\" mysql: quit command
+.\" quit command: mysql
+quit,
 \eq
 .sp
 Exit
@@ -1827,7 +1994,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: rehash command.\" rehash command: mysqlrehash,
+.\" mysql: rehash command
+.\" rehash command: mysql
+rehash,
 \e#
 .sp
 Rebuild the completion hash that enables database, table, and column name completion while you are entering statements\&. (See the description for the
@@ -1843,7 +2012,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: source command.\" source command: mysqlsource \fIfile_name\fR,
+.\" mysql: source command
+.\" source command: mysql
+source \fIfile_name\fR,
 \e\&. \fIfile_name\fR
 .sp
 Read the named file and executes the statements contained therein\&. On Windows, you can specify path name separators as
@@ -1860,7 +2031,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: status command.\" status command: mysqlstatus,
+.\" mysql: status command
+.\" status command: mysql
+status,
 \es
 .sp
 Provide status information about the connection and the server you are using\&. If you are running in
@@ -1880,7 +2053,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: system command.\" system command: mysqlsystem \fIcommand\fR,
+.\" mysql: system command
+.\" system command: mysql
+system \fIcommand\fR,
 \e! \fIcommand\fR
 .sp
 Execute the given command using your default command interpreter\&.
@@ -1898,7 +2073,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: tee command.\" tee command: mysqltee [\fIfile_name\fR],
+.\" mysql: tee command
+.\" tee command: mysql
+tee [\fIfile_name\fR],
 \eT [\fIfile_name\fR]
 .sp
 By using the
@@ -1927,7 +2104,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: use command.\" use command: mysqluse \fIdb_name\fR,
+.\" mysql: use command
+.\" use command: mysql
+use \fIdb_name\fR,
 \eu \fIdb_name\fR
 .sp
 Use
@@ -1943,7 +2122,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: warnings command.\" warnings command: mysqlwarnings,
+.\" mysql: warnings command
+.\" warnings command: mysql
+warnings,
 \eW
 .sp
 Enable display of warnings after each statement (if there are any)\&.
@@ -3249,7 +3430,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 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.server.1'
--- man/mysql.server.1	2013-12-16 08:45:31 +0000
+++ man/mysql.server.1	2014-02-17 11:30:39 +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: 11/15/2013
+.\"      Date: 01/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -81,7 +81,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql.server: basedir option.\" basedir option: mysql.server\fB\-\-basedir=\fR\fB\fIpath\fR\fR
+.\" mysql.server: basedir option
+.\" basedir option: mysql.server
+\fB\-\-basedir=\fR\fB\fIpath\fR\fR
 .sp
 The path to the MySQL installation directory\&.
 .RE
@@ -94,7 +96,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql.server: datadir option.\" datadir option: mysql.server\fB\-\-datadir=\fR\fB\fIpath\fR\fR
+.\" mysql.server: datadir option
+.\" datadir option: mysql.server
+\fB\-\-datadir=\fR\fB\fIpath\fR\fR
 .sp
 The path to the MySQL data directory\&.
 .RE
@@ -107,7 +111,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql.server: pid-file option.\" pid-file option: mysql.server\fB\-\-pid\-file=\fR\fB\fIfile_name\fR\fR
+.\" mysql.server: pid-file option
+.\" pid-file option: mysql.server
+\fB\-\-pid\-file=\fR\fB\fIfile_name\fR\fR
 .sp
 The path name of the file in which the server should write its process ID\&.
 .RE
@@ -120,7 +126,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql.server: service-startup-timeout option.\" service-startup-timeout option: mysql.server\fB\-\-service\-startup\-timeout=\fR\fB\fIfile_name\fR\fR
+.\" mysql.server: service-startup-timeout option
+.\" service-startup-timeout option: mysql.server
+\fB\-\-service\-startup\-timeout=\fR\fB\fIfile_name\fR\fR
 .sp
 How long in seconds to wait for confirmation of server startup\&. If the server does not start within this time,
 \fBmysql\&.server\fR
@@ -135,7 +143,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql.server: use-mysqld_safe option.\" use-mysqld_safe option: mysql.server\fB\-\-use\-mysqld_safe\fR
+.\" mysql.server: use-mysqld_safe option
+.\" use-mysqld_safe option: mysql.server
+\fB\-\-use\-mysqld_safe\fR
 .sp
 Use
 \fBmysqld_safe\fR
@@ -150,7 +160,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}