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

[Laurynas Biveinis]

Merge MySQL 5.6.15, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.6.15,
and taking the upstream fixes for bug 1203050 and bug 1186748.

At the same time fix bug 1258154 /
http://bugs.mysql.com/bug.php?id=71092 (InnoDB FTS introduced new
mutex sync level in 5.6.15, broke UNIV_SYNC_DEBUG) by handling
newly-introduced SYNC_FTS_TOKENIZE sync level support to
sync_thread_add_level().

Also, make the statement timeout feature compatible with the upstream
change [1] that adjusted MDL_context::acquire_lock() to return
ER_QUERY_INTERRUPTED error to the client for any killed THDs,
resulting that error being returned intset of ER_QUERY_TIMEOUT for the
statements that exceed the statement timeout while waiting for the MDL
lock. Fix by introducing new method MDL_context_owner::is_timedout(),
providing its implementation THD::is_timedout() that returns true on
the statement timeout, and using this in MDL_context::acquire_lock()
not to return ER_QUERY_INTERRUPTED to the client.

Revert our fixes for:
- bug 1180481;
- bug 1050758 / http://bugs.mysql.com/bug.php?id=69653;

InnoDB priority mutex and rwlocks were adjusted for the new function
sync_array_get_and_reserve_cell().

Adjusted percona_utility_user testcase to ignore "did not write failed
GRANT to binlog" warning.

Adjusted change_user_notembedded testcase to account for spurious
"ERROR 42000: Unknown database 'mysql_native_password'" error that was
fixed in [2] but was previously recorded in the testcase.

As in the 5.5.35 merge, the upstream fix for bug 1223196 was
reverted. The upstream fixes for bug 1223196, bug 1049871, bug
1083377 will be verified and our fixes will be reverted separately.

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

[1]

5.6$ bzr log -r 5577
------------------------------------------------------------
revno: 5577
committer: Joao Gramacho <email address hidden>
branch nick: mysql-5.6
timestamp: Thu 2013-10-31 21:42:33 +0000
message:
  Bug#16861624 KILLING WAITING SLAVE SQL THREAD:
               M_STATUS == DA_ERROR || M_STATUS == DA_OK

  Problem:
  =======

  An assert will fail when the replication sql thread on a slave server
  is killed while waiting for commit lock will.

  Analysis:
  ========

  In the case of a failed commit attempt at
  Xid_log_event::do_apply_event(), an error message will be reported
  informing the reason why the commit could not be completed.

  The error message to be reported is collected using message() at
  sql_error.h that contains an assert expecting that current m_status
  must be DA_ERROR or DA_OK before returning the message.

  The problem happens when the SQL thread is waiting for the commit lock
  at MDL_context::acquire_lock and is killed.

  In this case, the resulting wait_status will be MDL_wait::KILLED, and
  will result in acquire_lock() returning an error but without throwing
  one (both other cases, MDL_wait::VICTIM and MDL_wait::TIMEOUT, throw
  errors using my_error()).

  So, in the case of a thread being deliberate killed while waiting for
  a lock would lead to a case where no error was flagged, but also no
  success was flagged, making the assert expecting DA_ERROR or DA_OK to
  fail.

  Fix:
  ===

  The code in MDL_context::acquire_lock in mysql-5.7 already throws an
  error for MDL_wait::KILLED. This patch just back-ported this behavior.

  Added also some debug sync points to easy putting sql thread in
  "Waiting for commit lock" state.

[2]

5.6$ bzr log -r 5460
------------------------------------------------------------
revno: 5460
committer: Igor Solodovnikov <email address hidden>
branch nick: mysql-5.6
timestamp: Thu 2013-09-19 02:27:49 +0300
message:
  Bug #17351732 MYSQL_CHANGE_USER() API RETURNS ERROR
                  UNKNOWN DATABASE 'MYSQL_NATIVE_PASSWORD'

  Malformed packed was created in send_client_reply_packet()
  due to wrong handling of CLIENT_CONNECT_WITH_DB flag.
  Fixed problem in mysql_change_user()'s handling of mysql
  handle which could lead to free()ing static string literal.

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

[Stewart Smith (stewart)]

review: Approve

[Stewart Smith (stewart)]

review: Approve

[Stewart Smith (stewart)]

Clicked approve in the wrong window, still looking for a bit longer...

=== modified file 'Makefile'
--- Makefile	2013-11-19 11:53:55 +0000
+++ Makefile	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-MYSQL_VERSION=5.6.14
+MYSQL_VERSION=5.6.15
 PERCONA_SERVER_VERSION=rel62.0
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
 
=== modified file 'Percona-Server/CMakeLists.txt'
--- Percona-Server/CMakeLists.txt	2013-10-23 08:48:28 +0000
+++ Percona-Server/CMakeLists.txt	2013-12-05 18:50:37 +0000
@@ -217,6 +217,82 @@
 OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
 MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED)
 
+
+include(CheckCSourceCompiles)
+include(CheckCXXSourceCompiles)
+# We need some extra FAIL_REGEX patterns
+# Note that CHECK_C_SOURCE_COMPILES is a misnomer, it will also link.
+MACRO (MY_CHECK_C_COMPILER_FLAG FLAG RESULT)
+  SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}")
+  CHECK_C_SOURCE_COMPILES("int main(void) { return 0; }" ${RESULT}
+    FAIL_REGEX "argument unused during compilation"
+    FAIL_REGEX "unsupported .*option"
+    FAIL_REGEX "unknown .*option"
+    FAIL_REGEX "unrecognized .*option"
+    FAIL_REGEX "ignoring unknown option"
+    FAIL_REGEX "[Ww]arning: [Oo]ption"
+    )
+  SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
+ENDMACRO()
+
+MACRO (MY_CHECK_CXX_COMPILER_FLAG FLAG RESULT)
+  SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}")
+  CHECK_CXX_SOURCE_COMPILES("int main(void) { return 0; }" ${RESULT}
+    FAIL_REGEX "argument unused during compilation"
+    FAIL_REGEX "unsupported .*option"
+    FAIL_REGEX "unknown .*option"
+    FAIL_REGEX "unrecognized .*option"
+    FAIL_REGEX "ignoring unknown option"
+    FAIL_REGEX "[Ww]arning: [Oo]ption"
+    )
+  SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
+ENDMACRO()
+
+OPTION(WITH_ASAN "Enable address sanitizer" OFF)
+IF (WITH_ASAN)
+  # gcc 4.8.1 and new versions of clang
+  MY_CHECK_C_COMPILER_FLAG("-fsanitize=address" HAVE_C_FSANITIZE)
+  MY_CHECK_CXX_COMPILER_FLAG("-fsanitize=address" HAVE_CXX_FSANITIZE)
+
+  IF(HAVE_C_FSANITIZE AND HAVE_CXX_FSANITIZE)
+    # We switch on basic optimization also for debug builds.
+    # With optimization we may get some warnings, so we switch off -Werror
+    SET(CMAKE_C_FLAGS_DEBUG
+      "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -O1 -Wno-error -fPIC")
+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO
+      "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fsanitize=address -fPIC")
+    SET(CMAKE_CXX_FLAGS_DEBUG
+      "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -O1 -Wno-error -fPIC")
+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fsanitize=address -fPIC")
+    SET(WITH_ASAN_OK 1)
+  ELSE()
+    # older versions of clang
+    MY_CHECK_C_COMPILER_FLAG("-faddress-sanitizer" HAVE_C_FADDRESS)
+    MY_CHECK_CXX_COMPILER_FLAG("-faddress-sanitizer" HAVE_CXX_FFADDRESS)
+
+    IF(HAVE_C_FADDRESS AND HAVE_CXX_FFADDRESS)
+      # We switch on basic optimization also for debug builds.
+      SET(CMAKE_C_FLAGS_DEBUG
+        "${CMAKE_C_FLAGS_DEBUG} -faddress-sanitizer -O1 -fPIC")
+      SET(CMAKE_C_FLAGS_RELWITHDEBINFO
+        "${CMAKE_C_FLAGS_RELWITHDEBINFO} -faddress-sanitizer -fPIC")
+      SET(CMAKE_CXX_FLAGS_DEBUG
+        "${CMAKE_CXX_FLAGS_DEBUG} -faddress-sanitizer -O1 -fPIC")
+      SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+        "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -faddress-sanitizer -fPIC")
+      SET(WITH_ASAN_OK 1)
+    ENDIF()
+  ENDIF()
+
+  IF(NOT WITH_ASAN_OK)
+    MESSAGE(FATAL_ERROR "Do not know how to enable address sanitizer")
+  ENDIF()
+ENDIF()
+
+
 OPTION(ENABLE_DEBUG_SYNC "Enable debug sync (debug builds only)" ON) 
 IF(ENABLE_DEBUG_SYNC) 
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") 
@@ -414,6 +490,8 @@
     ADD_SUBDIRECTORY(internal)
   ENDIF()
   ADD_SUBDIRECTORY(packaging/rpm-uln)
+  ADD_SUBDIRECTORY(packaging/rpm-oel)
+  ADD_SUBDIRECTORY(packaging/rpm-fedora)
 ENDIF()
 
 INCLUDE(cmake/abi_check.cmake)
@@ -457,7 +535,6 @@
 # (see http://public.kitware.com/Bug/view.php?id=11452)
 SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
 
-INCLUDE(CPack)
 IF(UNIX)
   INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
 ENDIF()
@@ -489,3 +566,5 @@
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()
+
+INCLUDE(CPack)
 
=== modified file 'Percona-Server/VERSION'
--- Percona-Server/VERSION	2013-10-23 08:48:28 +0000
+++ Percona-Server/VERSION	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=14
+MYSQL_VERSION_PATCH=15
 MYSQL_VERSION_EXTRA=
 
=== modified file 'Percona-Server/client/mysql.cc'
--- Percona-Server/client/mysql.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/client/mysql.cc	2013-12-05 18:50:37 +0000
@@ -238,8 +238,8 @@
   The same is true for stderr.
 */
 static uint win_is_console_cache= 
-  (test(my_win_is_console(stdout)) * (1 << _fileno(stdout))) |
-  (test(my_win_is_console(stderr)) * (1 << _fileno(stderr)));
+  (MY_TEST(my_win_is_console(stdout)) * (1 << _fileno(stdout))) |
+  (MY_TEST(my_win_is_console(stderr)) * (1 << _fileno(stderr)));
 
 static inline my_bool
 my_win_is_console_cached(FILE *file)
 
=== modified file 'Percona-Server/client/mysql_plugin.c'
--- Percona-Server/client/mysql_plugin.c	2013-03-20 05:56:02 +0000
+++ Percona-Server/client/mysql_plugin.c	2013-12-05 18:50:37 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, 2012, 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 'Percona-Server/client/mysqldump.c'
--- Percona-Server/client/mysqldump.c	2013-11-25 07:17:28 +0000
+++ Percona-Server/client/mysqldump.c	2013-12-05 18:50:37 +0000
@@ -2564,7 +2564,7 @@
       Check only the first (for PRIMARY KEY) or the second (for secondary keys)
       quoted identifier.
     */
-    if ((idnum == 1 + test(type != KEY_TYPE_PRIMARY)))
+    if ((idnum == 1 + MY_TEST(type != KEY_TYPE_PRIMARY)))
       break;
 
     keydef= to + 1;
 
=== modified file 'Percona-Server/cmake/build_configurations/compiler_options.cmake'
--- Percona-Server/cmake/build_configurations/compiler_options.cmake	2013-06-11 06:50:33 +0000
+++ Percona-Server/cmake/build_configurations/compiler_options.cmake	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/cmake/build_configurations/feature_set.cmake'
--- Percona-Server/cmake/build_configurations/feature_set.cmake	2013-06-11 06:50:33 +0000
+++ Percona-Server/cmake/build_configurations/feature_set.cmake	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/cmake/os/AIX.cmake'
--- Percona-Server/cmake/os/AIX.cmake	2011-06-30 15:46:53 +0000
+++ Percona-Server/cmake/os/AIX.cmake	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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 'Percona-Server/cmake/os/Linux.cmake'
--- Percona-Server/cmake/os/Linux.cmake	2011-06-30 15:46:53 +0000
+++ Percona-Server/cmake/os/Linux.cmake	2013-12-05 18:50:37 +0000
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2010, 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,7 +33,10 @@
 
 # Ensure we have clean build for shared libraries
 # without unresolved symbols
-SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")
+# Not supported with AddressSanitizer
+IF(NOT WITH_ASAN)
+  SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")
+ENDIF()
 
 # 64 bit file offset support flag
 SET(_FILE_OFFSET_BITS 64)
 
=== modified file 'Percona-Server/configure.cmake'
--- Percona-Server/configure.cmake	2013-10-15 11:37:57 +0000
+++ Percona-Server/configure.cmake	2013-12-05 18:50:37 +0000
@@ -202,6 +202,10 @@
 
   SET(CMAKE_REQUIRED_LIBRARIES 
     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
+  # Need explicit pthread for gcc -fsanitize=address
+  IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
+    SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} pthread)
+  ENDIF()
 
   LIST(LENGTH CMAKE_REQUIRED_LIBRARIES required_libs_length)
   IF(${required_libs_length} GREATER 0)
 
=== modified file 'Percona-Server/extra/yassl/CMakeLists.txt'
--- Percona-Server/extra/yassl/CMakeLists.txt	2013-02-26 05:45:28 +0000
+++ Percona-Server/extra/yassl/CMakeLists.txt	2013-12-05 18:50:37 +0000
@@ -33,4 +33,7 @@
 ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(yassl)
 
-
+INSTALL_DEBUG_SYMBOLS(yassl)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
 
=== modified file 'Percona-Server/extra/yassl/taocrypt/CMakeLists.txt'
--- Percona-Server/extra/yassl/taocrypt/CMakeLists.txt	2012-07-24 13:24:00 +0000
+++ Percona-Server/extra/yassl/taocrypt/CMakeLists.txt	2013-12-05 18:50:37 +0000
@@ -36,3 +36,7 @@
 ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(taocrypt)
 
+INSTALL_DEBUG_SYMBOLS(taocrypt)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
 
=== modified file 'Percona-Server/include/big_endian.h'
--- Percona-Server/include/big_endian.h	2013-06-11 06:50:33 +0000
+++ Percona-Server/include/big_endian.h	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/include/hash.h'
--- Percona-Server/include/hash.h	2011-09-07 10:08:09 +0000
+++ Percona-Server/include/hash.h	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, 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
@@ -45,9 +45,19 @@
 /* flags for hash_init */
 #define HASH_UNIQUE     1       /* hash_insert fails on duplicate key */
 
+struct st_hash;
 typedef uint my_hash_value_type;
 typedef uchar *(*my_hash_get_key)(const uchar *,size_t*,my_bool);
 typedef void (*my_hash_free_key)(void *);
+/**
+  Function type representing a hash function to be used with the HASH
+  container.
+  Should accept pointer to HASH, pointer to key buffer and key length
+  as parameters.
+*/
+typedef my_hash_value_type (*my_hash_function)(const struct st_hash *,
+                                               const uchar *,
+                                               size_t);
 
 typedef struct st_hash {
   size_t key_offset,key_length;		/* Length of key if const length */
@@ -58,16 +68,20 @@
   my_hash_get_key get_key;
   void (*free)(void *);
   CHARSET_INFO *charset;
+  my_hash_function hash_function;
 } HASH;
 
 /* A search iterator state */
 typedef uint HASH_SEARCH_STATE;
 
 #define my_hash_init(A,B,C,D,E,F,G,H) \
-          _my_hash_init(A,0,B,C,D,E,F,G,H)
+          _my_hash_init(A,0,B,NULL,C,D,E,F,G,H)
 #define my_hash_init2(A,B,C,D,E,F,G,H,I) \
-          _my_hash_init(A,B,C,D,E,F,G,H,I)
+          _my_hash_init(A,B,C,NULL,D,E,F,G,H,I)
+#define my_hash_init3(A,B,C,D,E,F,G,H,I,J) \
+          _my_hash_init(A,B,C,D,E,F,G,H,I,J)
 my_bool _my_hash_init(HASH *hash, uint growth_size, CHARSET_INFO *charset,
+                      my_hash_function hash_function,
                       ulong default_array_elements, size_t key_offset,
                       size_t key_length, my_hash_get_key get_key,
                       void (*free_element)(void*),
@@ -100,7 +114,7 @@
 #define my_hash_clear(H) memset((H), 0, sizeof(*(H)))
 #define my_hash_inited(H) ((H)->blength != 0)
 #define my_hash_init_opt(A,B,C,D,E,F,G,H) \
-          (!my_hash_inited(A) && _my_hash_init(A,0,B,C,D,E,F,G,H))
+          (!my_hash_inited(A) && _my_hash_init(A,0,B,NULL,C,D,E,F,G,H))
 
 #ifdef	__cplusplus
 }
 
=== modified file 'Percona-Server/include/little_endian.h'
--- Percona-Server/include/little_endian.h	2013-06-11 06:50:33 +0000
+++ Percona-Server/include/little_endian.h	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/include/my_base.h'
--- Percona-Server/include/my_base.h	2013-08-06 15:16:34 +0000
+++ Percona-Server/include/my_base.h	2013-12-05 18:50:37 +0000
@@ -481,7 +481,8 @@
 #define HA_ERR_ROW_IN_WRONG_PARTITION 186 /* Row in wrong partition */
 #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_LAST               188    /* Copy of last error nr */
+#define HA_ERR_TEMP_FILE_WRITE_FAILURE	189	/* Temporary file write failure */
+#define HA_ERR_LAST               189    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
 
=== added file 'Percona-Server/include/my_check_opt.h'
--- Percona-Server/include/my_check_opt.h	1970-01-01 00:00:00 +0000
+++ Percona-Server/include/my_check_opt.h	2013-12-05 18:50:37 +0000
@@ -0,0 +1,69 @@
+/* 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
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
+
+#ifndef _my_check_opt_h
+#define _my_check_opt_h
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+  All given definitions needed for MyISAM storage engine:
+  myisamchk.c or/and ha_myisam.cc or/and micheck.c
+  Some definitions are needed by the MySQL parser.
+*/
+
+#define T_AUTO_INC		(1UL << 0)
+#define T_AUTO_REPAIR		(1UL << 1)
+#define T_BACKUP_DATA		(1UL << 2)
+#define T_CALC_CHECKSUM		(1UL << 3)
+#define T_CHECK			(1UL << 4)
+#define T_CHECK_ONLY_CHANGED	(1UL << 5)
+#define T_CREATE_MISSING_KEYS	(1UL << 6)
+#define T_DESCRIPT		(1UL << 7)
+#define T_DONT_CHECK_CHECKSUM	(1UL << 8)
+#define T_EXTEND		(1UL << 9)
+#define T_FAST			(1UL << 10)
+#define T_FORCE_CREATE		(1UL << 11)
+#define T_FORCE_UNIQUENESS	(1UL << 12)
+#define T_INFO			(1UL << 13)
+/** CHECK TABLE...MEDIUM (the default) */
+#define T_MEDIUM		(1UL << 14)
+/** CHECK TABLE...QUICK */
+#define T_QUICK			(1UL << 15)
+#define T_READONLY		(1UL << 16)
+#define T_REP			(1UL << 17)
+#define T_REP_BY_SORT		(1UL << 18)
+#define T_REP_PARALLEL		(1UL << 19)
+#define T_RETRY_WITHOUT_QUICK	(1UL << 20)
+#define T_SAFE_REPAIR		(1UL << 21)
+#define T_SILENT		(1UL << 22)
+#define T_SORT_INDEX		(1UL << 23)
+#define T_SORT_RECORDS		(1UL << 24)
+#define T_STATISTICS		(1UL << 25)
+#define T_UNPACK		(1UL << 26)
+#define T_UPDATE_STATE		(1UL << 27)
+#define T_VERBOSE		(1UL << 28)
+#define T_VERY_SILENT		(1UL << 29)
+#define T_WAIT_FOREVER		(1UL << 30)
+#define T_WRITE_LOOP		(1UL << 31)
+
+#define T_REP_ANY		(T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
+
+#ifdef	__cplusplus
+}
+#endif
+#endif
 
=== modified file 'Percona-Server/include/my_compare.h'
--- Percona-Server/include/my_compare.h	2013-03-20 05:56:02 +0000
+++ Percona-Server/include/my_compare.h	2013-12-05 18:50:37 +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 'Percona-Server/include/my_default.h'
--- Percona-Server/include/my_default.h	2013-06-11 06:50:33 +0000
+++ Percona-Server/include/my_default.h	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/include/my_global.h'
--- Percona-Server/include/my_global.h	2013-09-09 15:24:45 +0000
+++ Percona-Server/include/my_global.h	2013-12-05 18:50:37 +0000
@@ -474,7 +474,7 @@
 #endif
 
 #define swap_variables(t, a, b) { t dummy; dummy= a; a= b; b= dummy; }
-#define test(a)		((a) ? 1 : 0)
+#define MY_TEST(a)		((a) ? 1 : 0)
 #define set_if_bigger(a,b)  do { if ((a) < (b)) (a)=(b); } while(0)
 #define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)
 #define test_all_bits(a,b) (((a) & (b)) == (b))
 
=== added file 'Percona-Server/include/my_murmur3.h'
--- Percona-Server/include/my_murmur3.h	1970-01-01 00:00:00 +0000
+++ Percona-Server/include/my_murmur3.h	2013-12-05 18:50:37 +0000
@@ -0,0 +1,27 @@
+#ifndef MY_MURMUR3_INCLUDED
+#define MY_MURMUR3_INCLUDED
+
+/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
+
+#include <my_global.h>
+
+C_MODE_START
+
+uint32 murmur3_32(const uchar * key, size_t len, uint32 seed);
+
+C_MODE_END
+
+#endif /* MY_MURMUR3_INCLUDED */
 
=== modified file 'Percona-Server/include/myisam.h'
--- Percona-Server/include/myisam.h	2012-03-06 14:29:42 +0000
+++ Percona-Server/include/myisam.h	2013-12-05 18:50:37 +0000
@@ -33,7 +33,7 @@
 #endif
 #include "my_compare.h"
 #include <mysql/plugin.h>
-
+#include <my_check_opt.h>
 /*
   Limit max keys according to HA_MAX_POSSIBLE_KEY
 */
@@ -80,8 +80,8 @@
 
 #define mi_is_key_active(_keymap_,_keyno_) \
                             (((_keyno_) < MI_KEYMAP_BITS) ? \
-                             test((_keymap_) & (ULL(1) << (_keyno_))) : \
-                             test((_keymap_) & MI_KEYMAP_HIGH_MASK))
+                             MY_TEST((_keymap_) & (ULL(1) << (_keyno_))) : \
+                             MY_TEST((_keymap_) & MI_KEYMAP_HIGH_MASK))
 #define mi_set_key_active(_keymap_,_keyno_) \
                             (_keymap_)|= (((_keyno_) < MI_KEYMAP_BITS) ? \
                                           (ULL(1) << (_keyno_)) : \
@@ -94,7 +94,7 @@
 #else
 
 #define mi_is_key_active(_keymap_,_keyno_) \
-                            test((_keymap_) & (ULL(1) << (_keyno_)))
+                            MY_TEST((_keymap_) & (ULL(1) << (_keyno_)))
 #define mi_set_key_active(_keymap_,_keyno_) \
                             (_keymap_)|= (ULL(1) << (_keyno_))
 #define mi_clear_key_active(_keymap_,_keyno_) \
@@ -103,7 +103,7 @@
 #endif
 
 #define mi_is_any_key_active(_keymap_) \
-                            test((_keymap_))
+                            MY_TEST((_keymap_))
 #define mi_is_all_keys_active(_keymap_,_keys_) \
                             ((_keymap_) == mi_get_mask_all_keys_active(_keys_))
 #define mi_set_all_keys_active(_keymap_,_keys_) \
@@ -312,51 +312,6 @@
 #define   MYISAMCHK_VERIFY 2  /* Verify, run repair if failure */
 
 /*
-  Definitions needed for myisamchk.c
-
-  Entries marked as "QQ to be removed" are NOT used to
-  pass check/repair options to mi_check.c. They are used
-  internally by myisamchk.c or/and ha_myisam.cc and should NOT
-  be stored together with other flags. They should be removed
-  from the following list to make addition of new flags possible.
-*/
-
-#define T_AUTO_INC              1
-#define T_AUTO_REPAIR           2              /* QQ to be removed */
-#define T_BACKUP_DATA           4
-#define T_CALC_CHECKSUM         8
-#define T_CHECK                 16             /* QQ to be removed */
-#define T_CHECK_ONLY_CHANGED    32             /* QQ to be removed */
-#define T_CREATE_MISSING_KEYS   64
-#define T_DESCRIPT              128
-#define T_DONT_CHECK_CHECKSUM   256
-#define T_EXTEND                512
-#define T_FAST                  (1L << 10)     /* QQ to be removed */
-#define T_FORCE_CREATE          (1L << 11)     /* QQ to be removed */
-#define T_FORCE_UNIQUENESS      (1L << 12)
-#define T_INFO                  (1L << 13)
-#define T_MEDIUM                (1L << 14)
-#define T_QUICK                 (1L << 15)     /* QQ to be removed */
-#define T_READONLY              (1L << 16)     /* QQ to be removed */
-#define T_REP                   (1L << 17)
-#define T_REP_BY_SORT           (1L << 18)     /* QQ to be removed */
-#define T_REP_PARALLEL          (1L << 19)     /* QQ to be removed */
-#define T_RETRY_WITHOUT_QUICK   (1L << 20)
-#define T_SAFE_REPAIR           (1L << 21)
-#define T_SILENT                (1L << 22)
-#define T_SORT_INDEX            (1L << 23)     /* QQ to be removed */
-#define T_SORT_RECORDS          (1L << 24)     /* QQ to be removed */
-#define T_STATISTICS            (1L << 25)
-#define T_UNPACK                (1L << 26)
-#define T_UPDATE_STATE          (1L << 27)
-#define T_VERBOSE               (1L << 28)
-#define T_VERY_SILENT           (1L << 29)
-#define T_WAIT_FOREVER          (1L << 30)
-#define T_WRITE_LOOP            ((ulong) 1L << 31)
-
-#define T_REP_ANY               (T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
-
-/*
   Flags used by myisamchk.c or/and ha_myisam.cc that are NOT passed
   to mi_check.c follows:
 */
 
=== modified file 'Percona-Server/include/mysql/innodb_priv.h'
--- Percona-Server/include/mysql/innodb_priv.h	2013-03-20 05:56:02 +0000
+++ Percona-Server/include/mysql/innodb_priv.h	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 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
 
=== modified file 'Percona-Server/include/mysql/service_thread_scheduler.h'
--- Percona-Server/include/mysql/service_thread_scheduler.h	2011-06-30 15:46:53 +0000
+++ Percona-Server/include/mysql/service_thread_scheduler.h	2013-12-05 18:50:37 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 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 'Percona-Server/libevent/CMakeLists.txt'
--- Percona-Server/libevent/CMakeLists.txt	2012-03-19 01:24:49 +0000
+++ Percona-Server/libevent/CMakeLists.txt	2013-12-05 18:50:37 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/libmysql/CMakeLists.txt'
--- Percona-Server/libmysql/CMakeLists.txt	2013-10-15 11:37:57 +0000
+++ Percona-Server/libmysql/CMakeLists.txt	2013-12-05 18:50:37 +0000
@@ -183,8 +183,10 @@
 MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
 
 # Visual Studio users need debug  static library for debug projects
+INSTALL_DEBUG_SYMBOLS(clientlib)
 IF(MSVC)
  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
+ INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 
 MACRO(GET_TARGET_NAME target out_name)
 
=== modified file 'Percona-Server/libmysql/authentication_win/CMakeLists.txt'
--- Percona-Server/libmysql/authentication_win/CMakeLists.txt	2011-04-29 21:53:46 +0000
+++ Percona-Server/libmysql/authentication_win/CMakeLists.txt	2013-12-05 18:50:37 +0000
@@ -31,3 +31,8 @@
 # In IDE, group headers in a separate folder.
 
 SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
+
+INSTALL_DEBUG_SYMBOLS(auth_win_client)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
 
=== modified file 'Percona-Server/libmysql/authentication_win/common.cc'
--- Percona-Server/libmysql/authentication_win/common.cc	2013-03-20 05:56:02 +0000
+++ Percona-Server/libmysql/authentication_win/common.cc	2013-12-05 18:50:37 +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 'Percona-Server/libmysql/authentication_win/common.h'
--- Percona-Server/libmysql/authentication_win/common.h	2013-03-20 05:56:02 +0000
+++ Percona-Server/libmysql/authentication_win/common.h	2013-12-05 18:50:37 +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 'Percona-Server/libmysql/authentication_win/handshake_client.cc'
--- Percona-Server/libmysql/authentication_win/handshake_client.cc	2013-03-20 05:56:02 +0000
+++ Percona-Server/libmysql/authentication_win/handshake_client.cc	2013-12-05 18:50:37 +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 'Percona-Server/libmysql/authentication_win/log_client.cc'
--- Percona-Server/libmysql/authentication_win/log_client.cc	2013-03-20 05:56:02 +0000
+++ Percona-Server/libmysql/authentication_win/log_client.cc	2013-12-05 18:50:37 +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 'Percona-Server/libmysql/authentication_win/plugin_client.cc'
--- Percona-Server/libmysql/authentication_win/plugin_client.cc	2013-03-20 05:56:02 +0000
+++ Percona-Server/libmysql/authentication_win/plugin_client.cc	2013-12-05 18:50:37 +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 'Percona-Server/libmysql/libmysql.c'
--- Percona-Server/libmysql/libmysql.c	2013-06-25 13:13:06 +0000
+++ Percona-Server/libmysql/libmysql.c	2013-12-05 18:50:37 +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
@@ -357,10 +357,13 @@
     DBUG_RETURN(TRUE);
   }
 
-  /* Use an empty string instead of NULL. */
-
-  mysql->user= (char*)(user ? user : "");
-  mysql->passwd= (char*)(passwd ? passwd : "");
+  /*
+    Use an empty string instead of NULL.
+    Alloc user and password on heap because mysql_reconnect()
+    calls mysql_close() on success.
+  */
+  mysql->user= my_strdup(user ? user : "", MYF(MY_WME));
+  mysql->passwd= my_strdup(passwd ? passwd : "", MYF(MY_WME));
   mysql->db= 0;
 
   rc= run_plugin_auth(mysql, 0, 0, 0, db);
@@ -378,12 +381,16 @@
     my_free(saved_db);
 
     /* alloc new connect information */
-    mysql->user= my_strdup(mysql->user, MYF(MY_WME));
-    mysql->passwd= my_strdup(mysql->passwd, MYF(MY_WME));
     mysql->db= db ? my_strdup(db, MYF(MY_WME)) : 0;
   }
   else
   {
+    /* Free temporary connect information */
+    my_free(mysql->user);
+    my_free(mysql->passwd);
+    my_free(mysql->db);
+
+    /* Restore saved state */
     mysql->charset= saved_cs;
     mysql->user= saved_user;
     mysql->passwd= saved_passwd;
@@ -2071,9 +2078,9 @@
   buff[4]= (char) stmt->flags;
   int4store(buff+5, 1);                         /* iteration count */
 
-  res= test(cli_advanced_command(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),
-                                 (uchar*) packet, length, 1, stmt) ||
-            (*mysql->methods->read_query_result)(mysql));
+  res= MY_TEST(cli_advanced_command(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),
+                                    (uchar*) packet, length, 1, stmt) ||
+               (*mysql->methods->read_query_result)(mysql));
   stmt->affected_rows= mysql->affected_rows;
   stmt->server_status= mysql->server_status;
   stmt->insert_id= mysql->insert_id;
@@ -2559,7 +2566,7 @@
     reinit_result_set_metadata(stmt);
     prepare_to_fetch_result(stmt);
   }
-  DBUG_RETURN(test(stmt->last_errno));
+  DBUG_RETURN(MY_TEST(stmt->last_errno));
 }
 
 
@@ -3179,7 +3186,7 @@
     int err;
     double data= my_strntod(&my_charset_latin1, value, length, &endptr, &err);
     float fdata= (float) data;
-    *param->error= (fdata != data) | test(err);
+    *param->error= (fdata != data) | MY_TEST(err);
     floatstore(buffer, fdata);
     break;
   }
@@ -3187,7 +3194,7 @@
   {
     int err;
     double data= my_strntod(&my_charset_latin1, value, length, &endptr, &err);
-    *param->error= test(err);
+    *param->error= MY_TEST(err);
     doublestore(buffer, data);
     break;
   }
@@ -3196,7 +3203,7 @@
     MYSQL_TIME_STATUS status;
     MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
     str_to_time(value, length, tm, &status);
-    *param->error= test(status.warnings);
+    *param->error= MY_TEST(status.warnings);
     break;
   }
   case MYSQL_TYPE_DATE:
@@ -3206,7 +3213,7 @@
     MYSQL_TIME_STATUS status;
     MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
     (void) str_to_datetime(value, length, tm, TIME_FUZZY_DATE, &status);
-    *param->error= test(status.warnings) &&
+    *param->error= MY_TEST(status.warnings) &&
                    (param->buffer_type == MYSQL_TYPE_DATE &&
                     tm->time_type != MYSQL_TIMESTAMP_DATE);
     break;
@@ -3331,7 +3338,7 @@
     int error;
     value= number_to_datetime(value, (MYSQL_TIME *) buffer, TIME_FUZZY_DATE,
                               &error);
-    *param->error= test(error);
+    *param->error= MY_TEST(error);
     break;
   }
   default:
@@ -3679,7 +3686,7 @@
 static void fetch_result_tinyint(MYSQL_BIND *param, MYSQL_FIELD *field,
                                  uchar **row)
 {
-  my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
   uchar data= **row;
   *(uchar *)param->buffer= data;
   *param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX8;
@@ -3689,7 +3696,7 @@
 static void fetch_result_short(MYSQL_BIND *param, MYSQL_FIELD *field,
                                uchar **row)
 {
-  my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
   ushort data= (ushort) sint2korr(*row);
   shortstore(param->buffer, data);
   *param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX16;
@@ -3700,7 +3707,7 @@
                                MYSQL_FIELD *field __attribute__((unused)),
                                uchar **row)
 {
-  my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
   uint32 data= (uint32) sint4korr(*row);
   longstore(param->buffer, data);
   *param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX32;
@@ -3711,7 +3718,7 @@
                                MYSQL_FIELD *field __attribute__((unused)),
                                uchar **row)
 {
-  my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
   ulonglong data= (ulonglong) sint8korr(*row);
   *param->error= param->is_unsigned != field_is_unsigned && data > LONGLONG_MAX;
   longlongstore(param->buffer, data);
@@ -4705,7 +4712,7 @@
   my_free(stmt->extension);
   my_free(stmt);
 
-  DBUG_RETURN(test(rc));
+  DBUG_RETURN(MY_TEST(rc));
 }
 
 /*
 
=== modified file 'Percona-Server/libmysqld/lib_sql.cc'
--- Percona-Server/libmysqld/lib_sql.cc	2013-10-15 11:37:57 +0000
+++ Percona-Server/libmysqld/lib_sql.cc	2013-12-05 18:50:37 +0000
@@ -337,9 +337,9 @@
   thd->client_param_count= stmt->param_count;
   thd->client_params= stmt->params;
 
-  res= test(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0,
-                                 header, sizeof(header), 1, stmt) ||
-            emb_read_query_result(stmt->mysql));
+  res= MY_TEST(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0,
+                                    header, sizeof(header), 1, stmt) ||
+               emb_read_query_result(stmt->mysql));
   stmt->affected_rows= stmt->mysql->affected_rows;
   stmt->insert_id= stmt->mysql->insert_id;
   stmt->server_status= stmt->mysql->server_status;
 
=== modified file 'Percona-Server/libservices/my_thread_scheduler_service.c'
--- Percona-Server/libservices/my_thread_scheduler_service.c	2011-06-30 15:46:53 +0000
+++ Percona-Server/libservices/my_thread_scheduler_service.c	2013-12-05 18:50:37 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 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 'Percona-Server/libservices/thd_wait_service.c'
--- Percona-Server/libservices/thd_wait_service.c	2011-06-30 15:46:53 +0000
+++ Percona-Server/libservices/thd_wait_service.c	2013-12-05 18:50:37 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 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 'Percona-Server/man/comp_err.1'
--- Percona-Server/man/comp_err.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/comp_err.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBcomp_err\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -83,9 +83,7 @@
 .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\&.
@@ -99,9 +97,7 @@
 .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
@@ -116,9 +112,7 @@
 .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
@@ -136,9 +130,7 @@
 .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\&.
@@ -152,9 +144,7 @@
 .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
@@ -169,9 +159,7 @@
 .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
@@ -186,9 +174,7 @@
 .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
@@ -203,9 +189,7 @@
 .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
@@ -220,9 +204,7 @@
 .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
@@ -237,9 +219,7 @@
 .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
@@ -254,9 +234,7 @@
 .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\&.
 
=== modified file 'Percona-Server/man/innochecksum.1'
--- Percona-Server/man/innochecksum.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/innochecksum.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBinnochecksum\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'Percona-Server/man/msql2mysql.1'
--- Percona-Server/man/msql2mysql.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/msql2mysql.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmsql2mysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'Percona-Server/man/my_print_defaults.1'
--- Percona-Server/man/my_print_defaults.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/my_print_defaults.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmy_print_defaults\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -72,9 +72,7 @@
 .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\&.
@@ -88,12 +86,8 @@
 .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\&.
@@ -107,9 +101,7 @@
 .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
@@ -127,12 +119,8 @@
 .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\&.
@@ -146,9 +134,7 @@
 .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\&.
@@ -162,8 +148,7 @@
 .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
@@ -180,9 +165,7 @@
 .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\&.
@@ -196,9 +179,7 @@
 .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\&.
@@ -212,9 +193,7 @@
 .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\&.
 
=== modified file 'Percona-Server/man/myisam_ftdump.1'
--- Percona-Server/man/myisam_ftdump.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/myisam_ftdump.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisam_ftdump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -160,11 +160,8 @@
 .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
@@ -177,9 +174,7 @@
 .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)\&.
@@ -193,9 +188,7 @@
 .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\&.
@@ -209,9 +202,7 @@
 .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\&.
@@ -225,9 +216,7 @@
 .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\&.
@@ -241,9 +230,7 @@
 .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\&.
 
=== modified file 'Percona-Server/man/myisamchk.1'
--- Percona-Server/man/myisamchk.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/myisamchk.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisamchk\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -268,9 +268,7 @@
 .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\&.
@@ -284,9 +282,7 @@
 .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\&.
@@ -300,9 +296,7 @@
 .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
@@ -320,9 +314,7 @@
 .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
@@ -340,9 +332,7 @@
 .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
@@ -362,9 +352,7 @@
 .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\&.
@@ -378,9 +366,7 @@
 .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
@@ -652,9 +638,7 @@
 .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\&.
@@ -668,9 +652,7 @@
 .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\&.
@@ -684,9 +666,7 @@
 .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,
@@ -715,9 +695,7 @@
 .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\&.
@@ -731,9 +709,7 @@
 .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
@@ -753,9 +729,7 @@
 .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\&.
@@ -769,9 +743,7 @@
 .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
@@ -787,9 +759,7 @@
 .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
@@ -807,9 +777,7 @@
 .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
@@ -839,9 +807,7 @@
 .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
@@ -858,9 +824,7 @@
 .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\&.
@@ -874,9 +838,7 @@
 .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
@@ -889,9 +851,7 @@
 .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
@@ -906,9 +866,7 @@
 .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\&.
@@ -927,9 +885,7 @@
 .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
@@ -944,9 +900,7 @@
 .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
@@ -962,9 +916,7 @@
 .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
@@ -980,9 +932,7 @@
 .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
@@ -997,9 +947,7 @@
 .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
@@ -1017,9 +965,7 @@
 .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
@@ -1035,9 +981,7 @@
 .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
@@ -1063,9 +1007,7 @@
 .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
@@ -1091,9 +1033,7 @@
 .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
@@ -1108,9 +1048,7 @@
 .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
@@ -1123,9 +1061,7 @@
 .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
@@ -1141,9 +1077,7 @@
 .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,
@@ -1163,9 +1097,7 @@
 .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
@@ -1184,9 +1116,7 @@
 .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
@@ -1204,9 +1134,7 @@
 .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\&.
@@ -1220,9 +1148,7 @@
 .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
@@ -1239,9 +1165,7 @@
 .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
@@ -1263,9 +1187,7 @@
 .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\&.
@@ -1279,9 +1201,7 @@
 .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
@@ -2100,7 +2020,8 @@
 \- check data record references index: 3
 Key:  3:  Keyblocks used:  98%  Packed:  \-14%  Max levels:  3
 Total:    Keyblocks used:  98%  Packed:   89%
-\- check records and index references\fI*** LOTS OF ROW NUMBERS DELETED ***\fR
+\- check records and index references
+\fI*** LOTS OF ROW NUMBERS DELETED ***\fR
 Records:            306688  M\&.recordlength:       25  Packed:            83%
 Recordspace used:       97% Empty space:           2% Blocks/Record:   1\&.00
 Record blocks:      306688  Delete blocks:         0
 
=== modified file 'Percona-Server/man/myisamlog.1'
--- Percona-Server/man/myisamlog.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/myisamlog.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisamlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'Percona-Server/man/myisampack.1'
--- Percona-Server/man/myisampack.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/myisampack.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisampack\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -120,9 +120,7 @@
 .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\&.
@@ -136,9 +134,7 @@
 .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
@@ -153,9 +149,7 @@
 .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\&.
@@ -169,9 +163,7 @@
 .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
@@ -189,9 +181,7 @@
 .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
@@ -220,9 +210,7 @@
 .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
@@ -250,9 +238,7 @@
 .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\&.
@@ -266,9 +252,7 @@
 .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\&.
@@ -282,9 +266,7 @@
 .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
@@ -300,9 +282,7 @@
 .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\&.
@@ -316,9 +296,7 @@
 .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\&.
@@ -332,9 +310,7 @@
 .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
 
=== modified file 'Percona-Server/man/mysql-stress-test.pl.1'
--- Percona-Server/man/mysql-stress-test.pl.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/mysql-stress-test.pl.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql-stress-test.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/06/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/13/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "09/06/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "11/13/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -67,9 +67,7 @@
 .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
@@ -82,9 +80,7 @@
 .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
@@ -97,9 +93,7 @@
 .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
@@ -112,9 +106,7 @@
 .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
@@ -127,9 +119,7 @@
 .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
@@ -142,9 +132,7 @@
 .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
@@ -157,9 +145,7 @@
 .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
@@ -174,9 +160,7 @@
 .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\&.
@@ -190,9 +174,7 @@
 .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
@@ -207,9 +189,7 @@
 .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
@@ -224,9 +204,7 @@
 .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
@@ -239,9 +217,7 @@
 .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
@@ -254,9 +230,7 @@
 .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
@@ -271,9 +245,7 @@
 .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\&.
@@ -287,9 +259,7 @@
 .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
@@ -302,9 +272,7 @@
 .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
@@ -319,9 +287,7 @@
 .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
@@ -338,9 +304,7 @@
 .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
@@ -356,9 +320,7 @@
 .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
@@ -378,9 +340,7 @@
 .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
@@ -403,9 +363,7 @@
 .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
@@ -425,9 +383,7 @@
 .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
@@ -444,9 +400,7 @@
 .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
@@ -459,9 +413,7 @@
 .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
@@ -474,9 +426,7 @@
 .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
@@ -489,9 +439,7 @@
 .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 'Percona-Server/man/mysql-test-run.pl.1'
--- Percona-Server/man/mysql-test-run.pl.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/mysql-test-run.pl.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql-test-run.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/06/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/13/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-TEST\-RUN\" "1" "09/06/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-TEST\-RUN\" "1" "11/13/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -401,9 +401,7 @@
 .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\&.
@@ -417,9 +415,7 @@
 .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
@@ -437,9 +433,7 @@
 .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
@@ -456,9 +450,7 @@
 .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
@@ -475,9 +467,7 @@
 .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
@@ -494,9 +484,7 @@
 .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
@@ -523,9 +511,7 @@
 .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
@@ -541,9 +527,7 @@
 .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
@@ -556,9 +540,7 @@
 .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
@@ -578,9 +560,7 @@
 .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
@@ -593,9 +573,7 @@
 .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
@@ -612,9 +590,7 @@
 .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
@@ -631,9 +607,7 @@
 .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
@@ -648,9 +622,7 @@
 .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
@@ -667,9 +639,7 @@
 .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
@@ -682,9 +652,7 @@
 .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
@@ -713,9 +681,7 @@
 .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
@@ -731,9 +697,7 @@
 .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
@@ -746,9 +710,7 @@
 .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
@@ -766,9 +728,7 @@
 .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
@@ -785,9 +745,7 @@
 .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
@@ -804,9 +762,7 @@
 .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
@@ -819,9 +775,7 @@
 .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
@@ -836,9 +790,7 @@
 .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
@@ -864,9 +816,7 @@
 .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
@@ -894,9 +844,7 @@
 .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\&.
@@ -910,9 +858,7 @@
 .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
@@ -925,9 +871,7 @@
 .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
@@ -940,9 +884,7 @@
 .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
@@ -976,9 +918,7 @@
 .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
@@ -993,9 +933,7 @@
 .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
@@ -1010,9 +948,7 @@
 .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 ]
@@ -1035,10 +971,7 @@
 .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
@@ -1071,9 +1004,7 @@
 .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\&.
@@ -1087,9 +1018,7 @@
 .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
@@ -1106,9 +1035,7 @@
 .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
@@ -1125,9 +1052,7 @@
 .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
@@ -1142,9 +1067,7 @@
 .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
@@ -1161,9 +1084,7 @@
 .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
@@ -1180,12 +1101,8 @@
 .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
@@ -1198,9 +1115,7 @@
 .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
@@ -1215,9 +1130,7 @@
 .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
@@ -1232,9 +1145,7 @@
 .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
@@ -1247,9 +1158,7 @@
 .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
@@ -1264,9 +1173,7 @@
 .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\&.
@@ -1280,9 +1187,7 @@
 .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\&.
@@ -1298,9 +1203,7 @@
 .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
@@ -1314,9 +1217,7 @@
 .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
@@ -1330,9 +1231,7 @@
 .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
@@ -1346,9 +1245,7 @@
 .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
@@ -1383,9 +1280,7 @@
 .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
@@ -1403,9 +1298,7 @@
 .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
@@ -1428,9 +1321,7 @@
 .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
@@ -1447,9 +1338,7 @@
 .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
@@ -1464,9 +1353,7 @@
 .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
@@ -1479,9 +1366,7 @@
 .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
@@ -1494,9 +1379,7 @@
 .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
@@ -1511,9 +1394,7 @@
 .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
@@ -1530,9 +1411,7 @@
 .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
@@ -1545,9 +1424,7 @@
 .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
@@ -1565,9 +1442,7 @@
 .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
@@ -1593,9 +1468,7 @@
 .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
@@ -1608,9 +1481,7 @@
 .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
@@ -1626,9 +1497,7 @@
 .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
@@ -1644,9 +1513,7 @@
 .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
@@ -1659,9 +1526,7 @@
 .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
@@ -1676,9 +1541,7 @@
 .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
@@ -1694,9 +1557,7 @@
 .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\&.
@@ -1718,9 +1579,7 @@
 .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
@@ -1745,9 +1604,7 @@
 .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
@@ -1760,9 +1617,7 @@
 .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
@@ -1775,9 +1630,7 @@
 .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
@@ -1790,12 +1643,8 @@
 .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
@@ -1808,12 +1657,8 @@
 .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
@@ -1826,9 +1671,7 @@
 .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
@@ -1841,9 +1684,7 @@
 .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
@@ -1858,9 +1699,7 @@
 .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
@@ -1879,9 +1718,7 @@
 .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
@@ -1916,9 +1753,7 @@
 .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
@@ -1934,9 +1769,7 @@
 .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
@@ -1952,9 +1785,7 @@
 .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
@@ -1976,9 +1807,7 @@
 .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
@@ -2012,9 +1841,7 @@
 .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
@@ -2038,9 +1865,7 @@
 .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\&.
@@ -2054,9 +1879,7 @@
 .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
@@ -2071,9 +1894,7 @@
 .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
@@ -2096,9 +1917,7 @@
 .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
@@ -2120,9 +1939,7 @@
 .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
@@ -2144,9 +1961,7 @@
 .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
@@ -2163,9 +1978,7 @@
 .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
@@ -2178,9 +1991,7 @@
 .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
@@ -2193,9 +2004,7 @@
 .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\&.
@@ -2209,9 +2018,7 @@
 .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
@@ -2227,9 +2034,7 @@
 .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
@@ -2242,9 +2047,7 @@
 .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
@@ -2260,9 +2063,7 @@
 .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
@@ -2279,9 +2080,7 @@
 .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
@@ -2294,9 +2093,7 @@
 .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
@@ -2321,9 +2118,7 @@
 .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
@@ -2351,9 +2146,7 @@
 .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
@@ -2369,9 +2162,7 @@
 .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
@@ -2387,9 +2178,7 @@
 .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\&.
@@ -2403,9 +2192,7 @@
 .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
@@ -2420,9 +2207,7 @@
 .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
@@ -2438,9 +2223,7 @@
 .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
@@ -2453,9 +2236,7 @@
 .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
@@ -2468,9 +2249,7 @@
 .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
@@ -2486,13 +2265,10 @@
 .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
@@ -2503,9 +2279,7 @@
 .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
@@ -2524,9 +2298,7 @@
 .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\&.
@@ -2540,9 +2312,7 @@
 .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 'Percona-Server/man/mysql.1'
--- Percona-Server/man/mysql.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/mysql.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -134,9 +134,7 @@
 .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\&.
@@ -150,9 +148,7 @@
 .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
@@ -175,9 +171,7 @@
 .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
 ;
@@ -193,9 +187,7 @@
 .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,
@@ -215,9 +207,7 @@
 .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
@@ -256,9 +246,7 @@
 .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
@@ -273,9 +261,7 @@
 .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\&.
@@ -289,9 +275,7 @@
 .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
@@ -304,9 +288,7 @@
 .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\&.
@@ -320,9 +302,7 @@
 .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)\&.
@@ -336,9 +316,7 @@
 .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\&.
@@ -352,9 +330,7 @@
 .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
@@ -370,9 +346,7 @@
 .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\&.
@@ -386,9 +360,7 @@
 .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
@@ -406,9 +378,7 @@
 .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
@@ -421,9 +391,7 @@
 .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\&.
@@ -437,9 +405,7 @@
 .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\&.
@@ -453,9 +419,7 @@
 .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
@@ -481,9 +445,7 @@
 .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
@@ -496,9 +458,7 @@
 .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*
@@ -518,9 +478,7 @@
 .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
@@ -536,9 +494,7 @@
 .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
@@ -556,9 +512,7 @@
 .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\&.
@@ -572,9 +526,7 @@
 .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\&.
@@ -588,9 +540,7 @@
 .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\&.
@@ -604,9 +554,7 @@
 .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\&.
@@ -620,9 +568,7 @@
 .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
@@ -639,9 +585,7 @@
 .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
@@ -654,9 +598,7 @@
 .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\&.
@@ -670,9 +612,7 @@
 .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
@@ -696,9 +636,7 @@
 .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
@@ -721,9 +659,7 @@
 .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
@@ -739,9 +675,7 @@
 .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\&.
@@ -755,9 +689,7 @@
 .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
@@ -859,9 +791,7 @@
 .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
@@ -881,9 +811,7 @@
 .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
@@ -910,9 +838,7 @@
 .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\&.
@@ -926,9 +852,7 @@
 .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
@@ -946,10 +870,7 @@
 .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\&.
@@ -963,9 +884,7 @@
 .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
@@ -980,9 +899,7 @@
 .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\&.
@@ -996,9 +913,7 @@
 .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,
@@ -1014,9 +929,7 @@
 .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
@@ -1069,9 +982,7 @@
 .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\&.
@@ -1085,11 +996,7 @@
 .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
@@ -1111,9 +1018,7 @@
 .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
@@ -1143,9 +1048,7 @@
 .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
@@ -1172,9 +1075,7 @@
 .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
@@ -1187,9 +1088,7 @@
 .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
@@ -1205,9 +1104,7 @@
 .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\&.
@@ -1225,9 +1122,7 @@
 .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\&.
@@ -1241,9 +1136,7 @@
 .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\&.
@@ -1257,9 +1150,7 @@
 .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
@@ -1274,9 +1165,7 @@
 .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
@@ -1292,9 +1181,7 @@
 .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\&.
@@ -1308,9 +1195,7 @@
 .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\&.
@@ -1324,9 +1209,7 @@
 .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\&.
@@ -1340,9 +1223,7 @@
 .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\&.
@@ -1356,9 +1237,7 @@
 .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,
@@ -1374,9 +1253,7 @@
 .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\&.
@@ -1390,9 +1267,7 @@
 .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
@@ -1407,9 +1282,7 @@
 .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\&.
@@ -1423,9 +1296,7 @@
 .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\&.
@@ -1494,9 +1365,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" timeout: connect_timeout variable
-.\" connect_timeout variable
-connect_timeout
+.\" timeout: connect_timeout variable.\" connect_timeout variableconnect_timeout
 .sp
 The number of seconds before connection timeout\&. (Default value is
 0\&.)
@@ -1510,8 +1379,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" max_allowed_packet variable
-max_allowed_packet
+.\" max_allowed_packet variablemax_allowed_packet
 .sp
 The maximum size of the buffer for client/server communication\&. The default is 16MB, the maximum is 1GB\&.
 .RE
@@ -1524,8 +1392,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" max_join_size variable
-max_join_size
+.\" max_join_size variablemax_join_size
 .sp
 The automatic limit for rows in a join when using
 \fB\-\-safe\-updates\fR\&. (Default value is 1,000,000\&.)
@@ -1539,8 +1406,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" net_buffer_length variable
-net_buffer_length
+.\" net_buffer_length variablenet_buffer_length
 .sp
 The buffer size for TCP/IP and socket communication\&. (Default value is 16KB\&.)
 .RE
@@ -1553,8 +1419,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" select_limit variable
-select_limit
+.\" select_limit variableselect_limit
 .sp
 The automatic limit for
 SELECT
@@ -1644,9 +1509,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: help command
-.\" help command: mysql
-help [\fIarg\fR],
+.\" mysql: help command.\" help command: mysqlhelp [\fIarg\fR],
 \eh [\fIarg\fR],
 \e? [\fIarg\fR],
 ? [\fIarg\fR]
@@ -1671,9 +1534,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: charset command
-.\" charset command: mysql
-charset \fIcharset_name\fR,
+.\" mysql: charset command.\" charset command: mysqlcharset \fIcharset_name\fR,
 \eC \fIcharset_name\fR
 .sp
 Change the default character set and issue a
@@ -1691,9 +1552,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: clear command
-.\" clear command: mysql
-clear,
+.\" mysql: clear command.\" clear command: mysqlclear,
 \ec
 .sp
 Clear the current input\&. Use this if you change your mind about executing the statement that you are entering\&.
@@ -1707,9 +1566,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: connect command
-.\" connect command: mysql
-connect [\fIdb_name\fR \fIhost_name\fR]],
+.\" mysql: connect command.\" connect command: mysqlconnect [\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\&.
@@ -1723,9 +1580,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: delimiter command
-.\" delimiter command: mysql
-delimiter \fIstr\fR,
+.\" mysql: delimiter command.\" delimiter command: mysqldelimiter \fIstr\fR,
 \ed \fIstr\fR
 .sp
 Change the string that
@@ -1765,9 +1620,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: edit command
-.\" edit command: mysql
-edit,
+.\" mysql: edit command.\" edit command: mysqledit,
 \ee
 .sp
 Edit the current input statement\&.
@@ -1793,9 +1646,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: ego command
-.\" ego command: mysql
-ego,
+.\" mysql: ego command.\" ego command: mysqlego,
 \eG
 .sp
 Send the current statement to the server to be executed and display the result using vertical format\&.
@@ -1809,9 +1660,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: exit command
-.\" exit command: mysql
-exit,
+.\" mysql: exit command.\" exit command: mysqlexit,
 \eq
 .sp
 Exit
@@ -1826,9 +1675,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: go command
-.\" go command: mysql
-go,
+.\" mysql: go command.\" go command: mysqlgo,
 \eg
 .sp
 Send the current statement to the server to be executed\&.
@@ -1842,9 +1689,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: nopager command
-.\" nopager command: mysql
-nopager,
+.\" mysql: nopager command.\" nopager command: mysqlnopager,
 \en
 .sp
 Disable output paging\&. See the description for
@@ -1863,9 +1708,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: notee command
-.\" notee command: mysql
-notee,
+.\" mysql: notee command.\" notee command: mysqlnotee,
 \et
 .sp
 Disable output copying to the tee file\&. See the description for
@@ -1880,9 +1723,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: nowarning command
-.\" nowarning command: mysql
-nowarning,
+.\" mysql: nowarning command.\" nowarning command: mysqlnowarning,
 \ew
 .sp
 Enable display of warnings after each statement\&.
@@ -1896,9 +1737,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: pager command
-.\" pager command: mysql
-pager [\fIcommand\fR],
+.\" mysql: pager command.\" pager command: mysqlpager [\fIcommand\fR],
 \eP [\fIcommand\fR]
 .sp
 Enable output paging\&. By using the
@@ -1936,9 +1775,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: print command
-.\" print command: mysql
-print,
+.\" mysql: print command.\" print command: mysqlprint,
 \ep
 .sp
 Print the current input statement without executing it\&.
@@ -1952,9 +1789,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: prompt command
-.\" prompt command: mysql
-prompt [\fIstr\fR],
+.\" mysql: prompt command.\" prompt command: mysqlprompt [\fIstr\fR],
 \eR [\fIstr\fR]
 .sp
 Reconfigure the
@@ -1977,9 +1812,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: quit command
-.\" quit command: mysql
-quit,
+.\" mysql: quit command.\" quit command: mysqlquit,
 \eq
 .sp
 Exit
@@ -1994,9 +1827,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: rehash command
-.\" rehash command: mysql
-rehash,
+.\" mysql: rehash command.\" rehash command: mysqlrehash,
 \e#
 .sp
 Rebuild the completion hash that enables database, table, and column name completion while you are entering statements\&. (See the description for the
@@ -2012,9 +1843,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: source command
-.\" source command: mysql
-source \fIfile_name\fR,
+.\" mysql: source command.\" source command: mysqlsource \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
@@ -2031,9 +1860,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: status command
-.\" status command: mysql
-status,
+.\" mysql: status command.\" status command: mysqlstatus,
 \es
 .sp
 Provide status information about the connection and the server you are using\&. If you are running in
@@ -2053,9 +1880,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: system command
-.\" system command: mysql
-system \fIcommand\fR,
+.\" mysql: system command.\" system command: mysqlsystem \fIcommand\fR,
 \e! \fIcommand\fR
 .sp
 Execute the given command using your default command interpreter\&.
@@ -2073,9 +1898,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: tee command
-.\" tee command: mysql
-tee [\fIfile_name\fR],
+.\" mysql: tee command.\" tee command: mysqltee [\fIfile_name\fR],
 \eT [\fIfile_name\fR]
 .sp
 By using the
@@ -2104,9 +1927,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: use command
-.\" use command: mysql
-use \fIdb_name\fR,
+.\" mysql: use command.\" use command: mysqluse \fIdb_name\fR,
 \eu \fIdb_name\fR
 .sp
 Use
@@ -2122,9 +1943,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql: warnings command
-.\" warnings command: mysql
-warnings,
+.\" mysql: warnings command.\" warnings command: mysqlwarnings,
 \eW
 .sp
 Enable display of warnings after each statement (if there are any)\&.
 
=== modified file 'Percona-Server/man/mysql.server.1'
--- Percona-Server/man/mysql.server.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/mysql.server.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql.server\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,7 +49,7 @@
 /etc/init\&.d
 directory with the name
 mysql\&. You need not install it manually\&. See
-Section\ \&2.5.1, \(lqInstalling MySQL on Linux Using RPM Packages\(rq, for more information on the Linux RPM packages\&.
+Section\ \&2.5.3, \(lqInstalling MySQL on Linux Using RPM Packages\(rq, for more information on the Linux RPM packages\&.
 .PP
 Some vendors provide RPM packages that install a startup script under a different name such as
 \fBmysqld\fR\&.
@@ -81,9 +81,7 @@
 .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
@@ -96,9 +94,7 @@
 .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
@@ -111,9 +107,7 @@
 .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
@@ -126,9 +120,7 @@
 .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
@@ -143,9 +135,7 @@
 .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
@@ -160,9 +150,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql.server: user option
-.\" user option: mysql.server
-\fB\-\-user=\fR\fB\fIuser_name\fR\fR
+.\" mysql.server: user option.\" user option: mysql.server\fB\-\-user=\fR\fB\fIuser_name\fR\fR
 .sp
 The login user name to use for running
 \fBmysqld\fR\&.
 
=== modified file 'Percona-Server/man/mysql_client_test.1'
--- Percona-Server/man/mysql_client_test.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/mysql_client_test.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_client_test\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/06/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/13/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CLIENT_TEST" "1" "09/06/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL_CLIENT_TEST" "1" "11/13/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -68,9 +68,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_client_test: help option
-.\" help option: mysql_client_test
-\fB\-\-help\fR,
+.\" mysql_client_test: help option.\" help option: mysql_client_test\fB\-\-help\fR,
 \fB\-?\fR
 .sp
 Display a help message and exit\&.
@@ -85,9 +83,7 @@
 .IP \(bu 2.3
 .\}
 \fB\-\-basedir=\fR\fB\fIdir_name\fR\fR,
-.\" mysql_client_test: basedir option
-.\" basedir option: mysql_client_test
-\fB\-b \fR\fB\fIdir_name\fR\fR
+.\" mysql_client_test: basedir option.\" basedir option: mysql_client_test\fB\-b \fR\fB\fIdir_name\fR\fR
 .sp
 The base directory for the tests\&.
 .RE
@@ -101,9 +97,7 @@
 .IP \(bu 2.3
 .\}
 \fB\-\-count=\fR\fB\fIcount\fR\fR,
-.\" mysql_client_test: count option
-.\" count option: mysql_client_test
-\fB\-t \fR\fB\fIcount\fR\fR
+.\" mysql_client_test: count option.\" count option: mysql_client_test\fB\-t \fR\fB\fIcount\fR\fR
 .sp
 The number of times to execute the tests\&.
 .RE
@@ -116,9 +110,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_client_test: database option
-.\" database option: mysql_client_test
-\fB\-\-database=\fR\fB\fIdb_name\fR\fR,
+.\" mysql_client_test: database option.\" database option: mysql_client_test\fB\-\-database=\fR\fB\fIdb_name\fR\fR,
 \fB\-D \fR\fB\fIdb_name\fR\fR
 .sp
 The database to use\&.
@@ -132,9 +124,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_client_test: debug option
-.\" debug option: mysql_client_test
-\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
+.\" mysql_client_test: debug option.\" debug option: mysql_client_test\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
 \fB\-#[\fR\fB\fIdebug_options\fR\fR\fB]\fR
 .sp
 Write a debugging log if MySQL is built with debugging support\&. The default
@@ -152,9 +142,7 @@
 .IP \(bu 2.3
 .\}
 \fB\-\-getopt\-ll\-test=\fR\fB\fIoption\fR\fR,
-.\" mysql_client_test: getopt-ll-test option
-.\" getopt-ll-test option: mysql_client_test
-\fB\-g \fR\fB\fIoption\fR\fR
+.\" mysql_client_test: getopt-ll-test option.\" getopt-ll-test option: mysql_client_test\fB\-g \fR\fB\fIoption\fR\fR
 .sp
 Option to use for testing bugs in the
 getopt
@@ -169,9 +157,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_client_test: host option
-.\" host option: mysql_client_test
-\fB\-\-host=\fR\fB\fIhost_name\fR\fR,
+.\" mysql_client_test: host option.\" host option: mysql_client_test\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\&.
@@ -185,9 +171,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_client_test: password option
-.\" password option: mysql_client_test
-\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
+.\" mysql_client_test: password option.\" password option: mysql_client_test\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
@@ -195,9 +179,7 @@
 have a space between the option and the password\&. If you omit the
 \fIpassword\fR
 value following the
-.\" mysql_client_test: password option
-.\" password option: mysql_client_test
-\fB\-\-password\fR
+.\" mysql_client_test: password option.\" password option: mysql_client_test\fB\-\-password\fR
 or
 \fB\-p\fR
 option on the command line, you are prompted for one\&.
@@ -211,9 +193,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_client_test: port option
-.\" port option: mysql_client_test
-\fB\-\-port=\fR\fB\fIport_num\fR\fR,
+.\" mysql_client_test: port option.\" port option: mysql_client_test\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\&.
@@ -228,9 +208,7 @@
 .IP \(bu 2.3
 .\}
 \fB\-\-server\-arg=\fR\fB\fIarg\fR\fR,
-.\" mysql_client_test: server-arg option
-.\" server-arg option: mysql_client_test
-\fB\-A \fR\fB\fIarg\fR\fR
+.\" mysql_client_test: server-arg option.\" server-arg option: mysql_client_test\fB\-A \fR\fB\fIarg\fR\fR
 .sp
 Argument to send to the embedded server\&.
 .RE
@@ -257,9 +235,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_client_test: silent option
-.\" silent option: mysql_client_test
-\fB\-\-silent\fR,
+.\" mysql_client_test: silent option.\" silent option: mysql_client_test\fB\-\-silent\fR,
 \fB\-s\fR
 .sp
 Be more silent\&.
@@ -273,9 +249,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_client_test: socket option
-.\" socket option: mysql_client_test
-\fB\-\-socket=\fR\fB\fIpath\fR\fR,
+.\" mysql_client_test: socket option.\" socket option: mysql_client_test\fB\-\-socket=\fR\fB\fIpath\fR\fR,
 \fB\-S \fR\fB\fIpath\fR\fR
 .sp
 The socket file to use when connecting to
@@ -308,9 +282,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_client_test: user option
-.\" user option: mysql_client_test
-\fB\-\-user=\fR\fB\fIuser_name\fR\fR,
+.\" mysql_client_test: user option.\" user option: mysql_client_test\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\&.
@@ -325,9 +297,7 @@
 .IP \(bu 2.3
 .\}
 \fB\-v \fR\fB\fIdir_name\fR\fR,
-.\" mysql_client_test: vardir option
-.\" vardir option: mysql_client_test
-\fB\-\-vardir=\fR\fB\fIdir_name\fR\fR
+.\" mysql_client_test: vardir option.\" vardir option: mysql_client_test\fB\-\-vardir=\fR\fB\fIdir_name\fR\fR
 .sp
 The data directory for tests\&. The default is
 mysql\-test/var\&.
 
=== modified file 'Percona-Server/man/mysql_config.1'
--- Percona-Server/man/mysql_config.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/mysql_config.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,9 +49,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: cflags option
-.\" cflags option: mysql_config
-\fB\-\-cflags\fR
+.\" mysql_config: cflags option.\" cflags option: mysql_config\fB\-\-cflags\fR
 .sp
 C Compiler flags to find include files and critical compiler flags and defines used when compiling the
 libmysqlclient
@@ -68,9 +66,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: cxxflags option
-.\" cxxflags option: mysql_config
-\fB\-\-cxxflags\fR
+.\" mysql_config: cxxflags option.\" cxxflags option: mysql_config\fB\-\-cxxflags\fR
 .sp
 Like
 \fB\-\-cflags\fR, but for C++ compiler flags\&. This option was added in MySQL 5\&.6\&.4\&.
@@ -84,9 +80,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: include option
-.\" include option: mysql_config
-\fB\-\-include\fR
+.\" mysql_config: include option.\" include option: mysql_config\fB\-\-include\fR
 .sp
 Compiler options to find MySQL include files\&.
 .RE
@@ -99,11 +93,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: libmysqld-libs option
-.\" libmysqld-libs option: mysql_config
-.\" mysql_config: embedded option
-.\" embedded option: mysql_config
-\fB\-\-libmysqld\-libs\fR,
+.\" mysql_config: libmysqld-libs option.\" libmysqld-libs option: mysql_config.\" mysql_config: embedded option.\" embedded option: mysql_config\fB\-\-libmysqld\-libs\fR,
 \fB\-\-embedded\fR
 .sp
 Libraries and options required to link with the MySQL embedded server\&.
@@ -117,9 +107,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: libs option
-.\" libs option: mysql_config
-\fB\-\-libs\fR
+.\" mysql_config: libs option.\" libs option: mysql_config\fB\-\-libs\fR
 .sp
 Libraries and options required to link with the MySQL client library\&.
 .RE
@@ -132,9 +120,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: libs_r option
-.\" libs_r option: mysql_config
-\fB\-\-libs_r\fR
+.\" mysql_config: libs_r option.\" libs_r option: mysql_config\fB\-\-libs_r\fR
 .sp
 Libraries and options required to link with the thread\-safe MySQL client library\&. In MySQL 5\&.6, all client libraries are thread\-safe, so this option need not be used\&. The
 \fB\-\-libs\fR
@@ -149,9 +135,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: plugindir option
-.\" plugindir option: mysql_config
-\fB\-\-plugindir\fR
+.\" mysql_config: plugindir option.\" plugindir option: mysql_config\fB\-\-plugindir\fR
 .sp
 The default plugin directory path name, defined when configuring MySQL\&.
 .RE
@@ -164,10 +148,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: port option
-.\" port option: mysql_config
-.\" TCP/IP
-\fB\-\-port\fR
+.\" mysql_config: port option.\" port option: mysql_config.\" TCP/IP\fB\-\-port\fR
 .sp
 The default TCP/IP port number, defined when configuring MySQL\&.
 .RE
@@ -180,9 +161,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: socket option
-.\" socket option: mysql_config
-\fB\-\-socket\fR
+.\" mysql_config: socket option.\" socket option: mysql_config\fB\-\-socket\fR
 .sp
 The default Unix socket file, defined when configuring MySQL\&.
 .RE
@@ -195,9 +174,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config: version option
-.\" version option: mysql_config
-\fB\-\-version\fR
+.\" mysql_config: version option.\" version option: mysql_config\fB\-\-version\fR
 .sp
 Version number for the MySQL distribution\&.
 .RE
 
=== modified file 'Percona-Server/man/mysql_config_editor.1'
--- Percona-Server/man/mysql_config_editor.1	2013-10-15 11:37:57 +0000
+++ Percona-Server/man/mysql_config_editor.1	2013-12-05 18:50:37 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_config_editor\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 11/15/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG_EDIT" "1" "09/09/2013" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG_EDIT" "1" "11/15/2013" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -680,9 +680,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config_editor: help option
-.\" help option: mysql_config_editor
-\fB\-\-help\fR,
+.\" mysql_config_editor: help option.\" help option: mysql_config_editor\fB\-\-help\fR,
 \fB\-?\fR
 .sp
 Display a help message and exit\&. If preceded by a command name such as
@@ -699,9 +697,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config_editor: all option
-.\" all option: mysql_config_editor
-\fB\-\-all\fR
+.\" mysql_config_editor: all option.\" all option: mysql_config_editor\fB\-\-all\fR
 .sp
 For the
 print
@@ -716,9 +712,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_config_editor: debug option
-.\" debug option: mysql_config_editor
-\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
+.\" mysql_config_editor: debug option.\" debug option: mysql_config_editor\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
 \fB\-# \fR\fB\fIdebug_options\fR\fR
 .sp