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

[Laurynas Biveinis]

Merge MySQL 5.5.35, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.5.35 and
taking upstream fixes for
https://bugs.launchpad.net/percona-server/5.5/+bug/1071775 and
https://bugs.launchpad.net/percona-server/5.5/+bug/1203050.

An automerge, except that the upstream fix for
https://bugs.launchpad.net/percona-server/+bug/1223196 was reverted.
The upstream fixes for bug 1223196, bug 1049871, bug 1083377 will be
verified and our fixes will be reverted separately.

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

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-10-23 08:23:08 +0000
+++ Makefile	2013-12-05 18:48:48 +0000
@@ -1,4 +1,4 @@
-MYSQL_VERSION=5.5.34
+MYSQL_VERSION=5.5.35
 PERCONA_SERVER_VERSION=rel32.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-08-02 09:40:55 +0000
+++ Percona-Server/CMakeLists.txt	2013-12-05 18:48:48 +0000
@@ -185,7 +185,83 @@
 ELSE()
 ADD_DEFINITIONS(-DHAVE_RESPONSE_TIME_DISTRIBUTION)
 ENDIF()
-																			       
+
+
+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") 
@@ -386,7 +462,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()
@@ -401,6 +476,7 @@
   )
   INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
   INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
+  
   IF(UNIX)
     INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
   ENDIF()
@@ -418,3 +494,5 @@
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()
+
+INCLUDE(CPack)

=== modified file 'Percona-Server/VERSION'
--- Percona-Server/VERSION	2013-10-22 13:33:14 +0000
+++ Percona-Server/VERSION	2013-12-05 18:48:48 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=34
+MYSQL_VERSION_PATCH=35
 MYSQL_VERSION_EXTRA=

=== 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:48:48 +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-06-26 07:01:13 +0000
+++ Percona-Server/configure.cmake	2013-12-05 18:48:48 +0000
@@ -147,6 +147,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:35:17 +0000
+++ Percona-Server/extra/yassl/CMakeLists.txt	2013-12-05 18:48:48 +0000
@@ -37,4 +37,9 @@
 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-02-13 12:44:54 +0000
+++ Percona-Server/extra/yassl/taocrypt/CMakeLists.txt	2013-12-05 18:48:48 +0000
@@ -36,3 +36,8 @@
 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()
+

=== 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:48:48 +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/myisam.h'
--- Percona-Server/include/myisam.h	2012-02-16 09:48:16 +0000
+++ Percona-Server/include/myisam.h	2013-12-05 18:48:48 +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
 */
@@ -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/libmysql/CMakeLists.txt'
--- Percona-Server/libmysql/CMakeLists.txt	2013-02-04 17:07:22 +0000
+++ Percona-Server/libmysql/CMakeLists.txt	2013-12-05 18:48:48 +0000
@@ -168,8 +168,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()
 
 IF(UNIX)

=== modified file 'Percona-Server/libmysql/authentication_win/CMakeLists.txt'
--- Percona-Server/libmysql/authentication_win/CMakeLists.txt	2011-04-28 19:39:42 +0000
+++ Percona-Server/libmysql/authentication_win/CMakeLists.txt	2013-12-05 18:48:48 +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/man/comp_err.1'
--- Percona-Server/man/comp_err.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/comp_err.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/innochecksum.1'
--- Percona-Server/man/innochecksum.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/innochecksum.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/msql2mysql.1'
--- Percona-Server/man/msql2mysql.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/msql2mysql.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "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-22 13:33:14 +0000
+++ Percona-Server/man/my_print_defaults.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmy_print_defaults\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/myisam_ftdump.1'
--- Percona-Server/man/myisam_ftdump.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/myisam_ftdump.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/myisamchk.1'
--- Percona-Server/man/myisamchk.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/myisamchk.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -2098,7 +2098,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-22 13:33:14 +0000
+++ Percona-Server/man/myisamlog.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/myisampack.1'
--- Percona-Server/man/myisampack.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/myisampack.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql-stress-test.pl.1'
--- Percona-Server/man/mysql-stress-test.pl.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql-stress-test.pl.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-stress-test.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/06/2013
+.\"      Date: 11/04/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/04/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql-test-run.pl.1'
--- Percona-Server/man/mysql-test-run.pl.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql-test-run.pl.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-test-run.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/06/2013
+.\"      Date: 11/04/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/04/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql.1'
--- Percona-Server/man/mysql.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql.server.1'
--- Percona-Server/man/mysql.server.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql.server.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_client_test.1'
--- Percona-Server/man/mysql_client_test.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_client_test.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_client_test\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/06/2013
+.\"      Date: 11/04/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/04/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_config.1'
--- Percona-Server/man/mysql_config.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_config.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_convert_table_format.1'
--- Percona-Server/man/mysql_convert_table_format.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_convert_table_format.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_convert_table_format\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONVERT_TAB" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_CONVERT_TAB" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_find_rows.1'
--- Percona-Server/man/mysql_find_rows.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_find_rows.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_find_rows\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIND_ROWS\F" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_FIND_ROWS\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_fix_extensions.1'
--- Percona-Server/man/mysql_fix_extensions.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_fix_extensions.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_fix_extensions\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_EXTENSI" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_FIX_EXTENSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_install_db.1'
--- Percona-Server/man/mysql_install_db.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_install_db.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_install_db\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_INSTALL_DB\" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_INSTALL_DB\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_plugin.1'
--- Percona-Server/man/mysql_plugin.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_plugin.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_plugin\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_PLUGIN\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_PLUGIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_secure_installation.1'
--- Percona-Server/man/mysql_secure_installation.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_secure_installation.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_secure_installation\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SECURE_INST" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_SECURE_INST" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -106,7 +106,7 @@
 .RE
 .\}
 .PP
-The script will prompt you to determine which actions to perform\&.
+When executed, the script prompts you to determine which actions to perform\&.
 .SH "COPYRIGHT"
 .br
 .PP

=== modified file 'Percona-Server/man/mysql_setpermission.1'
--- Percona-Server/man/mysql_setpermission.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_setpermission.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_setpermission\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SETPERMISSI" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_SETPERMISSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_tzinfo_to_sql.1'
--- Percona-Server/man/mysql_tzinfo_to_sql.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_tzinfo_to_sql.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_tzinfo_to_sql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_TZINFO_TO_S" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_TZINFO_TO_S" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_upgrade.1'
--- Percona-Server/man/mysql_upgrade.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_upgrade.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_upgrade\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_UPGRADE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_UPGRADE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_waitpid.1'
--- Percona-Server/man/mysql_waitpid.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_waitpid.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_waitpid\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_WAITPID\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_WAITPID\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysql_zap.1'
--- Percona-Server/man/mysql_zap.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_zap.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_zap\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_ZAP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_ZAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlaccess.1'
--- Percona-Server/man/mysqlaccess.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlaccess.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlaccess\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLACCESS\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLACCESS\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqladmin.1'
--- Percona-Server/man/mysqladmin.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqladmin.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqladmin\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLADMIN\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLADMIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlbinlog.1'
--- Percona-Server/man/mysqlbinlog.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlbinlog.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlbinlog\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBINLOG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLBINLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlbug.1'
--- Percona-Server/man/mysqlbug.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlbug.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlbug\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBUG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLBUG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlcheck.1'
--- Percona-Server/man/mysqlcheck.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlcheck.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlcheck\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLCHECK\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLCHECK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqld.8'
--- Percona-Server/man/mysqld.8	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqld.8	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqld_multi.1'
--- Percona-Server/man/mysqld_multi.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqld_multi.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_multi\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqld_safe.1'
--- Percona-Server/man/mysqld_safe.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqld_safe.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_safe\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_SAFE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD_SAFE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -250,7 +250,7 @@
 malloc()
 library\&. Any library can be used by specifying its path name, but there is a shortcut form to enable use of the
 tcmalloc
-library that is shipped with binary MySQL distributions for Linux in MySQL 5\&.5\&.
+library that is shipped with binary MySQL distributions for Linux in MySQL 5\&.5\&. It is possible that the shortcut form will not work under certain configurations, in which case you should specify a path name instead\&.
 .sp
 The
 \fB\-\-malloc\-lib\fR

=== modified file 'Percona-Server/man/mysqldump.1'
--- Percona-Server/man/mysqldump.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqldump.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqldump\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -105,7 +105,7 @@
 backups with minimal disruption; it can also back up tables from
 MyISAM
 and other storage engines; and it provides a number of convenient options to accommodate different backup scenarios\&. See
-\m[blue]\fBMySQL Enterprise Backup User\*(Aqs Guide (Version 3\&.8\&.2)\fR\m[]\&\s-2\u[1]\d\s+2\&.
+Section\ \&24.2, \(lqMySQL Enterprise Backup\(rq\&.
 .RE
 .sp
 .RS 4
@@ -2549,12 +2549,6 @@
 .PP
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
-.SH "NOTES"
-.IP " 1." 4
-MySQL Enterprise Backup User's Guide (Version 3.8.2)
-.RS 4
-\%http://dev.mysql.com/doc/mysql-enterprise-backup/3.8/en/index.html
-.RE
 .SH "SEE ALSO"
 For more information, please refer to the MySQL Reference Manual,
 which may already be installed locally and which is also available

=== modified file 'Percona-Server/man/mysqldumpslow.1'
--- Percona-Server/man/mysqldumpslow.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqldumpslow.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqldumpslow\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMPSLOW\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLDUMPSLOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlhotcopy.1'
--- Percona-Server/man/mysqlhotcopy.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlhotcopy.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlhotcopy\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLHOTCOPY\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLHOTCOPY\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlimport.1'
--- Percona-Server/man/mysqlimport.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlimport.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlimport\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlshow.1'
--- Percona-Server/man/mysqlshow.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlshow.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlshow\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSHOW\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLSHOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqlslap.1'
--- Percona-Server/man/mysqlslap.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlslap.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlslap\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSLAP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLSLAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/mysqltest.1'
--- Percona-Server/man/mysqltest.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqltest.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqltest\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQLTEST\FR" "1" "09/06/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQLTEST\FR" "1" "11/04/2013" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb-common-options.1'
--- Percona-Server/man/ndb-common-options.1	2013-10-23 08:23:08 +0000
+++ Percona-Server/man/ndb-common-options.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: Options Common to MySQL Cluster Programs
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "OPTIONS COMMON TO MY" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "OPTIONS COMMON TO MY" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_blob_tool.1'
--- Percona-Server/man/ndb_blob_tool.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_blob_tool.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_blob_tool\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_BLOB_TOOL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_BLOB_TOOL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_config.1'
--- Percona-Server/man/ndb_config.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_config.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_CONFIG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1229,7 +1229,7 @@
 .\}
 .nf
 shell> \fBndb_config \-\-configinfo \-\-xml\fR
-<configvariables protocolversion="1" ndbversionstring="5\&.5\&.33\-ndb\-7\&.2\&.14"
+<configvariables protocolversion="1" ndbversionstring="5\&.5\&.34\-ndb\-7\&.2\&.15"
                     ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
                     ndbversionbuild="6">
   <section name="SYSTEM">

=== modified file 'Percona-Server/man/ndb_cpcd.1'
--- Percona-Server/man/ndb_cpcd.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_cpcd.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_cpcd\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_CPCD\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CPCD\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_delete_all.1'
--- Percona-Server/man/ndb_delete_all.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_delete_all.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_delete_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DELETE_ALL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DELETE_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_desc.1'
--- Percona-Server/man/ndb_desc.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_desc.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_desc\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DESC\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DESC\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_drop_index.1'
--- Percona-Server/man/ndb_drop_index.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_drop_index.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_drop_index\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_INDEX\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DROP_INDEX\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -123,7 +123,7 @@
 Reading table information for completion of table and column names
 You can turn off this feature to get a quicker startup with \-A
 Welcome to the MySQL monitor\&.  Commands end with ; or \eg\&.
-Your MySQL connection id is 7 to server version: 5\&.5\&.33\-ndb\-7\&.2\&.14
+Your MySQL connection id is 7 to server version: 5\&.5\&.34\-ndb\-7\&.2\&.15
 Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
 mysql> \fBSHOW TABLES;\fR
 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+

=== modified file 'Percona-Server/man/ndb_drop_table.1'
--- Percona-Server/man/ndb_drop_table.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_drop_table.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_drop_table\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_TABLE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DROP_TABLE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_error_reporter.1'
--- Percona-Server/man/ndb_error_reporter.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_error_reporter.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_error_reporter\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_ERROR_REPORTE" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_ERROR_REPORTE" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -44,6 +44,15 @@
 \fBndb_error_reporter\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including
 \fBndb_error_reporter\fR), see
 Options Common to MySQL Cluster Programs(1)\&.
+.PP
+\fBndb_error_reporter\fR
+did not support the
+\fB\-\-help\fR
+option prior to MySQL Cluster NDB 7\&.2\&.14 (Bug #11756666, Bug #48606)\&. The
+\fB\-\-connection\-timeout\fR
+\fB\-\-dry\-scp\fR, and
+\fB\-\-skip\-nodegroup\fR
+options were also added in this release (Bug #16602002)\&.
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
@@ -61,9 +70,30 @@
 Added / Removed
 T}
 .T&
+l l l
+l l l
+l l l
 l l l.
 T{
 .PP
+--connection-timeout=timeout
+T}:T{
+Number of seconds to wait when connecting to nodes before timing out\&.
+T}:T{
+.PP
+ADDED: NDB 7\&.2\&.14
+T}
+T{
+.PP
+--dry-scp
+T}:T{
+Disable scp with remote hosts; used only for testing\&.
+T}:T{
+.PP
+ADDED: NDB 7\&.2\&.14
+T}
+T{
+.PP
 --fs
 T}:T{
 Include file system data in error report; can use a large amount of disk
@@ -72,6 +102,15 @@
 .PP
 All MySQL 5\&.5 based releases
 T}
+T{
+.PP
+--skip-nodegroup=nodegroup_id
+T}:T{
+Skip all nodes in the node group having this ID\&.
+T}:T{
+.PP
+ADDED: NDB 7\&.2\&.14
+T}
 .TE
 .sp 1
         Usage
@@ -80,32 +119,191 @@
 .RS 4
 .\}
 .nf
-ndb_error_reporter \fIpath/to/config\-file\fR [\fIusername\fR] [\-\-fs]
+ndb_error_reporter \fIpath/to/config\-file\fR [\fIusername\fR] [\fIoptions\fR]
 .fi
 .if n \{\
 .RE
 .\}
 .PP
-This utility is intended for use on a management node host, and requires the path to the management host configuration file (config\&.ini)\&. Optionally, you can supply the name of a user that is able to access the cluster\*(Aqs data nodes using SSH, to copy the data node log files\&. ndb_error_reporter then includes all of these files in archive that is created in the same directory in which it is run\&. The archive is named
+This utility is intended for use on a management node host, and requires the path to the management host configuration file (usually named
+config\&.ini)\&. Optionally, you can supply the name of a user that is able to access the cluster\*(Aqs data nodes using SSH, to copy the data node log files\&.
+\fBndb_error_reporter\fR
+then includes all of these files in archive that is created in the same directory in which it is run\&. The archive is named
 ndb_error_report_\fIYYYYMMDDHHMMSS\fR\&.tar\&.bz2, where
 \fIYYYYMMDDHHMMSS\fR
 is a datetime string\&.
 .PP
-If the
+.\" ndb_error_reporter: options
+\fBndb_error_reporter\fR
+also accepts the options listed here:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" connection-timeout option (ndb_error_reporter)
+\fB\-\-connection\-timeout=\fR\fB\fItimeout\fR\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s
+l l s s
+^ l l s
+^ l l s.
+T{
+\fBIntroduced\fR
+T}:T{
+5\&.5\&.33\-ndb\-7\&.2\&.14
+T}
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-connection\-timeout=timeout
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values\fR
+T}
+:T{
+\fBType\fR
+T}:T{
+integer
+T}
+:T{
+\fBDefault\fR
+T}:T{
+0
+T}
+.TE
+.sp 1
+Wait this many seconds when trying to connect to nodes before timing out\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" dry-scp option (ndb_error_reporter)
+\fB\-\-dry\-scp\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s
+l l s s
+^ l l s
+^ l l s.
+T{
+\fBIntroduced\fR
+T}:T{
+5\&.5\&.33\-ndb\-7\&.2\&.14
+T}
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-dry\-scp
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values\fR
+T}
+:T{
+\fBType\fR
+T}:T{
+boolean
+T}
+:T{
+\fBDefault\fR
+T}:T{
+TRUE
+T}
+.TE
+.sp 1
+Run
+\fBndb_error_reporter\fR
+without using scp from remote hosts\&. Used for testing only\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" fs option (ndb_error_reporter)
 \fB\-\-fs\fR
-is used, then the data node file systems are also copied to the management host and included in the archive that is produced by this script\&. As data node file systems can be extremely large even after being compressed, we ask that you please do
+.TS
+allbox tab(:);
+l l s s
+l l s s
+^ l l s
+^ l l s.
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-fs
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values\fR
+T}
+:T{
+\fBType\fR
+T}:T{
+boolean
+T}
+:T{
+\fBDefault\fR
+T}:T{
+FALSE
+T}
+.TE
+.sp 1
+Copy the data node file systems to the management host and include them in the archive\&.
+.sp
+Because data node file systems can be extremely large, even after being compressed, we ask that you please do
 \fInot\fR
 send archives created using this option to Oracle unless you are specifically requested to do so\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" skip-nodegroup option (ndb_error_reporter)
+\fB\-\-skip\-nodegroup=\fR\fB\fInodegroup_id\fR\fR
 .TS
 allbox tab(:);
 l l s s
 l l s s
+l l s s
 ^ l l s
 ^ l l s.
 T{
+\fBIntroduced\fR
+T}:T{
+5\&.5\&.33\-ndb\-7\&.2\&.14
+T}
+T{
 \fBCommand\-Line Format\fR
 T}:T{
-\-\-fs
+\-\-connection\-timeout=timeout
 T}
 T{
 \ \&
@@ -115,15 +313,17 @@
 :T{
 \fBType\fR
 T}:T{
-boolean
+integer
 T}
 :T{
 \fBDefault\fR
 T}:T{
-FALSE
+0
 T}
 .TE
 .sp 1
+Skip all nodes belong to the node group having the supplied node group ID\&.
+.RE
 .SH "COPYRIGHT"
 .br
 .PP

=== modified file 'Percona-Server/man/ndb_index_stat.1'
--- Percona-Server/man/ndb_index_stat.1	2013-10-23 08:23:08 +0000
+++ Percona-Server/man/ndb_index_stat.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_index_stat\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_INDEX_STAT\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_INDEX_STAT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_mgm.1'
--- Percona-Server/man/ndb_mgm.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_mgm.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_mgm\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGM\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_MGM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_mgmd.8'
--- Percona-Server/man/ndb_mgmd.8	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_mgmd.8	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_mgmd\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGMD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_MGMD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -99,7 +99,9 @@
 T}
 T{
 .PP
---configdir=directory
+--configdir=directory,
+.PP
+--config-dir=directory
 T}:T{
 Specify the cluster management server\*(Aqs configuration cache directory
 T}:T{
@@ -216,9 +218,9 @@
 T}
 T{
 .PP
---config-cache=value
+--config-cache[=TRUE|FALSE]
 T}:T{
-Enable the management server configuration cache; ON by default\&.
+Enable the management server configuration cache; TRUE by default\&.
 T}:T{
 .PP
 All MySQL 5\&.5 based releases
@@ -349,6 +351,7 @@
 allbox tab(:);
 l l s s
 l l s s
+l l s s
 ^ l l s
 ^ l l s.
 T{
@@ -359,6 +362,11 @@
 T{
 \ \&
 T}:T{
+\-\-config\-dir=directory
+T}
+T{
+\ \&
+T}:T{
 \fBPermitted Values\fR
 T}
 :T{
@@ -387,6 +395,35 @@
 .IP \(bu 2.3
 .\}
 .\" config-cache option (ndb_mgmd)
+\fB\-\-config\-cache\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s
+^ l l s
+^ l l s.
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-config\-cache[=TRUE|FALSE]
+T}
+T{
+\ \&
+T}:T{
+\fBPermitted Values\fR
+T}
+:T{
+\fBType\fR
+T}:T{
+boolean
+T}
+:T{
+\fBDefault\fR
+T}:T{
+TRUE
+T}
+.TE
+.sp 1
 This option, whose default value is
 1
 (or

=== modified file 'Percona-Server/man/ndb_print_backup_file.1'
--- Percona-Server/man/ndb_print_backup_file.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_print_backup_file.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_print_backup_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_BACKUP_" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_BACKUP_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_print_schema_file.1'
--- Percona-Server/man/ndb_print_schema_file.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_print_schema_file.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_print_schema_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SCHEMA_" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_SCHEMA_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_print_sys_file.1'
--- Percona-Server/man/ndb_print_sys_file.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_print_sys_file.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_print_sys_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SYS_FIL" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_SYS_FIL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_restore.1'
--- Percona-Server/man/ndb_restore.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_restore.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_restore\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_RESTORE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_RESTORE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -166,7 +166,9 @@
 T}
 T{
 .PP
---restore_data
+--restore_data,
+.PP
+-r
 T}:T{
 Restore table data and logs into NDB Cluster using the NDB API
 T}:T{
@@ -557,8 +559,8 @@
 .RS 4
 .\}
 .nf
-ndb_restore [\-c \fIconnectstring\fR] \-n \fInode_id\fR [\-m] \-b \fIbackup_id\fR \e
-    \-r \-\-backup_path=\fI/path/to/backup/files\fR
+ndb_restore [\-c \fIconnection_string\fR] \-n \fInode_id\fR \-b \fIbackup_id\fR \e
+      [\-m] \-r \-\-backup_path=\fI/path/to/backup/files\fR
 .fi
 .if n \{\
 .RE

=== modified file 'Percona-Server/man/ndb_select_all.1'
--- Percona-Server/man/ndb_select_all.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_select_all.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_select_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_ALL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SELECT_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_select_count.1'
--- Percona-Server/man/ndb_select_count.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_select_count.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_select_count\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_COUNT\" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SELECT_COUNT\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_show_tables.1'
--- Percona-Server/man/ndb_show_tables.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_show_tables.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_show_tables\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SHOW_TABLES\F" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SHOW_TABLES\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_size.pl.1'
--- Percona-Server/man/ndb_size.pl.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_size.pl.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_size.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SIZE\&.PL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SIZE\&.PL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndb_waiter.1'
--- Percona-Server/man/ndb_waiter.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_waiter.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_waiter\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_WAITER\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_WAITER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndbd.8'
--- Percona-Server/man/ndbd.8	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndbd.8	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndbd\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndbd_redo_log_reader.1'
--- Percona-Server/man/ndbd_redo_log_reader.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndbd_redo_log_reader.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndbd_redo_log_reader\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBD_REDO_LOG_REA" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBD_REDO_LOG_REA" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -68,6 +68,7 @@
 T}
 .T&
 l l l
+l l l
 l l l.
 T{
 .PP
@@ -87,6 +88,15 @@
 .PP
 All MySQL 5\&.5 based releases
 T}
+T{
+.PP
+--help
+T}:T{
+Print usage information
+T}:T{
+.PP
+ADDED: NDB 7\&.2\&.15
+T}
 .TE
 .sp 1
         Usage
@@ -187,6 +197,35 @@
 .sp 1
 \fB\-nocheck\fR: Do not check the log file for errors\&.
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.TS
+allbox tab(:);
+l l s s
+l l s s.
+T{
+\fBIntroduced\fR
+T}:T{
+5\&.5\&.34\-ndb\-7\&.2\&.15
+T}
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-help
+T}
+.TE
+.sp 1
+\fB\-\-help\fR: Print usage information\&.
+.sp
+Added in MySQL Cluster NDB 7\&.2\&.15\&. (Bug #11749591, Bug #36805)
+.RE
 .PP
 Like
 \fBndb_print_backup_file\fR

=== modified file 'Percona-Server/man/ndbinfo_select_all.1'
--- Percona-Server/man/ndbinfo_select_all.1	2013-10-23 08:23:08 +0000
+++ Percona-Server/man/ndbinfo_select_all.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndbinfo_select_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBINFO_SELECT_AL" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBINFO_SELECT_AL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/ndbmtd.8'
--- Percona-Server/man/ndbmtd.8	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndbmtd.8	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndbmtd\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBMTD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBMTD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -151,7 +151,7 @@
 .RS 4
 .\}
 .nf
-          ndb_\fInode_id\fR_trace\&.log\&.\fItrace_id\fR_t\fIthread_id\fR,
+ndb_\fInode_id\fR_trace\&.log\&.\fItrace_id\fR_t\fIthread_id\fR,
 .fi
 .if n \{\
 .RE

=== modified file 'Percona-Server/man/perror.1'
--- Percona-Server/man/perror.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/perror.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBperror\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBPERROR\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBPERROR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/replace.1'
--- Percona-Server/man/replace.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/replace.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBreplace\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBREPLACE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBREPLACE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/resolve_stack_dump.1'
--- Percona-Server/man/resolve_stack_dump.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/resolve_stack_dump.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBresolve_stack_dump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 09/09/2013
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBRESOLVE_STACK_DUM" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBRESOLVE_STACK_DUM" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/man/resolveip.1'
--- Percona-Server/man/resolveip.1	2013-10-22 13:33:14 +0000
+++ Percona-Server/man/resolveip.1	2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBresolveip\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
+.\"      Date: 11/04/2013
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBRESOLVEIP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBRESOLVEIP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

=== modified file 'Percona-Server/mysql-test/collections/default.experimental'
--- Percona-Server/mysql-test/collections/default.experimental	2013-07-23 12:48:19 +0000
+++ Percona-Server/mysql-test/collections/default.experimental	2013-12-05 18:48:48 +0000
@@ -15,6 +15,7 @@
 
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_row_sp011  @solaris              # Bug#11753919 2011-07-25 sven Several test cases fail on Solaris with error Thread stack overrun
+rpl.rpl_spec_variables @solaris          # Bug #17337114 2013-08-20 Luis Soares failing on pb2 with timeout for 'CHECK WARNINGS'
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 sys_vars.wait_timeout_func                    # Bug#11750645 2010-04-26 alik wait_timeout_func fails

=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc	2010-11-17 10:16:13 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc	2013-12-05 18:48:48 +0000
@@ -150,10 +150,9 @@
 }
 
 #
-# Drops tables and synchronizes master and slave. Note that temporary
-# tables are not explitcily dropped as they will be dropped while
-# closing the connection.
+# Drops tables and synchronizes master and slave.
 #
+
 if (`SELECT HEX(@commands) = HEX('clean')`)
 {
   connection master;
@@ -162,10 +161,15 @@
 
   DROP TABLE IF EXISTS nt_xx_1;
 
+  DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1;
+  DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1;
+
   --let $n= $tot_table
   while ($n)
   { 
     --eval DROP TABLE IF EXISTS nt_$n
+    --eval DROP TEMPORARY TABLE IF EXISTS tt_tmp_$n
+    --eval DROP TEMPORARY TABLE IF EXISTS nt_tmp_$n
     --dec $n
   }
 

=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test	2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test	2013-12-05 18:48:48 +0000
@@ -112,7 +112,7 @@
 --echo -------- switch to master --------
 connection master;
 FLUSH LOGS;
-
+DROP TEMPORARY TABLE IF EXISTS mysqltest1.tmp2;
 DROP DATABASE mysqltest1;
 
 --echo End of 5.1 tests

=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test	2011-07-18 17:18:03 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test	2013-12-05 18:48:48 +0000
@@ -38,6 +38,9 @@
 source include/start_slave.inc;
 sync_with_master;
 show status like 'slave_open_temp_tables';
+connection master;
+drop temporary table if exists t1;
+sync_slave_with_master;
 
 #
 #Bug#34654  	RESET SLAVE does not clear LAST_IO_Err* 

=== modified file 'Percona-Server/mysql-test/include/mtr_check.sql'
--- Percona-Server/mysql-test/include/mtr_check.sql	2012-05-10 07:49:14 +0000
+++ Percona-Server/mysql-test/include/mtr_check.sql	2013-12-05 18:48:48 +0000
@@ -72,6 +72,8 @@
     mysql.time_zone_transition_type,
     mysql.user;
 
+ show status like 'slave_open_temp_tables';
+
 END||
 
 --

=== added file 'Percona-Server/mysql-test/include/search_pattern_in_file.inc'
--- Percona-Server/mysql-test/include/search_pattern_in_file.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/search_pattern_in_file.inc	2013-12-05 18:48:48 +0000
@@ -0,0 +1,66 @@
+# Purpose:
+#    Simple search with Perl for a pattern in some file.
+#
+#    The advantages compared to thinkable auxiliary constructs using the
+#    mysqltest language and SQL are:
+#    1. We do not need a running MySQL server.
+#    2. SQL causes "noise" during debugging and increases the size of logs.
+#       Perl code does not disturb at all.
+#
+#    The environment variables SEARCH_FILE and SEARCH_PATTERN must be set
+#    before sourcing this routine.
+#
+#    In case of
+#    - SEARCH_FILE and/or SEARCH_PATTERN is not set
+#    - SEARCH_FILE cannot be opened
+#    - SEARCH_FILE does not contain SEARCH_PATTERN
+#    the test will abort immediate.
+#    MTR will report something like
+#    ....
+#    worker[1] Using MTR_BUILD_THREAD 300, with reserved ports 13000..13009
+#    main.1st                                 [ pass ]      3
+#    innodb.innodb_page_size                  [ fail ]
+#            Test ended at 2011-11-11 18:15:58
+#
+#    CURRENT_TEST: innodb.innodb_page_size
+#    # ERROR: The file '<name>' does not contain the expected pattern  <pattern>
+#    mysqltest: In included file "./include/search_pattern_in_file.inc":
+#    included from ./include/search_pattern_in_file.inc at line 36:
+#    At line 25: command "perl" failed with error 255. my_errno=175
+#
+#    The result from queries just before the failure was:
+#    ...
+#    - saving '<some path>' to '<some path>'
+#    main.1st                                 [ pass ]      2
+#
+# Typical use case (check invalid server startup options):
+#    let $error_log= $MYSQLTEST_VARDIR/log/my_restart.err;
+#    --error 0,1
+#    --remove_file $error_log
+#    let SEARCH_FILE= $error_log;
+#    # Stop the server
+#    let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+#    --exec echo "wait" > $restart_file
+#    --shutdown_server 10
+#    --source include/wait_until_disconnected.inc
+#
+#    --error 1
+#    --exec $MYSQLD_CMD <whatever wrong setting> > $error_log 2>&1
+#    # The server restart aborts
+#    let SEARCH_PATTERN= \[ERROR\] Aborting;
+#    --source include/search_pattern_in_file.inc
+#
+# Created: 2011-11-11 mleich
+#
+
+perl;
+    use strict;
+    my $search_file=           $ENV{'SEARCH_FILE'}           or die "SEARCH_FILE not set";
+    my $search_pattern=        $ENV{'SEARCH_PATTERN'}        or die "SEARCH_PATTERN not set";
+    open(FILE, "$search_file") or die("Unable to open '$search_file': $!\n");
+    read(FILE, my $file_content, 50000, 0);
+    close(FILE);
+    if ( not $file_content =~ m{$search_pattern} ) {
+       die("# ERROR: The file '$search_file' does not contain the expected pattern  $search_pattern\n->$file_content<-\n");
+    }
+EOF

=== modified file 'Percona-Server/mysql-test/mysql-test-run.pl'
--- Percona-Server/mysql-test/mysql-test-run.pl	2013-08-14 03:52:04 +0000
+++ Percona-Server/mysql-test/mysql-test-run.pl	2013-12-05 18:48:48 +0000
@@ -4364,7 +4364,7 @@
       {
 	# Remove initial timestamp and look for consecutive identical lines
 	my $line_pat= $line;
-	$line_pat =~ s/^[0-9: ]*//;
+	$line_pat =~ s/^[0-9:\-\+\.TZ ]*//;
 	if ($line_pat eq $last_pat) {
 	  $num_rep++;
 	} else {
@@ -6013,7 +6013,7 @@
   # Special override: also ignore in Pushbuild, some platforms may not have it
   # Now, run ctest and collect output
   my $ctest_out= `ctest $ctest_vs 2>&1`;
-  if ($? == $no_ctest && $opt_ctest == -1 && ! defined $ENV{PB2WORKDIR}) {
+  if ($? == $no_ctest && ($opt_ctest == -1 || defined $ENV{PB2WORKDIR})) {
     chdir($olddir);
     return;
   }

=== modified file 'Percona-Server/mysql-test/r/openssl_1.result'
--- Percona-Server/mysql-test/r/openssl_1.result	2012-08-11 10:22:11 +0000
+++ Percona-Server/mysql-test/r/openssl_1.result	2013-12-05 18:48:48 +0000
@@ -83,7 +83,7 @@
 SHOW STATUS LIKE 'Ssl_cipher';
 Variable_name	Value
 Ssl_cipher	AES128-SHA
-mysqltest: Could not open connection 'default': 2026 SSL connection error: SSL_CTX_new failed
+mysqltest: Could not open connection 'default': 2026 SSL connection error: Failed to set ciphers to use
 CREATE TABLE t1(a int);
 INSERT INTO t1 VALUES (1), (2);
 

=== modified file 'Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result'
--- Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result	2011-12-22 11:05:33 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result	2013-12-05 18:48:48 +0000
@@ -6,5 +6,5 @@
 c
 HANDLER bug13510739 READ `primary` NEXT;
 c
-4
+3
 DROP TABLE bug13510739;

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/innodb.test'
--- Percona-Server/mysql-test/suite/innodb/t/innodb.test	2012-05-10 07:49:14 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/innodb.test	2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 #######################################################################
 #                                                                     #
 # Please, DO NOT TOUCH this file as well as the innodb.result file.   #

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result	2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result	2013-12-05 18:48:48 +0000
@@ -15,4 +15,7 @@
 master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp1 LIKE tmp
 master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp1 LIKE tmp
 master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp2 SELECT * FROM tmp
+DROP TEMPORARY TABLE tmp;
+DROP TEMPORARY TABLE tmp1;
+DROP TEMPORARY TABLE tmp2;
 include/rpl_end.inc

=== added file 'Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result	2013-12-05 18:48:48 +0000
@@ -0,0 +1,14 @@
+include/master-slave.inc
+[connection master]
+SET @debug_saved= @@GLOBAL.DEBUG;
+CREATE TABLE t (i INT);
+SET GLOBAL DEBUG= "d,wait_after_binlog_EOF";
+INSERT INTO t VALUES (1);
+INSERT INTO t VALUES (2);
+FLUSH LOGS;
+SET DEBUG_SYNC= 'now SIGNAL signal.rotate_finished';
+include/diff_tables.inc [master:t,slave:t]
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET DEBUG_SYNC= 'RESET';
+DROP TABLE t;
+include/rpl_end.inc

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result	2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result	2013-12-05 18:48:48 +0000
@@ -42,4 +42,5 @@
   `created` datetime DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t2,t3,t5;
+drop temporary table t4;
 include/rpl_end.inc

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2013-07-27 12:05:02 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2013-12-05 18:48:48 +0000
@@ -1554,8 +1554,14 @@
 SET @commands= 'clean';
 DROP TABLE IF EXISTS tt_xx_1;
 DROP TABLE IF EXISTS nt_xx_1;
+DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1;
+DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1;
 DROP TABLE IF EXISTS nt_2;
+DROP TEMPORARY TABLE IF EXISTS tt_tmp_2;
+DROP TEMPORARY TABLE IF EXISTS nt_tmp_2;
 DROP TABLE IF EXISTS nt_1;
+DROP TEMPORARY TABLE IF EXISTS tt_tmp_1;
+DROP TEMPORARY TABLE IF EXISTS nt_tmp_1;
 DROP TABLE IF EXISTS tt_2;
 DROP TABLE IF EXISTS tt_1;
 SET @commands= '';

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2012-12-04 16:09:48 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2013-12-05 18:48:48 +0000
@@ -85,6 +85,7 @@
 include/assert.inc [Table t3 should contain 100 lines on the slave]
 unlock tables;
 drop table if exists t1,t2,t3,t4;
+drop temporary table temp_table;
 End of 4.1 tests
 show binlog events in 'non existing_binlog_file';
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result	2013-07-27 12:05:02 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result	2013-12-05 18:48:48 +0000
@@ -1619,8 +1619,14 @@
 SET @commands= 'clean';
 DROP TABLE IF EXISTS tt_xx_1;
 DROP TABLE IF EXISTS nt_xx_1;
+DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1;
+DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1;
 DROP TABLE IF EXISTS nt_2;
+DROP TEMPORARY TABLE IF EXISTS tt_tmp_2;
+DROP TEMPORARY TABLE IF EXISTS nt_tmp_2;
 DROP TABLE IF EXISTS nt_1;
+DROP TEMPORARY TABLE IF EXISTS tt_tmp_1;
+DROP TEMPORARY TABLE IF EXISTS nt_tmp_1;
 DROP TABLE IF EXISTS tt_2;
 DROP TABLE IF EXISTS tt_1;
 SET @commands= '';

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2011-07-18 17:18:03 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2013-12-05 18:48:48 +0000
@@ -23,6 +23,7 @@
 show status like 'slave_open_temp_tables';
 Variable_name	Value
 Slave_open_temp_tables	0
+drop temporary table if exists t1;
 include/stop_slave.inc
 reset slave;
 include/check_slave_no_error.inc

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result	2011-03-18 14:16:17 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result	2013-12-05 18:48:48 +0000
@@ -48,6 +48,7 @@
 0
 kill @id;
 drop table t2;
+drop temporary table t3;
 Got one of the listed errors
 include/wait_for_slave_sql_error_and_skip.inc [errno=1053]
 select count(*) from t1;

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result	2013-07-27 12:05:02 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result	2013-12-05 18:48:48 +0000
@@ -1604,8 +1604,14 @@
 SET @commands= 'clean';
 DROP TABLE IF EXISTS tt_xx_1;
 DROP TABLE IF EXISTS nt_xx_1;
+DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1;
+DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1;
 DROP TABLE IF EXISTS nt_2;
+DROP TEMPORARY TABLE IF EXISTS tt_tmp_2;
+DROP TEMPORARY TABLE IF EXISTS nt_tmp_2;
 DROP TABLE IF EXISTS nt_1;
+DROP TEMPORARY TABLE IF EXISTS tt_tmp_1;
+DROP TEMPORARY TABLE IF EXISTS nt_tmp_1;
 DROP TABLE IF EXISTS tt_2;
 DROP TABLE IF EXISTS tt_1;
 SET @commands= '';

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result	2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result	2013-12-05 18:48:48 +0000
@@ -79,6 +79,7 @@
 FLUSH LOGS;
 -------- switch to master --------
 FLUSH LOGS;
+DROP TEMPORARY TABLE IF EXISTS mysqltest1.tmp2;
 DROP DATABASE mysqltest1;
 End of 5.1 tests
 #

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2011-07-18 17:18:03 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2013-12-05 18:48:48 +0000
@@ -23,6 +23,7 @@
 show status like 'slave_open_temp_tables';
 Variable_name	Value
 Slave_open_temp_tables	1
+drop temporary table if exists t1;
 include/stop_slave.inc
 reset slave;
 include/check_slave_no_error.inc

=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test	2010-12-19 17:07:28 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test	2013-12-05 18:48:48 +0000
@@ -38,4 +38,8 @@
 CREATE TEMPORARY TABLE IF NOT EXISTS tmp2 SELECT * FROM tmp;
 source include/show_binlog_events.inc;
 
+DROP TEMPORARY TABLE tmp;
+DROP TEMPORARY TABLE tmp1;
+DROP TEMPORARY TABLE tmp2;
+
 --source include/rpl_end.inc

=== added file 'Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test	2013-12-05 18:48:48 +0000
@@ -0,0 +1,51 @@
+#
+# Whenever the mysql_binlog_send method (dump thread) reaches the
+# end of file when reading events from the binlog, before checking
+# if it should wait for more events, there was a test to check if
+# the file being read was still active, i.e, it was the last known
+# binlog. However, it was possible that something was written to
+# the binary log and then a rotation would happen, after EOF was
+# detected and before the check for active was performed. In this
+# case, the end of the binary log would not be read by the dump
+# thread, and this would cause the slave to lose updates.
+#
+# This test verifies that the problem has been fixed. It waits
+# during this window while forcing a rotation in the binlog.
+#
+--source include/have_debug.inc
+--source include/master-slave.inc
+
+--connection master
+
+SET @debug_saved= @@GLOBAL.DEBUG;
+
+CREATE TABLE t (i INT);
+
+# When reaching the EOF the dump thread will wait before deciding if
+# it should move to a new binlong file.
+SET GLOBAL DEBUG= "d,wait_after_binlog_EOF";
+
+INSERT INTO t VALUES (1);
+
+--sleep 1
+
+# A insert and a rotate happens before the decision
+INSERT INTO t VALUES (2);
+FLUSH LOGS;
+
+SET DEBUG_SYNC= 'now SIGNAL signal.rotate_finished';
+
+--sync_slave_with_master
+
+# All the rows should be sent to the slave.
+--let $diff_tables=master:t,slave:t
+--source include/diff_tables.inc
+
+##Clean up
+--connection master
+
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET DEBUG_SYNC= 'RESET';
+
+DROP TABLE t;
+--source include/rpl_end.inc

=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test	2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test	2013-12-05 18:48:48 +0000
@@ -43,6 +43,7 @@
 show create table t5;
 connection master;
 drop table t2,t3,t5;
+drop temporary table t4;
 sync_slave_with_master;
 
 # End of 4.1 tests

=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test	2012-12-04 16:09:48 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test	2013-12-05 18:48:48 +0000
@@ -218,6 +218,7 @@
 #clean up
 connection master;
 drop table if exists t1,t2,t3,t4;
+drop temporary table temp_table;
 sync_slave_with_master;
 
 --echo End of 4.1 tests

=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test	2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test	2013-12-05 18:48:48 +0000
@@ -91,8 +91,8 @@
 sleep 3;
 select (@id := id) - id from t2;
 kill @id;
-# We don't drop t3 as this is a temporary table
 drop table t2;
+drop temporary table t3;
 connection master;
 # The get_lock function causes warning for unsafe statement.
 --disable_warnings

=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test	2010-05-25 07:36:06 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test	2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 #################### mysql-test\t\identity_func.test ##########################
 #                                                                             #
 # Variable Name: identity                                                     #

=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test	2010-05-25 07:36:06 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test	2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 ################# mysql-test\t\innodb_autoinc_lock_mode_func.test  ############
 #                                                                             #
 # Variable Name: innodb_autoinc_lock_mode                                     #

=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test	2010-05-25 07:36:06 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test	2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 ################# mysql-test\t\last_insert_id_func.test #######################
 #                                                                             #
 # Variable Name: last_insert_id                                               #

=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test	2010-06-17 20:51:35 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test	2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 ############## mysql-test\t\storage_engine_basic.test ##################
 #                                                                      #
 #                                                                      # 

=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test	2010-06-07 08:47:04 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test	2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
---source include/not_windows_embedded.inc
-# remove this when
-# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
-#   .\sync\sync0sync.c line 324
-# is fixed
-
 ############# mysql-test\t\tx_isolation_func.test #######################################
 #                                                                                       #
 # Variable Name: tx_isolation                                                           #

=== modified file 'Percona-Server/mysys/CMakeLists.txt'
--- Percona-Server/mysys/CMakeLists.txt	2013-08-02 09:40:55 +0000
+++ Percona-Server/mysys/CMakeLists.txt	2013-12-05 18:48:48 +0000
@@ -77,3 +77,8 @@
 ADD_EXECUTABLE(thr_lock thr_lock.c)
 TARGET_LINK_LIBRARIES(thr_lock mysys)
 SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")
+
+INSTALL_DEBUG_SYMBOLS(mysys)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()

=== modified file 'Percona-Server/mysys/mf_iocache2.c'
--- Percona-Server/mysys/mf_iocache2.c	2013-06-27 15:35:20 +0000
+++ Percona-Server/mysys/mf_iocache2.c	2013-12-05 18:48:48 +0000
@@ -419,7 +419,7 @@
     {
       register int iarg;
       size_t length2;
-      char buff[17];
+      char buff[32];
 
       iarg = va_arg(args, int);
       if (*fmt == 'd')
@@ -454,7 +454,7 @@
     {
       register long iarg;
       size_t length2;
-      char buff[17];
+      char buff[32];
 
       iarg = va_arg(args, long);
       if (*++fmt == 'd')

=== modified file 'Percona-Server/packaging/WiX/mysql_server.wxs.in'
--- Percona-Server/packaging/WiX/mysql_server.wxs.in	2013-02-20 11:41:43 +0000
+++ Percona-Server/packaging/WiX/mysql_server.wxs.in	2013-12-05 18:48:48 +0000
@@ -70,10 +70,10 @@
         Installed
       </Custom>
     </InstallExecuteSequence>
-	<InstallUISequence>
+    <InstallUISequence>
       <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->
       <AppSearch After="FindRelatedProducts"/>
-	</InstallUISequence>
+    </InstallUISequence>
  
     <!-- Find previous installation -->
     <Property Id="INSTALLDIR">
@@ -83,31 +83,43 @@
           Name="InstallLocation"
           Type="raw" />
     </Property>
-	 <Property Id="OLDERVERSION">
-      <RegistrySearch Id="FindOlderVersion"
-          Root="HKLM"
-          Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
-          Name="DisplayVersion"
-          Type="raw" />
-    </Property>
-	 <Property Id="DATADIR">
+    <?if @Platform@ != "x64" ?>
+        <Property Id="OLDERVERSION"> 
+          <RegistrySearch Id="FindOlderVersion"
+            Root="HKLM"
+            Win64 = "no"
+            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+            Name="DisplayVersion"
+            Type="raw" />
+        </Property>
+    <?else ?>
+        <Property Id="OLDERVERSION"> 
+          <RegistrySearch Id="FindOlderVersion"
+            Root="HKLM"
+            Win64 = "yes"
+            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+            Name="DisplayVersion"
+            Type="raw" />
+        </Property>
+    <?endif ?>
+    <Property Id="DATADIR">
       <RegistrySearch Id="FindDataDir"
           Root="HKLM"
           Key="SOFTWARE\MySQL AB\[ProductName]"
           Name="DataLocation"
           Type="raw" />
     </Property>
-	 <Property Id="INSTALLDIR2">
+    <Property Id="INSTALLDIR2">
        <RegistrySearch Id="FindInstallLocation2"
           Root="HKLM"
           Key="SOFTWARE\MySQL AB\[ProductName]"
           Name="Location"
           Type="raw" />
     </Property>
-	<CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> 
-	<InstallUISequence>
-	 <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> 
-	</InstallUISequence>
+    <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> 
+    <InstallUISequence>
+    <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> 
+    </InstallUISequence>
 
 
     <!-- UI -->

=== modified file 'Percona-Server/packaging/rpm-uln/mysql.spec.sh'
--- Percona-Server/packaging/rpm-uln/mysql.spec.sh	2013-07-09 18:35:26 +0000
+++ Percona-Server/packaging/rpm-uln/mysql.spec.sh	2013-12-05 18:48:48 +0000
@@ -858,7 +858,9 @@
 %files -n mysql-server%{product_suffix} -f release/support-files/plugins.files
 %defattr(-,root,root)
 %doc release/support-files/*.cnf
-%doc %{_datadir}/info/mysql.info*
+%if 0%{?commercial}
+ %doc %{_datadir}/info/mysql.info*
+%endif
 %doc %{src_dir}/Docs/ChangeLog
 %doc %{src_dir}/Docs/INFO_SRC*
 %doc release/Docs/INFO_BIN*
@@ -981,6 +983,9 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Nov 05 2013 Balasubramanian Kandasamy <[e-mail]>
+- Removed non gpl file mysql.info from community packages
+
 * Wed Jul 10 2013 Balasubramanian Kandasamy <[e-mail]>
 - Removed directory  /usr/share/mysql/solaris/postinstall-solaris to resolve build
   error

=== modified file 'Percona-Server/plugin/semisync/semisync_master.cc'
--- Percona-Server/plugin/semisync/semisync_master.cc	2011-09-08 10:10:26 +0000
+++ Percona-Server/plugin/semisync/semisync_master.cc	2013-12-05 18:48:48 +0000
@@ -482,13 +482,17 @@
   lock();
   rpl_semi_sync_master_clients--;
 
-  /* If user has chosen not to wait if no semi-sync slave available
-     and the last semi-sync slave exits, turn off semi-sync on master
-     immediately.
-   */
-  if (!rpl_semi_sync_master_wait_no_slave &&
-      rpl_semi_sync_master_clients == 0)
-    switch_off();
+  /* Only switch off if semi-sync is enabled and is on */
+  if (getMasterEnabled() && is_on())
+  {
+    /* If user has chosen not to wait if no semi-sync slave available
+       and the last semi-sync slave exits, turn off semi-sync on master
+       immediately.
+     */
+    if (!rpl_semi_sync_master_wait_no_slave &&
+        rpl_semi_sync_master_clients == 0)
+      switch_off();
+  }
   unlock();
 }
 
@@ -752,7 +756,8 @@
       At this point, the binlog file and position of this transaction
       must have been removed from ActiveTranx.
     */
-    assert(!active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,
+    assert(!getMasterEnabled() ||
+           !active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,
                                              trx_wait_binlog_pos));
     
     /* Update the status counter. */
@@ -893,10 +898,7 @@
    * target, do not request replies from the slave.
    */
   if (!getMasterEnabled() || !is_semi_sync_slave())
-  {
-    sync = false;
     return 0;
-  }
 
   function_enter(kWho);
 
@@ -904,15 +906,12 @@
 
   /* This is the real check inside the mutex. */
   if (!getMasterEnabled())
-  {
-    sync = false;
-    goto l_end;
-  }
+    goto l_end; // sync= false at this point in time
 
   if (is_on())
   {
     /* semi-sync is ON */
-    sync = false;     /* No sync unless a transaction is involved. */
+    /* sync= false; No sync unless a transaction is involved. */
 
     if (reply_file_name_inited_)
     {

=== modified file 'Percona-Server/scripts/CMakeLists.txt'
--- Percona-Server/scripts/CMakeLists.txt	2013-02-26 05:35:17 +0000
+++ Percona-Server/scripts/CMakeLists.txt	2013-12-05 18:48:48 +0000
@@ -216,7 +216,6 @@
   COMPONENT Server
   )
 
-
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
 SET(sysconfdir ${prefix})
 SET(bindir ${prefix}/${INSTALL_BINDIR})

=== modified file 'Percona-Server/scripts/mysql_system_tables_data.sql'
--- Percona-Server/scripts/mysql_system_tables_data.sql	2013-02-19 09:06:30 +0000
+++ Percona-Server/scripts/mysql_system_tables_data.sql	2013-12-05 18:48:48 +0000
@@ -24,8 +24,7 @@
 -- Get the hostname, if the hostname has any wildcard character like "_" or "%" 
 -- add escape character in front of wildcard character to convert "_" or "%" to
 -- a plain character
-SET @get_hostname= @@hostname;
-SELECT REPLACE((SELECT REPLACE(@get_hostname,'_','\_')),'%','\%') INTO @current_hostname;
+SELECT LOWER( REPLACE((SELECT REPLACE(@@hostname,'_','\_')),'%','\%') )INTO @current_hostname;
 
 
 -- Fill "db" table with default grants for anyone to
@@ -41,11 +40,11 @@
 -- from local machine if "user" table didn't exist before
 CREATE TEMPORARY TABLE tmp_user LIKE user;
 INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
-REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost';
+REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE @current_hostname != 'localhost';
 REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
 REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
 INSERT INTO tmp_user (host,user) VALUES ('localhost','');
-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
+INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
 INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
 DROP TABLE tmp_user;
 

=== modified file 'Percona-Server/scripts/mysql_system_tables_fix.sql'
--- Percona-Server/scripts/mysql_system_tables_fix.sql	2011-06-30 15:46:53 +0000
+++ Percona-Server/scripts/mysql_system_tables_fix.sql	2013-12-05 18:48:48 +0000
@@ -652,6 +652,8 @@
 INSERT INTO proxies_priv SELECT * FROM tmp_proxies_priv WHERE @had_proxies_priv_table=0;
 DROP TABLE tmp_proxies_priv;
 
+# Convering the host name to lower case for existing users
+UPDATE user SET host=LOWER( host ) WHERE LOWER( host ) <> host;
 
 # Activate the new, possible modified privilege tables
 # This should not be needed, but gives us some extra testing that the above

=== modified file 'Percona-Server/sql-common/client.c'
--- Percona-Server/sql-common/client.c	2013-06-26 07:01:13 +0000
+++ Percona-Server/sql-common/client.c	2013-12-05 18:48:48 +0000
@@ -4151,6 +4151,7 @@
     mysql->options.methods_to_use= option;
     break;
   case MYSQL_SET_CLIENT_IP:
+    my_free(mysql->options.client_ip);
     mysql->options.client_ip= my_strdup(arg, MYF(MY_WME));
     break;
   case MYSQL_SECURE_AUTH:

=== modified file 'Percona-Server/sql/filesort.cc'
--- Percona-Server/sql/filesort.cc	2013-06-26 07:01:13 +0000
+++ Percona-Server/sql/filesort.cc	2013-12-05 18:48:48 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/*
+   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -201,7 +202,8 @@
 
   {
     const ulong min_sort_memory=
-      max(MIN_SORT_MEMORY, param.sort_length * MERGEBUFF2);
+      max(MIN_SORT_MEMORY,
+          ALIGN_SIZE(MERGEBUFF2 * (param.rec_length + sizeof(uchar*))));
     while (memory_available >= min_sort_memory)
     {
       ulong keys= memory_available / (param.rec_length + sizeof(char*));
@@ -342,7 +344,10 @@
                     "%s: %s",
                     MYF(ME_ERROR + ME_WAITTANG),
                     ER_THD(thd, ER_FILSORT_ABORT),
-                    kill_errno ? ER(kill_errno) : thd->stmt_da->message());
+                    kill_errno ? ((kill_errno == THD::KILL_CONNECTION &&
+                                 !shutdown_in_progress) ? ER(THD::KILL_QUERY) :
+                                                          ER(kill_errno)) :
+                                 thd->stmt_da->message());
                     
     if (global_system_variables.log_warnings > 1)
     {

=== modified file 'Percona-Server/sql/ha_partition.cc'
--- Percona-Server/sql/ha_partition.cc	2013-07-29 06:11:13 +0000
+++ Percona-Server/sql/ha_partition.cc	2013-12-05 18:48:48 +0000
@@ -1337,7 +1337,8 @@
 int ha_partition::prepare_new_partition(TABLE *tbl,
                                         HA_CREATE_INFO *create_info,
                                         handler *file, const char *part_name,
-                                        partition_element *p_elem)
+                                        partition_element *p_elem,
+                                        uint disable_non_uniq_indexes)
 {
   int error;
   DBUG_ENTER("prepare_new_partition");
@@ -1362,6 +1363,7 @@
   if ((error= file->ha_open(tbl, part_name, m_mode, m_open_test_lock)))
     goto error_open;
   DBUG_PRINT("info", ("partition %s opened", part_name));
+
   /*
     Note: if you plan to add another call that may return failure,
     better to do it before external_lock() as cleanup_new_partition()
@@ -1372,6 +1374,9 @@
     goto error_external_lock;
   DBUG_PRINT("info", ("partition %s external locked", part_name));
 
+  if (disable_non_uniq_indexes)
+    file->ha_disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
+
   DBUG_RETURN(0);
 error_external_lock:
   (void) file->close();
@@ -1649,6 +1654,14 @@
       on them to prepare them for copy phase and also for later close
       calls
   */
+
+  /*
+     Before creating new partitions check whether indexes are disabled
+     in the  partitions.
+  */
+
+  uint disable_non_uniq_indexes = indexes_are_disabled();
+
   i= 0;
   part_count= 0;
   part_it.rewind();
@@ -1683,11 +1696,13 @@
           if ((error= prepare_new_partition(table, create_info,
                                             new_file_array[part],
                                             (const char *)part_name_buff,
-                                            sub_elem)))
+                                            sub_elem,
+                                            disable_non_uniq_indexes)))
           {
             cleanup_new_partition(part_count);
             DBUG_RETURN(error);
           }
+
           m_added_file[part_count++]= new_file_array[part];
         } while (++j < num_subparts);
       }
@@ -1700,11 +1715,13 @@
         if ((error= prepare_new_partition(table, create_info,
                                           new_file_array[i],
                                           (const char *)part_name_buff,
-                                          part_elem)))
+                                          part_elem,
+                                          disable_non_uniq_indexes)))
         {
           cleanup_new_partition(part_count);
           DBUG_RETURN(error);
         }
+
         m_added_file[part_count++]= new_file_array[i];
       }
     }

=== modified file 'Percona-Server/sql/ha_partition.h'
--- Percona-Server/sql/ha_partition.h	2013-06-14 05:58:29 +0000
+++ Percona-Server/sql/ha_partition.h	2013-12-05 18:48:48 +0000
@@ -270,7 +270,8 @@
   void cleanup_new_partition(uint part_count);
   int prepare_new_partition(TABLE *table, HA_CREATE_INFO *create_info,
                             handler *file, const char *part_name,
-                            partition_element *p_elem);
+                            partition_element *p_elem,
+                            uint disable_non_uniq_indexes);
   /*
     delete_table, rename_table and create uses very similar logic which
     is packed into this routine.

=== modified file 'Percona-Server/sql/handler.cc'
--- Percona-Server/sql/handler.cc	2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/handler.cc	2013-12-05 18:48:48 +0000
@@ -5135,8 +5135,14 @@
                          "", 0, "DISABLED", 8) ? 1 : 0;
     }
     else
+    {
+      DBUG_EXECUTE_IF("simulate_show_status_failure",
+                      DBUG_SET("+d,simulate_net_write_failure"););
       result= db_type->show_status &&
               db_type->show_status(db_type, thd, stat_print, stat) ? 1 : 0;
+      DBUG_EXECUTE_IF("simulate_show_status_failure",
+                      DBUG_SET("-d,simulate_net_write_failure"););
+    }
   }
 
   if (!result)

=== modified file 'Percona-Server/sql/item_strfunc.cc'
--- Percona-Server/sql/item_strfunc.cc	2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/item_strfunc.cc	2013-12-05 18:48:48 +0000
@@ -1,5 +1,5 @@
 /*
-   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
@@ -2928,7 +2928,9 @@
   int to_base= (int) args[2]->val_int();
   int err;
 
+  // Note that abs(INT_MIN) is undefined.
   if (args[0]->null_value || args[1]->null_value || args[2]->null_value ||
+      from_base == INT_MIN || to_base == INT_MIN ||
       abs(to_base) > 36 || abs(to_base) < 2 ||
       abs(from_base) > 36 || abs(from_base) < 2 || !(res->length()))
   {

=== modified file 'Percona-Server/sql/item_sum.cc'
--- Percona-Server/sql/item_sum.cc	2013-04-14 02:39:56 +0000
+++ Percona-Server/sql/item_sum.cc	2013-12-05 18:48:48 +0000
@@ -1496,8 +1496,12 @@
 
 bool Item_sum_count::add()
 {
-  if (!args[0]->maybe_null || !args[0]->is_null())
-    count++;
+  for (uint i=0; i<arg_count; i++)
+  {
+    if (args[i]->maybe_null && args[i]->is_null())
+      return 0;
+  }
+  count++;
   return 0;
 }
 

=== modified file 'Percona-Server/sql/log_event.cc'
--- Percona-Server/sql/log_event.cc	2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/log_event.cc	2013-12-05 18:48:48 +0000
@@ -5511,7 +5511,6 @@
 
   switch (type) {
   case LAST_INSERT_ID_EVENT:
-    thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt= 1;
     thd->first_successful_insert_id_in_prev_stmt= val;
     break;
   case INSERT_ID_EVENT:

=== modified file 'Percona-Server/sql/net_serv.cc'
--- Percona-Server/sql/net_serv.cc	2013-06-27 15:35:20 +0000
+++ Percona-Server/sql/net_serv.cc	2013-12-05 18:48:48 +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
@@ -370,6 +370,12 @@
 
   MYSQL_NET_WRITE_START(len);
 
+  DBUG_EXECUTE_IF("simulate_net_write_failure", {
+                  my_error(ER_NET_ERROR_ON_WRITE, MYF(0));
+                  return 1;
+                  };
+                 );
+
   /*
     Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH
     length. The last packet is always a packet that is < MAX_PACKET_LENGTH.

=== modified file 'Percona-Server/sql/opt_range.cc'
--- Percona-Server/sql/opt_range.cc	2013-08-14 03:52:04 +0000
+++ Percona-Server/sql/opt_range.cc	2013-12-05 18:48:48 +0000
@@ -8071,15 +8071,16 @@
     {
       KEY *table_key=quick->head->key_info+quick->index;
       flag=EQ_RANGE;
-      if ((table_key->flags & HA_NOSAME) && key->part == table_key->key_parts-1)
+      if ((table_key->flags & HA_NOSAME) &&
+          key_tree->part == table_key->key_parts-1)
       {
-	if (!(table_key->flags & HA_NULL_PART_KEY) ||
-	    !null_part_in_key(key,
-			      param->min_key,
-			      (uint) (tmp_min_key - param->min_key)))
-	  flag|= UNIQUE_RANGE;
-	else
-	  flag|= NULL_RANGE;
+        if ((table_key->flags & HA_NULL_PART_KEY) &&
+            null_part_in_key(key,
+                             param->min_key,
+                             (uint) (tmp_min_key - param->min_key)))
+          flag|= NULL_RANGE;
+        else
+          flag|= UNIQUE_RANGE;
       }
     }
   }
@@ -8109,7 +8110,7 @@
 }
 
 /*
-  Return 1 if there is only one range and this uses the whole primary key
+  Return 1 if there is only one range and this uses the whole unique key
 */
 
 bool QUICK_RANGE_SELECT::unique_key_range()

=== modified file 'Percona-Server/sql/set_var.cc'
--- Percona-Server/sql/set_var.cc	2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/set_var.cc	2013-12-05 18:48:48 +0000
@@ -217,7 +217,6 @@
 
 bool sys_var::check(THD *thd, set_var *var)
 {
-  do_deprecated_warning(thd);
   if ((var->value && do_check(thd, var))
       || (on_check && on_check(this, thd, var)))
   {
@@ -599,6 +598,7 @@
 
 int set_var::check(THD *thd)
 {
+  var->do_deprecated_warning(thd);
   if (var->is_readonly())
   {
     my_error(ER_INCORRECT_GLOBAL_LOCAL_VAR, MYF(0), var->name.str, "read only");

=== modified file 'Percona-Server/sql/set_var.h'
--- Percona-Server/sql/set_var.h	2013-06-27 15:35:20 +0000
+++ Percona-Server/sql/set_var.h	2013-12-05 18:48:48 +0000
@@ -151,6 +151,7 @@
     return (option.id != -1) && (m_parse_flag & parse_flags) &&
            insert_dynamic(array, (uchar*)&option);
   }
+  void do_deprecated_warning(THD *thd);
 
 private:
   virtual bool do_check(THD *thd, set_var *var) = 0;
@@ -164,7 +165,7 @@
   virtual void global_save_default(THD *thd, set_var *var) = 0;
   virtual bool session_update(THD *thd, set_var *var) = 0;
   virtual bool global_update(THD *thd, set_var *var) = 0;
-  void do_deprecated_warning(THD *thd);
+
 protected:
   /**
     A pointer to a value of the variable for SHOW.

=== modified file 'Percona-Server/sql/sql_acl.cc'
--- Percona-Server/sql/sql_acl.cc	2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/sql_acl.cc	2013-12-05 18:48:48 +0000
@@ -1818,7 +1818,8 @@
 
   copy_length= (size_t) (strlen(ip ? ip : "") +
                  strlen(user ? user : "") +
-                 strlen(db ? db : ""));
+                 strlen(db ? db : "")) + 2; /* Added 2 at the end to avoid  
+                                               buffer overflow at strmov()*/
   /*
     Make sure that strmov() operations do not result in buffer overflow.
   */
@@ -5218,7 +5219,8 @@
   size_t copy_length;
 
   copy_length= (size_t) (strlen(sctx->priv_user ? sctx->priv_user : "") +
-                 strlen(db ? db : ""));
+                 strlen(db ? db : "")) + 1; /* Added 1 at the end to avoid  
+                                               buffer overflow at strmov()*/
 
   /*
     Make sure that strmov() operations do not result in buffer overflow.

=== modified file 'Percona-Server/sql/sql_class.h'
--- Percona-Server/sql/sql_class.h	2013-12-03 05:52:35 +0000
+++ Percona-Server/sql/sql_class.h	2013-12-05 18:48:48 +0000
@@ -3699,11 +3699,13 @@
   bool get(TABLE *table);
   static double get_use_cost(uint *buffer, uint nkeys, uint key_size, 
                              ulonglong max_in_memory_size);
+
+  // Returns the number of bytes needed in imerge_cost_buf.
   inline static int get_cost_calc_buff_size(ulong nkeys, uint key_size, 
                                             ulonglong max_in_memory_size)
   {
     register ulonglong max_elems_in_tree=
-      (1 + max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size));
+      (max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size));
     return (int) (sizeof(uint)*(1 + nkeys/max_elems_in_tree));
   }
 

=== modified file 'Percona-Server/sql/sql_lex.cc'
--- Percona-Server/sql/sql_lex.cc	2013-08-02 09:40:55 +0000
+++ Percona-Server/sql/sql_lex.cc	2013-12-05 18:48:48 +0000
@@ -412,6 +412,7 @@
   lex->select_lex.ftfunc_list= &lex->select_lex.ftfunc_list_alloc;
   lex->select_lex.group_list.empty();
   lex->select_lex.order_list.empty();
+  lex->select_lex.gorder_list.empty();
   lex->duplicates= DUP_ERROR;
   lex->ignore= 0;
   lex->spname= NULL;

=== modified file 'Percona-Server/sql/sql_partition.cc'
--- Percona-Server/sql/sql_partition.cc	2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/sql_partition.cc	2013-12-05 18:48:48 +0000
@@ -5183,6 +5183,8 @@
     }
     else if (alter_info->flags & ALTER_REBUILD_PARTITION)
     {
+      set_engine_all_partitions(tab_part_info,
+                                tab_part_info->default_engine_type);
       if (set_part_state(alter_info, tab_part_info, PART_CHANGED))
       {
         my_error(ER_DROP_PARTITION_NON_EXISTENT, MYF(0), "REBUILD");

=== modified file 'Percona-Server/sql/sql_prepare.cc'
--- Percona-Server/sql/sql_prepare.cc	2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/sql_prepare.cc	2013-12-05 18:48:48 +0000
@@ -880,7 +880,7 @@
         if (param->state == Item_param::NO_VALUE)
           DBUG_RETURN(1);
 
-        if (param->limit_clause_param && param->item_type != Item::INT_ITEM)
+        if (param->limit_clause_param && param->state != Item_param::INT_VALUE)
         {
           param->set_int(param->val_int(), MY_INT64_NUM_DECIMAL_DIGITS);
           param->item_type= Item::INT_ITEM;

=== modified file 'Percona-Server/sql/sys_vars.cc'
--- Percona-Server/sql/sys_vars.cc	2013-12-03 05:52:35 +0000
+++ Percona-Server/sql/sys_vars.cc	2013-12-05 18:48:48 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1879,9 +1879,13 @@
 static Sys_var_ulong Sys_thread_concurrency(
        "thread_concurrency",
        "Permits the application to give the threads system a hint for "
-       "the desired number of threads that should be run at the same time",
+       "the desired number of threads that should be run at the same time."
+       "This variable has no effect, and is deprecated. "
+       "It will be removed in a future release.",
        READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1));
+       VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
+       DEPRECATED(""));
 
 static Sys_var_ulong Sys_thread_stack(
        "thread_stack", "The stack size for each thread",

=== modified file 'Percona-Server/storage/innobase/btr/btr0cur.c'
--- Percona-Server/storage/innobase/btr/btr0cur.c	2013-10-22 13:33:14 +0000
+++ Percona-Server/storage/innobase/btr/btr0cur.c	2013-12-05 18:48:48 +0000
@@ -61,6 +61,7 @@
 #include "row0upd.h"
 #include "trx0rec.h"
 #include "trx0roll.h" /* trx_is_recv() */
+#include "trx0undo.h"
 #include "que0que.h"
 #include "row0row.h"
 #include "srv0srv.h"
@@ -1757,7 +1758,7 @@
 
 /***********************************************************//**
 Writes a redo log record of updating a record in-place. */
-UNIV_INLINE
+UNIV_INTERN
 void
 btr_cur_update_in_place_log(
 /*========================*/
@@ -1785,18 +1786,30 @@
 		return;
 	}
 
-	/* The code below assumes index is a clustered index: change index to
-	the clustered index if we are updating a secondary index record (or we
-	could as well skip writing the sys col values to the log in this case
-	because they are not needed for a secondary index record update) */
-
-	index = dict_table_get_first_index(index->table);
+	/* For secondary indexes, we could skip writing the dummy system fields
+	to the redo log but we have to change redo log parsing of
+	MLOG_REC_UPDATE_IN_PLACE/MLOG_COMP_REC_UPDATE_IN_PLACE or we have to add
+	new redo log record. For now, just write dummy sys fields to the redo
+	log if we are updating a secondary index record.
+	*/
 
 	mach_write_to_1(log_ptr, flags);
 	log_ptr++;
 
-	log_ptr = row_upd_write_sys_vals_to_log(index, trx, roll_ptr, log_ptr,
-						mtr);
+	if (dict_index_is_clust(index)) {
+		log_ptr = row_upd_write_sys_vals_to_log(
+				index, trx, roll_ptr, log_ptr, mtr);
+	} else {
+		/* Dummy system fields for a secondary index */
+		/* TRX_ID Position */
+		log_ptr += mach_write_compressed(log_ptr, 0);
+		/* ROLL_PTR */
+		trx_write_roll_ptr(log_ptr, 0);
+		log_ptr += DATA_ROLL_PTR_LEN;
+		/* TRX_ID */
+		log_ptr += mach_ull_write_compressed(log_ptr, 0);
+	}
+
 	mach_write_to_2(log_ptr, page_offset(rec));
 	log_ptr += 2;
 

=== modified file 'Percona-Server/storage/innobase/btr/btr0pcur.c'
--- Percona-Server/storage/innobase/btr/btr0pcur.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/btr/btr0pcur.c	2013-12-05 18:48:48 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -111,7 +111,7 @@
 	page_t*		page;
 	ulint		offs;
 
-	ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
+	ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
 	ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
 
 	block = btr_pcur_get_block(cursor);
@@ -128,7 +128,6 @@
 
 	ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_S_FIX)
 	      || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
-	ut_a(cursor->latch_mode != BTR_NO_LATCHES);
 
 	if (UNIV_UNLIKELY(page_get_n_recs(page) == 0)) {
 		/* It must be an empty index tree; NOTE that in this case
@@ -239,21 +238,12 @@
 
 	ut_ad(mtr);
 	ut_ad(mtr->state == MTR_ACTIVE);
+	ut_ad(cursor->old_stored == BTR_PCUR_OLD_STORED);
+	ut_ad(cursor->pos_state == BTR_PCUR_WAS_POSITIONED
+	      || cursor->pos_state == BTR_PCUR_IS_POSITIONED);
 
 	index = btr_cur_get_index(btr_pcur_get_btr_cur(cursor));
 
-	if (UNIV_UNLIKELY(cursor->old_stored != BTR_PCUR_OLD_STORED)
-	    || UNIV_UNLIKELY(cursor->pos_state != BTR_PCUR_WAS_POSITIONED
-			     && cursor->pos_state != BTR_PCUR_IS_POSITIONED)) {
-		ut_print_buf(stderr, cursor, sizeof(btr_pcur_t));
-		putc('\n', stderr);
-		if (cursor->trx_if_known) {
-			trx_print(stderr, cursor->trx_if_known, 0);
-		}
-
-		ut_error;
-	}
-
 	if (UNIV_UNLIKELY
 	    (cursor->rel_pos == BTR_PCUR_AFTER_LAST_IN_TREE
 	     || cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE)) {
@@ -277,14 +267,14 @@
 
 	if (UNIV_LIKELY(latch_mode == BTR_SEARCH_LEAF)
 	    || UNIV_LIKELY(latch_mode == BTR_MODIFY_LEAF)) {
-		/* Try optimistic restoration */
+		/* Try optimistic restoration. */
 
-		if (UNIV_LIKELY(buf_page_optimistic_get(
-					latch_mode,
-					cursor->block_when_stored,
-					cursor->modify_clock,
-					file, line, mtr))) {
+		if (buf_page_optimistic_get(latch_mode,
+					    cursor->block_when_stored,
+					    cursor->modify_clock,
+					    file, line, mtr)) {
 			cursor->pos_state = BTR_PCUR_IS_POSITIONED;
+			cursor->latch_mode = latch_mode;
 
 			buf_block_dbg_add_level(
 				btr_pcur_get_block(cursor),
@@ -296,9 +286,6 @@
 				const rec_t*	rec;
 				const ulint*	offsets1;
 				const ulint*	offsets2;
-#endif /* UNIV_DEBUG */
-				cursor->latch_mode = latch_mode;
-#ifdef UNIV_DEBUG
 				rec = btr_pcur_get_rec(cursor);
 
 				heap = mem_heap_create(256);
@@ -316,7 +303,13 @@
 #endif /* UNIV_DEBUG */
 				return(TRUE);
 			}
-
+			/* This is the same record as stored,
+			may need to be adjusted for BTR_PCUR_BEFORE/AFTER,
+			depending on search mode and direction. */
+			if (btr_pcur_is_on_user_rec(cursor)) {
+				cursor->pos_state
+					= BTR_PCUR_IS_POSITIONED_OPTIMISTIC;
+			}
 			return(FALSE);
 		}
 	}
@@ -418,7 +411,7 @@
 	buf_block_t*	next_block;
 	page_t*		next_page;
 
-	ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
+	ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
 	ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
 	ut_ad(btr_pcur_is_after_last_on_page(cursor));
 
@@ -484,7 +477,6 @@
 	ulint		latch_mode;
 	ulint		latch_mode2;
 
-	ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
 	ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
 	ut_ad(btr_pcur_is_before_first_on_page(cursor));
 	ut_ad(!btr_pcur_is_before_first_in_tree(cursor, mtr));

=== modified file 'Percona-Server/storage/innobase/dict/dict0dict.c'
--- Percona-Server/storage/innobase/dict/dict0dict.c	2013-09-06 13:24:59 +0000
+++ Percona-Server/storage/innobase/dict/dict0dict.c	2013-12-05 18:48:48 +0000
@@ -36,6 +36,11 @@
 /** dummy index for ROW_FORMAT=COMPACT supremum and infimum records */
 UNIV_INTERN dict_index_t*	dict_ind_compact;
 
+#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
+/** Flag to control insert buffer debugging. */
+UNIV_INTERN uint	ibuf_debug;
+#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
+
 #ifndef UNIV_HOTBACKUP
 #include "buf0buf.h"
 #include "data0type.h"
@@ -4855,6 +4860,8 @@
 	dict_index_t*	index;
 	ulint		sum_of_index_sizes	= 0;
 
+	DBUG_EXECUTE_IF("skip_innodb_statistics", return;);
+
 	if (table->ibd_file_missing) {
 		ut_print_timestamp(stderr);
 		fprintf(stderr,
@@ -4916,6 +4923,12 @@
 			continue;
 		}
 
+#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
+		if (ibuf_debug && !dict_index_is_clust(index)) {
+			goto fake_statistics;
+		}
+#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
+
 		if (UNIV_LIKELY
 		    (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE
 		     || (srv_force_recovery < SRV_FORCE_NO_LOG_REDO

=== modified file 'Percona-Server/storage/innobase/fil/fil0fil.c'
--- Percona-Server/storage/innobase/fil/fil0fil.c	2013-12-03 05:53:09 +0000
+++ Percona-Server/storage/innobase/fil/fil0fil.c	2013-12-05 18:48:48 +0000
@@ -4369,7 +4369,7 @@
 
 		if (check_msg) {
 			fprintf(stderr,
-				"InnoDB: Error: %s in file %s",
+				"InnoDB: Error: %s in file %s\n",
 				check_msg, filepath);
 			goto func_exit;
 		}

=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-10-23 08:23:08 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-12-05 18:48:48 +0000
@@ -55,6 +55,7 @@
 #include <mysql/innodb_priv.h>
 #include <mysql/psi/psi.h>
 #include <my_sys.h>
+#include <my_check_opt.h>
 
 #ifdef MYSQL_SERVER
 #include <rpl_mi.h>
@@ -8810,6 +8811,10 @@
 	/* There exists possibility of not being able to find requested
 	index due to inconsistency between MySQL and InoDB dictionary info.
 	Necessary message should have been printed in innobase_get_index() */
+	if (prebuilt->table->ibd_file_missing) {
+		n_rows = HA_POS_ERROR;
+		goto func_exit;
+	}
 	if (UNIV_UNLIKELY(!index)) {
 		n_rows = HA_POS_ERROR;
 		goto func_exit;
@@ -9533,8 +9538,7 @@
 ha_innobase::check(
 /*===============*/
 	THD*		thd,		/*!< in: user thread handle */
-	HA_CHECK_OPT*	check_opt)	/*!< in: check options, currently
-					ignored */
+	HA_CHECK_OPT*	check_opt)	/*!< in: check options */
 {
 	dict_index_t*	index;
 	ulint		n_rows;
@@ -9591,11 +9595,6 @@
 	do additional check */
 	prebuilt->table->corrupted = FALSE;
 
-	/* Enlarge the fatal lock wait timeout during CHECK TABLE. */
-	mutex_enter(&kernel_mutex);
-	srv_fatal_semaphore_wait_threshold += SRV_SEMAPHORE_WAIT_EXTENSION;
-	mutex_exit(&kernel_mutex);
-
 	for (index = dict_table_get_first_index(prebuilt->table);
 	     index != NULL;
 	     index = dict_table_get_next_index(index)) {
@@ -9608,21 +9607,42 @@
 
 		/* If this is an index being created, break */
 		if (*index->name == TEMP_INDEX_PREFIX) {
-			break;
-		}  else if (!btr_validate_index(index, prebuilt->trx)) {
-			is_ok = FALSE;
-
-			innobase_format_name(
-				index_name, sizeof index_name,
-				prebuilt->index->name, TRUE);
-
-			push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-					    ER_NOT_KEYFILE,
-					    "InnoDB: The B-tree of"
-					    " index %s is corrupted.",
-					    index_name);
 			continue;
 		}
+		if (!(check_opt->flags & T_QUICK)) {
+			/* Enlarge the fatal lock wait timeout during
+			CHECK TABLE. */
+			mutex_enter(&kernel_mutex);
+			srv_fatal_semaphore_wait_threshold +=
+				SRV_SEMAPHORE_WAIT_EXTENSION;
+			mutex_exit(&kernel_mutex);
+
+			ibool	valid = TRUE;
+			valid = btr_validate_index(index, prebuilt->trx);
+
+			/* Restore the fatal lock wait timeout after
+			CHECK TABLE. */
+			mutex_enter(&kernel_mutex);
+			srv_fatal_semaphore_wait_threshold -=
+				SRV_SEMAPHORE_WAIT_EXTENSION;
+			mutex_exit(&kernel_mutex);
+
+			if (!valid) {
+				is_ok = FALSE;
+
+				innobase_format_name(
+					index_name, sizeof index_name,
+					index->name, TRUE);
+				push_warning_printf(thd,
+					MYSQL_ERROR::WARN_LEVEL_WARN,
+					ER_NOT_KEYFILE,
+					"InnoDB: The B-tree of"
+					" index %s is corrupted.",
+					index_name);
+
+				continue;
+			}
+		}
 
 		/* Instead of invoking change_active_index(), set up
 		a dummy template for non-locking reads, disabling
@@ -9725,21 +9745,17 @@
 	/* Restore the original isolation level */
 	prebuilt->trx->isolation_level = old_isolation_level;
 
-	/* We validate also the whole adaptive hash index for all tables
-	at every CHECK TABLE */
+#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
+	/* We validate the whole adaptive hash index for all tables
+	at every CHECK TABLE only when QUICK flag is not present. */
 
-	if (!btr_search_validate()) {
+	if (!(check_opt->flags & T_QUICK) && !btr_search_validate()) {
 		push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			     ER_NOT_KEYFILE,
 			     "InnoDB: The adaptive hash index is corrupted.");
 		is_ok = FALSE;
 	}
-
-	/* Restore the fatal lock wait timeout after CHECK TABLE. */
-	mutex_enter(&kernel_mutex);
-	srv_fatal_semaphore_wait_threshold -= SRV_SEMAPHORE_WAIT_EXTENSION;
-	mutex_exit(&kernel_mutex);
-
+#endif /* defined UNIV_AHI_DEBUG || defined UNIV_DEBUG */
 	prebuilt->trx->op_info = "";
 	if (thd_killed(user_thd)) {
 		my_error(ER_QUERY_INTERRUPTED, MYF(0));
@@ -10623,6 +10639,7 @@
 	const long		MAX_STATUS_SIZE = 1048576;
 	ulint			trx_list_start = ULINT_UNDEFINED;
 	ulint			trx_list_end = ULINT_UNDEFINED;
+	bool			ret_val;
 
 	DBUG_ENTER("innodb_show_status");
 	DBUG_ASSERT(hton == innodb_hton_ptr);
@@ -10687,12 +10704,13 @@
 
 	mutex_exit(&srv_monitor_file_mutex);
 
-	stat_print(thd, innobase_hton_name, (uint) strlen(innobase_hton_name),
-		   STRING_WITH_LEN(""), str, flen);
+	ret_val= stat_print(thd, innobase_hton_name,
+				(uint) strlen(innobase_hton_name),
+				STRING_WITH_LEN(""), str, flen);
 
 	my_free(str);
 
-	DBUG_RETURN(FALSE);
+	DBUG_RETURN(ret_val);
 }
 
 /************************************************************************//**

=== modified file 'Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c'
--- Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c	2013-10-22 13:33:14 +0000
+++ Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c	2013-12-05 18:48:48 +0000
@@ -194,11 +194,6 @@
 /** Operations that can currently be buffered. */
 UNIV_INTERN ibuf_use_t	ibuf_use		= IBUF_USE_ALL;
 
-#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
-/** Flag to control insert buffer debugging. */
-UNIV_INTERN uint	ibuf_debug;
-#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
-
 /** The insert buffer control structure */
 UNIV_INTERN ibuf_t*	ibuf			= NULL;
 
@@ -2693,6 +2688,12 @@
 		return(0);
 	}
 
+#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
+	if (ibuf_debug) {
+		return(0);
+	}
+#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
+
 	ibuf_mtr_start(&mtr);
 
 	/* Open a cursor to a randomly chosen leaf of the tree, at a random
@@ -4066,6 +4067,24 @@
 			to btr_cur_update_in_place(). */
 			row_upd_rec_in_place(rec, index, offsets,
 					     update, page_zip);
+
+			/* Log the update in place operation. During recovery
+			MLOG_COMP_REC_UPDATE_IN_PLACE/MLOG_REC_UPDATE_IN_PLACE
+			expects trx_id, roll_ptr for secondary indexes. So we
+			just write dummy trx_id(0), roll_ptr(0) */
+			btr_cur_update_in_place_log(BTR_KEEP_SYS_FLAG, rec,
+						    index, update,
+						    NULL, 0, mtr);
+			DBUG_EXECUTE_IF(
+				"crash_after_log_ibuf_upd_inplace",
+				log_buffer_flush_to_disk();
+				fprintf(stderr,
+					"InnoDB: Wrote log record for ibuf "
+					"update in place operation\n");
+				DBUG_SUICIDE();
+			);
+
+
 			goto updated_in_place;
 		}
 

=== modified file 'Percona-Server/storage/innobase/include/btr0cur.h'
--- Percona-Server/storage/innobase/include/btr0cur.h	2013-05-23 08:39:28 +0000
+++ Percona-Server/storage/innobase/include/btr0cur.h	2013-12-05 18:48:48 +0000
@@ -637,6 +637,21 @@
 					uncompressed */
 	ibool		val,		/*!< in: value to set */
 	mtr_t*		mtr);		/*!< in/out: mini-transaction */
+
+/***********************************************************//**
+Writes a redo log record of updating a record in-place. */
+UNIV_INTERN
+void
+btr_cur_update_in_place_log(
+/*========================*/
+	ulint		flags,		/*!< in: flags */
+	rec_t*		rec,		/*!< in: record */
+	dict_index_t*	index,		/*!< in: index where cursor positioned */
+	const upd_t*	update,		/*!< in: update vector */
+	trx_t*		trx,		/*!< in: transaction */
+	roll_ptr_t	roll_ptr,	/*!< in: roll ptr */
+	mtr_t*		mtr);		/*!< in: mtr */
+
 /*######################################################################*/
 
 /** In the pessimistic delete, if the page data size drops below this

=== modified file 'Percona-Server/storage/innobase/include/btr0pcur.h'
--- Percona-Server/storage/innobase/include/btr0pcur.h	2013-06-10 20:29:41 +0000
+++ Percona-Server/storage/innobase/include/btr0pcur.h	2013-12-05 18:48:48 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -447,6 +447,27 @@
 /*==========================*/
 	btr_pcur_t*	cursor);/*!< in/out: persistent cursor */
 
+/** Position state of persistent B-tree cursor. */
+enum pcur_pos_t {
+	/** The persistent cursor is not positioned. */
+	BTR_PCUR_NOT_POSITIONED = 0,
+	/** The persistent cursor was previously positioned.
+	TODO: currently, the state can be BTR_PCUR_IS_POSITIONED,
+	though it really should be BTR_PCUR_WAS_POSITIONED,
+	because we have no obligation to commit the cursor with
+	mtr; similarly latch_mode may be out of date. This can
+	lead to problems if btr_pcur is not used the right way;
+	all current code should be ok. */
+	BTR_PCUR_WAS_POSITIONED,
+	/** The persistent cursor is positioned by optimistic get to the same
+	record as it was positioned at. Not used for rel_pos == BTR_PCUR_ON.
+	It may need adjustment depending on previous/current search direction
+	and rel_pos. */
+	BTR_PCUR_IS_POSITIONED_OPTIMISTIC,
+	/** The persistent cursor is positioned by index search.
+	Or optimistic get for rel_pos == BTR_PCUR_ON. */
+	BTR_PCUR_IS_POSITIONED
+};
 
 /* The persistent B-tree cursor structure. This is used mainly for SQL
 selects, updates, and deletes. */
@@ -480,10 +501,8 @@
 	ib_uint64_t	modify_clock;	/*!< the modify clock value of the
 					buffer block when the cursor position
 					was stored */
-	ulint		pos_state;	/*!< see TODO note below!
-					BTR_PCUR_IS_POSITIONED,
-					BTR_PCUR_WAS_POSITIONED,
-					BTR_PCUR_NOT_POSITIONED */
+	enum pcur_pos_t	pos_state;	/*!< btr_pcur_store_position() and
+					btr_pcur_restore_position() state. */
 	ulint		search_mode;	/*!< PAGE_CUR_G, ... */
 	trx_t*		trx_if_known;	/*!< the transaction, if we know it;
 					otherwise this field is not defined;
@@ -499,21 +518,6 @@
 					is not NULL */
 };
 
-#define BTR_PCUR_IS_POSITIONED	1997660512	/* TODO: currently, the state
-						can be BTR_PCUR_IS_POSITIONED,
-						though it really should be
-						BTR_PCUR_WAS_POSITIONED,
-						because we have no obligation
-						to commit the cursor with
-						mtr; similarly latch_mode may
-						be out of date. This can
-						lead to problems if btr_pcur
-						is not used the right way;
-						all current code should be
-						ok. */
-#define BTR_PCUR_WAS_POSITIONED	1187549791
-#define BTR_PCUR_NOT_POSITIONED 1328997689
-
 #define BTR_PCUR_OLD_STORED	908467085
 #define BTR_PCUR_OLD_NOT_STORED	122766467
 

=== modified file 'Percona-Server/storage/innobase/include/btr0pcur.ic'
--- Percona-Server/storage/innobase/include/btr0pcur.ic	2013-06-10 20:29:41 +0000
+++ Percona-Server/storage/innobase/include/btr0pcur.ic	2013-12-05 18:48:48 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -379,7 +379,7 @@
 	btr_pcur_t*	pcur,	/*!< in: persistent cursor */
 	mtr_t*		mtr)	/*!< in: mtr to commit */
 {
-	ut_a(pcur->pos_state == BTR_PCUR_IS_POSITIONED);
+	ut_ad(pcur->pos_state == BTR_PCUR_IS_POSITIONED);
 
 	pcur->latch_mode = BTR_NO_LATCHES;
 

=== modified file 'Percona-Server/storage/innobase/include/btr0sea.h'
--- Percona-Server/storage/innobase/include/btr0sea.h	2013-09-06 13:24:59 +0000
+++ Percona-Server/storage/innobase/include/btr0sea.h	2013-12-05 18:48:48 +0000
@@ -196,8 +196,6 @@
 ibool
 btr_search_validate(void);
 /*======================*/
-#else
-# define btr_search_validate()	TRUE
 #endif /* defined UNIV_AHI_DEBUG || defined UNIV_DEBUG */
 
 /********************************************************************//**

=== modified file 'Percona-Server/storage/innobase/include/dict0types.h'
--- Percona-Server/storage/innobase/include/dict0types.h	2013-06-25 01:42:54 +0000
+++ Percona-Server/storage/innobase/include/dict0types.h	2013-12-05 18:48:48 +0000
@@ -63,4 +63,9 @@
 #define TEMP_TABLE_PREFIX                "#sql"
 #define TEMP_TABLE_PATH_PREFIX           "/" TEMP_TABLE_PREFIX
 
+#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
+/** Flag to control insert buffer debugging. */
+extern uint		ibuf_debug;
+#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
+
 #endif

=== modified file 'Percona-Server/storage/innobase/include/ibuf0ibuf.h'
--- Percona-Server/storage/innobase/include/ibuf0ibuf.h	2013-08-02 09:40:55 +0000
+++ Percona-Server/storage/innobase/include/ibuf0ibuf.h	2013-12-05 18:48:48 +0000
@@ -63,11 +63,6 @@
 /** Operations that can currently be buffered. */
 extern ibuf_use_t	ibuf_use;
 
-#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
-/** Flag to control insert buffer debugging. */
-extern uint		ibuf_debug;
-#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
-
 /** The insert buffer control structure */
 extern ibuf_t*		ibuf;
 

=== modified file 'Percona-Server/storage/innobase/include/log0log.h'
--- Percona-Server/storage/innobase/include/log0log.h	2013-05-31 09:31:09 +0000
+++ Percona-Server/storage/innobase/include/log0log.h	2013-12-05 18:48:48 +0000
@@ -822,6 +822,8 @@
 					later; this is advanced when a flush
 					operation is completed to all the log
 					groups */
+	volatile ibool	is_extending;	/*!< this is set to true during extend
+					the log buffer size */
 	ib_uint64_t	written_to_some_lsn;
 					/*!< first log sequence number not yet
 					written to any log group; for this to

=== modified file 'Percona-Server/storage/innobase/log/log0log.c'
--- Percona-Server/storage/innobase/log/log0log.c	2013-06-01 15:04:43 +0000
+++ Percona-Server/storage/innobase/log/log0log.c	2013-12-05 18:48:48 +0000
@@ -262,6 +262,85 @@
 	return tracked_lsn_age + lsn_advance > log_sys->max_checkpoint_age;
 }
 
+/** Extends the log buffer.
+@param[in] len	requested minimum size in bytes */
+static
+void
+log_buffer_extend(
+	ulint	len)
+{
+	ulint	move_start;
+	ulint	move_end;
+	byte	tmp_buf[OS_FILE_LOG_BLOCK_SIZE];
+
+	mutex_enter(&(log_sys->mutex));
+
+	while (log_sys->is_extending) {
+		/* Another thread is trying to extend already.
+		Needs to wait for. */
+		mutex_exit(&(log_sys->mutex));
+
+		log_buffer_flush_to_disk();
+
+		mutex_enter(&(log_sys->mutex));
+
+		if (srv_log_buffer_size > len / UNIV_PAGE_SIZE) {
+			/* Already extended enough by the others */
+			mutex_exit(&(log_sys->mutex));
+			return;
+		}
+	}
+
+	log_sys->is_extending = TRUE;
+
+	while (log_sys->n_pending_writes != 0
+	       || ut_calc_align_down(log_sys->buf_free,
+				     OS_FILE_LOG_BLOCK_SIZE)
+		  != ut_calc_align_down(log_sys->buf_next_to_write,
+					OS_FILE_LOG_BLOCK_SIZE)) {
+		/* Buffer might have >1 blocks to write still. */
+		mutex_exit(&(log_sys->mutex));
+
+		log_buffer_flush_to_disk();
+
+		mutex_enter(&(log_sys->mutex));
+	}
+
+	move_start = ut_calc_align_down(
+		log_sys->buf_free,
+		OS_FILE_LOG_BLOCK_SIZE);
+	move_end = log_sys->buf_free;
+
+	/* store the last log block in buffer */
+	ut_memcpy(tmp_buf, log_sys->buf + move_start,
+		  move_end - move_start);
+
+	log_sys->buf_free -= move_start;
+	log_sys->buf_next_to_write -= move_start;
+
+	/* reallocate log buffer */
+	srv_log_buffer_size = len / UNIV_PAGE_SIZE + 1;
+	mem_free(log_sys->buf_ptr);
+	log_sys->buf_ptr = mem_alloc(LOG_BUFFER_SIZE + OS_FILE_LOG_BLOCK_SIZE);
+	log_sys->buf = ut_align(log_sys->buf_ptr, OS_FILE_LOG_BLOCK_SIZE);
+	log_sys->buf_size = LOG_BUFFER_SIZE;
+	memset(log_sys->buf, '\0', LOG_BUFFER_SIZE);
+	log_sys->max_buf_free = log_sys->buf_size / LOG_BUF_FLUSH_RATIO
+		- LOG_BUF_FLUSH_MARGIN;
+
+	/* restore the last log block */
+	ut_memcpy(log_sys->buf, tmp_buf, move_end - move_start);
+
+	ut_ad(log_sys->is_extending);
+	log_sys->is_extending = FALSE;
+
+	mutex_exit(&(log_sys->mutex));
+
+	fprintf(stderr,
+		"InnoDB: innodb_log_buffer_size was extended to %lu.\n",
+		LOG_BUFFER_SIZE);
+}
+
 /************************************************************//**
 Opens the log for log_write_low. The log must be closed with log_close.
 @return	start lsn of the log record */
@@ -279,10 +358,38 @@
 #endif /* UNIV_LOG_ARCHIVE */
 	ulint	count			= 0;
 
-	ut_a(len < log->buf_size / 2);
+	if (len >= log->buf_size / 2) {
+		DBUG_EXECUTE_IF("ib_log_buffer_is_short_crash",
+				DBUG_SUICIDE(););
+
+		/* log_buffer is too small. try to extend instead of crash. */
+		ut_print_timestamp(stderr);
+		fprintf(stderr,
+			" InnoDB: Warning: "
+			"The transaction log size is too large"
+			" for innodb_log_buffer_size (%lu >= %lu / 2). "
+			"Trying to extend it.\n",
+			len, LOG_BUFFER_SIZE);
+
+		log_buffer_extend((len + 1) * 2);
+	}
 loop:
 	ut_ad(!recv_no_log_write);
 
+	if (log->is_extending) {
+
+		mutex_exit(&(log->mutex));
+
+		/* Log buffer size is extending. Writing up to the next block
+		should wait for the extending finished. */
+
+		os_thread_sleep(100000);
+
+		ut_ad(++count < 50);
+
+		goto loop;
+	}
+
 	/* Calculate an upper limit for the space the string may take in the
 	log buffer */
 
@@ -899,6 +1006,7 @@
 	log_sys->buf = ut_align(log_sys->buf_ptr, OS_FILE_LOG_BLOCK_SIZE);
 
 	log_sys->buf_size = LOG_BUFFER_SIZE;
+	log_sys->is_extending = FALSE;
 
 	memset(log_sys->buf, '\0', LOG_BUFFER_SIZE);
 

=== modified file 'Percona-Server/storage/innobase/row/row0sel.c'
--- Percona-Server/storage/innobase/row/row0sel.c	2013-10-22 13:33:14 +0000
+++ Percona-Server/storage/innobase/row/row0sel.c	2013-12-05 18:48:48 +0000
@@ -3099,48 +3099,78 @@
 	mtr_t*		mtr)		/*!< in: mtr; CAUTION: may commit
 					mtr temporarily! */
 {
-	ibool	success;
-	ulint	relative_position;
-
-	relative_position = pcur->rel_pos;
+	ibool		success;
 
 	success = btr_pcur_restore_position(latch_mode, pcur, mtr);
 
 	*same_user_rec = success;
 
-	if (relative_position == BTR_PCUR_ON) {
-		if (success) {
-			return(FALSE);
-		}
-
-		if (moves_up) {
+	ut_ad(!success || pcur->rel_pos == BTR_PCUR_ON);
+#ifdef UNIV_DEBUG
+	if (pcur->pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC) {
+		ut_ad(pcur->rel_pos == BTR_PCUR_BEFORE
+		      || pcur->rel_pos == BTR_PCUR_AFTER);
+	} else {
+		ut_ad(pcur->pos_state == BTR_PCUR_IS_POSITIONED);
+		ut_ad((pcur->rel_pos == BTR_PCUR_ON)
+		      == btr_pcur_is_on_user_rec(pcur));
+	}
+#endif
+
+	/* The position may need be adjusted for rel_pos and moves_up. */
+
+	switch (pcur->rel_pos) {
+	case BTR_PCUR_ON:
+		if (!success && moves_up) {
+next:
 			btr_pcur_move_to_next(pcur, mtr);
+			return(TRUE);
 		}
-
+		return(!success);
+	case BTR_PCUR_AFTER_LAST_IN_TREE:
+	case BTR_PCUR_BEFORE_FIRST_IN_TREE:
 		return(TRUE);
-	}
-
-	if (relative_position == BTR_PCUR_AFTER
-	    || relative_position == BTR_PCUR_AFTER_LAST_IN_TREE) {
-
-		if (moves_up) {
-			return(TRUE);
-		}
-
-		if (btr_pcur_is_on_user_rec(pcur)) {
+	case BTR_PCUR_AFTER:
+		/* positioned to record after pcur->old_rec. */
+		pcur->pos_state = BTR_PCUR_IS_POSITIONED;
+prev:
+		if (btr_pcur_is_on_user_rec(pcur) && !moves_up) {
 			btr_pcur_move_to_prev(pcur, mtr);
 		}
-
 		return(TRUE);
-	}
-
-	ut_ad(relative_position == BTR_PCUR_BEFORE
-	      || relative_position == BTR_PCUR_BEFORE_FIRST_IN_TREE);
-
-	if (moves_up && btr_pcur_is_on_user_rec(pcur)) {
-		btr_pcur_move_to_next(pcur, mtr);
-	}
-
+	case BTR_PCUR_BEFORE:
+		/* For non optimistic restoration:
+		The position is now set to the record before pcur->old_rec.
+
+		For optimistic restoration:
+		The position also needs to take the previous search_mode into
+		consideration. */
+
+		switch (pcur->pos_state) {
+		case BTR_PCUR_IS_POSITIONED_OPTIMISTIC:
+			pcur->pos_state = BTR_PCUR_IS_POSITIONED;
+			if (pcur->search_mode == PAGE_CUR_GE) {
+				/* Positioned during Greater or Equal search
+				with BTR_PCUR_BEFORE. Optimistic restore to
+				the same record. If scanning for lower then
+				we must move to previous record.
+				This can happen with:
+				HANDLER READ idx a = (const);
+				HANDLER READ idx PREV; */
+				goto prev;
+			}
+			return(TRUE);
+		case BTR_PCUR_IS_POSITIONED:
+			if (moves_up && btr_pcur_is_on_user_rec(pcur)) {
+				goto next;
+			}
+			return(TRUE);
+		case BTR_PCUR_WAS_POSITIONED:
+		case BTR_PCUR_NOT_POSITIONED:
+			break;
+		}
+	}
+	ut_ad(0);
 	return(TRUE);
 }
 
@@ -4141,6 +4171,14 @@
 
 			btr_pcur_store_position(pcur, &mtr);
 
+			/* The found record was not a match, but may be used
+			as NEXT record (index_next). Set the relative position
+			to BTR_PCUR_BEFORE, to reflect that the position of
+			the persistent cursor is before the found/stored row
+			(pcur->old_rec). */
+			ut_ad(pcur->rel_pos == BTR_PCUR_ON);
+			pcur->rel_pos = BTR_PCUR_BEFORE;
+
 			err = DB_RECORD_NOT_FOUND;
 			/* ut_print_name(stderr, index->name);
 			fputs(" record not found 3\n", stderr); */
@@ -4180,6 +4218,14 @@
 
 			btr_pcur_store_position(pcur, &mtr);
 
+			/* The found record was not a match, but may be used
+			as NEXT record (index_next). Set the relative position
+			to BTR_PCUR_BEFORE, to reflect that the position of
+			the persistent cursor is before the found/stored row
+			(pcur->old_rec). */
+			ut_ad(pcur->rel_pos == BTR_PCUR_ON);
+			pcur->rel_pos = BTR_PCUR_BEFORE;
+
 			err = DB_RECORD_NOT_FOUND;
 			/* ut_print_name(stderr, index->name);
 			fputs(" record not found 4\n", stderr); */
@@ -4757,6 +4803,7 @@
 	if (prebuilt->n_fetch_cached > 0) {
 		row_sel_pop_cached_row_for_mysql(buf, prebuilt);
 
+		DEBUG_SYNC_C("row_search_cached_row");
 		err = DB_SUCCESS;
 	}
 

=== modified file 'Percona-Server/strings/CMakeLists.txt'
--- Percona-Server/strings/CMakeLists.txt	2011-06-30 15:46:53 +0000
+++ Percona-Server/strings/CMakeLists.txt	2013-12-05 18:48:48 +0000
@@ -31,3 +31,8 @@
 # Avoid dependencies on perschema data defined in mysys
 ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H)
 ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES})
+
+INSTALL_DEBUG_SYMBOLS(strings)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()

=== modified file 'Percona-Server/strings/ctype-win1250ch.c'
--- Percona-Server/strings/ctype-win1250ch.c	2011-06-30 15:46:53 +0000
+++ Percona-Server/strings/ctype-win1250ch.c	2013-12-05 18:48:48 +0000
@@ -500,7 +500,7 @@
 
   do {
     NEXT_CMP_VALUE(src, p, pass, value, (int)srclen);
-    if (totlen <= len)
+    if (totlen < len)
       dest[totlen] = value;
     totlen++;
   } while (value) ;

=== modified file 'Percona-Server/support-files/mysql.spec.sh'
--- Percona-Server/support-files/mysql.spec.sh	2013-09-09 17:49:44 +0000
+++ Percona-Server/support-files/mysql.spec.sh	2013-12-05 18:48:48 +0000
@@ -1058,7 +1058,9 @@
 %doc release/Docs/INFO_BIN*
 %doc release/support-files/my-*.cnf
 
+%if 0%{?commercial}
 %doc %attr(644, root, root) %{_infodir}/mysql.info*
+%endif
 
 %doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
 %doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
@@ -1215,6 +1217,9 @@
 # merging BK trees)
 ##############################################################################
 %changelog
+* Wed Oct 30 2013 Balasubramanian Kandasamy <[e-mail]>
+- Removed non gpl file docs/mysql.info from community packages
+
 * Mon Sep 09 2013 Balasubramanian Kandasamy <[e-mail]>
 - Updated logic to get the correct count of PID files 
 

=== modified file 'Percona-Server/vio/CMakeLists.txt'
--- Percona-Server/vio/CMakeLists.txt	2013-02-26 05:35:17 +0000
+++ Percona-Server/vio/CMakeLists.txt	2013-12-05 18:48:48 +0000
@@ -20,3 +20,8 @@
 SET(VIO_SOURCES  vio.c viosocket.c viossl.c viosslfactories.c)
 ADD_CONVENIENCE_LIBRARY(vio ${VIO_SOURCES})
 TARGET_LINK_LIBRARIES(vio ${LIBSOCKET})
+
+INSTALL_DEBUG_SYMBOLS(vio)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(vio DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()

=== modified file 'Percona-Server/vio/viosslfactories.c'
--- Percona-Server/vio/viosslfactories.c	2013-06-27 15:35:20 +0000
+++ Percona-Server/vio/viosslfactories.c	2013-12-05 18:48:48 +0000
@@ -78,7 +78,7 @@
   "No error",
   "Unable to get certificate",
   "Unable to get private key",
-  "Private key does not match the certificate public key"
+  "Private key does not match the certificate public key",
   "SSL_CTX_set_default_verify_paths failed",
   "Failed to set ciphers to use",
   "SSL_CTX_new failed"

=== modified file 'Percona-Server/zlib/CMakeLists.txt'
--- Percona-Server/zlib/CMakeLists.txt	2013-02-26 05:35:17 +0000
+++ Percona-Server/zlib/CMakeLists.txt	2013-12-05 18:48:48 +0000
@@ -23,3 +23,8 @@
 ADD_CONVENIENCE_LIBRARY(zlib ${ZLIB_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(zlib)
 
+INSTALL_DEBUG_SYMBOLS(zlib)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(zlib DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
+